summaryrefslogtreecommitdiff
path: root/Build/source/libs/gd/TLpatches
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/gd/TLpatches')
-rw-r--r--Build/source/libs/gd/TLpatches/ChangeLog58
-rw-r--r--Build/source/libs/gd/TLpatches/TL-Changes30
-rw-r--r--Build/source/libs/gd/TLpatches/patch-01-win3220
-rw-r--r--Build/source/libs/gd/TLpatches/patch-02-no-stdcall12
4 files changed, 120 insertions, 0 deletions
diff --git a/Build/source/libs/gd/TLpatches/ChangeLog b/Build/source/libs/gd/TLpatches/ChangeLog
new file mode 100644
index 00000000000..db52775694e
--- /dev/null
+++ b/Build/source/libs/gd/TLpatches/ChangeLog
@@ -0,0 +1,58 @@
+2017-01-18 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Import libgd-2.2.4 source tree from:
+ https://github.com/libgd/libgd/releases
+ * patch-01-win32: Adapted.
+ * patch-02-no-stdcall: Adapted.
+
+2016-12-23 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Import libgd-2.2.3 source tree from:
+ https://github.com/libgd/libgd/releases
+ * patch-01-win32: Adapted.
+ * patch-02-no-stdcall: Adapted.
+ * patch-03-ceill: Removed.
+ * patch-04-double-semicolon: Removed.
+
+2015-01-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-04-double-semicolon: Build fix for Visual Studio 2010,
+ from Akira Kakuto <kakuto@fuk.kindai.ac.jp>.
+
+2015-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported libgd-2.1.1 source tree from:
+ https://bitbucket.org/libgd/gd-libgd/downloads
+
+ * patch-01-win32: Adapted.
+ * patch-02-no-stdcall: Adapted.
+ * patch-03-ceill: Adapted.
+
+2014-06-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-ceill (new): Replace ceill() by ceil() as everywhere.
+
+2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported libgd-2.1.0 source tree from:
+ https://bitbucket.org/libgd/gd-libgd/downloads
+
+ * patch-01-win32: Adapted.
+ * patch-02-no-stdcall: Adapted.
+
+2013-06-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported libgd-2.1.0-rc1 source tree from:
+ https://bitbucket.org/libgd/gd-libgd/downloads
+
+ * patch-01-win32: Adapted, some parts now upstream.
+ * patch-02-no-stdcall (new): Avoid '__stdcall'.
+
+2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-win32 [WIN32] (new): Avoid 'redefined' warnings.
+ Add $SYSTEMROOT\fonts fontsearchpath.
+ Mail from Akira, 18 Jul 2012 19:11:09.
+
+Copyright (C) 2012-2013 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
diff --git a/Build/source/libs/gd/TLpatches/TL-Changes b/Build/source/libs/gd/TLpatches/TL-Changes
new file mode 100644
index 00000000000..21b8cec668a
--- /dev/null
+++ b/Build/source/libs/gd/TLpatches/TL-Changes
@@ -0,0 +1,30 @@
+Changes applied to the libgd-2.2.4/ tree as obtained from:
+ https://github.com/libgd/libgd/releases
+
+Removed:
+ Makefile.in
+ aclocal.m4
+ config/Makefile.in
+ config/ar-lib
+ config/compile
+ config/config.guess
+ config/config.rpath
+ config/config.sub
+ config/depcomp
+ config/install-sh
+ config/ltmain.sh
+ config/missing
+ configure
+ m4/libtool.m4
+ m4/ltoptions.m4
+ m4/ltsugar.m4
+ m4/ltversion.m4
+ m4/lt~obsolete.m4
+ src/Makefile.in
+ src/depcomp
+ tests/Makefile.in
+
+Removed execute permission:
+ windows/libgd.rc
+ windows/msys/deps.mk
+
diff --git a/Build/source/libs/gd/TLpatches/patch-01-win32 b/Build/source/libs/gd/TLpatches/patch-01-win32
new file mode 100644
index 00000000000..814ed38e1e9
--- /dev/null
+++ b/Build/source/libs/gd/TLpatches/patch-01-win32
@@ -0,0 +1,20 @@
+diff -ur libgd-2.2.4.orig/src/gdft.c libgd-2.2.4/src/gdft.c
+--- libgd-2.2.4.orig/src/gdft.c Wed Jan 18 20:01:19 2017
++++ libgd-2.2.4/src/gdft.c Thu Jan 19 07:20:24 2017
+@@ -1683,6 +1683,16 @@
+ */
+ *fontpath = NULL;
+ fontsearchpath = getenv ("GDFONTPATH");
++#ifdef _WIN32
++ if (!fontsearchpath) {
++ char *ffptr = getenv ("SYSTEMROOT");
++ if (ffptr) {
++ fontsearchpath = malloc (strlen(ffptr) + strlen("\\fonts") + 1);
++ strcpy(fontsearchpath, ffptr);
++ strcat(fontsearchpath, "\\fonts");
++ }
++ }
++#endif
+ if (!fontsearchpath)
+ fontsearchpath = DEFAULT_FONTPATH;
+ path = (char *) gdMalloc(sizeof(char) * strlen(fontsearchpath) + 1);
diff --git a/Build/source/libs/gd/TLpatches/patch-02-no-stdcall b/Build/source/libs/gd/TLpatches/patch-02-no-stdcall
new file mode 100644
index 00000000000..efde64e3ccf
--- /dev/null
+++ b/Build/source/libs/gd/TLpatches/patch-02-no-stdcall
@@ -0,0 +1,12 @@
+diff -ur libgd-2.2.4.orig/src/gd.h libgd-2.2.4/src/gd.h
+--- libgd-2.2.4.orig/src/gd.h Wed Jan 18 20:01:19 2017
++++ libgd-2.2.4/src/gd.h Thu Jan 19 07:22:18 2017
+@@ -63,7 +63,7 @@
+ # define BGD_EXPORT_DATA_PROT __declspec(dllimport)
+ # endif
+ # endif
+-# define BGD_STDCALL __stdcall
++# define BGD_STDCALL
+ # define BGD_EXPORT_DATA_IMPL
+ #else
+ # if defined(__GNUC__) || defined(__clang__)