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

Update qtwebkit to 5.212.0alpha4v0

Browse Source 
Changelog:
- https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4

Port changelog:
- Switch QT5_WEBKIT_VERSION from 5.212.0 to 5.212.0alpha4v0 which includes
  an EPOCH bump.
- Switch to py3, MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}
  - upstream: "QtWebKit does not require Python 2 anymore for building and can
    use Python 3 instead"
- Bump QT5_WEBKIT_VERSION/MODQT5_WEBKIT_VERSION consumer

sparc64 build by jca@ Thanks!
This commit is contained in:
rsadowski 2020-04-05 15:43:05 +00:00
parent 4d21714cc6
commit 7367c7e4a5
9 changed files with 63 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta/qt5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2020/03/13 16:53:53 rsadowski Exp $
# $OpenBSD: Makefile,v 1.12 2020/04/05 15:43:05 rsadowski Exp $
COMMENT-main = C++ general-purpose toolkit, meta-package
COMMENT-examples = examples for Qt5, meta-package
@ -6,6 +6,7 @@ COMMENT-examples = examples for Qt5, meta-package
PKGNAME = qt5-${MODQT5_VERSION}
PKGNAME-main = ${PKGNAME}
PKGNAME-examples = qt5-examples-${MODQT5_VERSION}
REVISION-main = 0
MULTI_PACKAGES = -main -examples

4
x11/qt5/Makefile.version
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile.version,v 1.10 2020/03/13 16:53:49 rsadowski Exp $
# $OpenBSD: Makefile.version,v 1.11 2020/04/05 15:43:05 rsadowski Exp $
# Common source for Qt5 version
QT5_VERSION = 5.13.2
QT5_DIST_VERSION = 5.13.2
QT5_WEBKIT_VERSION = 5.212.0
QT5_WEBKIT_VERSION = 5.212.0alpha4v0
# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.

3
x11/qt5/qttools/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2020/03/13 16:53:53 rsadowski Exp $
# $OpenBSD: Makefile,v 1.12 2020/04/05 15:43:05 rsadowski Exp $
QT5NAME = QtTools
COMMENT-main = Qt development tools
COMMENT-webview = Webkit-based Qt Designer plugin
PKGNAME-webview = qwebview-${VERSION}
REVISON-webview = 0
DPB_PROPERTIES = parallel

21
x11/qt5/qtwebkit/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2020/03/21 21:18:06 rsadowski Exp $
# $OpenBSD: Makefile,v 1.22 2020/04/05 15:43:06 rsadowski Exp $
COMMENT = QtWebKit with a more modern WebKit code base
@ -8,16 +8,15 @@ CATEGORIES = www
DPB_PROPERTIES = parallel
VERSION = ${QT5_WEBKIT_VERSION}
DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION:C/alpha4v0/-alpha4/}
PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
REVISION = 1
SHARED_LIBS += Qt5WebKit 3.0 # 5.9
SHARED_LIBS += Qt5WebKitWidgets 3.0 # 5.9
SHARED_LIBS += Qt5WebKit 3.1 # 5.9
SHARED_LIBS += Qt5WebKitWidgets 3.1 # 5.9
SHARED_LIBS += JavaScriptCore 0.0 # 5.212.9
SHARED_LIBS += WebCore 0.0 # 5.212.9
SHARED_LIBS += WebKit2 0.0 # 5.212.9
SHARED_LIBS += WebCore 1.0 # 5.212.9
SHARED_LIBS += WebKit2 0.1 # 5.212.9
SHARED_LIBS += WTF 0.0 # 5.212.9
# Mostly LGPLv2.1 or LGPLv3 for code; FDLv1.3 for documentation.
@ -47,6 +46,7 @@ CONFIGURE_STYLE = cmake
# Remove default "first" target and build all
ALL_TARGET =
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP = No
MODRUBY_RUNDEP = No
@ -59,6 +59,9 @@ BUILD_DEPENDS = devel/bison \
RUN_DEPENDS = geo/geoclue \
x11/dbus
# avoid using wrong $VERSION
RUN_DEPENDS-examples =
# no leveldb dependency, requires -lmemenv; QtWebKit uses internal version
LIB_DEPENDS = databases/sqlite3 \
graphics/libwebp \
@ -97,6 +100,8 @@ CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX="${WRKINST}${TRUEPREFIX}" \
-DKDE_INSTALL_LIBDIR=${WRKINST}${MODQT_LIBDIR} \
-DKDE_INSTALL_QMLDIR=${WRKINST}${MODQT_LIBDIR}/qml
CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${MODPY_BIN}
.include <bsd.port.arch.mk>
# sync with Source/JavaScriptCore/assembler/MacroAssembler.h

4
x11/qt5/qtwebkit/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qt/qtwebkit-5.212.0-alpha3.tar.xz) = NX7uWCRFV0Ry5BDr7OYy0G+g7JQ1j8Q0XypxOSLfXhc=
SIZE (qt/qtwebkit-5.212.0-alpha3.tar.xz) = 12457896
SHA256 (qt/qtwebkit-5.212.0-alpha4.tar.xz) = nKEm2pJzZk3SOjzNDJvrzre7U0vd10PbMcr2pabUqeY=
SIZE (qt/qtwebkit-5.212.0-alpha4.tar.xz) = 12528508

