From 5628370bb78e2bc6f203ebeed49aaec4fccf1698 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 3 Jan 2021 14:15:33 +1000 Subject: [PATCH] KWave: switch uri to download.kde.org, fix locale --- kde-base/kwave/additional-files/kwave.rdef.in | 2 +- kde-base/kwave/kwave-20.12.0.recipe | 10 +++-- kde-base/kwave/patches/kwave-20.12.0.patchset | 37 ------------------- 3 files changed, 7 insertions(+), 42 deletions(-) diff --git a/kde-base/kwave/additional-files/kwave.rdef.in b/kde-base/kwave/additional-files/kwave.rdef.in index 664a76138..ec401ff9e 100644 --- a/kde-base/kwave/additional-files/kwave.rdef.in +++ b/kde-base/kwave/additional-files/kwave.rdef.in @@ -15,7 +15,7 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; -resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK"; +resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK"; resource file_types message { "types" = "audio" diff --git a/kde-base/kwave/kwave-20.12.0.recipe b/kde-base/kwave/kwave-20.12.0.recipe index ce8e03469..cbc9d057e 100644 --- a/kde-base/kwave/kwave-20.12.0.recipe +++ b/kde-base/kwave/kwave-20.12.0.recipe @@ -7,12 +7,12 @@ Features: including multi channel files * Kwave includes some plugins to transform audio files in several ways and presents \ a graphical view with a complete zoom and scroll capability" -HOMEPAGE="http://kwave.sourceforge.net/" +HOMEPAGE="https://apps.kde.org/kwave" COPYRIGHT="2010-2020 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="1" -SOURCE_URI="https://github.com/KDE/kwave/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="342cc97d156dce65a282b0b980dd9ac9ebebc1ae39ec5981cc13671df6b63dcd" +REVISION="2" +SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kwave-$portVersion.tar.xz" +CHECKSUM_SHA256="0448a54a0a48953dfaf9f8ac5b0cc4fde4ceb407063eee724b2ade1e69cc9d45" PATCHES="kwave-$portVersion.patchset" ADDITIONAL_FILES=" kwave.rdef.in @@ -147,6 +147,8 @@ BUILD_PREREQUIRES=" BUILD() { + sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt + mkdir -p build cd build diff --git a/kde-base/kwave/patches/kwave-20.12.0.patchset b/kde-base/kwave/patches/kwave-20.12.0.patchset index 749d774bf..ad58e7481 100644 --- a/kde-base/kwave/patches/kwave-20.12.0.patchset +++ b/kde-base/kwave/patches/kwave-20.12.0.patchset @@ -85,43 +85,6 @@ index 84d7da0..85c64d5 100644 2.19.1 -From 854e4c138c12a2e9a88117a86fde1afc01358fdc Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 31 Mar 2019 14:37:52 +1000 -Subject: Ugly fix for crash on exit - - -diff --git a/kwave/main.cpp b/kwave/main.cpp -index 85c64d5..4635cf0 100644 ---- a/kwave/main.cpp -+++ b/kwave/main.cpp -@@ -37,6 +37,12 @@ - #include "App.h" - #include "Splash.h" - -+#ifdef Q_OS_HAIKU -+#include -+#include -+#include -+#endif -+ - /** - * add data concerning the developers and - * contributers to the about data -@@ -266,6 +272,9 @@ int main(int argc, char **argv) - splash.done(); - splash.close(); - -+#ifdef Q_OS_HAIKU -+ kill(::getpid(), SIGKILL); -+#endif - return retval; - } - --- -2.19.1 - - From 9cebbcafbc1e367919091da6e337cd66921670e1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 31 Mar 2019 15:27:01 +1000