diff options
Diffstat (limited to 'converters/wkhtmltopdf')
17 files changed, 0 insertions, 973 deletions
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile deleted file mode 100644 index fd48acca1cb9..000000000000 --- a/converters/wkhtmltopdf/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -PORTNAME= wkhtmltopdf -PORTVERSION= 0.12.6 -PORTREVISION= 4 -CATEGORIES= converters - -MAINTAINER= pi@FreeBSD.org -COMMENT= Convert HTML (or live webpages) to PDF or image -WWW= https://github.com/wkhtmltopdf/wkhtmltopdf - -LICENSE= LGPL3 -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Upstream abandoned the project -EXPIRATION_DATE= 2024-12-31 -BROKEN_armv6= fails to build: error: Not supported ARM architecture -BROKEN_mips64= fails to link: undefined reference to __sync_add_and_fetch_4 - -RUN_DEPENDS= webfonts>=0:x11-fonts/webfonts -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libpng.so:graphics/png - -USES= gmake iconv jpeg perl5 pkgconfig ssl xorg -USE_XORG= x11 xext xrender -USE_PERL5= build -USE_LDCONFIG= yes -USE_GITHUB= yes -WKQT_TAGNAME= 5db36ec -GH_TUPLE= ${PORTNAME}:qt:${WKQT_TAGNAME}:qt -HAS_CONFIGURE= yes - -PATCH_WRKSRC= ${WRKSRC}/qt -CONFIGURE_WRKSRC= ${WRKSRC}/build/qt -BUILD_WRKSRC= ${WRKSRC}/build/qt -INSTALL_WRKSRC= ${WRKSRC}/build/app - -CONFIGURE_SCRIPT= ../../qt/configure -CONFIGURE_ARGS= -prefix ${WRKSRC}/build/qt \ - -opensource -confirm-license -fast -release -static \ - -graphicssystem raster -webkit -exceptions -xmlpatterns -system-zlib \ - -system-libpng -system-libjpeg -no-libmng -no-libtiff -no-stl \ - -no-accessibility -no-qt3support -no-phonon -no-phonon-backend \ - -no-opengl -no-declarative -no-script -no-scripttools \ - -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \ - -no-sql-sqlite -no-sql-sqlite2 -no-mmx -no-3dnow -no-sse -no-sse2 \ - -no-multimedia -nomake demos -nomake docs -nomake examples \ - -nomake tools -nomake tests -nomake translations -xrender -largefile \ - -iconv -openssl-linked -no-rpath -no-dbus -no-nis -no-cups -no-pch \ - -no-gtkstyle -no-nas-sound -no-sm -no-xshape -no-xinerama -no-xcursor \ - -no-xfixes -no-xrandr -no-mitshm -no-xinput -no-xkb -no-glib \ - -no-gstreamer -D ENABLE_VIDEO=0 -no-openvg -no-xsync \ - -no-audio-backend -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-avx \ - -no-neon - -MAKE_ARGS= INSTALL_ROOT="${STAGEDIR}${PREFIX}" - -.include <bsd.port.pre.mk> - -pre-patch: - ${RMDIR} ${WRKSRC}/qt - ${LN} -s ../qt-${WKQT_TAGNAME} ${WRKSRC}/qt - -post-patch: - ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - -e 's|/usr/X11R6/include|${LOCALBASE}/include/X11|g' \ - -e 's|/usr/X11R6/lib|${LOCALBASE}/lib|g' \ - ${PATCH_WRKSRC}/mkspecs/freebsd-g++/qmake.conf - ${REINPLACE_CMD} -e "s|gcc|${CC}|g" -e "s|g++|${CXX}|g" \ - ${PATCH_WRKSRC}/mkspecs/common/g++-base.conf - ${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/image/image.pro - ${ECHO} 'LIBS+= -lcrypto' >>${WRKSRC}/src/pdf/pdf.pro - ${MKDIR} ${WRKSRC}/build/app ${WRKSRC}/build/qt \ - ${WRKSRC}/build/wkhtmltox -.if ${OPSYS} == FreeBSD - @${FIND} ${PATCH_WRKSRC}/../qt-5db36ec -name "*.cpp" -o -name "*.h" | \ - ${XARGS} ${REINPLACE_CMD} -E 's|register ([a-zA-Z])|\1|g' -.endif - -post-build: - cd ${WRKSRC}/build/app && ${SETENV} ${MAKE_ENV} \ - ../qt/bin/qmake ../../wkhtmltopdf.pro && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ - ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} \ - ${ALL_TARGET} - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wkhtmltoimage \ - ${STAGEDIR}${PREFIX}/bin/wkhtmltopdf \ - ${STAGEDIR}${PREFIX}/lib/libwkhtmltox.so.${PORTVERSION} - -.include <bsd.port.post.mk> diff --git a/converters/wkhtmltopdf/distinfo b/converters/wkhtmltopdf/distinfo deleted file mode 100644 index caeda23b963a..000000000000 --- a/converters/wkhtmltopdf/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1591904530 -SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = adcced78492e7366d940c66a1327a85d3ae8c45190f486f545fdaa84cac662f0 -SIZE (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = 519045 -SHA256 (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 2b60944b46a4b0b9cdb9ce0339c3bf8f54c5ff9411cbc3c6a6ad01f88cc578e1 -SIZE (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 172992377 diff --git a/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test b/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test deleted file mode 100644 index 87b09cad4bc2..000000000000 --- a/converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test +++ /dev/null @@ -1,11 +0,0 @@ ---- config.tests/unix/compile.test.orig 2018-05-29 06:56:52 UTC -+++ config.tests/unix/compile.test -@@ -13,7 +13,7 @@ DESCRIPTION=$7 - shift 7 - LFLAGS="$SYSROOT_FLAG" - INCLUDEPATH="" --CXXFLAGS="$SYSROOT_FLAG" -+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG" - MAC_ARCH_CXXFLAGS="" - MAC_ARCH_LFLAGS="" - while [ "$#" -gt 0 ]; do diff --git a/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp b/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp deleted file mode 100644 index 5f5c16ea37f5..000000000000 --- a/converters/wkhtmltopdf/files/patch-config.tests_unix_gnu-libiconv_gnu-libiconv.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig 2015-01-03 18:06:12 UTC -+++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp -@@ -48,7 +48,7 @@ int main(int, char **) - { - iconv_t x = iconv_open("", ""); - -- const char *inp; -+ char *inp; - char *outp; - size_t inbytes, outbytes; - iconv(x, &inp, &inbytes, &outp, &outbytes); diff --git a/converters/wkhtmltopdf/files/patch-configure b/converters/wkhtmltopdf/files/patch-configure deleted file mode 100644 index 167565dc496d..000000000000 --- a/converters/wkhtmltopdf/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2018-05-29 06:56:52 UTC -+++ configure -@@ -7754,7 +7754,7 @@ case "$XPLATFORM" in - *-g++*) - # Check gcc's version - case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in -- 8*|7*|6*|5*|4*|3.4*) -+ [1-9][0-9]*|[4-9]*|3.4*) - ;; - 3.3*) - canBuildWebKit="no" diff --git a/converters/wkhtmltopdf/files/patch-libcxx b/converters/wkhtmltopdf/files/patch-libcxx deleted file mode 100644 index b253c18762f3..000000000000 --- a/converters/wkhtmltopdf/files/patch-libcxx +++ /dev/null @@ -1,614 +0,0 @@ -Several upstream (as in WebKit itself) commits that fix the build with libc++, -plus a few additional changes made only for the port (the OS(FREEBSD) part for -time_t). Some of those commits had to be edited because they did not apply -cleanly to the ancient WebKit checkout present in Qt. - -Upstream commit messages: - ------------------------------------------------------------------------- -r86529 | abarth@webkit.org | 2011-05-16 09:30:58 +0300 (Mon, 16 May 2011) | 7 lines - -2011-05-15 Adam Barth <abarth@webkit.org> - - Attempt to fix Qt build. (Strict PassOwnPtr fix.) - - * dom/XMLDocumentParserQt.cpp: - (WebCore::XMLDocumentParser::doEnd): - ------------------------------------------------------------------------- -r86530 | abarth@webkit.org | 2011-05-16 09:36:56 +0300 (Mon, 16 May 2011) | 13 lines - -2011-05-15 Adam Barth <abarth@webkit.org> - - Attempt to fix Qt build. (Strict PassOwnPtr fix.) - -* platform/network/qt/QNetworkReplyHandler.cpp: -(WebCore::QNetworkReplyWrapper::release): -(WebCore::QNetworkReplyWrapper::receiveMetaData): -(WebCore::QNetworkReplyWrapper::receiveSniffedMIMEType): -(WebCore::QNetworkReplyHandler::release): -(WebCore::QNetworkReplyHandler::finish): -(WebCore::QNetworkReplyHandler::redirect): -(WebCore::QNetworkReplyHandler::start): - ------------------------------------------------------------------------- -r86531 | abarth@webkit.org | 2011-05-16 09:41:08 +0300 (Mon, 16 May 2011) | 7 lines - -2011-05-15 Adam Barth <abarth@webkit.org> - - Attempt to fix Qt build. (Strict PassOwnPtr fix.) - - * platform/text/qt/TextCodecQt.cpp: - (WebCore::newTextCodecQt): - ------------------------------------------------------------------------- -r86532 | abarth@webkit.org | 2011-05-16 09:46:33 +0300 (Mon, 16 May 2011) | 8 lines - -2011-05-15 Adam Barth <abarth@webkit.org> - - Attempt to fix Qt build. (Strict PassOwnPtr fix.) - - * platform/graphics/qt/GraphicsLayerQt.cpp: - (WebCore::GraphicsLayerQt::GraphicsLayerQt): - (WebCore::GraphicsLayer::create): - - ------------------------------------------------------------------------- -r86533 | abarth@webkit.org | 2011-05-16 09:52:23 +0300 (Mon, 16 May 2011) | 10 lines - -2011-05-15 Adam Barth <abarth@webkit.org> - - Attempt to fix the Qt build. (Strict PassOwnPtr fix.) - - * Api/qgraphicswebview.cpp: - (QGraphicsWebViewPrivate::detachCurrentPage): - (QGraphicsWebView::setPage): - * Api/qwebpage.cpp: - (QWebPage::setView): - ------------------------------------------------------------------------- -r86537 | abarth@webkit.org | 2011-05-16 10:24:01 +0300 (Mon, 16 May 2011) | 41 lines - -2011-05-16 Adam Barth <abarth@webkit.org> - - [Qt] QtPlatformPlugin create methods should use PassOwnPtr - https://bugs.webkit.org/show_bug.cgi?id=60873 - - This change is slightly more than a build fix because the patch kind of - spidered a bit while I was trying to fix the build the "right way." - Hopefully nothing here is controversial. - - * Api/qwebpage.cpp: - (QWebPagePrivate::adjustPointForClicking): - * WebCoreSupport/ChromeClientQt.cpp: - (WebCore::ChromeClientQt::createSelectPopup): - * WebCoreSupport/FullScreenVideoQt.cpp: - (WebCore::FullScreenVideoQt::FullScreenVideoQt): - (WebCore::FullScreenVideoQt::~FullScreenVideoQt): - * WebCoreSupport/FullScreenVideoQt.h: - * WebCoreSupport/NotificationPresenterClientQt.cpp: - (WebCore::NotificationWrapper::NotificationWrapper): - (WebCore::NotificationPresenterClientQt::displayNotification): - * WebCoreSupport/PopupMenuQt.cpp: - (WebCore::PopupMenuQt::PopupMenuQt): - (WebCore::PopupMenuQt::~PopupMenuQt): - (WebCore::PopupMenuQt::show): - * WebCoreSupport/PopupMenuQt.h: - * WebCoreSupport/QtPlatformPlugin.cpp: - (WebCore::QtPlatformPlugin::createSelectInputMethod): - (WebCore::QtPlatformPlugin::createNotificationPresenter): - (WebCore::QtPlatformPlugin::createHapticFeedbackPlayer): - (WebCore::QtPlatformPlugin::createTouchModifier): - (WebCore::QtPlatformPlugin::createFullScreenVideoHandler): - * WebCoreSupport/QtPlatformPlugin.h: - (WebCore::QtPlatformPlugin::QtPlatformPlugin): -2011-05-16 Adam Barth <abarth@webkit.org> - - [Qt] QtPlatformPlugin create methods should use PassOwnPtr - https://bugs.webkit.org/show_bug.cgi?id=60873 - - * plugins/qt/PluginViewQt.cpp: - (WebCore::PluginView::platformStart): - ------------------------------------------------------------------------- -r86538 | abarth@webkit.org | 2011-05-16 10:27:51 +0300 (Mon, 16 May 2011) | 6 lines - -2011-05-16 Adam Barth <abarth@webkit.org> - - Missing include. - - * WebCoreSupport/PopupMenuQt.h: - ------------------------------------------------------------------------- -r86540 | abarth@webkit.org | 2011-05-16 10:43:22 +0300 (Mon, 16 May 2011) | 10 lines - -2011-05-16 Adam Barth <abarth@webkit.org> - - Attempt to fix Qt build. (Strict PassOwnPtr fix.) - - This patch requires some slightly fancy footwork. - - * WebCoreSupport/InspectorClientQt.cpp: - (WebCore::InspectorClientQt::openInspectorFrontend): - (WebCore::InspectorFrontendClientQt::InspectorFrontendClientQt): - ------------------------------------------------------------------------- -r86541 | abarth@webkit.org | 2011-05-16 10:51:04 +0300 (Mon, 16 May 2011) | 7 lines - -2011-05-16 Adam Barth <abarth@webkit.org> - - Sigh. This code is somewhat crazy. - - * WebCoreSupport/InspectorClientQt.cpp: - (WebCore::InspectorClientQt::openInspectorFrontend): - ------------------------------------------------------------------------- -r86550 | abarth@webkit.org | 2011-05-16 12:30:40 +0300 (Mon, 16 May 2011) | 13 lines - -2011-05-16 Adam Barth <abarth@webkit.org> - - Partial revert of r86537. FullScreenVideoQt.h can't depend on OwnPtr.h - because moc_FullScreenVideoQt.cpp fails to include config.h. - Apparently, having moc_FullScreenVideoQt.cpp properly include config.h - is hard, so we're going back to manual new and delete for this class. - Bad times. - - * WebCoreSupport/FullScreenVideoQt.cpp: - (WebCore::FullScreenVideoQt::FullScreenVideoQt): - (WebCore::FullScreenVideoQt::~FullScreenVideoQt): - * WebCoreSupport/FullScreenVideoQt.h: - ------------------------------------------------------------------------- -r90915 | andersca@apple.com | 2011-07-13 17:11:49 +0300 (Wed, 13 Jul 2011) | 7 lines - -If a compiler has nullptr support, include <cstddef> to get the nullptr_t definition -https://bugs.webkit.org/show_bug.cgi?id=64429 - -Include the cstddef which has the nullptr_t typedef according to the C++0x standard. - -* wtf/NullPtr.h: - ------------------------------------------------------------------------- -r92556 | darin@apple.com | 2011-08-06 23:17:26 +0300 (Sat, 06 Aug 2011) | 17 lines - -Fix Timer heap implementation to work with more libraries (other versions of STL) -https://bugs.webkit.org/show_bug.cgi?id=65782 - -Reviewed by Anders Carlsson. - -No behavior change, so no tests needed. Existing tests pass. - -* platform/Timer.cpp: Added TimerHeapPointer and TimerHeapReference class -alongside the TimerHeapIterator class. Also added a swap function. Also -added a TimerHeapLessThanFunction class. -(WebCore::TimerBase::heapDecreaseKey): Pass pointers in to the TimerHeapIterator -since that's how the class works now. Pass a TimerHeapLessThanFunction object -instead of letting the library use the < operator directly. -(WebCore::TimerBase::heapPopMin): Ditto. - -* platform/Timer.h: Updated for above changes. - ------------------------------------------------------------------------- -r107489 | weinig@apple.com | 2012-02-12 01:10:24 +0200 (Sun, 12 Feb 2012) | 9 lines - -Prepare JavaScriptCore to build with libc++ -<rdar://problem/10426673> -https://bugs.webkit.org/show_bug.cgi?id=78424 - -Reviewed by Anders Carlsson. - -* wtf/NullPtr.cpp: -* wtf/NullPtr.h: -libc++ provides std::nullptr emulation, so we don't have to. - ------------------------------------------------------------------------- ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h -@@ -35,9 +35,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH D - #define __has_feature(feature) 0 - #endif - -+#include <ciso646> -+ - #if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION) - - #define HAVE_NULLPTR 1 -+ -+#include <cstddef> - - #else - ---- src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp -@@ -215,7 +215,7 @@ void XMLDocumentParser::doEnd() - { - #if ENABLE(XSLT) - if (m_sawXSLTransform) { -- document()->setTransformSource(new TransformSource(m_originalSourceForTransform)); -+ document()->setTransformSource(adoptPtr(new TransformSource(m_originalSourceForTransform))); - document()->setParsing(false); // Make the doc think it's done, so it will apply xsl sheets. - document()->styleSelectorChanged(RecalcStyleImmediately); - document()->setParsing(true); ---- src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h -@@ -38,7 +38,7 @@ - #include <wtf/OwnPtr.h> - #include <wtf/text/StringHash.h> - --#if OS(SOLARIS) -+#if OS(FREEBSD) || OS(SOLARIS) - #include <sys/types.h> // For time_t structure. - #endif - ---- src/3rdparty/webkit/Source/WebCore/page/Page.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebCore/page/Page.h -@@ -29,7 +29,7 @@ - #include <wtf/HashSet.h> - #include <wtf/Noncopyable.h> - --#if OS(SOLARIS) -+#if OS(FREEBSD) || OS(SOLARIS) - #include <sys/time.h> // For time_t structure. - #endif - ---- src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h -@@ -35,7 +35,7 @@ - #include <wtf/PassOwnPtr.h> - #include <wtf/RefPtr.h> - --#if OS(SOLARIS) -+#if OS(FREEBSD) || OS(SOLARIS) - #include <sys/time.h> // For time_t structure. - #endif - ---- src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp -@@ -285,7 +285,7 @@ void QNetworkReplyWrapper::receiveMetaData() - - Q_ASSERT(!m_sniffer); - -- m_sniffer = new QtMIMETypeSniffer(m_reply, m_advertisedMIMEType, isSupportedImageType); -+ m_sniffer = adoptPtr(new QtMIMETypeSniffer(m_reply, m_advertisedMIMEType, isSupportedImageType)); - - if (m_sniffer->isFinished()) { - receiveSniffedMIMEType(); -@@ -666,7 +666,7 @@ void QNetworkReplyHandler::start() - if (!reply) - return; - -- m_replyWrapper = new QNetworkReplyWrapper(&m_queue, reply, m_resourceHandle->shouldContentSniff() && d->m_context->mimeSniffingEnabled(), this); -+ m_replyWrapper = adoptPtr(new QNetworkReplyWrapper(&m_queue, reply, m_resourceHandle->shouldContentSniff() && d->m_context->mimeSniffingEnabled(), this)); - - if (m_loadType == SynchronousLoad) { - m_replyWrapper->synchronousLoad(); ---- src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp -@@ -64,7 +64,7 @@ void TextCodecQt::registerEncodingNames(EncodingNameRe - - static PassOwnPtr<TextCodec> newTextCodecQt(const TextEncoding& encoding, const void*) - { -- return new TextCodecQt(encoding); -+ return adoptPtr(new TextCodecQt(encoding)); - } - - void TextCodecQt::registerCodecs(TextCodecRegistrar registrar) ---- src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -950,7 +950,7 @@ bool PluginView::platformStart() - - #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER) - if (shouldUseAcceleratedCompositing()) { -- m_platformLayer = new PluginGraphicsLayerQt(this); -+ m_platformLayer = adoptPtr(new PluginGraphicsLayerQt(this)); - // Trigger layer computation in RenderLayerCompositor - m_element->setNeedsStyleRecalc(SyntheticStyleChange); - } ---- src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp -@@ -504,7 +504,7 @@ void QGraphicsWebView::setPage(QWebPage* page) - if (!d->page) - return; - -- d->page->d->client = new PageClientQGraphicsWidget(this, page); // set the page client -+ d->page->d->client = adoptPtr(new PageClientQGraphicsWidget(this, page)); - - if (d->overlay()) - d->overlay()->prepareGraphicsItemGeometryChange(); ---- src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp -@@ -1343,7 +1343,7 @@ void QWebPagePrivate::adjustPointForClicking(QMouseEve - void QWebPagePrivate::adjustPointForClicking(QGraphicsSceneMouseEvent* ev) - { - QtPlatformPlugin platformPlugin; -- QWebTouchModifier* touchModifier = platformPlugin.createTouchModifier(); -+ OwnPtr<QWebTouchModifier> touchModifier = platformPlugin.createTouchModifier(); - if (!touchModifier) - return; - -@@ -1352,8 +1352,7 @@ void QWebPagePrivate::adjustPointForClicking(QGraphics - unsigned bottomPadding = touchModifier->hitTestPaddingForTouch(QWebTouchModifier::Down); - unsigned leftPadding = touchModifier->hitTestPaddingForTouch(QWebTouchModifier::Left); - -- delete touchModifier; -- touchModifier = 0; -+ touchModifier = nullptr; - - if (!topPadding && !rightPadding && !bottomPadding && !leftPadding) - return; -@@ -2068,7 +2067,7 @@ void QWebPage::setView(QWidget* view) - } - - if (view) -- d->client = new PageClientQWidget(view, this); -+ d->client = adoptPtr(new PageClientQWidget(view, this)); - } - - /*! ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp -@@ -702,18 +702,18 @@ void ChromeClientQt::exitFullscreenForNode(Node* node) - } - #endif - --QWebSelectMethod* ChromeClientQt::createSelectPopup() const -+PassOwnPtr<QWebSelectMethod> ChromeClientQt::createSelectPopup() const - { -- QWebSelectMethod* result = m_platformPlugin.createSelectInputMethod(); -+ OwnPtr<QWebSelectMethod> result = m_platformPlugin.createSelectInputMethod(); - if (result) -- return result; -+ return result.release(); - - #if defined(Q_WS_MAEMO_5) -- return new QtMaemoWebPopup; -+ return adoptPtr(new QtMaemoWebPopup); - #elif !defined(QT_NO_COMBOBOX) -- return new QtFallbackWebPopup(this); -+ return adoptPtr(new QtFallbackWebPopup(this)); - #else -- return 0; -+ return nullptr; - #endif - } - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h -@@ -34,6 +34,7 @@ - #include "KURL.h" - #include "PlatformString.h" - #include "QtPlatformPlugin.h" -+#include <wtf/PassOwnPtr.h> - #include <wtf/RefCounted.h> - - QT_BEGIN_NAMESPACE -@@ -190,7 +191,7 @@ class ChromeClientQt : public ChromeClient { (public) - virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const; - virtual void populateVisitedLinks(); - -- QWebSelectMethod* createSelectPopup() const; -+ PassOwnPtr<QWebSelectMethod> createSelectPopup() const; - - virtual void dispatchViewportDataDidChange(const ViewportArguments&) const; - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp -@@ -140,7 +140,7 @@ FullScreenVideoQt::FullScreenVideoQt(ChromeClientQt* c - Q_ASSERT(m_chromeClient); - - #if USE(QT_MULTIMEDIA) -- m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler(); -+ m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler().leakPtr(); - if (!m_FullScreenVideoHandler) - m_FullScreenVideoHandler = new DefaultFullScreenVideoHandler; - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp -@@ -203,8 +203,9 @@ void InspectorClientQt::inspectorDestroyed() - void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* inspectorController) - { - #if ENABLE(INSPECTOR) -- QWebView* inspectorView = new QWebView; -- InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView); -+ OwnPtr<QWebView> inspectorView = adoptPtr(new QWebView); -+ // FIXME: Where does inspectorPage get deleted? -+ InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView.get()); - inspectorView->setPage(inspectorPage); - - QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector(); -@@ -229,11 +230,14 @@ void InspectorClientQt::openInspectorFrontend(WebCore: - inspectorPage->setProperty("_q_inspectorJavaScriptWindowObjects", inspectorJavaScriptWindowObjects); - #endif - inspectorView->page()->mainFrame()->load(inspectorUrl); -- m_inspectedWebPage->d->inspectorFrontend = inspectorView; -- inspector->d->setFrontend(inspectorView); -+ m_inspectedWebPage->d->inspectorFrontend = inspectorView.get(); -+ inspector->d->setFrontend(inspectorView.get()); - -- m_frontendClient = new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView, this); -- inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(m_frontendClient); -+ // Is 'controller' the same object as 'inspectorController' (which appears to be unused)? -+ InspectorController* controller = inspectorView->page()->d->page->inspectorController(); -+ OwnPtr<InspectorFrontendClientQt> frontendClient = adoptPtr(new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView.release(), this)); -+ m_frontendClient = frontendClient.get(); -+ controller->setInspectorFrontendClient(frontendClient.release()); - m_frontendWebPage = inspectorPage; - #endif - } -@@ -297,7 +301,7 @@ bool InspectorClientQt::sendMessageToFrontend(const St - - #if ENABLE(INSPECTOR) - InspectorFrontendClientQt::InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr<QWebView> inspectorView, InspectorClientQt* inspectorClient) -- : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, new InspectorFrontendSettingsQt()) -+ : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, adoptPtr(new InspectorFrontendSettingsQt())) - , m_inspectedWebPage(inspectedWebPage) - , m_inspectorView(inspectorView) - , m_destroyingInspectorView(false) ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp -@@ -211,9 +211,9 @@ void NotificationPresenterClientQt::displayNotificatio - QPixmap pixmap; - if (bytes.length() && pixmap.loadFromData(bytes)) { - QIcon icon(pixmap); -- wrapper->m_notificationIcon = new QSystemTrayIcon(icon); -+ wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon(icon)); - } else -- wrapper->m_notificationIcon = new QSystemTrayIcon(); -+ wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon()); - #endif - } - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp -@@ -82,16 +82,12 @@ namespace WebCore { - - PopupMenuQt::PopupMenuQt(PopupMenuClient* client, const ChromeClientQt* chromeClient) - : m_popupClient(client) -- , m_popup(0) -- , m_selectData(0) - , m_chromeClient(chromeClient) - { - } - - PopupMenuQt::~PopupMenuQt() - { -- delete m_selectData; -- delete m_popup; - } - - void PopupMenuQt::disconnectClient() -@@ -107,21 +103,19 @@ void PopupMenuQt::show(const IntRect& rect, FrameView* - - if (!m_popup) { - m_popup = m_chromeClient->createSelectPopup(); -- connect(m_popup, SIGNAL(didHide()), this, SLOT(didHide())); -- connect(m_popup, SIGNAL(selectItem(int, bool, bool)), this, SLOT(selectItem(int, bool, bool))); -+ connect(m_popup.get(), SIGNAL(didHide()), this, SLOT(didHide())); -+ connect(m_popup.get(), SIGNAL(selectItem(int, bool, bool)), this, SLOT(selectItem(int, bool, bool))); - } - -- if (QtFallbackWebPopup* fallback = qobject_cast<QtFallbackWebPopup*>(m_popup)) { -+ if (QtFallbackWebPopup* fallback = qobject_cast<QtFallbackWebPopup*>(m_popup.get())) { - QRect geometry(rect); - geometry.moveTopLeft(view->contentsToWindow(rect.location())); - fallback->setGeometry(geometry); - fallback->setFont(m_popupClient->menuStyle().font().font()); - } - -- if (m_selectData) -- delete m_selectData; -- m_selectData = new SelectData(m_popupClient); -- m_popup->show(*m_selectData); -+ m_selectData = adoptPtr(new SelectData(m_popupClient)); -+ m_popup->show(*m_selectData.get()); - #endif - } - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h -@@ -22,6 +22,8 @@ - - #include "PopupMenu.h" - #include <QObject> -+#include <wtf/OwnPtr.h> -+#include <wtf/PassOwnPtr.h> - - class QWebSelectData; - class QWebSelectMethod; -@@ -49,8 +51,8 @@ private slots: - - private: - PopupMenuClient* m_popupClient; -- QWebSelectMethod* m_popup; -- QWebSelectData* m_selectData; -+ OwnPtr<QWebSelectMethod> m_popup; -+ OwnPtr<QWebSelectData> m_selectData; - const ChromeClientQt* m_chromeClient; - }; - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp -@@ -102,36 +102,35 @@ QWebKitPlatformPlugin* QtPlatformPlugin::plugin() - return m_plugin; - } - --QWebSelectMethod* QtPlatformPlugin::createSelectInputMethod() -+PassOwnPtr<QWebSelectMethod> QtPlatformPlugin::createSelectInputMethod() - { - QWebKitPlatformPlugin* p = plugin(); -- return p ? static_cast<QWebSelectMethod*>(p->createExtension(QWebKitPlatformPlugin::MultipleSelections)) : 0; -+ return adoptPtr(p ? static_cast<QWebSelectMethod*>(p->createExtension(QWebKitPlatformPlugin::MultipleSelections)) : 0); - } - -- --QWebNotificationPresenter* QtPlatformPlugin::createNotificationPresenter() -+PassOwnPtr<QWebNotificationPresenter> QtPlatformPlugin::createNotificationPresenter() - { - QWebKitPlatformPlugin* p = plugin(); -- return p ? static_cast<QWebNotificationPresenter*>(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0; -+ return adoptPtr(p ? static_cast<QWebNotificationPresenter*>(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0); - } - --QWebHapticFeedbackPlayer* QtPlatformPlugin::createHapticFeedbackPlayer() -+PassOwnPtr<QWebHapticFeedbackPlayer> QtPlatformPlugin::createHapticFeedbackPlayer() - { - QWebKitPlatformPlugin* p = plugin(); -- return p ? static_cast<QWebHapticFeedbackPlayer*>(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0; -+ return adoptPtr(p ? static_cast<QWebHapticFeedbackPlayer*>(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0); - } - --QWebTouchModifier* QtPlatformPlugin::createTouchModifier() -+PassOwnPtr<QWebTouchModifier> QtPlatformPlugin::createTouchModifier() - { - QWebKitPlatformPlugin* p = plugin(); -- return p ? static_cast<QWebTouchModifier*>(p->createExtension(QWebKitPlatformPlugin::TouchInteraction)) : 0; -+ return adoptPtr(p ? static_cast<QWebTouchModifier*>(p->createExtension(QWebKitPlatformPlugin::TouchInteraction)) : 0); - } - - #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) --QWebFullScreenVideoHandler* QtPlatformPlugin::createFullScreenVideoHandler() -+PassOwnPtr<QWebFullScreenVideoHandler> QtPlatformPlugin::createFullScreenVideoHandler() - { - QWebKitPlatformPlugin* p = plugin(); -- return p ? static_cast<QWebFullScreenVideoHandler*>(p->createExtension(QWebKitPlatformPlugin::FullScreenVideoPlayer)) : 0; -+ return adoptPtr(p ? static_cast<QWebFullScreenVideoHandler*>(p->createExtension(QWebKitPlatformPlugin::FullScreenVideoPlayer)) : 0); - } - #endif - ---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h -@@ -22,6 +22,7 @@ - #define QtPlatformPlugin_h - - #include <QPluginLoader> -+#include <wtf/PassOwnPtr.h> - - class QWebSelectMethod; - class QWebKitPlatformPlugin; -@@ -37,15 +38,20 @@ namespace WebCore { - - class QtPlatformPlugin { - public: -- QtPlatformPlugin() : m_loaded(false), m_plugin(0) {} -+ QtPlatformPlugin() -+ : m_loaded(false) -+ , m_plugin(0) -+ { -+ } -+ - ~QtPlatformPlugin(); - -- QWebSelectMethod* createSelectInputMethod(); -- QWebNotificationPresenter* createNotificationPresenter(); -- QWebHapticFeedbackPlayer* createHapticFeedbackPlayer(); -- QWebTouchModifier* createTouchModifier(); -+ PassOwnPtr<QWebSelectMethod> createSelectInputMethod(); -+ PassOwnPtr<QWebNotificationPresenter> createNotificationPresenter(); -+ PassOwnPtr<QWebHapticFeedbackPlayer> createHapticFeedbackPlayer(); -+ PassOwnPtr<QWebTouchModifier> createTouchModifier(); - #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) -- QWebFullScreenVideoHandler* createFullScreenVideoHandler(); -+ PassOwnPtr<QWebFullScreenVideoHandler> createFullScreenVideoHandler(); - #endif - - QWebKitPlatformPlugin* plugin(); diff --git a/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp b/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp deleted file mode 100644 index ded07e4bb198..000000000000 --- a/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.cpp.orig 2023-10-03 22:33:30 UTC -+++ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FEGaussianBlurNEON.cpp -@@ -285,7 +285,7 @@ TOSTRING(neonDrawAlphaChannelGaussianBlur) ":" NL - "vmov.u32 " REMAINING_STRIDES_R ", " REMAINING_STRIDES_S0 NL - // Early return for 0 strides. - "cmp " REMAINING_STRIDES_R ", #0" NL -- "ldmeqia sp!, {r4-r8, r10, r11, pc}" NL -+ "ldmiaeq sp!, {r4-r8, r10, r11, pc}" NL - - // Initialize the sum variable. - "vmov.u32 " SUM_Q ", #0" NL diff --git a/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp b/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp deleted file mode 100644 index 4397f3ac2e80..000000000000 --- a/converters/wkhtmltopdf/files/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FELightingNEON.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.cpp.orig 2023-10-03 22:30:40 UTC -+++ src/3rdparty/webkit/Source/WebCore/platform/graphics/filters/arm/FELightingNEON.cpp -@@ -398,11 +398,11 @@ TOSTRING(neonDrawLighting) ":" NL - "vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL - "vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL - "vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL -- "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL -+ "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL - // The color values are stored in-place. - "strb r2, [" PIXELS_R ", #-11]" NL - "strb r3, [" PIXELS_R ", #-10]" NL -- "vmov.u32 r2, " TMP3_S2 NL -+ "vmov r2, " TMP3_S2 NL - "strb r2, [" PIXELS_R ", #-9]" NL - - // Continue to the next pixel. diff --git a/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h b/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h deleted file mode 100644 index 9dac669034ad..000000000000 --- a/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h +++ /dev/null @@ -1,35 +0,0 @@ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h -@@ -63,19 +63,11 @@ - - #if OS(WINDOWS) - #include <windows.h> --#elif OS(DARWIN) --#include <libkern/OSAtomic.h> - #elif OS(ANDROID) - #include <cutils/atomic.h> - #elif OS(QNX) - #include <atomic.h> --#elif COMPILER(GCC) && !OS(SYMBIAN) --#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) --#include <ext/atomicity.h> --#else --#include <bits/atomicity.h> - #endif --#endif - - namespace WTF { - -@@ -89,12 +81,6 @@ inline int atomicDecrement(int* addend) { return Inter - inline int atomicIncrement(int volatile* addend) { return InterlockedIncrement(reinterpret_cast<long volatile*>(addend)); } - inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); } - #endif -- --#elif OS(DARWIN) --#define WTF_USE_LOCKFREE_THREADSAFESHARED 1 -- --inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); } --inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); } - - #elif OS(ANDROID) - diff --git a/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Platform.h b/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Platform.h deleted file mode 100644 index 853457375a0c..000000000000 --- a/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Platform.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h -@@ -1003,7 +1003,9 @@ - || CPU(SPARC64) \ - || CPU(S390X) \ - || CPU(PPC64) \ -- || CPU(MIPS64) -+ || CPU(MIPS64) \ -+ || defined(__aarch64__) \ -+ || defined(__riscv) - #define WTF_USE_JSVALUE64 1 - #else - #define WTF_USE_JSVALUE32_64 1 diff --git a/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro b/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro deleted file mode 100644 index 0459dfc6a6d3..000000000000 --- a/converters/wkhtmltopdf/files/patch-src__3rdparty__webkit__Source__WebKit__qt__QtWebKit.pro +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig 2018-05-29 06:56:52 UTC -+++ src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro -@@ -115,7 +115,7 @@ CONFIG(QTDIR_build) { - } - - moduleFile=$$PWD/qt_webkit_version.pri --isEmpty(QT_BUILD_TREE):include($$moduleFile) -+include($$moduleFile) - VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION} - - symbian { diff --git a/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp b/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp deleted file mode 100644 index 99bfac114be0..000000000000 --- a/converters/wkhtmltopdf/files/patch-src_corelib_codecs_qiconvcodec.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- src/corelib/codecs/qiconvcodec.cpp.orig 2015-01-03 18:06:52 UTC -+++ src/corelib/codecs/qiconvcodec.cpp -@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(co - IconvState *state = *pstate; - size_t inBytesLeft = len; - // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM --#ifdef GNU_LIBICONV -- // GNU doesn't disagree with POSIX :/ -- const char *inBytes = chars; --#else - char *inBytes = const_cast<char *>(chars); --#endif - - QByteArray in; - if (remainingCount) { -@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd) - size_t outBytesLeft = sizeof buf; - size_t inBytesLeft = sizeof bom; - --#if defined(GNU_LIBICONV) -- const char **inBytesPtr = const_cast<const char **>(&inBytes); --#else - char **inBytesPtr = &inBytes; --#endif - - if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) { - return false; -@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico - char *outBytes; - size_t inBytesLeft; - --#if defined(GNU_LIBICONV) -- const char **inBytesPtr = const_cast<const char **>(&inBytes); --#else - char **inBytesPtr = &inBytes; --#endif - - IconvState *temporaryState = 0; - QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState(); diff --git a/converters/wkhtmltopdf/files/patch-src_corelib_global_qglobal.h b/converters/wkhtmltopdf/files/patch-src_corelib_global_qglobal.h deleted file mode 100644 index 2db44fffd5c2..000000000000 --- a/converters/wkhtmltopdf/files/patch-src_corelib_global_qglobal.h +++ /dev/null @@ -1,40 +0,0 @@ ---- src/corelib/global/qglobal.h.orig 2023-11-20 11:36:42 UTC -+++ src/corelib/global/qglobal.h -@@ -2482,22 +2482,32 @@ typedef uint Flags; - - #endif /* Q_NO_TYPESAFE_FLAGS */ - --#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT) -+#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT)) - /* make use of typeof-extension */ - template <typename T> - class QForeachContainer { - public: -- inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { } -+ inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { } - const T c; - int brk; - typename T::const_iterator i, e; -+ int control; - }; - -+// Explanation of the control word: -+// - it's initialized to 1 -+// - that means both the inner and outer loops start -+// - if there were no breaks, at the end of the inner loop, it's set to 0, which -+// causes it to exit (the inner loop is run exactly once) -+// - at the end of the outer loop, it's inverted, so it becomes 1 again, allowing -+// the outer loop to continue executing -+// - if there was a break inside the inner loop, it will exit with control still -+// set to 1; in that case, the outer loop will invert it to 0 and will exit too - #define Q_FOREACH(variable, container) \ - for (QForeachContainer<__typeof__(container)> _container_(container); \ -- !_container_.brk && _container_.i != _container_.e; \ -- __extension__ ({ ++_container_.brk; ++_container_.i; })) \ -- for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;})) -+ _container_.control && _container_.i != _container_.e; \ -+ ++_container_.i, _container_.control ^= 1) \ -+ for (variable = *_container_.i; _container_.control; _container_.control = 0) - - #else - diff --git a/converters/wkhtmltopdf/files/patch-src_gui_kernel_qx11embed__x11.cpp b/converters/wkhtmltopdf/files/patch-src_gui_kernel_qx11embed__x11.cpp deleted file mode 100644 index 7091bedefde3..000000000000 --- a/converters/wkhtmltopdf/files/patch-src_gui_kernel_qx11embed__x11.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- src/gui/kernel/qx11embed_x11.cpp.orig 2023-10-03 21:02:05 UTC -+++ src/gui/kernel/qx11embed_x11.cpp -@@ -483,7 +483,7 @@ QX11EmbedWidget::QX11EmbedWidget(QWidget *parent) - | ExposureMask | StructureNotifyMask - | SubstructureNotifyMask | PropertyChangeMask); - -- long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; -+ long data[] = {static_cast<long>(XEMBED_VERSION), XEMBED_MAPPED}; - XChangeProperty(x11Info().display(), internalWinId(), ATOM(_XEMBED_INFO), - ATOM(_XEMBED_INFO), 32, PropModeReplace, - (unsigned char*) data, 2); -@@ -1578,7 +1578,7 @@ void QX11EmbedContainer::showEvent(QShowEvent *) - { - Q_D(QX11EmbedContainer); - if (d->client) { -- long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; -+ long data[] = {static_cast<long>(XEMBED_VERSION), XEMBED_MAPPED}; - XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, - PropModeReplace, (unsigned char *) data, 2); - } -@@ -1594,7 +1594,7 @@ void QX11EmbedContainer::hideEvent(QHideEvent *) - { - Q_D(QX11EmbedContainer); - if (d->client) { -- long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; -+ long data[] = {static_cast<long>(XEMBED_VERSION), XEMBED_MAPPED}; - XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, - PropModeReplace, (unsigned char *) data, 2); - } diff --git a/converters/wkhtmltopdf/pkg-descr b/converters/wkhtmltopdf/pkg-descr deleted file mode 100644 index 35e16b7df404..000000000000 --- a/converters/wkhtmltopdf/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -wkhtmltopdf and wkhtmltoimage are powerful utilities to convert HTML to PDF -or an image file using a patched static build of Qt and the webkit rendering -engine. - -A webpage can be downloaded directly from the web and rendered into a PDF -document or an image file (multiple formats are supported). - -Features of the static version: -* Convert web pages into PDF documents (or images) using webkit -* Adding headers and footers -* TOC generation -* Batch mode conversions -* XServer is not required (however the X11 client libs must be installed) - -For proper functionality you may need to install the following port(s): -x11-fonts/webfonts diff --git a/converters/wkhtmltopdf/pkg-message b/converters/wkhtmltopdf/pkg-message deleted file mode 100644 index 0582a5806afa..000000000000 --- a/converters/wkhtmltopdf/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: <<EOM -For proper functionality you may need to install the following port(s): -x11-fonts/webfonts -EOM -} -] diff --git a/converters/wkhtmltopdf/pkg-plist b/converters/wkhtmltopdf/pkg-plist deleted file mode 100644 index 34de3fa34a4d..000000000000 --- a/converters/wkhtmltopdf/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -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.0.12.6 -share/man/man1/wkhtmltoimage.1.gz -share/man/man1/wkhtmltopdf.1.gz |