diff --git a/.gitignore b/.gitignore index 0914ec2..be598c8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /gimagereader-3.1.99.tar.xz /gimagereader-3.2.0.tar.xz /gimagereader-3.2.1.tar.xz +/gimagereader-3.2.2.tar.xz diff --git a/0001-Gtk-Workaround-broken-gtk_image_set_from_resource.patch b/0001-Gtk-Workaround-broken-gtk_image_set_from_resource.patch deleted file mode 100644 index 9aae845..0000000 --- a/0001-Gtk-Workaround-broken-gtk_image_set_from_resource.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a7951dd813baed66f982e35c0dcdae292d72bd91 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Wed, 17 May 2017 10:47:59 +0200 -Subject: [PATCH] [Gtk] Workaround broken gtk_image_set_from_resource - ---- - gtk/src/MainWindow.cc | 7 +++++++ - gtk/src/OutputEditorText.cc | 6 ++++++ - 2 files changed, 13 insertions(+) - -diff --git a/gtk/src/MainWindow.cc b/gtk/src/MainWindow.cc -index d5e892e..f18f25b 100644 ---- a/gtk/src/MainWindow.cc -+++ b/gtk/src/MainWindow.cc -@@ -144,6 +144,13 @@ MainWindow::MainWindow() - m_idlegroup.push_back(getWidget("button:main.autolayout")); - m_idlegroup.push_back(getWidget("menubutton:main.languages")); - -+ getWidget("image:main.controls").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/controls.png")); -+ getWidget("image:display.rotate.mode").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png")); -+ getWidget("image:display.rotate.all").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png")); -+ getWidget("image:display.rotate.current").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_page.png")); -+ getWidget("image:main.autolayout").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/autolayout.png")); -+ -+ - CONNECT(m_window, delete_event, [this](GdkEventAny* ev) { - return closeEvent(ev); - }); -diff --git a/gtk/src/OutputEditorText.cc b/gtk/src/OutputEditorText.cc -index 77942bc..4fc5326 100644 ---- a/gtk/src/OutputEditorText.cc -+++ b/gtk/src/OutputEditorText.cc -@@ -59,6 +59,12 @@ OutputEditorText::OutputEditorText() - m_toggleSearchButton->add_accelerator("clicked", group, GDK_KEY_F, Gdk::CONTROL_MASK, Gtk::AccelFlags(0)); - saveButton->add_accelerator("clicked", group, GDK_KEY_S, Gdk::CONTROL_MASK, Gtk::AccelFlags(0)); - -+ m_builder("image:output.insert").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png")); -+ m_builder("image:output.stripcrlf").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/stripcrlf.png")); -+ m_builder("image:output.insert.append").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png")); -+ m_builder("image:output.insert.cursor").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_cursor.png")); -+ m_builder("image:output.insert.replace").as()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_replace.png")); -+ - m_substitutionsManager = new SubstitutionsManager(m_builder, m_textBuffer); - - m_insertMode = InsertMode::Append; --- -2.13.0 - diff --git a/gimagereader.spec b/gimagereader.spec index 496cb9c..7120be3 100644 --- a/gimagereader.spec +++ b/gimagereader.spec @@ -1,15 +1,12 @@ Name: gimagereader -Version: 3.2.1 -Release: 4%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: A front-end to tesseract-ocr License: GPLv3+ URL: https://github.com/manisandro/gimagereader Source0: https://github.com/manisandro/gimagereader/releases/download/v%{version}/%{name}-%{version}.tar.xz -# Backport: fix some icons missing in Gtk interface -Patch0: 0001-Gtk-Workaround-broken-gtk_image_set_from_resource.patch - BuildRequires: cmake BuildRequires: gtkmm30-devel BuildRequires: gtkspellmm30-devel @@ -166,6 +163,9 @@ fi %{_datadir}/applications/%{name}-qt5.desktop %changelog +* Fri Jun 30 2017 Sandro Mani - 3.2.2-1 +- Update to 3.2.2 + * Wed May 17 2017 Sandro Mani - 3.2.1-4 - Backport patch to fix some icons missing in Gtk interface (#1451357) diff --git a/sources b/sources index 854b7d6..852288a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gimagereader-3.2.1.tar.xz) = a44ef0bfc344f687cde13e645bec16f1b3aa8308aae26509cf1ec15bac703c9123d653355c5cba9f160e595594046af237fdc1c5deb1cbfa0976d89c30f15ab2 +SHA512 (gimagereader-3.2.2.tar.xz) = ab5c007b739fe5d8b5dabf684150c01f5e0d720f0f1d009bbd0ef1eb057174b826d4aab92e33a0b144ba3f172c292a590a8bfe6fd19efed717ddae89a8489c73