[136319] trunk/dports/www/midori
devans at macports.org
devans at macports.org
Thu May 14 15:06:59 PDT 2015
Revision: 136319
https://trac.macports.org/changeset/136319
Author: devans at macports.org
Date: 2015-05-14 15:06:59 -0700 (Thu, 14 May 2015)
Log Message:
-----------
midori: update to version 0.5.10, dependencies, apply upstream patches for gtk 2.22+ and zeitgeist 2.0, drop unnecessary +quartz variant (no longer uses libnotify), add post-activate processing to register desktop file and hicolor icons.
Modified Paths:
--------------
trunk/dports/www/midori/Portfile
Added Paths:
-----------
trunk/dports/www/midori/files/
trunk/dports/www/midori/files/patch-gtk2.22-bzr6943.diff
trunk/dports/www/midori/files/patch-midori-midori-privatedata.c.diff
trunk/dports/www/midori/files/patch-zeitgeist-2.0-bzr6945.diff
Modified: trunk/dports/www/midori/Portfile
===================================================================
--- trunk/dports/www/midori/Portfile 2015-05-14 19:18:42 UTC (rev 136318)
+++ trunk/dports/www/midori/Portfile 2015-05-14 22:06:59 UTC (rev 136319)
@@ -4,7 +4,7 @@
PortSystem 1.0
name midori
-version 0.5.6
+version 0.5.10
categories www
platforms darwin
@@ -16,36 +16,47 @@
homepage http://midori-browser.org
master_sites http://midori-browser.org/downloads
-use_bzip2 yes
+use_bzip2 yes
distname midori_${version}_all_
worksrcdir midori-${version}
+extract.mkdir yes
-checksums sha1 951d68d26c0d7691eea5fbf3b29404d47f0a0504 \
- rmd160 874c3bab803f5c69ee92abbd53d77ff5d0b9fe92 \
- sha256 c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a
+checksums rmd160 9aff6f7bb4e373594300bd5d75f81f1be727e74b \
+ sha256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f
depends_build port:cmake \
port:pkgconfig \
port:intltool
-# glib 2.16.5 or later is required:
depends_lib port:gtk2 \
path:include/gio/gio.h:glib2 \
- path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
+ port:gcr \
port:librsvg \
+ port:libsoup \
port:libxml2 \
- port:libunique \
- port:libnotify \
+ port:sqlite3 \
+ port:vala \
port:xorg-libXScrnSaver \
- port:vala
+ port:zeitgeist
+if {${configure.cxx_stdlib} eq "libstdc++"} {
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
+} else {
+ depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
+}
+
+# apply post-release upstream patches
+# avoiding gtk 2.22 deprecated API (http://bazaar.launchpad.net/~midori/midori/trunk/revision/6943)
+# zeitgeist 2.0 compatibility (http://bazaar.launchpad.net/~midori/midori/trunk/revision/6945)
+
+patchfiles patch-gtk2.22-bzr6943.diff \
+ patch-zeitgeist-2.0-bzr6945.diff \
+ patch-midori-midori-privatedata.c.diff
+
# Not autoconf
configure.universal_args-delete --disable-dependency-tracking
-# Needs zeitgeist-1.0, but we have zeitgeist-2.0 ... check a later version
-configure.args-append --disable-zeitgeist
-
platform darwin {
if {${configure.cxx_stdlib} eq "libstdc++"} {
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
@@ -63,9 +74,9 @@
}
}
-variant quartz description {Disable libnotify support (doesn't work with gtk2+quartz)} {
- depends_lib-delete port:libnotify
- configure.args-append --disable-libnotify
+post-activate {
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
}
livecheck.url ${homepage}/download/source/
Added: trunk/dports/www/midori/files/patch-gtk2.22-bzr6943.diff
===================================================================
--- trunk/dports/www/midori/files/patch-gtk2.22-bzr6943.diff (rev 0)
+++ trunk/dports/www/midori/files/patch-gtk2.22-bzr6943.diff 2015-05-14 22:06:59 UTC (rev 136319)
@@ -0,0 +1,13 @@
+=== modified file 'katze/katze-preferences.c'
+--- katze/katze-preferences.c 2014-05-20 02:15:05 +0000
++++ katze/katze-preferences.c 2015-04-19 14:40:59 +0000
+@@ -67,7 +67,7 @@
+ g_object_set (preferences,
+ "icon-name", GTK_STOCK_PREFERENCES,
+ "title", dialog_title,
+-#if !GTK_CHECK_VERSION (3, 0, 0)
++#if !GTK_CHECK_VERSION (2, 22, 0)
+ "has-separator", FALSE,
+ #endif
+ NULL);
+
Added: trunk/dports/www/midori/files/patch-midori-midori-privatedata.c.diff
===================================================================
--- trunk/dports/www/midori/files/patch-midori-midori-privatedata.c.diff (rev 0)
+++ trunk/dports/www/midori/files/patch-midori-midori-privatedata.c.diff 2015-05-14 22:06:59 UTC (rev 136319)
@@ -0,0 +1,11 @@
+--- midori/midori-privatedata.c.orig 2015-05-14 13:47:30.000000000 -0700
++++ midori/midori-privatedata.c 2015-05-14 13:49:23.000000000 -0700
+@@ -119,7 +119,7 @@
+ {
+ MidoriPrivateDataItem* privacy = data_items->data;
+ button = g_object_get_data (G_OBJECT (dialog), privacy->name);
+- g_return_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button));
++ g_return_val_if_fail (button != NULL && GTK_IS_TOGGLE_BUTTON (button), false);
+ if (gtk_toggle_button_get_active (button))
+ count++;
+ }
Added: trunk/dports/www/midori/files/patch-zeitgeist-2.0-bzr6945.diff
===================================================================
--- trunk/dports/www/midori/files/patch-zeitgeist-2.0-bzr6945.diff (rev 0)
+++ trunk/dports/www/midori/files/patch-zeitgeist-2.0-bzr6945.diff 2015-05-14 22:06:59 UTC (rev 136319)
@@ -0,0 +1,70 @@
+=== modified file 'CMakeLists.txt'
+--- CMakeLists.txt 2015-04-19 23:03:37 +0000
++++ CMakeLists.txt 2015-04-21 22:20:43 +0000
+@@ -180,11 +180,11 @@
+ endif()
+
+ if (USE_ZEITGEIST)
+- pkg_check_modules(ZEITGEIST zeitgeist-1.0>=0.3.14)
++ pkg_check_modules(ZEITGEIST zeitgeist-2.0>=0.3.14)
+ set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${ZEITGEIST_INCLUDE_DIRS}")
+ set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${ZEITGEIST_LIBRARIES}")
+ add_definitions("-DHAVE_ZEITGEIST")
+- set(PKGS ${PKGS} zeitgeist-1.0)
++ set(PKGS ${PKGS} zeitgeist-2.0)
+ endif()
+
+ if (WIN32)
+
+=== modified file 'midori/midori-browser.c'
+--- midori/midori-browser.c 2015-04-09 19:20:41 +0000
++++ midori/midori-browser.c 2015-04-21 22:20:43 +0000
+@@ -463,6 +463,9 @@
+
+ #ifdef HAVE_ZEITGEIST
+ const gchar* inter;
++ ZeitgeistEvent* zgevent;
++ ZeitgeistSubject* zgsubject;
++
+ if (strstr (event, "access"))
+ inter = ZEITGEIST_ZG_ACCESS_EVENT;
+ else if (strstr (event, "leave"))
+@@ -480,16 +483,27 @@
+ if (KATZE_ITEM_IS_FOLDER (item))
+ return;
+
+- zeitgeist_log_insert_events_no_reply (zeitgeist_log_get_default (),
+- zeitgeist_event_new_full (inter, ZEITGEIST_ZG_USER_ACTIVITY,
+- "application://midori.desktop",
+- zeitgeist_subject_new_full (
+- katze_item_get_uri (item),
+- strstr (type, "bookmark") ? ZEITGEIST_NFO_BOOKMARK : ZEITGEIST_NFO_WEBSITE,
+- zeitgeist_manifestation_for_uri (katze_item_get_uri (item)),
+- katze_item_get_meta_string (item, "mime-type"), NULL, katze_item_get_name (item), NULL),
+- NULL),
+- NULL);
++ zgsubject = zeitgeist_subject_new_full (
++ katze_item_get_uri (item),
++ strstr (type, "bookmark") ? ZEITGEIST_NFO_BOOKMARK : ZEITGEIST_NFO_WEBSITE,
++ zeitgeist_manifestation_for_uri (katze_item_get_uri (item)),
++ katze_item_get_meta_string (item, "mime-type"),
++ NULL,
++ katze_item_get_name (item),
++ NULL),
++
++ zgevent = zeitgeist_event_new_full (
++ inter,
++ ZEITGEIST_ZG_USER_ACTIVITY,
++ "application://midori.desktop",
++ NULL,
++ zgsubject,
++ NULL),
++
++ zeitgeist_log_insert_event_no_reply (zeitgeist_log_get_default (), zgevent, NULL);
++
++ g_object_unref (zgevent);
++ g_object_unref (zgsubject);
+ #endif
+ }
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150514/8ebb7531/attachment-0001.html>
More information about the macports-changes
mailing list