cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to poppler-0.22.0.

Browse Source 
ok ajacoutot@ landry@
This commit is contained in:
kili 2013-01-21 19:08:00 +00:00
parent f5a8f64b62
commit 73d60475aa
5 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
print/poppler/Makefile
View File

@ -1,28 +1,24 @@
# $OpenBSD: Makefile,v 1.70 2012/11/05 19:32:27 kili Exp $
# $OpenBSD: Makefile,v 1.71 2013/01/21 19:08:00 kili Exp $
COMMENT-main= PDF rendering library
COMMENT-qt= qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
V= 0.20.5
V= 0.22.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
REVISION-main= 0
PKGNAME-utils= poppler-utils-$V
REVISION-utils= 0
PKGNAME-qt= poppler-qt-$V
REVISION-qt= 0
PKGNAME-qt4= poppler-qt4-$V
REVISION-qt4= 0
OLDSHIT = poppler-0.16.7
SHARED_LIBS += poppler 15.0 # 28.0
SHARED_LIBS += poppler-glib 11.0 # 12.0
SHARED_LIBS += poppler-qt 10.0 # 3.0
SHARED_LIBS += poppler-qt4 11.0 # 4.0
SHARED_LIBS += poppler-cpp 3.0 # 2.0
SHARED_LIBS += poppler 16.0 # 34.0
SHARED_LIBS += poppler-glib 12.0 # 14.0
SHARED_LIBS += poppler-qt 11.0 # 3.0
SHARED_LIBS += poppler-qt4 12.0 # 6.0
SHARED_LIBS += poppler-cpp 4.0 # 2.0
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
@ -83,17 +79,17 @@ LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
LIB_DEPENDS-utils=${MODGETTEXT_LIB_DEPENDS} \
print/poppler
WANTLIB-main= ${cWANTLIB} Xext Xfixes ffi \
glib-2.0 gobject-2.0 gthread-2.0 \
WANTLIB-main= ${cWANTLIB} Xext ffi \
gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
pixman-1 openjpeg \
X11 Xau Xdamage Xdmcp Xrender cairo pcre png \
pthread-stubs xcb xcb-render lcms2 GL Xxf86vm \
drm xcb-shm ${MODGETTEXT_WANTLIB}
X11 Xau Xdmcp Xrender cairo pcre png \
pthread-stubs xcb xcb-render lcms2 \
xcb-shm ${MODGETTEXT_WANTLIB}
WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png ${MODQT3_WANTLIB}
WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 Xext Xi \
Xinerama Xrender lcms2 openjpeg png poppler QtCore QtGui QtXml
WANTLIB-utils= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm \
c cairo drm expat ffi fontconfig freetype glib-2.0 \
WANTLIB-utils= X11 Xau Xdmcp Xext Xrender \
c cairo expat ffi fontconfig freetype glib-2.0 \
gobject-2.0 gthread-2.0 jpeg lcms2 m pcre pixman-1 png \
pthread pthread-stubs stdc++ tiff xcb xcb-render xcb-shm \
openjpeg poppler z ${cWANTLIB} ${MODGETTEXT_WANTLIB}

4
print/poppler/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
SHA256 (poppler-0.20.5.tar.gz) = xtcEil8BHb3h9XnSG8/dZStHLZ0cYH3emqie/5YEVLY=
SHA256 (poppler-0.22.0.tar.gz) = hGhFCRwtEl9bYDaA1ieoAHmoK5PRmfNMxJc2utXVueY=
SIZE (poppler-0.16.7.tar.gz) = 1952179
SIZE (poppler-0.20.5.tar.gz) = 2158387
SIZE (poppler-0.22.0.tar.gz) = 2210986

14
print/poppler/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.4 2012/07/13 15:03:19 kili Exp $
--- configure.ac.orig Sun Jun 10 20:40:14 2012
+++ configure.ac Mon Jul 9 14:49:52 2012
@@ -564,6 +564,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
$OpenBSD: patch-configure_ac,v 1.5 2013/01/21 19:08:00 kili Exp $
--- configure.ac.orig Sat Dec 29 19:45:50 2012
+++ configure.ac Fri Jan 18 19:23:07 2013
@@ -565,6 +565,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2012/07/13 15:03:19 kili Exp $
dnl
dnl Try Qt4
dnl
@@ -596,7 +614,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
@@ -597,7 +615,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
AC_SUBST(POPPLER_QT4_TEST_LIBS)
if test x$enable_poppler_qt4 = xyes; then
@ -35,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2012/07/13 15:03:19 kili Exp $
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
@@ -782,6 +800,9 @@ glib/reference/Makefile
@@ -783,6 +801,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2012/07/13 15:03:19 kili Exp $
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
@@ -808,6 +829,7 @@ echo "Building poppler with support for:"
@@ -809,6 +830,7 @@ echo "Building poppler with support for:"
echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
echo " cairo output: $use_cairo"

8
print/poppler/patches/patch-poppler_XRef_cc
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.10 2012/09/27 18:45:34 ajacoutot Exp $
--- poppler/XRef.cc.orig Sun Sep 9 23:33:55 2012
+++ poppler/XRef.cc Thu Sep 27 18:19:11 2012
@@ -945,49 +945,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa
$OpenBSD: patch-poppler_XRef_cc,v 1.11 2013/01/21 19:08:00 kili Exp $
--- poppler/XRef.cc.orig Fri Dec 28 01:17:03 2012
+++ poppler/XRef.cc Fri Jan 18 19:23:05 2013
@@ -976,49 +976,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {

5
print/poppler/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.16 2012/07/13 15:03:19 kili Exp $
@comment $OpenBSD: PLIST-main,v 1.17 2013/01/21 19:08:00 kili Exp $
@conflict poppler-qt-<0.5.4p0
@pkgpath print/poppler
%%SHARED%%
@ -63,6 +63,7 @@ include/poppler/StdinPDFDocBuilder.h
include/poppler/Stream-CCITT.h
include/poppler/Stream.h
include/poppler/TextOutputDev.h
include/poppler/UTF.h
include/poppler/UTF8.h
include/poppler/UnicodeCClassTables.h
include/poppler/UnicodeCompTables.h
@ -120,6 +121,7 @@ include/poppler/goo/PNGWriter.h
include/poppler/goo/TiffWriter.h
include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
include/poppler/goo/grandom.h
include/poppler/goo/gstrtod.h
include/poppler/goo/gtypes.h
include/poppler/poppler-config.h
@ -180,6 +182,7 @@ share/gtk-doc/html/poppler/api-index-0-14.html
share/gtk-doc/html/poppler/api-index-0-16.html
share/gtk-doc/html/poppler/api-index-0-18.html
share/gtk-doc/html/poppler/api-index-0-20.html
share/gtk-doc/html/poppler/api-index-0-22.html
share/gtk-doc/html/poppler/api-index-deprecated.html
share/gtk-doc/html/poppler/api-index-full.html
share/gtk-doc/html/poppler/ch01.html