summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2019-02-11 16:00:09 +0100
committerAndreas Grapentin <andreas@grapentin.org>2019-02-11 16:01:25 +0100
commit60f0cdc48f5478e4e6bc2e7ae02feb8c28ab1ae5 (patch)
treeeaa85fe774bd8429ee9fb78456930ffc3d2ecc64
parent3b8859c6d5a88275e9b6e88fbf1a5a38dc2da93f (diff)
pcr/glib2-static: fix meson build
-rw-r--r--libre/glib2-static/PKGBUILD29
-rw-r--r--libre/glib2-static/fix-static-build-589.diff (renamed from libre/glib2-static/disable-dynamic-tests.patch)0
-rw-r--r--libre/glib2-static/gio-querymodules.hook11
-rw-r--r--libre/glib2-static/glib-compile-schemas.hook12
4 files changed, 11 insertions, 41 deletions
diff --git a/libre/glib2-static/PKGBUILD b/libre/glib2-static/PKGBUILD
index f5a443408..9283512aa 100644
--- a/libre/glib2-static/PKGBUILD
+++ b/libre/glib2-static/PKGBUILD
@@ -5,32 +5,25 @@
pkgname=glib2-static
pkgver=2.58.3
pkgrel=1
-pkgrel+=.static1
+pkgrel+=.static2
pkgdesc="Low level core library"
pkgdesc+=" (static libraries)"
url="https://wiki.gnome.org/Projects/GLib"
license=(LGPL2.1)
arch=(x86_64)
arch+=(i686 armv7h)
-depends=(pcre libffi libutil-linux zlib)
-depends+=("glib2=$pkgver")
-_depends=(pcre-static libffi-static libutil-linux-static zlib)
-makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux meson dbus)
-makedepends+=("${_depends[@]}")
-checkdepends=(desktop-file-utils)
+depends=(pcre libffi)
+makedepends=(libffi zlib shared-mime-info python libelf git util-linux meson dbus libxslt docbook-xsl)
+checkdepends=(desktop-file-utils dbus)
optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report'
'libelf: gresource inspection tool')
-options=(!emptydirs)
-options+=(staticlibs)
+options=('!docs' '!libtool' '!emptydirs' '!strip' 'staticlibs')
_commit=f2d1128ffae0de87680e411fb62ccfccafed6b1c # tags/2.58.3^0
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
noisy-glib-compile-schemas.diff
- glib-compile-schemas.hook gio-querymodules.hook)
-source+=(disable-dynamic-tests.patch)
+ fix-static-build-589.diff)
sha256sums=('SKIP'
'81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531'
- 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
- '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
'f4790fc845f2b4811ce5df5ef3a7dfcc23a1593ec4e19ae9173bb799a045d00f')
pkgver() {
@@ -43,9 +36,7 @@ prepare() {
# Suppress noise from glib-compile-schemas.hook
patch -Np1 -i ../noisy-glib-compile-schemas.diff
-
- # disable tests that fail on static builds
- patch -Np1 -i ../disable-dynamic-tests.patch
+ patch -Np1 -i ../fix-static-build-589.diff
}
build() {
@@ -58,8 +49,10 @@ build() {
arch-meson glib build \
--default-library static \
-D selinux=false \
- -D man=false \
- -D gtk_doc=false
+ -D man=true \
+ -D gtk_doc=false \
+ -D internal_pcre=false \
+ -D fam=false
ninja -C build
}
diff --git a/libre/glib2-static/disable-dynamic-tests.patch b/libre/glib2-static/fix-static-build-589.diff
index cde19b391..cde19b391 100644
--- a/libre/glib2-static/disable-dynamic-tests.patch
+++ b/libre/glib2-static/fix-static-build-589.diff
diff --git a/libre/glib2-static/gio-querymodules.hook b/libre/glib2-static/gio-querymodules.hook
deleted file mode 100644
index 193233398..000000000
--- a/libre/glib2-static/gio-querymodules.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gio/modules/*.so
-
-[Action]
-Description = Updating GIO module cache...
-When = PostTransaction
-Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
diff --git a/libre/glib2-static/glib-compile-schemas.hook b/libre/glib2-static/glib-compile-schemas.hook
deleted file mode 100644
index 04dc59b1a..000000000
--- a/libre/glib2-static/glib-compile-schemas.hook
+++ /dev/null
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/glib-2.0/schemas/*.gschema.xml
-Target = usr/share/glib-2.0/schemas/*.gschema.override
-
-[Action]
-Description = Compiling GSettings XML schema files...
-When = PostTransaction
-Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas