build-support: Move glib2 to disabled as it needs to be built manually

5 files changed, 5 insertions, 6 deletions

diff --git a/build-support/glib2-nogir/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch b/build-support/disabled/glib2/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
index 0a0b7f04..0a0b7f04 100644
--- a/build-support/glib2-nogir/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
+++ b/build-support/disabled/glib2/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
diff --git a/build-support/glib2-nogir/PKGBUILD b/build-support/disabled/glib2/PKGBUILD
index cb9dc485..afe36dee 100644
--- a/build-support/glib2-nogir/PKGBUILD
+++ b/build-support/disabled/glib2/PKGBUILD
@@ -4,12 +4,11 @@
 
 # glib2 without introspection for bootstrapping
 
-pkgbase=glib2-nogir
+pkgbase=glib2
 pkgname=(
-  glib2-nogir
-  glib2-nogir-docs
+  glib2
+  glib2-docs
 )
-conflicts=(glib2 glib2-docs)
 pkgver=2.80.0
 pkgrel=3
 pkgdesc="Low level core library"
@@ -99,7 +98,7 @@ check() {
   meson test -C build --no-suite flaky --no-suite slow --print-errorlogs || true
 }
 
-package_glib2-nogir() {
+package_glib2() {
   depends+=(
     libffi.so
     libmount.so
@@ -127,7 +126,7 @@ package_glib2-nogir() {
   mv {"$pkgdir",docs}/usr/share/doc
 }
 
-package_glib2-nogir-docs() {
+package_glib2-docs() {
   pkgdesc+=" - documentation"
   depends=()
   license+=(LicenseRef-Public-Domain)
diff --git a/build-support/glib2-nogir/gio-querymodules.hook b/build-support/disabled/glib2/gio-querymodules.hook
index 85781479..85781479 100644
--- a/build-support/glib2-nogir/gio-querymodules.hook
+++ b/build-support/disabled/glib2/gio-querymodules.hook
diff --git a/build-support/glib2-nogir/glib-compile-schemas.hook b/build-support/disabled/glib2/glib-compile-schemas.hook
index 93d1ed53..93d1ed53 100644
--- a/build-support/glib2-nogir/glib-compile-schemas.hook
+++ b/build-support/disabled/glib2/glib-compile-schemas.hook
diff --git a/build-support/glib2-nogir/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc b/build-support/disabled/glib2/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc
index 55967633..55967633 100644
--- a/build-support/glib2-nogir/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc
+++ b/build-support/disabled/glib2/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc