Attachment #152354 for bug #196599

Lines 3-9 Link Here

(-)graphics/inkscape/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= inkscape	4	PORTNAME= inkscape
5	PORTVERSION= 0.48.5	5	PORTVERSION= 0.48.5
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= graphics gnome	7	CATEGORIES= graphics gnome
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9	MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}	9	MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}




--- 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"




--- 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
 




--- 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){

 			}
 _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; }




=== 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);



Lines 3-10 Link Here

(-)graphics/poppler/Makefile (-3 / +5 lines)
3	# $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $	3	# $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
4		4
5	PORTNAME= poppler	5	PORTNAME= poppler
6	PORTVERSION= 0.26.3	6	PORTVERSION= 0.30.0
7	PORTREVISION?= 1	7	PORTREVISION?= 0
8	CATEGORIES= graphics print	8	CATEGORIES= graphics print
9	MASTER_SITES= http://poppler.freedesktop.org/	9	MASTER_SITES= http://poppler.freedesktop.org/
10		10
Lines 115-122 Link Here
115	PLIST_SUB+= CURL="@comment "	115	PLIST_SUB+= CURL="@comment "
116	.endif	116	.endif
117		117
		118	# stick with openjpeg1 for now due to regression in openjpeg2 (configure)
		119	# https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35
118	.if ${PORT_OPTIONS:MOPENJPEG}	120	.if ${PORT_OPTIONS:MOPENJPEG}
119	CONFIGURE_ARGS+=--enable-libopenjpeg	121	CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1
120	LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15	122	LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
121	.else	123	.else
122	CONFIGURE_ARGS+=--disable-libopenjpeg	124	CONFIGURE_ARGS+=--disable-libopenjpeg

Lines 1-2 Link Here

(-)graphics/poppler/distinfo (-2 / +2 lines)
1	SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1	1	SHA256 (poppler-0.30.0.tar.xz) = b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5
2	SIZE (poppler-0.26.3.tar.xz) = 1593760	2	SIZE (poppler-0.30.0.tar.xz) = 1605292




--- 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__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		\

+	-lpoppler		\
 	$(top_builddir)/poppler/libpoppler-cairo.la	\
 	$(POPPLER_GLIB_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




--- utils/Makefile.in.orig	2014-11-04 18:46:22 UTC
+++ utils/Makefile.in
@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS)
 am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
 pdfdetach_LDADD = $(LDADD)
-pdfdetach_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdfdetach_DEPENDENCIES = libparseargs.la
 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
 am__v_lt_0 = --silent
@@ -119,31 +119,31 @@
 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
 pdffonts_LDADD = $(LDADD)
-pdffonts_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdffonts_DEPENDENCIES = libparseargs.la
 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
 	JSInfo.$(OBJEXT)
 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
 pdfimages_LDADD = $(LDADD)
-pdfimages_DEPENDENCIES = libparseargs.la \
-	$(top_builddir)/poppler/libpoppler.la
+pdfimages_DEPENDENCIES = libparseargs.la
 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
 	JSInfo.$(OBJEXT)
 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
 pdfinfo_LDADD = $(LDADD)
-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 = 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 = 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)
-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 = 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 $@
 am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
 @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
 pdftoppm_LDADD = $(LDADD)
-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 = 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 = 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 = 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
@@ -527,7 +516,7 @@ AM_CPPFLAGS = \
 	$(PDFTOCAIRO_CFLAGS)
 
 LDADD = \
 	libparseargs.la				\
-	$(top_builddir)/poppler/libpoppler.la	\
+	-lpoppler	\
 	$(UTILS_LIBS)
 
 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \
 	pdftocairo-win32.h
 
 pdftocairo_LDADD = \
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
+	-lpoppler-glib	\
 	$(LDADD)					\
 	$(PDFTOCAIRO_LIBS)				\
 	$(PTHREAD_LIBS)

Lines 134-143 Link Here

