67 lines
3.0 KiB
Diff
67 lines
3.0 KiB
Diff
|
From: James Cowgill <jcowgill@debian.org>
|
||
|
|
Date: Sat, 11 Jan 2025 14:43:16 -0500
|
||
|
|
Subject: Don't use gdk-pixbuf-pixdata for image resources
|
||
|
|
|
||
|
|
Bug-Debian: https://bugs.debian.org/886137
|
||
|
|
|
||
|
|
Bug-Debian: https://bugs.debian.org/886137
|
||
|
|
---
|
||
|
|
configure.ac | 4 ----
|
||
|
|
data/org.gnome.EasyTAG.gresource.xml | 28 ++++++++++++++--------------
|
||
|
|
2 files changed, 14 insertions(+), 18 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index f20318d..ac8b436 100644
|
||
|
|
--- 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"],
|
||
|
|
diff --git a/data/org.gnome.EasyTAG.gresource.xml b/data/org.gnome.EasyTAG.gresource.xml
|
||
|
|
index 21418a4..aba263b 100644
|
||
|
|
--- 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>
|
||
|
|
|