From 7b806b22253179b0ad1183f3faa62c403c268706 Mon Sep 17 00:00:00 2001 From: vanilla Date: Thu, 21 Jan 1999 20:00:49 +0000 Subject: Upgrade to 1.9.2. Submitted by: Jeremy Lea --- graphics/imlib/files/patch-aa | 31 ++----------------------------- graphics/imlib/files/patch-ac | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 39 deletions(-) (limited to 'graphics/imlib/files') diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa index 34ec3b55d5a2..580690478c03 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Sat Jan 16 01:23:28 1999 -+++ configure Thu Jan 21 06:12:39 1999 +--- configure.orig Thu Jan 21 00:10:05 1999 ++++ configure Fri Jan 22 03:38:47 1999 @@ -2173,8 +2173,8 @@ echo "configure:2174: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" @@ -202,30 +202,3 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" { (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4777,26 +4643,6 @@ - else - echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2 - fi -- --echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6 --echo "configure:4783: checking for libpng version other than 1.0.2" >&5 --cat > conftest.$ac_ext < --PNG_LIBPNG_VER_STRING --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep ""1.0.2"" >/dev/null 2>&1; then -- rm -rf conftest* -- echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit --else -- rm -rf conftest* -- png_ok=yes --fi --rm -f conftest* -- --echo "$ac_t""$png_ok" 1>&6 - - if test "$png_ok" = yes; then - PNGLIBS="-lpng -lz" diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac index fecd0d89ba21..981f8d978623 100644 --- a/graphics/imlib/files/patch-ac +++ b/graphics/imlib/files/patch-ac @@ -1,5 +1,5 @@ ---- config/Makefile.in.orig Sat Jan 16 02:07:15 1999 -+++ config/Makefile.in Thu Jan 21 06:13:27 1999 +--- config/Makefile.in.orig Thu Jan 21 00:26:15 1999 ++++ config/Makefile.in Fri Jan 22 03:36:42 1999 @@ -23,7 +23,7 @@ sbindir = @sbindir@ libexecdir = @libexecdir@ @@ -9,15 +9,16 @@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ ---- Imlib/Makefile.in.orig Sat Jan 16 02:07:15 1999 -+++ Imlib/Makefile.in Thu Jan 21 06:14:23 1999 -@@ -130,12 +130,12 @@ +--- Imlib/Makefile.in.orig Thu Jan 21 00:26:14 1999 ++++ Imlib/Makefile.in Fri Jan 22 03:39:37 1999 +@@ -130,13 +130,13 @@ save.c \ snprintf.c --libImlib_la_LDFLAGS = -version-info 10:1:9 +-libImlib_la_LDFLAGS = -version-info 10:2:9 +libImlib_la_LDFLAGS = -version-info 2:1:0 - libImlib_la_LDDADD = $(SUPPORT_LIBS) + #libImlib_la_LDDADD = $(SUPPORT_LIBS) + libImlib_la_LIBADD = $(SUPPORT_LIBS) DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \ -DCONVERT_PATH=\"@CONVERT_PATH@\" \ @@ -26,13 +27,13 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gdk_imlib/Makefile.in.orig Sat Jan 16 02:07:10 1999 -+++ gdk_imlib/Makefile.in Thu Jan 21 06:14:48 1999 +--- gdk_imlib/Makefile.in.orig Thu Jan 21 00:26:11 1999 ++++ gdk_imlib/Makefile.in Fri Jan 22 03:39:58 1999 @@ -167,14 +167,14 @@ save.c \ modules.c --libgdk_imlib_la_LDFLAGS = -version-info 10:1:9 +-libgdk_imlib_la_LDFLAGS = -version-info 10:2:9 +libgdk_imlib_la_LDFLAGS = -version-info 2:1:0 libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) -- cgit