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

[Eli Schwartz]

    Date: Friday, November 27, 2020 @ 08:27:42
  Author: eschwartz
Revision: 763990

upgpkg: nemo-extensions 4.8.0-1: upstream release

nemo-preview ported to meson, so adapt build pattern to suit

Modified:
  nemo-extensions/trunk/PKGBUILD

----------+
 PKGBUILD |   50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-27 08:22:49 UTC (rev 763989)
+++ PKGBUILD	2020-11-27 08:27:42 UTC (rev 763990)
@@ -17,8 +17,8 @@
         #'nemo-media-columns'
         #'nemo-pastebin'
         #'nemo-repairer'
-pkgver=4.6.0
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 pkgdesc="Various extensions for Nemo"
 arch=('x86_64')
 license=('GPL2')
@@ -31,8 +31,8 @@
 makedepends+=("${_preview_deps[@]}" "${_python_deps[@]}" "${_seahorse_deps[@]}")
 options=('!emptydirs')
 source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz")
-sha256sums=('f656a65ebb4454180f5dcddbb063c14410f38125151e762fc695993685d64edd')
-b2sums=('83ce84f78a1b991edc7eca156ce7ddb792b70e467004671a00a713227488ca96576c9ab280805eff71090dc47b6eecfdeec636aa4e20d046e38241cba95de987')
+sha256sums=('1b7b85b41c659fe0f93a9b83fadb81a7934c7e7cb2df9eda4a03413b7f5d05c4')
+b2sums=('624e1197f5adbf2d5eac5d80d17d9d551beac2991a5e80a72cdddb9f5abe7b645a2988cf35b928479f8f2cc92ea57cd84fc40fd43c09643bfd8a92e0027819bb')
 
 prepare() {
     cd "${srcdir}"/${pkgbase}-${pkgver}
@@ -55,25 +55,29 @@
     cd "${srcdir}"/${pkgbase}-${pkgver}
 
     for _dir in "${pkgname[@]}"; do
-        if ! [[ -f ${_dir}/configure ]]; then
-            continue
+        if [[ -f ${_dir}/configure ]]; then
+            pushd ${_dir}
+            ./configure --prefix=/usr \
+                        --sysconfdir=/etc \
+                        --localstatedir=/var \
+                        --libexecdir=/usr/lib/${_dir} \
+                        --disable-schemas-compile
+            sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' \
+                   -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+            make
+            popd
+        elif [[ -f ${_dir}/meson.build ]]; then
+            mkdir -p ${_dir}/builddir
+            pushd ${_dir}/builddir
+            meson --prefix=/usr \
+                  --libexecdir=lib/${_dir} \
+                  --buildtype=plain \
+                  ..
+            samu
+            popd
         fi
-        pushd ${_dir}
-        ./configure --prefix=/usr \
-                    --sysconfdir=/etc \
-                    --localstatedir=/var \
-                    --libexecdir=/usr/lib/${_dir} \
-                    --disable-schemas-compile
-        sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-        make
-        popd
     done
 
-    mkdir -p nemo-python/build
-    pushd nemo-python/build
-    meson --prefix=/usr --buildtype=plain ..
-    samu
-
     # # nemo-pastebin
     # cd nemo-pastebin
     # python2 ./setup.py build --build-base ${srcdir}/build/ || return 1
@@ -107,8 +111,8 @@
     depends+=("${_preview_deps[@]}")
     optdepends=('cinnamon-translations: i18n')
 
-    cd "${srcdir}"/${pkgbase}-${pkgver}/${pkgname}
-    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}"/${pkgbase}-${pkgver}/${pkgname}/builddir
+    DESTDIR="${pkgdir}" samu install
 }
 
 package_nemo-python() {
@@ -115,7 +119,7 @@
     pkgdesc="Python3 binding for Nemo components"
     depends+=("${_python_deps[@]}")
 
-    cd "${srcdir}"/${pkgbase}-${pkgver}/${pkgname}/build
+    cd "${srcdir}"/${pkgbase}-${pkgver}/${pkgname}/builddir
     DESTDIR="${pkgdir}" samu install
 }