Accepting request 1265309 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/1265309
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tuxguitar?expand=0&rev=22

0001-no-lv2.patch

@@ -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?= <fridrich.strba@bluewin.ch>
+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 @@ diff -rupN a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml b/desktop/build-s
  										<!-- /PLUGINS FILES -->
  									</target>
  								</configuration>
+-- 
+2.48.1
+

0002-no-fluidsynth.patch

@@ -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?= <fridrich.strba@bluewin.ch>
+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 @@ diff -rupN a/desktop/build-scripts/tuxguitar-linux-swt/pom.xml b/desktop/build-s
  										<!--
  										<copy todir="${project.build.directory}/${project.finalName}/">
  											<fileset dir="../native-modules/tuxguitar-synth-lv2-linux/target/build" />
+-- 
+2.48.1
+

0003-default-soundfont.patch

@@ -0,0 +1,43 @@
+From bf226888243de791fcd2866d969f41fb826302ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+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
+

0004-startscript.patch

@@ -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?= <fridrich.strba@bluewin.ch>
-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 @@ index a213786a..f059e32f 100755
 -${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
 

0011-default-soundfont.patch

@@ -1,12 +0,0 @@
-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
-
- synth.gain=1.1
- synth.chorus.active=yes

0013-desktop.patch

@@ -1,24 +0,0 @@
-From 61ac196ab83ce73d6c8efede692c832faf8fbcd0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
-Date: Thu, 11 Apr 2024 08:31:15 +0200
-Subject: [PATCH 13/13] desktop
-
----
- .../common-linux/share/applications/tuxguitar.desktop           | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/desktop/build-scripts/common-resources/common-linux/share/applications/tuxguitar.desktop b/desktop/build-scripts/common-resources/common-linux/share/applications/tuxguitar.desktop
-index 1af409e2..1c141a1a 100644
---- a/desktop/build-scripts/common-resources/common-linux/share/applications/tuxguitar.desktop
-+++ b/desktop/build-scripts/common-resources/common-linux/share/applications/tuxguitar.desktop
-@@ -15,6 +15,6 @@ Type=Application
- MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb
- Categories=AudioVideo;Audio
- Exec=tuxguitar %F
--Icon=/opt/tuxguitar/share/skins/Oxygen/icon.png
-+Icon=tuxguitar
- Terminal=false
- StartupNotify=false
--- 
-2.44.0
-

1.6.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c078c9326680d302c516634518eb5cd72338e70f686b4eb853772803c53eafca
-size 94971270

1.6.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44f84f0fa35d24cbe0f8380a793503c25ddc2b79bc0c69a38aa7bc134ea7b219
+size 98266835

tuxguitar.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Fri Mar 28 21:25:55 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Fix pom errors that are fatal with Maven 4
+
+-------------------------------------------------------------------
+Fri Feb 21 14:44:29 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- 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
+
+-------------------------------------------------------------------
+Sat Dec 28 15:14:50 UTC 2024 - guiv42 <guiv42@tuta.io>
+
+- Updated to new upstream release 1.6.6
+  * Add zoom control for Print/Export to pdf
+  * Improve GP and tef v2 import
+  * Save/restore player mode when switching tabs
+  * Export only audible tracks to MIDI and audio files
+  * Restore scrollbars during playback 
+  * Minor improvements, cleanups, bug fixes
+
+-------------------------------------------------------------------
+Sun Aug 25 12:52:03 UTC 2024 - guiv42 <guiv42@tuta.io>
+
+- Updated to new upstream release 1.6.4
+  * Updated translations
+  * Reworked duration and division menus
+  * More small improvements and cleanups
+- Removed patch:
+  * 0013-desktop.patch
+    + deleted, no more needed
+
 -------------------------------------------------------------------
 Thu Jun  6 19:17:52 UTC 2024 - guiv42 <guiv42@tuta.io>
 

tuxguitar.spec

@@ -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
@@ -17,18 +17,17 @@
 
 
 Name:           tuxguitar
-Version:        1.6.3
+Version:        1.6.6
 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
-Patch11:        0009-no-lv2.patch
-Patch12:        0010-no-fluidsynth.patch
-Patch20:        0011-default-soundfont.patch
-Patch21:        0012-startscript.patch
-Patch22:        0013-desktop.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++
@@ -43,10 +42,10 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
 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
@@ -80,15 +79,14 @@ find . \( -name "*.xml" -or -name "*.gradle"  -or -name "*.properties" -or -name
 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 22 -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
@@ -96,13 +94,22 @@ sed -i "s/static final String RELEASE_NAME =.*/static final String RELEASE_NAME
 %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
 %pom_xpath_remove "pom:artifactItem[pom:destFileName[text()='swt.jar']]" desktop/build-scripts/%{name}-linux-swt
+%pom_remove_dep :org.eclipse.swt.gtk.freebsd desktop/pom.xml
 %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
 
+sed -i 's#\${project.parent.relativePath}#../../../#g' \
+    desktop/build-scripts/native-modules/tuxguitar-alsa-linux/pom.xml \
+    desktop/build-scripts/native-modules/tuxguitar-jack-linux/pom.xml \
+    desktop/build-scripts/native-modules/tuxguitar-fluidsynth-linux/pom.xml \
+    desktop/build-scripts/native-modules/tuxguitar-synth-lv2-linux/pom.xml
+
 %build
 %{mvn_build} -j -f -- \
     -e -f desktop/build-scripts/%{name}-linux-swt/pom.xml \
+    -Dorg.eclipse.swt.groupId=org.eclipse.swt \
+    -Dorg.eclipse.swt.artifactId=org.eclipse.swt \
     -Dproject.build.sourceEncoding=UTF-8 -Dnative-modules=true
 
 %install
@@ -136,7 +143,7 @@ install -dm 755 %{buildroot}/%{_datadir}/applications
 install -pm 644 desktop/build-scripts/common-resources/common-linux/share/applications/tuxguitar.desktop %{buildroot}/%{_datadir}/applications/
 
 # icon
-install -D -m 644 desktop/build-scripts/common-resources/common-linux/share/pixmaps/tuxguitar.xpm %{buildroot}%{_datadir}/pixmaps/tuxguitar.xpm
+install -D -m 644 desktop/build-scripts/common-resources/common-linux/share/pixmaps/tuxguitar.png %{buildroot}%{_datadir}/pixmaps/tuxguitar.png
 %suse_update_desktop_file -n -i tuxguitar AudioVideo Music Java
 
 # man page
@@ -160,7 +167,7 @@ ln -sf %{_jnidir}/%{name}/%{name}-synth-lv2.jar %{buildroot}%{_javadir}/%{name}/
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.xpm
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/mime/packages/%{name}.xml
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1%{?ext_man}