commit 5ea194b199c2a736a14e1985659400aa9b2132fd Author: Tim Biermann <tbier@posteo.de> Date: Sun Nov 13 11:06:54 2022 +0000 qtwebkit: dropped diff --git a/qtwebkit/.footprint b/qtwebkit/.footprint deleted file mode 100644 index bbd063f19..000000000 --- a/qtwebkit/.footprint +++ /dev/null @@ -1,131 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/qt5/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.212.0/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/ -drwxr-xr-x root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/ --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkreply_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickurlschemedelegate_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qtwebsecurityorigin_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebchannelwebkittransport_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebelement_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebhistory_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebiconimageprovider_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebkittest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebloadrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpermissionrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebplugindatabase_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebscriptworld_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebsecurityorigin_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebDatabase --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebElement --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebElementCollection --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebFullScreenRequest --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebFullScreenVideoHandler --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebHapticFeedbackPlayer --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebHistory --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebHistoryInterface --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebHistoryItem --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebKitPlatformPlugin --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebNotificationData --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebNotificationPresenter --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebPluginFactory --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSecurityOrigin --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSelectData --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSelectMethod --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSettings --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebSpellChecker --rw-r--r-- root/root usr/include/qt5/QtWebKit/QWebTouchModifier --rw-r--r-- root/root usr/include/qt5/QtWebKit/QtWebKit --rw-r--r-- root/root usr/include/qt5/QtWebKit/QtWebKitDepends --rw-r--r-- root/root usr/include/qt5/QtWebKit/QtWebKitVersion --rw-r--r-- root/root usr/include/qt5/QtWebKit/qtwebkitversion.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebdatabase.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebelement.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebfullscreenrequest.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebhistory.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebhistoryinterface.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebkitglobal.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebkitplatformplugin.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebpluginfactory.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebsecurityorigin.h --rw-r--r-- root/root usr/include/qt5/QtWebKit/qwebsettings.h -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.212.0/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/ --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebframe_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebinspector_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebpage_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebviewaccessible_p.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QGraphicsWebView --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebFrame --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebHitTestResult --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebInspector --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebPage --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QWebView --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QtWebKitWidgets --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsDepends --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qgraphicswebview.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qwebframe.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qwebinspector.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qwebpage.h --rw-r--r-- root/root usr/include/qt5/QtWebKitWidgets/qwebview.h -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/cmake/ -drwxr-xr-x root/root usr/lib/cmake/Qt5WebKit/ --rw-r--r-- root/root usr/lib/cmake/Qt5WebKit/Qt5WebKitConfig.cmake --rw-r--r-- root/root usr/lib/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake --rw-r--r-- root/root usr/lib/cmake/Qt5WebKit/WebKitTargets-release.cmake --rw-r--r-- root/root usr/lib/cmake/Qt5WebKit/WebKitTargets.cmake -drwxr-xr-x root/root usr/lib/cmake/Qt5WebKitWidgets/ --rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake --rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake --rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake --rw-r--r-- root/root usr/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake -lrwxrwxrwx root/root usr/lib/libQt5WebKit.so -> libQt5WebKit.so.5 -lrwxrwxrwx root/root usr/lib/libQt5WebKit.so.5 -> libQt5WebKit.so.5.212.0 --rwxr-xr-x root/root usr/lib/libQt5WebKit.so.5.212.0 -lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so -> libQt5WebKitWidgets.so.5 -lrwxrwxrwx root/root usr/lib/libQt5WebKitWidgets.so.5 -> libQt5WebKitWidgets.so.5.212.0 --rwxr-xr-x root/root usr/lib/libQt5WebKitWidgets.so.5.212.0 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebKit.pc --rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebKitWidgets.pc -drwxr-xr-x root/root usr/lib/qt5/ -drwxr-xr-x root/root usr/lib/qt5/libexec/ --rwxr-xr-x root/root usr/lib/qt5/libexec/QtWebNetworkProcess --rwxr-xr-x root/root usr/lib/qt5/libexec/QtWebPluginProcess --rwxr-xr-x root/root usr/lib/qt5/libexec/QtWebProcess --rwxr-xr-x root/root usr/lib/qt5/libexec/QtWebStorageProcess -drwxr-xr-x root/root usr/lib/qt5/mkspecs/ -drwxr-xr-x root/root usr/lib/qt5/mkspecs/modules/ --rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webkit.pri --rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webkit_private.pri --rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri --rw-r--r-- root/root usr/lib/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri -drwxr-xr-x root/root usr/lib/qt5/qml/ -drwxr-xr-x root/root usr/lib/qt5/qml/QtWebKit/ -drwxr-xr-x root/root usr/lib/qt5/qml/QtWebKit/experimental/ --rwxr-xr-x root/root usr/lib/qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so --rw-r--r-- root/root usr/lib/qt5/qml/QtWebKit/experimental/qmldir --rwxr-xr-x root/root usr/lib/qt5/qml/QtWebKit/libqmlwebkitplugin.so --rw-r--r-- root/root usr/lib/qt5/qml/QtWebKit/plugins.qmltypes --rw-r--r-- root/root usr/lib/qt5/qml/QtWebKit/qmldir diff --git a/qtwebkit/.signature b/qtwebkit/.signature deleted file mode 100644 index 6f7da4375..000000000 --- a/qtwebkit/.signature +++ /dev/null @@ -1,6 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fiLIH+Mex+q+e4Qt9DfW5vYJkyauVh8uHamwBWDxOEzlvGe+fcv2eJegPrCM+BP6fejvBcsmdCz9lfcO7oWWww= -SHA256 (Pkgfile) = 55114ec2f6c683b8c2a6b885bb94dd2eef43e25974848680d5e2524029f7a44b -SHA256 (.footprint) = 839d04c7250b0262d6f81ad2c5ec4182e696bdb0a7c70c298afe2b0614269bc1 -SHA256 (qtwebkit-opensource-src-5.212.tar.xz) = 10cbdaba60aac79d27016aa05bae9ab3ec7b0aed4df163debfbf8fddd66adc14 -SHA256 (qtwebkit-5.212.0_pre20200309-icu-68.patch) = 146829ab233c73e8c5e080babca12f9bfb193621fd3452da57721a0af447214a diff --git a/qtwebkit/Pkgfile b/qtwebkit/Pkgfile deleted file mode 100644 index 791cc265a..000000000 --- a/qtwebkit/Pkgfile +++ /dev/null @@ -1,31 +0,0 @@ -# Description: QtWebKit for qt5. -# URL: https://www.qt.io/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: hyphen icu qt5 ruby - -name=qtwebkit -version=5.212 -release=1 -source=(https://download.qt.io/snapshots/ci/qtwebkit/$version/latest/src/submodules/... - qtwebkit-5.212.0_pre20200309-icu-68.patch) - -build() { - [ $(pkginfo -i | awk '/^icu / {split($2,a,"."); print a[1]}') -ge 68 ] && \ - patch -d $name-opensource-src-$version -p1 -i $SRC/qtwebkit-5.212.0_pre20200309-icu-68.patch - - cmake -S $name-opensource-src-$version -B build -G Ninja \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS="$CXXFLAGS -DNDEBUG" \ - -D PORT=Qt \ - -D ENABLE_TOOLS=OFF - - cmake --build build - DESTDIR=$PKG cmake --install build - - # Fix pkgconfig files - sed -e 's|qt/Qt5WebKit|qt/QtWebKit|' -i $PKG/usr/lib/pkgconfig/Qt5WebKit.pc - sed -e 's|qt/Qt5WebKitWidgets|qt/QtWebKitWidgets|' -i $PKG/usr/lib/pkgconfig/Qt5WebKitWidgets.pc - sed -e '/Name/a Description: Qt WebKit module' -i $PKG/usr/lib/pkgconfig/Qt5WebKit.pc - sed -e '/Name/a Description: Qt WebKitWidgets module' -i $PKG/usr/lib/pkgconfig/Qt5WebKitWidgets.pc -} diff --git a/qtwebkit/qtwebkit-5.212.0_pre20200309-icu-68.patch b/qtwebkit/qtwebkit-5.212.0_pre20200309-icu-68.patch deleted file mode 100644 index 7de72ea61..000000000 --- a/qtwebkit/qtwebkit-5.212.0_pre20200309-icu-68.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- a/Source/WebCore/platform/text/icu/UTextProvider.h -+++ b/Source/WebCore/platform/text/icu/UTextProvider.h -@@ -80,12 +80,12 @@ - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits<int32_t>::max()); - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { - text->chunkOffset = text->chunkLength; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } else { -@@ -94,12 +94,12 @@ - // Ensure chunk offset is well formed if computed offset exceeds int32_t range. - ASSERT(offset < std::numeric_limits<int32_t>::max()); - text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; -- isAccessible = TRUE; -+ isAccessible = true; - return true; - } - if (nativeIndex <= 0 && !text->chunkNativeStart) { - text->chunkOffset = 0; -- isAccessible = FALSE; -+ isAccessible = false; - return true; - } - } ---- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ - if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (index >= length && uText->chunkNativeLimit == length) { - // Off the end of the buffer, but we can't get it. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return FALSE; -+ return false; - } - } else { - if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { - // Already inside the buffer. Set the new offset. - uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart); -- return TRUE; -+ return true; - } - if (!index && !uText->chunkNativeStart) { - // Already at the beginning; can't go any farther. - uText->chunkOffset = 0; -- return FALSE; -+ return false; - } - } - -@@ -144,7 +144,7 @@ - - uText->nativeIndexingLimit = uText->chunkLength; - -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) -@@ -336,7 +336,7 @@ - static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -356,7 +356,7 @@ - ASSERT(newContext == UTextProviderContext::PriorContext); - textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) ---- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp -@@ -125,7 +125,7 @@ - static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) - { - if (!text->context) -- return FALSE; -+ return false; - int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); - UBool isAccessible; - if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) -@@ -145,7 +145,7 @@ - ASSERT(newContext == UTextProviderContext::PriorContext); - textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); - } -- return TRUE; -+ return true; - } - - static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -308,7 +308,7 @@ - m_converterICU = ucnv_open(m_canonicalConverterName, &err); - ASSERT(U_SUCCESS(err)); - if (m_converterICU) -- ucnv_setFallback(m_converterICU, TRUE); -+ ucnv_setFallback(m_converterICU, true); - } - - int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)