[ldoce5viewer] Fix for inkscape 1.0.2 (rfbz#5673)

commit bb1b94c7faaf6f8f2ca624d0b2ee09d94d8da3af Author: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl&gt; Date: Thu Jun 11 20:38:08 2020 +0200 Fix for inkscape 1.0.2 (rfbz#5673) ...ewer-0001-Adopt-to-new-inkscape-arguments.patch | 22 ++++++++++++++++++++++ ldoce5viewer.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) --- diff --git a/ldoce5viewer-0001-Adopt-to-new-inkscape-arguments.patch b/ldoce5viewer-0001-Adopt-to-new-inkscape-arguments.patch new file mode 100644 index 0000000..ccc8993 --- /dev/null +++ b/ldoce5viewer-0001-Adopt-to-new-inkscape-arguments.patch @@ -0,0 +1,22 @@ +From 6bb1cc5a3df2f72b590e9230346bc0fb7862c792 Mon Sep 17 00:00:00 2001 +From: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl&gt; +Date: Thu, 11 Jun 2020 20:31:50 +0200 +Subject: [PATCH] Adopt to new inkscape arguments + +--- + ldoce5viewer/qtgui/resources/icons/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ldoce5viewer/qtgui/resources/icons/Makefile b/ldoce5viewer/qtgui/resources/icons/Makefile +index ba46712..4511051 100644 +--- a/ldoce5viewer/qtgui/resources/icons/Makefile ++++ b/ldoce5viewer/qtgui/resources/icons/Makefile +@@ -8,7 +8,7 @@ PNG_16 := $(patsubst %-src.png, %-16.png, $(PNG_SRC)) + all: $(PNG_24) $(PNG_22) $(PNG_16) + + %-48-src.png: %.svg icongen.py +- inkscape --help | grep -- --export-file= >/dev/null \ ++ inkscape --help | grep -- --export-file >/dev/null \ + && inkscape -w 96 -h 96 -o $@ $< \ + || inkscape -w 96 -h 96 -e $@ $< + diff --git a/ldoce5viewer.spec b/ldoce5viewer.spec index 1d3537d..ba468dc 100644 --- a/ldoce5viewer.spec +++ b/ldoce5viewer.spec @@ -4,7 +4,7 @@ Name: ldoce5viewer Version: 0 -Release: 14.%{date}git%{shortcommit0}%{?dist} +Release: 15.%{date}git%{shortcommit0}%{?dist} Summary: Viewer Application for the Longman Dictionary (LDOCE 5) License: GPLv3+ and Public Domain URL: https://forward-backward.co.jp/ldoce5viewer/ @@ -20,6 +20,9 @@ Patch2: https://github.com/dwrobel/ldoce5viewer/commit/85690cc4bec3f0c93 # Adopt to use new inkscape (>=1.0) (use -o instead of -o option) # Not sent upstream as it's read-only now. Patch3: https://github.com/dwrobel/ldoce5viewer/commit/e17a19a86c5f7a02c6005fe0eb... +# Inkscape 1.0.2 changed argument from --export-file= to --export-filename= +# Not sent upstream as it's read-only now. +Patch4: https://github.com/dwrobel/ldoce5viewer/commit/6bb1cc5a3df2f72b590e923034... BuildArch: noarch @@ -141,6 +144,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata %changelog +* Thu Jun 11 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl&gt; - 0-15.20180309git377ff48 +- Fix for inkscape 1.0.2 (rfbz#5673) + * Sat May 30 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 0-14.20180309git377ff48 - Rebuild for python-3.9