diff options
Diffstat (limited to 'user/qt5-qtbase')
| -rw-r--r-- | user/qt5-qtbase/APKBUILD | 2 | ||||
| -rw-r--r-- | user/qt5-qtbase/forward-port-move.patch | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/user/qt5-qtbase/APKBUILD b/user/qt5-qtbase/APKBUILD index 3f5bc413b..b02a523ae 100644 --- a/user/qt5-qtbase/APKBUILD +++ b/user/qt5-qtbase/APKBUILD @@ -24,6 +24,7 @@ makedepends="$depends_dev subpackages="$pkgname-dev $pkgname-doc $_sub" source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz big-endian-scroll-wheel.patch + forward-port-move.patch link-to-execinfo.patch qt-musl-iconv-no-bom.patch time64.patch @@ -182,6 +183,7 @@ x11() { sha512sums="40916f73e44dbcab2a3196063d491d5563ec3de583436dac25ecf219aea6e7eb55c46ce8b1c761980f90495b91c89bd5239bd081636054311fee6420750319b0 qtbase-everywhere-src-5.12.9.tar.xz d00dc607b71a93132f756b952871df9197cfd6d78cc3617544bfa11d7f0eea21ce5dd0d1aeb69dd2702a5694a63d3802accc76499dbf414c01eb56421698cb0c big-endian-scroll-wheel.patch +e8c542a7c203e7d449f06ac16784e13aefef55f6b8ef8619c49e4604e6e4f697baef027415d1b65f69e95770479c2ed0074dc0dfff9632317eccb30701ae1ed3 forward-port-move.patch ee78a44e28ba5f728914bfc3d8d5b467896c7de11a02d54b0bce11e40a4338b1f776c1fcc30cbd436df4f548c1ab0b4fe801f01b162ddd5c0f892893e227acfd link-to-execinfo.patch e3982b2df2ab4ba53b7a1329a9eb928eb1fee813c61cf6ac03d3300a767ffb57f019ac0fd89f633cac2330549446ff3d43344871296bf362815e7ebffadefa6b qt-musl-iconv-no-bom.patch 436f0bb7a89a88aa62c7b0398c4e91c325e78542e96f747c903f7e96dbf9d9b693d9688c722f2a74e287fb9ab31e861bd5ed8deb172ed28f56a1b8757663771c time64.patch diff --git a/user/qt5-qtbase/forward-port-move.patch b/user/qt5-qtbase/forward-port-move.patch new file mode 100644 index 000000000..cc30ea6e1 --- /dev/null +++ b/user/qt5-qtbase/forward-port-move.patch @@ -0,0 +1,20 @@ +At least Akonadi uses this from 5.13.0. We can use LTS Qt by backporting these +simple macros. + +--- qtbase-everywhere-src-5.12.9/src/corelib/global/qglobal.h.old 2020-06-03 10:51:20.000000000 +0000 ++++ qtbase-everywhere-src-5.12.9/src/corelib/global/qglobal.h 2020-09-17 16:01:53.181072159 +0000 +@@ -372,6 +372,14 @@ + Class(const Class &) Q_DECL_EQ_DELETE;\ + Class &operator=(const Class &) Q_DECL_EQ_DELETE; + ++#define Q_DISABLE_MOVE(Class) \ ++ Class(Class &&) = delete; \ ++ Class &operator=(Class &&) = delete; ++ ++#define Q_DISABLE_COPY_MOVE(Class) \ ++ Q_DISABLE_COPY(Class) \ ++ Q_DISABLE_MOVE(Class) ++ + /* + No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols + for Qt's internal unit tests. If you want slower loading times and more |