[Midnightbsd-cvs] mports [24413] trunk/www/midori: add patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Sep 30 16:13:56 EDT 2018
Revision: 24413
http://svnweb.midnightbsd.org/mports/?rev=24413
Author: laffer1
Date: 2018-09-30 16:13:55 -0400 (Sun, 30 Sep 2018)
Log Message:
-----------
add patchset
Modified Paths:
--------------
trunk/www/midori/Makefile
trunk/www/midori/files/patch-config__search
trunk/www/midori/files/patch-extensions__external-download-manager.vala
Added Paths:
-----------
trunk/www/midori/files/patch-extensions_adblock_widgets.vala
trunk/www/midori/files/patch-extensions_apps.vala
trunk/www/midori/files/patch-extensions_history-list.vala
trunk/www/midori/files/patch-extensions_notes.vala
trunk/www/midori/files/patch-extensions_transfers.vala
trunk/www/midori/files/patch-midori_midori-notebook.vala
Modified: trunk/www/midori/Makefile
===================================================================
--- trunk/www/midori/Makefile 2018-09-30 20:10:50 UTC (rev 24412)
+++ trunk/www/midori/Makefile 2018-09-30 20:13:55 UTC (rev 24413)
@@ -13,67 +13,43 @@
LICENSE= lgpl2.1 mit
LICENSE_COMB= multi
-BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
- valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \
- libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
- libgcr-3.so:${PORTSDIR}/security/gcr
-RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS= rsvg-convert:graphics/librsvg2 \
+ valac:lang/vala
+LIB_DEPENDS= libnotify.so:devel/libnotify \
+ libsoup-gnome-2.4.so:devel/libsoup-gnome \
+ libgcr-3.so:security/gcr
+RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -Wno-return-type
CMAKE_ARGS= -DUSE_APIDOCS:BOOL=OFF \
- -DUSE_GRANITE:BOOL=OFF
+ -DUSE_GRANITE:BOOL=OFF
+USES= cmake desktop-file-utils gettext localbase:ldflags pkgconfig \
+ sqlite tar:bzip2
USE_GNOME= glib20 intltool libxml2
USE_XORG= xscrnsaver
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-USES= desktop-file-utils pkgconfig cmake gettext tar:bzip2
-USE_SQLITE= yes
PLIST_SUB= VERSION="${PORTVERSION:R}"
-OPTIONS_DEFINE= GIR ZEITGEIST
-OPTIONS_SINGLE= GTK
-OPTIONS_SINGLE_GTK= GTK2 GTK3
-OPTIONS_DEFAULT= GTK2
-GIR_DESC= GObject Introspection
+OPTIONS_DEFINE= GIR GTK3 ZEITGEIST
+OPTIONS_SUB= yes
+GIR_PREVENTS= GTK3
+GIR_USE= gnome=introspection:build
+GIR_CMAKE_ON= -DUSE_GIR:BOOL=ON
+GTK3_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3
+GTK3_USE= gnome=gtk30
+GTK3_CMAKE_ON= -DUSE_GTK3:BOOL=ON \
+ -DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF
+GTK3_LIB_DEPENDS_OFF= libwebkitgtk-1.0.so:www/webkit-gtk2
+GTK3_USE_OFF= gnome=gtk20
+GTK3_CMAKE_OFF= -DUSE_GTK3:BOOL=OFF
+ZEITGEIST_LIB_DEPENDS= libzeitgeist-2.0.so:sysutils/zeitgeist
+ZEITGEIST_CMAKE_OFF= -DUSE_ZEITGEIST:BOOL=OFF
+GIR_DESC= Install GObject Introspection Reference manual
ZEITGEIST_DESC= User logs activities
-.include <bsd.mport.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-USE_GNOME+= gtk20
-CMAKE_ARGS+= -DUSE_GTK3:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-LIB_DEPENDS+= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
-USE_GNOME+= gtk30
-CMAKE_ARGS+= -DUSE_GTK3:BOOL=ON \
- -DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MZEITGEIST}
-BROKEN= Doesn't build with zeitgeist >= 0.9.0
-LIB_DEPENDS+= libzeitgeist-1.0.so:${PORTSDIR}/sysutils/libzeitgeist
-CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=ON
-.else
-CMAKE_ARGS+= -DUSE_ZEITGEIST:BOOL=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGIR} && ${PORT_OPTIONS:MGTK2}
-USE_GNOME+= introspection:build
-CMAKE_ARGS+= -DUSE_GIR:BOOL=ON
-PLIST_SUB+= GIR=""
-.else
-CMAKE_ARGS+= -DUSE_GIR:BOOL=OFF
-PLIST_SUB+= GIR="@comment "
-.endif
-
post-patch:
# Avoid errors with CMake
.for dir in config extensions
Modified: trunk/www/midori/files/patch-config__search
===================================================================
--- trunk/www/midori/files/patch-config__search 2018-09-30 20:10:50 UTC (rev 24412)
+++ trunk/www/midori/files/patch-config__search 2018-09-30 20:13:55 UTC (rev 24413)
@@ -1,6 +1,6 @@
---- ./config/search.orig 2013-11-20 01:26:52.000000000 +0000
-+++ ./config/search 2013-11-20 18:03:47.000000000 +0000
-@@ -16,6 +16,12 @@
+--- 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
Modified: trunk/www/midori/files/patch-extensions__external-download-manager.vala
===================================================================
--- trunk/www/midori/files/patch-extensions__external-download-manager.vala 2018-09-30 20:10:50 UTC (rev 24412)
+++ trunk/www/midori/files/patch-extensions__external-download-manager.vala 2018-09-30 20:13:55 UTC (rev 24413)
@@ -1,7 +1,7 @@
---- ./extensions/external-download-manager.vala.orig 2013-03-07 17:44:14.000000000 +0000
-+++ ./extensions/external-download-manager.vala 2013-03-11 06:50:27.000000000 +0000
-@@ -16,7 +16,7 @@
- using WebKit;
+--- 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
@@ -9,7 +9,7 @@
[DBus (name = "net.launchpad.steadyflow.App")]
interface SteadyflowInterface : GLib.Object {
public abstract void AddFile (string url) throws IOError;
-@@ -183,6 +183,7 @@
+@@ -203,6 +203,7 @@ namespace EDM {
}
}
@@ -17,7 +17,7 @@
private class SteadyFlow : ExternalDownloadManager {
public override bool download (DownloadRequest dlReq) {
try {
-@@ -210,6 +211,7 @@
+@@ -230,6 +231,7 @@ namespace EDM {
}
}
#endif
@@ -24,15 +24,14 @@
+#endif
private class CommandLinePreferences : Gtk.Dialog {
- protected Entry input;
-@@ -339,8 +341,10 @@
+ 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;
- }
Added: trunk/www/midori/files/patch-extensions_adblock_widgets.vala
===================================================================
--- trunk/www/midori/files/patch-extensions_adblock_widgets.vala (rev 0)
+++ trunk/www/midori/files/patch-extensions_adblock_widgets.vala 2018-09-30 20:13:55 UTC (rev 24413)
@@ -0,0 +1,14 @@
+--- 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;
+ }
+ }
Property changes on: trunk/www/midori/files/patch-extensions_adblock_widgets.vala
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/midori/files/patch-extensions_apps.vala
===================================================================
--- trunk/www/midori/files/patch-extensions_apps.vala (rev 0)
+++ trunk/www/midori/files/patch-extensions_apps.vala 2018-09-30 20:13:55 UTC (rev 24413)
@@ -0,0 +1,14 @@
+--- 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
Property changes on: trunk/www/midori/files/patch-extensions_apps.vala
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/midori/files/patch-extensions_history-list.vala
===================================================================
--- trunk/www/midori/files/patch-extensions_history-list.vala (rev 0)
+++ trunk/www/midori/files/patch-extensions_history-list.vala 2018-09-30 20:13:55 UTC (rev 24413)
@@ -0,0 +1,14 @@
+--- 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 ();
Property changes on: trunk/www/midori/files/patch-extensions_history-list.vala
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/midori/files/patch-extensions_notes.vala
===================================================================
--- trunk/www/midori/files/patch-extensions_notes.vala (rev 0)
+++ trunk/www/midori/files/patch-extensions_notes.vala 2018-09-30 20:13:55 UTC (rev 24413)
@@ -0,0 +1,14 @@
+--- 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));
Property changes on: trunk/www/midori/files/patch-extensions_notes.vala
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/midori/files/patch-extensions_transfers.vala
===================================================================
--- trunk/www/midori/files/patch-extensions_transfers.vala (rev 0)
+++ trunk/www/midori/files/patch-extensions_transfers.vala 2018-09-30 20:13:55 UTC (rev 24413)
@@ -0,0 +1,27 @@
+--- 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> ();
+ }
Property changes on: trunk/www/midori/files/patch-extensions_transfers.vala
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/midori/files/patch-midori_midori-notebook.vala
===================================================================
--- trunk/www/midori/files/patch-midori_midori-notebook.vala (rev 0)
+++ trunk/www/midori/files/patch-midori_midori-notebook.vala 2018-09-30 20:13:55 UTC (rev 24413)
@@ -0,0 +1,29 @@
+--- 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
Property changes on: trunk/www/midori/files/patch-midori_midori-notebook.vala
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list