Attachment #200233 for bug #233958

View | Details | Raw Unified | Return to bug 233958
Collapse All | Expand All

Lines 2-12 Link Here

(-)Makefile (-25 / +22 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= midori	4	PORTNAME= midori
5	PORTVERSION= 0.5.11	5	PORTVERSION= 0.7.0
6	CATEGORIES= www xfce	6	CATEGORIES= www xfce
7	MASTER_SITES= https://launchpadlibrarian.net/215909491/ \
8	https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
9	DIST_SUBDIR= xfce4
10		7
11	MAINTAINER= xfce@FreeBSD.org	8	MAINTAINER= xfce@FreeBSD.org
12	COMMENT= Lightweight web browser using WebKit browser engine	9	COMMENT= Lightweight web browser using WebKit browser engine
Lines 17-55 Link Here
17	BUILD_DEPENDS= rsvg-convert:graphics/librsvg2 \	14	BUILD_DEPENDS= rsvg-convert:graphics/librsvg2 \
18	valac:lang/vala	15	valac:lang/vala
19	LIB_DEPENDS= libnotify.so:devel/libnotify \	16	LIB_DEPENDS= libnotify.so:devel/libnotify \
		17	libsoup-2.4.so:devel/libsoup \
20	libsoup-gnome-2.4.so:devel/libsoup-gnome \	18	libsoup-gnome-2.4.so:devel/libsoup-gnome \
21	libgcr-3.so:security/gcr	19	libp11-kit.so:security/p11-kit \
		20	libgcr-3.so:security/gcr \
		21	libpeas-1.0.so:devel/libpeas \
		22	libwebkit2gtk-4.0.so:www/webkit2-gtk3
22	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	23	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
23		24
		25	USES= cmake desktop-file-utils gettext gnome localbase:ldflags \
		26	pkgconfig sqlite tar:bzip2
		27	USE_GNOME= cairo glib20 gtk30 intltool introspection libxml2
		28	USE_XORG= xscrnsaver
		29
24	CFLAGS+= -Wno-return-type	30	CFLAGS+= -Wno-return-type
25	CMAKE_ARGS= -DUSE_APIDOCS:BOOL=OFF \	31	CMAKE_ARGS= -DUSE_APIDOCS:BOOL=OFF
26	-DUSE_GRANITE:BOOL=OFF
27		32
28	USES= cmake desktop-file-utils gettext localbase:ldflags pkgconfig \
29	sqlite tar:bzip2
30	USE_GNOME= glib20 intltool libxml2
31	USE_XORG= xscrnsaver
32	INSTALLS_ICONS= yes	33	INSTALLS_ICONS= yes
33	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
34		35
35	PLIST_SUB= VERSION="${PORTVERSION:R}"	36	PLIST_SUB= VERSION="${PORTVERSION:R}"
36		37
37	OPTIONS_DEFINE= GIR GTK3 ZEITGEIST	38	USE_GITHUB= yes
38	OPTIONS_SUB= yes	39	GH_ACCOUNT= midori-browser
39	GIR_PREVENTS= GTK3	40	GH_PROJECT= core
40	GIR_USE= gnome=introspection:build	41	GH_TAGNAME= v7
41	GIR_CMAKE_ON= -DUSE_GIR:BOOL=ON	42
42	GTK3_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3	43	OPTIONS_DEFINE= ZEITGEIST
43	GTK3_USE= gnome=gtk30	44	OPTIONS_SUB= yes
44	GTK3_CMAKE_ON= -DUSE_GTK3:BOOL=ON \	45
45	-DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF	46	ZEITGEIST_DESC= User logs activities
46	GTK3_LIB_DEPENDS_OFF= libwebkitgtk-1.0.so:www/webkit-gtk2	47
47	GTK3_USE_OFF= gnome=gtk20
48	GTK3_CMAKE_OFF= -DUSE_GTK3:BOOL=OFF
49	ZEITGEIST_LIB_DEPENDS= libzeitgeist-2.0.so:sysutils/zeitgeist	48	ZEITGEIST_LIB_DEPENDS= libzeitgeist-2.0.so:sysutils/zeitgeist
50	ZEITGEIST_CMAKE_OFF= -DUSE_ZEITGEIST:BOOL=OFF	49	ZEITGEIST_CMAKE_OFF= -DUSE_ZEITGEIST:BOOL=OFF
51	GIR_DESC= Install GObject Introspection Reference manual
52	ZEITGEIST_DESC= User logs activities
53		50
54	post-patch:	51	post-patch:
55	# Avoid errors with CMake	52	# Avoid errors with CMake

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (xfce4/midori-0.5.11.tar.bz2) = 96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d	1	TIMESTAMP = 1544775534
2	SIZE (xfce4/midori-0.5.11.tar.bz2) = 1428791	2	SHA256 (midori-browser-core-0.7.0-v7_GH0.tar.gz) = ba9295e85e2eea45b07052413f50bab7d3b85c471a05ec653b6eb8a6286e3207
		3	SIZE (midori-browser-core-0.7.0-v7_GH0.tar.gz) = 1862369

Lines 1-10 Link Here

(-)files/patch-CMakeLists.txt (-10 lines)
1	--- CMakeLists.txt.orig 2015-08-30 11:56:26 UTC
2	+++ CMakeLists.txt
3	@@ -263,7 +263,6 @@ if ((CMAKE_C_COMPILER_ID STREQUAL "GNU"
4	OR (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "3.0.0"))
5	set(VALA_CFLAGS "${VALA_CFLAGS} -Werror=implicit-function-declaration")
6	set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-incompatible-pointer-types")
7	- set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-discarded-qualifiers")
8	set(VALA_CFLAGS "${VALA_CFLAGS} -Wno-deprecated-declarations")
9	else ()
10	set(VALA_CFLAGS "${VALA_CFLAGS} -w")




--- config/search.orig	2015-08-30 11:56:26 UTC
+++ config/search
@@ -16,6 +16,12 @@ text=Web Search
 uri=http://www.google.com/search?q=%s
 token=g
 
+[FreshPorts]
+name=FreshPorts
+text=The changes made to the FreeBSD ports tree
+uri=http://www.freshports.org/search.php?query=%s
+token=fp
+
 [Wikipedia]
 name=Wikipedia
 text=The free encyclopedia




--- 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
+#if !HAVE_WIN32 || HAVE_GTK3
     [DBus (name = "net.launchpad.steadyflow.App")]
     interface SteadyflowInterface : GLib.Object {
         public abstract void AddFile (string url) throws IOError;
@@ -203,6 +203,7 @@ namespace EDM {
         }
     }
 
+#if HAVE_GTK3
     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
     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-stock.h.orig	2015-08-30 11:56:26 UTC
+++ midori/midori-stock.h
@@ -20,12 +20,12 @@
 #define MIDORI_STOCK_WEB_BROWSER "web-browser"
 #define STOCK_NEWS_FEED          "internet-news-reader"
 #define STOCK_STYLE              "preferences-desktop-theme"
-#define MIDORI_STOCK_TRANSFER    "package"
-#define MIDORI_STOCK_PLUGINS     "application-x-shockwave-flash"
+#define MIDORI_STOCK_TRANSFER    "package-x-generic"
+#define MIDORI_STOCK_PLUGINS     "application-x-addon"
 #define STOCK_BOOKMARK_ADD       "bookmark-new"
 #define STOCK_IMAGE              "image-x-generic"
 #define STOCK_NETWORK_OFFLINE    "network-offline"
-#define STOCK_SCRIPT             "text-x-javascript"
+#define STOCK_SCRIPT             "text-x-script"
 #define STOCK_SEND               "mail-send"
 #define STOCK_TAB_NEW            "tab-new"
 #define STOCK_USER_TRASH         "user-trash"




--- 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




bin/midori
lib/girepository-1.0/Midori-0.6.typelib
etc/xdg/midori/search
%%GIR%%lib/girepository-1.0/Katze-%%VERSION%%.typelib
%%GIR%%lib/girepository-1.0/Midori-%%VERSION%%.typelib
lib/libmidori-core.so
lib/libmidori-core.so.0
lib/libmidori-core.so.0.6
lib/midori/adblock.plugin
lib/midori/bookmarks.plugin
lib/midori/colorful-tabs.plugin
lib/midori/libactivatable.so
lib/midori/libadblock.so
lib/midori/libbookmarks.so
lib/midori/libapps.so
lib/midori/libcolorful-tabs.so
lib/midori/libsession.so
lib/midori/libcookie-permissions.so
lib/midori/libcopy-tabs.so
lib/midori/libdelayed-load.so
lib/midori/libdevpet.so
lib/midori/libdomain-keys.so
lib/midori/libexternal-download-manager.so
lib/midori/libfeed-panel.so
lib/midori/libflummi.so
lib/midori/libformhistory.so
lib/midori/libhistory-list.so
lib/midori/libmouse-gestures.so
lib/midori/libnojs.so
lib/midori/libnotes.so
lib/midori/libnsplugin-manager.so
lib/midori/libopen-with.so
lib/midori/libshortcuts.so
lib/midori/libstatus-clock.so
lib/midori/libstatusbar-features.so
lib/midori/session.plugin
lib/midori/status-clock.plugin
lib/midori/statusbar-features.plugin
lib/midori/libtoolbar-editor.so
lib/midori/libtransfers.so
lib/midori/libwebmedia-now-playing.so
share/appdata/midori.appdata.xml
share/applications/org.midori_browser.Midori.desktop
share/applications/midori.desktop
%%DOCSDIR%%/AUTHORS
%%DOCSDIR%%/COPYING
share/gir-1.0/Midori-0.6.gir
%%DOCSDIR%%/EXPAT
%%DOCSDIR%%/README
%%DOCSDIR%%/faq.css
%%DOCSDIR%%/faq.html
%%GIR%%share/gir-1.0/Katze-%%VERSION%%.gir
%%GIR%%share/gir-1.0/Midori-%%VERSION%%.gir
share/icons/hicolor/16x16/apps/midori.png
share/icons/hicolor/16x16/categories/extension.png
share/icons/hicolor/16x16/status/internet-news-reader.png
share/icons/hicolor/22x22/apps/midori.png
share/icons/hicolor/22x22/categories/extension.png
share/icons/hicolor/22x22/status/internet-news-reader.png
share/icons/hicolor/24x24/status/adblock-blocked.svg
share/icons/hicolor/24x24/status/adblock-disabled.svg
share/icons/hicolor/24x24/status/adblock-enabled.svg
share/icons/hicolor/scalable/apps/midori.svg
share/icons/hicolor/scalable/categories/extension.svg
share/icons/hicolor/scalable/status/internet-news-reader.svg
share/locale/af/LC_MESSAGES/midori.mo
share/locale/am/LC_MESSAGES/midori.mo
share/locale/ar/LC_MESSAGES/midori.mo
share/locale/ast/LC_MESSAGES/midori.mo
share/locale/az/LC_MESSAGES/midori.mo
share/locale/be/LC_MESSAGES/midori.mo
share/locale/bg/LC_MESSAGES/midori.mo
share/locale/bn/LC_MESSAGES/midori.mo

share/locale/sr/LC_MESSAGES/midori.mo
share/locale/sr@latin/LC_MESSAGES/midori.mo
share/locale/sv/LC_MESSAGES/midori.mo
share/locale/szl/LC_MESSAGES/midori.mo
share/locale/ta/LC_MESSAGES/midori.mo
share/locale/te/LC_MESSAGES/midori.mo
share/locale/th/LC_MESSAGES/midori.mo
share/locale/tl/LC_MESSAGES/midori.mo
share/locale/tr/LC_MESSAGES/midori.mo
share/locale/ug/LC_MESSAGES/midori.mo
share/locale/uk/LC_MESSAGES/midori.mo

share/locale/zh_CN/LC_MESSAGES/midori.mo
share/locale/zh_HK/LC_MESSAGES/midori.mo
share/locale/zh_TW/LC_MESSAGES/midori.mo
%%DATADIR%%/res/about.css
%%DATADIR%%/res/adblock.list
%%DATADIR%%/res/adblock/element_hider.js
%%DATADIR%%/res/autosuggestcontrol.css
%%DATADIR%%/res/autosuggestcontrol.js
%%DATADIR%%/res/bookmarks/Create.sql
%%DATADIR%%/res/bookmarks/Import_old_db_bookmarks.sql
%%DATADIR%%/res/error.html
%%DATADIR%%/res/flummi/Create.sql
%%DATADIR%%/res/forms/Create.sql
%%DATADIR%%/res/gtk3.css
%%DATADIR%%/res/history/Create.sql
%%DATADIR%%/res/history/Day.sql
%%DATADIR%%/res/logo-shade.png
%%DATADIR%%/res/nojs/nojs-statusicon-allowed.png
%%DATADIR%%/res/nojs/nojs-statusicon-denied.png
%%DATADIR%%/res/nojs/nojs-statusicon-mixed.png
%%DATADIR%%/res/notes/Create.sql
%%DATADIR%%/res/speeddial-head.html
%%DATADIR%%/res/tabby/Create.sql
%%DATADIR%%/res/tabby/Update1.sql

Return to bug 233958

Lines 1-15 Link Here

(-)files/patch-config__search (-15 lines)
1	--- config/search.orig 2015-08-30 11:56:26 UTC
2	+++ config/search
3	@@ -16,6 +16,12 @@ text=Web Search
4	uri=http://www.google.com/search?q=%s
5	token=g
6
7	+[FreshPorts]
8	+name=FreshPorts
9	+text=The changes made to the FreeBSD ports tree
10	+uri=http://www.freshports.org/search.php?query=%s
11	+token=fp
12	+
13	[Wikipedia]
14	name=Wikipedia
15	text=The free encyclopedia

Lines 1-37 Link Here

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

Lines 1-14 Link Here

(-)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	}

Lines 1-14 Link Here

(-)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

Lines 1-14 Link Here

(-)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 ();

Lines 1-14 Link Here

(-)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));

