Date: Monday, September 26, 2022 @ 15:22:15
  Author: heftig
Revision: 1311490

3.24.34+r154+g56100ab49a-1: match testing/gtk3 better

Modified:
  lib32-gtk3/trunk/PKGBUILD

----------+
 PKGBUILD |   41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-09-26 13:34:30 UTC (rev 1311489)
+++ PKGBUILD    2022-09-26 15:22:15 UTC (rev 1311490)
@@ -3,7 +3,7 @@
 # Contributor: GordonGR <[email protected]>
 
 pkgname=lib32-gtk3
-pkgver=3.24.34
+pkgver=3.24.34+r154+g56100ab49a
 pkgrel=1
 pkgdesc='GObject-based multi-platform GUI toolkit'
 arch=(x86_64)
@@ -16,7 +16,6 @@
   lib32-dbus
   lib32-mesa
   lib32-gdk-pixbuf2
-  lib32-json-glib
   lib32-libcups
   lib32-libepoxy
   lib32-librsvg
@@ -26,7 +25,6 @@
   lib32-libxkbcommon
   lib32-libxrandr
   lib32-pango
-  lib32-rest
   lib32-libcanberra
   lib32-wayland
   lib32-libxdamage
@@ -41,9 +39,10 @@
   wayland-protocols
 )
 install=lib32-gtk3.install
-_tag=4e3a3f05533789e1a68c70c185e1755d386d6c47
+options=(debug)
+_commit=56100ab49ab729f1d98b66e84f3ed899a8105c43  # gtk-3-24
 source=(
-  git+https://gitlab.gnome.org/GNOME/gtk.git#tag=${_tag}
+  git+https://gitlab.gnome.org/GNOME/gtk.git#commit=${_commit}
   gtk-query-immodules-3.0-32.hook
 )
 sha256sums=(
@@ -53,26 +52,36 @@
 
 pkgver() {
   cd gtk
-  git describe --tags
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
+prepare() {
+  cd gtk
+}
+
 build() {
+  CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
+  local meson_options=(
+    --libdir=/usr/lib32
+    -D introspection=false
+    -D broadway_backend=true
+    -D cloudproviders=false
+    -D tracker3=false
+    -D colord=yes
+    -D gtk_doc=false
+    -D man=false
+  )
+
   export CC='gcc -m32'
   export CXX=/bin/false
   export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
-  arch-meson gtk build \
-    --libdir=/usr/lib32 \
-    -Dbroadway_backend=true \
-    -Dcloudproviders=false \
-    -Dcolord=yes \
-    -Dgtk_doc=false \
-    -Dintrospection=false \
-    -Dman=false
+
+  arch-meson gtk build "${meson_options[@]}"
   meson compile -C build
 }
 
 package() {
-  DESTDIR="${pkgdir}" meson install -C build
+  meson install -C build --destdir "$pkgdir"
   rm -r "${pkgdir}"/{etc,usr/{include,share}}
   find "${pkgdir}"/usr/bin -type f -not -name gtk-query-immodules-3.0 -delete
   mv "${pkgdir}"/usr/bin/gtk-query-immodules-3.0{,-32}
@@ -79,4 +88,4 @@
   install -Dm 644 gtk-query-immodules-3.0-32.hook -t 
"${pkgdir}"/usr/share/libalpm/hooks/
 }
 
-# vim: ts=2 sw=2 et:
+# vim:set sw=2 et:

Reply via email to