From 636f65ade99a771e69348bd08003fc5a626fc4f5 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Tue, 4 Aug 2020 11:49:04 +0200
Subject: [PATCH] Fix exporting of djvu icons with Inkscape

Resolves: #1863428
---
 djvulibre-3.5.27-export-file.patch | 18 ++++++++++++------
 djvulibre.spec                     |  6 +++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/djvulibre-3.5.27-export-file.patch b/djvulibre-3.5.27-export-file.patch
index 17f5657..02a1c44 100644
--- a/djvulibre-3.5.27-export-file.patch
+++ b/djvulibre-3.5.27-export-file.patch
@@ -1,22 +1,28 @@
 --- djvulibre-3.5.27/desktopfiles/Makefile.am
 +++ djvulibre-3.5.27/desktopfiles/Makefile.am
-@@ -35,7 +35,7 @@ ${INKSCAPE} \
- --without-gui \
+@@ -32,10 +32,9 @@ if HAVE_CONVERSION_INKSCAPE
+ convert_icons_process = \
+ s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+ ${INKSCAPE} \
+---without-gui \
  --export-width=$${s} \
  --export-height=$${s} \
 ---export-png=$@ $<
-+--export-file=$@ $<
++--export-filename=$@ $<
  endif
  
  if HAVE_CONVERSION_CONVERT
 --- djvulibre-3.5.27/desktopfiles/Makefile.in
 +++ djvulibre-3.5.27/desktopfiles/Makefile.in
-@@ -309,7 +309,7 @@ PNGICONS = \
- @HAVE_CONVERSION_INKSCAPE_TRUE@--without-gui \
+@@ -306,10 +306,9 @@ PNGICONS = \
+ @HAVE_CONVERSION_INKSCAPE_TRUE@convert_icons_process = \
+ @HAVE_CONVERSION_INKSCAPE_TRUE@s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
+ @HAVE_CONVERSION_INKSCAPE_TRUE@${INKSCAPE} \
+-@HAVE_CONVERSION_INKSCAPE_TRUE@--without-gui \
  @HAVE_CONVERSION_INKSCAPE_TRUE@--export-width=$${s} \
  @HAVE_CONVERSION_INKSCAPE_TRUE@--export-height=$${s} \
 -@HAVE_CONVERSION_INKSCAPE_TRUE@--export-png=$@ $<
-+@HAVE_CONVERSION_INKSCAPE_TRUE@--export-file=$@ $<
++@HAVE_CONVERSION_INKSCAPE_TRUE@--export-filename=$@ $<
  
  @HAVE_CONVERSION_RSVG_TRUE@convert_icons_process = \
  @HAVE_CONVERSION_RSVG_TRUE@s=`echo $@ | sed -e 's/[a-z]*\([0-9]*\).*/\1/'`; \
diff --git a/djvulibre.spec b/djvulibre.spec
index b655946..9379823 100644
--- a/djvulibre.spec
+++ b/djvulibre.spec
@@ -3,7 +3,7 @@
 Summary: DjVu viewers, encoders, and utilities
 Name: djvulibre
 Version: 3.5.27
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+
 URL: http://djvu.sourceforge.net/
 Source0: http://downloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz
@@ -180,6 +180,10 @@ fi
 
 
 %changelog
+* Tue Aug 04 2020 Marek Kasik <mkasik@redhat.com> - 3.5.27-22
+- Fix exporting of djvu icons with Inkscape
+- Resolves: #1863428
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.27-21
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild