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

[Balló György]

    Date: Thursday, June 3, 2021 @ 17:17:10
  Author: bgyorgy
Revision: 955702

upgpkg: libpillowfight 0.3.0-4: Fix build

Modified:
  libpillowfight/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-03 17:00:00 UTC (rev 955701)
+++ PKGBUILD	2021-06-03 17:17:10 UTC (rev 955702)
@@ -3,13 +3,13 @@
 pkgbase=libpillowfight
 pkgname=(libpillowfight python-pillowfight)
 pkgver=0.3.0
-pkgrel=3
-pkgdesc="Small library containing various image processing algorithms"
-arch=(x86_64)
-url="https://gitlab.gnome.org/World/OpenPaperwork/libpillowfight"
-license=(GPL2)
-depends=(glibc python-pillow)
-makedepends=(cmake git python-setuptools)
+pkgrel=4
+pkgdesc='Small library containing various image processing algorithms'
+arch=('x86_64')
+url='https://gitlab.gnome.org/World/OpenPaperwork/libpillowfight'
+license=('GPL2')
+depends=('glibc' 'python-pillow')
+makedepends=('cmake' 'git' 'ninja' 'python-nose' 'python-setuptools')
 _commit=dae21f97de872e4ad2e94f1b0fc53302a00259fd  # tags/0.3.0^0
 source=("git+https://gitlab.gnome.org/World/OpenPaperwork/libpillowfight.git#commit=$_commit")
 sha256sums=('SKIP')
@@ -19,27 +19,19 @@
   git describe --tags | sed 's/-/+/g'
 }
 
-prepare() {
-  [[ -d build ]] || mkdir build
-}
+build() {
+  make -C $pkgbase src/pillowfight/_version.h
+  cmake -S $pkgbase -B build -G Ninja -DCMAKE_INSTALL_PREFIX='/usr'
+  cmake --build build
 
-
-build() {
   cd $pkgbase
-  make build_py
-
-  cd ../build
-  cmake -G "Unix Makefiles" ../$pkgbase/ \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-
+  python setup.py build
 }
 
 package_libpillowfight() {
   depends=(glibc)
 
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }
 
 package_python-pillowfight() {
@@ -46,5 +38,5 @@
   depends=(python-pillow)
 
   cd $pkgbase
-  python3 setup.py install --root="$pkgdir" --optimize=1
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }