summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-01-08 07:43:02 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-01-08 07:43:02 +0000
commit6833c312ff9c627b6fffb29537efdadf2e9d412f (patch)
treeac6e8db6da405f91ded2ebf93facc6f3a2fd0fe7 /Build/source/texk/dvisvgm
parentdaa6be2d35b85a8e8eac876e12fb292579951c4c (diff)
poppler 0.30.0
git-svn-id: svn://tug.org/texlive/trunk@35992 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm')
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw3225
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp8
3 files changed, 21 insertions, 14 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog
index a5225a32a2a..485de034728 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog
@@ -1,7 +1,7 @@
2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* Import release 1.9.
- * patch-01-mingw32 (new): MinGW32 may not define RRF_RT_REG_SZ.
+ * patch-01-mingw32 (new): Oldish MinGW32 may not define this.
2014-09-15 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw32 b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw32
index 1f2243a855d..877dac8b566 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw32
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw32
@@ -1,13 +1,22 @@
diff -ur dvisvgm-1.9.orig/src/Ghostscript.cpp dvisvgm-1.9/src/Ghostscript.cpp
--- dvisvgm-1.9.orig/src/Ghostscript.cpp 2014-10-09 16:20:18.000000000 +0200
-+++ dvisvgm-1.9/src/Ghostscript.cpp 2015-01-07 12:53:17.108466555 +0100
-@@ -41,6 +41,9 @@
- #ifdef __WIN32__
++++ dvisvgm-1.9/src/Ghostscript.cpp 2015-01-07 13:42:12.049828785 +0100
+@@ -38,7 +38,8 @@
+
+ #ifndef HAVE_LIBGS
+
+-#ifdef __WIN32__
++/** RegGetValueA and RRF_RT_REG_SZ may not be defined for some oldish MinGW. */
++#if defined(__WIN32__) && defined(RRF_RT_REG_SZ)
/** Looks up the path of the Ghostscript DLL in the Windows registry and returns it.
* If there is no proper registry entry, the returned string is empty. */
-+#if !defined(RRF_RT_REG_SZ)
-+#define RRF_RT_REG_SZ 0x00000002
-+#endif
static string get_path_from_registry () {
- REGSAM mode = KEY_READ|KEY_QUERY_VALUE;
- #ifdef KEY_WOW64_64KEY
+@@ -96,7 +97,7 @@
+ if (const char *gsdll_path = FileFinder::lookup(gsdll))
+ return gsdll_path;
+ #endif // MIKTEX
+-#if defined(__WIN32__)
++#if defined(__WIN32__) && defined(RRF_RT_REG_SZ)
+ // try to look up the path of the Ghostscript DLL in the Windows registry
+ string gsdll_path = get_path_from_registry();
+ if (!gsdll_path.empty())
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp
index 72aff92f384..061dfa17212 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp
@@ -38,12 +38,10 @@ string Ghostscript::LIBGS_NAME;
#ifndef HAVE_LIBGS
-#ifdef __WIN32__
+/** RegGetValueA and RRF_RT_REG_SZ may not be defined for some oldish MinGW. */
+#if defined(__WIN32__) && defined(RRF_RT_REG_SZ)
/** Looks up the path of the Ghostscript DLL in the Windows registry and returns it.
* If there is no proper registry entry, the returned string is empty. */
-#if !defined(RRF_RT_REG_SZ)
-#define RRF_RT_REG_SZ 0x00000002
-#endif
static string get_path_from_registry () {
REGSAM mode = KEY_READ|KEY_QUERY_VALUE;
#ifdef KEY_WOW64_64KEY
@@ -99,7 +97,7 @@ static string get_libgs (const string &fname) {
if (const char *gsdll_path = FileFinder::lookup(gsdll))
return gsdll_path;
#endif // MIKTEX
-#if defined(__WIN32__)
+#if defined(__WIN32__) && defined(RRF_RT_REG_SZ)
// try to look up the path of the Ghostscript DLL in the Windows registry
string gsdll_path = get_path_from_registry();
if (!gsdll_path.empty())