Attachment #204335 for bug #237846

View | Details | Raw Unified | Return to bug 237846
Collapse All | Expand All




From aa3fdae51c19ad2865f92882ec9007feeb7e477a Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@jwilk.net>
Date: Mon, 1 Apr 2019 08:23:51 +0200
Subject: [PATCH] Put Ref in pdf namespace.

---
 pdf-backend.hh | 1 +
 pdf2djvu.cc    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pdf-backend.hh b/pdf-backend.hh
index 43899c0..d7872c3 100644
--- pdf-backend.hh
+++ pdf-backend.hh
@@ -82,6 +82,7 @@ namespace pdf
   typedef ::Catalog Catalog;
   typedef ::GooString String;
   typedef ::Goffset Offset;
+  typedef ::Ref Ref;
 
 /* type definitions — annotations
  * ==============================
diff --git a/pdf2djvu.cc b/pdf2djvu.cc
index 669eba5..d9e1532 100644
--- pdf2djvu.cc
+++ pdf2djvu.cc
@@ -86,7 +86,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
     int page;
     if (dest->isPageRef())
     {
-      Ref pageref = dest->getPageRef();
+      pdf::Ref pageref = dest->getPageRef();
       page = catalog->findPage(pageref.num, pageref.gen);
     }
     else




From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@jwilk.net>
Date: Mon, 1 Apr 2019 08:49:02 +0200
Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
 Catalog::findPage(int, int).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes:

    pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
    pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
---
 pdf-backend.cc | 15 +++++++++++++++
 pdf-backend.hh |  2 ++
 pdf2djvu.cc    |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pdf-backend.cc b/pdf-backend.cc
index f1d7662..a1b9b63 100644
--- pdf-backend.cc
+++ pdf-backend.cc
@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str)
 }
 #endif
 
+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
+{
+  return catalog->findPage(pgref.num, pgref.gen);
+}
+
+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
+{
+  return catalog->findPage(pgref);
+}
+
+int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
+{
+  return find_page_impl<pdf::Catalog>(catalog, pgref);
+}
+
 // vim:ts=2 sts=2 sw=2 et
diff --git a/pdf-backend.hh b/pdf-backend.hh
index d7872c3..d88c956 100644
--- pdf-backend.hh
+++ pdf-backend.hh
@@ -436,6 +436,8 @@ namespace pdf
 
   const char * get_c_string(const pdf::String *str);
 
+  int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
+
 }
 
 #endif
diff --git a/pdf2djvu.cc b/pdf2djvu.cc
index d9e1532..21f2d50 100644
--- pdf2djvu.cc
+++ pdf2djvu.cc
@@ -87,7 +87,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
     if (dest->isPageRef())
     {
       pdf::Ref pageref = dest->getPageRef();
-      page = catalog->findPage(pageref.num, pageref.gen);
+      page = pdf::find_page(catalog, pageref);
     }
     else
       page = dest->getPageNum();




From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@jwilk.net>
Date: Tue, 23 Apr 2019 08:23:46 +0200
Subject: [PATCH] pdf-backend: simplify find_page() implementation.

---
 pdf-backend.cc | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pdf-backend.cc b/pdf-backend.cc
index f6f5267..a94383e 100644
--- pdf-backend.cc
+++ pdf-backend.cc
@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str)
 }
 #endif
 
-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
-{
-  return catalog->findPage(pgref.num, pgref.gen);
-}
-
-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
-{
-  return catalog->findPage(pgref);
-}
-
 int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
 {
-  return find_page_impl<pdf::Catalog>(catalog, pgref);
+#if POPPLER_VERSION >= 7600
+  return catalog->findPage(pgref);
+#else
+  return catalog->findPage(pgref.num, pgref.gen);
+#endif
 }
 
 // vim:ts=2 sts=2 sw=2 et




From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Wed, 24 Apr 2019 14:11:26 +0200
Subject: [PATCH] Tentative fix for poppler 0.76

---
 src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
 src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 2981d6ee51..ddbff7671f 100644
--- src/extension/internal/pdfinput/pdf-parser.cpp
+++ src/extension/internal/pdfinput/pdf-parser.cpp
@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
 	error(errInternal, -1, "Weird page contents");
     	return;
   }
-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
+  parser = new _POPPLER_NEW_PARSER(xref, obj);
   go(topLevel);
   delete parser;
   parser = NULL;
diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
index 6e4dde7dee..21a60702fa 100644
--- src/extension/internal/pdfinput/poppler-transition-api.h
+++ src/extension/internal/pdfinput/poppler-transition-api.h
@@ -3,6 +3,13 @@
 
 #include <glib/poppler-features.h>
 
+#if POPPLER_CHECK_VERSION(0, 76, 0)
+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
+#else
+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
+#endif
+
+
 #if POPPLER_CHECK_VERSION(0, 72, 0)
 #define getCString c_str
 #endif
-- 
2.18.1


Lines 2-8 Link Here

(-)graphics/poppler/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= poppler	4	PORTNAME= poppler
5	DISTVERSION= 0.75.0	5	DISTVERSION= 0.76.1
6	CATEGORIES= graphics print	6	CATEGORIES= graphics print
7	MASTER_SITES= https://poppler.freedesktop.org/	7	MASTER_SITES= https://poppler.freedesktop.org/
8		8

Lines 1-3 Link Here

(-)graphics/poppler/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1553492103	1	TIMESTAMP = 1557610026
2	SHA256 (poppler-0.75.0.tar.xz) = 3bbaedb0fa2797cac933a0659d144303e4d09eec6892c65600da987d8707199a	2	SHA256 (poppler-0.76.1.tar.xz) = e62cd4053f851eecc4a6aa2b81d739fbab1d67b3c60b31ebac7049483cc617b1
3	SIZE (poppler-0.75.0.tar.xz) = 1523872	3	SIZE (poppler-0.76.1.tar.xz) = 1531548

Lines 97-103 include/poppler/fofi/FoFiType1C.h Link Here

(-)graphics/poppler/pkg-plist (-3 / +2 lines)
97	include/poppler/goo/FixedPoint.h	97	include/poppler/goo/FixedPoint.h
98	include/poppler/goo/GooCheckedOps.h	98	include/poppler/goo/GooCheckedOps.h
99	include/poppler/goo/GooLikely.h	99	include/poppler/goo/GooLikely.h
100	include/poppler/goo/GooList.h
101	include/poppler/goo/GooString.h	100	include/poppler/goo/GooString.h
102	include/poppler/goo/GooTimer.h	101	include/poppler/goo/GooTimer.h
103	include/poppler/goo/ImgWriter.h	102	include/poppler/goo/ImgWriter.h
Lines 134-141 lib/libpoppler-cpp.so Link Here
134	lib/libpoppler-cpp.so.0	133	lib/libpoppler-cpp.so.0
135	lib/libpoppler-cpp.so.0.7.0	134	lib/libpoppler-cpp.so.0.7.0
136	lib/libpoppler.so	135	lib/libpoppler.so
137	lib/libpoppler.so.86	136	lib/libpoppler.so.87
138	lib/libpoppler.so.86.0.0	137	lib/libpoppler.so.87.0.0
139	libdata/pkgconfig/poppler-cairo.pc	138	libdata/pkgconfig/poppler-cairo.pc
140	libdata/pkgconfig/poppler-cpp.pc	139	libdata/pkgconfig/poppler-cpp.pc
141	libdata/pkgconfig/poppler-splash.pc	140	libdata/pkgconfig/poppler-splash.pc




From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 2 May 2019 00:08:12 +0200
Subject: [PATCH] Fix build with poppler-0.76

findPage(int num, int gen) -> findPage(const Ref ref)

https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e

--- scribus/plugins/import/pdf/slaoutput.cpp.orig	2019-05-12 09:24:08.096711000 +0200
+++ scribus/plugins/import/pdf/slaoutput.cpp	2019-05-12 09:24:46.609452000 +0200
@@ -516,8 +516,7 @@
 			{
 				if (dst->isPageRef())
 				{
-					Ref dstr = dst->getPageRef();
-					pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
+					pagNum = pdfDoc->findPage(dst->getPageRef());
 				}
 				else
 					pagNum = dst->getPageNum();
@@ -538,8 +537,7 @@
 					{
 						if (dstn->isPageRef())
 						{
-							Ref dstr = dstn->getPageRef();
-							pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
+							pagNum = pdfDoc->findPage(dstn->getPageRef());
 						}
 						else
 							pagNum = dstn->getPageNum();
@@ -1061,8 +1059,7 @@
 				{
 					if (dst->isPageRef())
 					{
-						Ref dstr = dst->getPageRef();
-						pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
+						pagNum = pdfDoc->findPage(dst->getPageRef());
 					}
 					else
 						pagNum = dst->getPageNum();
@@ -1085,8 +1082,7 @@
 						{
 							if (dstn->isPageRef())
 							{
-								Ref dstr = dstn->getPageRef();
-								pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
+								pagNum = pdfDoc->findPage(dstn->getPageRef());
 							}
 							else
 								pagNum = dstn->getPageNum();

Return to bug 237846

Added Link Here

(-)converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-1.patch (+35 lines)
1	From aa3fdae51c19ad2865f92882ec9007feeb7e477a Mon Sep 17 00:00:00 2001
2	From: Jakub Wilk <jwilk@jwilk.net>
3	Date: Mon, 1 Apr 2019 08:23:51 +0200
4	Subject: [PATCH] Put Ref in pdf namespace.
5
6	---
7	pdf-backend.hh \| 1 +
8	pdf2djvu.cc \| 2 +-
9	2 files changed, 2 insertions(+), 1 deletion(-)
10
11	diff --git a/pdf-backend.hh b/pdf-backend.hh
12	index 43899c0..d7872c3 100644
13	--- pdf-backend.hh
14	+++ pdf-backend.hh
15	@@ -82,6 +82,7 @@ namespace pdf
16	typedef ::Catalog Catalog;
17	typedef ::GooString String;
18	typedef ::Goffset Offset;
19	+ typedef ::Ref Ref;
20
21	/* type definitions — annotations
22	* ==============================
23	diff --git a/pdf2djvu.cc b/pdf2djvu.cc
24	index 669eba5..d9e1532 100644
25	--- pdf2djvu.cc
26	+++ pdf2djvu.cc
27	@@ -86,7 +86,7 @@ static int get_page_for_goto_link(pdf::link::GoTo goto_link, pdf::Catalog cata
28	int page;
29	if (dest->isPageRef())
30	{
31	- Ref pageref = dest->getPageRef();
32	+ pdf::Ref pageref = dest->getPageRef();
33	page = catalog->findPage(pageref.num, pageref.gen);
34	}
35	else

Added Link Here

(-)converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-2.patch (+69 lines)
1	From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001
2	From: Jakub Wilk <jwilk@jwilk.net>
3	Date: Mon, 1 Apr 2019 08:49:02 +0200
4	Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
5	Catalog::findPage(int, int).
6	MIME-Version: 1.0
7	Content-Type: text/plain; charset=UTF-8
8	Content-Transfer-Encoding: 8bit
9
10	Fixes:
11
12	pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo, pdf::Catalog)’:
13	pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
14	---
15	pdf-backend.cc \| 15 +++++++++++++++
16	pdf-backend.hh \| 2 ++
17	pdf2djvu.cc \| 2 +-
18	3 files changed, 18 insertions(+), 1 deletion(-)
19
20	diff --git a/pdf-backend.cc b/pdf-backend.cc
21	index f1d7662..a1b9b63 100644
22	--- pdf-backend.cc
23	+++ pdf-backend.cc
24	@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str)
25	}
26	#endif
27
28	+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
29	+{
30	+ return catalog->findPage(pgref.num, pgref.gen);
31	+}
32	+
33	+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
34	+{
35	+ return catalog->findPage(pgref);
36	+}
37	+
38	+int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
39	+{
40	+ return find_page_impl<pdf::Catalog>(catalog, pgref);
41	+}
42	+
43	// vim:ts=2 sts=2 sw=2 et
44	diff --git a/pdf-backend.hh b/pdf-backend.hh
45	index d7872c3..d88c956 100644
46	--- pdf-backend.hh
47	+++ pdf-backend.hh
48	@@ -436,6 +436,8 @@ namespace pdf
49
50	const char * get_c_string(const pdf::String *str);
51
52	+ int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
53	+
54	}
55
56	#endif
57	diff --git a/pdf2djvu.cc b/pdf2djvu.cc
58	index d9e1532..21f2d50 100644
59	--- pdf2djvu.cc
60	+++ pdf2djvu.cc
61	@@ -87,7 +87,7 @@ static int get_page_for_goto_link(pdf::link::GoTo goto_link, pdf::Catalog cata
62	if (dest->isPageRef())
63	{
64	pdf::Ref pageref = dest->getPageRef();
65	- page = catalog->findPage(pageref.num, pageref.gen);
66	+ page = pdf::find_page(catalog, pageref);
67	}
68	else
69	page = dest->getPageNum();

Added Link Here

(-)converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.76-3.patch (+38 lines)
1	From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001
2	From: Jakub Wilk <jwilk@jwilk.net>
3	Date: Tue, 23 Apr 2019 08:23:46 +0200
4	Subject: [PATCH] pdf-backend: simplify find_page() implementation.
5
6	---
7	pdf-backend.cc \| 16 +++++-----------
8	1 file changed, 5 insertions(+), 11 deletions(-)
9
10	diff --git a/pdf-backend.cc b/pdf-backend.cc
11	index f6f5267..a94383e 100644
12	--- pdf-backend.cc
13	+++ pdf-backend.cc
14	@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str)
15	}
16	#endif
17
18	-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
19	-{
20	- return catalog->findPage(pgref.num, pgref.gen);
21	-}
22	-
23	-template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
24	-{
25	- return catalog->findPage(pgref);
26	-}
27	-
28	int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
29	{
30	- return find_page_impl<pdf::Catalog>(catalog, pgref);
31	+#if POPPLER_VERSION >= 7600
32	+ return catalog->findPage(pgref);
33	+#else
34	+ return catalog->findPage(pgref.num, pgref.gen);
35	+#endif
36	}
37
38	// vim:ts=2 sts=2 sw=2 et

Added Link Here

(-)graphics/inkscape/files/patch-gentoo_inkscape-0.92.4-poppler-0.76.0.patch (+44 lines)
1	From dc25406853353320078eca22cf817fb052c97082 Mon Sep 17 00:00:00 2001
2	From: Marc Jeanmougin <marc@jeanmougin.fr>
3	Date: Wed, 24 Apr 2019 14:11:26 +0200
4	Subject: [PATCH] Tentative fix for poppler 0.76
5
6	---
7	src/extension/internal/pdfinput/pdf-parser.cpp \| 2 +-
8	src/extension/internal/pdfinput/poppler-transition-api.h \| 7 +++++++
9	2 files changed, 8 insertions(+), 1 deletion(-)
10
11	diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
12	index 2981d6ee51..ddbff7671f 100644
13	--- src/extension/internal/pdfinput/pdf-parser.cpp
14	+++ src/extension/internal/pdfinput/pdf-parser.cpp
15	@@ -426,7 +426,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
16	error(errInternal, -1, "Weird page contents");
17	return;
18	}
19	- parser = new Parser(xref, new Lexer(xref, obj), gFalse);
20	+ parser = new _POPPLER_NEW_PARSER(xref, obj);
21	go(topLevel);
22	delete parser;
23	parser = NULL;
24	diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
25	index 6e4dde7dee..21a60702fa 100644
26	--- src/extension/internal/pdfinput/poppler-transition-api.h
27	+++ src/extension/internal/pdfinput/poppler-transition-api.h
28	@@ -3,6 +3,13 @@
29
30	#include <glib/poppler-features.h>
31
32	+#if POPPLER_CHECK_VERSION(0, 76, 0)
33	+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
34	+#else
35	+#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
36	+#endif
37	+
38	+
39	#if POPPLER_CHECK_VERSION(0, 72, 0)
40	#define getCString c_str
41	#endif
42	--
43	2.18.1
44

Added Link Here

(-)print/scribus-devel/files/patch-z-gentoo_scribus-1.5.5_pre20190429-poppler-0.76.patch (+51 lines)
1	From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001
2	From: Andreas Sturmlechner <asturm@gentoo.org>
3	Date: Thu, 2 May 2019 00:08:12 +0200
4	Subject: [PATCH] Fix build with poppler-0.76
5
6	findPage(int num, int gen) -> findPage(const Ref ref)
7
8	https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e
9
10	--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-05-12 09:24:08.096711000 +0200
11	+++ scribus/plugins/import/pdf/slaoutput.cpp 2019-05-12 09:24:46.609452000 +0200
12	@@ -516,8 +516,7 @@
13	{
14	if (dst->isPageRef())
15	{
16	- Ref dstr = dst->getPageRef();
17	- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
18	+ pagNum = pdfDoc->findPage(dst->getPageRef());
19	}
20	else
21	pagNum = dst->getPageNum();
22	@@ -538,8 +537,7 @@
23	{
24	if (dstn->isPageRef())
25	{
26	- Ref dstr = dstn->getPageRef();
27	- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
28	+ pagNum = pdfDoc->findPage(dstn->getPageRef());
29	}
30	else
31	pagNum = dstn->getPageNum();
32	@@ -1061,8 +1059,7 @@
33	{
34	if (dst->isPageRef())
35	{
36	- Ref dstr = dst->getPageRef();
37	- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
38	+ pagNum = pdfDoc->findPage(dst->getPageRef());
39	}
40	else
41	pagNum = dst->getPageNum();
42	@@ -1085,8 +1082,7 @@
43	{
44	if (dstn->isPageRef())
45	{
46	- Ref dstr = dstn->getPageRef();
47	- pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
48	+ pagNum = pdfDoc->findPage(dstn->getPageRef());
49	}
50	else
51	pagNum = dstn->getPageNum();