glib2, revbump, move $dataDir/gir-1.0 to _devel package (#13700)

This commit is contained in:
Schrijvers Luc
2026-02-04 16:47:18 +01:00
committed by GitHub
parent a278ba2643
commit 60e16989a4

View File

@@ -20,7 +20,7 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
2008-2010 Collabora Ltd.
1995-2010 Several others"
LICENSE="GNU LGPL v2"
REVISION="3"
REVISION="4"
SOURCE_URI="https://gitlab.gnome.org/GNOME/glib/-/archive/$portVersion/glib-$portVersion.tar.gz"
CHECKSUM_SHA256="e9c311a25abb5717fb83f0f3a36daddc039e61fe37cea61cad4d0e455a6cdca0"
SOURCE_DIR="glib-$portVersion"
@@ -35,7 +35,7 @@ CHECKSUM_SHA256_3="ec973bf5c2c2e69d14642df38e508c24ae91a254b6c38d2828022c71f2a14
SOURCE_DIR_3="gobject-introspection-$PACKAGE_VERSION_gi"
PATCHES_3="glib2-$portVersion-source3.patchset"
ARCHITECTURES="all !x86_gcc2"
ARCHITECTURES="ALL !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
@@ -152,7 +152,7 @@ PROVIDES_gi_devel="
devel:libgirepository_1.0$secondaryArchSuffix = $libGiVersionCompat
"
REQUIRES_gi_devel="
gobject_introspection${secondaryArchSuffix} == $PACKAGE_VERSION_gi base
gobject_introspection$secondaryArchSuffix == $PACKAGE_VERSION_gi base
devel:libffi$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libpcre2_8$secondaryArchSuffix
@@ -287,6 +287,14 @@ INSTALL()
# we are not linux
rm -f $libDir/gio-launch-desktop
# *.gir files, don't point to the main glib2 package data directory
sed -e 's|girdir=/packages/glib2-2.81.0-4/.self/data/gir-1.0|girdir=${datadir}/gir-1.0|g' \
-i $libDir/pkgconfig/gobject-introspection-1.0.pc
sed -e 's|girdir=/packages/glib2-2.81.0-4/.self/data/gir-1.0|girdir=${datadir}/gir-1.0|g' \
-i $libDir/pkgconfig/gobject-introspection-no-export-1.0.pc
sed -e 's|girdir=/packages/glib2-2.81.0-4/.self/data/gir-1.0|girdir=${datadir}/gir-1.0|g' \
-i $libDir/pkgconfig/girepository-2.0.pc
prepareInstalledDevelLibs \
libgio-2.0 \
libgirepository-1.0 \
@@ -318,7 +326,8 @@ INSTALL()
$commandBinDir/gresource \
$commandBinDir/gtester \
$commandBinDir/gtester-report \
$dataDir/aclocal
$dataDir/aclocal \
$dataDir/gir-1.0
# gi package
packageEntries gi \
@@ -329,7 +338,6 @@ INSTALL()
$commandBinDir/g-ir-scanner \
$libDir/libgirepository-1.0.so* \
$libDir/girepository-1.0 \
$dataDir/gir-1.0 \
$dataDir/gobject-introspection-1.0 \
$manDir \
$prefix/lib/python$pythonVersion