gobject-introspection: Update to 1.56.1 (#3701)

This commit is contained in:
Christoph Reiter
2018-05-06 21:32:59 +02:00
committed by Алексей
parent 1e940af15a
commit cfb5ebc083
3 changed files with 3 additions and 67 deletions

View File

@@ -1,49 +0,0 @@
From 46047c74b98ee2a61bb876554b86f615f1f2aaae Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 22 Jan 2018 11:20:49 +0100
Subject: [PATCH] scanner: Fix library lookup under MinGW without libtool
When executing the scanner binary use the PATH/LIB env vars
also under MinGW, since LD_LIBRARY_PATH/rpath doesn't work there.
When resolving the library name from the import library look into
the user provided library paths first before falling back to the
default gcc search path.
This fixes the gir/typelib generation for meson under MSYS2.
Note that MSYS2 ships various patches, so this might not fix it
for all MinGW users.
https://bugzilla.gnome.org/show_bug.cgi?id=791902
---
giscanner/ccompiler.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
index 29de0ee5..da4eaac8 100644
--- a/giscanner/ccompiler.py
+++ b/giscanner/ccompiler.py
@@ -116,7 +116,7 @@ class CCompiler(object):
runtime_path_envvar = []
runtime_paths = []
- if self.check_is_msvc():
+ if os.name == 'nt':
runtime_path_envvar = ['LIB', 'PATH']
else:
runtime_path_envvar = ['LD_LIBRARY_PATH']
@@ -288,9 +288,10 @@ class CCompiler(object):
proc = subprocess.Popen([self.compiler_cmd, '-print-search-dirs'],
stdout=subprocess.PIPE)
o, e = proc.communicate()
+ libsearch = options.library_paths
for line in o.decode('ascii').splitlines():
if line.startswith('libraries: '):
- libsearch = line[len('libraries: '):].split(os.pathsep)
+ libsearch += line[len('libraries: '):].split(os.pathsep)
shlibs = []
not_resolved = []
--
2.15.0

View File

@@ -1,11 +0,0 @@
--- gobject-introspection-1.39.0/giscanner/giscannermodule.c.orig 2014-01-29 11:52:46.121400000 +0400
+++ gobject-introspection-1.39.0/giscanner/giscannermodule.c 2014-01-29 11:53:59.020200000 +0400
@@ -439,7 +439,7 @@
#endif
#endif
-#ifndef MSVC_USE_FD_DIRECTLY
+#if !defined(MSVC_USE_FD_DIRECTLY) && !defined(__MINGW64_VERSION_MAJOR)
{
#if defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==2 && PY_MINOR_VERSION==5
#define PYTHON_MSVCRXX_DLL "msvcr71.dll"

View File

@@ -5,8 +5,8 @@ _realname=gobject-introspection
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-runtime")
pkgver=1.54.1
pkgrel=4
pkgver=1.56.1
pkgrel=1
arch=('any')
url="https://live.gnome.org/GObjectIntrospection"
license=("LGPL")
@@ -28,11 +28,10 @@ source=(https://download.gnome.org/sources/gobject-introspection/${pkgver%.*}/${
0026-giscanner-assertions-and-waits.patch
0027-wait-for-xml-parse-too.patch
0055-fix-python-detection.patch
0001-scanner-Fix-library-lookup-under-MinGW-without-libto.patch
py3-fixes.patch
pyscript2exe.py)
sha256sums=('b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e'
sha256sums=('5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b'
'f84df99e1ce5a3a0b640ef172de068958eb0b3d0be43a454dd86e6ccb8cfc386'
'663bb39764058b1de1591765f9f465dd69eeae16fcf56b82a3692560849dacae'
'bb5f48047613216a6c3c652e0ef65c099475ffdddbea4a835b5a51279d7755ac'
@@ -41,7 +40,6 @@ sha256sums=('b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e'
'19ca830262339c4ac9f21bfb8d669ee8e126a949a4237d55656e00c5ae81c451'
'3f38bdd0dd43d9cf626cbca7c2abd22a7ed0213e6756252c6d467d470d9c5948'
'f61d099aa7cd37c437f01d98bb95c57c66f07c78028675ae19fac87f943d189d'
'b82b384453feda096a183e58a9b2e79144f17a01e4d2a349aba144ec108604b9'
'c91a0604e4cbc483099da94ab61a7dc32cb7337f03c5561ac5950c12e6f3d9af'
'f68b24932b3365c4098c04eeaeaf87275ceec29694b3f0597c431bbcf4f913a3')
@@ -56,9 +54,7 @@ prepare() {
patch -p1 -i "${srcdir}"/0025-more-tolerant-rmtreeing.patch
patch -p1 -i "${srcdir}"/0026-giscanner-assertions-and-waits.patch
patch -p1 -i "${srcdir}"/0027-wait-for-xml-parse-too.patch
#patch -p1 -i "${srcdir}"/0050-dont-load-msvcrt.patch
patch -p1 -i "${srcdir}"/0055-fix-python-detection.patch
patch -p1 -i "${srcdir}"/0001-scanner-Fix-library-lookup-under-MinGW-without-libto.patch
patch -p1 -i "${srcdir}"/py3-fixes.patch
autoreconf -fi