Hello community,
here is the log from the commit of package evas-generic-loaders for
openSUSE:Factory checked in at 2015-04-07 09:30:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evas-generic-loaders (Old)
and /work/SRC/openSUSE:Factory/.evas-generic-loaders.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evas-generic-loaders"
Changes:
--------
---
/work/SRC/openSUSE:Factory/evas-generic-loaders/evas-generic-loaders.changes
2015-03-19 21:22:46.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.evas-generic-loaders.new/evas-generic-loaders.changes
2015-04-07 09:30:24.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Apr 6 16:25:23 UTC 2015 - [email protected]
+
+- add pdf-add-support-for-changes-with-poppler-0.31.patch
+ fix for poppler > 0.31
+
+-------------------------------------------------------------------
+Tue Mar 31 06:44:51 UTC 2015 - [email protected]
+
+- Swap from gstreamer 0.10 to gstreamer 1 fixes #924950
+
+-------------------------------------------------------------------
New:
----
pdf-add-support-for-changes-with-poppler-0.31.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evas-generic-loaders.spec ++++++
--- /var/tmp/diff_new_pack.tCo8mI/_old 2015-04-07 09:30:25.000000000 +0200
+++ /var/tmp/diff_new_pack.tCo8mI/_new 2015-04-07 09:30:25.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package evas-generic-loaders
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,13 +24,18 @@
Group: Development/Libraries/C and C++
Url: http://enlightenment.org/
Source: evas_generic_loaders-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM pdf-add-support-for-changes-with-poppler-0.31.patch T2184
+Patch0: pdf-add-support-for-changes-with-poppler-0.31.patch
+# for patch0
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: efl-devel >= %version
BuildRequires: gcc-c++
-BuildRequires: gstreamer-0_10-plugins-base-devel
-BuildRequires: gstreamer-devel
BuildRequires: libpoppler-devel
BuildRequires: libraw-devel
BuildRequires: libspectre-devel
+BuildRequires: pkgconfig(gstreamer-1.0)
+BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(zlib)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -40,8 +45,11 @@
%prep
%setup -q -n evas_generic_loaders-%{version}
+%patch0 -p1
%build
+# patch0 requires new configure
+autoreconf -ifv
%configure --disable-static --disable-silent-rules
make %{?_smp_mflags}
++++++ pdf-add-support-for-changes-with-poppler-0.31.patch ++++++
>From 1e1a1e6fffc1805aadf75467e72af71391636075 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <[email protected]>
Date: Fri, 6 Mar 2015 10:44:50 +0100
Subject: [PATCH] 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
---
configure.ac | 14 ++++++++++++--
src/bin/pdf/main.cpp | 10 ++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
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,
--
2.3.4