summaryrefslogtreecommitdiff
path: root/print/poppler
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2009-09-11 10:09:13 +0000
committerdrochner <drochner@pkgsrc.org>2009-09-11 10:09:13 +0000
commitc7fc5a3ae291fa377f52fc07610d76b7eadc4930 (patch)
treea6e8356e46e2c58f22aa83665454c24916f7b16a /print/poppler
parent99786470f958566a7496c6b669a9b419f8de01a1 (diff)
downloadpkgsrc-c7fc5a3ae291fa377f52fc07610d76b7eadc4930.tar.gz
throw away the custom build rules in the poppler-qt pkg Makefile
(which got slightly out of sync) and use the original Makefile, fixes an unresolved autoconf variable in the .pc file reported by Hasso Tepper bump PKGREVISION
Diffstat (limited to 'print/poppler')
-rw-r--r--print/poppler/distinfo3
-rw-r--r--print/poppler/patches/patch-ao22
2 files changed, 24 insertions, 1 deletions
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index bb7165a6c40..bd31cdcae03 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2009/09/09 19:57:05 drochner Exp $
+$NetBSD: distinfo,v 1.47 2009/09/11 10:09:13 drochner Exp $
SHA1 (poppler-0.12.0.tar.gz) = 6165cfc46340644e8750ab8a37f3a3d634144106
RMD160 (poppler-0.12.0.tar.gz) = c90a6a437fb7b5e5c9c9cdaf72782be16cd8ae07
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
SHA1 (patch-ab) = 6bde603d2934099631e057f022ab61b6ff965022
SHA1 (patch-ag) = 89d4ca8d5325b703c953317f422501873d659ac6
SHA1 (patch-ai) = 52376e12baaba63629156055d5254c29f6e89824
+SHA1 (patch-ao) = 747870dcdc8a09f191a0518f42a4dc0c011aa85a
diff --git a/print/poppler/patches/patch-ao b/print/poppler/patches/patch-ao
new file mode 100644
index 00000000000..bef996fb06f
--- /dev/null
+++ b/print/poppler/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2009/09/11 10:09:13 drochner Exp $
+
+--- qt/Makefile.in.orig 2009-09-11 09:20:03.000000000 +0200
++++ qt/Makefile.in
+@@ -63,7 +63,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++libpoppler_qt_la_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+ am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
+@@ -308,7 +308,7 @@ libpoppler_qt_la_SOURCES = \
+ poppler-private.h
+
+ libpoppler_qt_la_LIBADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ $(prefix)/lib/libpoppler.la \
+ $(POPPLER_QT_LIBS) \
+ $(FREETYPE_LIBS) \
+ $(FONTCONFIG_LIBS)