[SCM] easytag/master: Add patch to remove use of gdk-pixbuf-pixdata

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Tue Jan 2 23:16:05 UTC 2018


The following commit has been merged in the master branch:
commit 03b5398e36b8bb387b86289c7715af5245670749
Author: James Cowgill <jcowgill at debian.org>
Date:   Tue Jan 2 23:01:41 2018 +0000

    Add patch to remove use of gdk-pixbuf-pixdata
    
    Thanks: Helmut Grohne
    Closes: #886137

diff --git a/debian/patches/01_remove-pixdata.patch b/debian/patches/01_remove-pixdata.patch
new file mode 100644
index 0000000..e730a3c
--- /dev/null
+++ b/debian/patches/01_remove-pixdata.patch
@@ -0,0 +1,55 @@
+Description: Don't use gdk-pixbuf-pixdata for image resources
+Author: James Cowgill <jcowgill at debian.org>
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/886137
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,10 +51,6 @@ AX_GENERATE_CHANGELOG
+ 
+ AC_SUBST([GLIB_COMPILE_RESOURCES], [`$PKG_CONFIG --variable glib_compile_resources gio-2.0`])
+ 
+-AC_PATH_PROG([GDK_PIXBUF_PIXDATA], [gdk-pixbuf-pixdata])
+-AS_IF([test "x$ac_cv_path_GDK_PIXBUF_PIXDATA" = "x"],
+-      [AC_MSG_ERROR([gdk-pixbuf-pixdata is required for image resources])])
+-
+ AC_MSG_CHECKING([for glib-mkenums script])
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+ AS_IF([test "x$GLIB_MKENUMS" = "x"],
+--- a/data/org.gnome.EasyTAG.gresource.xml
++++ b/data/org.gnome.EasyTAG.gresource.xml
+@@ -15,19 +15,19 @@
+         <file preprocess='xml-stripblanks'>search_dialog.ui</file>
+         <file preprocess='xml-stripblanks'>tag_area.ui</file>
+         <file preprocess='xml-stripblanks'>toolbar.ui</file>
+-        <file preprocess='to-pixdata'>images/all-lowercase.png</file>
+-        <file preprocess='to-pixdata'>images/all-uppercase.png</file>
+-        <file preprocess='to-pixdata'>images/artist-album.png</file>
+-        <file preprocess='to-pixdata'>images/artist.png</file>
+-        <file preprocess='to-pixdata'>images/first-letter-uppercase.png</file>
+-        <file preprocess='to-pixdata'>images/first-letter-uppercase-word.png</file>
+-        <file preprocess='to-pixdata'>images/freedb.png</file>
+-        <file preprocess='to-pixdata'>images/gnudb.png</file>
+-        <file preprocess='to-pixdata'>images/invert-selection.png</file>
+-        <file preprocess='to-pixdata'>images/mask.png</file>
+-        <file preprocess='to-pixdata'>images/musicbrainz.png</file>
+-        <file preprocess='to-pixdata'>images/red-lines.png</file>
+-        <file preprocess='to-pixdata'>images/sequence-track.png</file>
+-        <file preprocess='to-pixdata'>images/unselect-all.png</file>
++        <file>images/all-lowercase.png</file>
++        <file>images/all-uppercase.png</file>
++        <file>images/artist-album.png</file>
++        <file>images/artist.png</file>
++        <file>images/first-letter-uppercase.png</file>
++        <file>images/first-letter-uppercase-word.png</file>
++        <file>images/freedb.png</file>
++        <file>images/gnudb.png</file>
++        <file>images/invert-selection.png</file>
++        <file>images/mask.png</file>
++        <file>images/musicbrainz.png</file>
++        <file>images/red-lines.png</file>
++        <file>images/sequence-track.png</file>
++        <file>images/unselect-all.png</file>
+     </gresource>
+ </gresources>
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..a17cc24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_remove-pixdata.patch

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list