user/gobject-introspection: bump { 1.66.1 --> 1.72.0 }. fixes #618.

3 files changed, 43 insertions, 31 deletions

diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD
index 24655fb08..be3b42f54 100644
--- a/user/gobject-introspection/APKBUILD
+++ b/user/gobject-introspection/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Zach van Rijn <me@zv.io>
 pkgname=gobject-introspection
-pkgver=1.66.1
+pkgver=1.72.0
 pkgrel=0
 pkgdesc="Introspection system for GObject-based libraries"
 url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
@@ -13,7 +13,9 @@ makedepends="$depends_dev bison flex glib-dev libffi-dev meson ninja python3-dev
 checkdepends="sed"
 subpackages="$pkgname-doc $pkgname-dev"
 replaces="libgirepository"
-source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+	musl-time64.patch
+	"
 
 build() {
 	meson -Dprefix=/usr build
@@ -37,4 +39,5 @@ dev() {
 	replaces="gobject-introspection"
 }
 
-sha512sums="ea1e20cd94ff8af3572f417f35e96648ffc3e94a91d4e4c81adf99bb0f408ac21ecf40990f9dbd5f2e0f4e83360286ca5db88dbc45bd59289596a324acf7df3d  gobject-introspection-1.66.1.tar.xz"
+sha512sums="b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5  gobject-introspection-1.72.0.tar.xz
+784acecd0e139685664ba1af6f1df69aeeb2da11a2b7ef9b42f46f42699e087aa90f0a2d95c1ff7aa1c04a3f2505d6006015b5a0f1ba1b125d6b1311474736c2  musl-time64.patch"
diff --git a/user/gobject-introspection/musl-time64.patch b/user/gobject-introspection/musl-time64.patch
new file mode 100644
index 000000000..53066bebb
--- /dev/null
+++ b/user/gobject-introspection/musl-time64.patch
@@ -0,0 +1,37 @@
+--- a/giscanner/ast.py
++++ b/giscanner/ast.py
+@@ -346,7 +346,8 @@
+ type_names['ssize_t'] = type_names['gssize']
+ type_names['uintptr_t'] = type_names['guintptr']
+ type_names['intptr_t'] = type_names['gintptr']
+-type_names['time_t'] = TYPE_LONG
++# musl libc 1.2 and newer uses 64 time_t for all arches
++type_names['time_t'] = TYPE_INT64
+ type_names['off_t'] = type_names['gsize']
+ type_names['pid_t'] = TYPE_INT
+ type_names['uid_t'] = TYPE_UINT
+--- a/tests/scanner/Regress-1.0-expected.gir
++++ b/tests/scanner/Regress-1.0-expected.gir
+@@ -2003,7 +2003,7 @@ uses a C sugar return type.</doc>
+             <type name="FooObject" c:type="RegressFooObject*"/>
+           </instance-parameter>
+           <parameter name="time" transfer-ownership="none">
+-            <type name="glong" c:type="time_t"/>
++            <type name="gint64" c:type="time_t"/>
+           </parameter>
+         </parameters>
+       </method>
+@@ -8381,11 +8381,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
+     <function name="test_timet" c:identifier="regress_test_timet">
+       <source-position filename="regress.h" line="94"/>
+       <return-value transfer-ownership="none">
+-        <type name="glong" c:type="time_t"/>
++        <type name="gint64" c:type="time_t"/>
+       </return-value>
+       <parameters>
+         <parameter name="in" transfer-ownership="none">
+-          <type name="glong" c:type="time_t"/>
++          <type name="gint64" c:type="time_t"/>
+         </parameter>
+       </parameters>
+     </function>
diff --git a/user/gobject-introspection/we-are-in-a-pickle.patch b/user/gobject-introspection/we-are-in-a-pickle.patch
deleted file mode 100644
index 5262e2887..000000000
--- a/user/gobject-introspection/we-are-in-a-pickle.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 945438608433a554b8d7077af648d60a9daf59f9 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 8 Dec 2018 18:44:31 +0100
-Subject: [PATCH] cachestore: don't try to catch nonexisting
- pickle.BadPickleGet. Fixes #159
-
-pickle.loads() can pretty much throw any kind of exception and we can't
-handle it besides ignoring it, so just catch all.
----
- giscanner/cachestore.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py
-index 58b3193c..857dc725 100644
---- a/giscanner/cachestore.py
-+++ b/giscanner/cachestore.py
-@@ -178,7 +178,7 @@ class CacheStore(object):
-             return None
-         try:
-             data = pickle.load(fd)
--        except (AttributeError, EOFError, ValueError, pickle.BadPickleGet):
-+        except Exception:
-             # Broken cache entry, remove it
-             self._remove_filename(store_filename)
-             data = None
--- 
-2.18.1
-