From f16e49a06ffb9e36f3360f791dad2b5002ea74bd Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 13 Dec 2020 17:34:30 +0100
Subject: [PATCH] gobject-introspection, bump version (#5490)

---
 ...pe => gobject_introspection-1.62.0.recipe} | 29 +++++++++--------
 .../gobject_introspection-1.56.1.patchset     | 32 -------------------
 .../gobject_introspection-1.62.0.patchset     | 22 +++++++++++++
 3 files changed, 38 insertions(+), 45 deletions(-)
 rename dev-libs/gobject-introspection/{gobject_introspection-1.56.1.recipe => gobject_introspection-1.62.0.recipe} (87%)
 delete mode 100644 dev-libs/gobject-introspection/patches/gobject_introspection-1.56.1.patchset
 create mode 100644 dev-libs/gobject-introspection/patches/gobject_introspection-1.62.0.patchset

diff --git a/dev-libs/gobject-introspection/gobject_introspection-1.56.1.recipe b/dev-libs/gobject-introspection/gobject_introspection-1.62.0.recipe
similarity index 87%
rename from dev-libs/gobject-introspection/gobject_introspection-1.56.1.recipe
rename to dev-libs/gobject-introspection/gobject_introspection-1.62.0.recipe
index 12f4a1ec4..f51d135ae 100644
--- a/dev-libs/gobject-introspection/gobject_introspection-1.56.1.recipe
+++ b/dev-libs/gobject-introspection/gobject_introspection-1.62.0.recipe
@@ -10,10 +10,11 @@ COPYRIGHT="Colin Walters
 	Matthias Clasen (girepository)
 	Jürg Billeter (scanner)"
 LICENSE="GNU LGPL v2
-	GNU GPL v2"
+	GNU GPL v2
+	MIT"
 REVISION="1"
 SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/${portVersion%.*}/gobject-introspection-$portVersion.tar.xz"
-CHECKSUM_SHA256="5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b"
+CHECKSUM_SHA256="b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2"
 SOURCE_DIR="gobject-introspection-$portVersion"
 PATCHES="gobject_introspection-$portVersion.patchset"
 
@@ -80,8 +81,10 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
+	cmd:meson
+	cmd:ninja
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:python3
+	cmd:python3 >= 3.7
 	cmd:which
 	"
 
@@ -90,19 +93,19 @@ defineDebugInfoPackage gobject_introspection$secondaryArchSuffix \
 
 BUILD()
 {
-	runConfigure --omit-dirs binDir ./autogen.sh \
-		--bindir=$commandBinDir --without-cairo \
-		CPPFLAGS=-I"$portPackageLinksDir/cmd~python3/$relativeIncludeDir/python3.6m/" \
-		PYTHON=python3
-	make $jobArgs
+	meson build --buildtype=release \
+		--prefix=$prefix \
+		--includedir=$includeDir \
+		--datadir=$dataDir \
+		--libdir=$libDir \
+		--mandir=$manDir
+
+	ninja -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install
-
-	# remove libtool library files
-	rm -f "$libDir"/lib*.la "$libDir"/gobject-introspection/giscanner/*.la
+	ninja -C build install
 
 	prepareInstalledDevelLib libgirepository-1.0
 	fixPkgconfig
@@ -116,5 +119,5 @@ TEST()
 {
 	# tests fails on Regress-1.0.gir, but as it looks
 	# it is known to fail there (doesn't break the tests)
-	make check
+	ninja -C build test
 }
diff --git a/dev-libs/gobject-introspection/patches/gobject_introspection-1.56.1.patchset b/dev-libs/gobject-introspection/patches/gobject_introspection-1.56.1.patchset
deleted file mode 100644
index 4bfa9111b..000000000
--- a/dev-libs/gobject-introspection/patches/gobject_introspection-1.56.1.patchset
+++ /dev/null
@@ -1,32 +0,0 @@
-From 84e62005b62c08ef301a391015e64b88a81227f7 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 12 Aug 2017 20:13:53 +0200
-Subject: use readelf instead of ldd
-
-
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 525bdba..ef560a8 100644
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -108,7 +108,7 @@ def _resolve_non_libtool(options, binary, libraries):
-         if platform_system == 'Darwin':
-             args.extend(['otool', '-L', binary.args[0]])
-         else:
--            args.extend(['ldd', binary.args[0]])
-+            args.extend(['readelf', '-d', binary.args[0]])
-         proc = subprocess.Popen(args, stdout=subprocess.PIPE)
-         patterns = {}
-         for library in libraries:
-@@ -126,7 +126,7 @@ def _resolve_non_libtool(options, binary, libraries):
-                 m = pattern.search(line)
-                 if m:
-                     del patterns[library]
--                    shlibs.append(m.group(1))
-+                    shlibs.append(m.group(1)[0:-1])
-                     break
- 
-         if len(patterns) > 0:
--- 
-2.16.4
-
-
diff --git a/dev-libs/gobject-introspection/patches/gobject_introspection-1.62.0.patchset b/dev-libs/gobject-introspection/patches/gobject_introspection-1.62.0.patchset
new file mode 100644
index 000000000..d0ce8b58c
--- /dev/null
+++ b/dev-libs/gobject-introspection/patches/gobject_introspection-1.62.0.patchset
@@ -0,0 +1,22 @@
+From eaf8d92cb3a9a1b488fc6c1e31f808068b70f624 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Wed, 18 Dec 2019 15:22:46 +0000
+Subject: Use objdump -x instead of ldd
+
+
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index e6de7bb..fee97b0 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -99,6 +99,8 @@ def _resolve_non_libtool(options, binary, libraries):
+         platform_system = platform.system()
+         if platform_system == 'Darwin':
+             args.extend(['otool', '-L', binary.args[0]])
++        elif platform_system == 'Haiku':
++            args.extend(['objdump', '-x', binary.args[0]])
+         else:
+             args.extend(['ldd', binary.args[0]])
+         output = subprocess.check_output(args)
+-- 
+2.24.0
+