Attachment 152354 Details for Bug 196599 – Poppler 0.30.0 update with inkscape patch.

[patch] Poppler 0.30.0 update with inkscape patch.

poppler-0.30.0.diff (text/plain), 24.58 KB, created by Koop Mast on 2015-01-29 23:32:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2015-01-29 23:32:28 UTC

Size: 24.58 KB

patch

obsolete

>Index: graphics/inkscape/Makefile
>===================================================================
>--- graphics/inkscape/Makefile	(revision 378127)
>+++ graphics/inkscape/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	inkscape
> PORTVERSION=	0.48.5
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	graphics gnome
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
>Index: graphics/inkscape/files/configure.ac
>===================================================================
>--- graphics/inkscape/files/configure.ac	(revision 0)
>+++ graphics/inkscape/files/configure.ac	(working copy)
>@@ -0,0 +1,14 @@
>+--- configure.ac.orig	2015-01-29 19:58:01.271153231 +0100
>++++ configure.ac	2015-01-29 19:58:25.237151226 +0100
>+@@ -593,6 +593,11 @@
>+ 	AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
>+ fi
>+ 
>++PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
>++if test "x$popplernewernewcolorspaceapi" = "xyes"; then
>++	AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
>++fi
>++
>+ # Poppler's b604a008 commit changes this
>+ AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
>+ popplergfxcolor="no"
>
>Property changes on: graphics/inkscape/files/configure.ac
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/inkscape/files/patch-config.h.in
>===================================================================
>--- graphics/inkscape/files/patch-config.h.in	(revision 0)
>+++ graphics/inkscape/files/patch-config.h.in	(working copy)
>@@ -0,0 +1,12 @@
>+--- config.h.in.orig	2015-01-29 20:28:40.068026139 +0100
>++++ config.h.in	2015-01-29 20:31:07.000000000 +0100
>+@@ -246,6 +246,9 @@
>+ /* Use even newer color space API from Poppler >= 0.26.0 */
>+ #undef POPPLER_EVEN_NEWER_COLOR_SPACE_API
>+ 
>++/* Use even newer new color space API from Poppler >= 0.29.0 */
>++#undef POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
>++
>+ /* Use color space API from Poppler >= 0.12.2 */
>+ #undef POPPLER_NEW_COLOR_SPACE_API
>+ 
>
>Property changes on: graphics/inkscape/files/patch-config.h.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/inkscape/files/patch-configure
>===================================================================
>--- graphics/inkscape/files/patch-configure	(revision 378127)
>+++ graphics/inkscape/files/patch-configure	(working copy)
>@@ -1,6 +1,37 @@
>---- configure.orig	2014-10-20 01:29:05.836430783 +0200
>-+++ configure	2014-10-20 01:29:05.872430406 +0200
>-@@ -9046,10 +9046,11 @@
>+--- configure.orig	2015-01-29 19:57:54.424153129 +0100
>++++ configure	2015-01-29 20:00:37.112141976 +0100
>+@@ -657,6 +657,8 @@
>+ LIBWPG01_CFLAGS
>+ INKBOARD_CFLAGS
>+ INKBOARD_LIBS
>++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
>++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
>+ POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
>+ POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS
>+ POPPLER_NEWERRORAPI_LIBS
>+@@ -914,6 +916,8 @@
>+ POPPLER_NEWERRORAPI_LIBS
>+ POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS
>+ POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
>++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
>++POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
>+ LIBWPG01_CFLAGS
>+ LIBWPG01_LIBS
>+ LIBWPG02_CFLAGS
>+@@ -1630,6 +1634,12 @@
>+   POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
>+               linker flags for POPPLER_EVEN_NEWER_COLOR_SPACE_API, overriding
>+               pkg-config
>++  POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
>++              C compiler flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API,
>++              overriding pkg-config
>++  POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
>++              linker flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API,
>++              overriding pkg-config
>+   LIBWPG01_CFLAGS
>+               C compiler flags for LIBWPG01, overriding pkg-config
>+   LIBWPG01_LIBS
>+@@ -9047,10 +9057,11 @@
>  			#include <stdio.h>
>  			extern unsigned GC_version;
>  			int main(void){
>@@ -16,3 +47,87 @@
>  			}
>  _ACEOF
>  if ac_fn_cxx_try_run "$LINENO"; then :
>+@@ -10561,6 +10572,83 @@
>+ 
>+ fi
>+ 
>++
>++pkg_failed=no
>++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API" >&5
>++$as_echo_n "checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API... " >&6; }
>++
>++if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"; then
>++    pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"
>++ elif test -n "$PKG_CONFIG"; then
>++    if test -n "$PKG_CONFIG" && \
>++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5
>++  ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5
>++  ac_status=$?
>++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>++  test $ac_status = 0; }; then
>++  pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.29.0" 2>/dev/null`
>++		      test "x$?" != "x0" && pkg_failed=yes
>++else
>++  pkg_failed=yes
>++fi
>++ else
>++    pkg_failed=untried
>++fi
>++if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"; then
>++    pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"
>++ elif test -n "$PKG_CONFIG"; then
>++    if test -n "$PKG_CONFIG" && \
>++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5
>++  ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5
>++  ac_status=$?
>++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>++  test $ac_status = 0; }; then
>++  pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=`$PKG_CONFIG --libs "poppler >= 0.29.0" 2>/dev/null`
>++		      test "x$?" != "x0" && pkg_failed=yes
>++else
>++  pkg_failed=yes
>++fi
>++ else
>++    pkg_failed=untried
>++fi
>++
>++
>++
>++if test $pkg_failed = yes; then
>++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>++$as_echo "no" >&6; }
>++
>++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
>++        _pkg_short_errors_supported=yes
>++else
>++        _pkg_short_errors_supported=no
>++fi
>++        if test $_pkg_short_errors_supported = yes; then
>++	        POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1`
>++        else
>++	        POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1`
>++        fi
>++	# Put the nasty error message in config.log where it belongs
>++	echo "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS" >&5
>++
>++	popplernewernewcolorspaceapi=no
>++elif test $pkg_failed = untried; then
>++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>++$as_echo "no" >&6; }
>++	popplernewernewcolorspaceapi=no
>++else
>++	POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
>++	POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
>++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>++$as_echo "yes" >&6; }
>++	popplernewernewcolorspaceapi=yes
>++fi
>++if test "x$popplernewernewcolorspaceapi" = "xyes"; then
>++
>++$as_echo "#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1" >>confdefs.h
>++
>++fi
>++
>+ # Poppler's b604a008 commit changes this
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Poppler's GfxPatch no longer uses GfxColor" >&5
>+ $as_echo_n "checking whether Poppler's GfxPatch no longer uses GfxColor... " >&6; }
>Index: graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
>===================================================================
>--- graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp	(revision 0)
>+++ graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp	(working copy)
>@@ -0,0 +1,83 @@
>+=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
>+--- src/extension/internal/pdfinput/pdf-parser.cpp	2014-06-03 15:44:09 +0000
>++++ src/extension/internal/pdfinput/pdf-parser.cpp	2014-12-10 20:32:30 +0000
>+@@ -860,7 +860,9 @@
>+ 	  blendingColorSpace = NULL;
>+ 	  isolated = knockout = gFalse;
>+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
>+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
>++	    blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
>++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
>+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
>+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
>+@@ -1085,7 +1087,13 @@
>+ 
>+   state->setFillPattern(NULL);
>+   res->lookupColorSpace(args[0].getName(), &obj);
>+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
>++  if (obj.isNull()) {
>++    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
>++  } else {
>++    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
>++  }
>++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>+   if (obj.isNull()) {
>+     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
>+   } else {
>+@@ -1126,7 +1134,13 @@
>+ 
>+   state->setStrokePattern(NULL);
>+   res->lookupColorSpace(args[0].getName(), &obj);
>+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
>++  if (obj.isNull()) {
>++    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
>++  } else {
>++    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
>++  }
>++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>+   if (obj.isNull()) {
>+     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
>+   } else {
>+@@ -2756,8 +2770,10 @@
>+       }
>+     }
>+     if (!obj1.isNull()) {
>+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>+-            colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
>++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
>++      colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
>++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>++      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
>+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
>+       colorSpace = GfxColorSpace::parse(&obj1, NULL);
>+ #else
>+@@ -2847,8 +2863,10 @@
>+ 	  obj2.free();
>+ 	}
>+       }
>+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>+-            GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
>++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
>++      GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
>++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>++      GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
>+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
>+       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
>+ #else
>+@@ -3040,7 +3058,9 @@
>+     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
>+       transpGroup = gTrue;
>+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
>+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
>++	blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
>++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
>+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
>+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
>+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
>+
>+
>
>Property changes on: graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/poppler/Makefile
>===================================================================
>--- graphics/poppler/Makefile	(revision 378127)
>+++ graphics/poppler/Makefile	(working copy)
>@@ -3,8 +3,8 @@
> #   $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
> 
> PORTNAME=	poppler
>-PORTVERSION=	0.26.3
>-PORTREVISION?=	1
>+PORTVERSION=	0.30.0
>+PORTREVISION?=	0
> CATEGORIES=	graphics print
> MASTER_SITES=	http://poppler.freedesktop.org/
> 
>@@ -115,8 +115,10 @@
> PLIST_SUB+=	CURL="@comment "
> .endif
> 
>+# stick with openjpeg1 for now due to regression in openjpeg2 (configure)
>+# https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35
> .if ${PORT_OPTIONS:MOPENJPEG}
>-CONFIGURE_ARGS+=--enable-libopenjpeg
>+CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1
> LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
> .else
> CONFIGURE_ARGS+=--disable-libopenjpeg
>Index: graphics/poppler/distinfo
>===================================================================
>--- graphics/poppler/distinfo	(revision 378127)
>+++ graphics/poppler/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1
>-SIZE (poppler-0.26.3.tar.xz) = 1593760
>+SHA256 (poppler-0.30.0.tar.xz) = b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5
>+SIZE (poppler-0.30.0.tar.xz) = 1605292
>Index: graphics/poppler/files/patch-glib_Makefile.in
>===================================================================
>--- graphics/poppler/files/patch-glib_Makefile.in	(revision 378127)
>+++ graphics/poppler/files/patch-glib_Makefile.in	(working copy)
>@@ -1,15 +1,15 @@
>---- glib/Makefile.in.orig	2011-10-03 23:55:25.000000000 +0200
>-+++ glib/Makefile.in	2011-10-03 23:56:20.000000000 +0200
>-@@ -84,7 +84,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
>+--- glib/Makefile.in.orig	2015-01-19 11:51:06.175898921 +0100
>++++ glib/Makefile.in	2015-01-19 11:51:27.026898915 +0100
>+@@ -134,7 +134,6 @@
>  LTLIBRARIES = $(lib_LTLIBRARIES)
>  am__DEPENDENCIES_1 =
>  libpoppler_glib_la_DEPENDENCIES =  \
> -	$(top_builddir)/poppler/libpoppler.la \
>  	$(top_builddir)/poppler/libpoppler-cairo.la \
>- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
>- 	$(am__DEPENDENCIES_1)
>-@@ -433,7 +432,7 @@ libpoppler_glib_la_SOURCES = \
>- 	poppler-private.h
>+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
>+ am__objects_1 = libpoppler_glib_la-poppler-enums.lo
>+@@ -553,7 +552,7 @@
>+ 	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
>  
>  libpoppler_glib_la_LIBADD = \
> -	$(top_builddir)/poppler/libpoppler.la		\
>@@ -16,4 +16,13 @@
> +	-lpoppler		\
>  	$(top_builddir)/poppler/libpoppler-cairo.la	\
>  	$(POPPLER_GLIB_LIBS)				\
>- 	$(FREETYPE_LIBS)				\
>+ 	$(FREETYPE_LIBS)
>+@@ -576,7 +575,7 @@
>+ @HAVE_INTROSPECTION_TRUE@introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
>+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
>+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
>+-@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
>++@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la
>+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files)
>+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
>+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib
>Index: graphics/poppler/files/patch-utils_Makefile.in
>===================================================================
>--- graphics/poppler/files/patch-utils_Makefile.in	(revision 378127)
>+++ graphics/poppler/files/patch-utils_Makefile.in	(working copy)
>@@ -1,101 +1,105 @@
>---- utils/Makefile.in.orig	2014-11-25 11:49:19 UTC
>+--- utils/Makefile.in.orig	2014-11-04 18:46:22 UTC
> +++ utils/Makefile.in
>-@@ -111,7 +111,7 @@
>- am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
>+@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS)
>+ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
>  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
>  pdfdetach_LDADD = $(LDADD)
>--pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>-+pdfdetach_DEPENDENCIES =
>- AM_V_lt = $(am__v_lt_@AM_V@)
>- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
>- am__v_lt_0 = --silent
>-@@ -119,31 +119,31 @@
>- am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
>+-pdfdetach_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdfdetach_DEPENDENCIES = libparseargs.la
>+ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
>  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
>  pdffonts_LDADD = $(LDADD)
>--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>-+pdffonts_DEPENDENCIES =
>+-pdffonts_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdffonts_DEPENDENCIES = libparseargs.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 =
>+-pdfimages_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdfimages_DEPENDENCIES = libparseargs.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 =
>- am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)
>+-pdfinfo_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdfinfo_DEPENDENCIES = libparseargs.la
>+ am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
>  pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
>  pdfseparate_LDADD = $(LDADD)
>--pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>-+pdfseparate_DEPENDENCIES =
>- 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
>++pdfseparate_DEPENDENCIES = libparseargs.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 =
>+-am__DEPENDENCIES_1 = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++am__DEPENDENCIES_1 = libparseargs.la
>  am__DEPENDENCIES_2 =
>  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
>  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
>  am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
>--@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
>-+@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \
>- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1) \
>- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4) \
>- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_2)
>-@@ -153,7 +153,7 @@
>- 	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
>+-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
>++pdftocairo_DEPENDENCIES = \
>+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
>+ 	$(am__DEPENDENCIES_2)
>+ am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
>+@@ -166,31 +160,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
>+ 	pdftohtml-HtmlOutputDev.$(OBJEXT)
>  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
>  pdftohtml_LDADD = $(LDADD)
>--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>-+pdftohtml_DEPENDENCIES =
>+-pdftohtml_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdftohtml_DEPENDENCIES = libparseargs.la
>  pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
>  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
>  	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
>-@@ -162,20 +162,20 @@
>- @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
>+ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
>  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
>  pdftoppm_LDADD = $(LDADD)
>--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>-+pdftoppm_DEPENDENCIES =
>- am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
>+-pdftoppm_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdftoppm_DEPENDENCIES = libparseargs.la
>+ am_pdftops_OBJECTS = pdftops.$(OBJEXT)
>  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
>  pdftops_LDADD = $(LDADD)
>--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>-+pdftops_DEPENDENCIES =
>- am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
>- 	$(am__objects_1)
>+-pdftops_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdftops_DEPENDENCIES = libparseargs.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 =
>- am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
>+-pdftotext_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdftotext_DEPENDENCIES = libparseargs.la
>+ am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
>  pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
>  pdfunite_LDADD = $(LDADD)
>--pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
>-+pdfunite_DEPENDENCIES =
>+-pdfunite_DEPENDENCIES = libparseargs.la \
>+-	$(top_builddir)/poppler/libpoppler.la
>++pdfunite_DEPENDENCIES = libparseargs.la
>  AM_V_P = $(am__v_P_@AM_V@)
>  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
>  am__v_P_0 = false
>-@@ -516,7 +516,7 @@
>- 	$(PDFTOCAIRO_CFLAGS)
>+@@ -527,7 +516,7 @@ AM_CPPFLAGS = \
>  
>  LDADD = \
>+ 	libparseargs.la				\
> -	$(top_builddir)/poppler/libpoppler.la	\
> +	-lpoppler	\
>  	$(UTILS_LIBS)
>  
>- @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \
>-@@ -524,7 +524,7 @@
>- @BUILD_CAIRO_OUTPUT_TRUE@	$(common)
>+ @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
>+@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \
>+ 	pdftocairo-win32.h
>  
>- @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \
>--@BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la \
>-+@BUILD_CAIRO_OUTPUT_TRUE@	-lpoppler-glib \
>- @BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD)				\
>- @BUILD_CAIRO_OUTPUT_TRUE@	$(PDFTOCAIRO_LIBS)			\
>- @BUILD_CAIRO_OUTPUT_TRUE@	$(PTHREAD_LIBS)
>+ pdftocairo_LDADD = \
>+-	$(top_builddir)/poppler/libpoppler-cairo.la	\
>++	-lpoppler-glib	\
>+ 	$(LDADD)					\
>+ 	$(PDFTOCAIRO_LIBS)				\
>+ 	$(PTHREAD_LIBS)
>Index: graphics/poppler/pkg-plist
>===================================================================
>--- graphics/poppler/pkg-plist	(revision 378127)
>+++ graphics/poppler/pkg-plist	(working copy)
>@@ -134,10 +134,10 @@
> include/poppler/splash/SplashXPathScanner.h
> lib/libpoppler-cpp.so
> lib/libpoppler-cpp.so.0
>-lib/libpoppler-cpp.so.0.2.0
>+lib/libpoppler-cpp.so.0.2.1
> lib/libpoppler.so
>-lib/libpoppler.so.46
>-lib/libpoppler.so.46.0.0
>+lib/libpoppler.so.49
>+lib/libpoppler.so.49.0.0
> %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
> libdata/pkgconfig/poppler-cpp.pc
> libdata/pkgconfig/poppler-splash.pc
>Index: graphics/poppler-glib/Makefile
>===================================================================
>--- graphics/poppler-glib/Makefile	(revision 378127)
>+++ graphics/poppler-glib/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> #   $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
> 
>-PORTREVISION=	1
>+PORTREVISION=	0
> PKGNAMESUFFIX=	-glib
> 
> MAINTAINER=	gnome@FreeBSD.org
>Index: graphics/poppler-qt4/pkg-plist
>===================================================================
>--- graphics/poppler-qt4/pkg-plist	(revision 378127)
>+++ graphics/poppler-qt4/pkg-plist	(working copy)
>@@ -8,5 +8,5 @@
> include/poppler/qt4/poppler-qt4.h
> lib/libpoppler-qt4.so
> lib/libpoppler-qt4.so.4
>-lib/libpoppler-qt4.so.4.4.0
>+lib/libpoppler-qt4.so.4.5.0
> libdata/pkgconfig/poppler-qt4.pc
>Index: graphics/poppler-qt5/pkg-plist
>===================================================================
>--- graphics/poppler-qt5/pkg-plist	(revision 378127)
>+++ graphics/poppler-qt5/pkg-plist	(working copy)
>@@ -8,5 +8,5 @@
> include/poppler/qt5/poppler-qt5.h
> lib/libpoppler-qt5.so
> lib/libpoppler-qt5.so.1
>-lib/libpoppler-qt5.so.1.1.0
>+lib/libpoppler-qt5.so.1.2.0
> libdata/pkgconfig/poppler-qt5.pc

Actions: View | Diff

Attachments on bug 196599: 151583 | 152354