[99155] trunk/dports/www/midori

jeremyhu at macports.org jeremyhu at macports.org
Sun Oct 28 13:31:06 PDT 2012


Revision: 99155
          http://trac.macports.org//changeset/99155
Author:   jeremyhu at macports.org
Date:     2012-10-28 13:31:06 -0700 (Sun, 28 Oct 2012)
Log Message:
-----------
midori: Bump to 0.4.7

Modified Paths:
--------------
    trunk/dports/www/midori/Portfile
    trunk/dports/www/midori/files/patch-wscript.diff

Removed Paths:
-------------
    trunk/dports/www/midori/files/patch-wscript-dont-look-for-libm.diff

Modified: trunk/dports/www/midori/Portfile
===================================================================
--- trunk/dports/www/midori/Portfile	2012-10-28 20:24:28 UTC (rev 99154)
+++ trunk/dports/www/midori/Portfile	2012-10-28 20:31:06 UTC (rev 99155)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name		midori
-version		0.4.6
-revision        1
+version		0.4.7
 categories	www
 description	Midori is a lightweight web browser
 long_description	${description}
@@ -17,9 +16,9 @@
 master_sites	http://archive.xfce.org/src/apps/midori/${branch}
 use_bzip2	yes
 
-checksums           sha1    68a41fef15dde865f7cf4579c0dfbd0bae0cccc5 \
-                    rmd160  4f55a332579426c91406617d554ff59570d60f8a \
-                    sha256  910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea
+checksums           sha1    f32b1dc76061de3cefc222d779a7d6441b92a4fa \
+                    rmd160  72b0cf1290ed2a6c5e306b9b2dbb1ad4ce565860 \
+                    sha256  65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d
 
 patchfiles	patch-wscript.diff
 
@@ -37,7 +36,6 @@
 platform darwin {
 	configure.env-append  PYTHON=/usr/bin/python 
 	patchfiles-append patch-extensions-wscript_build.diff \
-	                  patch-wscript-dont-look-for-libm.diff \
 	                  patch-wscript-darwin-options.diff
 }
 

Deleted: trunk/dports/www/midori/files/patch-wscript-dont-look-for-libm.diff
===================================================================
--- trunk/dports/www/midori/files/patch-wscript-dont-look-for-libm.diff	2012-10-28 20:24:28 UTC (rev 99154)
+++ trunk/dports/www/midori/files/patch-wscript-dont-look-for-libm.diff	2012-10-28 20:31:06 UTC (rev 99155)
@@ -1,10 +0,0 @@
---- wscript.m	2010-11-22 19:53:59.000000000 +0100
-+++ wscript	2010-11-22 19:54:32.000000000 +0100
-@@ -202,7 +202,6 @@
-         libnotify = 'no '
-     conf.define ('HAVE_LIBNOTIFY', [0,1][libnotify == 'yes'])
- 
--    conf.check (lib='m', mandatory=True)
-     check_pkg ('gmodule-2.0', '2.8.0', False)
-     check_pkg ('gthread-2.0', '2.8.0', False)
-     check_pkg ('gio-2.0', '2.16.0')

Modified: trunk/dports/www/midori/files/patch-wscript.diff
===================================================================
--- trunk/dports/www/midori/files/patch-wscript.diff	2012-10-28 20:24:28 UTC (rev 99154)
+++ trunk/dports/www/midori/files/patch-wscript.diff	2012-10-28 20:31:06 UTC (rev 99155)
@@ -1,22 +1,22 @@
---- /Users/pierre/Desktop/midori-0.4.2/wscript - copie	2011-11-11 00:21:06.000000000 +0100
-+++ wscript	2011-11-22 17:52:37.000000000 +0100
-@@ -90,6 +90,7 @@
-         return dirvalue
+--- 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')
- 
-@@ -353,6 +354,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.')
+     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/')
-@@ -368,6 +370,7 @@
+@@ -413,6 +415,7 @@ def set_options (opt):
              default=disable, help='Disable ' + desc, dest='disable_' + option_)
  
      opt.tool_options ('compiler_cc')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121028/3b8b61e6/attachment-0001.html>


More information about the macports-changes mailing list