summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordudemanguy2023-03-23 21:43:28 -0500
committerdudemanguy2023-03-23 21:43:44 -0500
commit883b6fed207c1d3394b418763aca370bb4b2f3d5 (patch)
tree94d50fe93c82e95b954699d9f94a1735680e8924
parentbdccb56e8bab988fb4ef9191edf4c43cb8f2005a (diff)
downloadaur-883b6fed207c1d3394b418763aca370bb4b2f3d5.tar.gz
2.76.1-1
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD36
-rw-r--r--gio-querymodules.hook5
-rw-r--r--gio-querymodules.script7
4 files changed, 27 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7df01b6da71..9fcaaaa4d2c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = glib2-patched-thumbnailer
pkgdesc = GLib2 patched with ahodesuka's thumbnailer patch.
- pkgver = 2.76.0
+ pkgver = 2.76.1
pkgrel = 1
url = https://gist.github.com/Dudemanguy/d199759b46a79782cc1b301649dec8a5
arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = glib2-patched-thumbnailer
optdepends = python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report
optdepends = libelf: gresource inspection tool
optdepends = gvfs: most gio functionality
- provides = glib2=2.76.0
+ provides = glib2=2.76.1
provides = libgio-2.0.so
provides = libglib-2.0.so
provides = libgmodule-2.0.so
@@ -36,19 +36,17 @@ pkgbase = glib2-patched-thumbnailer
conflicts = glib2
options = !docs
options = staticlibs
- source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=8a9ada663923e39c0e8d7eefe65390955dc3c0d8
+ source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=180713772f4e7bcdddf2c793f2f34a498184ed15
source = git+https://gitlab.gnome.org/GNOME/gvdb.git
source = 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
source = 0002-glocalfileinfo-add-a-dbus-thumbnail-generator.patch
source = gio-querymodules.hook
- source = gio-querymodules.script
source = glib-compile-schemas.hook
b2sums = SKIP
b2sums = SKIP
b2sums = bd7f881ae6054c363783bf45b1add5eef5e8347554e23b9fece526701469d07cdcb9871fa73dee473796a219e8aa513796a96da769949097ea207db038578d07
b2sums = 7f6bc830e8ccf0ef8d1afa178af5141f2ff6b9387efd6675a27627ff90548b854c68bfc928b680833352b055de316f92726391909884f89c7a042825a942c03b
- b2sums = cd3a7817193ca985be5aff0813e78cc59c39ad8d4a2171c1c719267e4f51beda47c58a44c6d5afead64e9fa1b854430ac935976d02158e927ba3ec8f36fce282
- b2sums = 4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243
+ b2sums = 14c9211c0557f6d8d9a914f1b18b7e0e23f79f4abde117cb03ab119b95bf9fa9d7a712aa0a29beb266468aeb352caa3a9e4540503cfc9fe0bbaf764371832a96
b2sums = d30d349b4cb4407839d9074ce08f5259b8a5f3ca46769aabc621f17d15effdb89c4bf19bd23603f6df3d59f8d1adaded0f4bacd0333afcab782f2d048c882858
pkgname = glib2-patched-thumbnailer
diff --git a/PKGBUILD b/PKGBUILD
index 6b10c077fb3a..437c610bf1df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=glib2-patched-thumbnailer
-pkgver=2.76.0
+pkgver=2.76.1
pkgrel=1
pkgdesc="GLib2 patched with ahodesuka's thumbnailer patch."
url="https://gist.github.com/Dudemanguy/d199759b46a79782cc1b301649dec8a5"
@@ -21,21 +21,20 @@ optdepends=('python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-repor
'gvfs: most gio functionality')
options=(!docs staticlibs)
license=(LGPL)
-_commit=8a9ada663923e39c0e8d7eefe65390955dc3c0d8 # tags/2.76.0^0
+_commit=180713772f4e7bcdddf2c793f2f34a498184ed15 # tags/2.76.1^0
source=(
"git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
0002-glocalfileinfo-add-a-dbus-thumbnail-generator.patch
- gio-querymodules.{hook,script}
+ gio-querymodules.hook
glib-compile-schemas.hook
)
b2sums=('SKIP'
'SKIP'
'bd7f881ae6054c363783bf45b1add5eef5e8347554e23b9fece526701469d07cdcb9871fa73dee473796a219e8aa513796a96da769949097ea207db038578d07'
'7f6bc830e8ccf0ef8d1afa178af5141f2ff6b9387efd6675a27627ff90548b854c68bfc928b680833352b055de316f92726391909884f89c7a042825a942c03b'
- 'cd3a7817193ca985be5aff0813e78cc59c39ad8d4a2171c1c719267e4f51beda47c58a44c6d5afead64e9fa1b854430ac935976d02158e927ba3ec8f36fce282'
- '4b90eb8d582509b09aab401313d4399cc139ad21b5dd7d45d79860d0764c7494c60714e0794e09823e51d1894ac032a994f27d79d1499abf24ee6f59bdb0c243'
+ '14c9211c0557f6d8d9a914f1b18b7e0e23f79f4abde117cb03ab119b95bf9fa9d7a712aa0a29beb266468aeb352caa3a9e4540503cfc9fe0bbaf764371832a96'
'd30d349b4cb4407839d9074ce08f5259b8a5f3ca46769aabc621f17d15effdb89c4bf19bd23603f6df3d59f8d1adaded0f4bacd0333afcab782f2d048c882858')
pkgver() {
@@ -58,17 +57,24 @@ prepare() {
}
build() {
+ local meson_options=(
+ --default-library both
+ -D glib_debug=disabled
+ -D gtk_doc=true
+ -D man=true
+ -D selinux=disabled
+ -D sysprof=enabled
+ )
+
+ # Produce more debug info: GLib has a lot of useful macros
+ CFLAGS+=" -g3"
+ CXXFLAGS+=" -g3"
+
# use fat LTO objects for static libraries
- CFLAGS+=' -ffat-lto-objects -g3'
- CXXFLAGS+=' -ffat-lto-objects -g3'
+ CFLAGS+=" -ffat-lto-objects"
+ CXXFLAGS+=" -ffat-lto-objects"
- CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
- arch-meson glib build \
- --default-library both \
- -D glib_debug=disabled \
- -D selinux=disabled \
- -D man=true \
- -D sysprof=enabled
+ arch-meson glib build "${meson_options[@]}"
meson compile -C build
}
@@ -81,7 +87,7 @@ package() {
meson install -C build --destdir "$pkgdir"
install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
- install -D gio-querymodules.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules"
+ touch "$pkgdir/usr/lib/gio/modules/.keep"
python -m compileall -d /usr/share/glib-2.0/codegen \
"$pkgdir/usr/share/glib-2.0/codegen"
diff --git a/gio-querymodules.hook b/gio-querymodules.hook
index 09b0c2f89c88..857814791ac3 100644
--- a/gio-querymodules.hook
+++ b/gio-querymodules.hook
@@ -3,10 +3,9 @@ Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
-Target = usr/lib/gio/modules/
+Target = usr/lib/gio/modules/*.so
[Action]
Description = Updating GIO module cache...
When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gio-querymodules
-NeedsTargets
+Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
diff --git a/gio-querymodules.script b/gio-querymodules.script
deleted file mode 100644
index 5c218775790a..000000000000
--- a/gio-querymodules.script
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-while read -r d; do
- [[ -d $d ]] || continue
- gio-querymodules "$d"
- rmdir --ignore-fail-on-non-empty "$d"
-done