<!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>[115400] 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/115400">115400</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-01 02:24:52 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>midori: Bump to version 0.5.6</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwmidoriPortfile">trunk/dports/www/midori/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwmidorifilespatchextensionsmousegesturescdiff">trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff</a></li>
<li><a href="#trunkdportswwwmidorifilespatchextensionswscript_builddiff">trunk/dports/www/midori/files/patch-extensions-wscript_build.diff</a></li>
<li><a href="#trunkdportswwwmidorifilespatchwscriptdarwinoptionsdiff">trunk/dports/www/midori/files/patch-wscript-darwin-options.diff</a></li>
<li><a href="#trunkdportswwwmidorifilespatchwscriptdiff">trunk/dports/www/midori/files/patch-wscript.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 (115399 => 115400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/midori/Portfile 2014-01-01 09:41:47 UTC (rev 115399)
+++ trunk/dports/www/midori/Portfile 2014-01-01 10:24:52 UTC (rev 115400)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name midori
</span><del>-version 0.4.7
-revision 1
</del><ins>+version 0.5.6
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx">
</span><span class="cx"> categories www
</span><span class="lines">@@ -16,14 +15,16 @@
</span><span class="cx"> description Midori is a lightweight, Webkit-Gtk based web browser
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><del>-homepage http://www.twotoasts.de/index.php?/pages/midori_summary.html
-master_sites http://archive.xfce.org/src/apps/midori/${branch}
-use_bzip2 yes
</del><ins>+homepage http://midori-browser.org
+master_sites http://midori-browser.org/downloads
+use_bzip2 yes
</ins><span class="cx">
</span><del>-checksums rmd160 72b0cf1290ed2a6c5e306b9b2dbb1ad4ce565860 \
- sha256 65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d
</del><ins>+distname midori_${version}_all_
+worksrcdir midori-${version}
</ins><span class="cx">
</span><del>-patchfiles patch-wscript.diff
</del><ins>+checksums sha1 951d68d26c0d7691eea5fbf3b29404d47f0a0504 \
+ rmd160 874c3bab803f5c69ee92abbd53d77ff5d0b9fe92 \
+ sha256 c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool
</span><span class="lines">@@ -37,6 +38,13 @@
</span><span class="cx"> port:libnotify \
</span><span class="cx"> port:vala
</span><span class="cx">
</span><ins>+# Not autoconf
+configure.env-append LINKFLAGS="-L${prefix}/lib"
+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
+
</ins><span class="cx"> # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</span><span class="cx"> platform darwin {
</span><span class="cx"> set cxxstdlib {}
</span><span class="lines">@@ -56,16 +64,18 @@
</span><span class="cx"> depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span class="cx"> depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-# Not autoconf
-configure.env-append LINKFLAGS="-L${prefix}/lib"
-configure.universal_args-delete --disable-dependency-tracking
</del><ins>+ #configure.env-append PYTHON=/usr/bin/python
</ins><span class="cx">
</span><del>-platform darwin {
- configure.env-append PYTHON=/usr/bin/python
- patchfiles-append patch-extensions-wscript_build.diff \
- patch-wscript-darwin-options.diff
</del><ins>+ post-destroot {
+ # TODO: Fix the build system
+ system "install_name_tool -id ${prefix}/lib/libmidori-core.1.dylib ${destroot}${prefix}/lib/libmidori-core.1.dylib"
+ system "install_name_tool -change libmidori-core.1.dylib ${prefix}/lib/libmidori-core.1.dylib ${destroot}${prefix}/bin/midori"
+
+ foreach file [glob ${destroot}${prefix}/lib/midori/*.so] {
+ system "install_name_tool -change libmidori-core.1.dylib ${prefix}/lib/libmidori-core.1.dylib ${file}"
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant quartz description {Disable libnotify support (doesn't work with gtk2+quartz)} {
</span></span></pre></div>
<a id="trunkdportswwwmidorifilespatchextensionsmousegesturescdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff (115399 => 115400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff 2014-01-01 09:41:47 UTC (rev 115399)
+++ trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff 2014-01-01 10:24:52 UTC (rev 115400)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- extensions/mouse-gestures.c.orig 2010-05-24 19:34:44.000000000 +0200
-+++ extensions/mouse-gestures.c 2010-07-17 19:02:02.000000000 +0200
-@@ -25,7 +25,7 @@
- struct MouseGestureNode {
- double x;
- double y;
--} MouseGestureNode_t;
-+};
-
- struct _MouseGesture {
- MouseButton button;
-@@ -38,7 +38,7 @@
- #define DEVIANCE 20
- #define MINLENGTH 50
-
--MouseGesture *gesture;
-+MouseGesture *gesture = NULL;
-
- void mouse_gesture_clear (MouseGesture *g)
- {
</del></span></pre></div>
<a id="trunkdportswwwmidorifilespatchextensionswscript_builddiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/midori/files/patch-extensions-wscript_build.diff (115399 => 115400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/midori/files/patch-extensions-wscript_build.diff 2014-01-01 09:41:47 UTC (rev 115399)
+++ trunk/dports/www/midori/files/patch-extensions-wscript_build.diff 2014-01-01 10:24:52 UTC (rev 115400)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>---- extensions/wscript_build.old 2010-09-14 23:02:47.000000000 +0200
-+++ extensions/wscript_build 2010-09-14 23:03:25.000000000 +0200
-@@ -38,3 +38,4 @@
- obj.install_path = '${LIBDIR}/midori'
- if bld.env['platform'] == 'win32':
- obj.uselib_local = 'midori'
-+ obj.mac_bundle = True
</del></span></pre></div>
<a id="trunkdportswwwmidorifilespatchwscriptdarwinoptionsdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/midori/files/patch-wscript-darwin-options.diff (115399 => 115400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/midori/files/patch-wscript-darwin-options.diff 2014-01-01 09:41:47 UTC (rev 115399)
+++ trunk/dports/www/midori/files/patch-wscript-darwin-options.diff 2014-01-01 10:24:52 UTC (rev 115400)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- wscript.ini 2010-11-23 21:12:53.000000000 +0100
-+++ wscript 2010-11-23 20:26:12.000000000 +0100
-@@ -88,6 +88,16 @@
- return dirvalue
-
- conf.check_tool ('compiler_cc')
-+ conf.check_tool('gcc', funs='''
-+find_gcc
-+find_cpp
-+find_ar
-+gcc_common_flags
-+gcc_modifier_darwin
-+cc_add_flags
-+cc_load_tools
-+'''
-+)
- conf.check_tool ('osx')
- if option_enabled ('vala'):
- if find_program_impl (conf.env, 'valac'):
</del></span></pre></div>
<a id="trunkdportswwwmidorifilespatchwscriptdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/midori/files/patch-wscript.diff (115399 => 115400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/midori/files/patch-wscript.diff 2014-01-01 09:41:47 UTC (rev 115399)
+++ trunk/dports/www/midori/files/patch-wscript.diff 2014-01-01 10:24:52 UTC (rev 115400)
</span><span class="lines">@@ -1,26 +0,0 @@
</span><del>---- wscript.orig 2012-09-19 14:17:43.000000000 -0700
-+++ wscript 2012-10-28 13:27:44.000000000 -0700
-@@ -104,6 +104,7 @@ def configure (conf):
- int(given_major) == major and int(given_minor) == minor and int(given_micro) >= micro
-
- conf.check_tool ('compiler_cc')
-+ conf.check_tool ('osx')
- conf.check_tool ('vala')
- conf.check_tool ('glib2')
- if not check_version (conf.env['VALAC_VERSION'], 0, 14, 0):
-@@ -398,6 +399,7 @@ def configure (conf):
- Utils.pprint ('RED', 'This combination breaks the download GUI.')
- Utils.pprint ('RED', 'See https://bugs.launchpad.net/midori/+bug/780133/comments/14')
- sys.exit (1)
-+ conf.env['macbundle_PATTERN'] = '%s.so'
-
- def set_options (opt):
- def is_maemo (): return os.path.exists ('/etc/osso-af-init/')
-@@ -413,6 +415,7 @@ def set_options (opt):
- default=disable, help='Disable ' + desc, dest='disable_' + option_)
-
- opt.tool_options ('compiler_cc')
-+ opt.tool_options ('osx')
- opt.get_option_group ('--check-c-compiler').add_option('-d', '--debug-level',
- action = 'store', default = '',
- help = 'Specify the debugging level. [\'none\', \'debug\', \'full\']',
</del></span></pre>
</div>
</div>
</body>
</html>