Lines 1-27 Link Here

(-)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	}

Lines 1-18 Link Here

(-)files/patch-midori__midori-stock.h (-18 lines)
1	--- midori/midori-stock.h.orig 2015-08-30 11:56:26 UTC
2	+++ midori/midori-stock.h
3	@@ -20,12 +20,12 @@
4	#define MIDORI_STOCK_WEB_BROWSER "web-browser"
5	#define STOCK_NEWS_FEED "internet-news-reader"
6	#define STOCK_STYLE "preferences-desktop-theme"
7	-#define MIDORI_STOCK_TRANSFER "package"
8	-#define MIDORI_STOCK_PLUGINS "application-x-shockwave-flash"
9	+#define MIDORI_STOCK_TRANSFER "package-x-generic"
10	+#define MIDORI_STOCK_PLUGINS "application-x-addon"
11	#define STOCK_BOOKMARK_ADD "bookmark-new"
12	#define STOCK_IMAGE "image-x-generic"
13	#define STOCK_NETWORK_OFFLINE "network-offline"
14	-#define STOCK_SCRIPT "text-x-javascript"
15	+#define STOCK_SCRIPT "text-x-script"
16	#define STOCK_SEND "mail-send"
17	#define STOCK_TAB_NEW "tab-new"
18	#define STOCK_USER_TRASH "user-trash"

Lines 1-29 Link Here

(-)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

Lines 1-69 Link Here

(-)pkg-plist (-72 / +17 lines)
1	bin/midori	1	bin/midori
2	etc/xdg/midori/extensions/adblock/config	2	lib/girepository-1.0/Midori-0.6.typelib
3	etc/xdg/midori/search
4	%%GIR%%lib/girepository-1.0/Katze-%%VERSION%%.typelib
5	%%GIR%%lib/girepository-1.0/Midori-%%VERSION%%.typelib
6	lib/libmidori-core.so	3	lib/libmidori-core.so
7	lib/libmidori-core.so.0.0.0	4	lib/libmidori-core.so.0
8	lib/libmidori-core.so.1	5	lib/libmidori-core.so.0.6
9	lib/midori/libabout.so	6	lib/midori/adblock.plugin
		7	lib/midori/bookmarks.plugin
		8	lib/midori/colorful-tabs.plugin
		9	lib/midori/libactivatable.so
10	lib/midori/libadblock.so	10	lib/midori/libadblock.so
11	lib/midori/libaddons.so	11	lib/midori/libbookmarks.so
12	lib/midori/libapps.so
13	lib/midori/libcolorful-tabs.so	12	lib/midori/libcolorful-tabs.so
14	lib/midori/libcookie-manager.so	13	lib/midori/libsession.so
15	lib/midori/libcookie-permissions.so
16	lib/midori/libcopy-tabs.so
17	lib/midori/libdelayed-load.so
18	lib/midori/libdevpet.so
19	lib/midori/libdomain-keys.so
20	lib/midori/libexternal-download-manager.so
21	lib/midori/libfeed-panel.so
22	lib/midori/libflummi.so
23	lib/midori/libformhistory.so
24	lib/midori/libhistory-list.so
25	lib/midori/libmouse-gestures.so
26	lib/midori/libnojs.so
27	lib/midori/libnotes.so
28	lib/midori/libnsplugin-manager.so
29	lib/midori/libopen-with.so
30	lib/midori/libshortcuts.so
31	lib/midori/libstatus-clock.so	14	lib/midori/libstatus-clock.so
32	lib/midori/libstatusbar-features.so	15	lib/midori/libstatusbar-features.so
33	lib/midori/libtab-panel.so	16	lib/midori/session.plugin
34	lib/midori/libtabby.so	17	lib/midori/status-clock.plugin
35	lib/midori/libtabs-minimized.so	18	lib/midori/statusbar-features.plugin
36	lib/midori/libtoolbar-editor.so
37	lib/midori/libtransfers.so
38	lib/midori/libwebmedia-now-playing.so
39	share/appdata/midori.appdata.xml	19	share/appdata/midori.appdata.xml
40	share/applications/midori-private.desktop	20	share/applications/org.midori_browser.Midori.desktop
41	share/applications/midori.desktop
42	%%DOCSDIR%%/AUTHORS
43	%%DOCSDIR%%/COPYING	21	%%DOCSDIR%%/COPYING
44	%%DOCSDIR%%/ChangeLog	22	share/gir-1.0/Midori-0.6.gir
45	%%DOCSDIR%%/EXPAT
46	%%DOCSDIR%%/README
47	%%DOCSDIR%%/faq.css
48	%%DOCSDIR%%/faq.html
49	%%GIR%%share/gir-1.0/Katze-%%VERSION%%.gir
50	%%GIR%%share/gir-1.0/Midori-%%VERSION%%.gir
51	share/icons/hicolor/16x16/apps/midori.png	23	share/icons/hicolor/16x16/apps/midori.png
52	share/icons/hicolor/16x16/categories/extension.png
53	share/icons/hicolor/16x16/status/internet-news-reader.png
54	share/icons/hicolor/22x22/apps/midori.png	24	share/icons/hicolor/22x22/apps/midori.png
55	share/icons/hicolor/22x22/categories/extension.png
56	share/icons/hicolor/22x22/status/internet-news-reader.png
57	share/icons/hicolor/24x24/status/adblock-blocked.svg
58	share/icons/hicolor/24x24/status/adblock-disabled.svg
59	share/icons/hicolor/24x24/status/adblock-enabled.svg
60	share/icons/hicolor/scalable/apps/midori.svg	25	share/icons/hicolor/scalable/apps/midori.svg
61	share/icons/hicolor/scalable/categories/extension.svg
62	share/icons/hicolor/scalable/status/internet-news-reader.svg
63	share/locale/af/LC_MESSAGES/midori.mo	26	share/locale/af/LC_MESSAGES/midori.mo
64	share/locale/am/LC_MESSAGES/midori.mo	27	share/locale/am/LC_MESSAGES/midori.mo
65	share/locale/ar/LC_MESSAGES/midori.mo	28	share/locale/ar/LC_MESSAGES/midori.mo
66	share/locale/ast/LC_MESSAGES/midori.mo	29	share/locale/ast/LC_MESSAGES/midori.mo
		30	share/locale/az/LC_MESSAGES/midori.mo
67	share/locale/be/LC_MESSAGES/midori.mo	31	share/locale/be/LC_MESSAGES/midori.mo
68	share/locale/bg/LC_MESSAGES/midori.mo	32	share/locale/bg/LC_MESSAGES/midori.mo
69	share/locale/bn/LC_MESSAGES/midori.mo	33	share/locale/bn/LC_MESSAGES/midori.mo
Lines 123-131 Link Here
123	share/locale/sr/LC_MESSAGES/midori.mo	87	share/locale/sr/LC_MESSAGES/midori.mo
124	share/locale/sr@latin/LC_MESSAGES/midori.mo	88	share/locale/sr@latin/LC_MESSAGES/midori.mo
125	share/locale/sv/LC_MESSAGES/midori.mo	89	share/locale/sv/LC_MESSAGES/midori.mo
		90	share/locale/szl/LC_MESSAGES/midori.mo
126	share/locale/ta/LC_MESSAGES/midori.mo	91	share/locale/ta/LC_MESSAGES/midori.mo
127	share/locale/te/LC_MESSAGES/midori.mo	92	share/locale/te/LC_MESSAGES/midori.mo
128	share/locale/th/LC_MESSAGES/midori.mo	93	share/locale/th/LC_MESSAGES/midori.mo
		94	share/locale/tl/LC_MESSAGES/midori.mo
