aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-08-08 16:33:14 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-08-08 16:33:15 -0300
commit6cd3ef027e51ee7a0435869a55534b90ec19e4a9 (patch)
treea35113b157e844ef013d0398436003bd6b9eb25f
parentf93e8f772f3f3159b2949e1204c0fef088d3e461 (diff)
downloadaports-6cd3ef027e51ee7a0435869a55534b90ec19e4a9.tar.gz
aports-6cd3ef027e51ee7a0435869a55534b90ec19e4a9.tar.bz2
aports-6cd3ef027e51ee7a0435869a55534b90ec19e4a9.tar.xz
community/hydrogen: fix build with qt-5.15
Patch taken from upstream
-rw-r--r--community/hydrogen/APKBUILD7
-rw-r--r--community/hydrogen/qt5.15.patch23
2 files changed, 28 insertions, 2 deletions
diff --git a/community/hydrogen/APKBUILD b/community/hydrogen/APKBUILD
index 066c5000da..adf3d40b30 100644
--- a/community/hydrogen/APKBUILD
+++ b/community/hydrogen/APKBUILD
@@ -24,7 +24,9 @@ makedepends="
qt5-qtxmlpatterns-dev
"
subpackages="$pkgname-dev $pkgname-doc"
-source="hydrogen-$pkgver.tar.gz::https://github.com/hydrogen-music/hydrogen/archive/$_ver.tar.gz"
+source="hydrogen-$pkgver.tar.gz::https://github.com/hydrogen-music/hydrogen/archive/$_ver.tar.gz
+ qt5.15.patch
+ "
builddir="$srcdir"/hydrogen-$_ver
build() {
@@ -49,4 +51,5 @@ package() {
}
-sha512sums="8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242 hydrogen-1.0.0_beta2.tar.gz"
+sha512sums="8712996adbc820909d1d38ff7d45a2a49ec64c15135d5a99b08b93ebd5a0c05139ce78a317c274059a538eb68031f0f42bb9d22988312c2b9f60fa53c539a242 hydrogen-1.0.0_beta2.tar.gz
+cbf8e7b479cf5f5a69403adf516574d82ea8a7d36a50f04699f216f8e7afd30a8a502636da84171ed4177ef1a492f51ff377950d24d93be727ebf57090e41ea8 qt5.15.patch"
diff --git a/community/hydrogen/qt5.15.patch b/community/hydrogen/qt5.15.patch
new file mode 100644
index 0000000000..ad4466346e
--- /dev/null
+++ b/community/hydrogen/qt5.15.patch
@@ -0,0 +1,23 @@
+From 9c6a2d22019a46d7a551817b7fc13e692b3d7ed0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
+Date: Sat, 6 Jun 2020 00:36:27 +0200
+Subject: [PATCH] SplashScreen : cast nullptr fixes #895
+
+---
+ src/gui/src/SplashScreen.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/src/SplashScreen.cpp b/src/gui/src/SplashScreen.cpp
+index f82a1227c..072e971de 100644
+--- a/src/gui/src/SplashScreen.cpp
++++ b/src/gui/src/SplashScreen.cpp
+@@ -32,7 +32,7 @@
+ const char* SplashScreen::__class_name = "SplashScreen";
+
+ SplashScreen::SplashScreen()
+- : QSplashScreen( nullptr )
++ : QSplashScreen( (QWidget*) nullptr )
+ , Object( __class_name )
+ {
+ //INFOLOG( "SplashScreen" );
+