aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2020-08-18 10:26:26 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2020-08-18 10:31:17 +0000
commit11e27aeefd7abf973a3f56cb459f105ee2cdf79e (patch)
treeb3541e6888a9eea7667ad8a5263d1fd09cb57d0d
parent4e3a7dfb5ac3b33e498401059b910bbe18e10e08 (diff)
downloadaports-11e27aeefd7abf973a3f56cb459f105ee2cdf79e.tar.gz
aports-11e27aeefd7abf973a3f56cb459f105ee2cdf79e.tar.bz2
aports-11e27aeefd7abf973a3f56cb459f105ee2cdf79e.tar.xz
testing/pegasus-frontend: support qt >=5.14
-rw-r--r--testing/pegasus-frontend/APKBUILD8
-rw-r--r--testing/pegasus-frontend/qt-5-14-compatibility.patch32
2 files changed, 38 insertions, 2 deletions
diff --git a/testing/pegasus-frontend/APKBUILD b/testing/pegasus-frontend/APKBUILD
index 677cba417a..07e05c78a4 100644
--- a/testing/pegasus-frontend/APKBUILD
+++ b/testing/pegasus-frontend/APKBUILD
@@ -18,10 +18,13 @@ _theme_commit=ccaf3152574992eacbda81ccf6624731e07e963e
source="$pkgname-$_realver.zip::https://github.com/mmatyas/pegasus-frontend/archive/$_realver.zip
$pkgname-$_realver-translations.zip::https://github.com/mmatyas/$pkgname-translations/archive/$_translations_commit.zip
$pkgname-$_realver-thirdparty.zip::https://github.com/mmatyas/SortFilterProxyModel/archive/$_thirdparty_commit.zip
- $pkgname-$_realver-themes.zip::https://github.com/mmatyas/pegasus-theme-grid/archive/$_theme_commit.zip"
+ $pkgname-$_realver-themes.zip::https://github.com/mmatyas/pegasus-theme-grid/archive/$_theme_commit.zip
+ qt-5-14-compatibility.patch
+ "
builddir="$srcdir/$pkgname-$_realver"
prepare() {
+ default_prepare
mv "$srcdir"/$pkgname-translations-$_translations_commit/* "$builddir"/lang
mv "$srcdir"/SortFilterProxyModel-$_thirdparty_commit/* "$builddir"/thirdparty/SortFilterProxyModel
mv "$srcdir"/pegasus-theme-grid-$_theme_commit/* "$builddir"/src/themes/pegasus-theme-grid
@@ -45,4 +48,5 @@ package() {
sha512sums="b80b05c7120c2c740f49b73b248003d2f46a524ce64cdde5feb6ee791bd25c291c1b036b95ca507557b7a65bd94d5587b74b575c5bfacb6d65ac1d7803654342 pegasus-frontend-alpha13.zip
48265568df3f83efa372d45233b0954f0e3a48e4085e0beeed01f2601e580cb1af9713d7edb48c010afa9af9e952df256718e99402fa2363c548a939682cdd8e pegasus-frontend-alpha13-translations.zip
545ace1a9641e988f3fbc91a5933ef05f5044fef672d50347dc890ca13efdf325d0c28eb0612040c2cf743fe8fbf80e1b16b236382fdb5bd7d495e95d0c02860 pegasus-frontend-alpha13-thirdparty.zip
-ac6addb71483e5f45f60a5815b4f1e6695f794446bacc3323a84155c03ec95e08d084ee4879c381cef428114f34596837e088de03b55679eeed2bd5bb1126bb8 pegasus-frontend-alpha13-themes.zip"
+ac6addb71483e5f45f60a5815b4f1e6695f794446bacc3323a84155c03ec95e08d084ee4879c381cef428114f34596837e088de03b55679eeed2bd5bb1126bb8 pegasus-frontend-alpha13-themes.zip
+a6d6ade0a963291f790f7607d53a7c33aad48bff6c3f8a49c48170af30353b2563103201c7bf1017dbc0daf9fe4ed34f00196c5f16c742d89fe2b407fe96359f qt-5-14-compatibility.patch"
diff --git a/testing/pegasus-frontend/qt-5-14-compatibility.patch b/testing/pegasus-frontend/qt-5-14-compatibility.patch
new file mode 100644
index 0000000000..354d44e0ff
--- /dev/null
+++ b/testing/pegasus-frontend/qt-5-14-compatibility.patch
@@ -0,0 +1,32 @@
+Upstream: yes
+Url: https://github.com/mmatyas/pegasus-frontend/pull/589
+From 71c4720ef26fbdd87b43e5c31eb604a92d1ad612 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= <matyas.mustoha@gmail.com>
+Date: Sun, 29 Dec 2019 00:46:15 +0100
+Subject: [PATCH] Fixed a compile error when using Qt 5.14, related to string
+ hashes
+
+---
+ src/backend/utils/HashMap.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/backend/utils/HashMap.h b/src/backend/utils/HashMap.h
+index 3a17305f..21f558e1 100644
+--- a/src/backend/utils/HashMap.h
++++ b/src/backend/utils/HashMap.h
+@@ -26,6 +26,7 @@
+ template <typename Key, typename Val, typename Hash = std::hash<Key>>
+ using HashMap = std::unordered_map<Key, Val, Hash>;
+
++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ // hash for strings
+ namespace std {
+ template<> struct hash<QString> {
+@@ -39,6 +40,7 @@ namespace std {
+ }
+ };
+ }
++#endif
+
+ // hash for enum classes
+ struct EnumHash {