(-)graphics/poppler/pkg-plist (-3 / +3 lines)
134	include/poppler/splash/SplashXPathScanner.h	134	include/poppler/splash/SplashXPathScanner.h
135	lib/libpoppler-cpp.so	135	lib/libpoppler-cpp.so
136	lib/libpoppler-cpp.so.0	136	lib/libpoppler-cpp.so.0
137	lib/libpoppler-cpp.so.0.2.0	137	lib/libpoppler-cpp.so.0.2.1
138	lib/libpoppler.so	138	lib/libpoppler.so
139	lib/libpoppler.so.46	139	lib/libpoppler.so.49
140	lib/libpoppler.so.46.0.0	140	lib/libpoppler.so.49.0.0
141	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc	141	%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
142	libdata/pkgconfig/poppler-cpp.pc	142	libdata/pkgconfig/poppler-cpp.pc
143	libdata/pkgconfig/poppler-splash.pc	143	libdata/pkgconfig/poppler-splash.pc

Lines 2-8 Link Here

(-)graphics/poppler-glib/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3	# $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $	3	# $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
4		4
5	PORTREVISION= 1	5	PORTREVISION= 0
6	PKGNAMESUFFIX= -glib	6	PKGNAMESUFFIX= -glib
7		7
8	MAINTAINER= gnome@FreeBSD.org	8	MAINTAINER= gnome@FreeBSD.org

Lines 8-12 Link Here

(-)graphics/poppler-qt4/pkg-plist (-1 / +1 lines)
8	include/poppler/qt4/poppler-qt4.h	8	include/poppler/qt4/poppler-qt4.h
9	lib/libpoppler-qt4.so	9	lib/libpoppler-qt4.so
10	lib/libpoppler-qt4.so.4	10	lib/libpoppler-qt4.so.4
11	lib/libpoppler-qt4.so.4.4.0	11	lib/libpoppler-qt4.so.4.5.0
12	libdata/pkgconfig/poppler-qt4.pc	12	libdata/pkgconfig/poppler-qt4.pc

Lines 8-12 Link Here

(-)graphics/poppler-qt5/pkg-plist (-1 / +1 lines)
8	include/poppler/qt5/poppler-qt5.h	8	include/poppler/qt5/poppler-qt5.h
9	lib/libpoppler-qt5.so	9	lib/libpoppler-qt5.so
10	lib/libpoppler-qt5.so.1	10	lib/libpoppler-qt5.so.1
11	lib/libpoppler-qt5.so.1.1.0	11	lib/libpoppler-qt5.so.1.2.0
12	libdata/pkgconfig/poppler-qt5.pc	12	libdata/pkgconfig/poppler-qt5.pc

Return to bug 196599

Line 0 Link Here

(-)graphics/inkscape/files/configure.ac (+14 lines)
	1	--- configure.ac.orig 2015-01-29 19:58:01.271153231 +0100
	2	+++ configure.ac 2015-01-29 19:58:25.237151226 +0100
	3	@@ -593,6 +593,11 @@
	4	AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
	5	fi
	6
	7	+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
	8	+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
	9	+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
	10	+fi
	11	+
	12	# Poppler's b604a008 commit changes this
	13	AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
	14	popplergfxcolor="no"

Line 0 Link Here

(-)graphics/inkscape/files/patch-config.h.in (+12 lines)
	1	--- config.h.in.orig 2015-01-29 20:28:40.068026139 +0100
	2	+++ config.h.in 2015-01-29 20:31:07.000000000 +0100
	3	@@ -246,6 +246,9 @@
	4	/* Use even newer color space API from Poppler >= 0.26.0 */
	5	#undef POPPLER_EVEN_NEWER_COLOR_SPACE_API
	6
	7	+/* Use even newer new color space API from Poppler >= 0.29.0 */
	8	+#undef POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
	9	+
	10	/* Use color space API from Poppler >= 0.12.2 */
	11	#undef POPPLER_NEW_COLOR_SPACE_API
	12

Lines 1-6 Link Here

