summaryrefslogtreecommitdiff
path: root/Build/source/utils/asymptote/patches
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-03 22:35:04 +0000
committerKarl Berry <karl@freefriends.org>2018-04-03 22:35:04 +0000
commit36b8d1341af4a7ab1f5759d75ad1eecfc375c1f4 (patch)
tree12d09b686d2c18f245dc6fd492c09cdcd4c02ebc /Build/source/utils/asymptote/patches
parentd73e029b665b866fe734e44508746a2cba513fd7 (diff)
asy 2.42 sources
git-svn-id: svn://tug.org/texlive/trunk@47274 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/patches')
-rw-r--r--Build/source/utils/asymptote/patches/README5
-rw-r--r--Build/source/utils/asymptote/patches/cygwin_freeglut-2.8.1.patch13
-rw-r--r--Build/source/utils/asymptote/patches/cygwin_gc.patch77
3 files changed, 95 insertions, 0 deletions
diff --git a/Build/source/utils/asymptote/patches/README b/Build/source/utils/asymptote/patches/README
index bc21d024881..1d1b63b9f3b 100644
--- a/Build/source/utils/asymptote/patches/README
+++ b/Build/source/utils/asymptote/patches/README
@@ -16,6 +16,11 @@ out-of-memory errors.
The file cygwin_glu.patch adds missing GLU 1.3 declarations to w32api/GL/glu.h.
+The file cygwin_gc.patch fixes redefined symbols in the Boehm garbage collector.
+
+The file cygwin_freeglut-2.8.1.patch fixes undefined symbols when compiling the
+freeglut library under cygwin.
+
The file fixmem.reg patches the Microsoft Windows registry so that the
cygwin1.dll library can allocate more than 384MB. It is applied
automatically by the Asymptote setup.exe file but may also be applied manually:
diff --git a/Build/source/utils/asymptote/patches/cygwin_freeglut-2.8.1.patch b/Build/source/utils/asymptote/patches/cygwin_freeglut-2.8.1.patch
new file mode 100644
index 00000000000..6b2ea618c70
--- /dev/null
+++ b/Build/source/utils/asymptote/patches/cygwin_freeglut-2.8.1.patch
@@ -0,0 +1,13 @@
+diff -r -u freeglut-2.8.1/src/freeglut_internal.h freeglut-2.8.1J/src/freeglut_internal.h
+--- freeglut-2.8.1/src/freeglut_internal.h 2012-11-19 06:14:16.000000000 -0700
++++ freeglut-2.8.1J/src/freeglut_internal.h 2018-01-05 11:38:25.214161500 -0700
+@@ -32,6 +32,9 @@
+ # include "config.h"
+ #endif
+
++#define GCL_HCURSOR (-12)
++#define _snprintf snprintf
++
+ /* XXX Update these for each release! */
+ #define VERSION_MAJOR 2
+ #define VERSION_MINOR 8
diff --git a/Build/source/utils/asymptote/patches/cygwin_gc.patch b/Build/source/utils/asymptote/patches/cygwin_gc.patch
new file mode 100644
index 00000000000..1af6f6f2067
--- /dev/null
+++ b/Build/source/utils/asymptote/patches/cygwin_gc.patch
@@ -0,0 +1,77 @@
+diff -ru gc-7.6.2.orig/include/config.h.in gc-7.6.2/include/config.h.in
+--- gc-7.6.2.orig/include/config.h.in 2017-12-23 00:48:37.000000000 -0800
++++ gc-7.6.2/include/config.h.in 2018-01-12 13:42:30.026704300 -0800
+@@ -100,19 +100,27 @@
+ #undef GC_USE_DLOPEN_WRAP
+
+ /* The major version number of this GC release. */
++#ifndef GC_VERSION_MAJOR
+ #undef GC_VERSION_MAJOR
++#endif
+
+ /* The micro version number of this GC release. */
++#ifndef GC_VERSION_MICRO
+ #undef GC_VERSION_MICRO
++#endif
+
+ /* The minor version number of this GC release. */
++#ifndef GC_VERSION_MINOR
+ #undef GC_VERSION_MINOR
++#endif
+
+ /* Define to support pthreads-win32 or winpthreads. */
+ #undef GC_WIN32_PTHREADS
+
+ /* Define to support Win32 threads. */
++#ifndef GC_WIN32_THREADS
+ #undef GC_WIN32_THREADS
++#endif
+
+ /* Define to install pthread_atfork() handlers by default. */
+ #undef HANDLE_FORK
+@@ -196,22 +204,32 @@
+ #undef PACKAGE
+
+ /* Define to the address where bug reports for this package should be sent. */
++#ifndef PACKAGE_BUGREPORT
+ #undef PACKAGE_BUGREPORT
++#endif
+
+ /* Define to the full name of this package. */
++#ifndef PACKAGE_NAME
+ #undef PACKAGE_NAME
++#endif
+
+ /* Define to the full name and version of this package. */
++#ifndef PACKAGE_STRING
+ #undef PACKAGE_STRING
++#endif
+
+ /* Define to the one symbol short name of this package. */
++#ifndef PACKAGE_TARNAME
+ #undef PACKAGE_TARNAME
++#endif
+
+ /* Define to the home page for this package. */
+ #undef PACKAGE_URL
+
+ /* Define to the version of this package. */
++#ifndef PACKAGE_VERSION
+ #undef PACKAGE_VERSION
++#endif
+
+ /* Define to enable parallel marking. */
+ #undef PARALLEL_MARK
+diff -ru gc-7.6.2.orig/include/gc_config_macros.h gc-7.6.2/include/gc_config_macros.h
+--- gc-7.6.2.orig/include/gc_config_macros.h 2017-12-23 00:46:29.000000000 -0800
++++ gc-7.6.2/include/gc_config_macros.h 2018-01-12 13:44:29.838482500 -0800
+@@ -48,7 +48,9 @@
+ # define GC_LINUX_THREADS
+ #endif
+ #if defined(WIN32_THREADS)
++# ifndef GC_WIN32_THREADS
+ # define GC_WIN32_THREADS
++# endif
+ #endif
+ #if defined(RTEMS_THREADS)
+ # define GC_RTEMS_PTHREADS