Attachment #274337 for bug #365473

View | Details | Raw Unified | Return to bug 365473
Collapse All | Expand All

Lines 66-72 Link Here

(-)src/ipa/ipa/bmp.h.old (-1 / +1 lines)
66	return;	66	return;
67	}	67	}
68		68
69	if (setjmp (png_ptr->jmpbuf))	69	if (setjmp (png_jmpbuf(png_ptr)))
70	{ WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");	70	{ WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
71	png_destroy_write_struct (&png_ptr,&info_ptr);	71	png_destroy_write_struct (&png_ptr,&info_ptr);
72	wmf_free (API,buffer);	72	wmf_free (API,buffer);

Lines 63-69 Link Here

(-)src/Makefile.am.old (-1 / +2 lines)
63	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \	63	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
64	-release $(LT_RELEASE) -export-dynamic	64	-release $(LT_RELEASE) -export-dynamic
65		65
66	loaderdir = $(libdir)/$(GDK_PIXBUF_DIR)	66	loaderdir = $(GDK_PIXBUF_DIR)
67		67
68	loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN)	68	loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN)
69		69
Lines 72-77 Link Here
72	io_wmf_la_LIBADD = libwmf.la libwmflite.la @GDK_PIXBUF_LIBS@	72	io_wmf_la_LIBADD = libwmf.la libwmflite.la @GDK_PIXBUF_LIBS@
73		73
74	io_wmf_la_LDFLAGS = -no-undefined -module -avoid-version	74	io_wmf_la_LDFLAGS = -no-undefined -module -avoid-version
		75	io_wmf_la_LIBTOOLFLAGS = --tag=disable-static
75		76
76	PLAYERHEADERS = \	77	PLAYERHEADERS = \
77	player/clip.h \	78	player/clip.h \

Lines 744-751 Link Here

(-)configure.ac.old (-2 / +1 lines)
744		744
745	if test $LIBWMF_BUILDSTYLE != lite; then	745	if test $LIBWMF_BUILDSTYLE != lite; then
746	PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[	746	PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[
747	GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`	747	GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
748	GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
749	wmf_gdk_pixbuf=yes	748	wmf_gdk_pixbuf=yes
750	],[ wmf_gdk_pixbuf=no	749	],[ wmf_gdk_pixbuf=no
751	])	750	])

Return to bug 365473