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

[Balló György]

    Date: Monday, June 7, 2021 @ 12:06:11
  Author: bgyorgy
Revision: 957501

upgpkg: gimagereader 3.3.1-4: Remove desktop-file-utils dependency

Modified:
  gimagereader/trunk/PKGBUILD

----------+
 PKGBUILD |   68 +++++++++++++++++++++++++++----------------------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-07 12:06:01 UTC (rev 957500)
+++ PKGBUILD	2021-06-07 12:06:11 UTC (rev 957501)
@@ -3,19 +3,19 @@
 pkgbase=gimagereader
 pkgname=(gimagereader-gtk gimagereader-qt gimagereader-common)
 pkgver=3.3.1
-pkgrel=3
-url="https://github.com/manisandro/gImageReader"
-pkgdesc="Gtk/Qt front-end to tesseract-ocr"
-arch=(x86_64)
-license=(GPL3)
-depends=(desktop-file-utils djvulibre gtksourceviewmm gtkspellmm libxml++ libzip podofo
-         poppler-glib poppler-qt5 qt5-imageformats qtspell quazip sane tesseract)
-makedepends=(cmake intltool python-gobject)
-source=(https://github.com/manisandro/gImageReader/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz
-        openmp.patch
-        gimagereader-quazip1.patch
-        gimagereader-qt5.14.patch::"https://github.com/manisandro/gImageReader/commit/6209e25d.patch"
-        gimagereader-automoc.patch)
+pkgrel=4
+url='https://github.com/manisandro/gImageReader'
+pkgdesc='Gtk/Qt front-end to tesseract-ocr'
+arch=('x86_64')
+license=('GPL3')
+depends=('djvulibre' 'gtksourceviewmm' 'gtkspellmm' 'libxml++' 'libzip' 'podofo' 'poppler-glib'
+         'poppler-qt5' 'qt5-imageformats' 'qtspell' 'quazip' 'sane' 'tesseract')
+makedepends=('cmake' 'intltool' 'ninja' 'python-gobject')
+source=("https://github.com/manisandro/gImageReader/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz"
+        'openmp.patch'
+        'gimagereader-quazip1.patch'
+        'gimagereader-qt5.14.patch::https://github.com/manisandro/gImageReader/commit/6209e25d.patch'
+        'gimagereader-automoc.patch')
 sha256sums=('7688c9c20cbf2fa4f5b6ba0a8d77bd8d2e5929882ed965c7c07ccc529673f0dd'
             'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2'
             '0b432d99e79ab49c8ffff9763ba436a105684dcacf405af9e41d6065edb2a876'
@@ -23,10 +23,6 @@
             '37668af2c039d756b1661078610aed07120d88441cc38851a2563dc2f8fac4a5')
 
 prepare() {
-  [[ -d build-gtk ]] || mkdir build-gtk
-  [[ -d build-qt ]] || mkdir build-qt
-  [[ -d gimagereader-common ]] || mkdir gimagereader-common
-
   cd $pkgbase-$pkgver
 
   # Run OpenMP once before calling tesseract
@@ -39,37 +35,35 @@
 }
 
 build() {
-  cd build-gtk
-  cmake -G "Unix Makefiles" ../$pkgbase-$pkgver/ \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake -S $pkgbase-$pkgver -B build-gtk -G Ninja \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
     -DINTERFACE_TYPE=gtk
-  make
+  cmake --build build-gtk
 
-  cd ../build-qt
-  cmake -G "Unix Makefiles" ../$pkgbase-$pkgver/ \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake -S $pkgbase-$pkgver -B build-qt -G Ninja \
+    -DCMAKE_INSTALL_PREFIX='/usr' \
     -DINTERFACE_TYPE=qt5
-  make
+  cmake --build build-qt
 }
 
 package_gimagereader-gtk() {
-  pkgdesc="Gtk front-end to tesseract-ocr"
-  depends=(gimagereader-common djvulibre gtksourceviewmm gtkspellmm libxml++ libzip podofo poppler-glib sane tesseract)
+  pkgdesc='Gtk front-end to tesseract-ocr'
+  depends=('gimagereader-common' 'djvulibre' 'gtksourceviewmm' 'gtkspellmm' 'libxml++' 'libzip'
+           'podofo' 'poppler-glib' 'sane' 'tesseract')
 
-  cd build-gtk
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build-gtk
 
   # Split gimagereader-common
-  mv "$pkgdir"/usr/share/{doc,icons,locale} \
-     "$srcdir/gimagereader-common/"
+  mkdir gimagereader-common
+  mv "$pkgdir"/usr/share/{doc,icons,locale} gimagereader-common
 }
 
 package_gimagereader-qt() {
-  pkgdesc="Qt front-end to tesseract-ocr"
-  depends=(gimagereader-common desktop-file-utils djvulibre podofo poppler-qt5 qt5-imageformats qtspell quazip sane tesseract)
+  pkgdesc='Qt front-end to tesseract-ocr'
+  depends=('gimagereader-common' 'djvulibre' 'podofo' 'poppler-qt5' 'qt5-imageformats' 'qtspell'
+           'quazip' 'sane' 'tesseract')
 
-  cd build-qt
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build-qt
 
   # Split gimagereader-common
   rm -r "$pkgdir"/usr/share/{doc,icons,locale}
@@ -76,8 +70,8 @@
 }
 
 package_gimagereader-common() {
-  pkgdesc="Common files for gImageReader"
-  depends=(hicolor-icon-theme)
+  pkgdesc='Common files for gImageReader'
+  depends=('hicolor-icon-theme')
 
   mkdir -p "$pkgdir"/usr/share
   mv gimagereader-common/* "$pkgdir/usr/share"