Control: tags 959579 + patch
Control: tags 959579 + pending

Dear maintainer,

I've prepared an NMU for adapta-gtk-theme (versioned as 3.95.0.11-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

--
Regards
Sudip

diff -Nru adapta-gtk-theme-3.95.0.11/debian/changelog 
adapta-gtk-theme-3.95.0.11/debian/changelog
--- adapta-gtk-theme-3.95.0.11/debian/changelog 2018-10-02 20:21:00.000000000 
+0100
+++ adapta-gtk-theme-3.95.0.11/debian/changelog 2020-07-04 16:41:37.000000000 
+0100
@@ -1,3 +1,10 @@
+adapta-gtk-theme (3.95.0.11-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS. (Closes: #959579)
+
+ -- Sudip Mukherjee <sudipm.mukher...@gmail.com>  Sat, 04 Jul 2020 16:41:37 
+0100
+
 adapta-gtk-theme (3.95.0.11-1) unstable; urgency=medium
 
   * Initial release (Closes: #894026).
diff -Nru adapta-gtk-theme-3.95.0.11/debian/patches/fix_render.patch 
adapta-gtk-theme-3.95.0.11/debian/patches/fix_render.patch
--- adapta-gtk-theme-3.95.0.11/debian/patches/fix_render.patch  1970-01-01 
01:00:00.000000000 +0100
+++ adapta-gtk-theme-3.95.0.11/debian/patches/fix_render.patch  2020-07-04 
16:29:09.000000000 +0100
@@ -0,0 +1,87 @@
+Description: Fix rendering with inkscape
+ The arguments have changed with the new version of inkscape, update them.
+
+Author: Sudip Mukherjee <sudipm.mukher...@gmail.com>
+Bug-Debian: https://bugs.debian.org/959579
+Forwarded: no
+
+---
+
+--- 
adapta-gtk-theme-3.95.0.11.orig/gtk/asset/assets-gtk2-scripts/render-assets-gtk2.sh
++++ 
adapta-gtk-theme-3.95.0.11/gtk/asset/assets-gtk2-scripts/render-assets-gtk2.sh
+@@ -30,7 +30,8 @@ render-non-scale() {
+     $INKSCAPE --export-id=$ID \
+               --export-dpi="$non_scale_dpi" \
+               --export-id-only \
+-              --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
++              --export-type=png \
++              --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
+                                                         2>>../inkscape.log
+ }
+ 
+--- 
adapta-gtk-theme-3.95.0.11.orig/gtk/asset/assets-gtk3-scripts/render-assets-gtk3.sh
++++ 
adapta-gtk-theme-3.95.0.11/gtk/asset/assets-gtk3-scripts/render-assets-gtk3.sh
+@@ -32,7 +32,8 @@ render-non-scale() {
+     $INKSCAPE --export-id=$i \
+               --export-dpi="$non_scale_dpi" \
+               --export-id-only \
+-              --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
++              --export-type=png \
++              --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \
+                                                         2>>../inkscape.log
+ }
+ 
+@@ -40,7 +41,8 @@ render-scale() {
+     $INKSCAPE --export-id=$i \
+               --export-dpi="$scale_dpi" \
+               --export-id-only \
+-              --export-png=$ASSETS_DIR/$i...@2.png $SRC_FILE >/dev/null \
++              --export-type=png \
++              --export-filename=$ASSETS_DIR/$i...@2.png $SRC_FILE >/dev/null \
+                                                           2>>../inkscape.log
+ }
+ 
+--- adapta-gtk-theme-3.95.0.11.orig/shell/asset/render-assets-cinnamon-thumb.sh
++++ adapta-gtk-theme-3.95.0.11/shell/asset/render-assets-cinnamon-thumb.sh
+@@ -48,11 +48,11 @@ fi
+ 
+ # Renderer
+ render-non-scale() {
+-    $INKSCAPE --export-dpi="$non_scale_dpi" \
+-              --export-png=$ASSETS_DIR/$THUMB.png $SRC_DIR/$THUMB.svg 
>/dev/null \
++    $INKSCAPE --export-dpi="$non_scale_dpi" --export-type=png \
++              --export-filename=$ASSETS_DIR/$THUMB.png $SRC_DIR/$THUMB.svg 
>/dev/null \
+                                                                       
2>>inkscape.log
+-    $INKSCAPE --export-dpi="$non_scale_dpi" \
+-              --export-png=$ASSETS_DARK_DIR/$THUMB.png 
$SRC_DARK_DIR/$THUMB.svg >/dev/null \
++    $INKSCAPE --export-dpi="$non_scale_dpi" --export-type=png \
++              --export-filename=$ASSETS_DARK_DIR/$THUMB.png 
$SRC_DARK_DIR/$THUMB.svg >/dev/null \
+                                                                               
  2>>inkscape.log
+ }
+ 
+--- 
adapta-gtk-theme-3.95.0.11.orig/wm/asset/assets-metacity-scripts/render-assets-metacity.sh
++++ 
adapta-gtk-theme-3.95.0.11/wm/asset/assets-metacity-scripts/render-assets-metacity.sh
+@@ -26,8 +26,8 @@ fi
+ 
+ # Renderer
+ render-non-scale() {
+-    $INKSCAPE --export-dpi="$non_scale_dpi" \
+-              --export-png=$ASSETS_DIR/$i.png $SRC_DIR/$i.svg >/dev/null \
++    $INKSCAPE --export-dpi="$non_scale_dpi" --export-type=png \
++              --export-filename=$ASSETS_DIR/$i.png $SRC_DIR/$i.svg >/dev/null 
\
+                                                               
2>>../inkscape.log
+ }
+ 
+--- 
adapta-gtk-theme-3.95.0.11.orig/wm/asset/assets-xfwm-scripts/render-assets-xfwm.sh
++++ 
adapta-gtk-theme-3.95.0.11/wm/asset/assets-xfwm-scripts/render-assets-xfwm.sh
+@@ -26,8 +26,8 @@ fi
+ 
+ # Renderer
+ render-non-scale() {
+-    $INKSCAPE --export-dpi="$non_scale_dpi" \
+-              --export-png=$ASSETS_DIR/$i.png $SRC_DIR/$i.svg >/dev/null \
++    $INKSCAPE --export-dpi="$non_scale_dpi" --export-type=png  \
++              --export-filename=$ASSETS_DIR/$i.png $SRC_DIR/$i.svg >/dev/null 
\
+                                                               
2>>../inkscape.log
+ }
+ 
diff -Nru adapta-gtk-theme-3.95.0.11/debian/patches/series 
adapta-gtk-theme-3.95.0.11/debian/patches/series
--- adapta-gtk-theme-3.95.0.11/debian/patches/series    1970-01-01 
01:00:00.000000000 +0100
+++ adapta-gtk-theme-3.95.0.11/debian/patches/series    2020-07-04 
16:28:38.000000000 +0100
@@ -0,0 +1 @@
+fix_render.patch

Reply via email to