pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
midori: Mostly sync with www/midori
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Sun Nov 11 15:24:13 2018 +0100
Changeset: a302f4c92d2335220b82d70e7f43e5aa2552268f
Modified Files:
midori/Makefile
midori/distinfo
Added Files:
midori/patches/patch-extensions_adblock_widgets.vala
midori/patches/patch-extensions_apps.vala
midori/patches/patch-extensions_external-download-manager.vala
midori/patches/patch-extensions_history-list.vala
midori/patches/patch-extensions_notes.vala
midori/patches/patch-extensions_open-with.vala
midori/patches/patch-extensions_transfers.vala
midori/patches/patch-katze_midori-paths.vala
midori/patches/patch-midori_midori-notebook.vala
Log Message:
midori: Mostly sync with www/midori
Sync wip/midori with www/midori except for HAS_CONFIGURE that seems
to make the kludge to build with webkit-gtk more difficult.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a302f4c92d2335220b82d70e7f43e5aa2552268f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
midori/Makefile | 12 ++--
midori/distinfo | 9 +++
.../patches/patch-extensions_adblock_widgets.vala | 62 +++++++++++++++++
midori/patches/patch-extensions_apps.vala | 51 ++++++++++++++
...patch-extensions_external-download-manager.vala | 17 +++++
midori/patches/patch-extensions_history-list.vala | 26 ++++++++
midori/patches/patch-extensions_notes.vala | 60 +++++++++++++++++
midori/patches/patch-extensions_open-with.vala | 52 +++++++++++++++
midori/patches/patch-extensions_transfers.vala | 78 ++++++++++++++++++++++
midori/patches/patch-katze_midori-paths.vala | 15 +++++
midori/patches/patch-midori_midori-notebook.vala | 33 +++++++++
11 files changed, 410 insertions(+), 5 deletions(-)
diffs:
diff --git a/midori/Makefile b/midori/Makefile
index 21af5cb4e4..defc9e321a 100644
--- a/midori/Makefile
+++ b/midori/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2017/04/22 21:04:02 adam Exp $
+# $NetBSD: Makefile,v 1.111 2018/11/09 09:17:07 abs Exp $
DISTNAME= midori_0.5.11_all_
PKGNAME= ${DISTNAME:S/_all_//:S/_/-/}
-PKGREVISION= 14
+PKGREVISION= 26
CATEGORIES= www
MASTER_SITES= http://midori-browser.org/downloads/
@@ -27,12 +27,16 @@ CHECK_PORTABILITY_SKIP+= win32/makedist/makedist.midori
BUILD_DEPENDS+= librsvg>=2.18:../../graphics/librsvg
-DEPENDS+= gnome-themes-[0-9]*:../../x11/gnome-themes
+DEPENDS+= gnome-themes-standard-[0-9]*:../../graphics/gnome-themes-standard
EGDIR= ${PREFIX}/share/examples/midori
OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/midori
CONF_FILES= ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
+# Otherwise build chokes on .orig files
+pre-configure:
+ ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
+
.include "../../mk/bsd.prefs.mk"
OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
@@ -41,8 +45,6 @@ CONF_FILES+= ${EGDIR}/extensions/adblock/config \
CONFIGURE_ENV= VALAC=${VALAC}
-NOT_PAX_MPROTECT_SAFE+= bin/midori
-
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
diff --git a/midori/distinfo b/midori/distinfo
index bf49b25d66..085e56ee3a 100644
--- a/midori/distinfo
+++ b/midori/distinfo
@@ -6,3 +6,12 @@ SHA512 (midori_0.5.11_all_.tar.bz2) = 237310d1f0bf70796474b9ec5be6755927e66acd2b
Size (midori_0.5.11_all_.tar.bz2) = 1428791 bytes
SHA1 (patch-CMakeLists.txt) = 68d0232b254e4094118b7f029162bf669f096d45
SHA1 (patch-config_CMakeLists.txt) = 5ac4af9f980749659058fb55e7fd25ad6226861f
+SHA1 (patch-extensions_adblock_widgets.vala) = 076a3e9bcc33b20bde4df0ae5f89efd950260087
+SHA1 (patch-extensions_apps.vala) = 77b4e5ed86809446b2d63cbf248fd5a9dddd159f
+SHA1 (patch-extensions_external-download-manager.vala) = 3ccd1a11828849ddc2e6007f52b3549bdb34418f
+SHA1 (patch-extensions_history-list.vala) = e17c5b8ff0bbbaec41b64c813138b564cf555b56
+SHA1 (patch-extensions_notes.vala) = 7869734d57377b713b4e78029fc2d12f3d6e7ab5
+SHA1 (patch-extensions_open-with.vala) = bb07507b64b73ae7c68aedb7e1f704ba00c323d2
+SHA1 (patch-extensions_transfers.vala) = bea6a7789cbda64f8a950360e87b2a256e70d83d
+SHA1 (patch-katze_midori-paths.vala) = f304804f39fc47d5c5591c9712a4b98ace3e1b26
+SHA1 (patch-midori_midori-notebook.vala) = c117d382af224af05241daaa7ccf991e702098a0
diff --git a/midori/patches/patch-extensions_adblock_widgets.vala b/midori/patches/patch-extensions_adblock_widgets.vala
new file mode 100644
index 0000000000..26405ffd4d
--- /dev/null
+++ b/midori/patches/patch-extensions_adblock_widgets.vala
@@ -0,0 +1,62 @@
+$NetBSD: patch-extensions_adblock_widgets.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- extensions/adblock/widgets.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ extensions/adblock/widgets.vala
+@@ -27,7 +27,7 @@ namespace Adblock {
+ this.debug_element_toggled = false;
+
+ var item = new Midori.ContextAction ("Preferences",
+- _("Preferences"), null, Gtk.STOCK_PREFERENCES);
++ _("Preferences"), null, Gtk.Stock.PREFERENCES);
+ item.activate.connect (() => {
+ manager.add_subscription (null);
+ });
+@@ -99,12 +99,12 @@ namespace Adblock {
+ Gtk.DialogFlags.NO_SEPARATOR |
+ #endif
+ Gtk.DialogFlags.DESTROY_WITH_PARENT,
+- Gtk.STOCK_HELP, Gtk.ResponseType.HELP,
+- Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE);
++ Gtk.Stock.HELP, Gtk.ResponseType.HELP,
++ Gtk.Stock.CLOSE, Gtk.ResponseType.CLOSE);
+ #if HAVE_GTK3
+ dialog.get_widget_for_response (Gtk.ResponseType.HELP).get_style_context ().add_class ("help_button");
+ #endif
+- dialog.set_icon_name (Gtk.STOCK_PROPERTIES);
++ dialog.set_icon_name (Gtk.Stock.PROPERTIES);
+ dialog.set_response_sensitive (Gtk.ResponseType.HELP, false);
+
+ var hbox = new Gtk.HBox (false, 0);
+@@ -211,7 +211,7 @@ namespace Adblock {
+ Subscription sub;
+ liststore.get (iter, 0, out sub);
+
+- renderer.set ("stock-id", sub.mutable ? Gtk.STOCK_DELETE : null,
++ renderer.set ("stock-id", sub.mutable ? Gtk.Stock.DELETE : null,
+ "stock-size", Gtk.IconSize.MENU);
+ }
+
+@@ -227,7 +227,7 @@ namespace Adblock {
+ liststore.get (iter, 0, out sub);
+ if (sub.mutable) {
+ config.remove (sub);
+- liststore.remove (iter);
++ liststore.remove (ref iter);
+ return true;
+ }
+ }
+@@ -258,9 +258,9 @@ namespace Adblock {
+ Gtk.DialogFlags.NO_SEPARATOR |
+ #endif
+ Gtk.DialogFlags.DESTROY_WITH_PARENT,
+- Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+- Gtk.STOCK_ADD, Gtk.ResponseType.ACCEPT);
+- dialog.set_icon_name (Gtk.STOCK_ADD);
++ Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
++ Gtk.Stock.ADD, Gtk.ResponseType.ACCEPT);
++ dialog.set_icon_name (Gtk.Stock.ADD);
+ dialog.resizable = false;
+
+ var hbox = new Gtk.HBox (false, 8);
diff --git a/midori/patches/patch-extensions_apps.vala b/midori/patches/patch-extensions_apps.vala
new file mode 100644
index 0000000000..66d30894fa
--- /dev/null
+++ b/midori/patches/patch-extensions_apps.vala
@@ -0,0 +1,51 @@
+$NetBSD: patch-extensions_apps.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- extensions/apps.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ extensions/apps.vala
+@@ -98,7 +98,7 @@ namespace Apps {
+ }
+
+ internal static async File create_profile (Gtk.Widget? proxy) {
+- string uuid = g_dbus_generate_guid ();
++ string uuid = DBus.generate_guid ();
+ string config = Path.build_path (Path.DIR_SEPARATOR_S,
+ Midori.Paths.get_user_data_dir (), PACKAGE_NAME, "profiles", uuid);
+ var folder = get_profile_folder ();
+@@ -207,7 +207,7 @@ namespace Apps {
+
+ #if !HAVE_WIN32
+ /* FIXME: Profiles are broken on win32 because of no multi instance support */
+- var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
++ var profile = new Gtk.ToolButton.from_stock (Gtk.Stock.ADD);
+ profile.label = _("New _Profile");
+ profile.tooltip_text = _("Creates a new, independent profile and a launcher");
+ profile.use_underline = true;
+@@ -219,7 +219,7 @@ namespace Apps {
+ toolbar.insert (profile, -1);
+ #endif
+
+- var app = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
++ var app = new Gtk.ToolButton.from_stock (Gtk.Stock.ADD);
+ app.label = _("New _App");
+ app.tooltip_text = _("Creates a new app for a specific site");
+ app.use_underline = true;
+@@ -265,7 +265,7 @@ namespace Apps {
+ store.get (iter, 0, out launcher);
+ try {
+ launcher.file.trash (null);
+- store.remove (iter);
++ store.remove (ref iter);
+
+ string filename = Midori.Download.clean_filename (launcher.name);
+ #if HAVE_WIN32
+@@ -385,7 +385,7 @@ namespace Apps {
+ void on_render_button (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+ Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+- renderer.set ("stock-id", Gtk.STOCK_DELETE,
++ renderer.set ("stock-id", Gtk.Stock.DELETE,
+ "stock-size", Gtk.IconSize.MENU);
+ }
+ }
diff --git a/midori/patches/patch-extensions_external-download-manager.vala b/midori/patches/patch-extensions_external-download-manager.vala
new file mode 100644
index 0000000000..ac7d80f7dc
--- /dev/null
+++ b/midori/patches/patch-extensions_external-download-manager.vala
@@ -0,0 +1,17 @@
+$NetBSD: patch-extensions_external-download-manager.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- extensions/external-download-manager.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ extensions/external-download-manager.vala
+@@ -280,8 +280,8 @@ namespace EDM {
+ this.vbox.pack_start (this.input, false, true, 0);
+ #endif
+
+- this.add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+- this.add_button (Gtk.STOCK_APPLY, Gtk.ResponseType.APPLY);
++ this.add_button (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
++ this.add_button (Gtk.Stock.APPLY, Gtk.ResponseType.APPLY);
+
+ this.show_all ();
+ }
diff --git a/midori/patches/patch-extensions_history-list.vala b/midori/patches/patch-extensions_history-list.vala
new file mode 100644
index 0000000000..7fd74bd566
--- /dev/null
+++ b/midori/patches/patch-extensions_history-list.vala
@@ -0,0 +1,26 @@
+$NetBSD: patch-extensions_history-list.vala,v 1.3 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- extensions/history-list.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ extensions/history-list.vala
+@@ -223,7 +223,7 @@ 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
+ */
+- model.remove (iter);
++ model.remove (ref iter);
+ this.browser.close_tab (view);
+ if (length > 2)
+ this.resize_treeview ();
+@@ -365,8 +365,8 @@ namespace HistoryList {
+ this.vbox.pack_start (table, false, true, 0);
+ #endif
+
+- this.add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
+- this.add_button (Gtk.STOCK_APPLY, Gtk.ResponseType.APPLY);
++ this.add_button (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
++ this.add_button (Gtk.Stock.APPLY, Gtk.ResponseType.APPLY);
+
+ this.show_all ();
+ }
diff --git a/midori/patches/patch-extensions_notes.vala b/midori/patches/patch-extensions_notes.vala
new file mode 100644
index 0000000000..1d78de17dd
--- /dev/null
+++ b/midori/patches/patch-extensions_notes.vala
@@ -0,0 +1,60 @@
+$NetBSD: patch-extensions_notes.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- extensions/notes.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ extensions/notes.vala
+@@ -116,7 +116,7 @@ namespace ClipNotes {
+ if (current_note == note) {
+ current_note = null;
+ }
+- notes_list_store.remove (iter);
++ notes_list_store.remove (ref iter);
+ break;
+ }
+ } while (notes_list_store.iter_next (ref iter));
+@@ -131,7 +131,7 @@ namespace ClipNotes {
+ Gtk.TextView note_text_view = new Gtk.TextView ();
+
+ public unowned string get_stock_id () {
+- return Gtk.STOCK_EDIT;
++ return Gtk.Stock.EDIT;
+ }
+
+ public unowned string get_label () {
+@@ -141,7 +141,7 @@ namespace ClipNotes {
+ public Gtk.Widget get_toolbar () {
+ if (toolbar == null) {
+ toolbar = new Gtk.Toolbar ();
+- var new_note_button = new Gtk.ToolButton.from_stock (Gtk.STOCK_EDIT);
++ var new_note_button = new Gtk.ToolButton.from_stock (Gtk.Stock.EDIT);
+ new_note_button.label = _("New Note");
+ new_note_button.tooltip_text = _("Creates a new empty note, unrelated to opened pages");
+ new_note_button.use_underline = true;
+@@ -337,7 +337,7 @@ namespace ClipNotes {
+ var menu = new Gtk.Menu ();
+
+ var menuitem = new Gtk.ImageMenuItem.with_label (_("Rename note"));
+- var image = new Gtk.Image.from_stock (Gtk.STOCK_EDIT, Gtk.IconSize.MENU);
++ var image = new Gtk.Image.from_stock (Gtk.Stock.EDIT, Gtk.IconSize.MENU);
+ menuitem.always_show_image = true;
+ menuitem.set_image (image);
+ menuitem.activate.connect (() => {
+@@ -348,7 +348,7 @@ namespace ClipNotes {
+
+
+ menuitem = new Gtk.ImageMenuItem.with_label (_("Copy note to clipboard"));
+- image = new Gtk.Image.from_stock (Gtk.STOCK_COPY, Gtk.IconSize.MENU);
++ image = new Gtk.Image.from_stock (Gtk.Stock.COPY, Gtk.IconSize.MENU);
+ menuitem.always_show_image = true;
+ menuitem.set_image (image);
+ menuitem.activate.connect (() => {
+@@ -358,7 +358,7 @@ namespace ClipNotes {
+
+
+ menuitem = new Gtk.ImageMenuItem.with_label (_("Remove note"));
+- image = new Gtk.Image.from_stock (Gtk.STOCK_DELETE, Gtk.IconSize.MENU);
++ image = new Gtk.Image.from_stock (Gtk.Stock.DELETE, Gtk.IconSize.MENU);
+ menuitem.always_show_image = true;
+ menuitem.set_image (image);
+ menuitem.activate.connect (() => {
diff --git a/midori/patches/patch-extensions_open-with.vala b/midori/patches/patch-extensions_open-with.vala
new file mode 100644
index 0000000000..6efd0c9cde
--- /dev/null
+++ b/midori/patches/patch-extensions_open-with.vala
@@ -0,0 +1,52 @@
+$NetBSD: patch-extensions_open-with.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- extensions/open-with.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ extensions/open-with.vala
+@@ -161,10 +161,10 @@ namespace ExternalApplications {
+ has_separator = false;
+ #endif
+ destroy_with_parent = true;
+- set_icon_name (Gtk.STOCK_OPEN);
++ set_icon_name (Gtk.Stock.OPEN);
+ resizable = false;
+- add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+- Gtk.STOCK_SAVE, Gtk.ResponseType.ACCEPT);
++ add_buttons (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
++ Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT);
+
+ var vbox = new Gtk.VBox (false, 8);
+ vbox.border_width = 8;
+@@ -266,7 +266,7 @@ namespace ExternalApplications {
+
+ var menu = new Gtk.Menu ();
+ var menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Custom…"));
+- menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_EDIT, Gtk.IconSize.MENU);
++ menuitem.image = new Gtk.Image.from_stock (Gtk.Stock.EDIT, Gtk.IconSize.MENU);
+ menuitem.activate.connect (() => {
+ customize_app_info (app_info, content_type, uri);
+ });
+@@ -374,10 +374,10 @@ namespace ExternalApplications {
+ has_separator = false;
+ #endif
+ destroy_with_parent = true;
+- set_icon_name (Gtk.STOCK_OPEN);
++ set_icon_name (Gtk.Stock.OPEN);
+ resizable = true;
+- add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+- Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT);
++ add_buttons (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
++ Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT);
+
+ var vbox = new Gtk.VBox (false, 8);
+ vbox.border_width = 8;
+@@ -740,7 +740,7 @@ namespace ExternalApplications {
+
+ void show_preferences (Katze.Preferences preferences) {
+ var settings = get_app ().settings;
+- var category = preferences.add_category (_("File Types"), Gtk.STOCK_FILE);
++ var category = preferences.add_category (_("File Types"), Gtk.Stock.FILE);
+ preferences.add_group (null);
+
+ var sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
diff --git a/midori/patches/patch-extensions_transfers.vala b/midori/patches/patch-extensions_transfers.vala
new file mode 100644
index 0000000000..ceb6ca86ff
--- /dev/null
+++ b/midori/patches/patch-extensions_transfers.vala
@@ -0,0 +1,78 @@
+$NetBSD: patch-extensions_transfers.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- extensions/transfers.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ extensions/transfers.vala
+@@ -119,7 +119,7 @@ namespace Transfers {
+ separator.draw = false;
+ separator.set_expand (true);
+ toolbar.insert (separator, -1);
+- clear = new Gtk.ToolButton.from_stock (Gtk.STOCK_CLEAR);
++ clear = new Gtk.ToolButton.from_stock (Gtk.Stock.CLEAR);
+ clear.label = _("Clear All");
+ clear.is_important = true;
+ clear.clicked.connect (clear_clicked);
+@@ -213,7 +213,7 @@ namespace Transfers {
+ store.get (iter, 0, out transfer);
+
+ var menu = new Gtk.Menu ();
+- var menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_OPEN, null);
++ var menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.OPEN, null);
+ menuitem.activate.connect (() => {
+ try {
+ Midori.Download.open (transfer.download, treeview);
+@@ -224,7 +224,7 @@ namespace Transfers {
+ menuitem.sensitive = transfer.succeeded;
+ menu.append (menuitem);
+ menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Open Destination _Folder"));
+- menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_DIRECTORY, Gtk.IconSize.MENU);
++ menuitem.image = new Gtk.Image.from_stock (Gtk.Stock.DIRECTORY, Gtk.IconSize.MENU);
+ menuitem.activate.connect (() => {
+ var folder = GLib.File.new_for_uri (transfer.destination);
+ (Midori.Browser.get_for_widget (this).tab as Midori.Tab).open_uri (folder.get_parent ().get_uri ());
+@@ -236,7 +236,7 @@ namespace Transfers {
+ get_clipboard (Gdk.SELECTION_PRIMARY).set_text (uri, -1);
+ get_clipboard (Gdk.SELECTION_CLIPBOARD).set_text (uri, -1);
+ });
+- menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_COPY, Gtk.IconSize.MENU);
++ menuitem.image = new Gtk.Image.from_stock (Gtk.Stock.COPY, Gtk.IconSize.MENU);
+ menu.append (menuitem);
+ menu.show_all ();
+ Katze.widget_popup (treeview, menu, null, Katze.MenuPos.CURSOR);
+@@ -275,7 +275,7 @@ namespace Transfers {
+ Transfer found;
+ store.get (iter, 0, out found);
+ if (transfer == found) {
+- store.remove (iter);
++ store.remove (ref iter);
+ break;
+ }
+ } while (store.iter_next (ref iter));
+@@ -394,7 +394,7 @@ namespace Transfers {
+ set_style (Gtk.ToolbarStyle.BOTH_HORIZ);
+ show_arrow = false;
+
+- clear = new Gtk.ToolButton.from_stock (Gtk.STOCK_CLEAR);
++ clear = new Gtk.ToolButton.from_stock (Gtk.Stock.CLEAR);
+ clear.label = _("Clear All");
+ clear.is_important = true;
+ clear.clicked.connect (clear_clicked);
+@@ -455,7 +455,7 @@ 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 ());
++ msg = _("'<b>%s</b>' and %u other files have been downloaded.").printf (filename, notifications.length ());
+ get_app ().send_notification (_("Transfer completed"), msg);
+ notifications = new GLib.List<string> ();
+ }
+@@ -514,7 +514,7 @@ namespace Transfers {
+ "%s",
+ _("Some files are being downloaded"));
+ dialog.title = _("Some files are being downloaded");
+- dialog.add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
++ dialog.add_buttons (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
+ _("_Quit Midori"), Gtk.ResponseType.ACCEPT);
+ dialog.format_secondary_text (
+ _("The transfers will be cancelled if Midori quits."));
diff --git a/midori/patches/patch-katze_midori-paths.vala b/midori/patches/patch-katze_midori-paths.vala
new file mode 100644
index 0000000000..c32ed6d569
--- /dev/null
+++ b/midori/patches/patch-katze_midori-paths.vala
@@ -0,0 +1,15 @@
+$NetBSD: patch-katze_midori-paths.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- katze/midori-paths.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ katze/midori-paths.vala
+@@ -485,7 +485,7 @@ namespace Midori {
+ return pixbuf;
+ #endif
+ if (widget != null)
+- return widget.render_icon (Gtk.STOCK_FILE, Gtk.IconSize.MENU, null);
++ return widget.render_icon (Gtk.Stock.FILE, Gtk.IconSize.MENU, null);
+ return null;
+ }
+ }
diff --git a/midori/patches/patch-midori_midori-notebook.vala b/midori/patches/patch-midori_midori-notebook.vala
new file mode 100644
index 0000000000..929e77e4d4
--- /dev/null
+++ b/midori/patches/patch-midori_midori-notebook.vala
@@ -0,0 +1,33 @@
+$NetBSD: patch-midori_midori-notebook.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
+
+Update to build against vala-0.42.0
+
+--- midori/midori-notebook.vala.orig 2015-08-30 11:56:26.000000000 +0000
++++ 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);
+@@ -393,7 +393,7 @@ namespace Midori {
+ child.destroy ();
+ });
+ menu.add (action_other);
+- var action_close = new Midori.ContextAction ("TabClose", null, null, Gtk.STOCK_CLOSE);
++ var action_close = new Midori.ContextAction ("TabClose", null, null, Gtk.Stock.CLOSE);
+ action_close.activate.connect (()=>{
+ tab.destroy ();
+ });
Home |
Main Index |
Thread Index |
Old Index