<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[136319] trunk/dports/www/midori</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/136319">136319</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-05-14 15:06:59 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwmidoriPortfile">trunk/dports/www/midori/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/www/midori/files/</li>
<li><a href="#trunkdportswwwmidorifilespatchgtk222bzr6943diff">trunk/dports/www/midori/files/patch-gtk2.22-bzr6943.diff</a></li>
<li><a href="#trunkdportswwwmidorifilespatchmidorimidoriprivatedatacdiff">trunk/dports/www/midori/files/patch-midori-midori-privatedata.c.diff</a></li>
<li><a href="#trunkdportswwwmidorifilespatchzeitgeist20bzr6945diff">trunk/dports/www/midori/files/patch-zeitgeist-2.0-bzr6945.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwmidoriPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/midori/Portfile (136318 => 136319)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name midori
</span><del>-version 0.5.6
</del><ins>+version 0.5.10
</ins><span class="cx">
</span><span class="cx"> categories www
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -16,36 +16,47 @@
</span><span class="cx">
</span><span class="cx"> homepage http://midori-browser.org
</span><span class="cx"> master_sites http://midori-browser.org/downloads
</span><del>-use_bzip2 yes
</del><ins>+use_bzip2 yes
</ins><span class="cx">
</span><span class="cx"> distname midori_${version}_all_
</span><span class="cx"> worksrcdir midori-${version}
</span><ins>+extract.mkdir yes
</ins><span class="cx">
</span><del>-checksums sha1 951d68d26c0d7691eea5fbf3b29404d47f0a0504 \
- rmd160 874c3bab803f5c69ee92abbd53d77ff5d0b9fe92 \
- sha256 c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a
</del><ins>+checksums rmd160 9aff6f7bb4e373594300bd5d75f81f1be727e74b \
+ sha256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f
</ins><span class="cx">
</span><span class="cx"> depends_build port:cmake \
</span><span class="cx"> port:pkgconfig \
</span><span class="cx"> port:intltool
</span><span class="cx">
</span><del>-# glib 2.16.5 or later is required:
</del><span class="cx"> depends_lib port:gtk2 \
</span><span class="cx"> path:include/gio/gio.h:glib2 \
</span><del>- path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
</del><ins>+ port:gcr \
</ins><span class="cx"> port:librsvg \
</span><ins>+ port:libsoup \
</ins><span class="cx"> port:libxml2 \
</span><del>- port:libunique \
- port:libnotify \
</del><ins>+ port:sqlite3 \
+ port:vala \
</ins><span class="cx"> port:xorg-libXScrnSaver \
</span><del>- port:vala
</del><ins>+ port:zeitgeist
</ins><span class="cx">
</span><ins>+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
+
</ins><span class="cx"> # Not autoconf
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><span class="cx">
</span><del>-# Needs zeitgeist-1.0, but we have zeitgeist-2.0 ... check a later version
-configure.args-append --disable-zeitgeist
-
</del><span class="cx"> platform darwin {
</span><span class="cx"> if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="lines">@@ -63,9 +74,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant quartz description {Disable libnotify support (doesn't work with gtk2+quartz)} {
- depends_lib-delete port:libnotify
- configure.args-append --disable-libnotify
</del><ins>+post-activate {
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.url ${homepage}/download/source/
</span></span></pre></div>
<a id="trunkdportswwwmidorifilespatchgtk222bzr6943diff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/midori/files/patch-gtk2.22-bzr6943.diff (0 => 136319)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+=== 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);
+
</ins></span></pre></div>
<a id="trunkdportswwwmidorifilespatchmidorimidoriprivatedatacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/midori/files/patch-midori-midori-privatedata.c.diff (0 => 136319)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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++;
+ }
</ins></span></pre></div>
<a id="trunkdportswwwmidorifilespatchzeitgeist20bzr6945diff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/midori/files/patch-zeitgeist-2.0-bzr6945.diff (0 => 136319)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+=== 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
+ }
+
+
</ins></span></pre>
</div>
</div>
</body>
</html>