diff options
author | Karl Berry <karl@freefriends.org> | 2021-02-25 19:22:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-02-25 19:22:25 +0000 |
commit | ad547a6b5986815fda458221149728d9d9ab1d87 (patch) | |
tree | 16296910eb3eca724371474ea9aea3994dc69614 /Build/source/libs/gd/TLpatches | |
parent | 947b43de3dd21d58ccc2ffadefc4441ea1c2a813 (diff) |
restore Build,TODO from r57911
git-svn-id: svn://tug.org/texlive/trunk@57915 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/gd/TLpatches')
-rw-r--r-- | Build/source/libs/gd/TLpatches/ChangeLog | 79 | ||||
-rw-r--r-- | Build/source/libs/gd/TLpatches/TL-Changes | 30 | ||||
-rw-r--r-- | Build/source/libs/gd/TLpatches/patch-01-win32 | 78 | ||||
-rw-r--r-- | Build/source/libs/gd/TLpatches/patch-02-no-stdcall | 12 |
4 files changed, 199 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..a140ecacca8 --- /dev/null +++ b/Build/source/libs/gd/TLpatches/ChangeLog @@ -0,0 +1,79 @@ +2021-02-03 Akira Kakuto <kakuto@w32tex.org> + + Import libgd-2.3.1 source tree from: + https://github.com/libgd/libgd/releases + * patch-01-win32: Adapted. + * patch-02-no-stdcall: Adapted. + +2020-04-10 Akira Kakuto <kakuto@w32tex.org> + + Import libgd-2.3.0 source tree from: + https://github.com/libgd/libgd/releases + * patch-01-win32: Adapted. + * patch-02-no-stdcall: Adapted. + +2017-08-30 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Import libgd-2.2.5 source tree from: + https://github.com/libgd/libgd/releases + * patch-01-win32: Adapted. + * patch-02-no-stdcall: Adapted. + +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..d5bd85fac90 --- /dev/null +++ b/Build/source/libs/gd/TLpatches/TL-Changes @@ -0,0 +1,30 @@ +Changes applied to the libgd-2.3.1/ 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/getlib.sh + 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..b2a276c4e67 --- /dev/null +++ b/Build/source/libs/gd/TLpatches/patch-01-win32 @@ -0,0 +1,78 @@ +diff -ur libgd-2.3.1/src/gd_interpolation.c libgd-src/src/gd_interpolation.c +--- libgd-2.3.1/src/gd_interpolation.c Sat Jan 30 18:30:01 2021 ++++ libgd-src/src/gd_interpolation.c Wed Feb 03 14:56:52 2021 +@@ -1992,9 +1992,9 @@ + int i; + + b = (unsigned char)tcolor; +- g = (unsigned char)tcolor >> 8; +- r = (unsigned char)tcolor >> 16; +- a = (unsigned char)tcolor >> 24; ++ g = (unsigned char)(tcolor >> 8); ++ r = (unsigned char)(tcolor >> 16); ++ a = (unsigned char)(tcolor >> 24); + + b = CLAMP(b, 0, 255); + g = CLAMP(g, 0, 255); +diff -ur libgd-2.3.1/src/gdft.c libgd-src/src/gdft.c +--- libgd-2.3.1/src/gdft.c Sat Jan 30 18:30:01 2021 ++++ libgd-src/src/gdft.c Wed Feb 03 15:26:58 2021 +@@ -446,6 +446,11 @@ + FT_Face face, gdFTStringExtraPtr strex, + glyphInfo **glyph_info) + { ++#ifndef HAVE_LIBRAQM ++ FT_UInt glyph_index = 0, previous = 0; ++ FT_Vector delta; ++ FT_Error err; ++#endif + size_t count; + glyphInfo *info; + +@@ -488,9 +493,6 @@ + + raqm_destroy (rq); + #else +- FT_UInt glyph_index = 0, previous = 0; +- FT_Vector delta; +- FT_Error err; + info = (glyphInfo*) gdMalloc (sizeof (glyphInfo) * len); + if (!info) { + return -1; +@@ -1523,6 +1525,8 @@ + } + + if (render) { ++ FT_Pos pen_x; ++ FT_Pos pen_y; + FT_Activate_Size (platform_specific); + + /* load glyph again into the slot (erase previous one) - this time with scaling */ +@@ -1556,8 +1560,8 @@ + bm = (FT_BitmapGlyph) image; + /* position rounded down to nearest pixel at current dpi + (the estimate was rounded up to next 1/METRIC_RES, so this should fit) */ +- FT_Pos pen_x = penf.x + info[i].x_offset; +- FT_Pos pen_y = penf.y - info[i].y_offset; ++ pen_x = penf.x + info[i].x_offset; ++ pen_y = penf.y - info[i].y_offset; + gdft_draw_bitmap (tc_cache, im, fg, bm->bitmap, + (int)(x + (pen_x * cos_a + pen_y * sin_a)*hdpi/(METRIC_RES*64) + bm->left), + (int)(y - (pen_x * sin_a - pen_y * cos_a)*vdpi/(METRIC_RES*64) - bm->top)); +@@ -1793,6 +1797,16 @@ + */ + *fontpath = NULL; + fontsearchpath = getenv ("GDFONTPATH"); ++#ifdef _WIN32 ++ if (!fontsearchpath) { ++ char *ffptr = getenv ("WINDIR"); ++ 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..3a77b0a791c --- /dev/null +++ b/Build/source/libs/gd/TLpatches/patch-02-no-stdcall @@ -0,0 +1,12 @@ +diff -ur libgd-2.3.1/src/gd.h libgd-src/src/gd.h +--- libgd-2.3.1/src/gd.h Sat Jan 30 18:40:10 2021 ++++ libgd-src/src/gd.h Wed Feb 03 14:52:34 2021 +@@ -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__) |