diff options
Diffstat (limited to 'devel')
48 files changed, 166 insertions, 162 deletions
diff --git a/devel/qt5-assistant/Makefile b/devel/qt5-assistant/Makefile index 9738b62bd85e..fe9a167bb187 100644 --- a/devel/qt5-assistant/Makefile +++ b/devel/qt5-assistant/Makefile @@ -1,5 +1,5 @@ PORTNAME= assistant -DISTVERSION= ${QT5_VERSION} +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-assistant/distinfo b/devel/qt5-assistant/distinfo new file mode 100644 index 000000000000..0d4531b45bb2 --- /dev/null +++ b/devel/qt5-assistant/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423860 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile index 0f7ad4d0a3be..e9264a322ef4 100644 --- a/devel/qt5-buildtools/Makefile +++ b/devel/qt5-buildtools/Makefile @@ -1,6 +1,5 @@ PORTNAME= buildtools -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -8,6 +7,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt build tools USES= compiler:c++11-lang libtool perl5 qmake:no_env qt-dist:5,base +USE_PERL5= extract HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb QT_BINARIES= yes diff --git a/devel/qt5-buildtools/distinfo b/devel/qt5-buildtools/distinfo new file mode 100644 index 000000000000..ad7fd12014dd --- /dev/null +++ b/devel/qt5-buildtools/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423861 +SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e +SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048 diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile index 5cc46363ff2a..6f3a42df0736 100644 --- a/devel/qt5-concurrent/Makefile +++ b/devel/qt5-concurrent/Makefile @@ -1,13 +1,13 @@ PORTNAME= concurrent -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt multi-threading module -USES= compiler:c++11-lang qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base +USE_PERL5= extract USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb diff --git a/devel/qt5-concurrent/distinfo b/devel/qt5-concurrent/distinfo new file mode 100644 index 000000000000..5c3758be8f88 --- /dev/null +++ b/devel/qt5-concurrent/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423862 +SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e +SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048 diff --git a/devel/qt5-concurrent/files/patch-gcc11 b/devel/qt5-concurrent/files/patch-gcc11 deleted file mode 100644 index 3198f6ed38ca..000000000000 --- a/devel/qt5-concurrent/files/patch-gcc11 +++ /dev/null @@ -1,15 +0,0 @@ -https://codereview.qt-project.org/c/qt/qtbase/+/339417 - ---- src/concurrent/qtconcurrentthreadengine.h.orig 2020-10-27 08:02:11 UTC -+++ src/concurrent/qtconcurrentthreadengine.h -@@ -247,8 +247,8 @@ template <> - class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void> - { - public: -- ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine) -- :ThreadEngineStarterBase<void>(_threadEngine) {} -+ ThreadEngineStarter(ThreadEngine<void> *_threadEngine) -+ : ThreadEngineStarterBase<void>(_threadEngine) {} - - void startBlocking() - { diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 846ea77ff07b..d2b938e1f768 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -1,6 +1,5 @@ PORTNAME= core -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 6 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -12,8 +11,9 @@ LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ libpcre2-posix.so:devel/pcre2 \ libzstd.so:archivers/zstd -USES= compiler:c++11-lang gnome qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang gnome perl5 qmake:no_env qt-dist:5,base USE_GNOME= glib20 +USE_PERL5= extract USE_QT= qmake_build buildtools_build HAS_CONFIGURE= yes # Disable (almost) everything to install minimal qconfig.h. diff --git a/devel/qt5-core/distinfo b/devel/qt5-core/distinfo new file mode 100644 index 000000000000..afc62138a969 --- /dev/null +++ b/devel/qt5-core/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423864 +SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e +SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048 diff --git a/devel/qt5-core/files/patch-src_corelib_io_qiodevice.cpp b/devel/qt5-core/files/patch-src_corelib_io_qiodevice.cpp deleted file mode 100644 index 3a35ca2b1259..000000000000 --- a/devel/qt5-core/files/patch-src_corelib_io_qiodevice.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- src/corelib/io/qiodevice.cpp.orig 2020-05-11 08:15:08 UTC -+++ src/corelib/io/qiodevice.cpp -@@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize) - } else - readBytes = readLine(result.data(), result.size()); - -- if (readBytes <= 0) -+ if (readBytes <= 0) { - result.clear(); -- else -+ } else { - result.resize(readBytes); -+ result.squeeze(); -+ } - - return result; - } diff --git a/devel/qt5-dbus/Makefile b/devel/qt5-dbus/Makefile index 47b0fa12f107..48334177fa16 100644 --- a/devel/qt5-dbus/Makefile +++ b/devel/qt5-dbus/Makefile @@ -1,6 +1,5 @@ PORTNAME= dbus -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -9,7 +8,8 @@ COMMENT= Qt D-Bus inter-process communication module LIB_DEPENDS= libdbus-1.so:devel/dbus -USES= compiler:c++11-lang qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base +USE_PERL5= extract USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb diff --git a/devel/qt5-dbus/distinfo b/devel/qt5-dbus/distinfo new file mode 100644 index 000000000000..0e99e5287fd0 --- /dev/null +++ b/devel/qt5-dbus/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423865 +SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e +SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048 diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile index 6d2a3f163331..08ee9e3742cf 100644 --- a/devel/qt5-designer/Makefile +++ b/devel/qt5-designer/Makefile @@ -1,6 +1,5 @@ PORTNAME= designer -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-designer/distinfo b/devel/qt5-designer/distinfo new file mode 100644 index 000000000000..3bf6e6575462 --- /dev/null +++ b/devel/qt5-designer/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423866 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile index c06d5b565895..b1c5f0c525ca 100644 --- a/devel/qt5-help/Makefile +++ b/devel/qt5-help/Makefile @@ -1,6 +1,5 @@ PORTNAME= help -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-help/distinfo b/devel/qt5-help/distinfo new file mode 100644 index 000000000000..18887f18a435 --- /dev/null +++ b/devel/qt5-help/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423867 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5-linguist/Makefile b/devel/qt5-linguist/Makefile index 5b407debb3fe..6a8fc0357cf0 100644 --- a/devel/qt5-linguist/Makefile +++ b/devel/qt5-linguist/Makefile @@ -1,5 +1,5 @@ PORTNAME= linguist -DISTVERSION= ${QT5_VERSION} +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-linguist/distinfo b/devel/qt5-linguist/distinfo new file mode 100644 index 000000000000..984afb95baa4 --- /dev/null +++ b/devel/qt5-linguist/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423868 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile index 0311af3064e6..6d2865306381 100644 --- a/devel/qt5-linguisttools/Makefile +++ b/devel/qt5-linguisttools/Makefile @@ -1,6 +1,5 @@ PORTNAME= linguisttools -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-linguisttools/distinfo b/devel/qt5-linguisttools/distinfo new file mode 100644 index 000000000000..f1d1ebf9f91a --- /dev/null +++ b/devel/qt5-linguisttools/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423869 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5-location/Makefile b/devel/qt5-location/Makefile index 159f88895ccb..1353a8619338 100644 --- a/devel/qt5-location/Makefile +++ b/devel/qt5-location/Makefile @@ -1,6 +1,5 @@ PORTNAME= location -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-location/distinfo b/devel/qt5-location/distinfo new file mode 100644 index 000000000000..705ae54f3698 --- /dev/null +++ b/devel/qt5-location/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423870 +SHA256 (KDE/Qt/5.15.2/kde-qtlocation-5.15.2p6.tar.xz) = 82bcf791ce0651b24c43a2875e629a1500f7a9a29378d49100ea5050cd2fa076 +SIZE (KDE/Qt/5.15.2/kde-qtlocation-5.15.2p6.tar.xz) = 4212420 diff --git a/devel/qt5-qdbus/Makefile b/devel/qt5-qdbus/Makefile index 811103590a7f..7453bb6f64ee 100644 --- a/devel/qt5-qdbus/Makefile +++ b/devel/qt5-qdbus/Makefile @@ -1,6 +1,5 @@ PORTNAME= qdbus -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qdbus/distinfo b/devel/qt5-qdbus/distinfo new file mode 100644 index 000000000000..a9b350ab4e08 --- /dev/null +++ b/devel/qt5-qdbus/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423871 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5-qdbusviewer/Makefile b/devel/qt5-qdbusviewer/Makefile index 3f84dc4726ad..c2f155acb4dd 100644 --- a/devel/qt5-qdbusviewer/Makefile +++ b/devel/qt5-qdbusviewer/Makefile @@ -1,5 +1,5 @@ PORTNAME= qdbusviewer -DISTVERSION= ${QT5_VERSION} +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qdbusviewer/distinfo b/devel/qt5-qdbusviewer/distinfo new file mode 100644 index 000000000000..551e04498568 --- /dev/null +++ b/devel/qt5-qdbusviewer/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423872 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5-qdoc-data/Makefile b/devel/qt5-qdoc-data/Makefile index 020dc9f6083d..ae92b05fa7ac 100644 --- a/devel/qt5-qdoc-data/Makefile +++ b/devel/qt5-qdoc-data/Makefile @@ -26,7 +26,6 @@ NO_ARCH= yes NO_BUILD= yes DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr -DISTINFO_FILE= ${.CURDIR:H:H}/devel/qt5/distinfo do-install: ${MKDIR} ${STAGEDIR}${QT_DOCDIR} && \ diff --git a/devel/qt5-qdoc-data/distinfo b/devel/qt5-qdoc-data/distinfo new file mode 100644 index 000000000000..69871b4e830c --- /dev/null +++ b/devel/qt5-qdoc-data/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639505201 +SHA256 (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 +SIZE (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 50179672 diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index 533643cf0830..f954b602e778 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -1,5 +1,5 @@ PORTNAME= qdoc -DISTVERSION= ${QT5_VERSION} +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel textproc PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qdoc/distinfo b/devel/qt5-qdoc/distinfo new file mode 100644 index 000000000000..79fad251e6a4 --- /dev/null +++ b/devel/qt5-qdoc/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423873 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile index c73de40c0aef..147f7b17cb93 100644 --- a/devel/qt5-qmake/Makefile +++ b/devel/qt5-qmake/Makefile @@ -1,13 +1,12 @@ PORTNAME= qmake -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator -USES= compiler:c++11-lib gmake pkgconfig \ +USES= compiler:c++11-lib gmake perl5 pkgconfig \ python:build qmake:no_env qt-dist:5,base shebangfix SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ util/unicode/x11/makeencodings \ @@ -15,6 +14,7 @@ SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ mkspecs/features/data/mac/objc_namespace.sh \ mkspecs/features/uikit/devices.py \ mkspecs/features/uikit/device_destinations.sh +USE_PERL5= extract REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes diff --git a/devel/qt5-qmake/distinfo b/devel/qt5-qmake/distinfo new file mode 100644 index 000000000000..526e93f5af27 --- /dev/null +++ b/devel/qt5-qmake/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639421182 +SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e +SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048 diff --git a/devel/qt5-remoteobjects/Makefile b/devel/qt5-remoteobjects/Makefile index c1a022298f0c..b53a0437ac90 100644 --- a/devel/qt5-remoteobjects/Makefile +++ b/devel/qt5-remoteobjects/Makefile @@ -1,6 +1,5 @@ PORTNAME= remoteobjects -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-remoteobjects/distinfo b/devel/qt5-remoteobjects/distinfo new file mode 100644 index 000000000000..640350bfd20f --- /dev/null +++ b/devel/qt5-remoteobjects/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423876 +SHA256 (KDE/Qt/5.15.2/kde-qtremoteobjects-5.15.2p3.tar.xz) = f1c2d5d2346fdac017b2a40be80468d9ed50c50bfbdefc7e57f88ea1d111e6dd +SIZE (KDE/Qt/5.15.2/kde-qtremoteobjects-5.15.2p3.tar.xz) = 350464 diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index 02c9fbe74ce9..20419d33b32a 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -1,13 +1,13 @@ PORTNAME= script -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4-compatible scripting module -USES= compiler:c++11-lang qmake qt-dist:5,script +USES= compiler:c++11-lang perl5 qmake qt-dist:5,script +USE_PERL5= extract USE_QT= core buildtools_build # Keep make(1) from descending into src/script/obj/ (qmake:outsource # doesn't work). diff --git a/devel/qt5-script/distinfo b/devel/qt5-script/distinfo new file mode 100644 index 000000000000..e1fc1ff6c2fc --- /dev/null +++ b/devel/qt5-script/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423877 +SHA256 (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 66671e9516df5b099cef4f0440db97d96d07990665c9311321ccfaaf0687b129 +SIZE (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 2623560 diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile index 4090a424224b..0f03a044087a 100644 --- a/devel/qt5-scripttools/Makefile +++ b/devel/qt5-scripttools/Makefile @@ -1,6 +1,5 @@ PORTNAME= scripttools -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-scripttools/distinfo b/devel/qt5-scripttools/distinfo new file mode 100644 index 000000000000..ac9463e8ab1d --- /dev/null +++ b/devel/qt5-scripttools/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423878 +SHA256 (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 66671e9516df5b099cef4f0440db97d96d07990665c9311321ccfaaf0687b129 +SIZE (KDE/Qt/5.15.2/kde-qtscript-5.15.2p4.tar.xz) = 2623560 diff --git a/devel/qt5-scxml/Makefile b/devel/qt5-scxml/Makefile index 1fe3a138ad78..68027aa886bf 100644 --- a/devel/qt5-scxml/Makefile +++ b/devel/qt5-scxml/Makefile @@ -1,6 +1,5 @@ PORTNAME= scxml -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-scxml/distinfo b/devel/qt5-scxml/distinfo new file mode 100644 index 000000000000..00cf9c478371 --- /dev/null +++ b/devel/qt5-scxml/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423879 +SHA256 (KDE/Qt/5.15.2/kde-qtscxml-5.15.2p1.tar.xz) = e99d34a972c0bf84ad692edac47b4928e89053d692950a153535c7fc17011f4b +SIZE (KDE/Qt/5.15.2/kde-qtscxml-5.15.2p1.tar.xz) = 408532 diff --git a/devel/qt5-testlib/Makefile b/devel/qt5-testlib/Makefile index d3e352b97636..e41d1fb4eb9f 100644 --- a/devel/qt5-testlib/Makefile +++ b/devel/qt5-testlib/Makefile @@ -1,13 +1,13 @@ PORTNAME= testlib -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing module -USES= compiler:c++11-lang qmake:no_env qt-dist:5,base +USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base +USE_PERL5= extract USE_QT= core qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-gui -no-xcb diff --git a/devel/qt5-testlib/distinfo b/devel/qt5-testlib/distinfo new file mode 100644 index 000000000000..38f97651ea3c --- /dev/null +++ b/devel/qt5-testlib/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423880 +SHA256 (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = a516b110cc8c3ae1627711cf3f7fdfffcd300e75cca6c97aa037ea940780ad1e +SIZE (KDE/Qt/5.15.2/kde-qtbase-5.15.2p263.tar.xz) = 49709048 diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile index ae9fc5cd928c..f461ff941f07 100644 --- a/devel/qt5-uitools/Makefile +++ b/devel/qt5-uitools/Makefile @@ -1,6 +1,5 @@ PORTNAME= uitools -DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-uitools/distinfo b/devel/qt5-uitools/distinfo new file mode 100644 index 000000000000..74e7ddfd2617 --- /dev/null +++ b/devel/qt5-uitools/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1639423881 +SHA256 (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 51281e37f5b140eeff242dfefe525bd7fca0223f8da5f33a2cf79e32745eb11a +SIZE (KDE/Qt/5.15.2/kde-qttools-5.15.2p17.tar.xz) = 8842464 diff --git a/devel/qt5/Makefile.sqldrivers b/devel/qt5/Makefile.sqldrivers index 72f77fa9bc1d..b5b2ec9a5429 100644 --- a/devel/qt5/Makefile.sqldrivers +++ b/devel/qt5/Makefile.sqldrivers @@ -1,12 +1,13 @@ PORTNAME?= ${DB:tl} -DISTVERSION?= ${QT5_VERSION} +PORTVERSION?= ${QT5_VERSION}${QT5_KDE_PATCH} CATEGORIES?= databases PKGNAMEPREFIX?= qt5-sqldrivers- MAINTAINER?= kde@FreeBSD.org COMMENT?= Qt ${DB_DESC} database plugin -USES+= compiler:c++11-lang qmake:no_env qt-dist:5,base +USES+= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base +USE_PERL5+= extract USE_QT+= core sql qmake_build buildtools_build HAS_CONFIGURE= yes CONFIGURE_ARGS+=-no-gui -no-xcb diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index d7bbf5673fe8..eb6bfbef0c6c 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -1,85 +1 @@ -TIMESTAMP = 1605899522 -SHA256 (KDE/Qt/5.15.2/qt3d-everywhere-src-5.15.2.tar.xz) = 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d -SIZE (KDE/Qt/5.15.2/qt3d-everywhere-src-5.15.2.tar.xz) = 81925416 -SHA256 (KDE/Qt/5.15.2/qtactiveqt-everywhere-src-5.15.2.tar.xz) = 868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c -SIZE (KDE/Qt/5.15.2/qtactiveqt-everywhere-src-5.15.2.tar.xz) = 268380 -SHA256 (KDE/Qt/5.15.2/qtandroidextras-everywhere-src-5.15.2.tar.xz) = 5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd -SIZE (KDE/Qt/5.15.2/qtandroidextras-everywhere-src-5.15.2.tar.xz) = 276344 -SHA256 (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 -SIZE (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 50179672 -SHA256 (KDE/Qt/5.15.2/qtcharts-everywhere-src-5.15.2.tar.xz) = e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 -SIZE (KDE/Qt/5.15.2/qtcharts-everywhere-src-5.15.2.tar.xz) = 4251992 -SHA256 (KDE/Qt/5.15.2/qtconnectivity-everywhere-src-5.15.2.tar.xz) = 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 -SIZE (KDE/Qt/5.15.2/qtconnectivity-everywhere-src-5.15.2.tar.xz) = 2815492 -SHA256 (KDE/Qt/5.15.2/qtdatavis3d-everywhere-src-5.15.2.tar.xz) = 226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd -SIZE (KDE/Qt/5.15.2/qtdatavis3d-everywhere-src-5.15.2.tar.xz) = 5191436 -SHA256 (KDE/Qt/5.15.2/qtdeclarative-everywhere-src-5.15.2.tar.xz) = c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 -SIZE (KDE/Qt/5.15.2/qtdeclarative-everywhere-src-5.15.2.tar.xz) = 21559880 -SHA256 (KDE/Qt/5.15.2/qtdoc-everywhere-src-5.15.2.tar.xz) = a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4 -SIZE (KDE/Qt/5.15.2/qtdoc-everywhere-src-5.15.2.tar.xz) = 5746492 -SHA256 (KDE/Qt/5.15.2/qtgamepad-everywhere-src-5.15.2.tar.xz) = c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c -SIZE (KDE/Qt/5.15.2/qtgamepad-everywhere-src-5.15.2.tar.xz) = 387084 -SHA256 (KDE/Qt/5.15.2/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz) = ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 -SIZE (KDE/Qt/5.15.2/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz) = 14040900 -SHA256 (KDE/Qt/5.15.2/qtimageformats-everywhere-src-5.15.2.tar.xz) = bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 -SIZE (KDE/Qt/5.15.2/qtimageformats-everywhere-src-5.15.2.tar.xz) = 1806740 -SHA256 (KDE/Qt/5.15.2/qtlocation-everywhere-src-5.15.2.tar.xz) = 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 -SIZE (KDE/Qt/5.15.2/qtlocation-everywhere-src-5.15.2.tar.xz) = 6556764 -SHA256 (KDE/Qt/5.15.2/qtlottie-everywhere-src-5.15.2.tar.xz) = cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517 -SIZE (KDE/Qt/5.15.2/qtlottie-everywhere-src-5.15.2.tar.xz) = 82424 -SHA256 (KDE/Qt/5.15.2/qtmacextras-everywhere-src-5.15.2.tar.xz) = 6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e -SIZE (KDE/Qt/5.15.2/qtmacextras-everywhere-src-5.15.2.tar.xz) = 69484 -SHA256 (KDE/Qt/5.15.2/qtmultimedia-everywhere-src-5.15.2.tar.xz) = 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 -SIZE (KDE/Qt/5.15.2/qtmultimedia-everywhere-src-5.15.2.tar.xz) = 3828172 -SHA256 (KDE/Qt/5.15.2/qtnetworkauth-everywhere-src-5.15.2.tar.xz) = fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85 -SIZE (KDE/Qt/5.15.2/qtnetworkauth-everywhere-src-5.15.2.tar.xz) = 141688 -SHA256 (KDE/Qt/5.15.2/qtpurchasing-everywhere-src-5.15.2.tar.xz) = 87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227 -SIZE (KDE/Qt/5.15.2/qtpurchasing-everywhere-src-5.15.2.tar.xz) = 208804 -SHA256 (KDE/Qt/5.15.2/qtquick3d-everywhere-src-5.15.2.tar.xz) = 5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb -SIZE (KDE/Qt/5.15.2/qtquick3d-everywhere-src-5.15.2.tar.xz) = 55767288 -SHA256 (KDE/Qt/5.15.2/qtquickcontrols-everywhere-src-5.15.2.tar.xz) = c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 -SIZE (KDE/Qt/5.15.2/qtquickcontrols-everywhere-src-5.15.2.tar.xz) = 5982344 -SHA256 (KDE/Qt/5.15.2/qtquickcontrols2-everywhere-src-5.15.2.tar.xz) = 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 -SIZE (KDE/Qt/5.15.2/qtquickcontrols2-everywhere-src-5.15.2.tar.xz) = 8284692 -SHA256 (KDE/Qt/5.15.2/qtquicktimeline-everywhere-src-5.15.2.tar.xz) = b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28 -SIZE (KDE/Qt/5.15.2/qtquicktimeline-everywhere-src-5.15.2.tar.xz) = 102624 -SHA256 (KDE/Qt/5.15.2/qtremoteobjects-everywhere-src-5.15.2.tar.xz) = 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 -SIZE (KDE/Qt/5.15.2/qtremoteobjects-everywhere-src-5.15.2.tar.xz) = 374740 -SHA256 (KDE/Qt/5.15.2/qtscript-everywhere-src-5.15.2.tar.xz) = a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e -SIZE (KDE/Qt/5.15.2/qtscript-everywhere-src-5.15.2.tar.xz) = 2663016 -SHA256 (KDE/Qt/5.15.2/qtscxml-everywhere-src-5.15.2.tar.xz) = 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc -SIZE (KDE/Qt/5.15.2/qtscxml-everywhere-src-5.15.2.tar.xz) = 434204 -SHA256 (KDE/Qt/5.15.2/qtsensors-everywhere-src-5.15.2.tar.xz) = 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 -SIZE (KDE/Qt/5.15.2/qtsensors-everywhere-src-5.15.2.tar.xz) = 2056944 -SHA256 (KDE/Qt/5.15.2/qtserialbus-everywhere-src-5.15.2.tar.xz) = aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88 -SIZE (KDE/Qt/5.15.2/qtserialbus-everywhere-src-5.15.2.tar.xz) = 356360 -SHA256 (KDE/Qt/5.15.2/qtserialport-everywhere-src-5.15.2.tar.xz) = 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d -SIZE (KDE/Qt/5.15.2/qtserialport-everywhere-src-5.15.2.tar.xz) = 321496 -SHA256 (KDE/Qt/5.15.2/qtspeech-everywhere-src-5.15.2.tar.xz) = c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5 -SIZE (KDE/Qt/5.15.2/qtspeech-everywhere-src-5.15.2.tar.xz) = 101940 -SHA256 (KDE/Qt/5.15.2/qtsvg-everywhere-src-5.15.2.tar.xz) = 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e -SIZE (KDE/Qt/5.15.2/qtsvg-everywhere-src-5.15.2.tar.xz) = 1886268 -SHA256 (KDE/Qt/5.15.2/qttools-everywhere-src-5.15.2.tar.xz) = c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc -SIZE (KDE/Qt/5.15.2/qttools-everywhere-src-5.15.2.tar.xz) = 8894728 -SHA256 (KDE/Qt/5.15.2/qttranslations-everywhere-src-5.15.2.tar.xz) = d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8 -SIZE (KDE/Qt/5.15.2/qttranslations-everywhere-src-5.15.2.tar.xz) = 1419504 -SHA256 (KDE/Qt/5.15.2/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz) = 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 -SIZE (KDE/Qt/5.15.2/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz) = 10955076 -SHA256 (KDE/Qt/5.15.2/qtwayland-everywhere-src-5.15.2.tar.xz) = 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5 -SIZE (KDE/Qt/5.15.2/qtwayland-everywhere-src-5.15.2.tar.xz) = 564884 -SHA256 (KDE/Qt/5.15.2/qtwebchannel-everywhere-src-5.15.2.tar.xz) = 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 -SIZE (KDE/Qt/5.15.2/qtwebchannel-everywhere-src-5.15.2.tar.xz) = 209208 -SHA256 (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 -SIZE (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = 280142544 -SHA256 (KDE/Qt/5.15.2/qtwebglplugin-everywhere-src-5.15.2.tar.xz) = 81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446 -SIZE (KDE/Qt/5.15.2/qtwebglplugin-everywhere-src-5.15.2.tar.xz) = 74144 -SHA256 (KDE/Qt/5.15.2/qtwebsockets-everywhere-src-5.15.2.tar.xz) = a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f -SIZE (KDE/Qt/5.15.2/qtwebsockets-everywhere-src-5.15.2.tar.xz) = 259000 -SHA256 (KDE/Qt/5.15.2/qtwebview-everywhere-src-5.15.2.tar.xz) = be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7 -SIZE (KDE/Qt/5.15.2/qtwebview-everywhere-src-5.15.2.tar.xz) = 133428 -SHA256 (KDE/Qt/5.15.2/qtwinextras-everywhere-src-5.15.2.tar.xz) = 65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e -SIZE (KDE/Qt/5.15.2/qtwinextras-everywhere-src-5.15.2.tar.xz) = 763948 -SHA256 (KDE/Qt/5.15.2/qtx11extras-everywhere-src-5.15.2.tar.xz) = 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e -SIZE (KDE/Qt/5.15.2/qtx11extras-everywhere-src-5.15.2.tar.xz) = 143972 -SHA256 (KDE/Qt/5.15.2/qtxmlpatterns-everywhere-src-5.15.2.tar.xz) = 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa -SIZE (KDE/Qt/5.15.2/qtxmlpatterns-everywhere-src-5.15.2.tar.xz) = 5209380 +TIMESTAMP = 1639414463 diff --git a/devel/qt5/files/create_kde-qt_release.sh b/devel/qt5/files/create_kde-qt_release.sh new file mode 100644 index 000000000000..8624cd456ac8 --- /dev/null +++ b/devel/qt5/files/create_kde-qt_release.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +# Creates and updates a git checkout in ${BASE_DIRECTORY} +# for the given KDE Qt repository ${PROJECT}. +# After that, a new distfile for the ports tree is created. + +DIST="$1" +PROJECT=qt"${DIST}" +BASE_DIRECTORY="$2" + +# Remote KDE git repository +REPO="https://invent.kde.org/qt/qt/${PROJECT}.git" +# Local checkout +CHECKOUT="${BASE_DIRECTORY}/${PROJECT}" + +# Version of Qt we want +VERSION=5.15.2 +# KDE-Qt branch +BRANCH=kde/5.15 + +# Make sure we can use ${BASE_DIRECTORY} +if [ ! -d "${BASE_DIRECTORY}" ] || [ ! -w "${BASE_DIRECTORY}" ] ; then + echo "Directory '${BASE_DIRECTORY}' does not exist" + exit 1 +fi + +# Init a new git checkout if it is missing +if [ ! -d "${CHECKOUT}" ] ; then + git -C "${BASE_DIRECTORY}" clone "${REPO}" +fi + +# Update the checkout of the required branch +git -C "${CHECKOUT}" checkout "${BRANCH}" && git -C "${CHECKOUT}" pull --ff-only --rebase --autostash +if [ $? -ne 0 ] ; then + echo "Failed to update ${CHECKOUT}" + exit 1 +fi + +# Count number of patches added by KDE +PATCH_COUNT=$(git -C ${CHECKOUT} rev-list --count origin/${VERSION}..origin/${BRANCH}) + +# Setup information for the distfile +DISTNAME="kde-${PROJECT}-${VERSION}p${PATCH_COUNT}" +DISTFILE="${BASE_DIRECTORY}/${DISTNAME}.tar.xz" + +# Tar and compress distfile +git -C ${CHECKOUT} archive --format=tar --prefix="${DISTNAME}/" HEAD | xz > "${DISTFILE}" +if [ $? -ne 0 ] ; then + echo "Failed to create tarball ${DISTFILE}" + exit 1 +fi + +# Printout information required in qt-dist.mk +echo -e "Distfile:\t${DISTFILE}\n_KDE_${DIST}=\t${PATCH_COUNT}" diff --git a/devel/qt5/files/extrapatch-sync.profiles b/devel/qt5/files/extrapatch-sync.profiles new file mode 100644 index 000000000000..b1fb62520247 --- /dev/null +++ b/devel/qt5/files/extrapatch-sync.profiles @@ -0,0 +1,12 @@ +--- sync.profile.orig 2021-12-13 20:02:18.219921000 +0100 ++++ sync.profile 2021-12-13 20:03:45.430880000 +0100 +@@ -37,9 +37,6 @@ + "QtZlib" => "!>$basedir/src/corelib;$basedir/src/3rdparty/zlib", + "QtOpenGLExtensions" => "$basedir/src/openglextensions", + "QtEglFSDeviceIntegration" => "$basedir/src/plugins/platforms/eglfs", +- "QtMockPlugins1" => "$basedir/tests/auto/cmake/mockplugins/mockplugins1", +- "QtMockPlugins2" => "$basedir/tests/auto/cmake/mockplugins/mockplugins2", +- "QtMockPlugins3" => "$basedir/tests/auto/cmake/mockplugins/mockplugins3", + ); + %moduleheaders = ( # restrict the module headers to those found in relative path + "QtEglFSDeviceIntegration" => "api", |