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

Antonio Rojas arojas at archlinux.org
Mon Aug 26 10:22:15 UTC 2019


    Date: Monday, August 26, 2019 @ 10:22:15
  Author: arojas
Revision: 502117

Update to 3.3.1

Modified:
  gimagereader/trunk/PKGBUILD
Deleted:
  gimagereader/trunk/setlocale.patch

-----------------+
 PKGBUILD        |   10 +------
 setlocale.patch |   72 ------------------------------------------------------
 2 files changed, 2 insertions(+), 80 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-26 10:18:03 UTC (rev 502116)
+++ PKGBUILD	2019-08-26 10:22:15 UTC (rev 502117)
@@ -2,7 +2,7 @@
 
 pkgbase=gimagereader
 pkgname=(gimagereader-gtk gimagereader-qt gimagereader-common)
-pkgver=3.3.0
+pkgver=3.3.1
 pkgrel=1
 url="https://github.com/manisandro/gImageReader"
 pkgdesc="Gtk/Qt front-end to tesseract-ocr"
@@ -12,10 +12,8 @@
          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
-        setlocale.patch
         openmp.patch)
-sha256sums=('91615af41e89170aadaae68cb0db94eb62abdd5b308e8a5162477ba9baf6efe9'
-            'd007abed0fd16e3db340b3d5114a7de7b7b1cdb858f9fce51655df98a02c1baa'
+sha256sums=('7688c9c20cbf2fa4f5b6ba0a8d77bd8d2e5929882ed965c7c07ccc529673f0dd'
             'ee84de7fee390ee54152b4e332e50d8f585b0c9a3aa8b40a04f865b5250607c2')
 
 prepare() {
@@ -25,10 +23,6 @@
 
   cd $pkgbase-$pkgver
 
-  # Set locale to C before constructing TessBaseAPI
-  # https://github.com/manisandro/gImageReader/issues/375
-  patch -Np1 -i ../setlocale.patch
-
   # Run OpenMP once before calling tesseract
   # https://github.com/manisandro/gImageReader/issues/285
   patch -Np1 -i ../openmp.patch

Deleted: setlocale.patch
===================================================================
--- setlocale.patch	2019-08-26 10:18:03 UTC (rev 502116)
+++ setlocale.patch	2019-08-26 10:22:15 UTC (rev 502117)
@@ -1,72 +0,0 @@
-From 46390fee9a01ea7c4d85cd0757a6a258c8ebe600 Mon Sep 17 00:00:00 2001
-From: Sandro Mani <manisandro at gmail.com>
-Date: Sun, 30 Sep 2018 23:35:26 +0200
-Subject: [PATCH] Set locale to C before constructing TessBaseAPI
-
----
- gtk/src/Recognizer.cc            | 3 +++
- gtk/src/hocr/OutputEditorHOCR.cc | 3 +++
- qt/src/Recognizer.cc             | 3 +++
- qt/src/hocr/OutputEditorHOCR.cc  | 3 +++
- 4 files changed, 12 insertions(+)
-
-diff --git a/gtk/src/Recognizer.cc b/gtk/src/Recognizer.cc
-index 564a3f2..2cbeb93 100644
---- a/gtk/src/Recognizer.cc
-+++ b/gtk/src/Recognizer.cc
-@@ -148,7 +148,10 @@ static void tessCrashHandler(int /*signal*/) {
- 			captured += buf;
- 		}
- 	} while(bytesRead == sizeof(buf) - 1);
-+	std::string current = setlocale(LC_ALL, NULL);
-+	setlocale(LC_ALL, "C");
- 	tesseract::TessBaseAPI tess;
-+	setlocale(LC_ALL, current.c_str());
- 	Glib::ustring errMsg = Glib::ustring::compose(_("Tesseract crashed with the following message:\n\n"
- 	                       "%1\n\n"
- 	                       "This typically happens for one of the following reasons:\n"
-diff --git a/gtk/src/hocr/OutputEditorHOCR.cc b/gtk/src/hocr/OutputEditorHOCR.cc
-index ffd7250..45679df 100644
---- a/gtk/src/hocr/OutputEditorHOCR.cc
-+++ b/gtk/src/hocr/OutputEditorHOCR.cc
-@@ -972,7 +972,10 @@ bool OutputEditorHOCR::save(const std::string& filename) {
- 		Utils::message_dialog(Gtk::MESSAGE_ERROR, _("Failed to save output"), _("Check that you have writing permissions in the selected folder."));
- 		return false;
- 	}
-+	std::string current = setlocale(LC_ALL, NULL);
-+	setlocale(LC_ALL, "C");
- 	tesseract::TessBaseAPI tess;
-+	setlocale(LC_ALL, current.c_str());
- 	Glib::ustring header = Glib::ustring::compose(
- 	                           "<!DOCTYPE html>\n"
- 	                           "<html>\n"
-diff --git a/qt/src/Recognizer.cc b/qt/src/Recognizer.cc
-index 0c4b0dd..7ff38cb 100644
---- a/qt/src/Recognizer.cc
-+++ b/qt/src/Recognizer.cc
-@@ -135,7 +135,10 @@ static void tessCrashHandler(int /*signal*/) {
- 			captured += buf;
- 		}
- 	} while(bytesRead == sizeof(buf) - 1);
-+	QByteArray current = setlocale(LC_ALL, NULL);
-+	setlocale(LC_ALL, "C");
- 	tesseract::TessBaseAPI tess;
-+	setlocale(LC_ALL, current.constData());
- 	QString errMsg = QString(_("Tesseract crashed with the following message:\n\n"
- 	                           "%1\n\n"
- 	                           "This typically happens for one of the following reasons:\n"
-diff --git a/qt/src/hocr/OutputEditorHOCR.cc b/qt/src/hocr/OutputEditorHOCR.cc
-index bb3759a..c59e3ee 100644
---- a/qt/src/hocr/OutputEditorHOCR.cc
-+++ b/qt/src/hocr/OutputEditorHOCR.cc
-@@ -842,7 +842,10 @@ bool OutputEditorHOCR::save(const QString& filename) {
- 		QMessageBox::critical(MAIN, _("Failed to save output"), _("Check that you have writing permissions in the selected folder."));
- 		return false;
- 	}
-+	QByteArray current = setlocale(LC_ALL, NULL);
-+	setlocale(LC_ALL, "C");
- 	tesseract::TessBaseAPI tess;
-+	setlocale(LC_ALL, current.constData());
- 	QString header = QString(
- 	                     "<!DOCTYPE html>\n"
- 	                     "<html>\n"


More information about the arch-commits mailing list