diff options
author | 2010-03-02 20:55:24 +0000 | |
---|---|---|
committer | 2010-03-02 20:55:24 +0000 | |
commit | 64948560c50fbd2ec3f4ca69f8649a3bab048131 (patch) | |
tree | a66f2e8c987985925ddf148ea5b9059d5ee3c0c7 /media-gfx/splashutils/files | |
parent | KDE SC 4.4.1 Released (diff) | |
download | gentoo-2-64948560c50fbd2ec3f4ca69f8649a3bab048131.tar.gz gentoo-2-64948560c50fbd2ec3f4ca69f8649a3bab048131.tar.bz2 gentoo-2-64948560c50fbd2ec3f4ca69f8649a3bab048131.zip |
Bump the internal versions of libfreetype, libjpeg and libpng (bug #307525).
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/splashutils/files')
-rw-r--r-- | media-gfx/splashutils/files/splashutils-1.5.4.3-libjpeg.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-libjpeg.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-libjpeg.patch new file mode 100644 index 000000000000..16d7ac2080a8 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-libjpeg.patch @@ -0,0 +1,36 @@ +diff --git a/core/libs/Makefile.am b/core/libs/Makefile.am +index d070b29..c0a9258 100644 +--- a/core/libs/Makefile.am ++++ b/core/libs/Makefile.am +@@ -53,7 +53,7 @@ libfreetype.a: klibc_compat.h + if ! $(MAKE) --question $(AM_MAKEFLAGS) CFLAGS="$(K_CFLAGS)" library ; then \ + $(call infmsg,MAKE,libfreetype.a) ; \ + fi ; \ +- $(MAKE) $(AM_MAKEFLAGS) CFLAGS="-c $(K_CFLAGS)" CCexe="$(BUILD_CC)" library $(OUTPUT) ++ $(MAKE) $(AM_MAKEFLAGS) CFLAGS="-c $(K_CFLAGS)" CCexe="$(BUILD_CC)" ANSIFLAGS="" library $(OUTPUT) + $(Q)$(MKDIR_P) $(@D) + $(Q)cp -f libfreetype/.libs/libfreetype.a $@ + +@@ -62,18 +62,18 @@ libjpeg.a: + $(Q)cd libjpeg ; \ + if test ! -e ./Makefile ; then \ + $(call infmsg,CONF,libjpeg.a) ; \ +- CC=$(KLCC) CFLAGS="$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg" $(LIBJPEG_SOURCE)/configure \ ++ CC=$(KLCC) CFLAGS="$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg -include $(abs_top_srcdir)/libs/klibc_compat.h" $(LIBJPEG_SOURCE)/configure \ + --host=$(host) --build=$(build_triplet) $(OUTPUT) ; \ + echo "#define NO_GETENV 1" >> jconfig.h ; \ + $(SED) -i "s#CFLAGS=.*#CFLAGS=$(K_CFLAGS) -I$(abs_top_builddir)/libs/libjpeg#" Makefile ; \ + $(SED) -i "s:#define JMESSAGE.*::" $(LIBJPEG_SOURCE)/jerror.c ; \ + fi ; \ +- if ! $(MAKE) --question $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.a ; then \ ++ if ! $(MAKE) --question $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.la ; then \ + $(call infmsg,MAKE,libjpeg.a) ; \ + fi ; \ +- $(MAKE) $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.a $(OUTPUT) ++ $(MAKE) $(AM_MAKEFLAGS) CC="$(KLCC)" libjpeg.la $(OUTPUT) + $(Q)$(MKDIR_P) $(@D) +- $(Q)cp -f libjpeg/libjpeg.a $@ ++ $(Q)cp -f libjpeg/.libs/libjpeg.a $@ + + libpng.a: libz.a + $(Q)cd $(LIBPNG_SOURCE) ; \ |