Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=7ff7587aeb1fe59d0ae70976ac52203c8eb840b9

commit 7ff7587aeb1fe59d0ae70976ac52203c8eb840b9
Author: Baste <[email protected]>
Date:   Tue Apr 28 14:08:55 2015 +0200

evas_generic_loaders-1.7.10-4-x86_64
- Fix build with poppler patch

diff --git a/source/e17-extra/evas_generic_loaders/FrugalBuild 
b/source/e17-extra/evas_generic_loaders/FrugalBuild
index ee6b7ee..aa9da21 100644
--- a/source/e17-extra/evas_generic_loaders/FrugalBuild
+++ b/source/e17-extra/evas_generic_loaders/FrugalBuild
@@ -13,6 +13,15 @@ archs=('i686' 'x86_64')
#_F_e17_snap=y
Finclude e17
up2date="lynx -dump http://download.enlightenment.org/releases | sed '/alpha/d' 
| Flasttar"
-sha1sums=('df4ed728a33ce419c71fc3e3ab5f57fbd58d3563')
+source=($source poppler.patch)
+sha1sums=('df4ed728a33ce419c71fc3e3ab5f57fbd58d3563' \
+          '02398b60d8b81ecc46022cb568b7dda8d2a337f1')
+
+build(){
+       Fpatchall
+       Fautoreconf
+       Fmake
+       Fmakeinstall
+}

# optimization OK
diff --git a/source/e17-extra/evas_generic_loaders/poppler.patch 
b/source/e17-extra/evas_generic_loaders/poppler.patch
new file mode 100644
index 0000000..0358c93
--- /dev/null
+++ b/source/e17-extra/evas_generic_loaders/poppler.patch
@@ -0,0 +1,86 @@
+From 1e1a1e6fffc1805aadf75467e72af71391636075 Mon Sep 17 00:00:00 2001
+From: Stefan Schmidt <[email protected]>
+Date: Fri, 6 Mar 2015 10:44:50 +0100
+Subject: pdf: Add support for changes with poppler >= 0.31
+
+With 0.31 poppler removed some parts of GlobalParams
+which they do not consider a public API. The antialias
+setting can now be done over the output device.
+
+Fixes T2184
+@fix
+
+diff --git a/configure.ac b/configure.ac
+index 7e13584..1079c6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -73,15 +73,25 @@ if test "x${want_poppler}" = "xyes" ; then
+       [have_poppler="no"])
+
+    if test "x${have_poppler}" = "xno" ; then
+-      PKG_CHECK_EXISTS([poppler >= 0.20],
++      PKG_CHECK_EXISTS([poppler >= 0.20 poppler < 0.31],
+          [
+-          poppler_pc="poppler >= 0.20"
++          poppler_pc="poppler >= 0.20 poppler < 0.31"
+           AC_DEFINE(HAVE_POPPLER_020, 1, [Have poppler 0.20])
+           have_poppler="yes"
+          ],
+          [have_poppler="no"])
+    fi
+
++   if test "x${have_poppler}" = "xno" ; then
++      PKG_CHECK_EXISTS([poppler >= 0.31],
++         [
++          poppler_pc="poppler >= 0.31"
++          AC_DEFINE(HAVE_POPPLER_031, 1, [Have poppler 0.31])
++          have_poppler="yes"
++         ],
++         [have_poppler="no"])
++   fi
++
+    if test "x${have_poppler}" = "xyes" ; then
+       PKG_CHECK_MODULES([POPPLER], [${poppler_pc}],
+          [have_poppler="yes"],
+diff --git a/src/bin/pdf/main.cpp b/src/bin/pdf/main.cpp
+index a68b21f..78f918e 100644
+--- a/src/bin/pdf/main.cpp
++++ b/src/bin/pdf/main.cpp
+@@ -62,10 +62,12 @@ Eina_Bool poppler_init(const char *file, int page_nbr, int 
size_w, int size_h)
+    if (!eina_init())
+      goto del_global_param;
+
++#ifndef HAVE_POPPLER_031
+    if (globalParams->getAntialias())
+      globalParams->setAntialias((char *)"yes");
+    if (globalParams->getVectorAntialias())
+      globalParams->setVectorAntialias((char *)"yes");
++#endif
+
+    pdfdoc = new PDFDoc(new GooString(file), NULL);
+    if (!pdfdoc)
+@@ -161,7 +163,7 @@ void poppler_load_image(int size_w, int size_h)
+    if (!output_dev)
+      return;
+
+-#ifdef HAVE_POPPLER_020
++#if defined(HAVE_POPPLER_020) || defined(HAVE_POPPLER_031)
+    output_dev->startDoc(pdfdoc);
+ #else
+    output_dev->startDoc(pdfdoc->getXRef());
+@@ -169,8 +171,12 @@ void poppler_load_image(int size_w, int size_h)
+
+    if (dpi <= 0.0) dpi = DEF_DPI;
+
++#ifdef HAVE_POPPLER_031
++   output_dev->setFontAntialias(EINA_TRUE);
++   output_dev->setVectorAntialias(EINA_TRUE);
++#endif
+
+-#ifdef HAVE_POPPLER_020
++#if defined(HAVE_POPPLER_020) || defined(HAVE_POPPLER_031)
+    page->displaySlice(output_dev, dpi, dpi,
+                       0, false, false,
+                       0, 0, width, height,
+--
+cgit v0.10.1
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to