Mercurial > vanilla

changeset 1329:3c418d573b5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dev/gobject-introspection: upgrade to 1.70.0
author David Demelier <markand@malikania.fr>
date Sun, 21 Nov 2021 13:09:24 +0100
parents c95391b22837
children 8996e7c01cf2
files dev/gobject-introspection/gobject-introspection.sh dev/gobject-introspection/gobject-introspection.sha1 dev/gobject-introspection/patch-cc.patch
diffstat 3 files changed, 5 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/dev/gobject-introspection/gobject-introspection.sh	Sun Nov 21 13:05:45 2021 +0100
+++ b/dev/gobject-introspection/gobject-introspection.sh	Sun Nov 21 13:09:24 2021 +0100
@@ -16,11 +16,12 @@
 #
 
 PKGNAME=gobject-introspection
-PKGVERSION=1.60.0
+PKGVERSION=1.70.0
 PKGREVISION=1
 PKGLICENSE="GPL-2.0-only+ LGPL-2.0-only+"
 PKGSUMMARY="introspection system for GObject-based libraries"
-PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/1.60/$PKGNAME-$PKGVERSION.tar.xz"
+PKGWWW="https://gi.readthedocs.io/en/latest"
+PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/1.70/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="glib meson:build"
 
 : ${CC:=clang}
@@ -34,7 +35,7 @@
 	cd $PKGNAME-$PKGVERSION
 
 	# https://gitlab.gnome.org/markand/gobject-introspection/commit/8342840f2d9d6b57ef673bc5541cacee45432d45
-	patch -p1 < ../patch-cc.patch
+	#patch -p1 < ../patch-cc.patch
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
--- a/dev/gobject-introspection/gobject-introspection.sha1	Sun Nov 21 13:05:45 2021 +0100
+++ b/dev/gobject-introspection/gobject-introspection.sha1	Sun Nov 21 13:09:24 2021 +0100
@@ -1,1 +1,1 @@
-550d9b503062b6a85a87ba2a2abe6dc2ebe33ed0  gobject-introspection-1.60.0.tar.xz
+ed436f1c5c4519f7f86e9217b964183b32ac73b1  gobject-introspection-1.70.0.tar.xz
--- a/dev/gobject-introspection/patch-cc.patch	Sun Nov 21 13:05:45 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-diff --git a/giscanner/dumper.py b/giscanner/dumper.py
-index 2b851a53c76cb906bb9db50a6f47aef7d9cf767e..888cffcd1651f8a91dcb64c051c1f2143aa93d49 100644
---- a/giscanner/dumper.py
-+++ b/giscanner/dumper.py
-@@ -25,6 +25,7 @@ import shlex
- import subprocess
- import tempfile
- 
-+from distutils import sysconfig
- from .gdumpparser import IntrospectionBinary
- from . import pkgconfig, utils
- from .ccompiler import CCompiler
-@@ -94,7 +95,8 @@ class DumpCompiler(object):
-         if self._compiler.check_is_msvc():
-             self._linker_cmd = ['link.exe']
-         else:
--            self._linker_cmd = shlex.split(os.environ.get('CC', 'cc'))
-+            cc = sysconfig.get_config_var('CC')
-+            self._linker_cmd = shlex.split(os.environ.get('CC', cc))
- 
-     # Public API
-