kevin pushed to calibre (master). "Update to 3.2.1. Fixes bug
#1466763"
by notificationsï¼ fedoraproject.org
From db3f2fcff91d52ac26a7119651917b4b82c4dac0 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin(a)scrye.com>
Date: Fri, 30 Jun 2017 14:01:18 -0600
Subject: Update to 3.2.1. Fixes bug #1466763
---
.gitignore | 1 +
calibre.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9f763d2..c13daac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -262,3 +262,4 @@ calibre-0.7.14-nofonts.tar.xz
/calibre-2.85.1-nofonts.tar.xz
/calibre-3.0.0-nofonts.tar.xz
/calibre-3.1.1-nofonts.tar.xz
+/calibre-3.2.1-nofonts.tar.xz
diff --git a/calibre.spec b/calibre.spec
index 57d9b82..761c5db 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -5,7 +5,7 @@
%global __provides_exclude_from ^%{_libdir}/%{name}/%{name}/plugins/.*\.so$
Name: calibre
-Version: 3.1.1
+Version: 3.2.1
Release: 1%{?dist}
Summary: E-book converter and library manager
Group: Applications/Multimedia
@@ -333,6 +333,9 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/
%{_datadir}/appdata/calibre*.appdata.xml
%changelog
+* Fri Jun 30 2017 Kevin Fenzi <kevin(a)scrye.com> - 3.2.1-1
+- Update to 3.2.1. Fixes bug #1466763
+
* Sat Jun 24 2017 Kevin Fenzi <kevin(a)scrye.com> - 3.1.1-1
- Update to 3.1.1. Fixes bug #1464428
diff --git a/sources b/sources
index 31798ff..6b4e8a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (calibre-3.1.1-nofonts.tar.xz) = 44f27de3f4a3a1074082d59d0059d38b64ac113ad772ea3ed40d03527d5d46165eabf11953866567695201e8eccee4396a99533ff22b463adbe60441901e21a2
+SHA512 (calibre-3.2.1-nofonts.tar.xz) = dc42bf935b69e35ce628e593c31e6623a9de15c74cbac802011cac853aa0b01b24adf418d659c0af8812eb30588e8ce02ef8628be8ac5f6e81eb12e421f5d532
--
cgit v1.1
https://src.fedoraproject.org/cgit/calibre.git/commit/?h=master&id=db3f2f...
5Â years, 7Â months
peter pushed to erlang-edown (f26). "Don't die if no git is available
(..more)"
by notificationsï¼ fedoraproject.org
From 7cfe3bd751ebdf0ab0cb06c2c8ef93602458eabe Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Fri, 30 Jun 2017 19:14:08 +0300
Subject: Don't die if no git is available
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
...on-t-use-git-command-for-branch-retrieval.patch | 47 ++++++++++++++++++++++
erlang-edown.spec | 7 +++-
2 files changed, 53 insertions(+), 1 deletion(-)
create mode 100644 erlang-edown-0002-Don-t-use-git-command-for-branch-retrieval.patch
diff --git a/erlang-edown-0002-Don-t-use-git-command-for-branch-retrieval.patch b/erlang-edown-0002-Don-t-use-git-command-for-branch-retrieval.patch
new file mode 100644
index 0000000..9d85e58
--- /dev/null
+++ b/erlang-edown-0002-Don-t-use-git-command-for-branch-retrieval.patch
@@ -0,0 +1,47 @@
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Fri, 30 Jun 2017 19:06:44 +0300
+Subject: [PATCH] Don't use git command for branch retrieval
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+
+diff --git a/src/edown_doclet.erl b/src/edown_doclet.erl
+index b0ad8e9..4262777 100644
+--- a/src/edown_doclet.erl
++++ b/src/edown_doclet.erl
+@@ -229,15 +229,30 @@ do_redirect(Href, Prefix, Args) ->
+ end.
+
+ get_git_branch() ->
+- case os:cmd("git rev-parse --abbrev-ref HEAD") of
+- "fatal:" ++ _ -> "master"; % sensible default
+- Git ->
+- case string:tokens(Git, " \n") of
+- [Branch] -> Branch;
+- Other -> erlang:error({cannot_get_git_branch, Other})
++ {ok, CWD} = file:get_cwd(),
++ case get_git_head_file(CWD) of
++ false -> "unknown"; % not a Git branch
++ GitHeadFile ->
++ {ok, Device} = file:open(GitHeadFile, [read, binary]),
++ Data = io:get_line(Device, ""),
++ file:close(Device),
++ StrSize = size(Data) -1, % w/o '\n' size)
++ <<GitHeadData:StrSize/binary, _>> = Data,
++ case GitHeadData of
++ <<"ref: refs/heads/", Master/binary>> -> binary_to_list(Master);
++ _ -> "unknown"
+ end
+ end.
+
++get_git_head_file("/") ->
++ filelib:is_regular("/.git/HEAD") andalso "/.git/HEAD";
++get_git_head_file(Dir) ->
++ case filelib:is_regular(Dir ++ "/.git/HEAD") of
++ true -> Dir ++ "/.git/HEAD";
++ false -> get_git_head_file(filename:dirname(Dir))
++ end.
++
++
+ %% Tried to display logo in a table on top of page, but not working.
+ %% Presumably, this hits some limitation of Markdown
+ %%
diff --git a/erlang-edown.spec b/erlang-edown.spec
index 971c91f..8b6e663 100644
--- a/erlang-edown.spec
+++ b/erlang-edown.spec
@@ -6,7 +6,7 @@
Name: erlang-%{realname}
Version: 0.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: EDoc extension for generating Github-flavored Markdown
Group: Development/Languages
License: ASL 2.0
@@ -16,6 +16,7 @@ VCS: scm:git:https://github.com/%{upstream}/%{realname}.git
%endif
Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}...
Patch1: erlang-edown-0001-Remove-pre-18.0-code.patch
+Patch2: erlang-edown-0002-Don-t-use-git-command-for-branch-retrieval.patch
BuildRequires: erlang-edoc
BuildRequires: erlang-rebar
@@ -27,6 +28,7 @@ EDoc extension for generating Github-flavored Markdown.
%prep
%setup -q -n %{realname}-%{version}
%patch1 -p1
+%patch2 -p1
%build
@@ -47,6 +49,9 @@ EDoc extension for generating Github-flavored Markdown.
%changelog
+* Fri Jun 30 2017 Peter Lemenkov <lemenkov(a)gmail.com> - 0.8.1-3
+- Don't die if no git is available
+
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
--
cgit v1.1
https://src.fedoraproject.org/cgit/erlang-edown.git/commit/?h=f26&id=7cfe...
5Â years, 7Â months
smani pushed to gimagereader (f24). "Update to 3.2.2"
by notificationsï¼ fedoraproject.org
From bdb1db71bdde7fa30c74cafed225e62917d452ed Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Fri, 30 Jun 2017 20:53:31 +0200
Subject: Update to 3.2.2
---
.gitignore | 1 +
...around-broken-gtk_image_set_from_resource.patch | 48 ----------------------
gimagereader.spec | 10 ++---
sources | 2 +-
4 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 0001-Gtk-Workaround-broken-gtk_image_set_from_resource.patch
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 <manisandro(a)gmail.com>
-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<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/controls.png"));
-+ getWidget("image:display.rotate.mode").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png"));
-+ getWidget("image:display.rotate.all").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png"));
-+ getWidget("image:display.rotate.current").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_page.png"));
-+ getWidget("image:main.autolayout").as<Gtk::Image>()->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<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png"));
-+ m_builder("image:output.stripcrlf").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/stripcrlf.png"));
-+ m_builder("image:output.insert.append").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png"));
-+ m_builder("image:output.insert.cursor").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_cursor.png"));
-+ m_builder("image:output.insert.replace").as<Gtk::Image>()->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}/...
-# 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 <manisandro(a)gmail.com> - 3.2.2-1
+- Update to 3.2.2
+
* Wed May 17 2017 Sandro Mani <manisandro(a)gmail.com> - 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
--
cgit v1.1
https://src.fedoraproject.org/cgit/gimagereader.git/commit/?h=f24&id=bdb1...
5Â years, 7Â months
smani pushed to gimagereader (f25). "Update to 3.2.2"
by notificationsï¼ fedoraproject.org
From bdb1db71bdde7fa30c74cafed225e62917d452ed Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Fri, 30 Jun 2017 20:53:31 +0200
Subject: Update to 3.2.2
---
.gitignore | 1 +
...around-broken-gtk_image_set_from_resource.patch | 48 ----------------------
gimagereader.spec | 10 ++---
sources | 2 +-
4 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 0001-Gtk-Workaround-broken-gtk_image_set_from_resource.patch
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 <manisandro(a)gmail.com>
-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<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/controls.png"));
-+ getWidget("image:display.rotate.mode").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png"));
-+ getWidget("image:display.rotate.all").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png"));
-+ getWidget("image:display.rotate.current").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_page.png"));
-+ getWidget("image:main.autolayout").as<Gtk::Image>()->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<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png"));
-+ m_builder("image:output.stripcrlf").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/stripcrlf.png"));
-+ m_builder("image:output.insert.append").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png"));
-+ m_builder("image:output.insert.cursor").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_cursor.png"));
-+ m_builder("image:output.insert.replace").as<Gtk::Image>()->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}/...
-# 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 <manisandro(a)gmail.com> - 3.2.2-1
+- Update to 3.2.2
+
* Wed May 17 2017 Sandro Mani <manisandro(a)gmail.com> - 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
--
cgit v1.1
https://src.fedoraproject.org/cgit/gimagereader.git/commit/?h=f25&id=bdb1...
5Â years, 7Â months
smani pushed to gimagereader (f26). "Update to 3.2.2"
by notificationsï¼ fedoraproject.org
From bdb1db71bdde7fa30c74cafed225e62917d452ed Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Fri, 30 Jun 2017 20:53:31 +0200
Subject: Update to 3.2.2
---
.gitignore | 1 +
...around-broken-gtk_image_set_from_resource.patch | 48 ----------------------
gimagereader.spec | 10 ++---
sources | 2 +-
4 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 0001-Gtk-Workaround-broken-gtk_image_set_from_resource.patch
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 <manisandro(a)gmail.com>
-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<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/controls.png"));
-+ getWidget("image:display.rotate.mode").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png"));
-+ getWidget("image:display.rotate.all").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png"));
-+ getWidget("image:display.rotate.current").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_page.png"));
-+ getWidget("image:main.autolayout").as<Gtk::Image>()->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<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png"));
-+ m_builder("image:output.stripcrlf").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/stripcrlf.png"));
-+ m_builder("image:output.insert.append").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png"));
-+ m_builder("image:output.insert.cursor").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_cursor.png"));
-+ m_builder("image:output.insert.replace").as<Gtk::Image>()->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}/...
-# 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 <manisandro(a)gmail.com> - 3.2.2-1
+- Update to 3.2.2
+
* Wed May 17 2017 Sandro Mani <manisandro(a)gmail.com> - 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
--
cgit v1.1
https://src.fedoraproject.org/cgit/gimagereader.git/commit/?h=f26&id=bdb1...
5Â years, 7Â months
smani pushed to gimagereader (master). "Update to 3.2.2"
by notificationsï¼ fedoraproject.org
From bdb1db71bdde7fa30c74cafed225e62917d452ed Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Fri, 30 Jun 2017 20:53:31 +0200
Subject: Update to 3.2.2
---
.gitignore | 1 +
...around-broken-gtk_image_set_from_resource.patch | 48 ----------------------
gimagereader.spec | 10 ++---
sources | 2 +-
4 files changed, 7 insertions(+), 54 deletions(-)
delete mode 100644 0001-Gtk-Workaround-broken-gtk_image_set_from_resource.patch
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 <manisandro(a)gmail.com>
-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<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/controls.png"));
-+ getWidget("image:display.rotate.mode").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png"));
-+ getWidget("image:display.rotate.all").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_pages.png"));
-+ getWidget("image:display.rotate.current").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/rotate_page.png"));
-+ getWidget("image:main.autolayout").as<Gtk::Image>()->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<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png"));
-+ m_builder("image:output.stripcrlf").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/stripcrlf.png"));
-+ m_builder("image:output.insert.append").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_append.png"));
-+ m_builder("image:output.insert.cursor").as<Gtk::Image>()->set(Gdk::Pixbuf::create_from_resource("/org/gnome/gimagereader/ins_cursor.png"));
-+ m_builder("image:output.insert.replace").as<Gtk::Image>()->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}/...
-# 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 <manisandro(a)gmail.com> - 3.2.2-1
+- Update to 3.2.2
+
* Wed May 17 2017 Sandro Mani <manisandro(a)gmail.com> - 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
--
cgit v1.1
https://src.fedoraproject.org/cgit/gimagereader.git/commit/?h=master&id=b...
5Â years, 7Â months