From bb7f1de79db96ac4789632cf580b471ec1ed87cc Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 31 Mar 2019 19:33:48 +1000 Subject: [PATCH] Kwave: add new recipe for 19.03.80 version --- kde-base/kwave/additional-files/icons.zip | Bin 0 -> 12349 bytes kde-base/kwave/additional-files/kwave.rdef.in | 30 +++ kde-base/kwave/kwave-19.03.80.recipe | 195 ++++++++++++++++++ .../kwave/patches/kwave-19.03.80.patchset | 146 +++++++++++++ 4 files changed, 371 insertions(+) create mode 100644 kde-base/kwave/additional-files/icons.zip create mode 100644 kde-base/kwave/additional-files/kwave.rdef.in create mode 100644 kde-base/kwave/kwave-19.03.80.recipe create mode 100644 kde-base/kwave/patches/kwave-19.03.80.patchset diff --git a/kde-base/kwave/additional-files/icons.zip b/kde-base/kwave/additional-files/icons.zip new file mode 100644 index 0000000000000000000000000000000000000000..f0201383aadbd6926fe4a516f46a18e0a55753c3 GIT binary patch literal 12349 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 kwave.rdef + + addResourcesToBinaries kwave.rdef $appsDir/Kwave/Kwave + addAppDeskbarSymlink $appsDir/Kwave/Kwave +} diff --git a/kde-base/kwave/patches/kwave-19.03.80.patchset b/kde-base/kwave/patches/kwave-19.03.80.patchset new file mode 100644 index 000000000..749d774bf --- /dev/null +++ b/kde-base/kwave/patches/kwave-19.03.80.patchset @@ -0,0 +1,146 @@ +From 33e859041b22705f6dcf91e37172eaf96f049236 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 24 Mar 2019 21:46:12 +1000 +Subject: Fix build for Haiku + + +diff --git a/kwave/CMakeLists.txt b/kwave/CMakeLists.txt +index 6e2fef8..cf0437e 100644 +--- a/kwave/CMakeLists.txt ++++ b/kwave/CMakeLists.txt +@@ -95,7 +95,6 @@ TARGET_LINK_LIBRARIES(kwave_core + KF5::Completion + KF5::ConfigCore + KF5::Crash +- KF5::DBusAddons + KF5::I18n + KF5::IconThemes + KF5::KIOFileWidgets +diff --git a/kwave/TopWidget.cpp b/kwave/TopWidget.cpp +index fb36d63..421f7c9 100644 +--- a/kwave/TopWidget.cpp ++++ b/kwave/TopWidget.cpp +@@ -1044,6 +1044,7 @@ int Kwave::TopWidget::loadFile(const QUrl &url) + } else { + qWarning("TopWidget::loadFile() failed: result=%d", res); + QString reason; ++#ifndef Q_OS_HAIKU + switch (res) { + case -ENOMEM: + reason = i18n("Out of memory"); +@@ -1060,7 +1061,7 @@ int Kwave::TopWidget::loadFile(const QUrl &url) + default: + reason = _(""); + } +- ++#endif + // show an error message box if the reason was known + if (reason.length()) { + Kwave::MessageBox::error(this, reason); +diff --git a/kwave/main.cpp b/kwave/main.cpp +index 84d7da0..85c64d5 100644 +--- a/kwave/main.cpp ++++ b/kwave/main.cpp +@@ -26,7 +26,9 @@ + #include + #include + #include ++#ifndef Q_OS_HAIKU + #include ++#endif + #include + #include + +@@ -231,10 +233,10 @@ int main(int argc, char **argv) + cmdline.process(app); + about.setupCommandLine(&cmdline); + about.processCommandLine(&cmdline); +- ++#ifndef Q_OS_HAIKU + /* let Kwave be a "unique" application, only one instance */ + KDBusService service(KDBusService::Unique); +- ++#endif + /* check for an optimized version of memcpy() */ + #ifdef WITH_OPTIMIZED_MEMCPY + probe_fast_memcpy(); +@@ -250,14 +252,14 @@ int main(int argc, char **argv) + + // now as the splash screen is in place, we can start a new instance + retval = app.newInstance(app.arguments(), QString()); +- ++#ifndef Q_OS_HAIKU + QObject::connect( + &service, + SIGNAL(activateRequested(QStringList,QString)), + &app, + SLOT(newInstance(QStringList,QString)) + ); +- ++#endif + if (retval != ECANCELED) + retval = app.exec(); + +-- +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 +Subject: Increase sound buffer + + +diff --git a/libkwave/PlayBackParam.h b/libkwave/PlayBackParam.h +index dc3c3ef..15e3603 100644 +--- a/libkwave/PlayBackParam.h ++++ b/libkwave/PlayBackParam.h +@@ -54,7 +54,7 @@ namespace Kwave + /** Default constructor */ + PlayBackParam() + :rate(44100), channels(2), bits_per_sample(16), +- device(), bufbase(10), ++ device(), bufbase(13), + method(Kwave::PLAYBACK_NONE) + { + } +-- +2.19.1 +