summaryrefslogtreecommitdiff
path: root/print/poppler
diff options
context:
space:
mode:
Diffstat (limited to 'print/poppler')
-rw-r--r--print/poppler/Makefile.common6
-rw-r--r--print/poppler/buildlink3.mk4
-rw-r--r--print/poppler/distinfo10
-rw-r--r--print/poppler/patches/patch-ag21
4 files changed, 23 insertions, 18 deletions
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 9639a8193db..7cda8d62f61 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile.common,v 1.55 2013/07/04 13:13:55 wiz Exp $
+# $NetBSD: Makefile.common,v 1.56 2013/08/22 09:11:16 prlw1 Exp $
#
# used by print/poppler/Makefile
+# used by print/poppler-cpp/Makefile
# used by print/poppler-glib/Makefile
# used by print/poppler-includes/Makefile
# used by print/poppler-qt4/Makefile
# used by print/poppler-utils/Makefile
-POPPLER_VERS= 0.22.5
+POPPLER_VERS= 0.24.0
DISTNAME= poppler-${POPPLER_VERS}
CATEGORIES= print
MASTER_SITES= http://poppler.freedesktop.org/
+EXTRACT_SUFX= .tar.xz
HOMEPAGE= http://poppler.freedesktop.org/
LICENSE= gnu-gpl-v2
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 4f5096fc60b..4201685559e 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2013/06/04 22:16:59 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2013/08/22 09:11:16 prlw1 Exp $
BUILDLINK_TREE+= poppler
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= poppler
POPPLER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.poppler+= poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.22.4nb2
+BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.24.0
BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler
pkgbase := poppler
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 7a97b1822d6..ae2aaa29dc0 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.80 2013/07/04 13:13:55 wiz Exp $
+$NetBSD: distinfo,v 1.81 2013/08/22 09:11:16 prlw1 Exp $
-SHA1 (poppler-0.22.5.tar.gz) = 9491bb33788d7f0ee67da572dc4798004f98323a
-RMD160 (poppler-0.22.5.tar.gz) = 6220e723a87f153f9c9ccc7329133d04191a3c8a
-Size (poppler-0.22.5.tar.gz) = 2239107 bytes
+SHA1 (poppler-0.24.0.tar.xz) = fd40adf10127d040f16e00ce2497fc5e8f5e5753
+RMD160 (poppler-0.24.0.tar.xz) = 2b8e91ee67c7e5cacb845f268a66685ce5557270
+Size (poppler-0.24.0.tar.xz) = 1503420 bytes
SHA1 (patch-aa) = f67de7b11651207d968972e5b27eb017cf59ceb7
SHA1 (patch-ab) = 758c541fa14c82cb44a247cbc37e1582b0167229
-SHA1 (patch-ag) = abe010cec549f305a53d9a21be6cf66ddc5f1b79
+SHA1 (patch-ag) = de9ef3e2498d5c07a8f35f1d215e377953a5dad8
SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63
SHA1 (patch-ar) = f72681a2148ec846a334774339836d468925b20c
SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d
diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag
index 35eaa7e7b65..68d1aa87ce9 100644
--- a/print/poppler/patches/patch-ag
+++ b/print/poppler/patches/patch-ag
@@ -1,22 +1,25 @@
-$NetBSD: patch-ag,v 1.9 2013/03/24 07:09:25 spz Exp $
+$NetBSD: patch-ag,v 1.10 2013/08/22 09:11:16 prlw1 Exp $
---- qt4/src/Makefile.in.orig 2013-02-10 10:48:38.000000000 +0000
+Use installed copy of poppler library so we can have a separate
+poppler-glib package.
+
+--- qt4/src/Makefile.in.orig 2013-07-29 17:13:29.000000000 +0000
+++ qt4/src/Makefile.in
-@@ -102,7 +102,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
+@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libpoppler_qt4_la_DEPENDENCIES = \
-- $(top_builddir)/poppler/libpoppler.la \
-+ $(prefix)/lib/libpoppler.la \
- $(top_builddir)/poppler/libpoppler-arthur.la \
- $(am__DEPENDENCIES_1)
+- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
++ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1)
am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
-@@ -440,7 +440,7 @@ libpoppler_qt4_la_CXXFLAGS = \
+ libpoppler_qt4_la-poppler-page.lo \
+ libpoppler_qt4_la-poppler-fontinfo.lo \
+@@ -505,7 +505,7 @@ libpoppler_qt4_la_CXXFLAGS = \
-Dpoppler_qt4_EXPORTS
libpoppler_qt4_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
+ $(prefix)/lib/libpoppler.la \
- $(top_builddir)/poppler/libpoppler-arthur.la \
$(POPPLER_QT4_LIBS)
+ libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@