Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / 
gimagereader


Commits:
fc4e8afe by Caleb Maclennan at 2024-02-05T12:39:01+03:00
upgpkg: 3.4.2-1

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- − openmp.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = gimagereader
        pkgdesc = Gtk/Qt front-end to tesseract-ocr
-       pkgver = 3.4.1
-       pkgrel = 4
+       pkgver = 3.4.2
+       pkgrel = 1
        url = https://github.com/manisandro/gImageReader
        arch = x86_64
        license = GPL3
@@ -23,14 +23,8 @@ pkgbase = gimagereader
        depends = quazip-qt6
        depends = sane
        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
+       source = 
https://github.com/manisandro/gImageReader/releases/download/v3.4.2/gimagereader-3.4.2.tar.xz
+       sha256sums = 
184cafe57d86ffc4115ce76e29a47f0d627655de46b7890dffbb82267091a264
 
 pkgname = gimagereader-gtk
        pkgdesc = Gtk front-end to tesseract-ocr


=====================================
PKGBUILD
=====================================
@@ -3,8 +3,8 @@
 
 pkgbase=gimagereader
 pkgname=(gimagereader-gtk gimagereader-qt gimagereader-common)
-pkgver=3.4.1
-pkgrel=4
+pkgver=3.4.2
+pkgrel=1
 url='https://github.com/manisandro/gImageReader'
 pkgdesc='Gtk/Qt front-end to tesseract-ocr'
 arch=('x86_64')
@@ -12,26 +12,8 @@ license=('GPL3')
 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'
-        'https://github.com/manisandro/gImageReader/commit/7a162b83.patch'
-        'https://github.com/manisandro/gImageReader/commit/54b7b9cf.patch')
-sha256sums=('8c57a60113b14b9f94dce20a8394a59cb8df2acb57f80d0e5c6f2e31ed5ee2a4'
-            'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2'
-            '1851220ca6810850dd68c12f366840f7f070e8197e523cce66ff48fecd796ad9'
-            '65c140079387be4ce7de582d6c39729e2a9ff5b9eda5ab1b5368905de05d6d15')
-
-prepare() {
-  cd $pkgbase-$pkgver
-
-  # Run OpenMP once before calling tesseract
-  # 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
-}
+source=("$url/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz")
+sha256sums=('184cafe57d86ffc4115ce76e29a47f0d627655de46b7890dffbb82267091a264')
 
 build() {
   cmake -S $pkgbase-$pkgver -B build-gtk -G Ninja \


=====================================
openmp.patch deleted
=====================================
@@ -1,26 +0,0 @@
-From 122ed08d72265e3abb02c48c4be804d793058fc9 Mon Sep 17 00:00:00 2001
-From: Philip Rinn <ri...@inventati.org>
-Date: Fri, 5 Jan 2018 15:22:47 +0100
-Subject: [PATCH] Run OpenMP once before calling tesseract (fixes: #285)
-
----
- gtk/src/main.cc | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/gtk/src/main.cc b/gtk/src/main.cc
-index a2668e4..9fec77a 100644
---- a/gtk/src/main.cc
-+++ b/gtk/src/main.cc
-@@ -94,6 +94,12 @@ int main (int argc, char *argv[]) {
-       }
- #endif
- 
-+    // Run OpenMP once before tesseract is called, otherwise it might be
-+    // _very_ slow, see https://github.com/manisandro/gImageReader/issues/285
-+    // Sleep 1 millisecond to prevent being optimized out.
-+    #pragma omp parallel for schedule(static)
-+    for(int i = 0; i < 1; i++) { sleep(1); }
-+
-       std::string localeDir = Glib::build_filename(pkgDir, "share", "locale");
- 
-       bindtextdomain(GETTEXT_PACKAGE, localeDir.c_str());



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

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


Reply via email to