diff --git a/mingw-w64-gobject-introspection/0012-fix-runtime-prefix.mingw.patch b/mingw-w64-gobject-introspection/0012-fix-runtime-prefix.mingw.patch deleted file mode 100644 index 9a0ac23b97..0000000000 --- a/mingw-w64-gobject-introspection/0012-fix-runtime-prefix.mingw.patch +++ /dev/null @@ -1,194 +0,0 @@ ---- gobject-introspection-4613390bcfd6a814685a5862925b11338b797e48/tools/g-ir-scanner.in.orig 2013-05-09 19:52:37 +0400 -+++ gobject-introspection-4613390bcfd6a814685a5862925b11338b797e48/tools/g-ir-scanner.in 2013-05-09 20:06:38 +0400 -@@ -23,7 +23,48 @@ - import sys - import __builtin__ - --__builtin__.__dict__['DATADIR'] = "@datarootdir@" -+prefix = "@prefix@" -+datarootdir = "@datarootdir@" -+libdir = "@libdir@" -+ -+def pathtolist (path): -+ dirs = [] -+ -+ while True: -+ path, dir = os.path.split (path) -+ -+ if dir != "": -+ dirs.append (dir) -+ else: -+ if path != "": -+ dirs.append (path) -+ break -+ -+ dirs.reverse () -+ return dirs -+ -+def getroot (): -+ if os.name != 'nt': -+ return prefix -+ -+ full_script_file_name = os.path.abspath (sys.argv[0]) -+ dirs = pathtolist (full_script_file_name)[:-1] -+ -+ found = False -+ for i, dir in reversed (list (enumerate (dirs))): -+ if dir in ['bin', 'lib', 'share', 'libexec', 'var', 'sbin', 'lib64', 'lib32', 'etc']: -+ return os.path.join (*dirs[:i]) -+ -+ return os.path.join (*dirs) -+ -+runtime_prefix = getroot () -+ -+if datarootdir.startswith (prefix): -+ datarootdir = runtime_prefix + datarootdir[len (prefix):] -+if libdir.startswith (prefix): -+ libdir = runtime_prefix + libdir[len (prefix):] -+ -+__builtin__.__dict__['DATADIR'] = datarootdir - - if 'GI_SCANNER_DEBUG' in os.environ: - def on_exception(exctype, value, tb): -@@ -38,7 +79,7 @@ - else: - # This is a private directory, we don't want to pollute the global - # namespace. -- path = os.path.join('@libdir@', 'gobject-introspection') -+ path = os.path.join(libdir, 'gobject-introspection') - sys.path.insert(0, path) - - from giscanner.scannermain import scanner_main ---- gobject-introspection-4613390bcfd6a814685a5862925b11338b797e48/tools/g-ir-annotation-tool.in.orig 2013-05-09 19:52:37 +0400 -+++ gobject-introspection-4613390bcfd6a814685a5862925b11338b797e48/tools/g-ir-annotation-tool.in 2013-05-09 20:07:06 +0400 -@@ -23,7 +23,48 @@ - import sys - import __builtin__ - --__builtin__.__dict__['DATADIR'] = "@datarootdir@" -+prefix = "@prefix@" -+datarootdir = "@datarootdir@" -+libdir = "@libdir@" -+ -+def pathtolist (path): -+ dirs = [] -+ -+ while True: -+ path, dir = os.path.split (path) -+ -+ if dir != "": -+ dirs.append (dir) -+ else: -+ if path != "": -+ dirs.append (path) -+ break -+ -+ dirs.reverse () -+ return dirs -+ -+def getroot (): -+ if os.name != 'nt': -+ return prefix -+ -+ full_script_file_name = os.path.abspath (sys.argv[0]) -+ dirs = pathtolist (full_script_file_name)[:-1] -+ -+ found = False -+ for i, dir in reversed (list (enumerate (dirs))): -+ if dir in ['bin', 'lib', 'share', 'libexec', 'var', 'sbin', 'lib64', 'lib32', 'etc']: -+ return os.path.join (*dirs[:i]) -+ -+ return os.path.join (*dirs) -+ -+runtime_prefix = getroot () -+ -+if datarootdir.startswith (prefix): -+ datarootdir = runtime_prefix + datarootdir[len (prefix):] -+if libdir.startswith (prefix): -+ libdir = runtime_prefix + libdir[len (prefix):] -+ -+__builtin__.__dict__['DATADIR'] = datarootdir - - if 'GI_SCANNER_DEBUG' in os.environ: - def on_exception(exctype, value, tb): -@@ -38,7 +79,7 @@ - else: - # This is a private directory, we don't want to pollute the global - # namespace. -- path = os.path.join('@libdir@', 'gobject-introspection') -+ path = os.path.join(libdir, 'gobject-introspection') - sys.path.insert(0, path) - - from giscanner.annotationmain import annotation_main ---- gobject-introspection-4613390bcfd6a814685a5862925b11338b797e48/tools/g-ir-doc-tool.in.orig 2013-05-09 19:52:37 +0400 -+++ gobject-introspection-4613390bcfd6a814685a5862925b11338b797e48/tools/g-ir-doc-tool.in 2013-05-09 20:06:51 +0400 -@@ -23,7 +23,48 @@ - import sys - import __builtin__ - --__builtin__.__dict__['DATADIR'] = "@datarootdir@" -+prefix = "@prefix@" -+datarootdir = "@datarootdir@" -+libdir = "@libdir@" -+ -+def pathtolist (path): -+ dirs = [] -+ -+ while True: -+ path, dir = os.path.split (path) -+ -+ if dir != "": -+ dirs.append (dir) -+ else: -+ if path != "": -+ dirs.append (path) -+ break -+ -+ dirs.reverse () -+ return dirs -+ -+def getroot (): -+ if os.name != 'nt': -+ return prefix -+ -+ full_script_file_name = os.path.abspath (sys.argv[0]) -+ dirs = pathtolist (full_script_file_name)[:-1] -+ -+ found = False -+ for i, dir in reversed (list (enumerate (dirs))): -+ if dir in ['bin', 'lib', 'share', 'libexec', 'var', 'sbin', 'lib64', 'lib32', 'etc']: -+ return os.path.join (*dirs[:i]) -+ -+ return os.path.join (*dirs) -+ -+runtime_prefix = getroot () -+ -+if datarootdir.startswith (prefix): -+ datarootdir = runtime_prefix + datarootdir[len (prefix):] -+if libdir.startswith (prefix): -+ libdir = runtime_prefix + libdir[len (prefix):] -+ -+__builtin__.__dict__['DATADIR'] = datarootdir - - if 'GI_SCANNER_DEBUG' in os.environ: - def on_exception(exctype, value, tb): -@@ -38,7 +79,7 @@ - else: - # This is a private directory, we don't want to pollute the global - # namespace. -- path = os.path.join('@libdir@', 'gobject-introspection') -+ path = os.path.join(libdir, 'gobject-introspection') - sys.path.insert(0, path) - - from giscanner.docmain import doc_main ---- gobject-introspection-4613390bcfd6a814685a5862925b11338b797e48/Makefile-tools.am.orig 2013-05-09 21:35:15 +0400 -+++ gobject-introspection-4613390bcfd6a814685a5862925b11338b797e48/Makefile-tools.am 2013-05-10 09:43:51 +0400 -@@ -10,7 +10,7 @@ - tools/g-ir-annotation-tool.in \ - tools/g-ir-doc-tool.in - --TOOL_SUBSTITUTIONS = sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), -+TOOL_SUBSTITUTIONS = sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), -e s,@prefix\@,$(prefix), - - g-ir-scanner: tools/g-ir-scanner.in _giscanner.la Makefile - $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@ diff --git a/mingw-w64-gobject-introspection/PKGBUILD b/mingw-w64-gobject-introspection/PKGBUILD index c559533a6c..98eb0cae07 100644 --- a/mingw-w64-gobject-introspection/PKGBUILD +++ b/mingw-w64-gobject-introspection/PKGBUILD @@ -3,7 +3,7 @@ _realname=gobject-introspection pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.41.3 +pkgver=1.41.4 pkgrel=1 pkgdesc="GObject Introspection can scan C header and source files in order to generate introspection typelib files (mingw-w64)" arch=('any') @@ -19,15 +19,13 @@ depends=( options=('strip' 'staticlibs') source=(http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/${pkgver%.*}/${_realname}-${pkgver}.tar.xz - 0012-fix-runtime-prefix.mingw.patch 0018-debug-rmtree-errors.mingw.patch 0021-tests-no-undefined.patch 0050-dont-load-msvcrt.patch 0055-fix-python-detection.patch ) -md5sums=('6f1a545092bf6896dad982e8f178d464' - 'f164bfa9b3caa66dc664131a729b3a70' +md5sums=('135350c26800ccd2a5667fd395401798' 'f0ecde986ebf1f0e28b752f9c36fb6c1' '69ef34e2f57abc8afe1b9f6fa3786e97' 'e3598d539258678eef8dde2216419faf'