129	share/locale/tr/LC_MESSAGES/midori.mo	95	share/locale/tr/LC_MESSAGES/midori.mo
130	share/locale/ug/LC_MESSAGES/midori.mo	96	share/locale/ug/LC_MESSAGES/midori.mo
131	share/locale/uk/LC_MESSAGES/midori.mo	97	share/locale/uk/LC_MESSAGES/midori.mo
Lines 135-158 Link Here
135	share/locale/zh_CN/LC_MESSAGES/midori.mo	101	share/locale/zh_CN/LC_MESSAGES/midori.mo
136	share/locale/zh_HK/LC_MESSAGES/midori.mo	102	share/locale/zh_HK/LC_MESSAGES/midori.mo
137	share/locale/zh_TW/LC_MESSAGES/midori.mo	103	share/locale/zh_TW/LC_MESSAGES/midori.mo
138	%%DATADIR%%/res/about.css
139	%%DATADIR%%/res/adblock.list
140	%%DATADIR%%/res/adblock/element_hider.js
141	%%DATADIR%%/res/autosuggestcontrol.css
142	%%DATADIR%%/res/autosuggestcontrol.js
143	%%DATADIR%%/res/bookmarks/Create.sql
144	%%DATADIR%%/res/bookmarks/Import_old_db_bookmarks.sql
145	%%DATADIR%%/res/error.html
146	%%DATADIR%%/res/flummi/Create.sql
147	%%DATADIR%%/res/forms/Create.sql
148	%%DATADIR%%/res/gtk3.css
149	%%DATADIR%%/res/history/Create.sql
150	%%DATADIR%%/res/history/Day.sql
151	%%DATADIR%%/res/logo-shade.png
152	%%DATADIR%%/res/nojs/nojs-statusicon-allowed.png
153	%%DATADIR%%/res/nojs/nojs-statusicon-denied.png
154	%%DATADIR%%/res/nojs/nojs-statusicon-mixed.png
155	%%DATADIR%%/res/notes/Create.sql
156	%%DATADIR%%/res/speeddial-head.html
157	%%DATADIR%%/res/tabby/Create.sql
158	%%DATADIR%%/res/tabby/Update1.sql