From fce44d44dd58bcae1cf3092190d55bcae957471d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 18 Nov 2022 11:45:16 +1000
Subject: [PATCH] glib2: bump version * add commandSuffix and commandBinDir

---
 ...lib2-2.73.3.recipe => glib2-2.75.0.recipe} | 73 ++++++++++---------
 ...-2.73.3.patchset => glib2-2.75.0.patchset} |  0
 2 files changed, 40 insertions(+), 33 deletions(-)
 rename dev-libs/glib/{glib2-2.73.3.recipe => glib2-2.75.0.recipe} (78%)
 rename dev-libs/glib/patches/{glib2-2.73.3.patchset => glib2-2.75.0.patchset} (100%)

diff --git a/dev-libs/glib/glib2-2.73.3.recipe b/dev-libs/glib/glib2-2.75.0.recipe
similarity index 78%
rename from dev-libs/glib/glib2-2.73.3.recipe
rename to dev-libs/glib/glib2-2.75.0.recipe
index ab9fab4e7..3d5702e4b 100644
--- a/dev-libs/glib/glib2-2.73.3.recipe
+++ b/dev-libs/glib/glib2-2.75.0.recipe
@@ -22,7 +22,7 @@ COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://gitlab.gnome.org/GNOME/glib/-/archive/$portVersion/glib-$portVersion.tar.gz"
-CHECKSUM_SHA256="56ad77af16e444f444e1a54f5f8a959212f078b332120a44728b17943fc4c2c0"
+CHECKSUM_SHA256="8524cf0d7048c1e9f44d9d1fa802ce0101707c645aa8776dfa9fb5a36b51a204"
 SOURCE_DIR="glib-$portVersion"
 srvGitRev2="0854af0fdb6d527a8d1999835ac2c5059976c210"
 SOURCE_URI_2="https://gitlab.gnome.org/GNOME/gvdb/-/archive/0854af0fdb6d527a8d1999835ac2c5059976c210/gvdb-$srvGitRev2.tar.gz"
@@ -33,21 +33,28 @@ PATCHES="glib2-$portVersion.patchset"
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="0.7303.0"
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="0.7500.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	glib2$secondaryArchSuffix = $portVersion
-	cmd:gapplication$secondaryArchSuffix
-	cmd:gdbus$secondaryArchSuffix
-	cmd:gdbus_codegen$secondaryArchSuffix
-	cmd:gio$secondaryArchSuffix
-	cmd:gio_launch_desktop$secondaryArchSuffix
-	cmd:gio_querymodules$secondaryArchSuffix
-	cmd:glib_compile_resources$secondaryArchSuffix
-	cmd:glib_compile_schemas$secondaryArchSuffix
-	cmd:gresource$secondaryArchSuffix
-	cmd:gsettings$secondaryArchSuffix
+	cmd:gapplication$commandSuffix
+	cmd:gdbus$commandSuffix
+	cmd:gdbus_codegen$commandSuffix
+	cmd:gio$commandSuffix
+	cmd:gio_launch_desktop$commandSuffix
+	cmd:gio_querymodules$commandSuffix
+	cmd:glib_compile_resources$commandSuffix
+	cmd:glib_compile_schemas$commandSuffix
+	cmd:gresource$commandSuffix
+	cmd:gsettings$commandSuffix
 	lib:libgio_2.0$secondaryArchSuffix = $libVersionCompat
 	lib:libglib_2.0$secondaryArchSuffix = $libVersionCompat
 	lib:libgmodule_2.0$secondaryArchSuffix = $libVersionCompat
@@ -66,12 +73,12 @@ REQUIRES="
 
 PROVIDES_devel="
 	glib2${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	cmd:glib_genmarshal$secondaryArchSuffix
-	cmd:glib_gettextize$secondaryArchSuffix
-	cmd:glib_mkenums$secondaryArchSuffix
-	cmd:gobject_query$secondaryArchSuffix
-	cmd:gtester$secondaryArchSuffix
-	cmd:gtester_report$secondaryArchSuffix
+	cmd:glib_genmarshal$commandSuffix
+	cmd:glib_gettextize$commandSuffix
+	cmd:glib_mkenums$commandSuffix
+	cmd:gobject_query$commandSuffix
+	cmd:gtester$commandSuffix
+	cmd:gtester_report$commandSuffix
 	devel:libgio_2.0$secondaryArchSuffix = $libVersionCompat
 	devel:libglib_2.0$secondaryArchSuffix = $libVersionCompat
 	devel:libgmodule_2.0$secondaryArchSuffix = $libVersionCompat
@@ -115,14 +122,14 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage glib2$secondaryArchSuffix \
-	$binDir/gapplication \
-	$binDir/gdbus \
-	$binDir/gio \
-	$binDir/gio-querymodules \
-	$binDir/glib-compile-resources \
-	$binDir/glib-compile-schemas \
-	$binDir/gresource \
-	$binDir/gsettings \
+	$commandBinDir/gapplication \
+	$commandBinDir/gdbus \
+	$commandBinDir/gio \
+	$commandBinDir/gio-querymodules \
+	$commandBinDir/glib-compile-resources \
+	$commandBinDir/glib-compile-schemas \
+	$commandBinDir/gresource \
+	$commandBinDir/gsettings \
 	$libDir/libgio-2.0.so.$libVersion \
 	$libDir/libglib-2.0.so.$libVersion \
 	$libDir/libgmodule-2.0.so.$libVersion \
@@ -138,7 +145,7 @@ BUILD()
 		LDFLAGS="-lbsd -lgnu -lnetwork" meson build \
 		-D glib_debug=disabled --buildtype=debugoptimized \
 		-Diconv=external --prefix=$prefix --includedir=$includeDir \
-		--libdir=$libDir --datadir=$dataDir --bindir=$binDir \
+		--libdir=$libDir --datadir=$dataDir --bindir=$commandBinDir \
 		--localedir=$dataDir/locale
 
 	ninja $jobArgs -C build
@@ -162,12 +169,12 @@ INSTALL()
 	# devel package
 	packageEntries devel \
 		$developDir \
-		$binDir/glib-genmarshal \
-		$binDir/glib-gettextize \
-		$binDir/glib-mkenums \
-		$binDir/gobject-query \
-		$binDir/gtester \
-		$binDir/gtester-report
+		$commandBinDir/glib-genmarshal \
+		$commandBinDir/glib-gettextize \
+		$commandBinDir/glib-mkenums \
+		$commandBinDir/gobject-query \
+		$commandBinDir/gtester \
+		$commandBinDir/gtester-report
 
 	rm -rf $prefix/libexec
 }
diff --git a/dev-libs/glib/patches/glib2-2.73.3.patchset b/dev-libs/glib/patches/glib2-2.75.0.patchset
similarity index 100%
rename from dev-libs/glib/patches/glib2-2.73.3.patchset
rename to dev-libs/glib/patches/glib2-2.75.0.patchset