(-)graphics/inkscape/files/patch-configure (-3 / +118 lines)
1	--- configure.orig 2014-10-20 01:29:05.836430783 +0200	1	--- configure.orig 2015-01-29 19:57:54.424153129 +0100
2	+++ configure 2014-10-20 01:29:05.872430406 +0200	2	+++ configure 2015-01-29 20:00:37.112141976 +0100
3	@@ -9046,10 +9046,11 @@	3	@@ -657,6 +657,8 @@
		4	LIBWPG01_CFLAGS
		5	INKBOARD_CFLAGS
		6	INKBOARD_LIBS
		7	+POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
		8	+POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
		9	POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
		10	POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS
		11	POPPLER_NEWERRORAPI_LIBS
		12	@@ -914,6 +916,8 @@
		13	POPPLER_NEWERRORAPI_LIBS
		14	POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS
		15	POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
		16	+POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
		17	+POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
		18	LIBWPG01_CFLAGS
		19	LIBWPG01_LIBS
		20	LIBWPG02_CFLAGS
		21	@@ -1630,6 +1634,12 @@
		22	POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
		23	linker flags for POPPLER_EVEN_NEWER_COLOR_SPACE_API, overriding
		24	pkg-config
		25	+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
		26	+ C compiler flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API,
		27	+ overriding pkg-config
		28	+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
		29	+ linker flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API,
		30	+ overriding pkg-config
		31	LIBWPG01_CFLAGS
		32	C compiler flags for LIBWPG01, overriding pkg-config
		33	LIBWPG01_LIBS
		34	@@ -9047,10 +9057,11 @@
4	#include <stdio.h>	35	#include <stdio.h>
5	extern unsigned GC_version;	36	extern unsigned GC_version;
6	int main(void){	37	int main(void){
Lines 16-18 Link Here
16	}	47	}
17	_ACEOF	48	_ACEOF
18	if ac_fn_cxx_try_run "$LINENO"; then :	49	if ac_fn_cxx_try_run "$LINENO"; then :
		50	@@ -10561,6 +10572,83 @@
		51
		52	fi
		53
		54	+
		55	+pkg_failed=no
		56	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API" >&5
		57	+$as_echo_n "checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API... " >&6; }
		58	+
		59	+if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"; then
		60	+ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"
		61	+ elif test -n "$PKG_CONFIG"; then
		62	+ if test -n "$PKG_CONFIG" && \
		63	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5
		64	+ ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5
		65	+ ac_status=$?
		66	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
		67	+ test $ac_status = 0; }; then
		68	+ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.29.0" 2>/dev/null`
		69	+ test "x$?" != "x0" && pkg_failed=yes
		70	+else
		71	+ pkg_failed=yes
		72	+fi
		73	+ else
		74	+ pkg_failed=untried
		75	+fi
		76	+if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"; then
		77	+ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"
		78	+ elif test -n "$PKG_CONFIG"; then
		79	+ if test -n "$PKG_CONFIG" && \
		80	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5
		81	+ ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5
		82	+ ac_status=$?
		83	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
		84	+ test $ac_status = 0; }; then
		85	+ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=`$PKG_CONFIG --libs "poppler >= 0.29.0" 2>/dev/null`
		86	+ test "x$?" != "x0" && pkg_failed=yes
		87	+else
		88	+ pkg_failed=yes
		89	+fi
		90	+ else
		91	+ pkg_failed=untried
		92	+fi
		93	+
		94	+
		95	+
		96	+if test $pkg_failed = yes; then
		97	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
		98	+$as_echo "no" >&6; }
		99	+
		100	+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
		101	+ _pkg_short_errors_supported=yes
		102	+else
		103	+ _pkg_short_errors_supported=no
		104	+fi
		105	+ if test $_pkg_short_errors_supported = yes; then
		106	+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1`
		107	+ else
		108	+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1`
		109	+ fi
		110	+ # Put the nasty error message in config.log where it belongs
		111	+ echo "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS" >&5
		112	+
		113	+ popplernewernewcolorspaceapi=no
114	+elif test $pkg_failed = untried; then
115	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
116	+$as_echo "no" >&6; }
117	+ popplernewernewcolorspaceapi=no
118	+else
119	+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
120	+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
121	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
122	+$as_echo "yes" >&6; }
123	+ popplernewernewcolorspaceapi=yes
124	+fi
125	+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
126	+
127	+$as_echo "#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1" >>confdefs.h
128	+
129	+fi
130	+
131	# Poppler's b604a008 commit changes this
132	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Poppler's GfxPatch no longer uses GfxColor" >&5
133	$as_echo_n "checking whether Poppler's GfxPatch no longer uses GfxColor... " >&6; }

Line 0 Link Here

