Hmm, the last patch was not final after all -- a last review before upload showed that the filters had thee same problem as the loaders. Attached is an updated patch that fixes both sets of plugins.
Thanks, -- Steve Langasek postmodern programmer
diff -u imlib2-1.2.0/src/modules/loaders/Makefile.in imlib2-1.2.0/src/modules/loaders/Makefile.in --- imlib2-1.2.0/src/modules/loaders/Makefile.in +++ imlib2-1.2.0/src/modules/loaders/Makefile.in @@ -276,41 +276,41 @@ lbm.la jpeg_la_SOURCES = loader_jpeg.c -jpeg_la_LDFLAGS = -module -avoid-version -jpeg_la_LIBADD = @JPEGLIBS@ +jpeg_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2 png_la_SOURCES = loader_png.c -png_la_LDFLAGS = -module -avoid-version -png_la_LIBADD = @PNGLIBS@ +png_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +png_la_LIBADD = @PNGLIBS@ -lImlib2 tiff_la_SOURCES = loader_tiff.c -tiff_la_LDFLAGS = -module -avoid-version -tiff_la_LIBADD = @TIFFLIBS@ +tiff_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +tiff_la_LIBADD = @TIFFLIBS@ -lImlib2 gif_la_SOURCES = loader_gif.c -gif_la_LDFLAGS = -module -avoid-version -gif_la_LIBADD = @GIFLIBS@ +gif_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +gif_la_LIBADD = @GIFLIBS@ -lImlib2 zlib_la_SOURCES = loader_zlib.c -zlib_la_LDFLAGS = -module -avoid-version -zlib_la_LIBADD = @ZLIBLIBS@ +zlib_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +zlib_la_LIBADD = @ZLIBLIBS@ -lImlib2 bz2_la_SOURCES = loader_bz2.c -bz2_la_LDFLAGS = -module -avoid-version -bz2_la_LIBADD = @BZ2LIBS@ +bz2_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +bz2_la_LIBADD = @BZ2LIBS@ -lImlib2 pnm_la_SOURCES = loader_pnm.c -pnm_la_LDFLAGS = -module -avoid-version -pnm_la_LIBADD = +pnm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +pnm_la_LIBADD = -lImlib2 argb_la_SOURCES = loader_argb.c -argb_la_LDFLAGS = -module -avoid-version -argb_la_LIBADD = +argb_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +argb_la_LIBADD = -lImlib2 bmp_la_SOURCES = loader_bmp.c -bmp_la_LDFLAGS = -module -avoid-version -bmp_la_LIBADD = +bmp_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +bmp_la_LIBADD = -lImlib2 xpm_la_SOURCES = loader_xpm.c -xpm_la_LDFLAGS = -module -avoid-version -xpm_la_LIBADD = +xpm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +xpm_la_LIBADD = -lImlib2 tga_la_SOURCES = loader_tga.c -tga_la_LDFLAGS = -module -avoid-version -tga_la_LIBADD = +tga_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +tga_la_LIBADD = -lImlib2 lbm_la_SOURCES = loader_lbm.c -lbm_la_LDFLAGS = -module -avoid-version -lbm_la_LIBADD = +lbm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +lbm_la_LIBADD = -lImlib2 all: all-am .SUFFIXES: diff -u imlib2-1.2.0/src/modules/filters/Makefile.in imlib2-1.2.0/src/modules/filters/Makefile.in --- imlib2-1.2.0/src/modules/filters/Makefile.in +++ imlib2-1.2.0/src/modules/filters/Makefile.in @@ -57,13 +57,13 @@ am__installdirs = "$(DESTDIR)$(pkgdir)" pkgLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pkg_LTLIBRARIES) -bumpmap_la_LIBADD = +bumpmap_la_DEPENDENCIES = am_bumpmap_la_OBJECTS = filter_bumpmap.lo bumpmap_la_OBJECTS = $(am_bumpmap_la_OBJECTS) -colormod_la_LIBADD = +colormod_la_DEPENDENCIES = am_colormod_la_OBJECTS = filter_colormod.lo colormod_la_OBJECTS = $(am_colormod_la_OBJECTS) -testfilter_la_LIBADD = +testfilter_la_DEPENDENCIES = am_testfilter_la_OBJECTS = filter_test.lo testfilter_la_OBJECTS = $(am_testfilter_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@ -220,11 +220,14 @@ pkgdir = $(libdir)/imlib2/filters pkg_LTLIBRARIES = testfilter.la bumpmap.la colormod.la testfilter_la_SOURCES = filter_test.c -testfilter_la_LDFLAGS = -module -avoid-version +testfilter_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +testfilter_la_LIBADD = -lImlib2 bumpmap_la_SOURCES = filter_bumpmap.c -bumpmap_la_LDFLAGS = -module -avoid-version +bumpmap_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +bumpmap_la_LIBADD = -lImlib2 colormod_la_SOURCES = filter_colormod.c -colormod_la_LDFLAGS = -module -avoid-version +colormod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +colormod_la_LIBADD = -lImlib2 all: all-am .SUFFIXES: diff -u imlib2-1.2.0/debian/changelog imlib2-1.2.0/debian/changelog --- imlib2-1.2.0/debian/changelog +++ imlib2-1.2.0/debian/changelog @@ -1,3 +1,14 @@ +imlib2 (1.2.0-1.1) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for sarge-targetted RC bugfix + * Fix regression in the linkage of the loader modules which resulted + in undefined symbols, making libimlib2 unusable when being + dlopen()ed by an application; thanks to Don Armstrong for the patch. + Closes: #293815. + + -- Steve Langasek <[EMAIL PROTECTED]> Sat, 12 Feb 2005 15:19:12 -0800 + imlib2 (1.2.0-1) unstable; urgency=low * New upstream version only in patch2: unchanged: --- imlib2-1.2.0.orig/src/modules/loaders/Makefile.am +++ imlib2-1.2.0/src/modules/loaders/Makefile.am @@ -43,49 +43,49 @@ lbm.la jpeg_la_SOURCES = loader_jpeg.c -jpeg_la_LDFLAGS = -module -avoid-version -jpeg_la_LIBADD = @JPEGLIBS@ +jpeg_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2 png_la_SOURCES = loader_png.c -png_la_LDFLAGS = -module -avoid-version -png_la_LIBADD = @PNGLIBS@ +png_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +png_la_LIBADD = @PNGLIBS@ -lImlib2 tiff_la_SOURCES = loader_tiff.c -tiff_la_LDFLAGS = -module -avoid-version -tiff_la_LIBADD = @TIFFLIBS@ +tiff_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +tiff_la_LIBADD = @TIFFLIBS@ -lImlib2 gif_la_SOURCES = loader_gif.c -gif_la_LDFLAGS = -module -avoid-version -gif_la_LIBADD = @GIFLIBS@ +gif_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +gif_la_LIBADD = @GIFLIBS@ -lImlib2 zlib_la_SOURCES = loader_zlib.c -zlib_la_LDFLAGS = -module -avoid-version -zlib_la_LIBADD = @ZLIBLIBS@ +zlib_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +zlib_la_LIBADD = @ZLIBLIBS@ -lImlib2 bz2_la_SOURCES = loader_bz2.c -bz2_la_LDFLAGS = -module -avoid-version -bz2_la_LIBADD = @BZ2LIBS@ +bz2_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +bz2_la_LIBADD = @BZ2LIBS@ -lImlib2 pnm_la_SOURCES = loader_pnm.c -pnm_la_LDFLAGS = -module -avoid-version -pnm_la_LIBADD = +pnm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +pnm_la_LIBADD = -lImlib2 argb_la_SOURCES = loader_argb.c -argb_la_LDFLAGS = -module -avoid-version -argb_la_LIBADD = +argb_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +argb_la_LIBADD = -lImlib2 bmp_la_SOURCES = loader_bmp.c -bmp_la_LDFLAGS = -module -avoid-version -bmp_la_LIBADD = +bmp_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +bmp_la_LIBADD = -lImlib2 xpm_la_SOURCES = loader_xpm.c -xpm_la_LDFLAGS = -module -avoid-version -xpm_la_LIBADD = +xpm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +xpm_la_LIBADD = -lImlib2 tga_la_SOURCES = loader_tga.c -tga_la_LDFLAGS = -module -avoid-version -tga_la_LIBADD = +tga_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +tga_la_LIBADD = -lImlib2 lbm_la_SOURCES = loader_lbm.c -lbm_la_LDFLAGS = -module -avoid-version -lbm_la_LIBADD = +lbm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +lbm_la_LIBADD = -lImlib2 only in patch2: unchanged: --- imlib2-1.2.0.orig/src/modules/filters/Makefile.am +++ imlib2-1.2.0/src/modules/filters/Makefile.am @@ -11,11 +11,14 @@ pkg_LTLIBRARIES = testfilter.la bumpmap.la colormod.la testfilter_la_SOURCES = filter_test.c -testfilter_la_LDFLAGS = -module -avoid-version +testfilter_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +testfilter_la_LIBADD = -lImlib2 bumpmap_la_SOURCES = filter_bumpmap.c -bumpmap_la_LDFLAGS = -module -avoid-version +bumpmap_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +bumpmap_la_LIBADD = -lImlib2 colormod_la_SOURCES = filter_colormod.c -colormod_la_LDFLAGS = -module -avoid-version +colormod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/ +colormod_la_LIBADD = -lImlib2
signature.asc
Description: Digital signature