Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTasos Sahanidis <tasos@tasossah.com>2024-04-08 17:37:07 +0300
committerTasos Sahanidis <tasos@tasossah.com>2024-04-08 17:37:37 +0300
commit98ef9b94872802d649be0e5ba770bbd15da4c024 (patch)
tree5b994d47b58ca8bce003b6cea08ff4d6ac86f50e
parentb60ef1ce6dc4b2481d6cd2ebbeaef75925d4df07 (diff)
build-support: Move glib2 to disabled as it needs to be built manually
-rw-r--r--build-support/disabled/glib2/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch (renamed from build-support/glib2-nogir/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch)0
-rw-r--r--build-support/disabled/glib2/PKGBUILD (renamed from build-support/glib2-nogir/PKGBUILD)11
-rw-r--r--build-support/disabled/glib2/gio-querymodules.hook (renamed from build-support/glib2-nogir/gio-querymodules.hook)0
-rw-r--r--build-support/disabled/glib2/glib-compile-schemas.hook (renamed from build-support/glib2-nogir/glib-compile-schemas.hook)0
-rw-r--r--build-support/disabled/glib2/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc (renamed from build-support/glib2-nogir/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc)0
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