(-)graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp (+83 lines)
		1	=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
		2	--- src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-03 15:44:09 +0000
		3	+++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-10 20:32:30 +0000
		4	@@ -860,7 +860,9 @@
		5	blendingColorSpace = NULL;
		6	isolated = knockout = gFalse;
		7	if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
		8	-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		9	+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
		10	+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
		11	+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		12	blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
		13	#elif defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
		14	blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
		15	@@ -1085,7 +1087,13 @@
		16
		17	state->setFillPattern(NULL);
		18	res->lookupColorSpace(args[0].getName(), &obj);
		19	-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		20	+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
		21	+ if (obj.isNull()) {
		22	+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
		23	+ } else {
		24	+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
		25	+ }
		26	+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		27	if (obj.isNull()) {
		28	colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
		29	} else {
		30	@@ -1126,7 +1134,13 @@
		31
		32	state->setStrokePattern(NULL);
		33	res->lookupColorSpace(args[0].getName(), &obj);
		34	-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		35	+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
		36	+ if (obj.isNull()) {
		37	+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
		38	+ } else {
		39	+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
		40	+ }
		41	+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		42	if (obj.isNull()) {
		43	colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
		44	} else {
		45	@@ -2756,8 +2770,10 @@
		46	}
		47	}
		48	if (!obj1.isNull()) {
		49	-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		50	- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
		51	+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
		52	+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
		53	+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		54	+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
		55	#elif defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
		56	colorSpace = GfxColorSpace::parse(&obj1, NULL);
		57	#else
		58	@@ -2847,8 +2863,10 @@
		59	obj2.free();
		60	}
		61	}
		62	-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
		63	- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
		64	+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
65	+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
66	+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
67	+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
68	#elif defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
69	maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
70	#else
71	@@ -3040,7 +3058,9 @@
72	if (obj1.dictLookup(const_cast<char>("S"), &obj2)->isName(const_cast<char>("Transparency"))) {
73	transpGroup = gTrue;
74	if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
75	-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
76	+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
77	+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
78	+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
79	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
80	#elif defined(POPPLER_NEW_COLOR_SPACE_API) \|\| defined(POPPLER_NEW_ERRORAPI)
81	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
82
83

Lines 1-15 Link Here

(-)graphics/poppler/files/patch-glib_Makefile.in (-8 / +17 lines)
1	--- glib/Makefile.in.orig 2011-10-03 23:55:25.000000000 +0200	1	--- glib/Makefile.in.orig 2015-01-19 11:51:06.175898921 +0100
2	+++ glib/Makefile.in 2011-10-03 23:56:20.000000000 +0200	2	+++ glib/Makefile.in 2015-01-19 11:51:27.026898915 +0100
3	@@ -84,7 +84,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"	3	@@ -134,7 +134,6 @@
4	LTLIBRARIES = $(lib_LTLIBRARIES)	4	LTLIBRARIES = $(lib_LTLIBRARIES)
5	am__DEPENDENCIES_1 =	5	am__DEPENDENCIES_1 =
6	libpoppler_glib_la_DEPENDENCIES = \	6	libpoppler_glib_la_DEPENDENCIES = \
7	- $(top_builddir)/poppler/libpoppler.la \	7	- $(top_builddir)/poppler/libpoppler.la \
8	$(top_builddir)/poppler/libpoppler-cairo.la \	8	$(top_builddir)/poppler/libpoppler-cairo.la \
9	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \	9	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
10	$(am__DEPENDENCIES_1)	10	am__objects_1 = libpoppler_glib_la-poppler-enums.lo
11	@@ -433,7 +432,7 @@ libpoppler_glib_la_SOURCES = \	11	@@ -553,7 +552,7 @@
12	poppler-private.h	12	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
13		13
14	libpoppler_glib_la_LIBADD = \	14	libpoppler_glib_la_LIBADD = \
15	- $(top_builddir)/poppler/libpoppler.la \	15	- $(top_builddir)/poppler/libpoppler.la \
Lines 16-19 Link Here
16	+ -lpoppler \	16	+ -lpoppler \
17	$(top_builddir)/poppler/libpoppler-cairo.la \	17	$(top_builddir)/poppler/libpoppler-cairo.la \
18	$(POPPLER_GLIB_LIBS) \	18	$(POPPLER_GLIB_LIBS) \
19	$(FREETYPE_LIBS) \	19	$(FREETYPE_LIBS)
		20	@@ -576,7 +575,7 @@
		21	@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)
		22	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
		23	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
		24	-@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
		25	+@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la
		26	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files)
		27	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
		28	@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib

