Add missing changes to PKGBUILD.in from ae533cec

1 files changed, 12 insertions, 45 deletions

diff --git a/PKGBUILD.in b/PKGBUILD.in
index 7403237c4a0f..780cd5132de2 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -5,9 +5,6 @@
 # Contributor: Alexander Hunziker <alex.hunziker@gmail.com>
 # Contributor: Alessio Biancalana <dottorblaster@gmail.com>
 
-: DISABLE_MESON="${DISABLE_MESON:=1}" # switch to autotools `makepkg DISABLE_MESON=1`
-((DISABLE_MESON)) && makedepends+=('vala') || makedepends+=('meson')
-
 pkgname=gimp-git
 _pkgname=${pkgname%-git}
 provides=(gimp)
@@ -45,7 +42,7 @@ makedepends+=('git' 'intltool>=0.40.1'
              'alsa-lib>=1.0.0' 'libxslt' 'glib-networking'
              'alsa-lib' 'curl' 'ghostscript' 'libxpm' 'webkit2gtk'
              'libheif' 'libwebp' 'libmng' 'iso-codes' 'aalib' 'zlib'
-             'gjs' 'python-gobject' 'luajit'
+             'gjs' 'python-gobject' 'luajit' 'meson'
              )
 checkdepends=('xorg-server-xvfb')
 optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
@@ -70,57 +67,27 @@ sha512sums=('SKIP'
 
 pkgver() {
 # shellcheck disable=SC2183,SC2046
-  printf "%s.%s.%s.r%s.%s" \
-    $(grep -oP 'gimp_(major|minor|micro)_version\], \[\K[0-9]{1,2}' ${_pkgname}/configure.ac) \
+  printf "%s.r%s.%s" \
+    $(grep -zoP "(?s)^project\(.*?version: '\K[0-9.]+(?=\'.*?\))" ${_pkgname}/meson.build|tr -d '\0') \
     "$(git -C $_pkgname rev-list "$(git -C $_pkgname describe --abbrev=0)"..HEAD --count)" \
     "$(git -C $_pkgname log --pretty=format:'%h' -n 1)"
 }
 
 build() {
-  if ((DISABLE_MESON)); then
-    cd $_pkgname
-    ./autogen.sh \
-          --prefix=/usr \
-          --sysconfdir=/etc \
-          --libexecdir=/usr/bin \
-          --enable-mp \
-          --enable-gimp-console \
-          --enable-gtk-doc \
-          --disable-check-update \
-          --disable-python \
-          --with-bug-report-url='https://github.com/bartoszek/AUR-gimp-git/issues' \
-          --with-openexr \
-          --without-aa
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make
-  else
-#   export CFLAGS CXXFLAGS LDFLAGS
-    meson "${srcdir}/${_pkgname}"\
-          "${srcdir}/build"\
-          --prefix=/usr \
-          -Dbug-report-url='https://github.com/bartoszek/AUR-gimp-git/issues'
-    export NINJA_STATUS="[%p | %f<%r<%u | %cbps ] "
-  # shellcheck disable=SC2046 # allow MAKEFLAGS to split when passing multiple flags.
-    ninja $(grep -oP -- '-+[A-z]+ ?[0-9]*'<<<"${MAKEFLAGS:--j1}") -C "${srcdir}/build"
-  fi
+  meson "${srcdir}/${_pkgname}"\
+        "${srcdir}/build"\
+        --prefix=/usr \
+        -Dbug-report-url='https://github.com/bartoszek/AUR-gimp-git/issues'
+  export NINJA_STATUS="[%p | %f<%r<%u | %cbps ] "
+# shellcheck disable=SC2046 # allow MAKEFLAGS to split when passing multiple flags.
+  ninja $(grep -oP -- '-+[A-z]+ ?[0-9]*'<<<"${MAKEFLAGS:--j1}") -C "${srcdir}/build"
 }
 
 check() {
-  if ((DISABLE_MESON)); then
-    cd $_pkgname
-    xvfb-run make check
-#   xvfb-run make distcheck
-  else
-    ninja -C "${srcdir}/build" test
-  fi
+  ninja -C "${srcdir}/build" test
 }
 
 package() {
-  if ((DISABLE_MESON)); then
-    cd $_pkgname
-    make DESTDIR="${pkgdir}" install
-  else
-    DESTDIR="${pkgdir}" ninja -C "${srcdir}/build" install
-  fi
+  DESTDIR="${pkgdir}" ninja -C "${srcdir}/build" install
   install -Dm 644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.99/palettes/Linux.gpl"
 }