[118463] trunk/dports/gnome/gobject-introspection
cal at macports.org
cal at macports.org
Wed Apr 2 14:04:50 PDT 2014
Revision: 118463
https://trac.macports.org/changeset/118463
Author: cal at macports.org
Date: 2014-04-02 14:04:50 -0700 (Wed, 02 Apr 2014)
Log Message:
-----------
gobject-introspection: update to 1.40.0, remove patchfiles integrated upstream
Modified Paths:
--------------
trunk/dports/gnome/gobject-introspection/Portfile
Removed Paths:
-------------
trunk/dports/gnome/gobject-introspection/files/glibtool_path.patch
trunk/dports/gnome/gobject-introspection/files/patch-giscanner-shlib.py-use-absolute-linkage-paths.patch
trunk/dports/gnome/gobject-introspection/files/patch-giscanner-utils.py-use-absolute-linkage-paths.patch
Modified: trunk/dports/gnome/gobject-introspection/Portfile
===================================================================
--- trunk/dports/gnome/gobject-introspection/Portfile 2014-04-02 21:02:56 UTC (rev 118462)
+++ trunk/dports/gnome/gobject-introspection/Portfile 2014-04-02 21:04:50 UTC (rev 118463)
@@ -5,8 +5,7 @@
PortGroup active_variants 1.1
name gobject-introspection
-version 1.38.0
-revision 1
+version 1.40.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
platforms darwin
@@ -22,8 +21,8 @@
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums rmd160 f01089754ce1586c8517ab0fafeb1f96843a8d5c \
- sha256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73
+checksums rmd160 d7204695a94cbf3c0119e5eec72848942d19f97d \
+ sha256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98
depends_build port:pkgconfig
@@ -34,10 +33,6 @@
depends_run bin:glibtool:libtool
-patchfiles patch-giscanner-shlib.py-use-absolute-linkage-paths.patch \
- patch-giscanner-utils.py-use-absolute-linkage-paths.patch \
- glibtool_path.patch
-
post-patch {
reinplace "s|'cc'|'${configure.cc}'|g" ${worksrcpath}/giscanner/sourcescanner.py
reinplace "s|'gcc'|'${configure.cc}'|g" ${worksrcpath}/giscanner/dumper.py
Deleted: trunk/dports/gnome/gobject-introspection/files/glibtool_path.patch
===================================================================
--- trunk/dports/gnome/gobject-introspection/files/glibtool_path.patch 2014-04-02 21:02:56 UTC (rev 118462)
+++ trunk/dports/gnome/gobject-introspection/files/glibtool_path.patch 2014-04-02 21:04:50 UTC (rev 118463)
@@ -1,19 +0,0 @@
---- giscanner/utils.py.orig 2013-05-13 18:04:50.000000000 -0700
-+++ giscanner/utils.py 2013-05-13 18:05:53.000000000 -0700
-@@ -140,13 +140,13 @@ def get_libtool_command(options):
- return libtool_path.split(' ')
-
- try:
-- subprocess.check_call(['libtool', '--version'],
-+ subprocess.check_call(['glibtool', '--version'],
-- stdout=open(os.devnull))
-+ stdout=open(os.devnull, 'wb'))
- except (subprocess.CalledProcessError, OSError):
- # If libtool's not installed, assume we don't need it
- return None
-
-- return ['libtool']
-+ return ['glibtool']
-
-
- def files_are_identical(path1, path2):
Deleted: trunk/dports/gnome/gobject-introspection/files/patch-giscanner-shlib.py-use-absolute-linkage-paths.patch
===================================================================
--- trunk/dports/gnome/gobject-introspection/files/patch-giscanner-shlib.py-use-absolute-linkage-paths.patch 2014-04-02 21:02:56 UTC (rev 118462)
+++ trunk/dports/gnome/gobject-introspection/files/patch-giscanner-shlib.py-use-absolute-linkage-paths.patch 2014-04-02 21:04:50 UTC (rev 118463)
@@ -1,11 +0,0 @@
---- giscanner/shlibs.py.orig 2012-05-19 04:01:42.000000000 +0200
-+++ giscanner/shlibs.py 2012-05-19 04:03:23.000000000 +0200
-@@ -49,7 +49,7 @@
- # is crazy enough to name a library liblib<foo> when lib<foo> exists.
- #
- def _ldd_library_pattern(library_name):
-- return re.compile("(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
-+ return re.compile("([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
- % re.escape(library_name))
-
- # This is a what we do for non-la files. We assume that we are on an
Deleted: trunk/dports/gnome/gobject-introspection/files/patch-giscanner-utils.py-use-absolute-linkage-paths.patch
===================================================================
--- trunk/dports/gnome/gobject-introspection/files/patch-giscanner-utils.py-use-absolute-linkage-paths.patch 2014-04-02 21:02:56 UTC (rev 118462)
+++ trunk/dports/gnome/gobject-introspection/files/patch-giscanner-utils.py-use-absolute-linkage-paths.patch 2014-04-02 21:04:50 UTC (rev 118463)
@@ -1,44 +0,0 @@
---- giscanner/utils.py.orig 2012-07-07 12:41:26.000000000 +0200
-+++ giscanner/utils.py 2012-07-07 12:49:08.000000000 +0200
-@@ -21,6 +21,7 @@
- import re
- import os
- import subprocess
-+import platform
-
- _debugflags = None
- def have_debug_flag(flag):
-@@ -78,6 +79,18 @@
- else:
- return None
-
-+_libtool_libdir_pat = re.compile("libdir='([^']+)'")
-+
-+def _extract_libdir_field(la_file):
-+ f = open(la_file)
-+ data = f.read()
-+ f.close()
-+ m = _libtool_libdir_pat.search(data)
-+ if m:
-+ return m.groups()[0]
-+ else:
-+ return None
-+
- # Returns the name that we would pass to dlopen() the library
- # corresponding to this .la file
- def extract_libtool_shlib(la_file):
-@@ -85,6 +98,14 @@
- if dlname is None:
- return None
-
-+ # Darwin uses absolute paths where possible; since the libtool files never
-+ # contain absolute paths, use the libdir field
-+ if platform.system() == 'Darwin':
-+ dlbasename = os.path.basename(dlname)
-+ libdir = _extract_libdir_field(la_file)
-+ if libdir is None:
-+ return dlbasename
-+ return libdir + '/' + dlbasename
- # From the comments in extract_libtool(), older libtools had
- # a path rather than the raw dlname
- return os.path.basename(dlname)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140402/0147587e/attachment.html>
More information about the macports-changes
mailing list