diff options
author | wiz <wiz@pkgsrc.org> | 2014-11-20 16:03:46 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-11-20 16:03:46 +0000 |
commit | 01b9fc14cb5b1fc3b631ac541f1c349427be1613 (patch) | |
tree | dac33eb323c4e9aa442d742ffac555dd65748aea /print/poppler | |
parent | f8f35e3bfac8354e3b0afe58701787c907411321 (diff) | |
download | pkgsrc-01b9fc14cb5b1fc3b631ac541f1c349427be1613.tar.gz |
Update poppler to 0.28.1:
Release 0.28.0
core:
* Fix rendering of file with a wrong embedded font. Bug #84270
* Use alt colorspace to get CMYK values for an ICC based CMYK colorspace. Bug #79019
* Map Standard/Expert encoding ligatures to AGLFN names. Bug #80093
* Make Attribute::getName() work when UTF-16BE is used. Bug #84722
* Fix memory leak in Dict::remove. Bug #84607
* Fix crashes in broken files
* SplashOutputDev: Improve Overprintmode and shadings. Bug #80998
* CairoOutputDev: fix crash when no group color space. Bug #85137
* CairoOutputDev: Don't render text when text matrix is not invertable. Bug #78042
* CairoOutputDev: Only embed mime data for gray/rgb/cmyk colorspaces. Bug #80719
* CairoOutputDev: Only embed mime data if image decode map is identity
* cairo: Use matrix to determine pattern size. Bug #33364
* Fix compile warnings
* regression test improvements
glib:
* Fix use of uninitialized members in PopplerInputStream. Bug #82630
* Documentation improvements
* Do not dist gir_DATA
* Remove use of GTK deprecated functions. Bug #82384. Bug #82385
* Build introspection linking to the uninstalled libraries. Big #84526
qt4:
* Add a new Page::annotations() that lets you specify subtypes
qt5:
* Add a new Page::annotations() that lets you specify subtypes
utils:
* pdfseparate: additional handling for annotations. Bug #77549
* pdfdetach: fix crash when getPage() returns null. Bug #85145
* pdftocairo: Add support for printing to a Windows printer. Bug #79936
build system:
* Move automake version check from autogen.sh to configure.ac. Bug #79797
* Makefile.am cleanups. Bug #79411
* Use poppler-data pkg-config
* Make autogen.sh work with variables with spaces
* Don't use -fPIC on mingw
* Fix build with --disable-utils. Bug #84448
Diffstat (limited to 'print/poppler')
-rw-r--r-- | print/poppler/Makefile.common | 4 | ||||
-rw-r--r-- | print/poppler/buildlink3.mk | 4 | ||||
-rw-r--r-- | print/poppler/distinfo | 20 | ||||
-rw-r--r-- | print/poppler/patches/patch-aa | 12 | ||||
-rw-r--r-- | print/poppler/patches/patch-ab | 166 | ||||
-rw-r--r-- | print/poppler/patches/patch-ag | 8 | ||||
-rw-r--r-- | print/poppler/patches/patch-ar | 20 | ||||
-rw-r--r-- | print/poppler/patches/patch-as | 10 | ||||
-rw-r--r-- | print/poppler/patches/patch-qt5_src_Makefile.in | 8 |
9 files changed, 138 insertions, 114 deletions
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index 112e2970452..dee23d6e109 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.70 2014/10/01 15:57:00 wiz Exp $ +# $NetBSD: Makefile.common,v 1.71 2014/11/20 16:03:46 wiz Exp $ # # used by print/poppler/Makefile # used by print/poppler-cpp/Makefile @@ -8,7 +8,7 @@ # used by print/poppler-qt5/Makefile # used by print/poppler-utils/Makefile -POPPLER_VERS= 0.26.5 +POPPLER_VERS= 0.28.1 DISTNAME= poppler-${POPPLER_VERS} CATEGORIES= print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index 09672b8107f..8e313b19631 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.39 2014/04/29 07:56:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.40 2014/11/20 16:03:46 wiz 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.26.0 +BUILDLINK_ABI_DEPENDS.poppler+= poppler>=0.28.1 BUILDLINK_PKGSRCDIR.poppler?= ../../print/poppler .include "../../graphics/lcms2/buildlink3.mk" diff --git a/print/poppler/distinfo b/print/poppler/distinfo index c16e2c1924e..a2af7a40f91 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.97 2014/10/01 15:57:00 wiz Exp $ +$NetBSD: distinfo,v 1.98 2014/11/20 16:03:46 wiz Exp $ -SHA1 (poppler-0.26.5.tar.xz) = 12937666faee80bae397a8338a3357e864d77d53 -RMD160 (poppler-0.26.5.tar.xz) = 7327c868a8a08c9c25551d18bd1c05585b6e50f4 -Size (poppler-0.26.5.tar.xz) = 1595232 bytes -SHA1 (patch-aa) = f67de7b11651207d968972e5b27eb017cf59ceb7 -SHA1 (patch-ab) = fc2e9e5dbbc2cda25b79d8342e82c10d542211a6 -SHA1 (patch-ag) = 7a3e0cb67bfb3856b3c5fbb581572a113eeb9fe5 +SHA1 (poppler-0.28.1.tar.xz) = 017258af51cb556dc53af630c50165bb9fd76e4f +RMD160 (poppler-0.28.1.tar.xz) = 85e3b933c14fc27a729c777ff591660c9139795b +Size (poppler-0.28.1.tar.xz) = 1600332 bytes +SHA1 (patch-aa) = 4ff366a6da2a9bd125af18f6413d9b445ca3307a +SHA1 (patch-ab) = 55bcf94d51f5c9c5bf999f7b4fa63afebe77c83c +SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa -SHA1 (patch-ar) = c3f9c4d0176f215cfee6127d2ac077a26c23ffa2 -SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d -SHA1 (patch-qt5_src_Makefile.in) = 3bbe51eca4f10fd91f6afd4f8e4cee05b04e98c3 +SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3 +SHA1 (patch-as) = 1238357e57fa310ba9c9f00768c46074b8325739 +SHA1 (patch-qt5_src_Makefile.in) = 8bd1456b2cfc61ea25bbc1ae6fa10e2c9c482828 diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa index 58468f7d859..345d6911893 100644 --- a/print/poppler/patches/patch-aa +++ b/print/poppler/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.13 2013/07/04 13:13:55 wiz Exp $ +$NetBSD: patch-aa,v 1.14 2014/11/20 16:03:46 wiz Exp $ Use installed copy of poppler library so we can have a separate poppler-glib package. ---- glib/Makefile.in.orig 2013-02-10 10:48:37.000000000 +0000 +--- glib/Makefile.in.orig 2014-11-04 18:46:21.000000000 +0000 +++ glib/Makefile.in -@@ -107,7 +107,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" +@@ -134,7 +134,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libpoppler_glib_la_DEPENDENCIES = \ @@ -13,9 +13,9 @@ poppler-glib package. + $(prefix)/lib/libpoppler.la \ $(top_builddir)/poppler/libpoppler-cairo.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - am__objects_1 = poppler-enums.lo -@@ -475,7 +475,7 @@ libpoppler_glib_la_SOURCES = \ - poppler-private.h + am__objects_1 = libpoppler_glib_la-poppler-enums.lo +@@ -553,7 +553,7 @@ libpoppler_glib_la_CPPFLAGS = \ + $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab index c83d271767b..500ac658e75 100644 --- a/print/poppler/patches/patch-ab +++ b/print/poppler/patches/patch-ab @@ -1,124 +1,136 @@ -$NetBSD: patch-ab,v 1.17 2014/04/29 07:56:48 wiz Exp $ +$NetBSD: patch-ab,v 1.18 2014/11/20 16:03:46 wiz Exp $ Use installed poppler library so we can have a separate poppler-utils package. ---- utils/Makefile.in.orig 2014-04-24 22:42:57.000000000 +0000 +Always build pdftoppm. + +--- utils/Makefile.in.orig 2014-11-04 18:46:22.000000000 +0000 +++ utils/Makefile.in -@@ -103,7 +103,7 @@ CONFIG_HEADER = $(top_builddir)/config.h - $(top_builddir)/poppler/poppler-config.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT) -+am__EXEEXT_1 = pdftoppm$(EXEEXT) - @BUILD_CAIRO_OUTPUT_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT) +@@ -85,9 +85,9 @@ host_triplet = @host@ + @BUILD_UTILS_TRUE@ pdftohtml$(EXEEXT) pdfseparate$(EXEEXT) \ + @BUILD_UTILS_TRUE@ pdfunite$(EXEEXT) $(am__EXEEXT_1) \ + @BUILD_UTILS_TRUE@ $(am__EXEEXT_2) +-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdftoppm ++am__append_1 = pdftoppm + @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftocairo +-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftoppm.1 ++am__append_3 = pdftoppm.1 + @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdftocairo.1 + @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_5 = $(LCMS_CFLAGS) + @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_6 = $(LCMS_LIBS) +@@ -117,8 +117,8 @@ AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent + am__v_lt_1 = +-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = \ +-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@ pdftoppm$(EXEEXT) ++am__EXEEXT_1 = \ ++ pdftoppm$(EXEEXT) + @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -@@ -111,7 +111,7 @@ am__objects_1 = parseargs.$(OBJEXT) - am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1) +@@ -126,39 +126,39 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) pdfdetach_LDADD = $(LDADD) --pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfdetach_DEPENDENCIES = $(prefix)/lib/libpoppler.la - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent -@@ -119,26 +119,26 @@ am__v_lt_1 = - am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1) + pdfdetach_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la + am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) --pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la + pdffonts_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ - JSInfo.$(OBJEXT) $(am__objects_1) + JSInfo.$(OBJEXT) pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) pdfimages_LDADD = $(LDADD) --pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la + pdfimages_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ - JSInfo.$(OBJEXT) $(am__objects_1) + JSInfo.$(OBJEXT) pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) pdfinfo_LDADD = $(LDADD) --pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la - am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1) + pdfinfo_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la + am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) pdfseparate_LDADD = $(LDADD) --pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfseparate_DEPENDENCIES = $(prefix)/lib/libpoppler.la - am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h - @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \ - @BUILD_CAIRO_OUTPUT_TRUE@ $(am__objects_1) + pdfseparate_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la + am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \ + pdftocairo-pdftocairo-win32.$(OBJEXT) pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) --am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la -+am__DEPENDENCIES_1 = $(prefix)/lib/libpoppler.la + am__DEPENDENCIES_1 = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la am__DEPENDENCIES_2 = @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) -@@ -153,29 +153,29 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht - pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2) + am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) +-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \ ++pdftocairo_DEPENDENCIES = $(prefix)/lib/libpoppler-cairo.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \ + $(am__DEPENDENCIES_2) + am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \ +@@ -167,7 +167,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) pdftohtml_LDADD = $(LDADD) --pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la + pdftohtml_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h --@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \ --@BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1) -+am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \ -+ $(am__objects_1) +@@ -175,22 +175,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) pdftoppm_LDADD = $(LDADD) --pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la - am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1) + pdftoppm_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la + am_pdftops_OBJECTS = pdftops.$(OBJEXT) pdftops_OBJECTS = $(am_pdftops_OBJECTS) pdftops_LDADD = $(LDADD) --pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la - am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \ - $(am__objects_1) + pdftops_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la + am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) pdftotext_LDADD = $(LDADD) --pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la - am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1) + pdftotext_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la + am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) pdfunite_LDADD = $(LDADD) --pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la -+pdfunite_DEPENDENCIES = $(prefix)/lib/libpoppler.la + pdfunite_DEPENDENCIES = libparseargs.la \ +- $(top_builddir)/poppler/libpoppler.la ++ $(prefix)/lib/libpoppler.la AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false -@@ -502,12 +502,12 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - win32_libs = @win32_libs@ --@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \ --@BUILD_SPLASH_OUTPUT_TRUE@ pdftoppm.cc \ --@BUILD_SPLASH_OUTPUT_TRUE@ $(common) -+pdftoppm_SOURCES = \ -+ pdftoppm.cc \ -+ $(common) - --@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_binary = pdftoppm --@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1 -+pdftoppm_binary = pdftoppm -+pdftoppm_manpage = pdftoppm.1 - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/goo \ -@@ -517,8 +517,9 @@ INCLUDES = \ - $(PDFTOCAIRO_CFLAGS) +@@ -527,8 +527,9 @@ AM_CPPFLAGS = \ LDADD = \ + libparseargs.la \ - $(top_builddir)/poppler/libpoppler.la \ - $(UTILS_LIBS) + $(prefix)/lib/libpoppler.la \ + $(UTILS_LIBS) \ + $(PTHREAD_STUBLIB) - @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \ - @BUILD_CAIRO_OUTPUT_TRUE@ pdftocairo.cc \ + @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ + @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \ +@@ -590,7 +591,7 @@ pdftocairo_SOURCES = \ + pdftocairo-win32.h + + pdftocairo_LDADD = \ +- $(top_builddir)/poppler/libpoppler-cairo.la \ ++ $(prefix)/lib/libpoppler-cairo.la \ + $(LDADD) \ + $(PDFTOCAIRO_LIBS) \ + $(PTHREAD_LIBS) diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag index f27a5a85656..edcd627a273 100644 --- a/print/poppler/patches/patch-ag +++ b/print/poppler/patches/patch-ag @@ -1,9 +1,9 @@ -$NetBSD: patch-ag,v 1.11 2014/04/29 07:56:48 wiz Exp $ +$NetBSD: patch-ag,v 1.12 2014/11/20 16:03:46 wiz Exp $ Use installed copy of poppler library so we can have a separate poppler-glib package. ---- qt4/src/Makefile.in.orig 2014-04-24 22:42:56.000000000 +0000 +--- qt4/src/Makefile.in.orig 2014-11-04 18:46:22.000000000 +0000 +++ qt4/src/Makefile.in @@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -14,7 +14,7 @@ poppler-glib package. am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \ libpoppler_qt4_la-poppler-page.lo \ libpoppler_qt4_la-poppler-fontinfo.lo \ -@@ -506,7 +506,7 @@ libpoppler_qt4_la_CXXFLAGS = \ +@@ -505,7 +505,7 @@ libpoppler_qt4_la_CXXFLAGS = \ -Dpoppler_qt4_EXPORTS libpoppler_qt4_la_LIBADD = \ @@ -22,4 +22,4 @@ poppler-glib package. + $(prefix)/lib/libpoppler.la \ $(POPPLER_QT4_LIBS) - libpoppler_qt4_la_LDFLAGS = -version-info 8:0:4 @create_shared_lib@ @auto_import_flags@ + libpoppler_qt4_la_LDFLAGS = \ diff --git a/print/poppler/patches/patch-ar b/print/poppler/patches/patch-ar index 9acee5ea0ee..e499b941089 100644 --- a/print/poppler/patches/patch-ar +++ b/print/poppler/patches/patch-ar @@ -1,9 +1,12 @@ -$NetBSD: patch-ar,v 1.6 2014/04/29 07:56:48 wiz Exp $ +$NetBSD: patch-ar,v 1.7 2014/11/20 16:03:46 wiz Exp $ Use installed poppler library so we can have a separate poppler-cpp package. ---- cpp/Makefile.in.orig 2014-04-24 22:42:56.000000000 +0000 +Do not descend into tests directory to avoid dependency on utils/ +directory. + +--- cpp/Makefile.in.orig 2014-11-04 18:46:21.000000000 +0000 +++ cpp/Makefile.in @@ -130,7 +130,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -14,7 +17,16 @@ package. am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-poppler-document.lo \ libpoppler_cpp_la-poppler-embedded-file.lo \ libpoppler_cpp_la-poppler-font.lo \ -@@ -537,7 +537,7 @@ libpoppler_cpp_la_CXXFLAGS = \ +@@ -483,7 +483,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + win32_libs = @win32_libs@ +-SUBDIRS = . tests ++SUBDIRS = . + lib_LTLIBRARIES = libpoppler-cpp.la + libpoppler_cpp_includedir = $(includedir)/poppler/cpp + libpoppler_cpp_include_HEADERS = \ +@@ -536,7 +536,7 @@ libpoppler_cpp_la_CXXFLAGS = \ -Dpoppler_cpp_EXPORTS libpoppler_cpp_la_LIBADD = \ @@ -22,4 +34,4 @@ package. + $(prefix)/lib/libpoppler.la \ $(LIBICONV) - libpoppler_cpp_la_LDFLAGS = -version-info 2:0:2 @create_shared_lib@ @auto_import_flags@ + libpoppler_cpp_la_LDFLAGS = \ diff --git a/print/poppler/patches/patch-as b/print/poppler/patches/patch-as index a80f5de7a34..c3027f46f34 100644 --- a/print/poppler/patches/patch-as +++ b/print/poppler/patches/patch-as @@ -1,14 +1,14 @@ -$NetBSD: patch-as,v 1.4 2013/07/04 13:13:55 wiz Exp $ +$NetBSD: patch-as,v 1.5 2014/11/20 16:03:46 wiz Exp $ Use installed poppler library so we can have a separate poppler-cpp package. ---- cpp/tests/Makefile.in.orig 2011-06-27 18:45:14.000000000 +0000 +--- cpp/tests/Makefile.in.orig 2014-11-04 18:46:21.000000000 +0000 +++ cpp/tests/Makefile.in -@@ -300,7 +300,7 @@ INCLUDES = \ - -I$(top_srcdir)/cpp +@@ -392,7 +392,7 @@ AM_CPPFLAGS = \ - LDADDS = \ + LDADD = \ + $(top_builddir)/utils/libparseargs.la \ - $(top_builddir)/poppler/libpoppler.la \ + $(prefix)/lib/libpoppler.la \ $(top_builddir)/cpp/libpoppler-cpp.la diff --git a/print/poppler/patches/patch-qt5_src_Makefile.in b/print/poppler/patches/patch-qt5_src_Makefile.in index ddbdd2544b0..c1b70f333cf 100644 --- a/print/poppler/patches/patch-qt5_src_Makefile.in +++ b/print/poppler/patches/patch-qt5_src_Makefile.in @@ -1,9 +1,9 @@ -$NetBSD: patch-qt5_src_Makefile.in,v 1.1 2014/04/29 08:03:53 wiz Exp $ +$NetBSD: patch-qt5_src_Makefile.in,v 1.2 2014/11/20 16:03:46 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.orig 2014-11-04 18:46:22.000000000 +0000 +++ qt5/src/Makefile.in @@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -14,7 +14,7 @@ poppler-qt5 package. 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 = \ +@@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \ -Dpoppler_qt5_EXPORTS -fPIC libpoppler_qt5_la_LIBADD = \ @@ -22,4 +22,4 @@ poppler-qt5 package. + $(prefix)/lib/libpoppler.la \ $(POPPLER_QT5_LIBS) - libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@ + libpoppler_qt5_la_LDFLAGS = \ |