Lines 1-101 Link Here

(-)graphics/poppler/files/patch-utils_Makefile.in (-60 / +64 lines)
1	--- utils/Makefile.in.orig 2014-11-25 11:49:19 UTC	1	--- utils/Makefile.in.orig 2014-11-04 18:46:22 UTC
2	+++ utils/Makefile.in	2	+++ utils/Makefile.in
3	@@ -111,7 +111,7 @@	3	@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS)
4	am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)	4	am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
5	pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)	5	pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
6	pdfdetach_LDADD = $(LDADD)	6	pdfdetach_LDADD = $(LDADD)
7	-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	7	-pdfdetach_DEPENDENCIES = libparseargs.la \
8	+pdfdetach_DEPENDENCIES =	8	- $(top_builddir)/poppler/libpoppler.la
9	AM_V_lt = $(am__v_lt_@AM_V@)	9	+pdfdetach_DEPENDENCIES = libparseargs.la
10	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)	10	am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
11	am__v_lt_0 = --silent
12	@@ -119,31 +119,31 @@
13	am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
14	pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)	11	pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
15	pdffonts_LDADD = $(LDADD)	12	pdffonts_LDADD = $(LDADD)
16	-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	13	-pdffonts_DEPENDENCIES = libparseargs.la \
17	+pdffonts_DEPENDENCIES =	14	- $(top_builddir)/poppler/libpoppler.la
		15	+pdffonts_DEPENDENCIES = libparseargs.la
18	am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \	16	am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
19	JSInfo.$(OBJEXT) $(am__objects_1)	17	JSInfo.$(OBJEXT)
20	pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)	18	pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
21	pdfimages_LDADD = $(LDADD)	19	pdfimages_LDADD = $(LDADD)
22	-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	20	-pdfimages_DEPENDENCIES = libparseargs.la \
23	+pdfimages_DEPENDENCIES =	21	- $(top_builddir)/poppler/libpoppler.la
		22	+pdfimages_DEPENDENCIES = libparseargs.la
24	am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \	23	am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
25	JSInfo.$(OBJEXT) $(am__objects_1)	24	JSInfo.$(OBJEXT)
26	pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)	25	pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
27	pdfinfo_LDADD = $(LDADD)	26	pdfinfo_LDADD = $(LDADD)
28	-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	27	-pdfinfo_DEPENDENCIES = libparseargs.la \
29	+pdfinfo_DEPENDENCIES =	28	- $(top_builddir)/poppler/libpoppler.la
30	am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)	29	+pdfinfo_DEPENDENCIES = libparseargs.la
		30	am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
31	pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)	31	pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
32	pdfseparate_LDADD = $(LDADD)	32	pdfseparate_LDADD = $(LDADD)
33	-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	33	-pdfseparate_DEPENDENCIES = libparseargs.la \
34	+pdfseparate_DEPENDENCIES =	34	- $(top_builddir)/poppler/libpoppler.la
35	am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h	35	+pdfseparate_DEPENDENCIES = libparseargs.la
36	@BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \	36	am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
37	@BUILD_CAIRO_OUTPUT_TRUE@ $(am__objects_1)	37	pdftocairo-pdftocairo-win32.$(OBJEXT)
38	pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)	38	pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
39	-am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la	39	-am__DEPENDENCIES_1 = libparseargs.la \
40	+am__DEPENDENCIES_1 =	40	- $(top_builddir)/poppler/libpoppler.la
		41	+am__DEPENDENCIES_1 = libparseargs.la
