pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: manu
Date: Fri Jun 23 07:12:19 UTC 2017
Modified Files:
pkgsrc/converters: Makefile
pkgsrc/doc: CHANGES-2017
Added Files:
pkgsrc/converters/wkhtmltopdf: DESCR Makefile PLIST distinfo
pkgsrc/converters/wkhtmltopdf/patches:
patch-qt_config.tests_mac_dwarf2.test patch-qt_configure
patch-qt_mkspecs_netbsd-g++_qmake.conf
Log Message:
Add wkhtmltopdf 0.12.4
wkhtmltopdf and wkhtmltoimage are open source (LGPLv3) command line
tools to render HTML into PDF and various image formats using the
Qt WebKit rendering engine. These run entirely "headless" and do
not require a display or display service.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 pkgsrc/converters/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/converters/wkhtmltopdf/DESCR \
pkgsrc/converters/wkhtmltopdf/Makefile \
pkgsrc/converters/wkhtmltopdf/PLIST \
pkgsrc/converters/wkhtmltopdf/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/converters/wkhtmltopdf/patches/patch-qt_config.tests_mac_dwarf2.test \
pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure \
pkgsrc/converters/wkhtmltopdf/patches/patch-qt_mkspecs_netbsd-g++_qmake.conf
cvs rdiff -u -r1.2568 -r1.2569 pkgsrc/doc/CHANGES-2017
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/converters/Makefile
diff -u pkgsrc/converters/Makefile:1.154 pkgsrc/converters/Makefile:1.155
--- pkgsrc/converters/Makefile:1.154 Sun May 28 13:25:53 2017
+++ pkgsrc/converters/Makefile Fri Jun 23 07:12:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2017/05/28 13:25:53 mef Exp $
+# $NetBSD: Makefile,v 1.155 2017/06/23 07:12:19 manu Exp $
#
COMMENT= Document format and character code converters
@@ -127,6 +127,7 @@ SUBDIR+= txt2pdbdoc
SUBDIR+= unix2dos
SUBDIR+= uudeview
SUBDIR+= uulib
+SUBDIR+= wkhtmltopdf
SUBDIR+= wv
SUBDIR+= wv2
SUBDIR+= xdeview
Index: pkgsrc/doc/CHANGES-2017
diff -u pkgsrc/doc/CHANGES-2017:1.2568 pkgsrc/doc/CHANGES-2017:1.2569
--- pkgsrc/doc/CHANGES-2017:1.2568 Fri Jun 23 03:45:24 2017
+++ pkgsrc/doc/CHANGES-2017 Fri Jun 23 07:12:19 2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.2568 2017/06/23 03:45:24 schmonz Exp $
+$NetBSD: CHANGES-2017,v 1.2569 2017/06/23 07:12:19 manu Exp $
Changes to the packages collection and infrastructure in 2017:
@@ -3558,3 +3558,4 @@ Changes to the packages collection and i
Updated www/drupal7 to 7.56 [taca 2017-06-22]
Updated net/djbdns to 1.05nb11 [schmonz 2017-06-22]
Updated security/stunnel to 5.41 [schmonz 2017-06-23]
+ Added converters/wkhtmltopdf 0.12.4 [manu 2017-06-23]
Added files:
Index: pkgsrc/converters/wkhtmltopdf/DESCR
diff -u /dev/null pkgsrc/converters/wkhtmltopdf/DESCR:1.1
--- /dev/null Fri Jun 23 07:12:19 2017
+++ pkgsrc/converters/wkhtmltopdf/DESCR Fri Jun 23 07:12:19 2017
@@ -0,0 +1,4 @@
+wkhtmltopdf and wkhtmltoimage are open source (LGPLv3) command line
+tools to render HTML into PDF and various image formats using the
+Qt WebKit rendering engine. These run entirely "headless" and do
+not require a display or display service.
Index: pkgsrc/converters/wkhtmltopdf/Makefile
diff -u /dev/null pkgsrc/converters/wkhtmltopdf/Makefile:1.1
--- /dev/null Fri Jun 23 07:12:19 2017
+++ pkgsrc/converters/wkhtmltopdf/Makefile Fri Jun 23 07:12:19 2017
@@ -0,0 +1,63 @@
+# $NetBSD: Makefile,v 1.1 2017/06/23 07:12:19 manu Exp $
+
+DISTNAME= wkhtmltox-0.12.4
+PKGNAME= wkhtmltopdf-0.12.4
+MASTER_SITES= ${MASTER_SITE_GITHUB:=wkhtmltopdf/}
+GITHUB_PROJECT= wkhtmltopdf
+GITHUB_RELEASE= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .tar.bz2
+
+CATEGORIES= www print converters
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://wkhtmltopdf.org/
+COMMENT= Command line tools to render HTML into PDF
+LICENSE= gnu-lgpl-v3
+
+USE_LANGUAGES+= c c++
+USE_TOOLS+= perl
+#USE_LIBTOOL= yes
+CHECK_SHLIBS_SUPPORTED= no # until libtool
+
+SUBST_CLASSES+= x11
+SUBST_MESSAGE.x11= Fixing x11 options.
+SUBST_STAGE.x11= pre-configure
+SUBST_FILES.x11+= qt/mkspecs/netbsd-g++/qmake.conf
+SUBST_SED.x11= -e 's,@X11BASE@,${X11BASE},g'
+
+
+do-configure:
+ for f in `find ${WRKSRC} -type f -name '*.py' -print`; do \
+ cp $$f $$f.orig && \
+ sed '1s|^#!.*$$|#!${PYTHONBIN}|' $$f.orig > $$f; \
+ done
+
+do-build:
+ cd ${WRKSRC} && ${PYTHONBIN} scripts/build.py posix-local -debug
+
+WKHTMLTOX_BUILD=${WRKSRC}/static-build/posix-local-dbg/${DISTNAME}
+WKHTMLTOX_BIN=${DESTDIR}${PREFIX}/bin
+WKHTMLTOX_DATA=${DESTDIR}${PREFIX}/include/wkhtmltox
+WKHTMLTOX_LIB=${DESTDIR}${PREFIX}/lib
+do-install:
+ ${INSTALL_PROGRAM_DIR} ${WKHTMLTOX_BIN}
+.for b in bin/wkhtmltoimage bin/wkhtmltopdf
+ ${INSTALL_PROGRAM} ${WKHTMLTOX_BUILD}/${b} ${WKHTMLTOX_BIN}
+.endfor
+ ${INSTALL_DATA_DIR} ${WKHTMLTOX_DATA}
+.for h in include/wkhtmltox/image.h include/wkhtmltox/pdf.h
+ ${INSTALL_DATA} ${WKHTMLTOX_BUILD}/${h} ${WKHTMLTOX_DATA}
+.endfor
+ ${INSTALL_LIB_DIR} ${WKHTMLTOX_LIB}
+.for l in lib/libwkhtmltox.so.0.12.4
+ ${INSTALL_LIB} ${WKHTMLTOX_BUILD}/${l} ${WKHTMLTOX_LIB}
+.endfor
+ cd ${WKHTMLTOX_LIB} && \
+ ln -sf libwkhtmltox.so.0.12.4 libwkhtmltox.so.0.1 && \
+ ln -sf libwkhtmltox.so.0.12.4 libwkhtmltox.so.0
+
+.include "../../lang/python/application.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/converters/wkhtmltopdf/PLIST
diff -u /dev/null pkgsrc/converters/wkhtmltopdf/PLIST:1.1
--- /dev/null Fri Jun 23 07:12:19 2017
+++ pkgsrc/converters/wkhtmltopdf/PLIST Fri Jun 23 07:12:19 2017
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.1 2017/06/23 07:12:19 manu Exp $
+bin/wkhtmltoimage
+bin/wkhtmltopdf
+include/wkhtmltox/image.h
+include/wkhtmltox/pdf.h
+lib/libwkhtmltox.so.0.12.4
+lib/libwkhtmltox.so.0.1
+lib/libwkhtmltox.so.0
Index: pkgsrc/converters/wkhtmltopdf/distinfo
diff -u /dev/null pkgsrc/converters/wkhtmltopdf/distinfo:1.1
--- /dev/null Fri Jun 23 07:12:19 2017
+++ pkgsrc/converters/wkhtmltopdf/distinfo Fri Jun 23 07:12:19 2017
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2017/06/23 07:12:19 manu Exp $
+
+SHA1 (wkhtmltox-0.12.4.tar.bz2) = 6a0ca9b01d5e37af3fb451bbd934afff43cf26ae
+RMD160 (wkhtmltox-0.12.4.tar.bz2) = 665abd76618cdfac27585e62caa52b33d09990fa
+SHA512 (wkhtmltox-0.12.4.tar.bz2) = 1526c6138d6276d0f6188737a67848b8ae9c16016c119eb00bbdaf7159464f8799c53ca9a997ea40eea4c2d1cadc35a10607564949fd39a3b7b7e6745a3dbdcb
+Size (wkhtmltox-0.12.4.tar.bz2) = 36355721 bytes
+SHA1 (patch-qt_config.tests_mac_dwarf2.test) = efabd53a31dc69feac1bc2767c801fab5514a447
+SHA1 (patch-qt_configure) = e13eb806e11a88a20650fc62d38d162145eaabae
+SHA1 (patch-qt_mkspecs_netbsd-g++_qmake.conf) = 508b1f25735d3a8f29a1da08a988f608186751bf
Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_config.tests_mac_dwarf2.test
diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_config.tests_mac_dwarf2.test:1.1
--- /dev/null Fri Jun 23 07:12:19 2017
+++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_config.tests_mac_dwarf2.test Fri Jun 23 07:12:19 2017
@@ -0,0 +1,28 @@
+$NetBSD: patch-qt_config.tests_mac_dwarf2.test,v 1.1 2017/06/23 07:12:19 manu Exp $
+
+Fix == operator in shell script
+
+--- qt/config.tests/mac/dwarf2.test.orig 2017-06-20 10:23:31.000000000 +0200
++++ qt/config.tests/mac/dwarf2.test 2017-06-20 10:23:51.000000000 +0200
+@@ -40,9 +40,9 @@
+ # Test for xcode 2.4.0, which has a broken implementation of DWARF
+ "$COMPILER" $WORKDIR/xcodeversion.cpp $CXXFLAGS $LFLAGS -o xcodeversion -framework Carbon;
+ ./xcodeversion
+
+-if [ "$?" == "1" ]; then
++if [ "$?" = "1" ]; then
+ DWARF2_SUPPORT_BROKEN=yes
+ fi
+
+ rm xcodeversion
+@@ -51,9 +51,9 @@
+ if [ "$DWARF2_SUPPORT" != "yes" ]; then
+ [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled."
+ exit 0
+ else
+- if [ "$DWARF2_SUPPORT_BROKEN" == "yes" ]; then
++ if [ "$DWARF2_SUPPORT_BROKEN" = "yes" ]; then
+ [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols disabled."
+ exit 0
+ else
+ [ "$VERBOSE" = "yes" ] && echo "DWARF2 debug symbols enabled."
Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure
diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure:1.1
--- /dev/null Fri Jun 23 07:12:19 2017
+++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_configure Fri Jun 23 07:12:19 2017
@@ -0,0 +1,37 @@
+$NetBSD: patch-qt_configure,v 1.1 2017/06/23 07:12:19 manu Exp $
+
+Fix == operator in shell script
+
+--- qt/configure.orig 2017-06-20 10:22:29.000000000 +0200
++++ qt/configure 2017-06-20 10:23:03.000000000 +0200
+@@ -3570,9 +3570,9 @@
+ # with the default mkspec. The 10.4u SDK does not support gcc 4.2.
+ if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
+ # get the darwin version. 10.0.0 and up means snow leopard.
+ VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
+- if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ] && [ "$PLATFORM" == "macx-g++" ]; then
++ if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ] && [ "$PLATFORM" = "macx-g++" ]; then
+ echo
+ echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
+ echo
+ fi
+@@ -7202,17 +7202,17 @@
+
+ # select Carbon on 10.4 Tiger.
+ if [ "$PLATFORM_MAC" = "yes" ]; then
+ VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
+- if [ "$VERSION" == 8 ]; then
++ if [ "$VERSION" = 8 ]; then
+ CFG_MAC_COCOA="no";
+ CFG_MAC_CARBON="yes";
+ fi
+ fi
+
+ # select Carbon when using the 10.4u SDK
+ if [ "$PLATFORM_MAC" = "yes" ] && [ -n "$CFG_SDK" ]; then
+- if [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ]; then
++ if [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ]; then
+ echo "Carbon on";
+ CFG_MAC_COCOA="no";
+ CFG_MAC_CARBON="yes";
+ fi
Index: pkgsrc/converters/wkhtmltopdf/patches/patch-qt_mkspecs_netbsd-g++_qmake.conf
diff -u /dev/null pkgsrc/converters/wkhtmltopdf/patches/patch-qt_mkspecs_netbsd-g++_qmake.conf:1.1
--- /dev/null Fri Jun 23 07:12:19 2017
+++ pkgsrc/converters/wkhtmltopdf/patches/patch-qt_mkspecs_netbsd-g++_qmake.conf Fri Jun 23 07:12:19 2017
@@ -0,0 +1,30 @@
+$NetBSD: patch-qt_mkspecs_netbsd-g++_qmake.conf,v 1.1 2017/06/23 07:12:19 manu Exp $
+
+Use /usr/X11R7 instead of /usr/X11R6
+
+--- qt/mkspecs/netbsd-g++/qmake.conf.orig 2016-08-23 06:13:29.000000000 +0000
++++ qt/mkspecs/netbsd-g++/qmake.conf 2017-06-22 00:00:14.000000000 +0000
+@@ -37,19 +37,19 @@
+ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
+
+ QMAKE_INCDIR = /usr/local/include
+ QMAKE_LIBDIR = /usr/local/lib
+-QMAKE_INCDIR_X11 = /usr/X11R6/include
+-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
++QMAKE_INCDIR_X11 = @X11BASE@/include
++QMAKE_LIBDIR_X11 = @X11BASE@/lib
+ QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+ QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
++QMAKE_INCDIR_OPENGL = @X11BASE@/include
++QMAKE_LIBDIR_OPENGL = @X11BASE@/lib
+
+ QMAKE_LINK = g++
+ QMAKE_LINK_SHLIB = g++
+ QMAKE_LINK_C = gcc
+ QMAKE_LINK_C_SHLIB = gcc
+ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
+ QMAKE_LFLAGS =
+ QMAKE_LFLAGS_RELEASE =
+ QMAKE_LFLAGS_DEBUG =
Home |
Main Index |
Thread Index |
Old Index