cuneiform-1.1.0-19.parabola1: rebuild

1 files changed, 17 insertions, 31 deletions

diff --git a/libre/cuneiform/PKGBUILD b/libre/cuneiform/PKGBUILD
index 7dfe89ded..a626d95db 100644
--- a/libre/cuneiform/PKGBUILD
+++ b/libre/cuneiform/PKGBUILD
@@ -1,20 +1,20 @@
 # $Id: PKGBUILD 200098 2016-12-18 10:27:54Z arojas $
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
+# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor (Arch): Maxim Vuets <maxim.vuets@gmail.com>
 # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=cuneiform
 pkgver=1.1.0
-_dpkgver=1.1
-pkgrel=18.parabola1
+pkgrel=19.parabola1
 pkgdesc="GNU/Linux port of an OCR system developed in Russia. Supports more than 20 languages, without nonfree data files"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://launchpad.net/cuneiform-linux"
 license=('BSD')
-depends=('libmagick6')
+depends=('libmagick')
 makedepends=('cmake')
-mksource=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2)
+mksource=(https://launchpad.net/cuneiform-linux/${pkgver%.*}/${pkgver%.*}/+download/$pkgname-linux-$pkgver.tar.bz2)
 source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.bz2"
         'build-fix.patch'
         'libre.patch')
@@ -24,42 +24,28 @@ sha256sums=('714b740d79c4799ec1bd340e3721d17f6d0e09ae54cd5667a01eddc8c4b758b4'
             '9db29dcd11faf92ed68d4af35c659b6f5e96b0864c15342be8e014817af8be2d')
 
 mksource() {
-  mv "${srcdir}/${pkgname}-linux-${pkgver}" "${srcdir}/${pkgname}-${pkgver}"
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  mv "$srcdir/$pkgname-linux-$pkgver" "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   rm -rv datafiles
 }
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#lib64#lib#' install_files.cmake
-  patch -p1 -i "$srcdir"/build-fix.patch
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../build-fix.patch
+  sed -i 's/lib64/lib/' install_files.cmake
   patch -p1 -i ../libre.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${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-$pkgver
+  [[ -d build ]] || mkdir build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
   make
 }
 
-check() {
-  ldd "${srcdir}/${pkgname}-${pkgver}/builddir/cuneiform" | grep Magick >/dev/null
-}
-
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"/builddir
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/cuneiform_src/Kern/license.txt" \
-    "${pkgdir}/usr/share/licenses/cuneiform/license.txt"
+  cd $pkgname-$pkgver/build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../cuneiform_src/Kern/license.txt "$pkgdir/usr/share/licenses/cuneiform/license.txt"
 }