[73370] trunk/dports/www/midori
afb at macports.org
afb at macports.org
Thu Nov 11 06:30:01 PST 2010
Revision: 73370
http://trac.macports.org/changeset/73370
Author: afb at macports.org
Date: 2010-11-11 06:29:57 -0800 (Thu, 11 Nov 2010)
Log Message:
-----------
port upgrade: midori 0.2.9 (#25729)
Modified Paths:
--------------
trunk/dports/www/midori/Portfile
Added Paths:
-----------
trunk/dports/www/midori/files/
trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff
trunk/dports/www/midori/files/patch-extensions-wscript_build.diff
trunk/dports/www/midori/files/patch-wscript.diff
Modified: trunk/dports/www/midori/Portfile
===================================================================
--- trunk/dports/www/midori/Portfile 2010-11-11 12:19:33 UTC (rev 73369)
+++ trunk/dports/www/midori/Portfile 2010-11-11 14:29:57 UTC (rev 73370)
@@ -3,22 +3,47 @@
PortSystem 1.0
name midori
-version 0.1.2
-revision 1
+version 0.2.9
categories www
description Midori is a lightweight web browser
long_description ${description}
homepage http://www.twotoasts.de/index.php?/pages/midori_summary.html
platforms darwin
maintainers afb openmaintainer
-master_sites http://goodies.xfce.org/releases/midori/
+
+set branch [join [lrange [split ${version} .] 0 1] .]
+master_sites http://archive.xfce.org/src/apps/midori/${branch}
use_bzip2 yes
-checksums md5 5169ead6783f374cedf3f89bf399bd75 \
- sha1 7bcace4b766da58e312b494220b15e88a983b8ac \
- rmd160 d7756231bd86aea5f5535d10bed0daa7128e3fe7
+
+checksums md5 a5821d8e31fa944374ed51c09ca4e740 \
+ sha1 3329c3b9cbe1d2fa0cb94e3f864802fae4fc5e9b \
+ rmd160 3b8f2f8fa55f10e80a9e769e4085f96b7fa769ab
+
+# patch-extensions-mouse-gestures-c.diff reported as
+# http://www.twotoasts.de/bugs/index.php?do=details&task_id=903
+patchfiles patch-extensions-mouse-gestures-c.diff \
+ patch-extensions-wscript_build.diff \
+ patch-wscript.diff
+
# glib 2.16.5 or later is required:
depends_lib port:gtk2 path:include/gio/gio.h:glib2 \
port:webkit-gtk lib:libxml2:libxml2 \
- port:libtool port:intltool
+ port:libtool port:intltool \
+ port:libunique port:libnotify port:vala
+ # last line is optional
+# libnotify doesn't build without X11 (that is on a gtk +quartz stack)
+variant no_x11 {
+ depends_lib-delete port:libnotify
+ configure.cmd-append --disable-libnotify
+}
+
+# can't seem to get libunique to work (throws dbus errors on startup)
+depends_lib-delete port:libunique
+configure.cmd-append --disable-unique
+
configure.env-append LINKFLAGS="-L${prefix}/lib -undefined dynamic_lookup"
+
+livecheck.url ${homepage}
+livecheck.regex ${name}-(\[0-9.a-z\]*)\.tar\.bz2
+livecheck.type regexm
Added: trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff
===================================================================
--- trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff (rev 0)
+++ trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff 2010-11-11 14:29:57 UTC (rev 73370)
@@ -0,0 +1,20 @@
+--- 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)
+ {
Added: trunk/dports/www/midori/files/patch-extensions-wscript_build.diff
===================================================================
--- trunk/dports/www/midori/files/patch-extensions-wscript_build.diff (rev 0)
+++ trunk/dports/www/midori/files/patch-extensions-wscript_build.diff 2010-11-11 14:29:57 UTC (rev 73370)
@@ -0,0 +1,7 @@
+--- 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
Added: trunk/dports/www/midori/files/patch-wscript.diff
===================================================================
--- trunk/dports/www/midori/files/patch-wscript.diff (rev 0)
+++ trunk/dports/www/midori/files/patch-wscript.diff 2010-11-11 14:29:57 UTC (rev 73370)
@@ -0,0 +1,35 @@
+--- wscript.old 2010-09-14 23:02:24.000000000 +0200
++++ wscript 2010-09-14 23:02:31.000000000 +0200
+@@ -87,6 +87,7 @@
+ return dirvalue
+
+ conf.check_tool ('compiler_cc')
++ conf.check_tool ('osx')
+ if option_enabled ('vala'):
+ if find_program_impl (conf.env, 'valac'):
+ conf.check_tool ('vala')
+@@ -331,6 +332,7 @@
+ if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4':
+ Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.')
+ Utils.pprint ('RED', 'Please use an older or newer version.')
++ conf.env['macbundle_PATTERN'] = '%s.so'
+
+ def set_options (opt):
+ def is_maemo (): return os.path.exists ('/etc/osso-af-init/')
+@@ -345,6 +347,7 @@
+ 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\']',
+@@ -505,7 +508,7 @@
+ if os.path.exists (source):
+ bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
+ '/extensions/' + folder, source)
+- elif Options.platform == 'linux':
++ else:
+ extensions = os.listdir ('data/extensions')
+ for extension in extensions:
+ folder = 'lib' + extension + '.so'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101111/c82ff93f/attachment.html>
More information about the macports-changes
mailing list