pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/midori Update midori to build against vala 0.42



details:   https://anonhg.NetBSD.org/pkgsrc/rev/56594464fa7d
branches:  trunk
changeset: 314798:56594464fa7d
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Nov 09 09:17:07 2018 +0000

description:
Update midori to build against vala 0.42

Also switch from gnome-themes to the newer gnome-themes-standard to avoid
conflicts with other gnome-themes-standard using packages

diffstat:

 www/midori/Makefile                                                |  10 +-
 www/midori/distinfo                                                |  11 +-
 www/midori/patches/patch-extensions_adblock_widgets.vala           |  62 +++++++
 www/midori/patches/patch-extensions_apps.vala                      |  51 ++++++
 www/midori/patches/patch-extensions_external-download-manager.vala |  17 ++
 www/midori/patches/patch-extensions_history-list.vala              |  26 +++
 www/midori/patches/patch-extensions_notes.vala                     |  60 +++++++
 www/midori/patches/patch-extensions_open-with.vala                 |  52 ++++++
 www/midori/patches/patch-extensions_transfers.vala                 |  78 ++++++++++
 www/midori/patches/patch-katze_midori-paths.vala                   |  15 +
 www/midori/patches/patch-midori_midori-notebook.vala               |  33 ++++
 11 files changed, 411 insertions(+), 4 deletions(-)

diffs (truncated from 484 to 300 lines):

diff -r 989a4927229c -r 56594464fa7d www/midori/Makefile
--- a/www/midori/Makefile       Fri Nov 09 07:03:37 2018 +0000
+++ b/www/midori/Makefile       Fri Nov 09 09:17:07 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2018/10/24 21:11:56 leot 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=   25
+PKGREVISION=   26
 CATEGORIES=    www
 MASTER_SITES=  http://midori-browser.org/downloads/
 
@@ -28,12 +28,16 @@
 
 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
diff -r 989a4927229c -r 56594464fa7d www/midori/distinfo
--- a/www/midori/distinfo       Fri Nov 09 07:03:37 2018 +0000
+++ b/www/midori/distinfo       Fri Nov 09 09:17:07 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2015/10/25 13:50:22 jmcneill Exp $
+$NetBSD: distinfo,v 1.26 2018/11/09 09:17:07 abs Exp $
 
 SHA1 (midori_0.5.11_all_.tar.bz2) = 64c86935028feb5f89d799c2acacaad67764da6f
 RMD160 (midori_0.5.11_all_.tar.bz2) = 66aaf624d39fbb86c1bec42972fba7998965ef50
@@ -6,3 +6,12 @@
 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 -r 989a4927229c -r 56594464fa7d www/midori/patches/patch-extensions_adblock_widgets.vala
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/midori/patches/patch-extensions_adblock_widgets.vala  Fri Nov 09 09:17:07 2018 +0000
@@ -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 -r 989a4927229c -r 56594464fa7d www/midori/patches/patch-extensions_apps.vala
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/midori/patches/patch-extensions_apps.vala     Fri Nov 09 09:17:07 2018 +0000
@@ -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 -r 989a4927229c -r 56594464fa7d www/midori/patches/patch-extensions_external-download-manager.vala
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/midori/patches/patch-extensions_external-download-manager.vala        Fri Nov 09 09:17:07 2018 +0000
@@ -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 -r 989a4927229c -r 56594464fa7d www/midori/patches/patch-extensions_history-list.vala
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/midori/patches/patch-extensions_history-list.vala     Fri Nov 09 09:17:07 2018 +0000
@@ -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 -r 989a4927229c -r 56594464fa7d www/midori/patches/patch-extensions_notes.vala
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/midori/patches/patch-extensions_notes.vala    Fri Nov 09 09:17:07 2018 +0000
@@ -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 -r 989a4927229c -r 56594464fa7d www/midori/patches/patch-extensions_open-with.vala
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/midori/patches/patch-extensions_open-with.vala        Fri Nov 09 09:17:07 2018 +0000
@@ -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



Home | Main Index | Thread Index | Old Index