summaryrefslogtreecommitdiff
path: root/package/libgd/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-14 17:21:27 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-10-14 17:21:27 +0200
commit87e7852e85430179b8e3074287349c14c1681492 (patch)
tree1cb992fe636336f7e2cacac881b751be1d66e030 /package/libgd/patches
parent38761fb752d70fb7c3104a1be531f26910977a11 (diff)
update to latest gd upstream version, added patch for php
Diffstat (limited to 'package/libgd/patches')
-rw-r--r--package/libgd/patches/patch-Makefile_in29
-rw-r--r--package/libgd/patches/patch-gd_io_h10
2 files changed, 10 insertions, 29 deletions
diff --git a/package/libgd/patches/patch-Makefile_in b/package/libgd/patches/patch-Makefile_in
deleted file mode 100644
index c36a6b4a6..000000000
--- a/package/libgd/patches/patch-Makefile_in
+++ /dev/null
@@ -1,29 +0,0 @@
-$Id$
---- gd-2.0.34.orig/Makefile.in 2007-02-03 02:41:46.000000000 +0100
-+++ gd-2.0.34/Makefile.in 2007-02-20 20:56:27.000000000 +0100
-@@ -78,7 +78,7 @@ am_libgd_la_OBJECTS = gd.lo gdfx.lo gd_s
- gd_io.lo gd_io_dp.lo gd_gif_in.lo gd_gif_out.lo gd_io_file.lo \
- gd_io_ss.lo gd_jpeg.lo gd_png.lo gd_ss.lo gd_topal.lo \
- gd_wbmp.lo gdcache.lo gdfontg.lo gdfontl.lo gdfontmb.lo \
-- gdfonts.lo gdfontt.lo gdft.lo gdhelpers.lo gdkanji.lo \
-+ gdfonts.lo gdfontt.lo gdft.lo gdhelpers.lo \
- gdtables.lo gdxpm.lo wbmp.lo
- libgd_la_OBJECTS = $(am_libgd_la_OBJECTS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -344,7 +344,7 @@ bin_SCRIPTS = bdftogd config/gdlib-confi
- EXTRA_DIST = README-JPEG.TXT README.TXT configure.pl bdftogd demoin.png err.out index.html install-item makefile.sample readme.jpn entities.html entities.tcl
- include_HEADERS = gd.h gdfx.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h gdfonts.h gdfontt.h entities.h
- lib_LTLIBRARIES = libgd.la
--libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
-+libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
- libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS)
- libgd_la_LIBADD = $(LTLIBICONV)
- LDADD = ./libgd.la $(LIBICONV)
-@@ -594,7 +594,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdft.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdfx.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdhelpers.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkanji.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdparttopng.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdtables.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdtest.Po@am__quote@
diff --git a/package/libgd/patches/patch-gd_io_h b/package/libgd/patches/patch-gd_io_h
new file mode 100644
index 000000000..1d083673c
--- /dev/null
+++ b/package/libgd/patches/patch-gd_io_h
@@ -0,0 +1,10 @@
+--- gd-2.0.36.orig/gd_io.h 2007-11-27 09:30:34.000000000 +0100
++++ gd-2.0.36/gd_io.h 2012-10-14 16:10:30.000000000 +0200
+@@ -26,6 +26,7 @@ typedef struct gdIOCtx
+
+ void (*gd_free) (struct gdIOCtx *);
+
++ void *data;
+ }
+ gdIOCtx;
+