Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tuxguitar for openSUSE:Factory checked in at 2024-06-09 20:22:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuxguitar (Old) and /work/SRC/openSUSE:Factory/.tuxguitar.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tuxguitar" Sun Jun 9 20:22:13 2024 rev:18 rq:1179401 version:1.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/tuxguitar/tuxguitar.changes 2024-04-11 19:41:54.871450616 +0200 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.19518/tuxguitar.changes 2024-06-09 20:24:41.755183795 +0200 @@ -1,0 +2,17 @@ +Thu Jun 6 19:17:52 UTC 2024 - guiv42 <[email protected]> + +- Updated to new upstream release 1.6.3 +- Remove achitecture-specific patches, no more needed: + * 0001-tuxguitar-aarch64.patch + * 0002-tuxguitar-armv6hl.patch + * 0003-tuxguitar-armv7hl.patch + * 0004-tuxguitar-ppc64.patch + * 0005-tuxguitar-ppc64le.patch + * 0006-tuxguitar-riscv64.patch + * 0007-tuxguitar-s390x.patch + * 0008-tuxguitar-x86.patch +- Updated patches, no more architecture-specific: + * 0009-no-lv2.patch + * 0010-no-fluidsynth.patch + +------------------------------------------------------------------- Old: ---- 0001-tuxguitar-aarch64.patch 0002-tuxguitar-armv6hl.patch 0003-tuxguitar-armv7hl.patch 0004-tuxguitar-ppc64.patch 0005-tuxguitar-ppc64le.patch 0006-tuxguitar-riscv64.patch 0007-tuxguitar-s390x.patch 0008-tuxguitar-x86.patch 1.6.2.tar.gz New: ---- 1.6.3.tar.gz BETA DEBUG BEGIN: Old:- Remove achitecture-specific patches, no more needed: * 0001-tuxguitar-aarch64.patch * 0002-tuxguitar-armv6hl.patch Old: * 0001-tuxguitar-aarch64.patch * 0002-tuxguitar-armv6hl.patch * 0003-tuxguitar-armv7hl.patch Old: * 0002-tuxguitar-armv6hl.patch * 0003-tuxguitar-armv7hl.patch * 0004-tuxguitar-ppc64.patch Old: * 0003-tuxguitar-armv7hl.patch * 0004-tuxguitar-ppc64.patch * 0005-tuxguitar-ppc64le.patch Old: * 0004-tuxguitar-ppc64.patch * 0005-tuxguitar-ppc64le.patch * 0006-tuxguitar-riscv64.patch Old: * 0005-tuxguitar-ppc64le.patch * 0006-tuxguitar-riscv64.patch * 0007-tuxguitar-s390x.patch Old: * 0006-tuxguitar-riscv64.patch * 0007-tuxguitar-s390x.patch * 0008-tuxguitar-x86.patch Old: * 0007-tuxguitar-s390x.patch * 0008-tuxguitar-x86.patch - Updated patches, no more architecture-specific: BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxguitar.spec ++++++ --- /var/tmp/diff_new_pack.oF2FH4/_old 2024-06-09 20:24:44.255274009 +0200 +++ /var/tmp/diff_new_pack.oF2FH4/_new 2024-06-09 20:24:44.287275163 +0200 @@ -16,49 +16,14 @@ # -%ifarch x86_64 -%global bit x86_64 -%endif -%ifarch armv7hl -%global bit armv7hl -%endif -%ifarch armv6hl -%global bit armv6hl -%endif -%ifarch ppc64 -%global bit ppc64 -%endif -%ifarch ppc64le -%global bit ppc64le -%endif -%ifarch riscv64 -%global bit riscv64 -%endif -%ifarch s390x -%global bit s390x -%endif -%ifarch aarch64 -%global bit aarch64 -%endif -%ifarch %{ix86} -%global bit x86 -%endif Name: tuxguitar -Version: 1.6.2 +Version: 1.6.3 Release: 0 Summary: A multitrack tablature editor and player written in Java-SWT License: LGPL-2.1-or-later Group: Productivity/Multimedia/Sound/Utilities URL: https://github.com/helge17/tuxguitar Source0: https://github.com/helge17/tuxguitar/archive/refs/tags/%{version}.tar.gz -Patch0: 0001-tuxguitar-aarch64.patch -Patch1: 0002-tuxguitar-armv6hl.patch -Patch2: 0003-tuxguitar-armv7hl.patch -Patch3: 0004-tuxguitar-ppc64.patch -Patch4: 0005-tuxguitar-ppc64le.patch -Patch5: 0006-tuxguitar-riscv64.patch -Patch6: 0007-tuxguitar-s390x.patch -Patch7: 0008-tuxguitar-x86.patch Patch11: 0009-no-lv2.patch Patch12: 0010-no-fluidsynth.patch Patch20: 0011-default-soundfont.patch @@ -105,20 +70,12 @@ find . -name "*.jar" -print -delete find . -name "*.so" -print -delete -%patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -p1 -%patch -P 5 -p1 -%patch -P 6 -p1 -%patch -P 7 -p1 - # In source archive, all modules have an attribute "VERSION" set to "SNAPSHOT" # this attribute is set during build/delivery # Refer to application delivery process : # https://github.com/helge17/tuxguitar/blob/bd6b29c9539d66b625a625e70bd8718497aa107b/misc/build_tuxguitar_from_source.sh#L148 -find . \( -name "*.xml" -or -name "*.gradle" -or -name "*.properties" -or -name "*.html" -or -name control -or -name Info.plist \) -and -not -path "./website/*" -and -type f -exec sed -i "s/SNAPSHOT/%{version}/" '{}' \; +find . \( -name "*.xml" -or -name "*.gradle" -or -name "*.properties" -or -name "*.html" -or -name control -or -name Info.plist -or -name CHANGES \) -and -not -path "./website/*" -and -type f -exec sed -i "s/9.99-SNAPSHOT/%{version}/" '{}' \; + # Also set the version in the "Help - About" dialog 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 @@ -133,19 +90,19 @@ %patch -P 21 -p1 %patch -P 22 -p1 -%pom_xpath_remove "pom:profile[pom:id[text()='platform-windows-all']]" desktop/pom.xml -%pom_xpath_remove "pom:profile[pom:id[text()='platform-macos-cocoa-64']]" desktop/pom.xml -%pom_xpath_remove "pom:profile[pom:id[text()='platform-freebsd-x86_64']]" desktop/pom.xml +%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 +%pom_xpath_remove "pom:profile[pom:id[text()='platform-freebsd']]" desktop/pom.xml %pom_xpath_set -r pom:org.eclipse.swt.artifactId org.eclipse.swt desktop/pom.xml -%pom_xpath_set -r pom:org.eclipse.swt.artifactId org.eclipse.swt desktop/build-scripts/%{name}-linux-swt-%{bit} -%pom_xpath_remove "pom:artifactItem[pom:destFileName[text()='swt.jar']]" desktop/build-scripts/%{name}-linux-swt-%{bit} -%pom_remove_dep :org.eclipse.swt.gtk.linux.x86_64 desktop/pom.xml -%pom_remove_dep :org.eclipse.swt.win32.win32.x86_64 desktop/pom.xml -%pom_remove_dep :org.eclipse.swt.cocoa.macosx.x86_64 desktop/pom.xml +%pom_xpath_set -r pom:org.eclipse.swt.artifactId org.eclipse.swt desktop/build-scripts/%{name}-linux-swt +%pom_xpath_remove "pom:artifactItem[pom:destFileName[text()='swt.jar']]" desktop/build-scripts/%{name}-linux-swt +%pom_remove_dep :org.eclipse.swt.gtk.linux desktop/pom.xml +%pom_remove_dep :org.eclipse.swt.win32.win32 desktop/pom.xml +%pom_remove_dep :org.eclipse.swt.cocoa.macosx desktop/pom.xml %build %{mvn_build} -j -f -- \ - -e -f desktop/build-scripts/%{name}-linux-swt-%{bit}/pom.xml \ + -e -f desktop/build-scripts/%{name}-linux-swt/pom.xml \ -Dproject.build.sourceEncoding=UTF-8 -Dnative-modules=true %install @@ -170,8 +127,9 @@ # data files mkdir -p %{buildroot}/%{_datadir}/%{name} cp -a desktop/TuxGuitar/share/* %{buildroot}/%{_datadir}/%{name} +cp -a common/resources/* %{buildroot}/%{_datadir}/%{name} cp -a misc/tuxguitar.tg %{buildroot}/%{_datadir}/%{name} -cp -a desktop/build-scripts/%{name}-linux-swt-%{bit}/target/%{name}-%{version}-linux-swt-%{bit}/dist/* %{buildroot}/%{_datadir}/%{name} +cp -a desktop/build-scripts/%{name}-linux-swt/target/%{name}-%{version}-linux-swt/dist/* %{buildroot}/%{_datadir}/%{name} # desktop files install -dm 755 %{buildroot}/%{_datadir}/applications ++++++ 0009-no-lv2.patch ++++++ --- /var/tmp/diff_new_pack.oF2FH4/_old 2024-06-09 20:24:44.535284113 +0200 +++ /var/tmp/diff_new_pack.oF2FH4/_new 2024-06-09 20:24:44.563285123 +0200 @@ -1,255 +1,26 @@ -From e78f94cbc6dd5583459e07cebd6c08c0bb3c98d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> -Date: Thu, 11 Apr 2024 10:03:11 +0200 -Subject: [PATCH 09/13] no-lv2 - ---- - desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml | 4 +++- - 9 files changed, 27 insertions(+), 9 deletions(-) - -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml -index f9a87107..38f396ef 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-aarch64</module> - <module>../native-modules/tuxguitar-jack-linux-aarch64</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-aarch64</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-aarch64</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-aarch64</module> --> - </modules> - - <build> -@@ -402,10 +402,12 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-aarch64/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-aarch64/target/build" /> - </copy> - <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> -+ --> - <!-- /PLUGINS FILES --> - </target> - </configuration> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml -index b6fce030..c4fe6c0c 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-armv6hl</module> - <module>../native-modules/tuxguitar-jack-linux-armv6hl</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-armv6hl</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-armv6hl</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-armv6hl</module> --> - </modules> - - <build> -@@ -402,10 +402,12 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-armv6hl/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-armv6hl/target/build" /> - </copy> - <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> -+ --> - <!-- /PLUGINS FILES --> - </target> - </configuration> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml -index 0420d387..d32a10a5 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-armv7hl</module> - <module>../native-modules/tuxguitar-jack-linux-armv7hl</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-armv7hl</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-armv7hl</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-armv7hl</module> --> - </modules> - - <build> -@@ -402,10 +402,12 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-armv7hl/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-armv7hl/target/build" /> - </copy> - <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> -+ --> - <!-- /PLUGINS FILES --> - </target> - </configuration> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml -index e16977a3..30c2bdb3 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-ppc64</module> - <module>../native-modules/tuxguitar-jack-linux-ppc64</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-ppc64</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-ppc64</module> --> - </modules> - - <build> -@@ -402,10 +402,12 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-ppc64/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-ppc64/target/build" /> - </copy> - <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> -+ --> - <!-- /PLUGINS FILES --> - </target> - </configuration> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml -index c79184e5..ced81fb9 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-ppc64le</module> - <module>../native-modules/tuxguitar-jack-linux-ppc64le</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64le</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-ppc64le</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-ppc64le</module> --> +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 +@@ -379,7 +379,7 @@ + <module>../native-modules/tuxguitar-alsa-linux</module> + <module>../native-modules/tuxguitar-jack-linux</module> + <module>../native-modules/tuxguitar-fluidsynth-linux</module> +- <module>../native-modules/tuxguitar-synth-lv2-linux</module> ++ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux</module> --> </modules> <build> -@@ -402,10 +402,12 @@ +@@ -404,10 +404,12 @@ <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-ppc64le/target/build" /> + <fileset dir="../native-modules/tuxguitar-fluidsynth-linux/target/build" /> </copy> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-ppc64le/target/build" /> + <fileset dir="../native-modules/tuxguitar-synth-lv2-linux/target/build" /> </copy> <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> + --> <!-- /PLUGINS FILES --> </target> </configuration> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml -index 0110ffa5..8bdfc4e2 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-riscv64</module> - <module>../native-modules/tuxguitar-jack-linux-riscv64</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-riscv64</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-riscv64</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-riscv64</module> --> - </modules> - - <build> -@@ -402,10 +402,12 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-riscv64/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-riscv64/target/build" /> - </copy> - <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> -+ --> - <!-- /PLUGINS FILES --> - </target> - </configuration> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml -index 0712d54c..1c0a36d3 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-s390x</module> - <module>../native-modules/tuxguitar-jack-linux-s390x</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-s390x</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-s390x</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-s390x</module> --> - </modules> - - <build> -@@ -402,10 +402,12 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-s390x/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-s390x/target/build" /> - </copy> - <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> -+ --> - <!-- /PLUGINS FILES --> - </target> - </configuration> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml -index de47c028..cc8abe98 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-x86</module> - <module>../native-modules/tuxguitar-jack-linux-x86</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-x86</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-x86</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-x86</module> --> - </modules> - - <build> -@@ -402,10 +402,12 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-x86/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-x86/target/build" /> - </copy> - <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> -+ --> - <!-- /PLUGINS FILES --> - </target> - </configuration> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml -index eec5e764..5139bf44 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml -@@ -377,7 +377,7 @@ - <module>../native-modules/tuxguitar-alsa-linux-x86_64</module> - <module>../native-modules/tuxguitar-jack-linux-x86_64</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-x86_64</module> -- <module>../native-modules/tuxguitar-synth-lv2-linux-x86_64</module> -+ <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-x86_64</module> --> - </modules> - - <build> -@@ -402,10 +402,12 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-x86_64/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-x86_64/target/build" /> - </copy> - <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> -+ --> - <!-- /PLUGINS FILES --> - </target> - </configuration> --- -2.44.0 - ++++++ 0010-no-fluidsynth.patch ++++++ --- /var/tmp/diff_new_pack.oF2FH4/_old 2024-06-09 20:24:44.727291041 +0200 +++ /var/tmp/diff_new_pack.oF2FH4/_new 2024-06-09 20:24:44.759292196 +0200 @@ -1,246 +1,25 @@ -From 34654035372c03a7fd318a8e4ed06eb70593f258 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> -Date: Thu, 11 Apr 2024 10:06:15 +0200 -Subject: [PATCH 10/13] no-fluidsynth - ---- - desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml | 4 +++- - desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml | 4 +++- - 9 files changed, 27 insertions(+), 9 deletions(-) - -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml -index 38f396ef..b4f17346 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-aarch64/pom.xml -@@ -376,7 +376,7 @@ - <modules> - <module>../native-modules/tuxguitar-alsa-linux-aarch64</module> - <module>../native-modules/tuxguitar-jack-linux-aarch64</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-aarch64</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-aarch64</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-aarch64</module> --> - </modules> - -@@ -399,9 +399,11 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-aarch64/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-aarch64/target/build" /> - </copy> -+ --> - <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-aarch64/target/build" /> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml -index c4fe6c0c..ab3e8afd 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-armv6hl/pom.xml -@@ -376,7 +376,7 @@ - <modules> - <module>../native-modules/tuxguitar-alsa-linux-armv6hl</module> - <module>../native-modules/tuxguitar-jack-linux-armv6hl</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-armv6hl</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-armv6hl</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-armv6hl</module> --> - </modules> - -@@ -399,9 +399,11 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-armv6hl/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-armv6hl/target/build" /> - </copy> -+ --> - <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-armv6hl/target/build" /> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml -index d32a10a5..0a3847aa 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-armv7hl/pom.xml -@@ -376,7 +376,7 @@ - <modules> - <module>../native-modules/tuxguitar-alsa-linux-armv7hl</module> - <module>../native-modules/tuxguitar-jack-linux-armv7hl</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-armv7hl</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-armv7hl</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-armv7hl</module> --> - </modules> - -@@ -399,9 +399,11 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-armv7hl/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-armv7hl/target/build" /> - </copy> -+ --> - <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-armv7hl/target/build" /> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml -index 30c2bdb3..46fbc974 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-ppc64/pom.xml -@@ -376,7 +376,7 @@ - <modules> - <module>../native-modules/tuxguitar-alsa-linux-ppc64</module> - <module>../native-modules/tuxguitar-jack-linux-ppc64</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-ppc64</module> --> - </modules> - -@@ -399,9 +399,11 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-ppc64/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-ppc64/target/build" /> - </copy> -+ --> - <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-ppc64/target/build" /> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml -index ced81fb9..63ba28fc 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-ppc64le/pom.xml -@@ -376,7 +376,7 @@ +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 +@@ -378,7 +378,7 @@ <modules> - <module>../native-modules/tuxguitar-alsa-linux-ppc64le</module> - <module>../native-modules/tuxguitar-jack-linux-ppc64le</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64le</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64le</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-ppc64le</module> --> + <module>../native-modules/tuxguitar-alsa-linux</module> + <module>../native-modules/tuxguitar-jack-linux</module> +- <module>../native-modules/tuxguitar-fluidsynth-linux</module> ++ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux</module> --> + <!-- <module>../native-modules/tuxguitar-synth-lv2-linux</module> --> </modules> -@@ -399,9 +399,11 @@ +@@ -401,9 +401,11 @@ <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-ppc64le/target/build" /> + <fileset dir="../native-modules/tuxguitar-jack-linux/target/build" /> </copy> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-ppc64le/target/build" /> + <fileset dir="../native-modules/tuxguitar-fluidsynth-linux/target/build" /> </copy> + --> <!-- <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-ppc64le/target/build" /> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml -index 8bdfc4e2..7f1bcbac 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-riscv64/pom.xml -@@ -376,7 +376,7 @@ - <modules> - <module>../native-modules/tuxguitar-alsa-linux-riscv64</module> - <module>../native-modules/tuxguitar-jack-linux-riscv64</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-riscv64</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-riscv64</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-riscv64</module> --> - </modules> - -@@ -399,9 +399,11 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-riscv64/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-riscv64/target/build" /> - </copy> -+ --> - <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-riscv64/target/build" /> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml -index 1c0a36d3..f9625f0c 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-s390x/pom.xml -@@ -376,7 +376,7 @@ - <modules> - <module>../native-modules/tuxguitar-alsa-linux-s390x</module> - <module>../native-modules/tuxguitar-jack-linux-s390x</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-s390x</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-s390x</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-s390x</module> --> - </modules> - -@@ -399,9 +399,11 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-s390x/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-s390x/target/build" /> - </copy> -+ --> - <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-s390x/target/build" /> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml -index cc8abe98..484089d6 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-x86/pom.xml -@@ -376,7 +376,7 @@ - <modules> - <module>../native-modules/tuxguitar-alsa-linux-x86</module> - <module>../native-modules/tuxguitar-jack-linux-x86</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-x86</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-x86</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-x86</module> --> - </modules> - -@@ -399,9 +399,11 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-x86/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-x86/target/build" /> - </copy> -+ --> - <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-x86/target/build" /> -diff --git a/desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml b/desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml -index 5139bf44..454c67a5 100644 ---- a/desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml -+++ b/desktop/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml -@@ -376,7 +376,7 @@ - <modules> - <module>../native-modules/tuxguitar-alsa-linux-x86_64</module> - <module>../native-modules/tuxguitar-jack-linux-x86_64</module> -- <module>../native-modules/tuxguitar-fluidsynth-linux-x86_64</module> -+ <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-x86_64</module> --> - <!-- <module>../native-modules/tuxguitar-synth-lv2-linux-x86_64</module> --> - </modules> - -@@ -399,9 +399,11 @@ - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-jack-linux-x86_64/target/build" /> - </copy> -+ <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-x86_64/target/build" /> - </copy> -+ --> - <!-- - <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-x86_64/target/build" /> --- -2.44.0 - + <fileset dir="../native-modules/tuxguitar-synth-lv2-linux/target/build" /> ++++++ 0011-default-soundfont.patch ++++++ --- /var/tmp/diff_new_pack.oF2FH4/_old 2024-06-09 20:24:44.803293784 +0200 +++ /var/tmp/diff_new_pack.oF2FH4/_new 2024-06-09 20:24:44.807293928 +0200 @@ -1,37 +1,13 @@ -From ea4778dcea6a49bf6a23803b4ed305df886d959e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> -Date: Thu, 11 Apr 2024 08:30:06 +0200 -Subject: [PATCH 11/13] default-soundfont - ---- - .../common-linux/dist/tuxguitar-fluidsynth.cfg | 3 ++- - .../common-resources/common-linux/dist/tuxguitar-jsa.cfg | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -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 4bba62c8..8d73f2e1 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,7 +1,8 @@ - #tuxguitar-fluidsynth - #Fri Oct 30 14:24:16 ART 2015 +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 +@@ -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 - ++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-linux/dist/tuxguitar-jsa.cfg b/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg -index b13f013f..df2d7653 100644 ---- a/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg -+++ b/desktop/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg -@@ -1,3 +1,3 @@ - #tuxguitar-jsa - #Mon Nov 02 20:00:23 ART 2015 --soundbank.custom.path=${tuxguitar.home.path}/share/soundfont/MagicSFver2.sf2 -+#soundbank.custom.path=/usr/share/sounds/sf2/FluidR3_GM.sf2 --- -2.44.0 - ++++++ 1.6.2.tar.gz -> 1.6.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/tuxguitar/1.6.2.tar.gz /work/SRC/openSUSE:Factory/.tuxguitar.new.19518/1.6.3.tar.gz differ: char 12, line 1
