From: Victor Martinez <pitillo@ono.com>
Date: Sun, 27 Feb 2022 07:48:24 +0000 (+0100)
Subject: gobject-introspection: updated to 1.70.0
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=629763a8f356b52880402e6202b20005364fcdc9;p=ports%2Fopt-arm64.git

gobject-introspection: updated to 1.70.0
---

diff --git a/gobject-introspection/.footprint b/gobject-introspection/.footprint
index 8e4ada0..d1ab354 100644
--- a/gobject-introspection/.footprint
+++ b/gobject-introspection/.footprint
@@ -52,6 +52,91 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 drwxr-xr-x	root/root	usr/lib/gobject-introspection/
 drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__init__.py
+drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/_version.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/_version.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/_version.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/annotationparser.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/annotationparser.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/annotationparser.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/ast.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/ast.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/ast.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/cachestore.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/cachestore.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/cachestore.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/ccompiler.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/ccompiler.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/ccompiler.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/codegen.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/codegen.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/codegen.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/docmain.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/docmain.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/docmain.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/docwriter.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/docwriter.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/docwriter.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/dumper.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/dumper.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/dumper.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/gdumpparser.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/gdumpparser.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/gdumpparser.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/girparser.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/girparser.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/girparser.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/girwriter.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/girwriter.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/girwriter.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/introspectablepass.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/introspectablepass.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/introspectablepass.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/mdextensions.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/mdextensions.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/mdextensions.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/message.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/message.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/message.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/pkgconfig.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/pkgconfig.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/pkgconfig.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/sectionparser.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/sectionparser.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/sectionparser.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/shlibs.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/shlibs.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/shlibs.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/sourcescanner.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/sourcescanner.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/sourcescanner.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/testcodegen.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/testcodegen.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/testcodegen.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/transformer.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/transformer.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/transformer.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/utils.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/utils.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/utils.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-39.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-39.pyc
 -rwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/_giscanner.cpython-39-aarch64-linux-gnu.so
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/_version.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/annotationmain.py
@@ -81,6 +166,7 @@ drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/devdoc
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/interface.tmpl
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/method.tmpl
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/namespace.tmpl
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/devdocs/meson.build
 drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallard/
 drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallard/C/
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallard/C/callback.tmpl
@@ -129,6 +215,7 @@ drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallar
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallard/Python/vfunc.tmpl
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallard/base.tmpl
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallard/class.tmpl
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallard/meson.build
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallard/namespace.tmpl
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/docwriter.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/dumper.py
diff --git a/gobject-introspection/.signature b/gobject-introspection/.signature
index e56dc9c..7a5cbf4 100644
--- a/gobject-introspection/.signature
+++ b/gobject-introspection/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt-arm64.pub
-RWRitF9a2DJqMd4KutF76FhDdQWPDQTC10VkXsj4jwsaCHpk/wmFw97YQb1B8GyQyRX0qMd+Z+Snw3qWlcj2v+kIzqa+bhhIwAA=
-SHA256 (Pkgfile) = 2c91320d626670ab71551e27b3152b7f60f41ca48a3133deb0042c73ce98d86f
-SHA256 (.footprint) = 441e6fa6e4cb3233fee5c3c05fe543fdc21c4d4cd172f778379e937536d74c44
+RWRitF9a2DJqMbAj4rwn1Dvt5tREDTXJUI/typ8sIX2acdJJH+W1NVGDwLIdgj0JPWuSD3TEQTpc+ASDA2C+hscKHttoTTWhEQE=
+SHA256 (Pkgfile) = 07a871d8f22187b261993b5803025f3acec04d648f1a2f7152951c7a5336b84e
+SHA256 (.footprint) = 02491f01552ffae06b6ffca6daad80a06033bf806c212cad94372aa4ff2f720d
 SHA256 (gobject-introspection-1.70.0.tar.xz) = 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a
+SHA256 (gobject-introspection-1.70.0-meson-0.61.patch) = fa02cbdf0472025e50ab607762db1558c0ecc82ee6eccbdc4c183bbc670215b1
diff --git a/gobject-introspection/Pkgfile b/gobject-introspection/Pkgfile
index 4e784e7..f2a0060 100644
--- a/gobject-introspection/Pkgfile
+++ b/gobject-introspection/Pkgfile
@@ -3,21 +3,32 @@
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Packager: Matt Housh, jaeger at morpheus dot net
-# Depends on: python glib
+# Depends on: glib libffi
+# Optional: cairo python3-mako python3-markdown
 
 name=gobject-introspection
 version=1.70.0
-release=1
-source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version::4}/$name-$version.tar.xz)
+release=2
+source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version::4}/$name-$version.tar.xz
+        gobject-introspection-1.70.0-meson-0.61.patch)
 
 build() {
-  cd $name-$version
+  prt-get isinst cairo || PKGMK_GOBJECTINTROSPECTION+=' -D cairo=disabled'
+  prt-get isinst python3-mako python3-markdown || PKGMK_GOBJECTINTROSPECTION+=' -D doctool=disabled'
 
-  meson build \
-        --prefix /usr \
-        -D cairo=disabled \
-        -D doctool=disabled
+  patch -d $name-$version -p1 -i $SRC/gobject-introspection-1.70.0-meson-0.61.patch
+
+  meson build $name-$version $PKGMK_GOBJECTINTROSPECTION \
+    --prefix /usr \
+    --buildtype plain \
+    --wrap-mode nodownload \
+    -D b_lto=true \
+    -D b_pie=true
 
   ninja -C build -j ${JOBS:-1}
-  DESTDIR="$PKG" ninja -C build install
+  DESTDIR=$PKG meson install -C build
+
+  /usr/bin/python3 -m compileall -d /usr/lib/$name $PKG
+  /usr/bin/python3 -O -m compileall -d /usr/lib/$name $PKG
+  /usr/bin/python3 -OO -m compileall -d /usr/lib/$name $PKG
 }