[115400] trunk/dports/www/midori
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 1 02:24:52 PST 2014
Revision: 115400
https://trac.macports.org/changeset/115400
Author: jeremyhu at macports.org
Date: 2014-01-01 02:24:52 -0800 (Wed, 01 Jan 2014)
Log Message:
-----------
midori: Bump to version 0.5.6
Modified Paths:
--------------
trunk/dports/www/midori/Portfile
Removed Paths:
-------------
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-darwin-options.diff
trunk/dports/www/midori/files/patch-wscript.diff
Modified: trunk/dports/www/midori/Portfile
===================================================================
--- 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)
@@ -4,8 +4,7 @@
PortSystem 1.0
name midori
-version 0.4.7
-revision 1
+version 0.5.6
set branch [join [lrange [split ${version} .] 0 1] .]
categories www
@@ -16,14 +15,16 @@
description Midori is a lightweight, Webkit-Gtk based web browser
long_description ${description}
-homepage http://www.twotoasts.de/index.php?/pages/midori_summary.html
-master_sites http://archive.xfce.org/src/apps/midori/${branch}
-use_bzip2 yes
+homepage http://midori-browser.org
+master_sites http://midori-browser.org/downloads
+use_bzip2 yes
-checksums rmd160 72b0cf1290ed2a6c5e306b9b2dbb1ad4ce565860 \
- sha256 65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d
+distname midori_${version}_all_
+worksrcdir midori-${version}
-patchfiles patch-wscript.diff
+checksums sha1 951d68d26c0d7691eea5fbf3b29404d47f0a0504 \
+ rmd160 874c3bab803f5c69ee92abbd53d77ff5d0b9fe92 \
+ sha256 c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a
depends_build port:pkgconfig \
port:intltool
@@ -37,6 +38,13 @@
port:libnotify \
port:vala
+# 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
+
# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
platform darwin {
set cxxstdlib {}
@@ -56,16 +64,18 @@
depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
}
-}
-# Not autoconf
-configure.env-append LINKFLAGS="-L${prefix}/lib"
-configure.universal_args-delete --disable-dependency-tracking
+ #configure.env-append PYTHON=/usr/bin/python
-platform darwin {
- configure.env-append PYTHON=/usr/bin/python
- patchfiles-append patch-extensions-wscript_build.diff \
- patch-wscript-darwin-options.diff
+ 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}"
+ }
+ }
}
variant quartz description {Disable libnotify support (doesn't work with gtk2+quartz)} {
Deleted: trunk/dports/www/midori/files/patch-extensions-mouse-gestures-c.diff
===================================================================
--- 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)
@@ -1,20 +0,0 @@
---- 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)
- {
Deleted: trunk/dports/www/midori/files/patch-extensions-wscript_build.diff
===================================================================
--- 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)
@@ -1,7 +0,0 @@
---- 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
Deleted: trunk/dports/www/midori/files/patch-wscript-darwin-options.diff
===================================================================
--- 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)
@@ -1,19 +0,0 @@
---- 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'):
Deleted: trunk/dports/www/midori/files/patch-wscript.diff
===================================================================
--- 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)
@@ -1,26 +0,0 @@
---- 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\']',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140101/4ed11cce/attachment.html>
More information about the macports-changes
mailing list