Update PKGBUILD

Synchronize the PKGBUILD with that one of the official package.

Note: Many tests fail, but so happens with the official package
      => we leave the check function as is.

2 files changed, 33 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e7e28f044b3..a571b6b596fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = img2pdf-git
 	pkgdesc = Losslessly convert raster images to PDF
-	pkgver = 0.4.0.r8.b5f0912
+	pkgver = 0.4.3.r11.ge8ca537
 	pkgrel = 1
 	epoch = 1
 	url = https://gitlab.mister-muffin.de/josch/img2pdf
 	arch = any
 	license = LGPL3
 	checkdepends = python-pytest
-	checkdepends = python-pdfrw
 	checkdepends = python-numpy
 	checkdepends = python-scipy
 	checkdepends = python-lxml
@@ -15,6 +14,7 @@ pkgbase = img2pdf-git
 	checkdepends = ghostscript
 	checkdepends = imagemagick
 	checkdepends = mupdf-tools
+	checkdepends = openjpeg2
 	checkdepends = poppler
 	checkdepends = perl-image-exiftool
 	checkdepends = netpbm
@@ -22,14 +22,9 @@ pkgbase = img2pdf-git
 	makedepends = python-setuptools
 	depends = python-pillow
 	depends = python-pikepdf
-	optdepends = tk: experimental tkinter GUI /usr/bin/img2pdf-gui
-	provides = img2pdf=0.4.0
-	provides = python-img2pdf=0.4.0
+	provides = img2pdf
 	conflicts = img2pdf
-	conflicts = python-img2pdf
-	conflicts = python-img2pdf-git
-	source = git+https://gitlab.mister-muffin.de/josch/img2pdf.git
+	source = git+https://gitlab.mister-muffin.de/josch/img2pdf
 	md5sums = SKIP
 
 pkgname = img2pdf-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 077d8a0c6a90..bfef25683f4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,52 @@
-# Maintainer: Darren Ng <$(base64 --decode <<<VW4xR2ZuQGdtYWlsLmNvbQo=)>
-# Maintainer : Özgür Sarıer <echo b3pndXJzYXJpZXIxMDExNjAxMTE1QGdtYWlsLmNvbQo= | base64 -d>
+# Contributor: Bruno Pagani <archange@archlinux.org>
+# Contributor: Darren Ng <$(base64 --decode <<<VW4xR2ZuQGdtYWlsLmNvbQo=)>
+# Contributor : Özgür Sarıer <echo b3pndXJzYXJpZXIxMDExNjAxMTE1QGdtYWlsLmNvbQo= | base64 -d>
 # Contributor: Brandon Invergo <brandon@invergo.net>
 
-# https://github.com/archlinux/svntogit-community/blob/packages/img2pdf/trunk/PKGBUILD
-
 pkgname=img2pdf-git
-pkgver=0.4.0.r8.b5f0912
+pkgver=0.4.3.r11.ge8ca537
 pkgrel=1
 epoch=1
 pkgdesc='Losslessly convert raster images to PDF'
 arch=(any)
-url=https://gitlab.mister-muffin.de/josch/"${pkgname%-*}"
+url="https://gitlab.mister-muffin.de/josch/img2pdf"
 license=(LGPL3)
-
 depends=(python-pillow python-pikepdf)
 makedepends=(git python-setuptools)
-checkdepends=(python-pytest python-pdfrw python-numpy python-scipy python-lxml
-              colord ghostscript imagemagick mupdf-tools poppler perl-image-exiftool netpbm)
-optdepends=('tk: experimental tkinter GUI /usr/bin/img2pdf-gui')
-
-# https://man.archlinux.org/man/bash.1#Parameter_Expansion
-provides=( {,python-}"${pkgname%-*}=${pkgver/.r*/}"                 ) # =${pkgver:0:5}
-conflicts=({,python-}"${pkgname%-*}"                python-$pkgname )
-source=(git+https://gitlab.mister-muffin.de/josch/"${pkgname%-*}".git)
+checkdepends=(python-pytest python-numpy python-scipy python-lxml
+              colord ghostscript imagemagick mupdf-tools openjpeg2 poppler perl-image-exiftool netpbm)
+provides=('img2pdf')
+conflicts=('img2pdf')
+source=("git+${url}")
 md5sums=(SKIP)
 
 pkgver() {
-	cd "$srcdir/${pkgname%-*}"
-  printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+    cd ${pkgname%-git}
+    git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
 }
 
 build() {
-	cd "$srcdir/${pkgname%-*}"
-	python setup.py build
+    cd ${pkgname%-git}
+    python setup.py build
 }
 
 check() {
-
-  cd "$srcdir/${pkgname%-*}"
-
-  local _gsverdash="$(expac %v ghostscript)" # 9.53.3-3
-  local _gsver=${_gsverdash/-*/} # 9.53.3
-  sed \
-    -e 's|Joint Photographic Experts Group JFIF format|JPEG|g' \
-    -e 's|JPEG-2000 File Format Syntax|JP2|g' \
-    -e 's|Portable Network Graphics|PNG|g' \
-    -e 's|Tagged Image File Format|TIFF|g' \
-    -e 's|CompuServe graphics interchange format|GIF|g' \
-    -e 's|endianess|endianness|g' \
-    -e "s|/usr/share/color/icc/ghostscript/srgb.icc|/usr/share/ghostscript/$_gsver/iccprofiles/srgb.icc|g" \
-    -i src/img2pdf_test.py
-
-  # Failures with checksuming and Zip vs None compression and more
-  # python -m pytest || { echo "Tests failed"; return 1; }
-  # pytest
-  pytest --exitfirst || printf "\n${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} At least one test has failed${ALL_OFF}\n\n" >&2
-  # /usr/share/makepkg/util/message.sh
-
+    cd ${pkgname%-git}
+    # Different output on Arch?
+    sed -e 's|Joint Photographic Experts Group JFIF format|JPEG|g' \
+        -e 's|JPEG-2000 File Format Syntax|JP2|g' \
+        -e 's|Portable Network Graphics|PNG|g' \
+        -e 's|Tagged Image File Format|TIFF|g' \
+        -e 's|CompuServe graphics interchange format|GIF|g' \
+        -i src/img2pdf_test.py
+    sed 's|usr/share/color/icc/sRGB.icc|usr/share/color/icc/colord/sRGB.icc|g' -i src/img2pdf_test.py
+    # Failures with depth
+    python -m pytest || echo "Tests failed"
 }
 
 package() {
-	cd "$srcdir/${pkgname%-*}"
-  # export PYTHONHASHSEED=0
-	python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+    cd ${pkgname%-git}
+    python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 --skip-build
 }
+
+# vim: set ts=4 sw=4 et: