epdf: make it build again and get out of blacklist-exile

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 181 insertions, 4 deletions

diff --git a/meta-efl/recipes-efl/efl/epdf/0001-remove-antialias-functions-poppler-has-dropped-them-.patch b/meta-efl/recipes-efl/efl/epdf/0001-remove-antialias-functions-poppler-has-dropped-them-.patch
new file mode 100644
index 0000000000..728ffa6e39
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/epdf/0001-remove-antialias-functions-poppler-has-dropped-them-.patch
@@ -0,0 +1,132 @@
+From 6691ac5fcbac0e766d4410ae649a13957ae85289 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 22 Oct 2015 16:27:52 +0200
+Subject: [PATCH 1/2] remove antialias functions - poppler has dropped them in
+ the API
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The functions removed were not used.
+
+Upstream-Status: pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/lib/epdf_main.h                   | 45 -----------------------------------
+ src/lib/mupdf/epdf_mupdf_main.c       | 18 --------------
+ src/lib/poppler/epdf_poppler_main.cpp | 21 ----------------
+ 3 files changed, 84 deletions(-)
+
+diff --git a/src/lib/epdf_main.h b/src/lib/epdf_main.h
+index 54a57ca..0a79bad 100644
+--- a/src/lib/epdf_main.h
++++ b/src/lib/epdf_main.h
+@@ -29,49 +29,4 @@ EAPI int epdf_shutdown();
+  */
+ EAPI const char *epdf_backend_version_get (void);
+ 
+-/**
+- * @brief Return the state of fonts antialiasing in Poppler
+- *
+- * @return EINA_TRUE if fonts antialiasing enabled, EINA_FALSE otherwise.
+- *
+- * Return EINA_TRUE if the state of fonts antialiasing is enabled in
+- * Poppler, EINA_FALSE otherwise.
+- *
+- * @ingroup Epdf_Main
+- */
+-EAPI Eina_Bool epdf_fonts_antialias_get (void);
+-
+-/**
+- * @brief Sets fonts antialiasing mode in Poppler
+- *
+- * @param on EINA_TRUE to enable fonts antialiasing, EINA_FALSE to disable
+- *
+- * Set @p on to EINA_TRUE to enable fonts antialiasing in Poppler,
+- * EINA_FALSE to disable it.
+- */
+-EAPI void epdf_fonts_antialias_set (Eina_Bool on);
+-
+-/**
+- * @brief Return the state of lines antialiasing in Poppler
+- *
+- * @return EINA_TRUE if lines antialiasing enabled, EINA_FALSE otherwise.
+- *
+- * Return EINA_TRUE if the state of lines antialiasing is enabled in
+- * Poppler, EINA_FALSE otherwise.
+- *
+- * @ingroup Epdf_Main
+- */
+-EAPI Eina_Bool epdf_lines_antialias_get (void);
+-
+-/**
+- * @brief Sets lines antialiasing mode in Poppler
+- *
+- * @param on EINA_TRUE to enable lines antialiasing, EINA_FALSE to disable
+- *
+- * Set @p on to EINA_TRUE to enable lines antialiasing in Poppler,
+- * EINA_FALSE to disable it.
+- */
+-EAPI void epdf_lines_antialias_set (Eina_Bool on);
+-
+-
+ #endif /* __EPDF_MAIN_H__ */
+diff --git a/src/lib/mupdf/epdf_mupdf_main.c b/src/lib/mupdf/epdf_mupdf_main.c
+index 17bb830..27c6de2 100644
+--- a/src/lib/mupdf/epdf_mupdf_main.c
++++ b/src/lib/mupdf/epdf_mupdf_main.c
+@@ -37,21 +37,3 @@ epdf_backend_version_get (void)
+ {
+    return "0.5";
+ }
+-
+-Eina_Bool epdf_fonts_antialias_get(void)
+-{
+-   return EINA_TRUE;
+-}
+-
+-void epdf_fonts_antialias_set(Eina_Bool on)
+-{
+-}
+-
+-Eina_Bool epdf_lines_antialias_get(void)
+-{
+-   return EINA_TRUE;
+-}
+-
+-void epdf_lines_antialias_set(Eina_Bool on)
+-{
+-}
+diff --git a/src/lib/poppler/epdf_poppler_main.cpp b/src/lib/poppler/epdf_poppler_main.cpp
+index 9841987..9efdbe8 100644
+--- a/src/lib/poppler/epdf_poppler_main.cpp
++++ b/src/lib/poppler/epdf_poppler_main.cpp
+@@ -46,24 +46,3 @@ epdf_backend_version_get (void)
+ {
+   return POPPLER_VERSION;
+ }
+-
+-Eina_Bool epdf_fonts_antialias_get (void)
+-{
+-  return globalParams->getAntialias();
+-}
+-
+-void epdf_fonts_antialias_set (Eina_Bool on)
+-{
+-  /* Nice API */
+-  globalParams->setAntialias((char*)(on ? "yes" : "no"));
+-}
+-
+-Eina_Bool epdf_lines_antialias_get (void)
+-{
+-    return globalParams->getVectorAntialias();
+-}
+-
+-void epdf_lines_antialias_set (Eina_Bool on)
+-{
+-    globalParams->setVectorAntialias((char*)(on ? "yes" : "no"));
+-}
+-- 
+2.1.0
+
diff --git a/meta-efl/recipes-efl/efl/epdf/0002-epdf_poppler_postscript.cpp-fix-build-for-poppler-AP.patch b/meta-efl/recipes-efl/efl/epdf/0002-epdf_poppler_postscript.cpp-fix-build-for-poppler-AP.patch
new file mode 100644
index 0000000000..c9adaa7314
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/epdf/0002-epdf_poppler_postscript.cpp-fix-build-for-poppler-AP.patch
@@ -0,0 +1,45 @@
+From a84c16fdc606f22b993f870b1cea56dd060a35e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 22 Oct 2015 16:55:30 +0200
+Subject: [PATCH 2/2] epdf_poppler_postscript.cpp: fix build for poppler API
+ change
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Poppler API was changed in [1]. The patch not only shows the change but also
+inspires how to fix.
+
+[1] http://cgit.freedesktop.org/poppler/poppler/commit/?id=9caf7525409d699c16896653528486451123b485
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/lib/poppler/epdf_poppler_postscript.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/poppler/epdf_poppler_postscript.cpp b/src/lib/poppler/epdf_poppler_postscript.cpp
+index 0c2836b..656193b 100644
+--- a/src/lib/poppler/epdf_poppler_postscript.cpp
++++ b/src/lib/poppler/epdf_poppler_postscript.cpp
+@@ -82,11 +82,14 @@ epdf_postscript_print (const Epdf_Postscript *postscript)
+ 
+   // FIXME: fix postscript title
+ #ifdef HAVE_POPPLER_0_20
++  std::vector<int> pages;
++  for (int i = postscript->first_page; i <= postscript->last_page; ++i) {
++    pages.push_back(i);
++  }
+   PSOutputDev ps_dev(postscript->filename,
+                      postscript->pdfdoc,
+                      (char *)"PS title",
+-                     postscript->first_page,
+-                     postscript->last_page,
++                     pages,
+                      psModePS,
+                      (int)postscript->width,
+                      (int)postscript->height,
+-- 
+2.1.0
+
diff --git a/meta-efl/recipes-efl/efl/epdf_svn.bb b/meta-efl/recipes-efl/efl/epdf_svn.bb
index a2adf6a204..e32a5fdb0d 100644
--- a/meta-efl/recipes-efl/efl/epdf_svn.bb
+++ b/meta-efl/recipes-efl/efl/epdf_svn.bb
@@ -11,7 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6 \
 "
 
-SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
+SRC_URI = " \
+    ${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
+    file://0001-remove-antialias-functions-poppler-has-dropped-them-.patch \
+    file://0002-epdf_poppler_postscript.cpp-fix-build-for-poppler-AP.patch \
 "
 S = "${WORKDIR}/${SRCNAME}"
 
@@ -22,6 +25,3 @@ EXTRA_OECONF = "\
 
 # Some upgrade path tweaking, as in evas
 AUTO_LIBNAME_PKGS = ""
-
-# 2_0.1.0+svnr82070-r0/epdf/src/lib/poppler/epdf_poppler_main.cpp:52:24: error: 'class GlobalParams' has no member named 'getAntialias'
-PNBLACKLIST[epdf] ?= "BROKEN: fails to build with newer poppler"