rpms/imlib/devel .cvsignore, 1.3, 1.4 imlib-1.9.10-cppflags.patch, 1.2, 1.3 imlib-1.9.15-gmodulehack.patch, 1.1, 1.2 imlib-1.9.15-lib-bloat.patch, 1.2, 1.3 imlib.spec, 1.18, 1.19 sources, 1.3, 1.4
Paul Howarth
pghmcfc at fedoraproject.org
Mon May 17 08:01:52 UTC 2010
Author: pghmcfc
Update of /cvs/pkgs/rpms/imlib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3678
Modified Files:
.cvsignore imlib-1.9.10-cppflags.patch
imlib-1.9.15-gmodulehack.patch imlib-1.9.15-lib-bloat.patch
imlib.spec sources
Log Message:
* Fri May 14 2010 Paul Howarth <paul at city-fan.org> 1:1.9.15-14
- EL-6 builds don't need manual pkgconfig dependency
- Fix up patches to avoid need for autotools during build
- Comment patches
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 3 Apr 2007 09:51:01 -0000 1.3
+++ .cvsignore 17 May 2010 08:01:50 -0000 1.4
@@ -1,2 +1,3 @@
imlib-1.9.15.tar.bz2
local-hack-gmodule.tar.gz
+imlib-1.9.15-autotools-rebase.patch.bz2
imlib-1.9.10-cppflags.patch:
configure | 2 --
configure.in | 2 --
2 files changed, 4 deletions(-)
Index: imlib-1.9.10-cppflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib-1.9.10-cppflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- imlib-1.9.10-cppflags.patch 29 Aug 2008 17:03:13 -0000 1.2
+++ imlib-1.9.10-cppflags.patch 17 May 2010 08:01:51 -0000 1.3
@@ -9,3 +9,14 @@
SUPPORT_LIBS=""
dnl Test for shared memory headers and semantics, unless we are
+--- imlib-1.9.15/configure.cppflags 2010-05-14 11:08:05.000000000 +0100
++++ imlib-1.9.15/configure 2010-05-14 11:09:03.000000000 +0100
+@@ -22314,8 +22314,6 @@
+ fi
+
+
+-CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
+-
+ SUPPORT_LIBS=""
+
+ if test "x$enable_shm" = "xyes"; then
imlib-1.9.15-gmodulehack.patch:
Imlib/Makefile.in | 2 -
Makefile.in | 2 -
config/Makefile.in | 2 -
configure | 88 ++------------------------------------------------
configure.in | 56 +++----------------------------
doc/Makefile.in | 2 -
gdk_imlib/Makefile.am | 2 -
gdk_imlib/Makefile.in | 7 ++-
utils/Makefile.in | 2 -
9 files changed, 21 insertions(+), 142 deletions(-)
Index: imlib-1.9.15-gmodulehack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib-1.9.15-gmodulehack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- imlib-1.9.15-gmodulehack.patch 3 Apr 2007 09:51:01 -0000 1.1
+++ imlib-1.9.15-gmodulehack.patch 17 May 2010 08:01:51 -0000 1.2
@@ -1,4 +1,4 @@
---- imlib-1.9.15/gdk_imlib/Makefile.am. 2007-03-27 14:59:33.000000000 +0100
+--- imlib-1.9.15/gdk_imlib/Makefile.am 2007-03-27 14:59:33.000000000 +0100
+++ imlib-1.9.15/gdk_imlib/Makefile.am 2007-03-27 14:58:42.000000000 +0100
@@ -87,7 +87,7 @@
@@ -74,3 +74,206 @@
AC_SUBST(TIFFLIBS)
AC_SUBST(GIFLIBS)
+--- imlib-1.9.15/configure 2010-05-14 11:12:48.000000000 +0100
++++ imlib-1.9.15/configure 2010-05-14 11:15:06.000000000 +0100
+@@ -463,7 +463,7 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MAINTAINER_
MODE_TRUE MAINTAINER_MODE_FALSE MAINT GTK_CONFIG GTK_CFLAGS GTK_LIBS GMODULE_LIBS GMODULE_FLAGS TIFFLIBS GIFLIBS JPEGLIBS PNGLIBS GDK_IMLIB DYNAMIC_MODULES_WORK_TRUE DYNAMIC_MODULES_WORK_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GX_LIBS HAVE_LIBPNG HAVE_GIF_TRUE HAVE_GIF_FALSE HAVE_TIFF_TRUE HAVE_TIFF_FALSE HAVE_PNG_TRUE HAVE_PNG_FALSE HAVE_JPEG_TRUE HAVE_JPEG_FALSE SUPPORT_LIBS GDK_SUPPORT_LIBS LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL MAINTAINER_
MODE_TRUE MAINTAINER_MODE_FALSE MAINT GTK_CONFIG GTK_CFLAGS GTK_LIBS GMODULE_LIBS GMODULE_CFLAGS TIFFLIBS GIFLIBS JPEGLIBS PNGLIBS GDK_IMLIB DYNAMIC_MODULES_WORK_TRUE DYNAMIC_MODULES_WORK_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GX_LIBS HAVE_LIBPNG HAVE_GIF_TRUE HAVE_GIF_FALSE HAVE_TIFF_TRUE HAVE_TIFF_FALSE HAVE_PNG_TRUE HAVE_PNG_FALSE HAVE_JPEG_TRUE HAVE_JPEG_FALSE SUPPORT_LIBS GDK_SUPPORT_LIBS LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -18982,94 +18982,16 @@
+
+ fi;
+
+-dynworks=false
+-if test x$with_modules = xno; then
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-else
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-
+-if test "x$GDK_IMLIB" != x; then
+- oLIBS="$LIBS"
+- oCFLAGS="$CFLAGS"
+- LIBS="$LIBS `glib-config --libs gmodule`"
+- CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
+- if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <glib.h>
+-#include <gmodule.h>
+-main ()
+-{
+- if (g_module_supported ())
+- exit (0);
+- else
+- exit (1);
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- dynworks=true
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+- LIBS="$oLIBS"
+- CFLAGS="$oCFLAGS"
+-fi
+-
+-builddir=`pwd`
+-if $dynworks; then
+- imlib_libtool_config="$builddir/libtool --config"
+- imlib_deplibs_check=`$imlib_libtool_config | \
+- grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \
+- sed 's/.*['\''"]\(.*\)['\''"]$/\1/'`
+- if test "x$imlib_deplibs_check" = "xnone" || \
+- test "x$imlib_deplibs_check" = "xunknown" || \
+- test "x$imlib_deplibs_check" = "x"; then
+- dynworks=false
+- fi
+-fi
+-
+-if $dynworks; then
++dynworks=true
++GMODULE_LIBS=
++GMODULE_CFLAGS=
+
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_GMODULE 1
+ _ACEOF
+
+- GMODULE_LIBS="`glib-config --libs gmodule`"
+- GMODULE_FLAGS="`glib-config --cflags gmodule`"
+
+
+-fi
+-
+-fi
+
+
+
+@@ -24928,7 +24850,7 @@
+ s, at GTK_CFLAGS@,$GTK_CFLAGS,;t t
+ s, at GTK_LIBS@,$GTK_LIBS,;t t
+ s, at GMODULE_LIBS@,$GMODULE_LIBS,;t t
+-s, at GMODULE_FLAGS@,$GMODULE_FLAGS,;t t
++s, at GMODULE_CFLAGS@,$GMODULE_CFLAGS,;t t
+ s, at TIFFLIBS@,$TIFFLIBS,;t t
+ s, at GIFLIBS@,$GIFLIBS,;t t
+ s, at JPEGLIBS@,$JPEGLIBS,;t t
+--- imlib-1.9.15/config/Makefile.in 2010-05-14 11:12:48.000000000 +0100
++++ imlib-1.9.15/config/Makefile.in 2010-05-14 11:15:08.000000000 +0100
+@@ -91,7 +91,7 @@
+ GDK_IMLIB = @GDK_IMLIB@
+ GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
+ GIFLIBS = @GIFLIBS@
+-GMODULE_FLAGS = @GMODULE_FLAGS@
++GMODULE_CFLAGS = @GMODULE_CFLAGS@
+ GMODULE_LIBS = @GMODULE_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+--- imlib-1.9.15/doc/Makefile.in 2010-05-14 11:12:48.000000000 +0100
++++ imlib-1.9.15/doc/Makefile.in 2010-05-14 11:15:08.000000000 +0100
+@@ -81,7 +81,7 @@
+ GDK_IMLIB = @GDK_IMLIB@
+ GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
+ GIFLIBS = @GIFLIBS@
+-GMODULE_FLAGS = @GMODULE_FLAGS@
++GMODULE_CFLAGS = @GMODULE_CFLAGS@
+ GMODULE_LIBS = @GMODULE_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+--- imlib-1.9.15/gdk_imlib/Makefile.in 2010-05-14 11:12:48.000000000 +0100
++++ imlib-1.9.15/gdk_imlib/Makefile.in 2010-05-14 11:15:08.000000000 +0100
+@@ -60,7 +60,8 @@
+ moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgdk_imlib_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
++libgdk_imlib_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ local-hack-gmodule/libgmodule-local.la
+ am_libgdk_imlib_la_OBJECTS = cache.lo colors.lo globals.lo load.lo \
+ misc.lo rend.lo utils.lo save.lo modules.lo
+ libgdk_imlib_la_OBJECTS = $(am_libgdk_imlib_la_OBJECTS)
+@@ -169,7 +170,7 @@
+ GDK_IMLIB = @GDK_IMLIB@
+ GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
+ GIFLIBS = @GIFLIBS@
+-GMODULE_FLAGS = @GMODULE_FLAGS@
++GMODULE_CFLAGS = @GMODULE_CFLAGS@
+ GMODULE_LIBS = @GMODULE_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+@@ -322,7 +323,7 @@
+ modules.c
+
+ libgdk_imlib_la_LDFLAGS = -version-info 10:15:9
+-libgdk_imlib_la_LIBADD = $(GX_LIBS)
++libgdk_imlib_la_LIBADD = $(GX_LIBS) local-hack-gmodule/libgmodule-local.la
+ include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
+ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. \
+ $(GTK_CFLAGS) $(X_CFLAGS) $(GMODULE_FLAGS)
+--- imlib-1.9.15/Imlib/Makefile.in 2010-05-14 11:12:48.000000000 +0100
++++ imlib-1.9.15/Imlib/Makefile.in 2010-05-14 11:15:08.000000000 +0100
+@@ -137,7 +137,7 @@
+ GDK_IMLIB = @GDK_IMLIB@
+ GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
+ GIFLIBS = @GIFLIBS@
+-GMODULE_FLAGS = @GMODULE_FLAGS@
++GMODULE_CFLAGS = @GMODULE_CFLAGS@
+ GMODULE_LIBS = @GMODULE_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+--- imlib-1.9.15/Makefile.in 2010-05-14 11:12:48.000000000 +0100
++++ imlib-1.9.15/Makefile.in 2010-05-14 11:15:09.000000000 +0100
+@@ -126,7 +126,7 @@
+ GDK_IMLIB = @GDK_IMLIB@
+ GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
+ GIFLIBS = @GIFLIBS@
+-GMODULE_FLAGS = @GMODULE_FLAGS@
++GMODULE_CFLAGS = @GMODULE_CFLAGS@
+ GMODULE_LIBS = @GMODULE_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+--- imlib-1.9.15/utils/Makefile.in 2010-05-14 11:12:48.000000000 +0100
++++ imlib-1.9.15/utils/Makefile.in 2010-05-14 11:15:09.000000000 +0100
+@@ -107,7 +107,7 @@
+ GDK_IMLIB = @GDK_IMLIB@
+ GDK_SUPPORT_LIBS = @GDK_SUPPORT_LIBS@
+ GIFLIBS = @GIFLIBS@
+-GMODULE_FLAGS = @GMODULE_FLAGS@
++GMODULE_CFLAGS = @GMODULE_CFLAGS@
+ GMODULE_LIBS = @GMODULE_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
imlib-1.9.15-lib-bloat.patch:
Imlib/Makefile.am | 3 -
Imlib/Makefile.in | 6 +--
configure | 78 +-------------------------------------------------
configure.in | 8 +----
gdk_imlib/Makefile.am | 6 +--
gdk_imlib/Makefile.in | 12 +++----
6 files changed, 16 insertions(+), 97 deletions(-)
Index: imlib-1.9.15-lib-bloat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib-1.9.15-lib-bloat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- imlib-1.9.15-lib-bloat.patch 29 Aug 2008 17:03:13 -0000 1.2
+++ imlib-1.9.15-lib-bloat.patch 17 May 2010 08:01:51 -0000 1.3
@@ -66,3 +66,170 @@
libimlib_ppm_la_SOURCES = io-ppm.c
libimlib_ppm_la_LDFLAGS = $(common_ldflags)
+--- imlib-1.9.15/configure 2010-05-14 11:30:53.000000000 +0100
++++ imlib-1.9.15/configure 2010-05-14 11:32:35.000000000 +0100
+@@ -23570,78 +23570,6 @@
+
+ fi
+ if test $ac_cv_header_gif_lib_h = yes; then
+- echo "$as_me:$LINENO: checking for DGifOpenFileName in -lungif" >&5
+-echo $ECHO_N "checking for DGifOpenFileName in -lungif... $ECHO_C" >&6
+-if test "${ac_cv_lib_ungif_DGifOpenFileName+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lungif $GX_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char DGifOpenFileName ();
+-int
+-main ()
+-{
+-DGifOpenFileName ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_ungif_DGifOpenFileName=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ungif_DGifOpenFileName=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_DGifOpenFileName" >&5
+-echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpenFileName" >&6
+-if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then
+- GIFLIBS="-lungif"
+- SUPPORT_LIBS="$SUPPORT_LIBS -lungif";
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBGIF 1
+-_ACEOF
+-
+-else
+ echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5
+ echo $ECHO_N "checking for DGifOpenFileName in -lgif... $ECHO_C" >&6
+ if test "${ac_cv_lib_gif_DGifOpenFileName+set}" = set; then
+@@ -23720,8 +23648,6 @@
+ { (exit 1); exit 1; }; }
+ fi
+
+-fi
+-
+ else
+ { { echo "$as_me:$LINENO: error: *** GIF header not found ***" >&5
+ echo "$as_me: error: *** GIF header not found ***" >&2;}
+@@ -24008,9 +23934,9 @@
+ fi
+
+ if test "$png_ok" = yes; then
+- PNGLIBS="-lpng -lz"
++ PNGLIBS="-lpng"
+
+- SUPPORT_LIBS="$SUPPORT_LIBS -lpng -lz";
++ SUPPORT_LIBS="$SUPPORT_LIBS -lpng";
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBPNG 1
+ _ACEOF
+--- imlib-1.9.15/gdk_imlib/Makefile.in 2010-05-14 11:30:53.000000000 +0100
++++ imlib-1.9.15/gdk_imlib/Makefile.in 2010-05-14 11:32:38.000000000 +0100
+@@ -90,17 +90,17 @@
+ libimlib_ppm_la_OBJECTS = $(am_libimlib_ppm_la_OBJECTS)
+ @DYNAMIC_MODULES_WORK_TRUE at am_libimlib_ppm_la_rpath = -rpath \
+ @DYNAMIC_MODULES_WORK_TRUE@ $(moduledir)
+-libimlib_ps_la_DEPENDENCIES = libgdk_imlib.la
++libimlib_ps_la_DEPENDENCIES =
+ am_libimlib_ps_la_OBJECTS = io-ps.lo
+ libimlib_ps_la_OBJECTS = $(am_libimlib_ps_la_OBJECTS)
+ @DYNAMIC_MODULES_WORK_TRUE at am_libimlib_ps_la_rpath = -rpath \
+ @DYNAMIC_MODULES_WORK_TRUE@ $(moduledir)
+-libimlib_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libgdk_imlib.la
++libimlib_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libimlib_tiff_la_OBJECTS = io-tiff.lo
+ libimlib_tiff_la_OBJECTS = $(am_libimlib_tiff_la_OBJECTS)
+ @DYNAMIC_MODULES_WORK_TRUE@@HAVE_TIFF_TRUE at am_libimlib_tiff_la_rpath = \
+ @DYNAMIC_MODULES_WORK_TRUE@@HAVE_TIFF_TRUE@ -rpath $(moduledir)
+-libimlib_xpm_la_DEPENDENCIES = libgdk_imlib.la
++libimlib_xpm_la_DEPENDENCIES =
+ am_libimlib_xpm_la_OBJECTS = io-xpm.lo
+ libimlib_xpm_la_OBJECTS = $(am_libimlib_xpm_la_OBJECTS)
+ @DYNAMIC_MODULES_WORK_TRUE at am_libimlib_xpm_la_rpath = -rpath \
+@@ -282,16 +282,16 @@
+ libimlib_png_la_LIBADD = $(PNGLIBS) libgdk_imlib.la
+ libimlib_tiff_la_SOURCES = io-tiff.c
+ libimlib_tiff_la_LDFLAGS = $(common_ldflags)
+-libimlib_tiff_la_LIBADD = $(TIFFLIBS) libgdk_imlib.la
++libimlib_tiff_la_LIBADD = $(TIFFLIBS)
+ libimlib_ps_la_SOURCES = io-ps.c
+ libimlib_ps_la_LDFLAGS = $(common_ldflags)
+-libimlib_ps_la_LIBADD = libgdk_imlib.la
++libimlib_ps_la_LIBADD =
+ libimlib_bmp_la_SOURCES = io-bmp.c
+ libimlib_bmp_la_LDFLAGS = $(common_ldflags)
+ libimlib_bmp_la_LIBADD = libgdk_imlib.la
+ libimlib_xpm_la_SOURCES = io-xpm.c
+ libimlib_xpm_la_LDFLAGS = $(common_ldflags)
+-libimlib_xpm_la_LIBADD = libgdk_imlib.la
++libimlib_xpm_la_LIBADD = -lgdk_imlib -lX11
+ libimlib_ppm_la_SOURCES = io-ppm.c
+ libimlib_ppm_la_LDFLAGS = $(common_ldflags)
+ libimlib_ppm_la_LIBADD = libgdk_imlib.la
+--- imlib-1.9.15/Imlib/Makefile.in 2010-05-14 11:30:53.000000000 +0100
++++ imlib-1.9.15/Imlib/Makefile.in 2010-05-14 11:32:38.000000000 +0100
+@@ -76,7 +76,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libImlib_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1)
+ am_libImlib_la_OBJECTS = cache.lo colors.lo load.lo misc.lo rend.lo \
+ utils.lo save.lo snprintf.lo
+ libImlib_la_OBJECTS = $(am_libImlib_la_OBJECTS)
+@@ -247,9 +247,7 @@
+
+ libImlib_la_LDFLAGS = -version-info 10:15:9
+ #libImlib_la_LDDADD = $(SUPPORT_LIBS)
+-libImlib_la_LIBADD = $(SUPPORT_LIBS) $(X_PRE_LIBS) \
+- $(X_LIBS) $(X_EXTRA_LIBS)
+-
++libImlib_la_LIBADD = $(SUPPORT_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
+ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS)
+ t_load_LDADD = libImlib.la
+ all: all-am
Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- imlib.spec 4 Mar 2010 16:33:59 -0000 1.18
+++ imlib.spec 17 May 2010 08:01:51 -0000 1.19
@@ -1,12 +1,13 @@
Summary: An image loading and rendering library for X11R6
Name: imlib
Version: 1.9.15
-Release: 13%{?dist}
+Release: 14%{?dist}
Epoch: 1
License: LGPLv2+
Group: System Environment/Libraries
Source0: http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-%{version}.tar.bz2
Source2: local-hack-gmodule.tar.gz
+Patch0: imlib-1.9.15-autotools-rebase.patch.bz2
Patch1: imlib-1.9.13-sec2.patch
Patch2: imlib-1.9.15-bpp16-CVE-2007-3568.patch
Patch3: imlib-1.9.10-cppflags.patch
@@ -16,7 +17,6 @@ Patch8: imlib-1.9.15-lib-bloat.patch
Patch9: imlib-1.9.15-multilib-config.patch
Patch10: imlib-1.9.15-check-for-shm-pixmaps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake, libtool
BuildRequires: giflib-devel
BuildRequires: glib-devel%{?_isa}
BuildRequires: gtk+-devel%{?_isa}
@@ -55,8 +55,8 @@ Requires: zlib-devel
%if 0%{?fedora} < 14
Requires: %{_datadir}/aclocal
%endif
-# From Fedora 11, pkgconfig dependency is auto-detected
-%if 0%{?fedora} < 11
+# From Fedora 11, RHEL-6, pkgconfig dependency is auto-detected
+%if 0%{?fedora} < 11 && 0%{?rhel} < 6
Requires: pkgconfig
%endif
@@ -67,13 +67,33 @@ rendering library for X11R6.
%prep
%setup -q
+
+## Rebase autotools to EL-5 versions
+%patch0 -p1
+
+## CVE-2004-1025, CVE-2004-1026 (integer/buffer overflows) (#235416)
%patch1 -p1 -b .sec2
+
+## CVE-2007-3568 (DoS via a BMP image with a Bits Per Page of 0) (#426091)
%patch2 -p0 -b .bpp16
+
+## -I/usr/include is never necessary
%patch3 -p1 -b .cppflags
+
+## Hook our gmodule hack for libpng into the build
%patch4 -p1 -b .gmodulehack
+
+## Fix underquoted m4 definitions
%patch6 -p1 -b .underquoted
+
+## Don't link against libraries unless we use their symbols
%patch8 -p1 -b .lib-bloat
+
+## Make imlib-config multilib-compatible
%patch9 -p1 -b .multilib
+
+## Check whether the MIT SHM extension supports shared pixmaps
+## before trying to use them (#357241)
%patch10 -p1 -b .shmpixmaps
## Local gmodule hack to support building with libpng rather than libpng10
@@ -90,7 +110,6 @@ rendering library for X11R6.
%{__sed} -i -e 's/10:15:9/11:0:0/g' Imlib/Makefile*
%build
-/usr/bin/autoreconf -i -f
%configure --disable-static
## Remove -L%{_libdir} from imlib-config if present;
@@ -101,7 +120,7 @@ rendering library for X11R6.
%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
## Build local gmodule hack
-tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule
+tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule LIBTOOL=$(pwd)/libtool
%{__cp} gdk_imlib/local-hack-gmodule/gmodule-local.h gdk_imlib/
## Avoid unnecessary library linkage in libgdk_imlib
@@ -159,6 +178,11 @@ GX_LIBS=$(/usr/bin/gtk-config --libs | %
%{_mandir}/man1/imlib-config.1*
%changelog
+* Fri May 14 2010 Paul Howarth <paul at city-fan.org> 1:1.9.15-14
+- EL-6 builds don't need manual pkgconfig dependency
+- Fix up patches to avoid need for autotools during build
+- Comment patches
+
* Thu Mar 4 2010 Paul Howarth <paul at city-fan.org> 1:1.9.15-13
- drop %%{_datadir}/aclocal dependency from devel package from Fedora 14,
where this directory is part of the filesystem package (#533962)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 3 Apr 2007 09:51:01 -0000 1.3
+++ sources 17 May 2010 08:01:52 -0000 1.4
@@ -1,2 +1,3 @@
7db987e6c52e4daf70d7d0f471238eae imlib-1.9.15.tar.bz2
1fe64ee91e1c8bb0a207d17101ec10b2 local-hack-gmodule.tar.gz
+b8d16eb747ef64ee2d0da28c16bd6d69 imlib-1.9.15-autotools-rebase.patch.bz2
More information about the scm-commits
mailing list