Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tuxguitar for openSUSE:Factory checked in at 2025-02-21 21:38:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuxguitar (Old) and /work/SRC/openSUSE:Factory/.tuxguitar.new.1873 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tuxguitar" Fri Feb 21 21:38:14 2025 rev:21 rq:1247668 version:1.6.6 Changes: -------- --- /work/SRC/openSUSE:Factory/tuxguitar/tuxguitar.changes 2024-12-31 11:13:03.699456130 +0100 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.1873/tuxguitar.changes 2025-02-21 21:38:43.986147951 +0100 @@ -1,0 +2,15 @@ +Fri Feb 21 14:44:29 UTC 2025 - Fridrich Strba <[email protected]> + +- Fix problem with default font not being installed (bsc#1237464) +- Modified patches: + * 0009-no-lv2.patch -> 0001-no-lv2.patch + * 0010-no-fluidsynth.patch -> 0002-no-fluidsynth.patch + * 0012-startscript.patch -> 0004-startscript.patch + + rediff + * 0011-default-soundfont.patch -> 0003-default-soundfont.patch + + use consistently FluidR3_GM.sf2 instead of the bundled + MagicSFver2.sf2 that cannot be distributed +- Make the fluid-soundfont-gm that contains the FluidR3_GM.sf2 a + hard requirement + +------------------------------------------------------------------- Old: ---- 0009-no-lv2.patch 0010-no-fluidsynth.patch 0011-default-soundfont.patch 0012-startscript.patch New: ---- 0001-no-lv2.patch 0002-no-fluidsynth.patch 0003-default-soundfont.patch 0004-startscript.patch BETA DEBUG BEGIN: Old:- Modified patches: * 0009-no-lv2.patch -> 0001-no-lv2.patch * 0010-no-fluidsynth.patch -> 0002-no-fluidsynth.patch Old: * 0009-no-lv2.patch -> 0001-no-lv2.patch * 0010-no-fluidsynth.patch -> 0002-no-fluidsynth.patch * 0012-startscript.patch -> 0004-startscript.patch Old: + rediff * 0011-default-soundfont.patch -> 0003-default-soundfont.patch + use consistently FluidR3_GM.sf2 instead of the bundled Old: * 0010-no-fluidsynth.patch -> 0002-no-fluidsynth.patch * 0012-startscript.patch -> 0004-startscript.patch + rediff BETA DEBUG END: BETA DEBUG BEGIN: New:- Modified patches: * 0009-no-lv2.patch -> 0001-no-lv2.patch * 0010-no-fluidsynth.patch -> 0002-no-fluidsynth.patch New: * 0009-no-lv2.patch -> 0001-no-lv2.patch * 0010-no-fluidsynth.patch -> 0002-no-fluidsynth.patch * 0012-startscript.patch -> 0004-startscript.patch New: + rediff * 0011-default-soundfont.patch -> 0003-default-soundfont.patch + use consistently FluidR3_GM.sf2 instead of the bundled New: * 0010-no-fluidsynth.patch -> 0002-no-fluidsynth.patch * 0012-startscript.patch -> 0004-startscript.patch + rediff BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxguitar.spec ++++++ --- /var/tmp/diff_new_pack.jkuOCR/_old 2025-02-21 21:38:45.098194254 +0100 +++ /var/tmp/diff_new_pack.jkuOCR/_new 2025-02-21 21:38:45.098194254 +0100 @@ -1,7 +1,7 @@ # # spec file for package tuxguitar # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,10 @@ Group: Productivity/Multimedia/Sound/Utilities URL: https://github.com/helge17/tuxguitar Source0: https://github.com/helge17/tuxguitar/archive/refs/tags/%{version}.tar.gz -Patch11: 0009-no-lv2.patch -Patch12: 0010-no-fluidsynth.patch -Patch20: 0011-default-soundfont.patch -Patch21: 0012-startscript.patch +Patch1: 0001-no-lv2.patch +Patch2: 0002-no-fluidsynth.patch +Patch3: 0003-default-soundfont.patch +Patch4: 0004-startscript.patch BuildRequires: alsa-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -42,10 +42,10 @@ BuildRequires: mvn(org.eclipse.swt:org.eclipse.swt) Requires: apache-commons-compress Requires: eclipse-swt >= 4.13 +Requires: fluid-soundfont-gm Recommends: snd_sf2 Recommends: timidity Recommends: wqy-zenhei-fonts -Suggests: fluid-soundfont-gm %if 0%{?suse_version} >= 1500 BuildRequires: fluidsynth-devel BuildRequires: liblilv-0-devel @@ -79,14 +79,14 @@ sed -i "s/static final String RELEASE_NAME =.*/static final String RELEASE_NAME = (TGApplication.NAME + \" %{version}\");/" desktop/TuxGuitar/src/org/herac/tuxguitar/app/view/dialog/about/TGAboutDialog.java %if 0%{?suse_version} <= 1500 -%patch -P 11 -p1 +%patch -P 1 -p1 %endif %if 0%{?suse_version} < 1500 -%patch -P 12 -p1 +%patch -P 2 -p1 %endif -%patch -P 20 -p1 -%patch -P 21 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 %pom_xpath_remove "pom:profile[pom:id[text()='platform-windows']]" desktop/pom.xml %pom_xpath_remove "pom:profile[pom:id[text()='platform-macos-cocoa']]" desktop/pom.xml ++++++ 0009-no-lv2.patch -> 0001-no-lv2.patch ++++++ --- /work/SRC/openSUSE:Factory/tuxguitar/0009-no-lv2.patch 2024-06-09 20:24:40.819150018 +0200 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.1873/0001-no-lv2.patch 2025-02-21 21:38:43.870143121 +0100 @@ -1,6 +1,16 @@ -diff -rupN a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt/pom.xml ---- a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml 2024-05-30 23:36:15.886360893 +0200 -+++ b/desktop/build-scripts/tuxguitar-linux-swt/pom.xml 2024-06-06 21:34:00.007347138 +0200 +From bf2a8c3a0e9956d5a33ba7eb0d2591d706146b40 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> +Date: Fri, 21 Feb 2025 15:11:42 +0100 +Subject: [PATCH 1/4] no-lv2 + +--- + desktop/build-scripts/tuxguitar-linux-swt/pom.xml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt/pom.xml +index dfe2105b4..67f8bd972 100644 +--- a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml ++++ b/desktop/build-scripts/tuxguitar-linux-swt/pom.xml @@ -379,7 +379,7 @@ <module>../native-modules/tuxguitar-alsa-linux</module> <module>../native-modules/tuxguitar-jack-linux</module> @@ -23,3 +33,6 @@ <!-- /PLUGINS FILES --> </target> </configuration> +-- +2.48.1 + ++++++ 0010-no-fluidsynth.patch -> 0002-no-fluidsynth.patch ++++++ --- /work/SRC/openSUSE:Factory/tuxguitar/0010-no-fluidsynth.patch 2024-06-09 20:24:40.835150596 +0200 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.1873/0002-no-fluidsynth.patch 2025-02-21 21:38:43.898144287 +0100 @@ -1,6 +1,16 @@ -diff -rupN a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt/pom.xml ---- a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml 2024-06-06 21:34:00.007347138 +0200 -+++ b/desktop/build-scripts/tuxguitar-linux-swt/pom.xml 2024-06-06 21:40:01.489755754 +0200 +From b49c8b10b16846e9831a694080c3956c87a50233 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> +Date: Fri, 21 Feb 2025 15:12:05 +0100 +Subject: [PATCH 2/4] no-fluidsynth + +--- + desktop/build-scripts/tuxguitar-linux-swt/pom.xml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt/pom.xml +index 67f8bd972..5e5a34cb3 100644 +--- a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml ++++ b/desktop/build-scripts/tuxguitar-linux-swt/pom.xml @@ -378,7 +378,7 @@ <modules> <module>../native-modules/tuxguitar-alsa-linux</module> @@ -22,3 +32,6 @@ <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-synth-lv2-linux/target/build" /> +-- +2.48.1 + ++++++ 0011-default-soundfont.patch -> 0003-default-soundfont.patch ++++++ --- /work/SRC/openSUSE:Factory/tuxguitar/0011-default-soundfont.patch 2024-06-09 20:24:40.843150884 +0200 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.1873/0003-default-soundfont.patch 2025-02-21 21:38:43.918145120 +0100 @@ -1,12 +1,43 @@ -diff -rupN a/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg b/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg ---- a/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg 2024-05-24 21:02:44.488126444 +0200 -+++ b/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg 2024-05-26 16:26:28.295083858 +0200 +From bf226888243de791fcd2866d969f41fb826302ae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> +Date: Fri, 21 Feb 2025 15:17:31 +0100 +Subject: [PATCH 3/4] default-soundfont + +--- + .../TuxGuitar-synth-gervill/share/tuxguitar-synth-gervill.cfg | 2 +- + .../common-linux/dist/tuxguitar-fluidsynth.cfg | 3 ++- + .../common-resources/common/dist/tuxguitar-jsa.cfg | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/desktop/TuxGuitar-synth-gervill/share/tuxguitar-synth-gervill.cfg b/desktop/TuxGuitar-synth-gervill/share/tuxguitar-synth-gervill.cfg +index df24eec86..18d0572ba 100644 +--- a/desktop/TuxGuitar-synth-gervill/share/tuxguitar-synth-gervill.cfg ++++ b/desktop/TuxGuitar-synth-gervill/share/tuxguitar-synth-gervill.cfg +@@ -1,2 +1,2 @@ + ## Default Settings ## +-tuxguitar-synth-gervill.soundbank.path=${tuxguitar.home.path}/share/soundfont/MagicSFver2.sf2 ++tuxguitar-synth-gervill.soundbank.path=/usr/share/sounds/sf2/FluidR3_GM.sf2 +diff --git a/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg b/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg +index 02bac12bf..b9e892549 100644 +--- a/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg ++++ b/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg @@ -1,6 +1,7 @@ # tuxguitar-fluidsynth settings for Linux soundfont.count=1 -soundfont.path0=${tuxguitar.home.path}/share/soundfont/MagicSFver2.sf2 +soundfont.path0=/usr/share/sounds/sf2/FluidR3_GM.sf2 +soundfont.path1=/usr/share/sounds/sf2/Vintage_Dreams_Waves_v2.sf2 - + synth.gain=1.1 synth.chorus.active=yes +diff --git a/desktop/build-scripts/common-resources/common/dist/tuxguitar-jsa.cfg b/desktop/build-scripts/common-resources/common/dist/tuxguitar-jsa.cfg +index 5b0c9556a..1887b4841 100644 +--- a/desktop/build-scripts/common-resources/common/dist/tuxguitar-jsa.cfg ++++ b/desktop/build-scripts/common-resources/common/dist/tuxguitar-jsa.cfg +@@ -1,2 +1,2 @@ + # Default tuxguitar-jsa settings +-soundbank.custom.path=${tuxguitar.home.path}/share/soundfont/MagicSFver2.sf2 ++soundbank.custom.path=/usr/share/sounds/sf2/FluidR3_GM.sf2 +-- +2.48.1 + ++++++ 0012-startscript.patch -> 0004-startscript.patch ++++++ --- /work/SRC/openSUSE:Factory/tuxguitar/0012-startscript.patch 2024-04-11 19:41:52.263354134 +0200 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.1873/0004-startscript.patch 2025-02-21 21:38:43.938145953 +0100 @@ -1,14 +1,14 @@ -From b6e4f0ec0712b117cc0787cbea550912368fd47f Mon Sep 17 00:00:00 2001 +From a5c036eeddba8d956431f2b537fa7aba10ead8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> -Date: Thu, 11 Apr 2024 08:30:38 +0200 -Subject: [PATCH 12/13] startscript +Date: Fri, 21 Feb 2025 15:17:53 +0100 +Subject: [PATCH 4/4] startscript --- .../common-linux/tuxguitar.sh | 151 +++++++++++++++++- 1 file changed, 144 insertions(+), 7 deletions(-) diff --git a/desktop/build-scripts/common-resources/common-linux/tuxguitar.sh b/desktop/build-scripts/common-resources/common-linux/tuxguitar.sh -index a213786a..f059e32f 100755 +index a213786ad..f059e32fb 100755 --- a/desktop/build-scripts/common-resources/common-linux/tuxguitar.sh +++ b/desktop/build-scripts/common-resources/common-linux/tuxguitar.sh @@ -1,20 +1,157 @@ @@ -177,5 +177,5 @@ -${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Dtuxguitar.home.path="${TG_DIR}" -Dtuxguitar.share.path="share/" -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$@" +${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Dtuxguitar.share.path="${SHAREPATH}/" -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$@" -- -2.44.0 +2.48.1
