Upgrade to 1.9.3.

2 files changed, 39 insertions, 43 deletions

diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index 4a69d0badbbe..cb282fe13003 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,7 +1,7 @@
---- 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
+--- configure.orig	Fri Feb 12 14:06:46 1999
++++ configure	Thu Feb 18 00:47:01 1999
+@@ -2304,8 +2304,8 @@
+ echo "configure:2305: checking If dynamic linking works on this system" >&5
    oLIBS="$LIBS"
    oCFLAGS="$CFLAGS"
 -  LIBS="$LIBS `glib-config --libs gmodule`"
@@ -11,7 +11,7 @@
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
-@@ -2223,8 +2223,8 @@
+@@ -2354,8 +2354,8 @@
  #define USE_GMODULE 1
  EOF
  
@@ -22,42 +22,42 @@
     
     
     echo "$ac_t""yes" 1>&6
-@@ -3987,7 +3853,7 @@
+@@ -4153,7 +4153,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lXext $X_LIBS $LIBS"
 +LIBS="-lXext -lX11 $X_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 3993 "configure"
+ #line 4159 "configure"
  #include "confdefs.h"
-@@ -4322,7 +4188,7 @@
+@@ -4488,7 +4488,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff $GX_LIBS $LIBS"
 +LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 4328 "configure"
+ #line 4494 "configure"
  #include "confdefs.h"
-@@ -4549,16 +4415,16 @@
+@@ -4715,16 +4715,16 @@
  
  
  
 -ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:4555: checking for gif_lib.h" >&5
+-echo "configure:4721: checking for gif_lib.h" >&5
 +ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:4555: checking for giflib/gif_lib.h" >&5
++echo "configure:4721: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 4560 "configure"
+ #line 4726 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  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; }
+ { (eval echo configure:4731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
index 981f8d978623..1d81083ae0f3 100644
--- a/graphics/imlib/files/patch-ac
+++ b/graphics/imlib/files/patch-ac
@@ -1,5 +1,5 @@
---- config/Makefile.in.orig	Thu Jan 21 00:26:15 1999
-+++ config/Makefile.in	Fri Jan 22 03:36:42 1999
+--- config/Makefile.in.orig	Fri Feb 12 14:29:22 1999
++++ config/Makefile.in	Wed Feb 17 22:12:52 1999
 @@ -23,7 +23,7 @@
  sbindir = @sbindir@
  libexecdir = @libexecdir@
@@ -9,40 +9,36 @@
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
  libdir = @libdir@
---- 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:2:9
-+libImlib_la_LDFLAGS    = -version-info 2:1:0
+--- Imlib/Makefile.in.orig	Fri Feb 12 14:29:20 1999
++++ Imlib/Makefile.in	Wed Feb 17 22:13:37 1999
+@@ -123,11 +123,11 @@
+ libImlib_la_SOURCES =  	cache.c			colors.c		load.c			misc.c			rend.c			utils.c			save.c			snprintf.c
+ 
+ 
+-libImlib_la_LDFLAGS = -version-info 10:3:9
++libImlib_la_LDFLAGS = -version-info 2:1:0
  #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
- libImlib_la_LIBADD     = $(SUPPORT_LIBS)
+ libImlib_la_LIBADD = $(SUPPORT_LIBS)
+ 
+-DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" 	-DCONVERT_PATH=\"@CONVERT_PATH@\" 	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\"
++DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" 	-DCONVERT_PATH=\"@CONVERT_PATH@\" 	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\"
  
- DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" \
- 	-DCONVERT_PATH=\"@CONVERT_PATH@\" \
--	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\"
-+	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\"
  
  INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- 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:2:9
+--- gdk_imlib/Makefile.in.orig	Fri Feb 12 14:29:16 1999
++++ gdk_imlib/Makefile.in	Wed Feb 17 22:14:09 1999
+@@ -157,12 +157,12 @@
+ libgdk_imlib_la_SOURCES =  	cache.c      			colors.c     			globals.c    			load.c       			misc.c       			rend.c       			utils.c      			save.c				modules.c
+ 
+ 
+-libgdk_imlib_la_LDFLAGS = -version-info 10:3:9
 +libgdk_imlib_la_LDFLAGS = -version-info 2:1:0
  libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
  
  include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
  
- DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" \
- 	-DCONVERT_PATH=\"@CONVERT_PATH@\" \
--	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\" \
-+	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\" \
- 	-DIMLIB_LIB=\""$(libdir)"\"
+-DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" 	-DCONVERT_PATH=\"@CONVERT_PATH@\" 	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\" 	-DIMLIB_LIB=\""$(libdir)"\"
++DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" 	-DCONVERT_PATH=\"@CONVERT_PATH@\" 	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\" 	-DIMLIB_LIB=\""$(libdir)"\"
+ 
  
- INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. \
+ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. 	$(GTK_CFLAGS) $(X_CFLAGS) $(GMODULE_FLAGS)