diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-12-18 10:11:53 +0100 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2022-01-02 09:47:54 +0100 |
| commit | 6b3bece75ad5a3d03e2751e5cdf78ae8aeb0abf9 (patch) | |
| tree | 274b8a7c1de1b060b55e801fb2e68d14168af9c2 /devel/qt5-concurrent | |
| parent | games/lmpc: allow the port to build on more 32-bit architectures (diff) | |
Qt: Switch Qt5 to use KDE's Qt patch collection
From [1]
What's this?
This is a set of git repositories based on the last public
commits available for Qt 5.15 branches with a curated collection
of patches on top to ensure open source products can be used
comfortably until users transition to their Qt 6-based ports.
Which patches does it include?
This collection of patches includes patches that fix at least
one of the following:
* Security issues
* Crashes
* Functional defects
We only include patches that have been approved upstream in the
Qt project. If a patch cannot be merged upstream for technical
reasons (e.g. the class no longer exists), it can also be
merged.
The patches to merge will be decided based on their relevance
towards Open Source products and their viability.
PR: 260548
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D33446
[1] https://community.kde.org/Qt5PatchCollection
Diffstat (limited to 'devel/qt5-concurrent')
| -rw-r--r-- | devel/qt5-concurrent/Makefile | 6 | ||||
| -rw-r--r-- | devel/qt5-concurrent/distinfo | 3 | ||||
| -rw-r--r-- | devel/qt5-concurrent/files/patch-gcc11 | 15 |
3 files changed, 6 insertions, 18 deletions
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() - { |