pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wkhtmltopdf: remove
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Fri Jan 31 16:27:57 2025 +0100
Changeset: eb2a00bc37e92ec5bf3fa12f6ff98e61e052b37c
Modified Files:
Makefile
Removed Files:
wkhtmltopdf/DESCR
wkhtmltopdf/Makefile
wkhtmltopdf/PLIST
wkhtmltopdf/distinfo
wkhtmltopdf/patches/patch-qt_mkspecs_solaris-g++-64_qmake.conf
wkhtmltopdf/patches/patch-qt_src_3rdparty_sqlite_sqlite3.c
wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp
wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp
wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h
wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h
wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h
wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h
Log Message:
wkhtmltopdf: remove
pkgsrc version is newer
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eb2a00bc37e92ec5bf3fa12f6ff98e61e052b37c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
wkhtmltopdf/DESCR | 4 -
wkhtmltopdf/Makefile | 99 ----------------------
wkhtmltopdf/PLIST | 13 ---
wkhtmltopdf/distinfo | 12 ---
.../patch-qt_mkspecs_solaris-g++-64_qmake.conf | 14 ---
.../patches/patch-qt_src_3rdparty_sqlite_sqlite3.c | 14 ---
...urce_JavaScriptCore_heap_MachineStackMarker.cpp | 14 ---
...y_webkit_Source_JavaScriptCore_jit_JITStubs.cpp | 15 ----
...y_webkit_Source_JavaScriptCore_wtf_MathExtras.h | 14 ---
...rty_webkit_Source_JavaScriptCore_wtf_Platform.h | 13 ---
...y_webkit_Source_JavaScriptCore_wtf_StringImpl.h | 14 ---
...ty_webkit_Source_JavaScriptCore_wtf_Threading.h | 14 ---
13 files changed, 241 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 90733668c5..b195cdc38d 100644
--- a/Makefile
+++ b/Makefile
@@ -5929,7 +5929,6 @@ SUBDIR+= wise3
SUBDIR+= witchblast
SUBDIR+= with-editor
SUBDIR+= wjelement
-SUBDIR+= wkhtmltopdf
SUBDIR+= wl-git
SUBDIR+= wl-snapshot
SUBDIR+= wla-dx
diff --git a/wkhtmltopdf/DESCR b/wkhtmltopdf/DESCR
deleted file mode 100644
index 4e1e3e9ed1..0000000000
--- a/wkhtmltopdf/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-wkhtmltopdf and wkhtmltoimage are open source (LGPL) 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.
diff --git a/wkhtmltopdf/Makefile b/wkhtmltopdf/Makefile
deleted file mode 100644
index 00d6a706f0..0000000000
--- a/wkhtmltopdf/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2015/08/17 15:34:47 fhajny Exp $
-
-DISTNAME= wkhtmltox-0.12.2.1
-PKGNAME= ${DISTNAME:S/tox/topdf/}
-CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_GITHUB:=wkhtmltopdf/}
-MASTER_SITES= http://download.gna.org/wkhtmltopdf/0.12/${PKGVERSION_NOREV}/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= zecrazytux%zecrazytux.net@localhost
-HOMEPAGE= https://wkhtmltopdf.org/
-COMMENT= Render HTML into PDF and image formats using QT Webkit
-LICENSE= gnu-lgpl-v3
-
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++ c99
-USE_TOOLS+= pax perl pkg-config
-
-HAS_CONFIGURE= yes
-
-CHECK_PORTABILITY_SKIP= *
-
-SUBST_CLASSES+= man
-SUBST_STAGE.man= post-patch
-SUBST_MESSAGE.man= Fixin man page location
-SUBST_FILES.man= src/image/image.pro src/pdf/pdf.pro
-SUBST_SED.man= -e 's,share/man,${PKGMANDIR},g'
-
-CONFIGURE_DIRS= build/qt
-BUILD_DIRS= build/qt
-INSTALL_DIRS= build/app
-
-CONFIGURE_SCRIPT= ../../qt/configure
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
-CONFIGURE_ARGS+= -platform solaris-g++-64
-.elif !empty(MACHINE_PLATFORM:MSunOS-*-i386)
-CONFIGURE_ARGS+= -platform solaris-g++
-.endif
-
-CONFIGURE_ARGS+= \
- --prefix=${WRKSRC}/build/qt \
- -v -confirm-license -opensource -release -silent \
- -exceptions -fast -largefile -graphicssystem raster -static
-
-# Features and dependencies
-CONFIGURE_ARGS+= \
- -fontconfig -iconv -openssl -webkit -xmlpatterns -xrender \
- -system-freetype -system-libjpeg -system-libpng -system-zlib
-
-# Features we don't need/want
-CONFIGURE_ARGS+= \
- -no-3dnow -no-accessibility -no-audio-backend -no-avx -no-cups -no-dbus \
- -no-declarative -no-glib -no-gstreamer -no-gtkstyle -no-libmng \
- -no-libtiff -no-mitshm -no-mmx -no-multimedia -no-nas-sound -no-neon \
- -no-nis -no-opengl -no-openvg -no-pch -no-phonon -no-phonon-backend \
- -no-qt3support -no-rpath -no-script -no-scripttools -no-sm \
- -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite \
- -no-sql-sqlite2 -no-sse -no-sse2 -no-sse3 -no-sse4.1 -no-sse4.2 \
- -no-ssse3 -no-stl -no-xcursor -no-xfixes -no-xinerama -no-xinput \
- -no-xkb -no-xrandr -no-xshape -no-xsync -no-javascript-jit
-
-# Bits we don't build
-CONFIGURE_ARGS+= \
- -nomake demos -nomake docs -nomake examples -nomake tests -nomake tools \
- -nomake translations
-
-# Other tweaks
-CONFIGURE_ARGS+= \
- -D ENABLE_VIDEO=0 -I${PREFIX}/include -I${PREFIX}/include/freetype2
-
-CFLAGS.SunOS+= -D_XPG6
-
-INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}${PREFIX}
-
-PLIST_SUBST+= LIBVERSION=${PKGVERSION_NOREV:C/([0-9]+\.)([0-9]+\.)([0-9]+)\.[0-9]+/\1\2\3/}
-
-pre-configure:
- ${MKDIR} -p ${WRKSRC}/build/app ${WRKSRC}/build/qt
-
-post-build:
- cd ${WRKSRC}/build/app && \
- ${SETENV} WKHTMLTOX_VERSION=${PKGVERSION_NOREV} \
- ../qt/bin/qmake ../../wkhtmltopdf.pro && \
- ${BUILD_MAKE_CMD} ${BUILD_TARGET}
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wkhtmltopdf/PLIST b/wkhtmltopdf/PLIST
deleted file mode 100644
index 51f078ad35..0000000000
--- a/wkhtmltopdf/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2015/08/17 15:34:47 fhajny Exp $
-bin/wkhtmltoimage
-bin/wkhtmltopdf
-include/wkhtmltox/dllbegin.inc
-include/wkhtmltox/dllend.inc
-include/wkhtmltox/image.h
-include/wkhtmltox/pdf.h
-lib/libwkhtmltox.so
-lib/libwkhtmltox.so.0
-lib/libwkhtmltox.so.0.12
-lib/libwkhtmltox.so.${LIBVERSION}
-man/man1/wkhtmltoimage.1
-man/man1/wkhtmltopdf.1
diff --git a/wkhtmltopdf/distinfo b/wkhtmltopdf/distinfo
deleted file mode 100644
index 400207c6e4..0000000000
--- a/wkhtmltopdf/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.5 2015/08/17 15:34:47 fhajny Exp $
-
-RMD160 (wkhtmltox-0.12.2.1.tar.bz2) = b5081626d9f4617ee1b4555d1f0ed7514dbb5771
-Size (wkhtmltox-0.12.2.1.tar.bz2) = 36248626 bytes
-SHA1 (patch-qt_mkspecs_solaris-g++-64_qmake.conf) = d61da21fe0ae9ed29a8f9fefb8e46a8dc7fd6fe3
-SHA1 (patch-qt_src_3rdparty_sqlite_sqlite3.c) = 6c32831ef77792b532c701d8cd049b4743d689a4
-SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 11f8fc8e810c368487be1a4602793efa980bab09
-SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = d48814456e8ed635de9a541b7d733d07bf320cd2
-SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = a35e8ecd2f6d2651744c7a6907744e5aaa8081ee
-SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h) = f8eed33ca51748bbaade830ff7e9bb098833a0df
-SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = 71bad3d443a195af66961bcb0ebda982d608ddd8
-SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = b2569015db79d0ba002444dc799143243cc32fa9
diff --git a/wkhtmltopdf/patches/patch-qt_mkspecs_solaris-g++-64_qmake.conf b/wkhtmltopdf/patches/patch-qt_mkspecs_solaris-g++-64_qmake.conf
deleted file mode 100644
index 98059efafc..0000000000
--- a/wkhtmltopdf/patches/patch-qt_mkspecs_solaris-g++-64_qmake.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-qt_mkspecs_solaris-g++-64_qmake.conf,v 1.1 2014/07/02 21:20:08 fhajny Exp $
-
-Do not mess with XOPEN_SOURCE on SunOS. Fixes GCC builds.
---- qt/mkspecs/solaris-g++-64/qmake.conf.orig 2014-06-07 00:54:20.000000000 +0000
-+++ qt/mkspecs/solaris-g++-64/qmake.conf
-@@ -36,7 +36,7 @@ QMAKE_LEX = flex
- QMAKE_LEXFLAGS =
- QMAKE_YACC = yacc
- QMAKE_YACCFLAGS = -d
--QMAKE_CFLAGS = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
-+QMAKE_CFLAGS = -m64 -D__EXTENSIONS__
- QMAKE_CFLAGS_DEPS = -M
- QMAKE_CFLAGS_WARN_ON = -Wall -W
- QMAKE_CFLAGS_WARN_OFF = -w
diff --git a/wkhtmltopdf/patches/patch-qt_src_3rdparty_sqlite_sqlite3.c b/wkhtmltopdf/patches/patch-qt_src_3rdparty_sqlite_sqlite3.c
deleted file mode 100644
index c5663d5c9c..0000000000
--- a/wkhtmltopdf/patches/patch-qt_src_3rdparty_sqlite_sqlite3.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-qt_src_3rdparty_sqlite_sqlite3.c,v 1.1 2014/07/02 21:20:08 fhajny Exp $
-
-Do not mess with XOPEN_SOURCE on SunOS. Fixes GCC builds.
---- qt/src/3rdparty/sqlite/sqlite3.c.orig 2014-06-07 00:54:20.000000000 +0000
-+++ qt/src/3rdparty/sqlite/sqlite3.c
-@@ -424,7 +424,7 @@
- **
- ** See also ticket #2741.
- */
--#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && SQLITE_THREADSAFE && !defined(VXWORKS)
-+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__sun) && SQLITE_THREADSAFE && !defined(VXWORKS)
- # define _XOPEN_SOURCE 500 /* Needed to enable pthread recursive mutexes */
- #endif
-
diff --git a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp b/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp
deleted file mode 100644
index 75b4a692ba..0000000000
--- a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2014/07/02 21:20:08 fhajny Exp $
-
-Fix build on SunOS.
---- qt/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2014-06-07 00:54:21.000000000 +0000
-+++ qt/src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -382,6 +382,8 @@ static size_t getPlatformThreadRegisters
- #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
- // e.g. on FreeBSD 5.4, neundorf%kde.org@localhost
- pthread_attr_get_np(platformThread, ®s);
-+#elif OS(SOLARIS)
-+ pthread_attr_init(®s);
- #else
- // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
- pthread_getattr_np(platformThread, ®s);
diff --git a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp b/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp
deleted file mode 100644
index a0d62bde8b..0000000000
--- a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp,v 1.1 2014/07/02 21:20:08 fhajny Exp $
-
-Fix building on NetBSD/amd64 with GCC.
-
---- qt/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp.orig 2014-06-07 00:54:21.000000000 +0000
-+++ qt/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp
-@@ -79,7 +79,7 @@ namespace JSC {
- #define THUMB_FUNC_PARAM(name)
- #endif
-
--#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86))
- #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
- #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
- #define SYMBOL_STRING_RELOCATION(name) "_" #name
diff --git a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h b/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h
deleted file mode 100644
index 8660969b99..0000000000
--- a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h,v 1.1 2014/07/02 21:20:08 fhajny Exp $
-
-Port over from x11/qt4-libs.
---- qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h.orig 2014-06-07 00:54:23.000000000 +0000
-+++ qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h
-@@ -252,7 +252,7 @@ inline int clampToInteger(unsigned value
- return static_cast<int>(std::min(value, static_cast<unsigned>(std::numeric_limits<int>::max())));
- }
-
--#if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !OS(SOLARIS) && !OS(SYMBIAN)
-+#if !COMPILER(MSVC) && !(COMPILER(RVCT) && PLATFORM(BREWMP)) && !(OS(SOLARIS) && COMPILER(GCC) && (GCC_VERSION < 40600)) && !OS(SYMBIAN)
- using std::isfinite;
- using std::isinf;
- using std::isnan;
diff --git a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h b/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h
deleted file mode 100644
index a9b1e5d2aa..0000000000
--- a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h,v 1.1 2014/07/02 21:20:08 fhajny Exp $
-
-Fix build on SunOS.
---- qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2014-06-07 00:54:23.000000000 +0000
-+++ qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-@@ -449,6 +449,7 @@
- /* OS(SOLARIS) - Solaris */
- #if defined(sun) || defined(__sun)
- #define WTF_OS_SOLARIS 1
-+#define USE_SYSTEM_MALLOC 1
- #endif
-
- /* OS(WINCE) - Windows CE; note that for this platform OS(WINDOWS) is also defined */
diff --git a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h b/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h
deleted file mode 100644
index 829eda08c8..0000000000
--- a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h,v 1.1 2014/07/02 21:20:08 fhajny Exp $
-
-Fix for GCC 4.7.
-Port over from x11/qt4-libs.
---- qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.h.orig 2014-06-07 00:54:23.000000000 +0000
-+++ qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.h
-@@ -24,6 +24,7 @@
- #define StringImpl_h
-
- #include <limits.h>
-+#include <unistd.h>
- #include <wtf/ASCIICType.h>
- #include <wtf/CrossThreadRefCounted.h>
- #include <wtf/Forward.h>
diff --git a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h b/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h
deleted file mode 100644
index d0c6689d13..0000000000
--- a/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h,v 1.1 2014/07/02 21:20:08 fhajny Exp $
-
-Port over from x11/qt4-libs.
---- qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Threading.h.orig 2014-06-07 00:54:23.000000000 +0000
-+++ qt/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Threading.h
-@@ -113,6 +113,8 @@ using WTF::createThread;
- using WTF::currentThread;
- using WTF::detachThread;
- using WTF::waitForThreadCompletion;
-+#if !OS(SOLARIS)
- using WTF::yield;
-+#endif
-
- #endif // Threading_h
Home |
Main Index |
Thread Index |
Old Index