Attachment #186080 for bug #222015




CMAKE_ARGS=	-DUSE_APIDOCS:BOOL=OFF \
	-DUSE_GRANITE:BOOL=OFF

USES=		cmake desktop-file-utils gettext pkgconfig sqlite tar:bzip2
USE_GNOME=	glib20 intltool libxml2
USE_XORG=	xscrnsaver
INSTALLS_ICONS=	yes
USE_LDCONFIG=	yes
USES=		cmake desktop-file-utils gettext pkgconfig sqlite tar:bzip2

PLIST_SUB=	VERSION="${PORTVERSION:R}"


Lines 1-6 Link Here

(-)www/midori/files/patch-config__search (-3 / +3 lines)
1	--- ./config/search.orig 2013-11-20 01:26:52.000000000 +0000	1	--- config/search.orig 2015-08-30 11:56:26 UTC
2	+++ ./config/search 2013-11-20 18:03:47.000000000 +0000	2	+++ config/search
3	@@ -16,6 +16,12 @@	3	@@ -16,6 +16,12 @@ text=Web Search
4	uri=http://www.google.com/search?q=%s	4	uri=http://www.google.com/search?q=%s
5	token=g	5	token=g
6		6




--- extensions/external-download-manager.vala.orig	2015-08-30 11:56:26 UTC
+++ extensions/external-download-manager.vala
@@ -10,7 +10,7 @@
 */
 
 namespace EDM {
-#if !HAVE_WIN32

     [DBus (name = "net.launchpad.steadyflow.App")]
     interface SteadyflowInterface : GLib.Object {
         public abstract void AddFile (string url) throws IOError;
@@ -203,6 +203,7 @@ namespace EDM {
         }
     }
 

     private class SteadyFlow : ExternalDownloadManager {
         public override bool download (DownloadRequest dlReq) {
             try {
@@ -230,6 +231,7 @@ namespace EDM {
         }
     }
 #endif

+#endif
 
     private class CommandLinePreferences : Gtk.Dialog {
         protected Gtk.Entry input;
@@ -359,7 +361,9 @@ public Katze.Array extension_init () {
     var extensions = new Katze.Array( typeof (Midori.Extension));
     #if !HAVE_WIN32
     extensions.add_item (new EDM.Aria2 ());
+    #if HAVE_GTK3
     extensions.add_item (new EDM.SteadyFlow ());
+    #endif
     #endif
+    #endif
     extensions.add_item (new EDM.CommandLine ());
     return extensions;
 }




--- extensions/adblock/widgets.vala.orig	2015-08-30 11:56:26 UTC
+++ extensions/adblock/widgets.vala
@@ -227,7 +227,11 @@ namespace Adblock {
                             liststore.get (iter, 0, out sub);
                             if (sub.mutable) {
                                 config.remove (sub);
+#if VALA_0_36
+                                liststore.remove (ref iter);
+#else
                                 liststore.remove (iter);
+#endif
                                 return true;
                             }
                         }




--- extensions/apps.vala.orig	2015-08-30 11:56:26 UTC
+++ extensions/apps.vala
@@ -265,7 +265,11 @@ namespace Apps {
                             store.get (iter, 0, out launcher);
                             try {
                                 launcher.file.trash (null);
+#if VALA_0_36
+                                store.remove (ref iter);
+#else
                                 store.remove (iter);
+#endif
 
                                 string filename = Midori.Download.clean_filename (launcher.name);
 #if HAVE_WIN32




--- extensions/history-list.vala.orig	2015-08-30 11:56:26 UTC
+++ extensions/history-list.vala
@@ -223,7 +223,11 @@ namespace HistoryList {
                     FixMe: the retrun value of `Gtk.ListStore.remove` should be checked
                     Note:  in some cases the return value of `Gtk.ListStore.remove` is wrong
                 */
+#if VALA_0_36
+                model.remove (ref iter);
+#else
                 model.remove (iter);
+#endif
                 this.browser.close_tab (view);
                 if (length > 2)
                     this.resize_treeview ();




--- extensions/notes.vala.orig	2015-08-30 11:56:26 UTC
+++ extensions/notes.vala
@@ -116,7 +116,11 @@ namespace ClipNotes {
                     if (current_note == note) {
                         current_note = null;
                     }
+#if VALA_0_36
+                    notes_list_store.remove (ref iter);
+#else
                     notes_list_store.remove (iter);
+#endif
                     break;
                 }
             } while (notes_list_store.iter_next (ref iter));




--- extensions/transfers.vala.orig	2015-08-30 11:56:26 UTC
+++ extensions/transfers.vala
@@ -275,7 +275,11 @@ namespace Transfers {
                     Transfer found;
                     store.get (iter, 0, out found);
                     if (transfer == found) {
+#if VALA_0_36
+                        store.remove (ref iter);
+#else
                         store.remove (iter);
+#endif
                         break;
                     }
                 } while (store.iter_next (ref iter));
@@ -455,7 +459,11 @@ namespace Transfers {
                 if (notifications.length () == 1)
                     msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
                 else
-                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
+#if VALA_0_36
+                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, (int) notifications.length ());
+#else
+                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
+#endif
                 get_app ().send_notification (_("Transfer completed"), msg);
                 notifications = new GLib.List<string> ();
             }




--- midori/midori-notebook.vala.orig	2015-08-30 11:56:26 UTC
+++ midori/midori-notebook.vala
@@ -10,7 +10,7 @@
 */
 
 namespace Midori {
-    protected class Tally : Gtk.EventBox {
+    internal class Tally : Gtk.EventBox {
         public Midori.Tab tab { get; set; }
         Gtk.Spinner spinner;
         public Gtk.Label label;
@@ -22,7 +22,7 @@ namespace Midori {
         public bool close_button_left { get; set; default = false; }
         public bool close_button_visible { get; set; default = false; }
 
-        protected Tally (Midori.Tab tab) {
+        internal Tally (Midori.Tab tab) {
             this.tab = tab;
             box = new Gtk.HBox (false, 1);
             add (box);
@@ -155,7 +155,7 @@ namespace Midori {
         int last_tab_size = 0;
 
 #if !HAVE_GTK3
-        static const string style_fixup = """
+        const string style_fixup = """
             style "midori-close-button-style"
             {
             GtkWidget::focus-padding = 0

Return to bug 222015

Lines 27-37 Link Here

(-)www/midori/Makefile (-1 / +1 lines)
27	CMAKE_ARGS= -DUSE_APIDOCS:BOOL=OFF \	27	CMAKE_ARGS= -DUSE_APIDOCS:BOOL=OFF \
28	-DUSE_GRANITE:BOOL=OFF	28	-DUSE_GRANITE:BOOL=OFF
29		29
		30	USES= cmake desktop-file-utils gettext pkgconfig sqlite tar:bzip2
30	USE_GNOME= glib20 intltool libxml2	31	USE_GNOME= glib20 intltool libxml2
31	USE_XORG= xscrnsaver	32	USE_XORG= xscrnsaver
32	INSTALLS_ICONS= yes	33	INSTALLS_ICONS= yes
33	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
34	USES= cmake desktop-file-utils gettext pkgconfig sqlite tar:bzip2
35		35
36	PLIST_SUB= VERSION="${PORTVERSION:R}"	36	PLIST_SUB= VERSION="${PORTVERSION:R}"
37		37

Lines 1-7 Link Here

(-)www/midori/files/patch-extensions__external-download-manager.vala (-10 / +9 lines)
1	--- ./extensions/external-download-manager.vala.orig 2013-03-07 17:44:14.000000000 +0000	1	--- extensions/external-download-manager.vala.orig 2015-08-30 11:56:26 UTC
2	+++ ./extensions/external-download-manager.vala 2013-03-11 06:50:27.000000000 +0000	2	+++ extensions/external-download-manager.vala
3	@@ -16,7 +16,7 @@	3	@@ -10,7 +10,7 @@
4	using WebKit;	4	*/
5		5
6	namespace EDM {	6	namespace EDM {
7	-#if !HAVE_WIN32	7	-#if !HAVE_WIN32
Lines 9-15 Link Here
9	[DBus (name = "net.launchpad.steadyflow.App")]	9	[DBus (name = "net.launchpad.steadyflow.App")]
10	interface SteadyflowInterface : GLib.Object {	10	interface SteadyflowInterface : GLib.Object {
11	public abstract void AddFile (string url) throws IOError;	11	public abstract void AddFile (string url) throws IOError;
12	@@ -183,6 +183,7 @@	12	@@ -203,6 +203,7 @@ namespace EDM {
13	}	13	}
14	}	14	}
15		15
Lines 17-23 Link Here
17	private class SteadyFlow : ExternalDownloadManager {	17	private class SteadyFlow : ExternalDownloadManager {
18	public override bool download (DownloadRequest dlReq) {	18	public override bool download (DownloadRequest dlReq) {
19	try {	19	try {
20	@@ -210,6 +211,7 @@	20	@@ -230,6 +231,7 @@ namespace EDM {
21	}	21	}
22	}	22	}
23	#endif	23	#endif
Lines 24-38 Link Here
24	+#endif	24	+#endif
25		25
26	private class CommandLinePreferences : Gtk.Dialog {	26	private class CommandLinePreferences : Gtk.Dialog {
27	protected Entry input;	27	protected Gtk.Entry input;
28	@@ -339,8 +341,10 @@	28	@@ -359,7 +361,9 @@ public Katze.Array extension_init () {
29	var extensions = new Katze.Array( typeof (Midori.Extension));	29	var extensions = new Katze.Array( typeof (Midori.Extension));
30	#if !HAVE_WIN32	30	#if !HAVE_WIN32
31	extensions.add_item (new EDM.Aria2 ());	31	extensions.add_item (new EDM.Aria2 ());
32	+ #if HAVE_GTK3	32	+ #if HAVE_GTK3
33	extensions.add_item (new EDM.SteadyFlow ());	33	extensions.add_item (new EDM.SteadyFlow ());
		34	+ #endif
34	#endif	35	#endif
35	+ #endif
36	extensions.add_item (new EDM.CommandLine ());	36	extensions.add_item (new EDM.CommandLine ());
37	return extensions;	37	return extensions;
38	}

Line 0 Link Here

(-)www/midori/files/patch-extensions_adblock_widgets.vala (+14 lines)
	1	--- extensions/adblock/widgets.vala.orig 2015-08-30 11:56:26 UTC
	2	+++ extensions/adblock/widgets.vala
	3	@@ -227,7 +227,11 @@ namespace Adblock {
	4	liststore.get (iter, 0, out sub);
	5	if (sub.mutable) {
	6	config.remove (sub);
	7	+#if VALA_0_36
	8	+ liststore.remove (ref iter);
	9	+#else
	10	liststore.remove (iter);
	11	+#endif
	12	return true;
	13	}
	14	}

Line 0 Link Here

(-)www/midori/files/patch-extensions_apps.vala (+14 lines)
	1	--- extensions/apps.vala.orig 2015-08-30 11:56:26 UTC
	2	+++ extensions/apps.vala
	3	@@ -265,7 +265,11 @@ namespace Apps {
	4	store.get (iter, 0, out launcher);
	5	try {
	6	launcher.file.trash (null);
	7	+#if VALA_0_36
	8	+ store.remove (ref iter);
	9	+#else
	10	store.remove (iter);
	11	+#endif
	12
	13	string filename = Midori.Download.clean_filename (launcher.name);
	14	#if HAVE_WIN32

Line 0 Link Here

(-)www/midori/files/patch-extensions_history-list.vala (+14 lines)
	1	--- extensions/history-list.vala.orig 2015-08-30 11:56:26 UTC
	2	+++ extensions/history-list.vala
	3	@@ -223,7 +223,11 @@ namespace HistoryList {
	4	FixMe: the retrun value of `Gtk.ListStore.remove` should be checked
	5	Note: in some cases the return value of `Gtk.ListStore.remove` is wrong
	6	*/
	7	+#if VALA_0_36
	8	+ model.remove (ref iter);
	9	+#else
	10	model.remove (iter);
	11	+#endif
	12	this.browser.close_tab (view);
	13	if (length > 2)
	14	this.resize_treeview ();

Line 0 Link Here

(-)www/midori/files/patch-extensions_notes.vala (+14 lines)
	1	--- extensions/notes.vala.orig 2015-08-30 11:56:26 UTC
	2	+++ extensions/notes.vala
	3	@@ -116,7 +116,11 @@ namespace ClipNotes {
	4	if (current_note == note) {
	5	current_note = null;
	6	}
	7	+#if VALA_0_36
	8	+ notes_list_store.remove (ref iter);
	9	+#else
	10	notes_list_store.remove (iter);
	11	+#endif
	12	break;
	13	}
	14	} while (notes_list_store.iter_next (ref iter));

Line 0 Link Here

(-)www/midori/files/patch-extensions_transfers.vala (+27 lines)
	1	--- extensions/transfers.vala.orig 2015-08-30 11:56:26 UTC
	2	+++ extensions/transfers.vala
	3	@@ -275,7 +275,11 @@ namespace Transfers {
	4	Transfer found;
	5	store.get (iter, 0, out found);
	6	if (transfer == found) {
	7	+#if VALA_0_36
	8	+ store.remove (ref iter);
	9	+#else
	10	store.remove (iter);
	11	+#endif
	12	break;
	13	}
	14	} while (store.iter_next (ref iter));
	15	@@ -455,7 +459,11 @@ namespace Transfers {
	16	if (notifications.length () == 1)
	17	msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
	18	else
	19	- msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
	20	+#if VALA_0_36
	21	+ msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, (int) notifications.length ());
	22	+#else
	23	+ msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
	24	+#endif
	25	get_app ().send_notification (_("Transfer completed"), msg);
	26	notifications = new GLib.List<string> ();
	27	}

Line 0 Link Here

(-)www/midori/files/patch-midori_midori-notebook.vala (+29 lines)
	1	--- midori/midori-notebook.vala.orig 2015-08-30 11:56:26 UTC
	2	+++ midori/midori-notebook.vala
	3	@@ -10,7 +10,7 @@
	4	*/
	5
	6	namespace Midori {
	7	- protected class Tally : Gtk.EventBox {
	8	+ internal class Tally : Gtk.EventBox {
	9	public Midori.Tab tab { get; set; }
	10	Gtk.Spinner spinner;
	11	public Gtk.Label label;
	12	@@ -22,7 +22,7 @@ namespace Midori {
	13	public bool close_button_left { get; set; default = false; }
	14	public bool close_button_visible { get; set; default = false; }
	15
	16	- protected Tally (Midori.Tab tab) {
	17	+ internal Tally (Midori.Tab tab) {
	18	this.tab = tab;
	19	box = new Gtk.HBox (false, 1);
	20	add (box);
	21	@@ -155,7 +155,7 @@ namespace Midori {
	22	int last_tab_size = 0;
	23
	24	#if !HAVE_GTK3
	25	- static const string style_fixup = """
	26	+ const string style_fixup = """
	27	style "midori-close-button-style"
	28	{
	29	GtkWidget::focus-padding = 0