commit e3b4751943f795ea5f5568c10cdd103a9344f945
Author: Jan Palus <[email protected]>
Date: Thu Jul 24 23:27:53 2014 +0200
- up to 0.26.3
- bump required qt4 version to 4.7.0
poppler-qt5.patch | 10 +++++-----
poppler.spec | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/poppler.spec b/poppler.spec
index d2f4af2..e0cbb9b 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -11,12 +11,12 @@
Summary: PDF rendering library
Summary(pl.UTF-8): Biblioteka renderująca PDF
Name: poppler
-Version: 0.26.2
+Version: 0.26.3
Release: 1
License: GPL v2+
Group: Libraries
Source0: http://poppler.freedesktop.org/%{name}-%{version}.tar.xz
-# Source0-md5: 10dcb979a57c0cbaa72d2d04c6adc32c
+# Source0-md5: e101f6653f9f68ab63dac63ec34801d1
Patch0: %{name}-qt5.patch
URL: http://poppler.freedesktop.org/
%{?with_qt5:BuildRequires: Qt5Core-devel >= 5.0.0}
@@ -24,10 +24,10 @@ URL: http://poppler.freedesktop.org/
%{?with_qt5:BuildRequires: Qt5Test-devel >= 5.0.0}
%{?with_qt5:BuildRequires: Qt5Widgets-devel >= 5.0.0}
%{?with_qt5:BuildRequires: Qt5Xml-devel >= 5.0.0}
-%{?with_qt4:BuildRequires: QtCore-devel >= 4.4.0}
-%{?with_qt4:BuildRequires: QtGui-devel >= 4.4.0}
-%{?with_qt4:BuildRequires: QtTest-devel >= 4.4.0}
-%{?with_qt4:BuildRequires: QtXml-devel >= 4.4.0}
+%{?with_qt4:BuildRequires: QtCore-devel >= 4.7.0}
+%{?with_qt4:BuildRequires: QtGui-devel >= 4.7.0}
+%{?with_qt4:BuildRequires: QtTest-devel >= 4.7.0}
+%{?with_qt4:BuildRequires: QtXml-devel >= 4.7.0}
BuildRequires: autoconf >= 2.59
BuildRequires: automake
%{?with_cairo:BuildRequires: cairo-devel >= %{cairo_ver}}
diff --git a/poppler-qt5.patch b/poppler-qt5.patch
index 61ff55f..cb6a69c 100644
--- a/poppler-qt5.patch
+++ b/poppler-qt5.patch
@@ -1,6 +1,6 @@
---- poppler-0.24.4/configure.ac.orig 2013-11-27 00:11:26.000000000 +0100
-+++ poppler-0.24.4/configure.ac 2014-02-25 20:57:38.944540843 +0100
-@@ -661,20 +661,20 @@
+--- poppler-0.26.3/configure.ac.orig 2014-07-24 23:17:58.522789036 +0200
++++ poppler-0.26.3/configure.ac 2014-07-24 23:22:51.026124439 +0200
+@@ -649,20 +649,20 @@
AC_CHECK_TOOL(MOCQT5, moc)
AC_MSG_CHECKING([for Qt5 moc])
mocversion=`$MOCQT5 -v 2>&1`
@@ -12,8 +12,8 @@
AC_CHECK_TOOL(MOCQT52, moc-qt5)
AC_MSG_CHECKING([for Qt5 moc-qt5])
mocversion=`$MOCQT52 -v 2>&1`
-- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
-+ mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5| 5\.[[0-9]]"`
+- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
++ mocversiongrep=`echo $mocversion | grep -E "Qt 5\|moc-qt5 5|moc 5|
5\.[[0-9]]"`
if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser)
AC_MSG_CHECKING([for qtchooser])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poppler.git/commitdiff/e3b4751943f795ea5f5568c10cdd103a9344f945
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
