From: Rafael Sadowski Subject: Re: x11/qt5: Qt 5.15.18 + KDE patches To: ports@openbsd.org Date: Mon, 24 Nov 2025 07:42:55 +0100 On Tue Nov 04, 2025 at 12:43:59PM +0100, Rafael Sadowski wrote: > The kde patchset collection has been rebased on top of qt 5.15.18. > I decided to switch all ports to use the KDE "kde/5.15" branch > (with a few exceptions where it does not exist because there are > no patches) > > The good news is that QTWebEngine is now also at 5.15.18. > (based on chromium version: 87.0.4280.144, patched with security > patches up to: 130.0.6723.59) > > Feedback and review welcome. > Improved diff. Some headers were lost in the last diff. If you mix Qt versions, everything is doomed. So there is nothing more exciting in these diff. diff --git a/x11/qt5/Makefile.inc b/x11/qt5/Makefile.inc index 0609e0107a2..fec08642773 100644 --- a/x11/qt5/Makefile.inc +++ b/x11/qt5/Makefile.inc @@ -47,8 +47,8 @@ PERMIT_PACKAGE ?= Yes .if defined(KDE_VERSION) && defined(KDE_COMMIT) DIST_TUPLE += kde qt qt/${QT5NAME:L} ${KDE_COMMIT} . .else -SITES ?= https://download.qt.io/official_releases/qt/${VERSION:R}/${VERSION}/submodules/ \ - https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${VERSION:R}/${VERSION}/submodules/ \ +SITES ?= https://download.qt.io/archive/qt/${VERSION:R}/${VERSION}/submodules/ \ + https://mirrors.ocf.berkeley.edu/qt/archive/qt/${VERSION:R}/${VERSION}/submodules/ \ https://download.qt.io/archive/qt/${VERSION:R}/${VERSION}/submodules/ .endif diff --git a/x11/qt5/Makefile.version b/x11/qt5/Makefile.version index ff385165274..8b294d4976f 100644 --- a/x11/qt5/Makefile.version +++ b/x11/qt5/Makefile.version @@ -1,7 +1,6 @@ # Common source for Qt5 version -QT5_VERSION ?= 5.15.16 -QT5_WEBENGINE_VERSION = 5.15.17 +QT5_VERSION ?= 5.15.18 # This one is used for building dependencies for examples and documentation, # which obviously should be in sync with core packages. diff --git a/x11/qt5/docs/Makefile b/x11/qt5/docs/Makefile index cfbf8036114..ebd8f3f3da5 100644 --- a/x11/qt5/docs/Makefile +++ b/x11/qt5/docs/Makefile @@ -1,12 +1,13 @@ COMMENT-html = HTML documentation for Qt5 COMMENT-qch = qdoc-compiled documentation for Qt5 +#KDE_COMMIT = ddb2afda6f713259fc8d95fb22a1c96bb448c36a +#KDE_VERSION = 0 + PKGNAME = qt5-docs-${QT5_VERSION} PKGNAME-html = qt5-html-${QT5_VERSION} PKGNAME-qch = qt5-qch-${QT5_VERSION} -REVISION-html = 0 - MULTI_PACKAGES = -html -qch SUBPACKAGE ?= -html diff --git a/x11/qt5/docs/distinfo b/x11/qt5/docs/distinfo index ec71d14852d..e015bd672ff 100644 --- a/x11/qt5/docs/distinfo +++ b/x11/qt5/docs/distinfo @@ -1,46 +1,46 @@ -SHA256 (qt/qt3d-everywhere-opensource-src-5.15.16.tar.xz) = KYzWg4iiRBNprSXpf27kOC2k+o5kBcRQXW1KxxZZc9s= -SHA256 (qt/qtcharts-everywhere-opensource-src-5.15.16.tar.xz) = J7ql7THgE9jt9PVhGKCG5O5eO9jk3+qWqQo+eVnKuOE= -SHA256 (qt/qtdoc-everywhere-opensource-src-5.15.16.tar.xz) = 0ItthqKsIK1aKTi7Mg7vZFkcDKs23gFDMYObGtK5WXE= -SHA256 (qt/qtgamepad-everywhere-opensource-src-5.15.16.tar.xz) = SYPaQNETKOAb/MkPwV60cU65TLt2QOBbly3Ml50UvYA= -SHA256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.16.tar.xz) = 0YWBNzfzg1LYGzpAWpJDrKGve/6+N6uiKkCZpwMfZAo= -SHA256 (qt/qtimageformats-everywhere-opensource-src-5.15.16.tar.xz) = 5wHEKaFrLvBLEv0a3y0kZhl91iYYFgIreCSsxsyDGoI= -SHA256 (qt/qtlocation-everywhere-opensource-src-5.15.16.tar.xz) = MwYcmz66tnPQrGseAUt7E5yeyfpgScBccRSH3mm2XIc= -SHA256 (qt/qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz) = yKHOHkvkbkBexY8VMKfFFmO4tLwHmKtG1S5jmOJ0FzQ= -SHA256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz) = v6bBiNMXuf+mFsXQbr7mgHZLGCY8sMppAnupSoAVSVc= -SHA256 (qt/qtpurchasing-everywhere-opensource-src-5.15.16.tar.xz) = JBvfUj2eS3J6QEO7eTicZvLk1+zVyziywTJ+sLDTt34= -SHA256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.16.tar.xz) = Wn7D1WQAPR5jiug+ZBNMZ+jkD+BLWwM5jUN2GC1rbvg= -SHA256 (qt/qtscript-everywhere-opensource-src-5.15.16.tar.xz) = C5i6pu7OfQ54YFkN1n+vRSSZCW9i8z0WVW/TisI27sI= -SHA256 (qt/qtscxml-everywhere-opensource-src-5.15.16.tar.xz) = YNqRb36l/T4UjBoD/qNtuh/3qBivvZNU87Coz4I783g= -SHA256 (qt/qtsensors-everywhere-opensource-src-5.15.16.tar.xz) = zVzDJf2dae+asWZcZHVi61Wpg+cz9ImNaOW+PpkFQBI= -SHA256 (qt/qtserialbus-everywhere-opensource-src-5.15.16.tar.xz) = jWAHRzZ1Mu1WPnW4rOjcLk5PypKAqWQoGyoa1J4O6rY= -SHA256 (qt/qtserialport-everywhere-opensource-src-5.15.16.tar.xz) = 4Tlxj3rOCCpp/GV2IXjOlZ14J6joe+l3NVWmxkkVTrw= -SHA256 (qt/qtspeech-everywhere-opensource-src-5.15.16.tar.xz) = UZFa7o8Wv+XFEZDhggaaG2CRSKgG57z0r6Ja55asX9Y= -SHA256 (qt/qtsvg-everywhere-opensource-src-5.15.16.tar.xz) = zE4yAIS8KILcblUikEXOmUaZRt6rjAdargZBPicQC8E= -SHA256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz) = EA5nbKXtpimui89ETZEX04jF+MpHLAt67eKvok6xlx8= -SHA256 (qt/qtwebchannel-everywhere-opensource-src-5.15.16.tar.xz) = 4xKWy5iGPf+kBOUyjLwBD8hwptKK0ggJwCTHBkMHqXA= -SHA256 (qt/qtwebsockets-everywhere-opensource-src-5.15.16.tar.xz) = b7dca7x13+1paRBORtjw4MSzYhAXJT4+MRcLHgunFM4= -SHA256 (qt/qtx11extras-everywhere-opensource-src-5.15.16.tar.xz) = uhKb8yR622SbK2/8tHh4LCoFeln59hePpUDlEy+K4rI= -SHA256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.16.tar.xz) = HIUxI/DxGll+7ocM/GJHwlabD9FL023k4y4EBXXYeUA= -SIZE (qt/qt3d-everywhere-opensource-src-5.15.16.tar.xz) = 118265056 -SIZE (qt/qtcharts-everywhere-opensource-src-5.15.16.tar.xz) = 4246260 -SIZE (qt/qtdoc-everywhere-opensource-src-5.15.16.tar.xz) = 5779544 -SIZE (qt/qtgamepad-everywhere-opensource-src-5.15.16.tar.xz) = 380928 -SIZE (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.16.tar.xz) = 14034764 -SIZE (qt/qtimageformats-everywhere-opensource-src-5.15.16.tar.xz) = 1889480 -SIZE (qt/qtlocation-everywhere-opensource-src-5.15.16.tar.xz) = 6548480 -SIZE (qt/qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz) = 3824912 -SIZE (qt/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz) = 135600 -SIZE (qt/qtpurchasing-everywhere-opensource-src-5.15.16.tar.xz) = 300916 -SIZE (qt/qtremoteobjects-everywhere-opensource-src-5.15.16.tar.xz) = 370484 -SIZE (qt/qtscript-everywhere-opensource-src-5.15.16.tar.xz) = 2656892 -SIZE (qt/qtscxml-everywhere-opensource-src-5.15.16.tar.xz) = 429268 -SIZE (qt/qtsensors-everywhere-opensource-src-5.15.16.tar.xz) = 2051048 -SIZE (qt/qtserialbus-everywhere-opensource-src-5.15.16.tar.xz) = 350832 -SIZE (qt/qtserialport-everywhere-opensource-src-5.15.16.tar.xz) = 314732 -SIZE (qt/qtspeech-everywhere-opensource-src-5.15.16.tar.xz) = 95716 -SIZE (qt/qtsvg-everywhere-opensource-src-5.15.16.tar.xz) = 1881028 -SIZE (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz) = 10951872 -SIZE (qt/qtwebchannel-everywhere-opensource-src-5.15.16.tar.xz) = 203080 -SIZE (qt/qtwebsockets-everywhere-opensource-src-5.15.16.tar.xz) = 253084 -SIZE (qt/qtx11extras-everywhere-opensource-src-5.15.16.tar.xz) = 137856 -SIZE (qt/qtxmlpatterns-everywhere-opensource-src-5.15.16.tar.xz) = 5181984 +SHA256 (qt/qt3d-everywhere-opensource-src-5.15.18.tar.xz) = ZCQzznoFj1N9k3ZqcrQPg478iX+eRCqCWCTQlO3hs6M= +SHA256 (qt/qtcharts-everywhere-opensource-src-5.15.18.tar.xz) = Akit3KCDgRXhP8VSLxlVeS+XmXQs3LarwPzi87EzJlU= +SHA256 (qt/qtdoc-everywhere-opensource-src-5.15.18.tar.xz) = WjNawgwdfN0/zsdyTZSIyauvSCTN2tL1ogI4veM/UXI= +SHA256 (qt/qtgamepad-everywhere-opensource-src-5.15.18.tar.xz) = f1z2mLfiGgdveOS60NRj7xvcWLZLnDEmK3RVb1a1v5k= +SHA256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.18.tar.xz) = 2+/KWQ7x0fHHnDlvDyj3PMFkZcOoCAOsxKP/ovbWMiU= +SHA256 (qt/qtimageformats-everywhere-opensource-src-5.15.18.tar.xz) = v4YACiGhKA96iq8S3ZoQ5Z53gWllO1PIatjzRvs5wGY= +SHA256 (qt/qtlocation-everywhere-opensource-src-5.15.18.tar.xz) = 6i7VKwhZif440Of5CA2kEE1HB9YNjTtfWkeLm+wyWjw= +SHA256 (qt/qtmultimedia-everywhere-opensource-src-5.15.18.tar.xz) = THf7YB0Q/f/kpHSfkAipadd4w7sOZzS9o55/Rs0Rw4w= +SHA256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.18.tar.xz) = atMIPiu2H38mWTLZUhtbjLFWsYuunurXH3yLsNTVnIY= +SHA256 (qt/qtpurchasing-everywhere-opensource-src-5.15.18.tar.xz) = u0cP4GiYTJ8kRhIekngIHNbj2rBaMuSNoFEPHDJOhDk= +SHA256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.18.tar.xz) = ZrQVOHQKUXlzIZ2ILR3fcojz/cvVkZIF2G9TnC+2svY= +SHA256 (qt/qtscript-everywhere-opensource-src-5.15.18.tar.xz) = ZxbSh40hRvE/EfD7EvNDfAnYUDO90GhO+stD6gD6GCg= +SHA256 (qt/qtscxml-everywhere-opensource-src-5.15.18.tar.xz) = CoJeWgzeoM+jwWKTGWXG+NxlFpIM8EVZHQ9wLorGzzg= +SHA256 (qt/qtsensors-everywhere-opensource-src-5.15.18.tar.xz) = yASDaULByzY+cbtC0yzXj06MMrEbcScV2uGRuc03IEA= +SHA256 (qt/qtserialbus-everywhere-opensource-src-5.15.18.tar.xz) = QWMP0oOBS9+U0cU4h+RmZ6N06X5a67tJdbJqcBz1/eg= +SHA256 (qt/qtserialport-everywhere-opensource-src-5.15.18.tar.xz) = IicznW5fQs0/usXrYpDyt2jMfzLEk7WHxXNeNC7zpY8= +SHA256 (qt/qtspeech-everywhere-opensource-src-5.15.18.tar.xz) = CHIbdbJRP3Stm1sFuShUDk+zeIfm+jD/T4uoEy30ftE= +SHA256 (qt/qtsvg-everywhere-opensource-src-5.15.18.tar.xz) = 9A2I/3klEq81AFY7BfN7e4NZETW5QTRU/TCIV1lNiek= +SHA256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.18.tar.xz) = RdvYZAMwUdx8q642X0hV2P7eUe9VPF5mzfh8Q5OQ/Gw= +SHA256 (qt/qtwebchannel-everywhere-opensource-src-5.15.18.tar.xz) = gNbADHc+fe2CjrnW1tmwjUmDB9mREN0incm4s+0PFC8= +SHA256 (qt/qtwebsockets-everywhere-opensource-src-5.15.18.tar.xz) = jPwT1kZatDcXxQipC2vhXFzsSVKvs7jG5Rktq+g+xhA= +SHA256 (qt/qtx11extras-everywhere-opensource-src-5.15.18.tar.xz) = Mecr6pWfkJO7xBAjq2f50jvPYsH1VwZMqki0wvdwmRc= +SHA256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.18.tar.xz) = tp+5H6rNEw6QUXQt06AyQp0BzG30AFYKzTlNqf/PjyM= +SIZE (qt/qt3d-everywhere-opensource-src-5.15.18.tar.xz) = 118255028 +SIZE (qt/qtcharts-everywhere-opensource-src-5.15.18.tar.xz) = 4232420 +SIZE (qt/qtdoc-everywhere-opensource-src-5.15.18.tar.xz) = 5766900 +SIZE (qt/qtgamepad-everywhere-opensource-src-5.15.18.tar.xz) = 366792 +SIZE (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.18.tar.xz) = 14021560 +SIZE (qt/qtimageformats-everywhere-opensource-src-5.15.18.tar.xz) = 1903016 +SIZE (qt/qtlocation-everywhere-opensource-src-5.15.18.tar.xz) = 6534556 +SIZE (qt/qtmultimedia-everywhere-opensource-src-5.15.18.tar.xz) = 3810252 +SIZE (qt/qtnetworkauth-everywhere-opensource-src-5.15.18.tar.xz) = 121828 +SIZE (qt/qtpurchasing-everywhere-opensource-src-5.15.18.tar.xz) = 501352 +SIZE (qt/qtremoteobjects-everywhere-opensource-src-5.15.18.tar.xz) = 356972 +SIZE (qt/qtscript-everywhere-opensource-src-5.15.18.tar.xz) = 2644892 +SIZE (qt/qtscxml-everywhere-opensource-src-5.15.18.tar.xz) = 415812 +SIZE (qt/qtsensors-everywhere-opensource-src-5.15.18.tar.xz) = 2037808 +SIZE (qt/qtserialbus-everywhere-opensource-src-5.15.18.tar.xz) = 337096 +SIZE (qt/qtserialport-everywhere-opensource-src-5.15.18.tar.xz) = 301032 +SIZE (qt/qtspeech-everywhere-opensource-src-5.15.18.tar.xz) = 81340 +SIZE (qt/qtsvg-everywhere-opensource-src-5.15.18.tar.xz) = 1867656 +SIZE (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.18.tar.xz) = 10938608 +SIZE (qt/qtwebchannel-everywhere-opensource-src-5.15.18.tar.xz) = 189272 +SIZE (qt/qtwebsockets-everywhere-opensource-src-5.15.18.tar.xz) = 239240 +SIZE (qt/qtx11extras-everywhere-opensource-src-5.15.18.tar.xz) = 123980 +SIZE (qt/qtxmlpatterns-everywhere-opensource-src-5.15.18.tar.xz) = 5169388 diff --git a/x11/qt5/qt3d/Makefile b/x11/qt5/qt3d/Makefile index 0b5016293cb..eb1b9fadbed 100644 --- a/x11/qt5/qt3d/Makefile +++ b/x11/qt5/qt3d/Makefile @@ -1,8 +1,8 @@ QT5NAME = Qt3D COMMENT-main = Qt5 components for 3D graphics -KDE_COMMIT = 1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d -KDE_VERSION = 3 +KDE_COMMIT = 208f5835e6c2415c9dc5cbe92bba83aa28bab7ea +KDE_VERSION = 0 MULTI_PACKAGES = -main -examples diff --git a/x11/qt5/qt3d/distinfo b/x11/qt5/qt3d/distinfo index 1073c85c59e..1e45ed2ec1a 100644 --- a/x11/qt5/qt3d/distinfo +++ b/x11/qt5/qt3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qt3d-1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d.tar.gz) = qPjcOpyujLS+oiNK6igTIlkQ0A5dGW8yKwSgv7LTjGQ= -SIZE (qt/qt-qt/qt3d-1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d.tar.gz) = 84550544 +SHA256 (qt/qt-qt/qt3d-208f5835e6c2415c9dc5cbe92bba83aa28bab7ea.tar.gz) = cpBXnqEMuZpQAztul0H5MQultQM1V189Sepjb591bkU= +SIZE (qt/qt-qt/qt3d-208f5835e6c2415c9dc5cbe92bba83aa28bab7ea.tar.gz) = 84550179 diff --git a/x11/qt5/qtbase/Makefile b/x11/qt5/qtbase/Makefile index cb26a901a60..3feead500ba 100644 --- a/x11/qt5/qtbase/Makefile +++ b/x11/qt5/qtbase/Makefile @@ -1,9 +1,7 @@ QT5NAME = QtBase -KDE_COMMIT = 2529f7f0c2333d437089c775c9c30f624d1fd5bc -KDE_VERSION = 130 - -REVISION-main = 0 +KDE_COMMIT = bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8 +KDE_VERSION = 109 COMMENT-main = C++ general-purpose toolkit COMMENT-global = global Qt5 documentation internals @@ -24,7 +22,7 @@ DPB_PROPERTIES = parallel SHARED_LIBS += Qt5Concurrent 4.1 # 5.15 SHARED_LIBS += Qt5Core 6.0 # 5.15 SHARED_LIBS += Qt5DBus 3.0 # 5.15 -SHARED_LIBS += Qt5Gui 4.2 # 5.15 +SHARED_LIBS += Qt5Gui 4.3 # 5.15 SHARED_LIBS += Qt5Network 4.0 # 5.15 SHARED_LIBS += Qt5OpenGL 3.0 # 5.15 SHARED_LIBS += Qt5PrintSupport 3.0 # 5.15 @@ -35,13 +33,13 @@ SHARED_LIBS += Qt5Xml 3.0 # 5.15 SHARED_LIBS += Qt5EglFSDeviceIntegration 1.0 # 5.15 SHARED_LIBS += Qt5EglFsKmsSupport 1.0 # 5.15 SHARED_LIBS += Qt5OpenGLExtensions 0.0 # 5.15 -SHARED_LIBS += Qt5XcbQpa 1.0 # 5.15 +SHARED_LIBS += Qt5XcbQpa 2.0 # 5.15 WANTLIB-main += ${COMPILER_LIBCXX} EGL GL ICE SM X11 X11-xcb Xext atk-1.0 WANTLIB-main += c cairo cairo-gobject crypto cups dbus-1 double-conversion WANTLIB-main += drm execinfo fontconfig freetype gbm gdk-3 gdk_pixbuf-2.0 WANTLIB-main += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz -WANTLIB-main += icudata icui18n icuuc jpeg m pango-1.0 pangocairo-1.0 +WANTLIB-main += icudata icui18n icuuc intl jpeg m pango-1.0 pangocairo-1.0 WANTLIB-main += pcre2-16 png sqlite3 ssl xcb xcb-glx xcb-icccm xcb-image WANTLIB-main += xcb-keysyms xcb-randr xcb-render xcb-render-util xcb-shape WANTLIB-main += xcb-shm xcb-sync xcb-xfixes xcb-xinerama xcb-xinput @@ -49,14 +47,9 @@ WANTLIB-main += xcb-xkb xkbcommon xkbcommon-x11 z zstd WANTLIB-global = -WANTLIB-mysql = ${COMPILER_LIBCXX} Qt5Core Qt5Sql -WANTLIB-mysql += m pthread mariadb - -WANTLIB-psql = ${COMPILER_LIBCXX} Qt5Core Qt5Sql -WANTLIB-psql += m pthread pq - -WANTLIB-tds = ${COMPILER_LIBCXX} Qt5Core Qt5Sql -WANTLIB-tds += m pthread sybdb +WANTLIB-mysql += ${COMPILER_LIBCXX} Qt5Core Qt5Sql m mariadb +WANTLIB-psql += ${COMPILER_LIBCXX} Qt5Core Qt5Sql m pq +WANTLIB-tds += ${COMPILER_LIBCXX} Qt5Core Qt5Sql m sybdb # there is no -sqlite3 because it's heavily used by Qt itself (.qch files) MULTI_PACKAGES = -main -examples -global -mysql -psql -tds @@ -83,8 +76,6 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \ x11/gtk+3 \ x11/xkbcommon>=1.0.1 -# those come from gthread-2.0, not used by Qt itself -WANTLIB-main += intl LIB_DEPENDS-main += devel/gettext,-runtime LIB_DEPENDS-global = diff --git a/x11/qt5/qtbase/distinfo b/x11/qt5/qtbase/distinfo index 5c6dca3c7fa..9613abf1ab0 100644 --- a/x11/qt5/qtbase/distinfo +++ b/x11/qt5/qtbase/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtbase-2529f7f0c2333d437089c775c9c30f624d1fd5bc.tar.gz) = R2XGr8l/OUs5suNWiqOy0QbcAixH1H8fDpXy2RTEMIY= -SIZE (qt/qt-qt/qtbase-2529f7f0c2333d437089c775c9c30f624d1fd5bc.tar.gz) = 69586499 +SHA256 (qt/qt-qt/qtbase-bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8.tar.gz) = vb06HqsDM4XMz2ctpbyaseIOTt77QdZnTyw9nuI4j8M= +SIZE (qt/qt-qt/qtbase-bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8.tar.gz) = 69832273 diff --git a/x11/qt5/qtcharts/Makefile b/x11/qt5/qtcharts/Makefile index e2bb195087e..2e1719c2c36 100644 --- a/x11/qt5/qtcharts/Makefile +++ b/x11/qt5/qtcharts/Makefile @@ -1,8 +1,8 @@ QT5NAME = QtCharts COMMENT-main = Qt5 components for drawing 2D charts -KDE_COMMIT = 4e4fc559c61d1fc2542add48d2b3c490214e9936 -KDE_VERSION = 3 +KDE_COMMIT = 1093fb53ced126100d14af30a8adffd29b7ef855 +KDE_VERSION = 0 MULTI_PACKAGES = -main -examples diff --git a/x11/qt5/qtcharts/distinfo b/x11/qt5/qtcharts/distinfo index 6f1035509d2..e90f78cd978 100644 --- a/x11/qt5/qtcharts/distinfo +++ b/x11/qt5/qtcharts/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtcharts-4e4fc559c61d1fc2542add48d2b3c490214e9936.tar.gz) = eR9uObLRu8BhObV4pxqzV5TX/qBH413zR+ut3wXpjk0= -SIZE (qt/qt-qt/qtcharts-4e4fc559c61d1fc2542add48d2b3c490214e9936.tar.gz) = 4730956 +SHA256 (qt/qt-qt/qtcharts-1093fb53ced126100d14af30a8adffd29b7ef855.tar.gz) = 9IQPiOJ4s4EUNxUAvz+FeTtUoi1xGABleU5eqnFCUEk= +SIZE (qt/qt-qt/qtcharts-1093fb53ced126100d14af30a8adffd29b7ef855.tar.gz) = 4730924 diff --git a/x11/qt5/qtcharts/pkg/PLIST-examples b/x11/qt5/qtcharts/pkg/PLIST-examples index 164aee7652c..77c257a3e4d 100644 --- a/x11/qt5/qtcharts/pkg/PLIST-examples +++ b/x11/qt5/qtcharts/pkg/PLIST-examples @@ -4,6 +4,8 @@ lib/qt5/examples/charts/areachart/ lib/qt5/examples/charts/areachart/areachart.pro lib/qt5/examples/charts/areachart/main.cpp lib/qt5/examples/charts/audio/ +lib/qt5/examples/charts/audio/apple/ +lib/qt5/examples/charts/audio/apple/Info.qmake.plist lib/qt5/examples/charts/audio/audio.pro lib/qt5/examples/charts/audio/main.cpp lib/qt5/examples/charts/audio/widget.cpp diff --git a/x11/qt5/qtcharts/pkg/PLIST-main b/x11/qt5/qtcharts/pkg/PLIST-main index 2764da3f2ee..70e6ac7de81 100644 --- a/x11/qt5/qtcharts/pkg/PLIST-main +++ b/x11/qt5/qtcharts/pkg/PLIST-main @@ -280,8 +280,6 @@ lib/pkgconfig/Qt5Charts.pc lib/qt5/cmake/Qt5Charts/ lib/qt5/cmake/Qt5Charts/Qt5ChartsConfig.cmake lib/qt5/cmake/Qt5Charts/Qt5ChartsConfigVersion.cmake -lib/qt5/examples/charts/audio/apple/ -lib/qt5/examples/charts/audio/apple/Info.qmake.plist lib/qt5/libQt5Charts.la lib/qt5/libQt5Charts.prl @lib lib/qt5/libQt5Charts.so.${LIBQt5Charts_VERSION} diff --git a/x11/qt5/qtconnectivity/Makefile b/x11/qt5/qtconnectivity/Makefile index b5098ee5b58..0426d42d666 100644 --- a/x11/qt5/qtconnectivity/Makefile +++ b/x11/qt5/qtconnectivity/Makefile @@ -1,8 +1,8 @@ QT5NAME = QtConnectivity COMMENT-main = Bluetooth and NFC support for Qt5 -KDE_COMMIT = b242dc4fd4bd68809872d8c1d6c1e63825692893 -KDE_VERSION = 3 +KDE_COMMIT = f1be05c8efeb65b77a8bfd21763ab55bb5c04906 +KDE_VERSION = 1 SHARED_LIBS += Qt5Bluetooth 3.0 # 5.9 SHARED_LIBS += Qt5Nfc 3.0 # 5.9 diff --git a/x11/qt5/qtconnectivity/distinfo b/x11/qt5/qtconnectivity/distinfo index cbfb6053f87..69bf3cca446 100644 --- a/x11/qt5/qtconnectivity/distinfo +++ b/x11/qt5/qtconnectivity/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtconnectivity-b242dc4fd4bd68809872d8c1d6c1e63825692893.tar.gz) = XvUjgeJjGGq7fgy5Zu5ADcRQmyjxJcWBad/rntNlcv4= -SIZE (qt/qt-qt/qtconnectivity-b242dc4fd4bd68809872d8c1d6c1e63825692893.tar.gz) = 3433417 +SHA256 (qt/qt-qt/qtconnectivity-f1be05c8efeb65b77a8bfd21763ab55bb5c04906.tar.gz) = 9VKwLlXvrR9SDW/ilOAQL5/7cFFyTo8NfJGp4dtbCPA= +SIZE (qt/qt-qt/qtconnectivity-f1be05c8efeb65b77a8bfd21763ab55bb5c04906.tar.gz) = 3433855 diff --git a/x11/qt5/qtdatavis3d/Makefile b/x11/qt5/qtdatavis3d/Makefile index 6b35c02bebf..d5c0f3a7fca 100644 --- a/x11/qt5/qtdatavis3d/Makefile +++ b/x11/qt5/qtdatavis3d/Makefile @@ -1,8 +1,8 @@ QT5NAME = QtDataVis3D COMMENT-main = Qt5 3D data visualization components -KDE_COMMIT = db75c351cd0c2b93016ca489ffb9db806e6fd6e9 -KDE_VERSION = 3 +KDE_COMMIT = d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60 +KDE_VERSION = 0 MULTI_PACKAGES = -main -examples diff --git a/x11/qt5/qtdatavis3d/distinfo b/x11/qt5/qtdatavis3d/distinfo index ab25187b7b4..706df87c870 100644 --- a/x11/qt5/qtdatavis3d/distinfo +++ b/x11/qt5/qtdatavis3d/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtdatavis3d-db75c351cd0c2b93016ca489ffb9db806e6fd6e9.tar.gz) = BbXAJuI70n167sM3EsEYvSYvfENN5xGnbqLdbjrICoc= -SIZE (qt/qt-qt/qtdatavis3d-db75c351cd0c2b93016ca489ffb9db806e6fd6e9.tar.gz) = 5614442 +SHA256 (qt/qt-qt/qtdatavis3d-d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60.tar.gz) = qxX2TRH9n8sHC1IFZLREqs0pZgDd8P08if+wRTdd6r8= +SIZE (qt/qt-qt/qtdatavis3d-d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60.tar.gz) = 5614446 diff --git a/x11/qt5/qtdeclarative/Makefile b/x11/qt5/qtdeclarative/Makefile index 0b3c796c580..587a0c58244 100644 --- a/x11/qt5/qtdeclarative/Makefile +++ b/x11/qt5/qtdeclarative/Makefile @@ -1,14 +1,14 @@ QT5NAME = QtDeclarative COMMENT-main = Qt5 Quick and QML components -KDE_COMMIT = e2b38659cb79104f157e1d0099c01e545d04d0db -KDE_VERSION = 3 +KDE_COMMIT = 1189557a50f11e7bc5716467a149cd09987a9f88 +KDE_VERSION = 22 MULTI_PACKAGES = -main -examples DPB_PROPERTIES = parallel SHARED_LIBS = Qt5Qml 5.0 # 5.9 -SHARED_LIBS += Qt5Quick 6.1 # 5.9 +SHARED_LIBS += Qt5Quick 7.0 # 5.9 SHARED_LIBS += Qt5QuickParticles 3.0 # 5.9 SHARED_LIBS += Qt5QuickTest 3.0 # 5.9 SHARED_LIBS += Qt5QuickWidgets 3.0 # 5.9 diff --git a/x11/qt5/qtdeclarative/distinfo b/x11/qt5/qtdeclarative/distinfo index e4785aadd1c..45c1e3123f7 100644 --- a/x11/qt5/qtdeclarative/distinfo +++ b/x11/qt5/qtdeclarative/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtdeclarative-e2b38659cb79104f157e1d0099c01e545d04d0db.tar.gz) = cCR6uc8QV3LYitzNSBprn8vAvNvJGKZ+jJ2cN0ZO4XI= -SIZE (qt/qt-qt/qtdeclarative-e2b38659cb79104f157e1d0099c01e545d04d0db.tar.gz) = 24429120 +SHA256 (qt/qt-qt/qtdeclarative-1189557a50f11e7bc5716467a149cd09987a9f88.tar.gz) = 5/CD8NETWyvl/u3i/fROmMXB67YwaWms2wH+9BaZARA= +SIZE (qt/qt-qt/qtdeclarative-1189557a50f11e7bc5716467a149cd09987a9f88.tar.gz) = 24427001 diff --git a/x11/qt5/qtgamepad/Makefile b/x11/qt5/qtgamepad/Makefile index 96370d8a44f..8e2c13f292c 100644 --- a/x11/qt5/qtgamepad/Makefile +++ b/x11/qt5/qtgamepad/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtGamepad COMMENT-main = Qt5 gamepad events handling components +KDE_COMMIT = 269fc0731f6838a1c02877a83c0ada23659c69fc +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5Gamepad 1.0 # 5.9 @@ -15,4 +18,7 @@ FLAVORS = debug MODQMAKE_RECURSIVE = No +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtgamepad/distinfo b/x11/qt5/qtgamepad/distinfo index 4e85346bbfd..9ec6234d618 100644 --- a/x11/qt5/qtgamepad/distinfo +++ b/x11/qt5/qtgamepad/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtgamepad-everywhere-opensource-src-5.15.16.tar.xz) = SYPaQNETKOAb/MkPwV60cU65TLt2QOBbly3Ml50UvYA= -SIZE (qt/qtgamepad-everywhere-opensource-src-5.15.16.tar.xz) = 380928 +SHA256 (qt/qt-qt/qtgamepad-269fc0731f6838a1c02877a83c0ada23659c69fc.tar.gz) = kj8OcV8ExKBDGcI6XyPGTgo/KYAamt4PXpB9wHJzxQg= +SIZE (qt/qt-qt/qtgamepad-269fc0731f6838a1c02877a83c0ada23659c69fc.tar.gz) = 401211 diff --git a/x11/qt5/qtgraphicaleffects/Makefile b/x11/qt5/qtgraphicaleffects/Makefile index 65058f50f12..3ffbc78ddc5 100644 --- a/x11/qt5/qtgraphicaleffects/Makefile +++ b/x11/qt5/qtgraphicaleffects/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtGraphicalEffects COMMENT = UI effects library for Qt Quick +KDE_COMMIT = dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5 +KDE_VERSION = 0 + WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml WANTLIB += Qt5QmlModels Qt5Quick m @@ -8,4 +11,7 @@ LIB_DEPENDS = x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtgraphicaleffects/distinfo b/x11/qt5/qtgraphicaleffects/distinfo index d9d1164376e..0c0b1482202 100644 --- a/x11/qt5/qtgraphicaleffects/distinfo +++ b/x11/qt5/qtgraphicaleffects/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.16.tar.xz) = 0YWBNzfzg1LYGzpAWpJDrKGve/6+N6uiKkCZpwMfZAo= -SIZE (qt/qtgraphicaleffects-everywhere-opensource-src-5.15.16.tar.xz) = 14034764 +SHA256 (qt/qt-qt/qtgraphicaleffects-dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5.tar.gz) = vrJjo3W90fqRmvY07HMC5V0xC0JRRNPq8+y17VNuFLE= +SIZE (qt/qt-qt/qtgraphicaleffects-dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5.tar.gz) = 17163485 diff --git a/x11/qt5/qtimageformats/Makefile b/x11/qt5/qtimageformats/Makefile index f37389ab957..3a1c89321fb 100644 --- a/x11/qt5/qtimageformats/Makefile +++ b/x11/qt5/qtimageformats/Makefile @@ -1,8 +1,8 @@ QT5NAME = QtImageFormats COMMENT = support for additional image formats in Qt5 -KDE_COMMIT = 7b25a0435edc2602f8999bd216c4bec711ffe09e -KDE_VERSION = 3 +KDE_COMMIT = c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d +KDE_VERSION = 2 WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui jasper m mng tiff WANTLIB += webp webpdemux webpmux diff --git a/x11/qt5/qtimageformats/distinfo b/x11/qt5/qtimageformats/distinfo index 882d881a734..7dda6341c0e 100644 --- a/x11/qt5/qtimageformats/distinfo +++ b/x11/qt5/qtimageformats/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtimageformats-7b25a0435edc2602f8999bd216c4bec711ffe09e.tar.gz) = r2TZEFOwcbU7p9OZv05EKwoIZvSvwZHzLXXAHQnhIkU= -SIZE (qt/qt-qt/qtimageformats-7b25a0435edc2602f8999bd216c4bec711ffe09e.tar.gz) = 2489438 +SHA256 (qt/qt-qt/qtimageformats-c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d.tar.gz) = Sa/gfEzejRp/9qskQaAuBVLq0HuPi+4jVB/2ePRh1/o= +SIZE (qt/qt-qt/qtimageformats-c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d.tar.gz) = 2520694 diff --git a/x11/qt5/qtlocation/Makefile b/x11/qt5/qtlocation/Makefile index 5535afd92dd..88a6832d8dd 100644 --- a/x11/qt5/qtlocation/Makefile +++ b/x11/qt5/qtlocation/Makefile @@ -1,13 +1,13 @@ QT5NAME = QtLocation COMMENT-main = Qt5 geo positioning APIs -KDE_COMMIT = 6e89db9fcf76fa35c9275123c814e260610d355e -KDE_VERSION = 3 +KDE_COMMIT = ba48a8b5cedd157d972c08d371ac2581db166bf7 +KDE_VERSION = 7 SHARED_LIBS += Qt5Location 3.1 # 5.15 SHARED_LIBS += Qt5Positioning 3.0 # 5.9 SHARED_LIBS += Qt5PositioningQuick 0.0 # 5.13 - +WANTLIB += ${COMPILER_LIBCXX} MULTI_PACKAGES = -main -examples WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5DBus diff --git a/x11/qt5/qtlocation/distinfo b/x11/qt5/qtlocation/distinfo index 9f823a48f1a..5896c995266 100644 --- a/x11/qt5/qtlocation/distinfo +++ b/x11/qt5/qtlocation/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtlocation-6e89db9fcf76fa35c9275123c814e260610d355e.tar.gz) = v5etKD04KUo/CEA+2QOQFuA0kCfnjWba2qBJ1O93/aI= -SIZE (qt/qt-qt/qtlocation-6e89db9fcf76fa35c9275123c814e260610d355e.tar.gz) = 5434809 +SHA256 (qt/qt-qt/qtlocation-ba48a8b5cedd157d972c08d371ac2581db166bf7.tar.gz) = dL/T0UjM+x3kYqSTKor92Mq3DLcBKibunxPYjwjevzQ= +SIZE (qt/qt-qt/qtlocation-ba48a8b5cedd157d972c08d371ac2581db166bf7.tar.gz) = 5436890 diff --git a/x11/qt5/qtlottie/Makefile b/x11/qt5/qtlottie/Makefile index fc77f94a697..c85587e1ceb 100644 --- a/x11/qt5/qtlottie/Makefile +++ b/x11/qt5/qtlottie/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtLottie COMMENT = QML API for rendering graphics and animations +KDE_COMMIT = 27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e +KDE_VERSION = 0 + SHARED_LIBS += Qt5Bodymovin 0.0 # 5.13 WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml @@ -10,4 +13,7 @@ LIB_DEPENDS = x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtlottie/distinfo b/x11/qt5/qtlottie/distinfo index d5b5190d5ee..a15fd429354 100644 --- a/x11/qt5/qtlottie/distinfo +++ b/x11/qt5/qtlottie/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtlottie-everywhere-opensource-src-5.15.16.tar.xz) = JV/1Y1FIVizvwdd/pyOibMpHKw9uMpQ+oLrZ/pMGA9M= -SIZE (qt/qtlottie-everywhere-opensource-src-5.15.16.tar.xz) = 76348 +SHA256 (qt/qt-qt/qtlottie-27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e.tar.gz) = yFmemcvadYRI+fAmIXq9R/CD/kX+Er9YLb/wQP1MU6E= +SIZE (qt/qt-qt/qtlottie-27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e.tar.gz) = 89123 diff --git a/x11/qt5/qtmultimedia/Makefile b/x11/qt5/qtmultimedia/Makefile index 1f58cb4bad0..29b0657301b 100644 --- a/x11/qt5/qtmultimedia/Makefile +++ b/x11/qt5/qtmultimedia/Makefile @@ -1,19 +1,16 @@ QT5NAME = QtMultimedia COMMENT-main = Qt5 multimedia components -KDE_COMMIT = b7c7ff4ab8c0f43a03de51a76867aae691411410 +KDE_COMMIT = ff83d119c75cd8406f73ccc08958fe36747e7390 KDE_VERSION = 2 -REVISION-main = 0 -REVISION-examples = 0 - MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5Multimedia 3.0 # 5.9 SHARED_LIBS += Qt5MultimediaWidgets 3.0 # 5.9 SHARED_LIBS += Qt5MultimediaGstTools 0.0 # 5.13 SHARED_LIBS += Qt5MultimediaQuick 0.0 # 5.13 - +WANTLIB += ${COMPILER_LIBCXX} WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml WANTLIB-main += Qt5QmlModels Qt5Quick Qt5Widgets drm glib-2.0 gobject-2.0 WANTLIB-main += gstallocators-1.0 gstapp-1.0 gstaudio-1.0 gstbase-1.0 diff --git a/x11/qt5/qtmultimedia/distinfo b/x11/qt5/qtmultimedia/distinfo index 2602fb17fe0..6e237b34610 100644 --- a/x11/qt5/qtmultimedia/distinfo +++ b/x11/qt5/qtmultimedia/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtmultimedia-b7c7ff4ab8c0f43a03de51a76867aae691411410.tar.gz) = JJDHgxF5Q8RZmBkAZ5a0Hi95fRPqi4J3FQo/p25G3HY= -SIZE (qt/qt-qt/qtmultimedia-b7c7ff4ab8c0f43a03de51a76867aae691411410.tar.gz) = 6065096 +SHA256 (qt/qt-qt/qtmultimedia-ff83d119c75cd8406f73ccc08958fe36747e7390.tar.gz) = mjsyj9C+m4wGGPXjQ/04SwDNKpN5x4wCNSAVlgSXGEY= +SIZE (qt/qt-qt/qtmultimedia-ff83d119c75cd8406f73ccc08958fe36747e7390.tar.gz) = 6065329 diff --git a/x11/qt5/qtmultimedia/patches/patch-src_plugins_gstreamer_camerabin_camerabinv4limageprocessing_cpp b/x11/qt5/qtmultimedia/patches/patch-src_plugins_gstreamer_camerabin_camerabinv4limageprocessing_cpp index 73e8aa92b51..b926bcb874c 100644 --- a/x11/qt5/qtmultimedia/patches/patch-src_plugins_gstreamer_camerabin_camerabinv4limageprocessing_cpp +++ b/x11/qt5/qtmultimedia/patches/patch-src_plugins_gstreamer_camerabin_camerabinv4limageprocessing_cpp @@ -3,8 +3,8 @@ Allow our V4L2 to be used. Index: src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp --- src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp.orig +++ src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.cpp -@@ -43,7 +43,11 @@ - #include +@@ -45,7 +45,11 @@ + #include #include -#include diff --git a/x11/qt5/qtnetworkauth/Makefile b/x11/qt5/qtnetworkauth/Makefile index 3d54324ca8e..89455a88e10 100644 --- a/x11/qt5/qtnetworkauth/Makefile +++ b/x11/qt5/qtnetworkauth/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtNetworKAuth COMMENT-main = Qt5 network authorization components +KDE_COMMIT = 510687fa4fdee84dd3d6d166e8f080c484016199 +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5NetworkAuth 2.0 # 5.9 @@ -9,4 +12,7 @@ WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network m FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtnetworkauth/distinfo b/x11/qt5/qtnetworkauth/distinfo index f809dc56547..b851923420a 100644 --- a/x11/qt5/qtnetworkauth/distinfo +++ b/x11/qt5/qtnetworkauth/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz) = v6bBiNMXuf+mFsXQbr7mgHZLGCY8sMppAnupSoAVSVc= -SIZE (qt/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz) = 135600 +SHA256 (qt/qt-qt/qtnetworkauth-510687fa4fdee84dd3d6d166e8f080c484016199.tar.gz) = 6co5zidt2MkMmkbPCZ/p12L1Ogqm5ClCvRQH0QxvAW0= +SIZE (qt/qt-qt/qtnetworkauth-510687fa4fdee84dd3d6d166e8f080c484016199.tar.gz) = 151801 diff --git a/x11/qt5/qtpurchasing/Makefile b/x11/qt5/qtpurchasing/Makefile index fc696837daf..b552c987c6c 100644 --- a/x11/qt5/qtpurchasing/Makefile +++ b/x11/qt5/qtpurchasing/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtPurchasing COMMENT-main = in-app purchases in Qt5 and Qt5 Quick applications +KDE_COMMIT = 8e9a5ec9f68639162c85c198b28e072e7150883c +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5Purchasing 1.0 # 5.9 @@ -12,4 +15,7 @@ LIB_DEPENDS = x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtpurchasing/distinfo b/x11/qt5/qtpurchasing/distinfo index 1d8d8ba7a99..b13073f54fd 100644 --- a/x11/qt5/qtpurchasing/distinfo +++ b/x11/qt5/qtpurchasing/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtpurchasing-everywhere-opensource-src-5.15.16.tar.xz) = JBvfUj2eS3J6QEO7eTicZvLk1+zVyziywTJ+sLDTt34= -SIZE (qt/qtpurchasing-everywhere-opensource-src-5.15.16.tar.xz) = 300916 +SHA256 (qt/qt-qt/qtpurchasing-8e9a5ec9f68639162c85c198b28e072e7150883c.tar.gz) = lB69BK2kZ9RuFLLHJmGSNvH/ADxYq8Ebt6ypJPRXETM= +SIZE (qt/qt-qt/qtpurchasing-8e9a5ec9f68639162c85c198b28e072e7150883c.tar.gz) = 574230 diff --git a/x11/qt5/qtquickcontrols/Makefile b/x11/qt5/qtquickcontrols/Makefile index ce005e7110c..6a216cb215f 100644 --- a/x11/qt5/qtquickcontrols/Makefile +++ b/x11/qt5/qtquickcontrols/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtQuickControls COMMENT-main = Qt Quick based UI controls +KDE_COMMIT = 0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041 +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml @@ -10,4 +13,7 @@ LIB_DEPENDS = x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtquickcontrols/distinfo b/x11/qt5/qtquickcontrols/distinfo index 7b5d270e41a..d4c8c640421 100644 --- a/x11/qt5/qtquickcontrols/distinfo +++ b/x11/qt5/qtquickcontrols/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtquickcontrols-everywhere-opensource-src-5.15.16.tar.xz) = 5p9h13iC6EDGpysXbhBEaOVtQ0tkJ7LSEvO6wtP6xN8= -SIZE (qt/qtquickcontrols-everywhere-opensource-src-5.15.16.tar.xz) = 5974732 +SHA256 (qt/qt-qt/qtquickcontrols-0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041.tar.gz) = R7luVr4Nst1bU3Uedn7VPvejv1ZOZAUfJ03/IsA/LA4= +SIZE (qt/qt-qt/qtquickcontrols-0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041.tar.gz) = 6649944 diff --git a/x11/qt5/qtquickcontrols2/Makefile b/x11/qt5/qtquickcontrols2/Makefile index d7d82ecfd78..b114163d593 100644 --- a/x11/qt5/qtquickcontrols2/Makefile +++ b/x11/qt5/qtquickcontrols2/Makefile @@ -2,7 +2,7 @@ QT5NAME = QtQuickcontrols2 COMMENT-main = Qt5 Quick based UI controls from Qt Labs -KDE_COMMIT = 8f244d09b22ed68b3aefaa8e521c8d68d18cada7 +KDE_COMMIT = e464888c53a641ee44a34ff2350cfb156c8ed59f KDE_VERSION = 5 SHARED_LIBS += Qt5QuickControls2 1.1 # 5.9 diff --git a/x11/qt5/qtquickcontrols2/distinfo b/x11/qt5/qtquickcontrols2/distinfo index ad43fcb121e..67b176626a8 100644 --- a/x11/qt5/qtquickcontrols2/distinfo +++ b/x11/qt5/qtquickcontrols2/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtquickcontrols2-8f244d09b22ed68b3aefaa8e521c8d68d18cada7.tar.gz) = QlZutUbZKZQUMGqSo0yqbYG7OGy6jDUVwzBhWRs66gQ= -SIZE (qt/qt-qt/qtquickcontrols2-8f244d09b22ed68b3aefaa8e521c8d68d18cada7.tar.gz) = 9257173 +SHA256 (qt/qt-qt/qtquickcontrols2-e464888c53a641ee44a34ff2350cfb156c8ed59f.tar.gz) = r13HVBl8vnYt1LXz+zLnsv51yfbOXVZatqiX5NGyOMo= +SIZE (qt/qt-qt/qtquickcontrols2-e464888c53a641ee44a34ff2350cfb156c8ed59f.tar.gz) = 9257465 diff --git a/x11/qt5/qtremoteobjects/Makefile b/x11/qt5/qtremoteobjects/Makefile index e53c80f2735..ecf608ae773 100644 --- a/x11/qt5/qtremoteobjects/Makefile +++ b/x11/qt5/qtremoteobjects/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtRemoteObjects COMMENT-main = inter-process communication using Qt5 objects +KDE_COMMIT = b2740a7c7f5b6ac810240404a947ca5cff9de5f7 +KDE_VERSION = 1 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5RemoteObjects 1.0 # 5.9 @@ -12,4 +15,7 @@ LIB_DEPENDS = x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtremoteobjects/distinfo b/x11/qt5/qtremoteobjects/distinfo index bda80748af0..20d20b0b2d8 100644 --- a/x11/qt5/qtremoteobjects/distinfo +++ b/x11/qt5/qtremoteobjects/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtremoteobjects-everywhere-opensource-src-5.15.16.tar.xz) = Wn7D1WQAPR5jiug+ZBNMZ+jkD+BLWwM5jUN2GC1rbvg= -SIZE (qt/qtremoteobjects-everywhere-opensource-src-5.15.16.tar.xz) = 370484 +SHA256 (qt/qt-qt/qtremoteobjects-b2740a7c7f5b6ac810240404a947ca5cff9de5f7.tar.gz) = PouCmdvXlT659Ov/0q/I6keXGbzW+xW29Bb9LXIQXBE= +SIZE (qt/qt-qt/qtremoteobjects-b2740a7c7f5b6ac810240404a947ca5cff9de5f7.tar.gz) = 506238 diff --git a/x11/qt5/qtscript/Makefile b/x11/qt5/qtscript/Makefile index 31c0d344f92..7ae45d0c4b7 100644 --- a/x11/qt5/qtscript/Makefile +++ b/x11/qt5/qtscript/Makefile @@ -1,7 +1,11 @@ QT5NAME = QtScript COMMENT-main = ECMAScript language for Qt5 +KDE_COMMIT = 182ceff6560f68d70017ab980186a6106fd126a6 +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples + SHARED_LIBS += Qt5Script 3.0 # 5.9 SHARED_LIBS += Qt5ScriptTools 3.0 # 5.9 @@ -11,4 +15,7 @@ RUN_DEPENDS-examples = x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtscript/distinfo b/x11/qt5/qtscript/distinfo index 7683e928878..184ca8f4a2f 100644 --- a/x11/qt5/qtscript/distinfo +++ b/x11/qt5/qtscript/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtscript-everywhere-opensource-src-5.15.16.tar.xz) = C5i6pu7OfQ54YFkN1n+vRSSZCW9i8z0WVW/TisI27sI= -SIZE (qt/qtscript-everywhere-opensource-src-5.15.16.tar.xz) = 2656892 +SHA256 (qt/qt-qt/qtscript-182ceff6560f68d70017ab980186a6106fd126a6.tar.gz) = JRYr6ksrX7q8Itk87a3QYbz/7IsrhWZ9eUsiXPf2YfQ= +SIZE (qt/qt-qt/qtscript-182ceff6560f68d70017ab980186a6106fd126a6.tar.gz) = 4079378 diff --git a/x11/qt5/qtscxml/Makefile b/x11/qt5/qtscxml/Makefile index 0047130fd81..8a4fc1c9ffd 100644 --- a/x11/qt5/qtscxml/Makefile +++ b/x11/qt5/qtscxml/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtScxml COMMENT-main = create state machines from SCXML files +KDE_COMMIT = 57491f554bc53bd020978b5744437b7ac7e56a27 +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5Scxml 1.0 # 5.9 @@ -11,4 +14,7 @@ LIB_DEPENDS = x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtscxml/distinfo b/x11/qt5/qtscxml/distinfo index e59eddeb935..fce15dffc00 100644 --- a/x11/qt5/qtscxml/distinfo +++ b/x11/qt5/qtscxml/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtscxml-everywhere-opensource-src-5.15.16.tar.xz) = YNqRb36l/T4UjBoD/qNtuh/3qBivvZNU87Coz4I783g= -SIZE (qt/qtscxml-everywhere-opensource-src-5.15.16.tar.xz) = 429268 +SHA256 (qt/qt-qt/qtscxml-57491f554bc53bd020978b5744437b7ac7e56a27.tar.gz) = UQvxSW0nz9liXGlq4DkU7GvEvxtnixn3yDRZy26W26Y= +SIZE (qt/qt-qt/qtscxml-57491f554bc53bd020978b5744437b7ac7e56a27.tar.gz) = 507749 diff --git a/x11/qt5/qtsensors/Makefile b/x11/qt5/qtsensors/Makefile index 7df3a2d5246..360fde29043 100644 --- a/x11/qt5/qtsensors/Makefile +++ b/x11/qt5/qtsensors/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtSensors COMMENT-main = Qt5 hardware sensors support +KDE_COMMIT = 50a61b360877e7c1300df76b5aabf8d75554a398 +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5Sensors 3.0 # 5.9 @@ -14,4 +17,7 @@ FLAVORS = debug MODQMAKE_RECURSIVE = No +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtsensors/distinfo b/x11/qt5/qtsensors/distinfo index d9c0826ceeb..1f18dad8790 100644 --- a/x11/qt5/qtsensors/distinfo +++ b/x11/qt5/qtsensors/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtsensors-everywhere-opensource-src-5.15.16.tar.xz) = zVzDJf2dae+asWZcZHVi61Wpg+cz9ImNaOW+PpkFQBI= -SIZE (qt/qtsensors-everywhere-opensource-src-5.15.16.tar.xz) = 2051048 +SHA256 (qt/qt-qt/qtsensors-50a61b360877e7c1300df76b5aabf8d75554a398.tar.gz) = 5OABbihFSWyeXvnpKWe9rApsvBnfQtcQ1QfmX415Eto= +SIZE (qt/qt-qt/qtsensors-50a61b360877e7c1300df76b5aabf8d75554a398.tar.gz) = 2405157 diff --git a/x11/qt5/qtserialbus/Makefile b/x11/qt5/qtserialbus/Makefile index 1627bd95009..4d4ca33bb5d 100644 --- a/x11/qt5/qtserialbus/Makefile +++ b/x11/qt5/qtserialbus/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtSerialBus COMMENT-main = Qt5 API for accessing serial bus devices +KDE_COMMIT = c23069351ec31563c9ea9fcdce42ccdba95ea518 +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5SerialBus 1.1 # 5.9 @@ -9,4 +12,9 @@ WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network c m FLAVORS = debug +BUILD_DEPENDS = x11/qt5/qtserialport + +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtserialbus/distinfo b/x11/qt5/qtserialbus/distinfo index 397c3061bc9..60b5e5e1db5 100644 --- a/x11/qt5/qtserialbus/distinfo +++ b/x11/qt5/qtserialbus/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtserialbus-everywhere-opensource-src-5.15.16.tar.xz) = jWAHRzZ1Mu1WPnW4rOjcLk5PypKAqWQoGyoa1J4O6rY= -SIZE (qt/qtserialbus-everywhere-opensource-src-5.15.16.tar.xz) = 350832 +SHA256 (qt/qt-qt/qtserialbus-c23069351ec31563c9ea9fcdce42ccdba95ea518.tar.gz) = R9Ng8qJmQMRu8P4lY+YrAMYLcNJ/HwnYDAAKawfVC10= +SIZE (qt/qt-qt/qtserialbus-c23069351ec31563c9ea9fcdce42ccdba95ea518.tar.gz) = 603051 diff --git a/x11/qt5/qtserialport/Makefile b/x11/qt5/qtserialport/Makefile index d262869b9c7..576f0d9d35e 100644 --- a/x11/qt5/qtserialport/Makefile +++ b/x11/qt5/qtserialport/Makefile @@ -1,6 +1,8 @@ QT5NAME = QtSerialPort COMMENT-main = Qt5 serial ports access components -PKGSPEC-main = qtserialport->=5.6 + +KDE_COMMIT = b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f +KDE_VERSION = 0 MULTI_PACKAGES = -main -examples @@ -10,4 +12,7 @@ WANTLIB += ${COMPILER_LIBCXX} Qt5Core m FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtserialport/distinfo b/x11/qt5/qtserialport/distinfo index 461017d408c..2bf6b1c8b02 100644 --- a/x11/qt5/qtserialport/distinfo +++ b/x11/qt5/qtserialport/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtserialport-everywhere-opensource-src-5.15.16.tar.xz) = 4Tlxj3rOCCpp/GV2IXjOlZ14J6joe+l3NVWmxkkVTrw= -SIZE (qt/qtserialport-everywhere-opensource-src-5.15.16.tar.xz) = 314732 +SHA256 (qt/qt-qt/qtserialport-b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f.tar.gz) = TWFjXSmIYQ6EmTMIXS95cBQU94ypqLoLLryFGKH1wdY= +SIZE (qt/qt-qt/qtserialport-b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f.tar.gz) = 503594 diff --git a/x11/qt5/qtspeech/Makefile b/x11/qt5/qtspeech/Makefile index 554b88a1570..90c97d0fd7f 100644 --- a/x11/qt5/qtspeech/Makefile +++ b/x11/qt5/qtspeech/Makefile @@ -1,7 +1,7 @@ QT5NAME = QtSpeech COMMENT-main = Qt5 text-to-speech components -KDE_COMMIT = fe7fc4f6295f644a93157707f940072b2676902d +KDE_COMMIT = aa2376f9b1302222edcd16b4641bbd7004318c00 KDE_VERSION = 1 MULTI_PACKAGES = -main -examples diff --git a/x11/qt5/qtspeech/distinfo b/x11/qt5/qtspeech/distinfo index 6941caf6170..f0ecc3b2257 100644 --- a/x11/qt5/qtspeech/distinfo +++ b/x11/qt5/qtspeech/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtspeech-fe7fc4f6295f644a93157707f940072b2676902d.tar.gz) = C27cZLAKLdMQiALxapwU7dQvBI7HT9vI5NKILaUg4cw= -SIZE (qt/qt-qt/qtspeech-fe7fc4f6295f644a93157707f940072b2676902d.tar.gz) = 93374 +SHA256 (qt/qt-qt/qtspeech-aa2376f9b1302222edcd16b4641bbd7004318c00.tar.gz) = 1J5kEbi4WBz1e/FpnXf+HhNqhuyzGAe2NvXCg+hNvvs= +SIZE (qt/qt-qt/qtspeech-aa2376f9b1302222edcd16b4641bbd7004318c00.tar.gz) = 93363 diff --git a/x11/qt5/qtsvg/Makefile b/x11/qt5/qtsvg/Makefile index d26aa348a77..f16b214e9cc 100644 --- a/x11/qt5/qtsvg/Makefile +++ b/x11/qt5/qtsvg/Makefile @@ -1,7 +1,7 @@ QT5NAME = QtSVG COMMENT-main = SVG support for Qt5 -KDE_COMMIT = 9c3d40626ddfccc87886966a59e5cd6b1b5ce739 +KDE_COMMIT = b74f7291f343dcbcb487b020868f042d8fe83098 KDE_VERSION = 5 DPB_PROPERTIES = parallel diff --git a/x11/qt5/qtsvg/distinfo b/x11/qt5/qtsvg/distinfo index 1e4c3ce1dea..7cc49bd93bd 100644 --- a/x11/qt5/qtsvg/distinfo +++ b/x11/qt5/qtsvg/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtsvg-9c3d40626ddfccc87886966a59e5cd6b1b5ce739.tar.gz) = BOrBFT6B8S0RM9mGLKOk1s9RxTNoF6/wJHkRxYq6AU8= -SIZE (qt/qt-qt/qtsvg-9c3d40626ddfccc87886966a59e5cd6b1b5ce739.tar.gz) = 2780509 +SHA256 (qt/qt-qt/qtsvg-b74f7291f343dcbcb487b020868f042d8fe83098.tar.gz) = tpKmwZTW8HFtNcqanbp1qBt3llUXSJKbVnGL3ynI+Nw= +SIZE (qt/qt-qt/qtsvg-b74f7291f343dcbcb487b020868f042d8fe83098.tar.gz) = 2780115 diff --git a/x11/qt5/qttools/Makefile b/x11/qt5/qttools/Makefile index a591f56b2ab..6f3182d766d 100644 --- a/x11/qt5/qttools/Makefile +++ b/x11/qt5/qttools/Makefile @@ -2,9 +2,8 @@ QT5NAME = QtTools COMMENT-main = Qt development tools -KDE_COMMIT = 15deb8f202b838b4dd1b2ff84e852171e8587881 +KDE_COMMIT = fa40a2d3373b89be0cd0a43fe0c1d047e3d34058 KDE_VERSION = 3 -REVISION = 0 DPB_PROPERTIES = parallel diff --git a/x11/qt5/qttools/distinfo b/x11/qt5/qttools/distinfo index 2c03f10e18d..cd39580996d 100644 --- a/x11/qt5/qttools/distinfo +++ b/x11/qt5/qttools/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qttools-15deb8f202b838b4dd1b2ff84e852171e8587881.tar.gz) = O46dFqa6qhsDrCW3FattgfaRv1Lqf/JHOspJ5mq2rCQ= -SIZE (qt/qt-qt/qttools-15deb8f202b838b4dd1b2ff84e852171e8587881.tar.gz) = 12261732 +SHA256 (qt/qt-qt/qttools-fa40a2d3373b89be0cd0a43fe0c1d047e3d34058.tar.gz) = x/lG+y8n/p6SZ02qvNRqcmdTqUkh8oCBszpMq86fCg8= +SIZE (qt/qt-qt/qttools-fa40a2d3373b89be0cd0a43fe0c1d047e3d34058.tar.gz) = 12261887 diff --git a/x11/qt5/qttranslations/Makefile b/x11/qt5/qttranslations/Makefile index 9b03468da98..1126fd89db8 100644 --- a/x11/qt5/qttranslations/Makefile +++ b/x11/qt5/qttranslations/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtTranslations COMMENT = unofficial Qt5 translations +KDE_COMMIT = 3cbcceb8e3e2e63a4022f1be946c7118c527a83e +KDE_VERSION = 0 + RUN_DEPENDS = x11/qt5/qtbase>=${QT5_VERSION},<${QT5_NEXT_VERSION} BUILD_DEPENDS = x11/qt5/qtbase>=${QT5_VERSION},<${QT5_NEXT_VERSION} \ x11/qt5/qttools>=${QT5_VERSION},<${QT5_NEXT_VERSION} diff --git a/x11/qt5/qttranslations/distinfo b/x11/qt5/qttranslations/distinfo index 16c60642349..392ac925d6b 100644 --- a/x11/qt5/qttranslations/distinfo +++ b/x11/qt5/qttranslations/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qttranslations-everywhere-opensource-src-5.15.16.tar.xz) = QV27uCp138mnvpaedDvuVMDmhnvje85M+PA9o58gESo= -SIZE (qt/qttranslations-everywhere-opensource-src-5.15.16.tar.xz) = 1626988 +SHA256 (qt/qt-qt/qttranslations-3cbcceb8e3e2e63a4022f1be946c7118c527a83e.tar.gz) = VY17jqLd3dB7WnAgllOiDrIdHNZhq572kB7FkUOJHQ0= +SIZE (qt/qt-qt/qttranslations-3cbcceb8e3e2e63a4022f1be946c7118c527a83e.tar.gz) = 3019657 diff --git a/x11/qt5/qtvirtualkeyboard/Makefile b/x11/qt5/qtvirtualkeyboard/Makefile index d8120267f9d..e2197978fdb 100644 --- a/x11/qt5/qtvirtualkeyboard/Makefile +++ b/x11/qt5/qtvirtualkeyboard/Makefile @@ -1,11 +1,14 @@ QT5NAME = QtVirtualKeyboard COMMENT-main = Qt5 virtual keyboard plugin +KDE_COMMIT = 859d2a6ee329cc08414410b2ef8c0af77a6853d3 +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5HunspellInputMethod 0.0 # 5.13 SHARED_LIBS += Qt5VirtualKeyboard 0.0 # 5.13 - +WANTLIB += ${COMPILER_LIBCXX} WANTLIB-main += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml WANTLIB-main += Qt5QmlModels Qt5Quick Qt5Svg Qt5Widgets hunspell-1.7 WANTLIB-main += m @@ -18,4 +21,7 @@ FLAVORS = debug MODQMAKE_ARGS += CONFIG+=disable-layouts +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtvirtualkeyboard/distinfo b/x11/qt5/qtvirtualkeyboard/distinfo index a078d72a305..6baf167d546 100644 --- a/x11/qt5/qtvirtualkeyboard/distinfo +++ b/x11/qt5/qtvirtualkeyboard/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz) = EA5nbKXtpimui89ETZEX04jF+MpHLAt67eKvok6xlx8= -SIZE (qt/qtvirtualkeyboard-everywhere-opensource-src-5.15.16.tar.xz) = 10951872 +SHA256 (qt/qt-qt/qtvirtualkeyboard-859d2a6ee329cc08414410b2ef8c0af77a6853d3.tar.gz) = SmXWfrqxB3BrgD500+uXLvZP8TBOLU2wJ/RcvZ0263I= +SIZE (qt/qt-qt/qtvirtualkeyboard-859d2a6ee329cc08414410b2ef8c0af77a6853d3.tar.gz) = 13694253 diff --git a/x11/qt5/qtwayland/Makefile b/x11/qt5/qtwayland/Makefile index b25bec99184..c7ad1aaee45 100644 --- a/x11/qt5/qtwayland/Makefile +++ b/x11/qt5/qtwayland/Makefile @@ -1,10 +1,10 @@ QT5NAME = QtWayland COMMENT = Qt5 module for Wayland support -KDE_COMMIT = 9340737a208b5dd4eda98eb74808951ddaef66c5 -KDE_VERSION = 59 +KDE_COMMIT = df49b9f3badce793a0a9ea850cf1a02cc5bafef6 +KDE_VERSION = 66 -SHARED_LIBS += Qt5WaylandClient 1.0 # 5.15 +SHARED_LIBS += Qt5WaylandClient 1.1 # 5.15 SHARED_LIBS += Qt5WaylandCompositor 0.0 # 5.15 WANTLIB += ${COMPILER_LIBCXX} EGL GL Qt5Core Qt5DBus Qt5Gui Qt5Network diff --git a/x11/qt5/qtwayland/distinfo b/x11/qt5/qtwayland/distinfo index e45de3215ef..7b9ba4e1a7e 100644 --- a/x11/qt5/qtwayland/distinfo +++ b/x11/qt5/qtwayland/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtwayland-9340737a208b5dd4eda98eb74808951ddaef66c5.tar.gz) = tIc22kH1VEPfcfxxfwHwRNgq2R8EHGz9ARdVUAVD+x8= -SIZE (qt/qt-qt/qtwayland-9340737a208b5dd4eda98eb74808951ddaef66c5.tar.gz) = 836393 +SHA256 (qt/qt-qt/qtwayland-df49b9f3badce793a0a9ea850cf1a02cc5bafef6.tar.gz) = 95kmelKZUizl4gX2QHJVf/jdJGN0bjVt0v0qZI4uLKg= +SIZE (qt/qt-qt/qtwayland-df49b9f3badce793a0a9ea850cf1a02cc5bafef6.tar.gz) = 836527 diff --git a/x11/qt5/qtwebchannel/Makefile b/x11/qt5/qtwebchannel/Makefile index 594aee48cdf..113b5683144 100644 --- a/x11/qt5/qtwebchannel/Makefile +++ b/x11/qt5/qtwebchannel/Makefile @@ -1,7 +1,7 @@ QT5NAME = QtWebChannel COMMENT-main = Qt5 seamless HTML/JavaScript integration -KDE_COMMIT = b375bde968f7b9c273adfb8a89f9a6fb888f9af6 +KDE_COMMIT = 2a157921861e651f43456cb7941b250c89feb736 KDE_VERSION = 3 SHARED_LIBS += Qt5WebChannel 2.1 # 5.9 diff --git a/x11/qt5/qtwebchannel/distinfo b/x11/qt5/qtwebchannel/distinfo index 1ef03f8e5ab..557d8f6d612 100644 --- a/x11/qt5/qtwebchannel/distinfo +++ b/x11/qt5/qtwebchannel/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtwebchannel-b375bde968f7b9c273adfb8a89f9a6fb888f9af6.tar.gz) = DHmqfZgeGXj3eKXmvztdY3fS5oMTvwP+CSG2xLCUG/E= -SIZE (qt/qt-qt/qtwebchannel-b375bde968f7b9c273adfb8a89f9a6fb888f9af6.tar.gz) = 383821 +SHA256 (qt/qt-qt/qtwebchannel-2a157921861e651f43456cb7941b250c89feb736.tar.gz) = Ejro5+8k25sU16a3gSU/7t3hmWKFx8YVr19s10ugagQ= +SIZE (qt/qt-qt/qtwebchannel-2a157921861e651f43456cb7941b250c89feb736.tar.gz) = 383839 diff --git a/x11/qt5/qtwebengine/Makefile b/x11/qt5/qtwebengine/Makefile index 655a923a76f..c34ec288a13 100644 --- a/x11/qt5/qtwebengine/Makefile +++ b/x11/qt5/qtwebengine/Makefile @@ -1,23 +1,18 @@ # Many parts are copied from www/chromium port, so keep in sync # INFO # Based on Chromium version: 87.0.4280.144 -# Patched with security patches up to: 119.0.6045.123 +# Patched with security patches up to: 130.0.6723.59 USE_WXNEEDED = Yes USE_NOBTCFI = Yes QT5NAME = QtWebEngine -KDE_COMMIT = 17fd3176988586168bee8654008a097a5f23ec1d -KDE_VERSION = 11 -REVISION = 2 - -# Override -VERSION = ${QT5_WEBENGINE_VERSION} -QT5_VERSION = ${QT5_WEBENGINE_VERSION} +KDE_COMMIT = 87ceb6a2ef5ee25d56f765dc533728c4ca4787e0 +KDE_VERSION = 2 # https://invent.kde.org/qt/qt/qtwebengine-chromium/-/commits/87-based?ref_type=heads DIST_TUPLE += kde qt qt/qtwebengine-chromium \ - 1cbcced5046ed659707a4d6ce548a6fd04b20b4b src/3rdparty + 85337c28bae7d7d2c79282c4f4c92435cd7649b8 src/3rdparty ONLY_FOR_ARCHS = amd64 aarch64 i386 @@ -44,10 +39,9 @@ WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels WANTLIB += Qt5Quick Qt5QuickWidgets Qt5WebChannel Qt5Widgets Qt5Xml WANTLIB += X11 X11-xcb Xcomposite Xdamage Xext Xfixes Xi Xrandr WANTLIB += Xrender Xtst c cbor crypto cups dbus-1 drm event execinfo -WANTLIB += expat fido2 fontconfig freetype gbm glib-2.0 graphite2 -WANTLIB += harfbuzz harfbuzz-subset intl jpeg kvm lcms2 lzma m -WANTLIB += minizip nspr4 nss3 nssutil3 opus pcre2-8 plc4 plds4 -WANTLIB += png sharpyuv smime3 snappy sndio usbhid util vpx webp +WANTLIB += expat fido2 fontconfig gbm harfbuzz harfbuzz-subset +WANTLIB += jpeg kvm lcms2 m minizip nspr4 nss3 nssutil3 opus plc4 +WANTLIB += plds4 png smime3 snappy sndio usbhid util vpx webp WANTLIB += webpdemux webpmux xcb xkbcommon xml2 xslt z # BSD-like, patents @@ -149,12 +143,4 @@ post-configure: ${CHROMESRC}/v8/tools/run.py \ ${CHROMESRC}/tools/protoc_wrapper/protoc_wrapper.py -pre-fake: -# Fix version mismatches for CMake -.for module in WebEngine WebEngineCore WebEngineWidgets - sed -i 's,${QT5_WEBENGINE_VERSION} $${_Qt5${module}_FIND_VERSION_EXACT},5.15.15 $${_Qt5${module}_FIND_VERSION_EXACT},g' \ - ${WRKBUILD}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake -.endfor - - .include diff --git a/x11/qt5/qtwebengine/distinfo b/x11/qt5/qtwebengine/distinfo index f5f54924646..6d83181b6ec 100644 --- a/x11/qt5/qtwebengine/distinfo +++ b/x11/qt5/qtwebengine/distinfo @@ -1,4 +1,4 @@ -SHA256 (qt/qt-qt/qtwebengine-17fd3176988586168bee8654008a097a5f23ec1d.tar.gz) = ul2XgGXQ2UCBzfowoMT9XnvyUA0n+aMHhMm4SQwf/BA= -SHA256 (qt/qt-qt/qtwebengine-chromium-1cbcced5046ed659707a4d6ce548a6fd04b20b4b.tar.gz) = Z68KAF9u8ZlXyjtgbhvolvnhSZxx3WhICZU9tt4f73s= -SIZE (qt/qt-qt/qtwebengine-17fd3176988586168bee8654008a097a5f23ec1d.tar.gz) = 3779059 -SIZE (qt/qt-qt/qtwebengine-chromium-1cbcced5046ed659707a4d6ce548a6fd04b20b4b.tar.gz) = 469454574 +SHA256 (qt/qt-qt/qtwebengine-87ceb6a2ef5ee25d56f765dc533728c4ca4787e0.tar.gz) = GM08Z2jnZU/4btGtrN/QkUcbsXPYrpBj35A+ZyBkZXI= +SHA256 (qt/qt-qt/qtwebengine-chromium-85337c28bae7d7d2c79282c4f4c92435cd7649b8.tar.gz) = E0UdmJS6PLnl0VuH7t7fwM7Rnyl+OQhtkMer/gNeq5s= +SIZE (qt/qt-qt/qtwebengine-87ceb6a2ef5ee25d56f765dc533728c4ca4787e0.tar.gz) = 3777486 +SIZE (qt/qt-qt/qtwebengine-chromium-85337c28bae7d7d2c79282c4f4c92435cd7649b8.tar.gz) = 469456308 diff --git a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_v8_src_base_bit-field_h b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_v8_src_base_bit-field_h new file mode 100644 index 00000000000..1cf5840f706 --- /dev/null +++ b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_v8_src_base_bit-field_h @@ -0,0 +1,17 @@ +https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb7d0a7131b5a5938b12673f4b260d66cc1a527 + +Index: src/3rdparty/chromium/v8/src/base/bit-field.h +--- src/3rdparty/chromium/v8/src/base/bit-field.h.orig ++++ src/3rdparty/chromium/v8/src/base/bit-field.h +@@ -39,8 +39,11 @@ class BitField final { + static constexpr int kLastUsedBit = kShift + kSize - 1; + static constexpr U kNumValues = U{1} << kSize; + ++ #pragma clang diagnostic push ++ #pragma clang diagnostic ignored "-Wenum-constexpr-conversion" + // Value for the field with all bits set. + static constexpr T kMax = static_cast(kNumValues - 1); ++ #pragma clang diagnostic pop + + template + using Next = BitField; diff --git a/x11/qt5/qtwebglplugin/Makefile b/x11/qt5/qtwebglplugin/Makefile index 6f62b78f83c..08dd140d1f7 100644 --- a/x11/qt5/qtwebglplugin/Makefile +++ b/x11/qt5/qtwebglplugin/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtWebGlPlugin COMMENT = QPA WebGL plugin for Qt applications +KDE_COMMIT = b9aaac72d0853ba48f6bfd710a43df94d83d4701 +KDE_VERSION = 0 + WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5WebSockets fontconfig WANTLIB += freetype glib-2.0 gthread-2.0 intl m z @@ -10,4 +13,7 @@ LIB_DEPENDS = x11/qt5/qtdeclarative \ FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtwebglplugin/distinfo b/x11/qt5/qtwebglplugin/distinfo index ed492c964ad..1516505bd11 100644 --- a/x11/qt5/qtwebglplugin/distinfo +++ b/x11/qt5/qtwebglplugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebglplugin-everywhere-opensource-src-5.15.16.tar.xz) = 7FXdcLMF+KJAFgI1z3Wh8UCnT0NripurPusF6qwV5Bo= -SIZE (qt/qtwebglplugin-everywhere-opensource-src-5.15.16.tar.xz) = 68148 +SHA256 (qt/qt-qt/qtwebglplugin-b9aaac72d0853ba48f6bfd710a43df94d83d4701.tar.gz) = ZpvfsWcV3LBCLMLs2og+ThbjOfzp1XwZgKzPEY8XBBY= +SIZE (qt/qt-qt/qtwebglplugin-b9aaac72d0853ba48f6bfd710a43df94d83d4701.tar.gz) = 65363 diff --git a/x11/qt5/qtwebsockets/Makefile b/x11/qt5/qtwebsockets/Makefile index 67493f3ffa7..84fb3a244c8 100644 --- a/x11/qt5/qtwebsockets/Makefile +++ b/x11/qt5/qtwebsockets/Makefile @@ -1,7 +1,7 @@ QT5NAME = QtWebSockets COMMENT-main = Qt5 implementation of WebSocket protocol -KDE_COMMIT = a0c1c335b691ad5ecaddbec17a14dcb2a129a177 +KDE_COMMIT = 0f910acb737cefc889ce1088fc60d15bc18efe9c KDE_VERSION = 2 SHARED_LIBS += Qt5WebSockets 3.0 # 5.9 diff --git a/x11/qt5/qtwebsockets/distinfo b/x11/qt5/qtwebsockets/distinfo index 9521cfb0d44..c282d0df31c 100644 --- a/x11/qt5/qtwebsockets/distinfo +++ b/x11/qt5/qtwebsockets/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qt-qt/qtwebsockets-a0c1c335b691ad5ecaddbec17a14dcb2a129a177.tar.gz) = zPr7WLoiXge1yq+Nf6WxUjsGjJA1My8xNHKX2msG+lw= -SIZE (qt/qt-qt/qtwebsockets-a0c1c335b691ad5ecaddbec17a14dcb2a129a177.tar.gz) = 434870 +SHA256 (qt/qt-qt/qtwebsockets-0f910acb737cefc889ce1088fc60d15bc18efe9c.tar.gz) = sdQl7y1XYJnAt9xPoSjTEzNVu41I1wh09nChCcq6Nck= +SIZE (qt/qt-qt/qtwebsockets-0f910acb737cefc889ce1088fc60d15bc18efe9c.tar.gz) = 434877 diff --git a/x11/qt5/qtwebview/Makefile b/x11/qt5/qtwebview/Makefile index 533c0f909b8..6617567d152 100644 --- a/x11/qt5/qtwebview/Makefile +++ b/x11/qt5/qtwebview/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtWebView COMMENT-main = simple web viewing component for Qt5 +KDE_COMMIT = 34342073a59f3a27ef3de02f6b21337c4f8db6cf +KDE_VERSION = 0 + MULTI_PACKAGES = -main -examples SHARED_LIBS += Qt5WebView 0.0 # 5.13 @@ -14,4 +17,7 @@ LIB_DEPENDS = x11/qt5/qtdeclarative \ FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtwebview/distinfo b/x11/qt5/qtwebview/distinfo index 1e79f20cfd8..75cf50fd203 100644 --- a/x11/qt5/qtwebview/distinfo +++ b/x11/qt5/qtwebview/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtwebview-everywhere-opensource-src-5.15.16.tar.xz) = Jc23f4ObWy8R4nzWDpCIjHJV2BeA38Hf5XLFqASZpMw= -SIZE (qt/qtwebview-everywhere-opensource-src-5.15.16.tar.xz) = 128180 +SHA256 (qt/qt-qt/qtwebview-34342073a59f3a27ef3de02f6b21337c4f8db6cf.tar.gz) = JrXtquvoaKWYUiWiyUTr1e0SANsu6kWKjqwRMlCZgNs= +SIZE (qt/qt-qt/qtwebview-34342073a59f3a27ef3de02f6b21337c4f8db6cf.tar.gz) = 132235 diff --git a/x11/qt5/qtx11extras/Makefile b/x11/qt5/qtx11extras/Makefile index 7c62170ed6a..ee28845b124 100644 --- a/x11/qt5/qtx11extras/Makefile +++ b/x11/qt5/qtx11extras/Makefile @@ -1,10 +1,16 @@ QT5NAME = QtX11Extras COMMENT = X11-specific parts of Qt +KDE_COMMIT = c44c4fa86fa0794c25baef4ee1f6272aca8c511a +KDE_VERSION = 0 + SHARED_LIBS += Qt5X11Extras 3.0 # 5.9 WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui m FLAVORS = debug +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtx11extras/distinfo b/x11/qt5/qtx11extras/distinfo index 4a0ec9e1825..d224eb4d61b 100644 --- a/x11/qt5/qtx11extras/distinfo +++ b/x11/qt5/qtx11extras/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtx11extras-everywhere-opensource-src-5.15.16.tar.xz) = uhKb8yR622SbK2/8tHh4LCoFeln59hePpUDlEy+K4rI= -SIZE (qt/qtx11extras-everywhere-opensource-src-5.15.16.tar.xz) = 137856 +SHA256 (qt/qt-qt/qtx11extras-c44c4fa86fa0794c25baef4ee1f6272aca8c511a.tar.gz) = rYl7wY6wYb3u9olRk3LWZb6rvbv0l+9SWuPepqjaI5M= +SIZE (qt/qt-qt/qtx11extras-c44c4fa86fa0794c25baef4ee1f6272aca8c511a.tar.gz) = 368259 diff --git a/x11/qt5/qtxmlpatterns/Makefile b/x11/qt5/qtxmlpatterns/Makefile index b5c3dfeb9fe..aaa39eb68c3 100644 --- a/x11/qt5/qtxmlpatterns/Makefile +++ b/x11/qt5/qtxmlpatterns/Makefile @@ -1,6 +1,9 @@ QT5NAME = QtXmlPatterns COMMENT-main = Qt5 support for XPath, XQuery, XSLT and XML Schema +KDE_COMMIT = 0b644263abca66503db1ce8a4e126cf358a34685 +KDE_VERSION = 0 + SHARED_LIBS += Qt5XmlPatterns 3.0 # 5.9 WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Qml c m @@ -13,4 +16,7 @@ MODQMAKE_RECURSIVE = No LIB_DEPENDS = x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION} +pre-configure: + ${QT5_GEN_INCLUDES} + .include diff --git a/x11/qt5/qtxmlpatterns/distinfo b/x11/qt5/qtxmlpatterns/distinfo index 8a2dde05032..763fc22c98d 100644 --- a/x11/qt5/qtxmlpatterns/distinfo +++ b/x11/qt5/qtxmlpatterns/distinfo @@ -1,2 +1,2 @@ -SHA256 (qt/qtxmlpatterns-everywhere-opensource-src-5.15.16.tar.xz) = HIUxI/DxGll+7ocM/GJHwlabD9FL023k4y4EBXXYeUA= -SIZE (qt/qtxmlpatterns-everywhere-opensource-src-5.15.16.tar.xz) = 5181984 +SHA256 (qt/qt-qt/qtxmlpatterns-0b644263abca66503db1ce8a4e126cf358a34685.tar.gz) = 45Eospr8tXv5q4MscUill/pYN2AAjnrUnQ15HWJc3cc= +SIZE (qt/qt-qt/qtxmlpatterns-0b644263abca66503db1ce8a4e126cf358a34685.tar.gz) = 2117327