[arch-commits] Commit in gtk3/trunk (PKGBUILD)

[Jan Steffens]

    Date: Friday, May 31, 2019 @ 08:39:56
  Author: heftig
Revision: 354560

3.24.8+162+g689bc42aaf-1

Modified:
  gtk3/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-31 08:39:40 UTC (rev 354559)
+++ PKGBUILD	2019-05-31 08:39:56 UTC (rev 354560)
@@ -3,7 +3,7 @@
 
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.24.8
+pkgver=3.24.8+162+g689bc42aaf
 pkgrel=1
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
@@ -12,10 +12,10 @@
 depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
          libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
          adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
-         cantarell-fonts colord rest libcups libcanberra fribidi)
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc)
+         cantarell-fonts colord rest libcups libcanberra fribidi iso-codes)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
 license=(LGPL)
-_commit=5428379fad31f1637c920d97a3d0303f606bfb6e  # tags/3.24.8^0
+_commit=689bc42aaffcf278c145f8e7d46ee6b934e6d709  # gtk-3-24
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         settings.ini
         gtk-query-immodules-3.0.hook
@@ -34,25 +34,15 @@
 
 prepare() {
   cd gtk
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd gtk
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-schemas-compile \
-    --enable-x11-backend \
-    --enable-broadway-backend \
-    --enable-wayland-backend \
-    --enable-gtk-doc
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
+  arch-meson gtk build \
+    -D broadway_backend=true \
+    -D colord=yes \
+    -D gtk_doc=true \
+    -D man=true
+  ninja -C build
 }
 
 package_gtk3() {
@@ -62,7 +52,7 @@
   replaces=("gtk3-print-backends<=3.22.26-1")
   install=gtk3.install
 
-  DESTDIR="$pkgdir" make -C gtk install
+  DESTDIR="$pkgdir" meson install -C build
 
   install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
   install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook