tags 332312 patch And here's the patch. Definitely not a gdk-imlib bug. :) Just a bug in gnome-libs, blithely continuing on despite failing to detect either ImageMagick or libpng and in the process generating a bunch of corrupt embedded pixmaps...
In addition to this patch, it would be a good idea to clean up tools/convertrgb and libgnomeui/pixmaps so that failing to correctly generate pixmap data gives a *build failure*, not corrupt icons... since after all, we *have* seen this bug once before already... -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u gnome-libs-1.4.2/debian/patches/01_configure.dpatch
gnome-libs-1.4.2/debian/patches/01_configure.dpatch
--- gnome-libs-1.4.2/debian/patches/01_configure.dpatch
+++ gnome-libs-1.4.2/debian/patches/01_configure.dpatch
@@ -30,15 +30,15 @@
-echo $ac_n "checking for png_read_info in -lpng""... $ac_c" 1>&6
-echo "configure:10770: checking for png_read_info in -lpng" >&5
-+echo $ac_n "checking for png_read_info in -lpng10""... $ac_c" 1>&6
-+echo "configure:10770: checking for png_read_info in -lpng10" >&5
++echo $ac_n "checking for png_read_info in -lpng12""... $ac_c" 1>&6
++echo "configure:10770: checking for png_read_info in -lpng12" >&5
ac_lib_var=`echo png'_'png_read_info | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lpng $Z_LIBS -lm $LIBS"
-+LIBS="-lpng10 $Z_LIBS -lm $LIBS"
++LIBS="-lpng12 $Z_LIBS -lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 10778 "configure"
#include "confdefs.h"
@@ -48,15 +48,15 @@
rm -f conftest*
- echo $ac_n "checking for png_get_IHDR in -lpng""... $ac_c" 1>&6
-echo "configure:10865: checking for png_get_IHDR in -lpng" >&5
-+ echo $ac_n "checking for png_get_IHDR in -lpng10""... $ac_c" 1>&6
-+echo "configure:10865: checking for png_get_IHDR in -lpng10" >&5
++ echo $ac_n "checking for png_get_IHDR in -lpng12""... $ac_c" 1>&6
++echo "configure:10865: checking for png_get_IHDR in -lpng12" >&5
ac_lib_var=`echo png'_'png_get_IHDR | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lpng $LIBS"
-+LIBS="-lpng10 $LIBS"
++LIBS="-lpng12 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 10873 "configure"
#include "confdefs.h"
@@ -65,7 +65,7 @@
echo "$ac_t""$png_ok" 1>&6
if test "$png_ok" = yes; then
- PNG_LIBS="-lpng $Z_LIBS"; cat >> confdefs.h <<\EOF
-+ PNG_LIBS="-lpng10 $Z_LIBS"; cat >> confdefs.h <<\EOF
++ PNG_LIBS="-lpng12 $Z_LIBS"; cat >> confdefs.h <<\EOF
#define HAVE_LIBPNG 1
EOF
diff -u gnome-libs-1.4.2/debian/changelog gnome-libs-1.4.2/debian/changelog
--- gnome-libs-1.4.2/debian/changelog
+++ gnome-libs-1.4.2/debian/changelog
@@ -1,3 +1,13 @@
+gnome-libs (1.4.2-24.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Amend debian/rules and debian/patches/01_configure.dpatch (eew) to look
+ for libpng12 instead of libpng10... which solves the problem with
+ libgnomeui embedding corrupt pixmap images when the source package can
+ find neither libpng nor convert from ImageMagick (closes: #332312).
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sat, 15 Oct 2005 03:42:04 -0700
+
gnome-libs (1.4.2-24) unstable; urgency=low
* debian/control.in (Build-Depends): Use gdk-imlib11-dev (>= 1.9.14-20)
diff -u gnome-libs-1.4.2/debian/rules gnome-libs-1.4.2/debian/rules
--- gnome-libs-1.4.2/debian/rules
+++ gnome-libs-1.4.2/debian/rules
@@ -50,7 +50,7 @@
cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
- CPPFLAGS=-I/usr/include/libpng10 CFLAGS="$(CFLAGS)" ./configure \
+ CPPFLAGS=-I/usr/include/libpng12 CFLAGS="$(CFLAGS)" ./configure \
--disable-gtk-doc --host=$(DEB_HOST_GNU_TYPE) \
--prefix=/usr --localstatedir=/var/lib --sysconfdir=/etc \
--mandir=\$${prefix}/share/man --datadir=\$${prefix}/share \
signature.asc
Description: Digital signature
