diff options
| author | wiz <wiz@pkgsrc.org> | 2014-04-29 08:03:53 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-04-29 08:03:53 +0000 |
| commit | 3ae82215a82ede31d06f87d01dade2400d990759 (patch) | |
| tree | 7f9a0a3848d0c87b3fed053ccdd0846268937264 /print/poppler | |
| parent | 443e52c983adb324d8381de509d4e7903f72f880 (diff) | |
| download | pkgsrc-3ae82215a82ede31d06f87d01dade2400d990759.tar.gz | |
Prepare for poppler-qt5 package.
Diffstat (limited to 'print/poppler')
| -rw-r--r-- | print/poppler/Makefile.common | 4 | ||||
| -rw-r--r-- | print/poppler/distinfo | 3 | ||||
| -rw-r--r-- | print/poppler/patches/patch-qt5_src_Makefile.in | 25 |
3 files changed, 29 insertions, 3 deletions
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index f45b4d9057d..022fcf63eaf 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,10 +1,11 @@ -# $NetBSD: Makefile.common,v 1.63 2014/04/29 07:56:48 wiz Exp $ +# $NetBSD: Makefile.common,v 1.64 2014/04/29 08:03:53 wiz 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-qt5/Makefile # used by print/poppler-utils/Makefile POPPLER_VERS= 0.26.0 @@ -25,4 +26,3 @@ USE_LANGUAGES= c c++ # Don't accidentally find libtiff CONFIGURE_ARGS+= --disable-libtiff - diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 94d3e23565a..d6f0fc2a4d6 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.89 2014/04/29 07:56:48 wiz Exp $ +$NetBSD: distinfo,v 1.90 2014/04/29 08:03:53 wiz Exp $ SHA1 (poppler-0.26.0.tar.xz) = 1f5d08ee01683c309688f17116d18bf47b13f001 RMD160 (poppler-0.26.0.tar.xz) = 9c74dd6fb617928375b64c3576575603ed2a72a5 @@ -10,3 +10,4 @@ SHA1 (patch-aq) = b1e1cd6e234a68ebc352d76dbf89ed4e3cb7b3c0 SHA1 (patch-ar) = c3f9c4d0176f215cfee6127d2ac077a26c23ffa2 SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d SHA1 (patch-configure) = a2488314e1da41c94bc78c327795e126515bdde5 +SHA1 (patch-qt5_src_Makefile.in) = 3bbe51eca4f10fd91f6afd4f8e4cee05b04e98c3 diff --git a/print/poppler/patches/patch-qt5_src_Makefile.in b/print/poppler/patches/patch-qt5_src_Makefile.in new file mode 100644 index 00000000000..ddbdd2544b0 --- /dev/null +++ b/print/poppler/patches/patch-qt5_src_Makefile.in @@ -0,0 +1,25 @@ +$NetBSD: patch-qt5_src_Makefile.in,v 1.1 2014/04/29 08:03:53 wiz Exp $ + +Use installed copy of poppler library so we can have a separate +poppler-qt5 package. + +--- qt5/src/Makefile.in.orig 2014-04-24 22:42:57.000000000 +0000 ++++ qt5/src/Makefile.in +@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + libpoppler_qt5_la_DEPENDENCIES = \ +- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) ++ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) + am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \ + libpoppler_qt5_la-poppler-page.lo \ + libpoppler_qt5_la-poppler-fontinfo.lo \ +@@ -506,7 +506,7 @@ libpoppler_qt5_la_CXXFLAGS = \ + -Dpoppler_qt5_EXPORTS -fPIC + + libpoppler_qt5_la_LIBADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ $(prefix)/lib/libpoppler.la \ + $(POPPLER_QT5_LIBS) + + libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@ |