From bacc57493342784b21b1b5c179a471b8c1fc6f1ac0abf2fc5b8e9295b9a877cd Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 13 Dec 2024 11:09:59 +0000 Subject: [PATCH] Accepting request 1230781 from home:plater - Renamed rosegarden-10.10-filepaths.patch to rosegarden-fix-filepaths.patch to prevent future confusion. - enable LV2 beta support OBS-URL: https://build.opensuse.org/request/show/1230781 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=111 --- rosegarden-14.02-fix-bashisms.patch | 12 ++++----- rosegarden-fix-filepaths.patch | 38 ++++++++++++----------------- scripts-sf2rg-python3.patch | 6 ++--- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/rosegarden-14.02-fix-bashisms.patch b/rosegarden-14.02-fix-bashisms.patch index dd054dc..652b409 100644 --- a/rosegarden-14.02-fix-bashisms.patch +++ b/rosegarden-14.02-fix-bashisms.patch @@ -1,7 +1,7 @@ -Index: rosegarden-19.12/scripts/distclean.sh +Index: b/scripts/distclean.sh =================================================================== ---- rosegarden-19.12.orig/scripts/distclean.sh 2020-06-03 13:56:12.929998737 +0200 -+++ rosegarden-19.12/scripts/distclean.sh 2020-06-03 13:56:42.131153109 +0200 +--- a/scripts/distclean.sh 2024-12-04 20:06:05.000000000 +0200 ++++ b/scripts/distclean.sh 2024-12-13 12:49:36.571854220 +0200 @@ -1,12 +1,10 @@ #!/bin/sh -rm -f {,src/,po/,docs/,data/}CMakeCache.txt @@ -23,10 +23,10 @@ Index: rosegarden-19.12/scripts/distclean.sh + done +done rm -rf RGbuild/* -Index: rosegarden-19.12/scripts/reorganise.sh +Index: b/scripts/reorganise.sh =================================================================== ---- rosegarden-19.12.orig/scripts/reorganise.sh 2020-06-03 13:56:12.929998737 +0200 -+++ rosegarden-19.12/scripts/reorganise.sh 2020-06-03 13:56:42.131153109 +0200 +--- a/scripts/reorganise.sh 2024-12-04 20:06:05.000000000 +0200 ++++ b/scripts/reorganise.sh 2024-12-13 12:49:36.571854220 +0200 @@ -585,7 +585,7 @@ for file in guitar/*.h ; do fi fi diff --git a/rosegarden-fix-filepaths.patch b/rosegarden-fix-filepaths.patch index 56b0c0f..dbafa5e 100644 --- a/rosegarden-fix-filepaths.patch +++ b/rosegarden-fix-filepaths.patch @@ -1,28 +1,7 @@ -Index: b/src/gui/widgets/FileDialog.cpp -=================================================================== ---- a/src/gui/widgets/FileDialog.cpp 2024-12-04 20:06:05.000000000 +0200 -+++ b/src/gui/widgets/FileDialog.cpp 2024-12-13 12:11:44.128502164 +0200 -@@ -58,8 +58,8 @@ FileDialog::FileDialog(QWidget *parent, - #else - QString home = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); - #endif -- QString examples = home + "/.local/share/rosegarden/examples"; -- QString templates = home + "/.local/share/rosegarden/templates"; -+ QString examples = "/usr/share/rosegarden/examples"; -+ QString templates = "/usr/share/rosegarden/templates"; - QString rosegarden = home + "/rosegarden"; - - RG_DEBUG << "FileDialog::FileDialog(...)" Index: b/src/gui/studio/BankEditorDialog.cpp =================================================================== --- a/src/gui/studio/BankEditorDialog.cpp 2024-12-04 20:06:05.000000000 +0200 -+++ b/src/gui/studio/BankEditorDialog.cpp 2024-12-13 12:15:02.991629973 +0200 -@@ -1,4 +1,4 @@ --/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ -+f/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ - - /* - Rosegarden ++++ b/src/gui/studio/BankEditorDialog.cpp 2024-12-13 12:49:21.584515793 +0200 @@ -1216,7 +1216,7 @@ BankEditorDialog::slotImport() const QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path(); #endif @@ -32,3 +11,18 @@ Index: b/src/gui/studio/BankEditorDialog.cpp QString urlString = FileDialog::getOpenFileName( this, // parent +Index: b/src/gui/widgets/FileDialog.cpp +=================================================================== +--- a/src/gui/widgets/FileDialog.cpp 2024-12-04 20:06:05.000000000 +0200 ++++ b/src/gui/widgets/FileDialog.cpp 2024-12-13 12:49:21.584515793 +0200 +@@ -58,8 +58,8 @@ FileDialog::FileDialog(QWidget *parent, + #else + QString home = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); + #endif +- QString examples = home + "/.local/share/rosegarden/examples"; +- QString templates = home + "/.local/share/rosegarden/templates"; ++ QString examples = home + "/usr/share/rosegarden/examples"; ++ QString templates = home + "/usr/share/rosegarden/templates"; + QString rosegarden = home + "/rosegarden"; + + RG_DEBUG << "FileDialog::FileDialog(...)" diff --git a/scripts-sf2rg-python3.patch b/scripts-sf2rg-python3.patch index 542f3e8..1d2abf7 100644 --- a/scripts-sf2rg-python3.patch +++ b/scripts-sf2rg-python3.patch @@ -1,7 +1,7 @@ -Index: rosegarden-20.12/scripts/sf2rg.py +Index: b/scripts/sf2rg.py =================================================================== ---- rosegarden-20.12.orig/scripts/sf2rg.py -+++ rosegarden-20.12/scripts/sf2rg.py +--- a/scripts/sf2rg.py 2024-12-04 20:06:05.000000000 +0200 ++++ b/scripts/sf2rg.py 2024-12-13 12:49:45.871443718 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3