diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-13 12:26:25 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-13 12:26:25 +0000 |
commit | 52ee081aab727269a39b866c77f0cf6fb5c336f7 (patch) | |
tree | 573c6d3a9c05e900d7c0ca2498c9dd741d56e8aa /Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES | |
parent | 7ef66445c67a38eae29a96876837a3bbbb6897cc (diff) |
dvisvgm 1.0.1
git-svn-id: svn://tug.org/texlive/trunk@18934 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES')
14 files changed, 0 insertions, 597 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog deleted file mode 100644 index 345282b8087..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog +++ /dev/null @@ -1,75 +0,0 @@ -2010-06-07 Peter Breitenlohner <peb@mppmu.mpg.de> - - Added patch-08-static-const-members, from vvv. - * src/FontCache.cpp (FontCache::VERSION), - src/gzstream.cpp (gzstreambuf::bufferSize): Initialized static - const class members need also to be declared (at least for AIX) - -2010-06-05 Karl Berry <karl@tug.org> - - * patch-07-libdvisvgm-uint32: declare glyphIndex as FT_UInt in the - first place, instead of casting. From vvv, confirmed for his AIX. - -2010-05-31 Karl Berry <karl@tug.org> - - Added patch-07-libdvisvgm-uint32. - * src/FontEngine.cpp: must cast &glyphindex to (FT_Uint *) - for AIX compiler (tlbuild 28 May 2010 15:23:25). - - Added patch-09-unistd. - * src/FileSystem.cpp: unconditionally include <unistd.h>. - (Needed on AIX, tlbuild 28 May 2010 15:08:06.) - -2010-02-23 Peter Breitenlohner <peb@mppmu.mpg.de> - - Added patch-30-WIN32-warning. - * src/MetafontWrapper.cpp (execute) [WIN32]: Initialize the - DWORD exitcode with (DWORD)-1 to avoid warning. - -2009-12-14 Peter Breitenlohner <peb@mppmu.mpg.de> - - Added patch-20-gettimeofday-or-ftime. - * configure.ac, src/dvisvgm.cpp: Check for gettimeofday() - and <sys/time.h> or ftime() and <sys/timeb.h>. - -2009-11-18 Peter Breitenlohner <peb@mppmu.mpg.de> - - Added patch-05-libdvisvgm-dlfcn. - * src/Ghostscript.h: #include <dlfcn.h> only when used. - * src/DVIToSVG.cpp, src/Ghostscript.{cpp,h}: - Use defined(DISABLE_GS) instead of DISABLE_GS. - - Added patch-06-libdvisvgm-HAVE_LIBGS. - * src/Ghostscript.{cpp,h}: Use defined(HAVE_LIBGS). - -2009-11-14 Peter Breitenlohner <peb@mppmu.mpg.de> - - Added patch-03-libdvisvgm-uninitialized. - * src/InputReader.cpp (skipUntil): Avoid uninitialized variable. - - Added patch-04-libdvisvgm-virtual. - * src/CmdLineParserBase.h, src/CommandLine.h: Added virtual - destructors because there are virtual functions. - - Added patch-10-TL-help. - * src/dvisvgm.cpp (show_help): With our proxy configure.ac - PACKAGE_BUGREPORT is "tex-k@tug.org" and can't be used as email - for the copyright. - -2009-11-13 Peter Breitenlohner <peb@mppmu.mpg.de> - - Added patch-01-potracelib-warning. - * potracelib/potracelib.[ch]: Change return type of - potrace_version() from 'char *' to 'const char *'. - - Added patch-02-libdvisvgm-warnings. - * src/Color.cpp (float_to_byte): Cast from double to UInt8. - * src/Color.cpp (HSB2RGB), - src/ColorSpecialHandler.cpp (hsb_to_rgb), - src/PsSpecialHandler.cpp (setdash), - src/TpicSpecialHandler.cpp (drawArc): Casts from double to int. - * src/PsSpecialHandler.h (setlinecap, setlinejoin): Casts from - double to unsigned int. - * src/FontManager.cpp (vfFirstFontNum): Cast from unsigned int - to int. - diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/TL-Changes deleted file mode 100644 index a7749f10b42..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/TL-Changes +++ /dev/null @@ -1,14 +0,0 @@ -Changes applied to the dvisvgm-0.8.7 tree as obtained from: - http://downloads.sourceforge.net/dvisvgm/dvisvgm-0.8.7.tar.gz - -Removed: - config.guess - config.sub - depcomp - install-sh - missing - -Converted mixed Dos/Win and Unix line ends to native: - src/DLLoader.cpp - src/DLLoader.h - diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-01-potracelib-warning b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-01-potracelib-warning deleted file mode 100644 index aa4a5f56d47..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-01-potracelib-warning +++ /dev/null @@ -1,24 +0,0 @@ - Avoid compiler warning. - -diff -ur dvisvgm-0.8.7.orig/potracelib/potracelib.c dvisvgm-0.8.7/potracelib/potracelib.c ---- dvisvgm-0.8.7.orig/potracelib/potracelib.c 2009-08-29 22:06:31.000000000 +0200 -+++ dvisvgm-0.8.7/potracelib/potracelib.c 2009-11-13 13:33:11.000000000 +0100 -@@ -108,6 +108,6 @@ - free(p); - } - --char *potrace_version(void) { -+const char *potrace_version(void) { - return "potracelib "VERSION""; - } -diff -ur dvisvgm-0.8.7.orig/potracelib/potracelib.h dvisvgm-0.8.7/potracelib/potracelib.h ---- dvisvgm-0.8.7.orig/potracelib/potracelib.h 2009-08-29 22:06:31.000000000 +0200 -+++ dvisvgm-0.8.7/potracelib/potracelib.h 2009-11-13 13:33:12.000000000 +0100 -@@ -126,6 +126,6 @@ - - /* return a static plain text version string identifying this version - of potracelib */ --char *potrace_version(void); -+const char *potrace_version(void); - - #endif /* POTRACELIB_H */ diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-02-libdvisvgm-warnings b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-02-libdvisvgm-warnings deleted file mode 100644 index 63544c87c7e..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-02-libdvisvgm-warnings +++ /dev/null @@ -1,87 +0,0 @@ - Various casts to avoid compiler warnings. - -diff -ur dvisvgm-0.8.7.orig/src/Color.cpp dvisvgm-0.8.7/src/Color.cpp ---- dvisvgm-0.8.7.orig/src/Color.cpp 2009-11-09 17:36:55.000000000 +0100 -+++ dvisvgm-0.8.7/src/Color.cpp 2009-11-13 18:21:01.000000000 +0100 -@@ -32,7 +32,7 @@ - - - static inline UInt8 float_to_byte (float v) { -- return floor(255*v+0.5); -+ return (UInt8) (floor(255*v+0.5)); - } - - -@@ -101,7 +101,7 @@ - rgb[0] = rgb[1] = rgb[2] = hsb[2]; - else { - float h = hsb[0]-floor(hsb[0]); -- int i = 6*h; -+ int i = (int) (6*h); - float f = 6*h-i; - float p = hsb[2]*(1-hsb[1]); - float q = hsb[2]*(1-hsb[1]*f); -diff -ur dvisvgm-0.8.7.orig/src/ColorSpecialHandler.cpp dvisvgm-0.8.7/src/ColorSpecialHandler.cpp ---- dvisvgm-0.8.7.orig/src/ColorSpecialHandler.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/ColorSpecialHandler.cpp 2009-11-13 18:21:56.000000000 +0100 -@@ -49,7 +49,7 @@ - rgb[0] = rgb[1] = rgb[2] = hsb[2]; - else { - float h = hsb[0]-floor(hsb[0]); -- int i = 6*h; -+ int i = (int) (6*h); - float f = 6*h-i; - float p = hsb[2]*(1-hsb[1]); - float q = hsb[2]*(1-hsb[1]*f); -diff -ur dvisvgm-0.8.7.orig/src/FontManager.cpp dvisvgm-0.8.7/src/FontManager.cpp ---- dvisvgm-0.8.7.orig/src/FontManager.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/FontManager.cpp 2009-11-13 18:42:59.000000000 +0100 -@@ -100,7 +100,7 @@ - - int FontManager::vfFirstFontNum (VirtualFont *vf) const { - VfFirstFontMap::const_iterator it = _vfFirstFontMap.find(vf); -- return (it == _vfFirstFontMap.end()) ? -1 : it->second; -+ return (it == _vfFirstFontMap.end()) ? -1 : (int) it->second; - } - - -diff -ur dvisvgm-0.8.7.orig/src/PsSpecialHandler.cpp dvisvgm-0.8.7/src/PsSpecialHandler.cpp ---- dvisvgm-0.8.7.orig/src/PsSpecialHandler.cpp 2009-11-09 17:36:55.000000000 +0100 -+++ dvisvgm-0.8.7/src/PsSpecialHandler.cpp 2009-11-13 14:12:39.000000000 +0100 -@@ -558,8 +558,8 @@ - void PsSpecialHandler::setdash (vector<double> &p) { - _dashpattern.clear(); - for (size_t i=0; i < p.size()-1; i++) -- _dashpattern.push_back(p[i]*1.00375); -- _dashoffset = p.back()*1.00375; -+ _dashpattern.push_back((int) (p[i]*1.00375)); -+ _dashoffset = (int) (p.back()*1.00375); - } - - -diff -ur dvisvgm-0.8.7.orig/src/PsSpecialHandler.h dvisvgm-0.8.7/src/PsSpecialHandler.h ---- dvisvgm-0.8.7.orig/src/PsSpecialHandler.h 2009-11-09 17:36:55.000000000 +0100 -+++ dvisvgm-0.8.7/src/PsSpecialHandler.h 2009-11-13 14:08:37.000000000 +0100 -@@ -82,8 +82,8 @@ - void setdash (std::vector<double> &p); - void setgray (std::vector<double> &p); - void sethsbcolor (std::vector<double> &hsb); -- void setlinecap (std::vector<double> &p) {_linecap = p[0];} -- void setlinejoin (std::vector<double> &p) {_linejoin = p[0];} -+ void setlinecap (std::vector<double> &p) {_linecap = (unsigned int) p[0];} -+ void setlinejoin (std::vector<double> &p) {_linejoin = (unsigned int) p[0];} - void setlinewidth (std::vector<double> &p) {_linewidth = p[0] ? p[0]*1.00375 : 0.5;} - void setmatrix (std::vector<double> &p); - void setmiterlimit (std::vector<double> &p) {_miterlimit = p[0]*1.00375;} -diff -ur dvisvgm-0.8.7.orig/src/TpicSpecialHandler.cpp dvisvgm-0.8.7/src/TpicSpecialHandler.cpp ---- dvisvgm-0.8.7.orig/src/TpicSpecialHandler.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/TpicSpecialHandler.cpp 2009-11-13 18:20:12.000000000 +0100 -@@ -172,7 +172,7 @@ - angle1 *= -1; - angle2 *= -1; - if (fabs(angle1) > PI2) { -- int n = angle1/PI2; -+ int n = (int) (angle1/PI2); - angle1 = angle1 - n*PI2; - angle2 = angle2 - n*PI2; - } diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-03-libdvisvgm-uninitialized b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-03-libdvisvgm-uninitialized deleted file mode 100644 index 4b69380bc6e..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-03-libdvisvgm-uninitialized +++ /dev/null @@ -1,14 +0,0 @@ - Avoid uninitialized variable. - -diff -ur dvisvgm-0.8.7.orig/src/InputReader.cpp dvisvgm-0.8.7/src/InputReader.cpp ---- dvisvgm-0.8.7.orig/src/InputReader.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/InputReader.cpp 2009-11-13 18:26:47.000000000 +0100 -@@ -45,7 +45,7 @@ - * @param[in] consume if true, the buffer pointer is moved to the first charater following string s - * @return true if s was found */ - bool InputReader::skipUntil (const char *s, bool consume) { -- bool found; -+ bool found = false; - while (!eof() && !(found = check(s, consume))) - get(); - return found; diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-04-libdvisvgm-virtual b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-04-libdvisvgm-virtual deleted file mode 100644 index 2a24096e311..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-04-libdvisvgm-virtual +++ /dev/null @@ -1,26 +0,0 @@ - Add virtual destructors to avoid compiler warning. - - May actually be required, or just be a warning? - -diff -ur dvisvgm-0.8.7.orig/src/CmdLineParserBase.h dvisvgm-0.8.7/src/CmdLineParserBase.h ---- dvisvgm-0.8.7.orig/src/CmdLineParserBase.h 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/CmdLineParserBase.h 2009-11-13 18:55:12.000000000 +0100 -@@ -72,6 +72,7 @@ - protected: - CmdLineParserBase () : _error(false) {} - CmdLineParserBase (const CmdLineParserBase &cmd) {} -+ virtual ~CmdLineParserBase () {} - virtual void init (); - virtual void error (const Option &opt, bool longopt, const char *msg) const; - bool checkArgPrefix (InputReader &ir, const Option &opt, bool longopt) const; -diff -ur dvisvgm-0.8.7.orig/src/CommandLine.h dvisvgm-0.8.7/src/CommandLine.h ---- dvisvgm-0.8.7.orig/src/CommandLine.h 2009-11-06 22:22:55.000000000 +0100 -+++ dvisvgm-0.8.7/src/CommandLine.h 2009-11-13 18:55:09.000000000 +0100 -@@ -14,6 +14,7 @@ - public: - CommandLine () {init();} - CommandLine (int argc, char **argv, bool printErrors) {parse(argc, argv, printErrors);} -+ virtual ~CommandLine () {} - void help () const; - void status () const; - int numOptions () const {return 22;} diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn deleted file mode 100644 index bef0dbd8862..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn +++ /dev/null @@ -1,79 +0,0 @@ - Do not #include <dlfcn.h> when not used (might not exits). - - Use defined(DISABLE_GS) instead of DISABLE_GS, to avoid gcc - preprocessor warning (-Wundef). - -diff -ur dvisvgm-0.8.7.orig/src/DVIToSVG.cpp dvisvgm-0.8.7/src/DVIToSVG.cpp ---- dvisvgm-0.8.7.orig/src/DVIToSVG.cpp 2009-11-09 17:36:55.000000000 +0100 -+++ dvisvgm-0.8.7/src/DVIToSVG.cpp 2009-11-18 00:30:05.000000000 +0100 -@@ -18,6 +18,13 @@ - ** along with this program; if not, see <http://www.gnu.org/licenses/>. ** - *************************************************************************/ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#define VERSION_STR VERSION " (" TARGET_SYSTEM ")" -+#else -+#define VERSION_STR "" -+#endif -+ - #include <cstdlib> - #include <ctime> - #include <fstream> -@@ -50,20 +57,13 @@ - #include "DvisvgmSpecialHandler.h" - #include "EmSpecialHandler.h" - //#include "HtmlSpecialHandler.h" --#if !DISABLE_GS -+#if !defined(DISABLE_GS) - #include "PsSpecialHandler.h" - #endif - #include "TpicSpecialHandler.h" - /////////////////////////////////// - - --#ifdef HAVE_CONFIG_H --#include "config.h" --#define VERSION_STR VERSION " (" TARGET_SYSTEM ")" --#else --#define VERSION_STR "" --#endif -- - using namespace std; - - // static class variables -diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.cpp dvisvgm-0.8.7/src/Ghostscript.cpp ---- dvisvgm-0.8.7.orig/src/Ghostscript.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/Ghostscript.cpp 2009-11-18 00:30:50.000000000 +0100 -@@ -19,7 +19,7 @@ - *************************************************************************/ - - #include "Ghostscript.h" --#if !DISABLE_GS -+#if !defined(DISABLE_GS) - - #include <cstring> - #include <sstream> -diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.h dvisvgm-0.8.7/src/Ghostscript.h ---- dvisvgm-0.8.7.orig/src/Ghostscript.h 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/Ghostscript.h 2009-11-18 00:33:30.000000000 +0100 -@@ -26,7 +26,9 @@ - #endif - - #include <string> --#if HAVE_LIBGS -+#if defined(DISABLE_GS) -+ #include "iapi.h" -+#elif HAVE_LIBGS - #include <ghostscript/iapi.h> - #else - #include "DLLoader.h" -@@ -37,7 +39,7 @@ - #define _Windows - #endif - --#if DISABLE_GS -+#if defined(DISABLE_GS) - struct Ghostscript - { - typedef int (GSDLLCALLPTR Stdin) (void *caller, char *buf, int len); diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS deleted file mode 100644 index 5f29442d43c..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS +++ /dev/null @@ -1,134 +0,0 @@ - Replace '#if HAVE_LIBGS' by '#if defined(HAVE_LIBGS)'. - -diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.cpp dvisvgm-0.8.7/src/Ghostscript.cpp ---- dvisvgm-0.8.7.orig/src/Ghostscript.cpp 2009-11-18 00:30:50.000000000 +0100 -+++ dvisvgm-0.8.7/src/Ghostscript.cpp 2009-11-18 14:28:08.000000000 +0100 -@@ -36,7 +36,7 @@ - /** Loads the Ghostscript library but does not create an instance. This - * constructor should only be used to call available() and revision(). */ - Ghostscript::Ghostscript () --#if !HAVE_LIBGS -+#if !defined(HAVE_LIBGS) - : DLLoader(GS_DL_NAME) - #endif - { -@@ -49,7 +49,7 @@ - * @param[in] argv parameters passed to Ghostscript - * @param[in] caller this parameter is passed to all callback functions */ - Ghostscript::Ghostscript (int argc, const char **argv, void *caller) --#if !HAVE_LIBGS -+#if !defined(HAVE_LIBGS) - : DLLoader(GS_DL_NAME) - #endif - { -@@ -73,7 +73,7 @@ - - /** Returns true if Ghostscript library was found and can be loaded. */ - bool Ghostscript::available () { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return true; - #else - return loaded(); -@@ -85,7 +85,7 @@ - * @param[out] r takes the revision information (see GS API documentation for further details) - * @return true on success */ - bool Ghostscript::revision (gsapi_revision_t *r) { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return (gsapi_revision(r, sizeof(gsapi_revision_t)) == 0); - #else - if (PFN_gsapi_revision fn = (PFN_gsapi_revision)loadFunction("gsapi_revision")) -@@ -111,7 +111,7 @@ - * @param[out] psinst handle of newly created instance (or 0 on error) - * @param[in] caller pointer forwarded to callback functions */ - int Ghostscript::new_instance (void **psinst, void *caller) { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return gsapi_new_instance(psinst, caller); - #else - if (PFN_gsapi_new_instance fn = (PFN_gsapi_new_instance)loadFunction("gsapi_new_instance")) -@@ -125,7 +125,7 @@ - /** Destroys the current instance of Ghostscript. This method is called by the destructor - * and should not be used elsewhere. */ - void Ghostscript::delete_instance () { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - gsapi_delete_instance(_inst); - #else - if (PFN_gsapi_delete_instance fn = (PFN_gsapi_delete_instance)loadFunction("gsapi_delete_instance")) -@@ -136,7 +136,7 @@ - - /** Exits the interpreter. Must be called before destroying the GS instance. */ - int Ghostscript::exit () { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return gsapi_exit(_inst); - #else - if (PFN_gsapi_exit fn = (PFN_gsapi_exit)loadFunction("gsapi_exit")) -@@ -151,7 +151,7 @@ - * @param[in] out pointer to stdout handler - * @param[in] err pointer to stderr handler */ - int Ghostscript::set_stdio (Stdin in, Stdout out, Stderr err) { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return gsapi_set_stdio(_inst, in, out, err); - #else - if (PFN_gsapi_set_stdio fn = (PFN_gsapi_set_stdio)loadFunction("gsapi_set_stdio")) -@@ -166,7 +166,7 @@ - * @param[in] argc number of paramters - * @param[in] argv parameters passed to Ghostscript */ - int Ghostscript::init_with_args (int argc, char **argv) { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return gsapi_init_with_args(_inst, argc, argv); - #else - if (PFN_gsapi_init_with_args fn = (PFN_gsapi_init_with_args)loadFunction("gsapi_init_with_args")) -@@ -178,7 +178,7 @@ - - /** Tells Ghostscript that several calls of run_string_continue will follow. */ - int Ghostscript::run_string_begin (int user_errors, int *pexit_code) { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return gsapi_run_string_begin(_inst, user_errors, pexit_code); - #else - if (PFN_gsapi_run_string_begin fn = (PFN_gsapi_run_string_begin)loadFunction("gsapi_run_string_begin")) -@@ -197,7 +197,7 @@ - * @param[in] user_errors if non-negative, the default PS error values will be generated, otherwise this value is returned - * @param[out] pexit_code takes the PS error code */ - int Ghostscript::run_string_continue (const char *str, unsigned length, int user_errors, int *pexit_code) { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return gsapi_run_string_continue(_inst, str, length, user_errors, pexit_code); - #else - if (PFN_gsapi_run_string_continue fn = (PFN_gsapi_run_string_continue)loadFunction("gsapi_run_string_continue")) -@@ -210,7 +210,7 @@ - - /** Terminates the successive code feeding. Must be called after the last call of run_string_continue. */ - int Ghostscript::run_string_end (int user_errors, int *pexit_code) { --#if HAVE_LIBGS -+#if defined(HAVE_LIBGS) - return gsapi_run_string_end(_inst, user_errors, pexit_code); - #else - if (PFN_gsapi_run_string_end fn = (PFN_gsapi_run_string_end)loadFunction("gsapi_run_string_end")) -diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.h dvisvgm-0.8.7/src/Ghostscript.h ---- dvisvgm-0.8.7.orig/src/Ghostscript.h 2009-11-18 00:33:30.000000000 +0100 -+++ dvisvgm-0.8.7/src/Ghostscript.h 2009-11-18 14:28:02.000000000 +0100 -@@ -28,7 +28,7 @@ - #include <string> - #if defined(DISABLE_GS) - #include "iapi.h" --#elif HAVE_LIBGS -+#elif defined(HAVE_LIBGS) - #include <ghostscript/iapi.h> - #else - #include "DLLoader.h" -@@ -62,7 +62,7 @@ - - /** Wrapper class of (a subset of) the Ghostscript API. */ - class Ghostscript --#if !HAVE_LIBGS -+#if !defined(HAVE_LIBGS) - : public DLLoader - #endif - { diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32 b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32 deleted file mode 100644 index bc5753faf39..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-07-libdvisvgm-uint32 +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur dvisvgm-0.8.7.orig/src/FontEngine.cpp dvisvgm-0.8.7/src/FontEngine.cpp ---- dvisvgm-0.8.7.orig/src/FontEngine.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/FontEngine.cpp 2010-06-05 01:11:20.000000000 +0200 -@@ -58,7 +58,7 @@ - * @param[in] face font face to be used - * @param[out] reverseMap the resulting map */ - static void build_reverse_map (FT_Face face, map<UInt32, UInt32> &reverseMap) { -- UInt32 glyphIndex; -+ FT_UInt glyphIndex; - UInt32 charcode = FT_Get_First_Char(face, &glyphIndex); - while (glyphIndex) { - // if (reverseMap.find(glyphIndex) == reverseMap.end()) -@@ -111,7 +111,7 @@ - build_reverse_map(_currentFace, reverseMap); - - FT_Set_Charmap(_currentFace, unicodeMap); -- UInt32 glyphIndex; -+ FT_UInt glyphIndex; - UInt32 charcode = FT_Get_First_Char(_currentFace, &glyphIndex); - while (glyphIndex) { - translationMap[reverseMap[glyphIndex]] = charcode; diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-08-static-const-members b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-08-static-const-members deleted file mode 100644 index 36ac400e2e2..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-08-static-const-members +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur dvisvgm-0.8.7.orig/src/FontCache.cpp dvisvgm-0.8.7/src/FontCache.cpp ---- dvisvgm-0.8.7.orig/src/FontCache.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/FontCache.cpp 2010-06-07 15:36:00.565125189 +0200 -@@ -31,6 +31,7 @@ - - using namespace std; - -+const UInt8 FontCache::VERSION; - - static UInt32 read_unsigned (int bytes, istream &is) { - UInt32 ret = 0; -diff -ur dvisvgm-0.8.7.orig/src/gzstream.cpp dvisvgm-0.8.7/src/gzstream.cpp ---- dvisvgm-0.8.7.orig/src/gzstream.cpp 2009-08-29 22:06:31.000000000 +0200 -+++ dvisvgm-0.8.7/src/gzstream.cpp 2010-06-07 15:36:00.565125189 +0200 -@@ -34,6 +34,8 @@ - namespace GZSTREAM_NAMESPACE { - #endif - -+const int gzstreambuf::bufferSize; -+ - // ---------------------------------------------------------------------------- - // Internal classes to implement gzstream. See header file for user classes. - // ---------------------------------------------------------------------------- diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-09-unistd b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-09-unistd deleted file mode 100644 index b79619b0d3e..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-09-unistd +++ /dev/null @@ -1,16 +0,0 @@ - <unistd.h> is ubiquitious these days. - Needed on AIX, tlbuild 28 May 2010 15:08:06. - -diff -ur dvisvgm-0.8.7.orig/src/FileSystem.cpp dvisvgm-0.8.7/src/FileSystem.cpp ---- dvisvgm-0.8.7.orig/src/FileSystem.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/FileSystem.cpp 2010-05-31 19:29:13.000000000 +0200 -@@ -23,9 +23,7 @@ - #include <fstream> - #include "FileSystem.h" - --#ifdef __GNUC__ - #include <unistd.h> --#endif - - - using namespace std; diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-10-TL-help b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-10-TL-help deleted file mode 100644 index d4f33b59751..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-10-TL-help +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur dvisvgm-0.8.7.orig/src/dvisvgm.cpp dvisvgm-0.8.7/src/dvisvgm.cpp ---- dvisvgm-0.8.7.orig/src/dvisvgm.cpp 2009-11-09 17:36:55.000000000 +0100 -+++ dvisvgm-0.8.7/src/dvisvgm.cpp 2009-11-13 14:49:31.000000000 +0100 -@@ -73,7 +73,7 @@ - static void show_help (const CommandLine &cmd) { - cout << PACKAGE_STRING "\n\n"; - cmd.help(); -- cout << "\nCopyright (C) 2005-2009 Martin Gieseking" EMAIL "\n\n"; -+ cout << "\nCopyright (C) 2005-2009 Martin Gieseking <martin.gieseking@uos.de> \n\n"; - } - - diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime deleted file mode 100644 index 891117407da..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-20-gettimeofday-or-ftime +++ /dev/null @@ -1,58 +0,0 @@ - Use gettimeofday(), ftime(), or time(), as available. - -diff -ur dvisvgm-0.8.7.orig/configure.ac dvisvgm-0.8.7/configure.ac ---- dvisvgm-0.8.7.orig/configure.ac 2009-11-09 18:17:17.000000000 +0100 -+++ dvisvgm-0.8.7/configure.ac 2009-12-14 14:23:12.000000000 +0100 -@@ -22,6 +22,9 @@ - AC_PROG_RANLIB - AC_LANG(C) - -+AC_CHECK_FUNCS([ftime gettimeofday]) -+AC_CHECK_HEADERS([sys/time.h sys/timeb.h]) -+ - # Check whether MikTeX import libraries should be linked - case $host in - *-mingw32* | *-windows*) -diff -ur dvisvgm-0.8.7.orig/src/dvisvgm.cpp dvisvgm-0.8.7/src/dvisvgm.cpp ---- dvisvgm-0.8.7.orig/src/dvisvgm.cpp 2009-11-13 14:49:31.000000000 +0100 -+++ dvisvgm-0.8.7/src/dvisvgm.cpp 2009-12-14 14:37:35.000000000 +0100 -@@ -23,7 +23,6 @@ - #include <iostream> - #include <sstream> - #include <string> --#include <sys/timeb.h> - #include <time.h> - #include "gzstream.h" - #include "CommandLine.h" -@@ -46,6 +45,12 @@ - #define EMAIL "Martin Gieseking <martin.gieseking@uos.de>" - #endif - -+#if defined (HAVE_SYS_TIME_H) -+#include <sys/time.h> -+#elif defined (HAVE_SYS_TIMEB_H) -+#include <sys/timeb.h> -+#endif -+ - using namespace std; - - -@@ -106,9 +111,18 @@ - - /** Returns timestamp (wall time) in seconds. */ - static double get_time () { -+#if defined (HAVE_SYS_TIME_H) -+ struct timeval tv; -+ gettimeofday(&tv, NULL); -+ return tv.tv_sec + tv.tv_usec/1000000.0; -+#elif defined (HAVE_SYS_TIMEB_H) - struct timeb tb; - ftime(&tb); - return tb.time + tb.millitm/1000.0; -+#else -+ time_t myclock = time((time_t*)NULL); -+ return myclock; -+#endif - } - - diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-30-WIN32-warning b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-30-WIN32-warning deleted file mode 100644 index 2ce14dbe623..00000000000 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-30-WIN32-warning +++ /dev/null @@ -1,14 +0,0 @@ - Avoid compiler warning. - -diff -ur dvisvgm-0.8.7.orig/src/MetafontWrapper.cpp dvisvgm-0.8.7/src/MetafontWrapper.cpp ---- dvisvgm-0.8.7.orig/src/MetafontWrapper.cpp 2009-11-06 22:17:58.000000000 +0100 -+++ dvisvgm-0.8.7/src/MetafontWrapper.cpp 2010-02-23 13:49:35.706277518 +0100 -@@ -55,7 +55,7 @@ - string cmdline = string("\"")+cmd+"\" "+params; - CreateProcess(NULL, (LPSTR)cmdline.c_str(), NULL, NULL, true, 0, NULL, NULL, &si, &pi); - WaitForSingleObject(pi.hProcess, INFINITE); -- DWORD exitcode = -1; -+ DWORD exitcode = (DWORD)-1; - GetExitCodeProcess(pi.hProcess, &exitcode); - CloseHandle(devnull); - return exitcode; |