41	am__DEPENDENCIES_2 =	42	am__DEPENDENCIES_2 =
42	@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \	43	@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \
43	@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)	44	@BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)
44	am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)	45	am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
45	-@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \	46	-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
46	+@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \	47	+pdftocairo_DEPENDENCIES = \
47	@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) \	48	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
48	@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_4) \	49	$(am__DEPENDENCIES_2)
49	@BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_2)	50	am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
50	@@ -153,7 +153,7 @@	51	@@ -166,31 +160,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
51	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)	52	pdftohtml-HtmlOutputDev.$(OBJEXT)
52	pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)	53	pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
53	pdftohtml_LDADD = $(LDADD)	54	pdftohtml_LDADD = $(LDADD)
54	-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	55	-pdftohtml_DEPENDENCIES = libparseargs.la \
55	+pdftohtml_DEPENDENCIES =	56	- $(top_builddir)/poppler/libpoppler.la
		57	+pdftohtml_DEPENDENCIES = libparseargs.la
56	pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \	58	pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
57	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \	59	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
58	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@	60	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
59	@@ -162,20 +162,20 @@	61	am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
60	@BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1)
61	pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)	62	pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
62	pdftoppm_LDADD = $(LDADD)	63	pdftoppm_LDADD = $(LDADD)
63	-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	64	-pdftoppm_DEPENDENCIES = libparseargs.la \
64	+pdftoppm_DEPENDENCIES =	65	- $(top_builddir)/poppler/libpoppler.la
65	am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)	66	+pdftoppm_DEPENDENCIES = libparseargs.la
		67	am_pdftops_OBJECTS = pdftops.$(OBJEXT)
66	pdftops_OBJECTS = $(am_pdftops_OBJECTS)	68	pdftops_OBJECTS = $(am_pdftops_OBJECTS)
67	pdftops_LDADD = $(LDADD)	69	pdftops_LDADD = $(LDADD)
68	-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	70	-pdftops_DEPENDENCIES = libparseargs.la \
69	+pdftops_DEPENDENCIES =	71	- $(top_builddir)/poppler/libpoppler.la
70	am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \	72	+pdftops_DEPENDENCIES = libparseargs.la
71	$(am__objects_1)	73	am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
72	pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)	74	pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
73	pdftotext_LDADD = $(LDADD)	75	pdftotext_LDADD = $(LDADD)
74	-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	76	-pdftotext_DEPENDENCIES = libparseargs.la \
75	+pdftotext_DEPENDENCIES =	77	- $(top_builddir)/poppler/libpoppler.la
76	am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)	78	+pdftotext_DEPENDENCIES = libparseargs.la
		79	am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
77	pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)	80	pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
78	pdfunite_LDADD = $(LDADD)	81	pdfunite_LDADD = $(LDADD)
79	-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la	82	-pdfunite_DEPENDENCIES = libparseargs.la \
80	+pdfunite_DEPENDENCIES =	83	- $(top_builddir)/poppler/libpoppler.la
		84	+pdfunite_DEPENDENCIES = libparseargs.la
81	AM_V_P = $(am__v_P_@AM_V@)	85	AM_V_P = $(am__v_P_@AM_V@)
82	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)	86	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
83	am__v_P_0 = false	87	am__v_P_0 = false
84	@@ -516,7 +516,7 @@	88	@@ -527,7 +516,7 @@ AM_CPPFLAGS = \
85	$(PDFTOCAIRO_CFLAGS)
86		89
87	LDADD = \	90	LDADD = \
		91	libparseargs.la \
88	- $(top_builddir)/poppler/libpoppler.la \	92	- $(top_builddir)/poppler/libpoppler.la \
89	+ -lpoppler \	93	+ -lpoppler \
90	$(UTILS_LIBS)	94	$(UTILS_LIBS)
91		95
92	@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \	96	@BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
93	@@ -524,7 +524,7 @@	97	@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \
94	@BUILD_CAIRO_OUTPUT_TRUE@ $(common)	98	pdftocairo-win32.h
95		99
96	@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \	100	pdftocairo_LDADD = \
97	-@BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \	101	- $(top_builddir)/poppler/libpoppler-cairo.la \
98	+@BUILD_CAIRO_OUTPUT_TRUE@ -lpoppler-glib \	102	+ -lpoppler-glib \
99	@BUILD_CAIRO_OUTPUT_TRUE@ $(LDADD) \	103	$(LDADD) \
100	@BUILD_CAIRO_OUTPUT_TRUE@ $(PDFTOCAIRO_LIBS) \	104	$(PDFTOCAIRO_LIBS) \
101	@BUILD_CAIRO_OUTPUT_TRUE@ $(PTHREAD_LIBS)	105	$(PTHREAD_LIBS)