4
x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_JavaScriptCore_CMakeLists_txt,v 1.1 2020/02/19 16:08:53 rsadowski Exp $
$OpenBSD: patch-Source_JavaScriptCore_CMakeLists_txt,v 1.2 2020/04/05 15:43:06 rsadowski Exp $
Index: Source/JavaScriptCore/CMakeLists.txt
--- Source/JavaScriptCore/CMakeLists.txt.orig
+++ Source/JavaScriptCore/CMakeLists.txt
@@ -1286,6 +1286,7 @@ elseif (WTF_CPU_S390)
@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390)
elseif (WTF_CPU_S390X)
elseif (WTF_CPU_MIPS)
elseif (WTF_CPU_SH4)

31
x11/qt5/qtwebkit/patches/patch-Source_WebCore_dom_Document_cpp
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-Source_WebCore_dom_Document_cpp,v 1.2 2020/02/19 16:08:53 rsadowski Exp $
Fix build with icu4c >=65
Index: Source/WebCore/dom/Document.cpp
--- Source/WebCore/dom/Document.cpp.orig
+++ Source/WebCore/dom/Document.cpp
@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* character
unsigned i = 0;
UChar32 c;
- U16_NEXT(characters, i, length, c)
+ U16_NEXT(characters, i, length, c);
if (!isValidNameStart(c))
return false;
while (i < length) {
- U16_NEXT(characters, i, length, c)
+ U16_NEXT(characters, i, length, c);
if (!isValidNamePart(c))
return false;
}
@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif
for (unsigned i = 0; i < length;) {
UChar32 c;
- U16_NEXT(qualifiedName, i, length, c)
+ U16_NEXT(qualifiedName, i, length, c);
if (c == ':') {
if (sawColon) {
ec = NAMESPACE_ERR;

4
x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp,v 1.1 2020/02/19 16:08:53 rsadowski Exp $
$OpenBSD: patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp,v 1.2 2020/04/05 15:43:06 rsadowski Exp $
Index: Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
--- Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp.orig
+++ Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
@@ -964,6 +964,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& si
@@ -965,6 +965,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& si
if (view->needsLayout())
view->layout();
view->adjustViewSize();

76
x11/qt5/qtwebkit/pkg/PLIST
View File

@ -1,37 +1,37 @@
@comment $OpenBSD: PLIST,v 1.3 2020/02/19 16:08:53 rsadowski Exp $
@comment $OpenBSD: PLIST,v 1.4 2020/04/05 15:43:06 rsadowski Exp $
@conflict qt5-<5.6
@pkgpath x11/qt5/qtwebkit,-main
include/X11/qt5/QtWebKit/
include/X11/qt5/QtWebKit/${VERSION}/
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qhttpheader_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquicknetworkreply_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquicknetworkrequest_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickurlschemedelegate_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebpage_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebpage_p_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebview_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebview_p_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qtwebsecurityorigin_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebchannelwebkittransport_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdatabase_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdownloaditem_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdownloaditem_p_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebelement_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebhistory_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebiconimageprovider_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebkittest_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebloadrequest_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationhistory_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationhistory_p_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationrequest_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpermissionrequest_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebplugindatabase_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpreferences_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpreferences_p_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebscriptworld_p.h
include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebsecurityorigin_p.h
include/X11/qt5/QtWebKit/5.212.0/
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkreply_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkrequest_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickurlschemedelegate_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qtwebsecurityorigin_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebchannelwebkittransport_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebelement_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebhistory_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebiconimageprovider_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebkittest_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebloadrequest_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationrequest_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpermissionrequest_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebplugindatabase_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebscriptworld_p.h
include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebsecurityorigin_p.h
include/X11/qt5/QtWebKit/QWebDatabase
include/X11/qt5/QtWebKit/QWebElement
include/X11/qt5/QtWebKit/QWebElementCollection
@ -66,13 +66,13 @@ include/X11/qt5/QtWebKit/qwebpluginfactory.h
include/X11/qt5/QtWebKit/qwebsecurityorigin.h
include/X11/qt5/QtWebKit/qwebsettings.h
include/X11/qt5/QtWebKitWidgets/
include/X11/qt5/QtWebKitWidgets/${VERSION}/
include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/
include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/
include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebframe_p.h
include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebinspector_p.h
include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebpage_p.h
include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebviewaccessible_p.h
include/X11/qt5/QtWebKitWidgets/5.212.0/
include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/
include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/
include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebframe_p.h
include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebinspector_p.h
include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebpage_p.h
include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebviewaccessible_p.h
include/X11/qt5/QtWebKitWidgets/QGraphicsWebView
include/X11/qt5/QtWebKitWidgets/QWebFrame
include/X11/qt5/QtWebKitWidgets/QWebHitTestResult