gobject-introspection: 1.58.3 -> 1.60.1

3 files changed, 23 insertions, 14 deletions

diff --git a/gobject-introspection/.footprint b/gobject-introspection/.footprint
index 3ab379137..e9e994c9b 100644
--- a/gobject-introspection/.footprint
+++ b/gobject-introspection/.footprint
@@ -26,6 +26,7 @@ drwxr-xr-x	root/root	usr/include/gobject-introspection-1.0/
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gitypelib.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/gitypes.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giunioninfo.h
+-rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giversion.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/giversionmacros.h
 -rw-r--r--	root/root	usr/include/gobject-introspection-1.0/givfuncinfo.h
 drwxr-xr-x	root/root	usr/lib/
@@ -50,7 +51,7 @@ 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
--rwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/_giscanner.cpython-36m-x86_64-linux-gnu.so
+-rwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/_giscanner.cpython-37m-x86_64-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
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/annotationparser.py
@@ -77,6 +78,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/enum.tmpl
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/function.tmpl
 -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
 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/
@@ -135,6 +137,7 @@ drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallar
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/introspectablepass.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/libtoolimporter.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/maintransformer.py
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/mdextensions.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/message.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/msvccompiler.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/pkgconfig.py
@@ -145,7 +148,7 @@ drwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/doctemplates/mallar
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/testcodegen.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/transformer.py
 -rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/utils.py
--rwxr-xr-x	root/root	usr/lib/gobject-introspection/giscanner/xmlwriter.py
+-rw-r--r--	root/root	usr/lib/gobject-introspection/giscanner/xmlwriter.py
 lrwxrwxrwx	root/root	usr/lib/libgirepository-1.0.so -> libgirepository-1.0.so.1
 lrwxrwxrwx	root/root	usr/lib/libgirepository-1.0.so.1 -> libgirepository-1.0.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libgirepository-1.0.so.1.0.0
@@ -178,11 +181,21 @@ drwxr-xr-x	root/root	usr/share/gobject-introspection-1.0/
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/Makefile.introspection
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/gdump.c
 drwxr-xr-x	root/root	usr/share/gobject-introspection-1.0/tests/
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/annotation.c
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/annotation.h
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/drawable.c
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/drawable.h
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/everything.c
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/everything.h
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/foo.c
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/foo.h
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/gimarshallingtests.c
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/gimarshallingtests.h
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/gitestmacros.h
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/regress.c
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/regress.h
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/utility.c
+-rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/utility.h
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/warnlib.c
 -rw-r--r--	root/root	usr/share/gobject-introspection-1.0/tests/warnlib.h
 drwxr-xr-x	root/root	usr/share/man/
diff --git a/gobject-introspection/.signature b/gobject-introspection/.signature
index 8e080fb84..76914bb11 100644
--- a/gobject-introspection/.signature
+++ b/gobject-introspection/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/VCA4x33Y9BIS5EIzpp5IYtDK5VPmupc1citPwosTUfMI9YAXoA5GnwLrk1jJ6tBJ/7kZlL28EIU++BmU+EoVgA=
-SHA256 (Pkgfile) = a8be8accd2053d15057a45ad0120e5746c6b6216e53fe59049b6a580e64b19ea
-SHA256 (.footprint) = c911d0ff4ad33e78923031b2db71aea1a302a4f7062087e14c03b2b4e7a38f23
-SHA256 (gobject-introspection-1.58.3.tar.xz) = 025b632bbd944dcf11fc50d19a0ca086b83baf92b3e34936d008180d28cdc3c8
-SHA256 (glib-2.58.3.tar.xz) = 8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+RWSE3ohX2g5d/SpuXKZ1CJG/5GAV/8hE7JrhMAdsJWKCXQRdkuIoVk91+o7mnKNBquHolMAGGsUEY4SMZORUKaSypz9J2pJHqQk=
+SHA256 (Pkgfile) = 6d4fa62ab2e3e9c2f3d33c3456eae73ac05a27e7689611f1ce589177b3f6b659
+SHA256 (.footprint) = ae82bc9d656e20bf98d28a00f4d455a4704fdf7d0e7d8b6cc40c4b72f4741847
+SHA256 (gobject-introspection-1.60.1.tar.xz) = d844d1499ecd36f3ec8a3573616186d36626ec0c9a7981939e99aa02e9c824b3
diff --git a/gobject-introspection/Pkgfile b/gobject-introspection/Pkgfile
index a5bd14be3..495683f02 100644
--- a/gobject-introspection/Pkgfile
+++ b/gobject-introspection/Pkgfile
@@ -1,23 +1,20 @@
 # Description: A middleware layer between C libraries (using GObject) and language bindings.
 # URL: https://live.gnome.org/GObjectIntrospection
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: cairo
+# Depends on: glib
 
 name=gobject-introspection
-version=1.58.3
+version=1.60.1
 release=1
-source=(https://ftp.gnome.org/pub/GNOME/sources/$name/${version::4}/$name-$version.tar.xz
-	https://download.gnome.org/sources/glib/2.58/glib-2.58.3.tar.xz)
+source=(https://ftp.gnome.org/pub/GNOME/sources/$name/${version::4}/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version
 
 	meson build \
 		--prefix /usr \
-		-D cairo=true \
 		-D gtk_doc=false \
-		-D doctool=false \
-		-D glib_src_dir="$SRC/glib-2.58.3"
+		-D doctool=false
 
 	ninja -C build -j ${JOBS:-1}
 	DESTDIR="$PKG" ninja -C build install