diff --git a/dia-libpng15.patch b/dia-libpng15.patch new file mode 100644 index 0000000..7c15ffa --- /dev/null +++ b/dia-libpng15.patch @@ -0,0 +1,11 @@ +--- plug-ins/libart/export_png.c.orig 2012-02-25 19:53:24.184676845 -0600 ++++ plug-ins/libart/export_png.c 2012-02-25 19:59:32.249455989 -0600 +@@ -178,7 +178,7 @@ + } + + /* set error handling ... */ +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png))) { + fclose(fp); + png_destroy_write_struct(&png, &info); + message_error(_("Error occurred while writing PNG")); diff --git a/dia.spec b/dia.spec index c56128c..5db9f32 100644 --- a/dia.spec +++ b/dia.spec @@ -25,7 +25,8 @@ and can export to PostScript(TM). %prep %setup -q -%patch0 -p1 -b .noglib +%patch0 -p0 -b .noglib +%patch1 -p0 -b .libpng15 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \ lib/Makefile.* @@ -91,6 +92,7 @@ fi %changelog * Sat Feb 25 2012 Bruno Wolff III - 1:0.97.1-3 - A couple of the test programs used glib with the more loose API +- Use the newer libpng 1.5 API * Fri Jan 13 2012 Fedora Release Engineering - 1:0.97.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild