diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-18 13:55:45 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-18 13:55:45 +0000 |
commit | ed75b1a94192c021262e040b590c75d624269162 (patch) | |
tree | fbbc8f2eb505360379f01306f2770e861e474ebf /Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES | |
parent | d6b68e58217ed2971ab581a9c0e4db84b70d0fd6 (diff) |
texk/kpathsea: Disallow writing file in dotted directories
texk/dvisvgm: minor cleanup
git-svn-id: svn://tug.org/texlive/trunk@16064 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog | 3 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS | 134 |
2 files changed, 137 insertions, 0 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 index 11f554bd776..1508a5650ad 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog +++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog @@ -5,6 +5,9 @@ * 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. 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 new file mode 100644 index 00000000000..5f29442d43c --- /dev/null +++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-06-libdvisvgm-HAVE_LIBGS @@ -0,0 +1,134 @@ + 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 + { |