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
This commit is contained in:
Dave Plater 2024-12-13 11:09:59 +00:00 committed by Git OBS Bridge
parent d7178eae57
commit bacc574933
3 changed files with 25 additions and 31 deletions

View File

@ -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 --- a/scripts/distclean.sh 2024-12-04 20:06:05.000000000 +0200
+++ rosegarden-19.12/scripts/distclean.sh 2020-06-03 13:56:42.131153109 +0200 +++ b/scripts/distclean.sh 2024-12-13 12:49:36.571854220 +0200
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
#!/bin/sh #!/bin/sh
-rm -f {,src/,po/,docs/,data/}CMakeCache.txt -rm -f {,src/,po/,docs/,data/}CMakeCache.txt
@ -23,10 +23,10 @@ Index: rosegarden-19.12/scripts/distclean.sh
+ done + done
+done +done
rm -rf RGbuild/* 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 --- a/scripts/reorganise.sh 2024-12-04 20:06:05.000000000 +0200
+++ rosegarden-19.12/scripts/reorganise.sh 2020-06-03 13:56:42.131153109 +0200 +++ b/scripts/reorganise.sh 2024-12-13 12:49:36.571854220 +0200
@@ -585,7 +585,7 @@ for file in guitar/*.h ; do @@ -585,7 +585,7 @@ for file in guitar/*.h ; do
fi fi
fi fi

View File

@ -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 Index: b/src/gui/studio/BankEditorDialog.cpp
=================================================================== ===================================================================
--- a/src/gui/studio/BankEditorDialog.cpp 2024-12-04 20:06:05.000000000 +0200 --- 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 +++ b/src/gui/studio/BankEditorDialog.cpp 2024-12-13 12:49:21.584515793 +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
@@ -1216,7 +1216,7 @@ BankEditorDialog::slotImport() @@ -1216,7 +1216,7 @@ BankEditorDialog::slotImport()
const QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path(); const QString home = QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation)).path();
#endif #endif
@ -32,3 +11,18 @@ Index: b/src/gui/studio/BankEditorDialog.cpp
QString urlString = FileDialog::getOpenFileName( QString urlString = FileDialog::getOpenFileName(
this, // parent 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(...)"

View File

@ -1,7 +1,7 @@
Index: rosegarden-20.12/scripts/sf2rg.py Index: b/scripts/sf2rg.py
=================================================================== ===================================================================
--- rosegarden-20.12.orig/scripts/sf2rg.py --- a/scripts/sf2rg.py 2024-12-04 20:06:05.000000000 +0200
+++ rosegarden-20.12/scripts/sf2rg.py +++ b/scripts/sf2rg.py 2024-12-13 12:49:45.871443718 +0200
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env python -#!/usr/bin/env python
+#!/usr/bin/python3 +#!/usr/bin/python3