Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
gimagereader


Commits:
9ab5dad7 by Antonio Rojas at 2023-11-29T09:57:21+01:00
upgpkg: 3.4.1-4: Use podofo 0.10

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = gimagereader
        pkgdesc = Gtk/Qt front-end to tesseract-ocr
        pkgver = 3.4.1
-       pkgrel = 3
+       pkgrel = 4
        url = https://github.com/manisandro/gImageReader
        arch = x86_64
        license = GPL3
@@ -15,7 +15,7 @@ pkgbase = gimagereader
        depends = libtesseract.so
        depends = libxml++
        depends = libzip
-       depends = podofo-0.9
+       depends = podofo
        depends = poppler-glib
        depends = poppler-qt6
        depends = qt6-imageformats
@@ -25,8 +25,12 @@ pkgbase = gimagereader
        depends = tesseract
        source = 
https://github.com/manisandro/gImageReader/releases/download/v3.4.1/gimagereader-3.4.1.tar.xz
        source = openmp.patch
+       source = 
https://github.com/manisandro/gImageReader/commit/7a162b83.patch
+       source = 
https://github.com/manisandro/gImageReader/commit/54b7b9cf.patch
        sha256sums = 
8c57a60113b14b9f94dce20a8394a59cb8df2acb57f80d0e5c6f2e31ed5ee2a4
        sha256sums = 
ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2
+       sha256sums = 
1851220ca6810850dd68c12f366840f7f070e8197e523cce66ff48fecd796ad9
+       sha256sums = 
65c140079387be4ce7de582d6c39729e2a9ff5b9eda5ab1b5368905de05d6d15
 
 pkgname = gimagereader-gtk
        pkgdesc = Gtk front-end to tesseract-ocr
@@ -36,7 +40,7 @@ pkgname = gimagereader-gtk
        depends = gtkspellmm
        depends = libxml++
        depends = libzip
-       depends = podofo-0.9
+       depends = podofo
        depends = poppler-glib
        depends = sane
        depends = tesseract
@@ -45,7 +49,7 @@ pkgname = gimagereader-qt
        pkgdesc = Qt front-end to tesseract-ocr
        depends = gimagereader-common
        depends = djvulibre
-       depends = podofo-0.9
+       depends = podofo
        depends = poppler-qt6
        depends = qt6-imageformats
        depends = qtspell


=====================================
PKGBUILD
=====================================
@@ -4,18 +4,22 @@
 pkgbase=gimagereader
 pkgname=(gimagereader-gtk gimagereader-qt gimagereader-common)
 pkgver=3.4.1
-pkgrel=3
+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' 'libtesseract.so' 
'libxml++' 'libzip' 'podofo-0.9' 'poppler-glib'
+depends=('djvulibre' 'gtksourceviewmm' 'gtkspellmm' 'libtesseract.so' 
'libxml++' 'libzip' 'podofo' 'poppler-glib'
          'poppler-qt6' 'qt6-imageformats' 'qtspell' 'quazip-qt6' 'sane' 
'tesseract')
 makedepends=('cmake' 'intltool' 'ninja' 'python-gobject')
 source=("$url/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz"
-        'openmp.patch')
+        'openmp.patch'
+        'https://github.com/manisandro/gImageReader/commit/7a162b83.patch'
+        'https://github.com/manisandro/gImageReader/commit/54b7b9cf.patch')
 sha256sums=('8c57a60113b14b9f94dce20a8394a59cb8df2acb57f80d0e5c6f2e31ed5ee2a4'
-            'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2')
+            'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2'
+            '1851220ca6810850dd68c12f366840f7f070e8197e523cce66ff48fecd796ad9'
+            '65c140079387be4ce7de582d6c39729e2a9ff5b9eda5ab1b5368905de05d6d15')
 
 prepare() {
   cd $pkgbase-$pkgver
@@ -24,11 +28,12 @@ prepare() {
   # https://github.com/manisandro/gImageReader/issues/285
   patch -Np1 -i ../openmp.patch
 
+  # Fix build with podofo 0.10
+  patch -p1 -i ../7a162b83.patch
+  patch -p1 -i ../54b7b9cf.patch
 }
 
 build() {
-  export PKG_CONFIG_PATH=/usr/lib/podofo-0.9/pkgconfig
-
   cmake -S $pkgbase-$pkgver -B build-gtk -G Ninja \
     -DCMAKE_INSTALL_PREFIX='/usr' \
     -DINTERFACE_TYPE=gtk
@@ -43,7 +48,7 @@ build() {
 package_gimagereader-gtk() {
   pkgdesc='Gtk front-end to tesseract-ocr'
   depends=('gimagereader-common' 'djvulibre' 'gtksourceviewmm' 'gtkspellmm' 
'libxml++' 'libzip'
-           'podofo-0.9' 'poppler-glib' 'sane' 'tesseract')
+           'podofo' 'poppler-glib' 'sane' 'tesseract')
 
   DESTDIR="$pkgdir" cmake --install build-gtk
 
@@ -54,7 +59,7 @@ package_gimagereader-gtk() {
 
 package_gimagereader-qt() {
   pkgdesc='Qt front-end to tesseract-ocr'
-  depends=('gimagereader-common' 'djvulibre' 'podofo-0.9' 'poppler-qt6' 
'qt6-imageformats' 'qtspell'
+  depends=('gimagereader-common' 'djvulibre' 'podofo' 'poppler-qt6' 
'qt6-imageformats' 'qtspell'
            'quazip-qt6' 'sane' 'tesseract')
 
   DESTDIR="$pkgdir" cmake --install build-qt



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gimagereader/-/commit/9ab5dad7a7476e60d3224a93672cc5d8869b5038

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gimagereader/-/commit/9ab5dad7a7476e60d3224a93672cc5d8869b5038
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to