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

[Balló György]

    Date: Tuesday, January 23, 2018 @ 00:56:38
  Author: bgyorgy
Revision: 285337

upgpkg: cuneiform 1.1.0-19

Adopt the package, rebuild with libmagick 7

Modified:
  cuneiform/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-22 23:47:30 UTC (rev 285336)
+++ PKGBUILD	2018-01-23 00:56:38 UTC (rev 285337)
@@ -1,52 +1,38 @@
 # $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: Maxim Vuets <maxim.vuets at gmail.com>
 
 pkgname=cuneiform
 pkgver=1.1.0
-_dpkgver=1.1
-pkgrel=18
-pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
+pkgrel=19
+pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages"
 arch=('x86_64')
 url="https://launchpad.net/cuneiform-linux"
 license=('BSD')
-depends=('libmagick6')
+depends=('libmagick')
 makedepends=('cmake')
-source=(https://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2
+source=(https://launchpad.net/cuneiform-linux/${pkgver%.*}/${pkgver%.*}/+download/$pkgname-linux-$pkgver.tar.bz2
 	build-fix.patch)
 sha256sums=('577e0d054de72086c33b4e8ae15033657776509b9a7af6eb272888eefcbdbbad'
             '3d9f4d923ec6ca5555550819096b7d66e364a8aeb74a9d1f0d961784d267642b')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-linux-${pkgver}"
-  sed -i 's#lib64#lib#' install_files.cmake
-  patch -p1 -i "$srcdir"/build-fix.patch
+  cd $pkgname-linux-$pkgver
+  patch -Np1 -i ../build-fix.patch
+  sed -i 's/lib64/lib/' install_files.cmake
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-linux-${pkgver}"
-  mkdir -p builddir
-  cd builddir
-
-  LMAGICK=`ls -1 /usr/lib/libMagick++*.so.?`
-
-  cmake \
-	-DCMAKE_BUILD_TYPE=release \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DImageMagick_Magick++_LIBRARY=$LMAGICK \
-	-DImageMagick_Magick++_INCLUDE_DIR=/usr/include/ImageMagick-6 \
-	..
+  cd $pkgname-linux-$pkgver
+  [[ -d build ]] || mkdir build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
   make
 }
 
-check() {
-  ldd "${srcdir}/${pkgname}-linux-${pkgver}/builddir/cuneiform" | grep Magick >/dev/null
-}
-
 package() {
-  cd "${srcdir}/${pkgname}-linux-${pkgver}"/builddir
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}/${pkgname}-linux-${pkgver}/cuneiform_src/Kern/license.txt" \
-    "${pkgdir}/usr/share/licenses/cuneiform/license.txt"
+  cd $pkgname-linux-$pkgver/build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../cuneiform_src/Kern/license.txt "$pkgdir/usr/share/licenses/cuneiform/license.txt"
 }