diff options
Diffstat (limited to 'Build/source/libs/poppler/TLpatches')
4 files changed, 26 insertions, 94 deletions
diff --git a/Build/source/libs/poppler/TLpatches/ChangeLog b/Build/source/libs/poppler/TLpatches/ChangeLog index 99a400e24f6..3e382943737 100644 --- a/Build/source/libs/poppler/TLpatches/ChangeLog +++ b/Build/source/libs/poppler/TLpatches/ChangeLog @@ -1,3 +1,11 @@ +2018-01-08 Karl Berry <karl@freefriends.org> + + Imported poppler-0.52.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-LLONG_MAX, patch-03-Object-functions: try removing, + seems like the source may have moved on by now, especially + what with requiring C++11. + 2017-02-17 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Imported poppler-0.52.0 source tree from: diff --git a/Build/source/libs/poppler/TLpatches/TL-Changes b/Build/source/libs/poppler/TLpatches/TL-Changes index 883eb5f752a..5d3ec566f77 100644 --- a/Build/source/libs/poppler/TLpatches/TL-Changes +++ b/Build/source/libs/poppler/TLpatches/TL-Changes @@ -1,29 +1,21 @@ -Changes applied to the poppler-0.52.0 tree as obtained from: +Changes applied to the poppler-0.62.0 tree as obtained from: http://poppler.freedesktop.org/ -Removed: - Makefile.in - aclocal.m4 - compile - config.guess - config.sub - configure - depcomp - install-sh - ltmain.sh - missing - test-driver - fofi/Makefile.in - goo/Makefile.in - poppler/Makefile.in - splash/Makefile.in - Removed unused dirs: - cmake - cpp - glib - m4 - qt4 - qt5 - test - utils + cmake cpp glib m4 qt4 qt5 test utils + +General idea: +update version.ac +mv poppler-src poppler-prev +tar xf poppler-*.tar.gz +mv poppler-0.62.0 poppler-src +cd poppler-src +svn status >/tmp/s +svn add # the ? lines +svn remove # the ! lines +# adapt Makefile.am for new files +# adapt configure.ac as needed +autoreconf +make -C .../Work/libs/poppler/ +# until it succeeds +# try build of everything, luatex/xetex may need updating. diff --git a/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX b/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX deleted file mode 100644 index 27c17477703..00000000000 --- a/Build/source/libs/poppler/TLpatches/patch-02-LLONG_MAX +++ /dev/null @@ -1,25 +0,0 @@ -diff -ur poppler-0.52.0.orig/goo/GooString.h poppler-0.52.0/goo/GooString.h ---- poppler-0.52.0.orig/goo/GooString.h Tue Jan 17 06:36:57 2017 -+++ poppler-0.52.0/goo/GooString.h Tue Mar 21 12:18:41 2017 -@@ -36,6 +36,21 @@ - #endif - - #include <limits.h> // for LLONG_MAX and ULLONG_MAX -+ -+/* <limits.h> and/or the compiler may or may not define these. */ -+/* Minimum and maximum values a `signed long long int' can hold. */ -+#ifndef LLONG_MAX -+# define LLONG_MAX 9223372036854775807LL -+#endif -+#ifndef LLONG_MIN -+# define LLONG_MIN (-LLONG_MAX - 1LL) -+#endif -+ -+/* Maximum value an `unsigned long long int' can hold. (Minimum is 0.) */ -+#ifndef ULLONG_MAX -+# define ULLONG_MAX 18446744073709551615ULL -+#endif -+ - #include <stdarg.h> - #include <stdlib.h> // for NULL - #include "gtypes.h" diff --git a/Build/source/libs/poppler/TLpatches/patch-03-Object-functions b/Build/source/libs/poppler/TLpatches/patch-03-Object-functions deleted file mode 100644 index aa3fc750ceb..00000000000 --- a/Build/source/libs/poppler/TLpatches/patch-03-Object-functions +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur poppler-0.52.0.orig/poppler/Object.h poppler-0.52.0/poppler/Object.h ---- poppler-0.52.0.orig/poppler/Object.h Tue Jan 17 06:36:58 2017 -+++ poppler-0.52.0/poppler/Object.h Tue Mar 21 12:21:07 2017 -@@ -148,7 +148,7 @@ - Object *initStream(Stream *streamA); - Object *initRef(int numA, int genA) - { initObj(objRef); ref.num = numA; ref.gen = genA; return this; } -- Object *initCmd(char *cmdA) -+ Object *initCmd(const char *cmdA) - { initObj(objCmd); cmd = copyString(cmdA); return this; } - Object *initError() - { initObj(objError); return this; } -@@ -195,7 +195,7 @@ - GBool isName(const char *nameA) - { return type == objName && !strcmp(name, nameA); } - GBool isDict(const char *dictType); -- GBool isStream(char *dictType); -+ GBool isStream(const char *dictType); - GBool isCmd(const char *cmdA) - { return type == objCmd && !strcmp(cmd, cmdA); } - -@@ -245,7 +245,7 @@ - Object *dictGetValNF(int i, Object *obj); - - // Stream accessors. -- GBool streamIs(char *dictType); -+ GBool streamIs(const char *dictType); - void streamReset(); - void streamClose(); - int streamGetChar(); -@@ -352,10 +352,10 @@ - - #include "Stream.h" - --inline GBool Object::streamIs(char *dictType) -+inline GBool Object::streamIs(const char *dictType) - { OBJECT_TYPE_CHECK(objStream); return stream->getDict()->is(dictType); } - --inline GBool Object::isStream(char *dictType) -+inline GBool Object::isStream(const char *dictType) - { return type == objStream && streamIs(dictType); } - - inline void Object::streamReset() |