summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/poppler-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/poppler/poppler-PATCHES')
-rw-r--r--Build/source/libs/poppler/poppler-PATCHES/ChangeLog6
-rw-r--r--Build/source/libs/poppler/poppler-PATCHES/TL-Changes2
-rw-r--r--Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX6
-rw-r--r--Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions6
4 files changed, 13 insertions, 7 deletions
diff --git a/Build/source/libs/poppler/poppler-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-PATCHES/ChangeLog
index 4232ebb6f9d..c8e832cf1fa 100644
--- a/Build/source/libs/poppler/poppler-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-08 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Imported poppler-0.48.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
2016-08-19 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Imported poppler-0.47.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-PATCHES/TL-Changes
index 1da0814ba58..aab40fae518 100644
--- a/Build/source/libs/poppler/poppler-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.47.0 tree as obtained from:
+Changes applied to the poppler-0.48.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX
index c659f840918..b13050f2a9f 100644
--- a/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.47.0.orig/goo/GooString.h poppler-0.47.0/goo/GooString.h
---- poppler-0.47.0.orig/goo/GooString.h Wed May 11 07:47:44 2016
-+++ poppler-0.47.0/goo/GooString.h Fri Aug 19 22:46:47 2016
+diff -ur poppler-0.48.0.orig/goo/GooString.h poppler-0.48.0/goo/GooString.h
+--- poppler-0.48.0.orig/goo/GooString.h Wed Sep 07 06:14:07 2016
++++ poppler-0.48.0/goo/GooString.h Sun Oct 09 07:51:17 2016
@@ -36,6 +36,21 @@
#endif
diff --git a/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions b/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions
index 322af0f8ece..a35f4e1b94c 100644
--- a/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions
+++ b/Build/source/libs/poppler/poppler-PATCHES/patch-03-Object-functions
@@ -1,6 +1,6 @@
-diff -ur poppler-0.47.0.orig/poppler/Object.h poppler-0.47.0/poppler/Object.h
---- poppler-0.47.0.orig/poppler/Object.h Wed Jul 06 06:37:01 2016
-+++ poppler-0.47.0/poppler/Object.h Fri Aug 19 22:49:27 2016
+diff -ur poppler-0.48.0.orig/poppler/Object.h poppler-0.48.0/poppler/Object.h
+--- poppler-0.48.0.orig/poppler/Object.h Wed Jul 06 06:37:01 2016
++++ poppler-0.48.0/poppler/Object.h Sun Oct 09 07:54:18 2016
@@ -148,7 +148,7 @@
Object *initStream(Stream *streamA);
Object *initRef(int numA, int genA)