Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tuxguitar for openSUSE:Factory checked in at 2023-10-10 21:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuxguitar (Old) and /work/SRC/openSUSE:Factory/.tuxguitar.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tuxguitar" Tue Oct 10 21:00:20 2023 rev:10 rq:1116518 version:1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tuxguitar/tuxguitar.changes 2022-10-15 16:40:25.766581933 +0200 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.28202/tuxguitar.changes 2023-10-10 21:01:35.920907473 +0200 @@ -1,0 +2,19 @@ +Mon Oct 9 16:30:14 UTC 2023 - guiv42 <gui...@tuta.io> + +- Add complementary information to previous changelog +- Deleted patches + * tuxguitar-startscript-itext.patch + * tuxguitar-additional-arch.patch + * no-fluidsynth.patch +- Added new patch, required by release 1.6.0 + * desktop.patch + +------------------------------------------------------------------- +Sat Oct 7 20:14:13 UTC 2023 - guiv42 <gui...@tuta.io> + +- Update to new upstream release 1.6.0 + * switch to https://github.com/helge17/tuxguitar + as source repo, since historical repo is orphaned + * only x86_64 arch is supported by source repo + +------------------------------------------------------------------- Old: ---- no-fluidsynth.patch tuxguitar-1.5.4-src.tar.gz tuxguitar-additional-arch.patch tuxguitar-startscript-itext.patch New: ---- 1.6.0.tar.gz desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxguitar.spec ++++++ --- /var/tmp/diff_new_pack.KdKB5c/_old 2023-10-10 21:01:38.885014959 +0200 +++ /var/tmp/diff_new_pack.KdKB5c/_new 2023-10-10 21:01:38.889015104 +0200 @@ -1,9 +1,7 @@ # # spec file for package tuxguitar # -# Copyright (c) 2022 SUSE LLC -# Copyright (c) 2008-2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> -# Copyright (c) 2008-2017 Fedora project +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,154 +16,94 @@ # -%bcond_without itext -%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 s390x -%global bit s390x -%endif -%ifarch aarch64 -%global bit aarch64 -%endif -%ifarch %{ix86} -%global bit x86 -%endif Name: tuxguitar -Version: 1.5.4 -Release: 0 +Version: 1.6.0 +Release: 0.1 Summary: A multitrack tablature editor and player written in Java-SWT License: LGPL-2.1-or-later Group: Productivity/Multimedia/Sound/Utilities -URL: http://www.tuxguitar.pw -Source0: https://sourceforge.net/projects/%{name}/files/TuxGuitar/TuxGuitar-%{version}/%{name}-%{version}-src.tar.gz +URL: https://github.com/helge17/tuxguitar +Source0: https://github.com/helge17/tuxguitar/archive/refs/tags/%{version}.tar.gz Patch0: tuxguitar-default-soundfont.patch Patch1: no-vst.patch -Patch2: tuxguitar-additional-arch.patch -Patch3: tuxguitar-startscript.patch -Patch4: no-fluidsynth.patch -Patch5: tuxguitar-startscript-itext.patch -BuildRequires: alsa-devel -BuildRequires: ant -BuildRequires: ant-contrib -BuildRequires: desktop-file-utils -BuildRequires: eclipse-swt +Patch2: tuxguitar-startscript.patch +Patch3: desktop.patch + +ExclusiveArch: x86_64 + BuildRequires: fdupes +BuildRequires: fluidsynth-devel +BuildRequires: gcc-c++ BuildRequires: jack-audio-connection-kit-devel -BuildRequires: java-devel >= 1.7 -BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-tools +BuildRequires: libQt5Core-devel +BuildRequires: libQt5Widgets-devel +BuildRequires: liblilv-0-devel BuildRequires: maven-local +BuildRequires: suil-devel BuildRequires: update-desktop-files -BuildRequires: mvn(org.apache.commons:commons-compress) +BuildRequires: mvn(com.itextpdf:itextpdf) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.eclipse.swt:org.eclipse.swt) Requires: apache-commons-compress -Requires: eclipse-swt +Requires: eclipse-swt >= 4.13 Recommends: snd_sf2 Recommends: timidity -%ifarch %{ix86} -BuildConflicts: java >= 12 -BuildConflicts: java-devel >= 12 -BuildConflicts: java-headless >= 12 -%endif -%if 0%{?suse_version} >= 1500 -BuildRequires: fluidsynth-devel -%endif -%if %{with itext} -BuildRequires: mvn(com.itextpdf.tool:xmlworker) -BuildRequires: mvn(com.itextpdf:itextpdf) -%endif -# use FluidR3_GM.sf2 (from fluid-soundfont-gm) as default sound font -%if 0%{?suse_version} <= 1320 -Requires: fluid-soundfont-gm -%else Suggests: fluid-soundfont-gm -%endif %description TuxGuitar is a guitar tablature editor with player support through midi. It can display scores and multitrack tabs. Various features TuxGuitar provides include autoscrolling while playing, note duration management, bend/slide/vibrato/ hammer-on/pull-off effects, support for tuplets, time signature management, -tempo management, gp3/gp4/gp5 import and export. +tempo management, gp3/gp4/gp5/gpx import and export. %prep -%setup -q -n %{name}-%{version}-src +%setup -q -n %{name}-%{version} find . -name "*.exe" -print -delete find . -name "*.dll" -print -delete find . -name "*.sf2" -print -delete find . -name "*.jar" -print -delete find . -name "*.so" -print -delete +# 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/9d40a35ffc906fd0479b4c47aff00e048daac220/misc/build_tuxguitar_from_source.sh#L118 +find . \( -name "*.xml" -or -name "*.gradle" -or -name "*.properties" -or -name control -or -name Info.plist \) -and -type f -exec sed -i "s/SNAPSHOT/%{version}/" '{}' \; +sed -i "s/static final String RELEASE_NAME =.*/static final String RELEASE_NAME = (TGApplication.NAME + \" %{version}\");/" TuxGuitar/src/org/herac/tuxguitar/app/view/dialog/about/TGAboutDialog.java + %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%if 0%{?suse_version} < 1500 -%patch4 -p1 -%endif -%if %{with itext} -%patch5 -p1 -%else -%pom_remove_dep -r com.itextpdf:itextpdf -%pom_remove_dep -r com.itextpdf.tool:xmlworker -%pom_remove_dep -r com.itextpdf:itextpdf build-scripts/%{name}-linux-%{bit} -%pom_remove_dep -r com.itextpdf.tool:xmlworker build-scripts/%{name}-linux-%{bit} -%pom_disable_module ../../TuxGuitar-pdf build-scripts/%{name}-linux-%{bit} -%pom_remove_dep -r :tuxguitar-pdf -%pom_disable_module ../../TuxGuitar-pdf-ui build-scripts/%{name}-linux-%{bit} -%pom_remove_dep -r :tuxguitar-pdf-ui -%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='itextpdf']]" build-scripts/%{name}-linux-%{bit} -%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='xmlworker']]" build-scripts/%{name}-linux-%{bit} -%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='tuxguitar-pdf']]" build-scripts/%{name}-linux-%{bit} -%pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='tuxguitar-pdf-ui']]" build-scripts/%{name}-linux-%{bit} -%endif +%pom_xpath_remove "pom:profile[pom:id[text()='platform-windows-swt-all']]" +%pom_xpath_remove "pom:profile[pom:id[text()='platform-macos-swt-cocoa-64']]" +%pom_xpath_remove "pom:profile[pom:id[text()='platform-freebsd-swt-x86_64']]" %pom_xpath_set -r pom:org.eclipse.swt.artifactId org.eclipse.swt -%pom_xpath_set -r pom:org.eclipse.swt.artifactId org.eclipse.swt build-scripts/%{name}-linux-%{bit} -%pom_change_dep :org.eclipse.swt.gtk.linux.x86 :org.eclipse.swt +%pom_xpath_set -r pom:org.eclipse.swt.artifactId org.eclipse.swt build-scripts/%{name}-linux-swt-%{_arch} +%pom_xpath_remove "pom:artifactItem[pom:destFileName[text()='swt.jar']]" build-scripts/%{name}-linux-swt-%{_arch} %pom_remove_dep :org.eclipse.swt.gtk.linux.x86_64 -%pom_remove_dep :org.eclipse.swt.gtk.linux.ppc -%pom_remove_dep :org.eclipse.swt.win32.win32.x86 -%pom_remove_dep :org.eclipse.swt.cocoa.macosx +%pom_remove_dep :org.eclipse.swt.win32.win32.x86_64 %pom_remove_dep :org.eclipse.swt.cocoa.macosx.x86_64 -%pom_remove_dep :org.eclipse.swt.carbon.macosx - -%pom_xpath_inject pom:modules "<module>../../TuxGuitar-tray</module> - <module>../../TuxGuitar-viewer</module>" build-scripts/%{name}-linux-%{bit} - -%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:configuration/pom:source" "1.8" . TuxGuitar-lib -%pom_xpath_set "pom:plugin[pom:artifactId[text()='maven-compiler-plugin']]/pom:configuration/pom:target" "1.8" . TuxGuitar-lib +%pom_xpath_inject pom:modules "<module>../../TuxGuitar-viewer</module>" build-scripts/%{name}-linux-swt-%{_arch} %build %{mvn_build} -j -f -- \ - -e -f build-scripts/%{name}-linux-%{bit}/pom.xml \ + -e -f build-scripts/%{name}-linux-swt-%{_arch}/pom.xml \ -Dproject.build.sourceEncoding=UTF-8 -Dnative-modules=true %install %mvn_install + # install jnis we built mkdir -p %{buildroot}%{_libdir}/%{name} -cp -a TuxGuitar-*/jni/*.so %{buildroot}%{_libdir}/%{name}/ +cp -a build-scripts/native-modules/*/target/build/lib/*.so %{buildroot}%{_libdir}/%{name}/ # Launch script mkdir -p %{buildroot}/%{_bindir} -cp -a misc/tuxguitar.sh %{buildroot}/%{_bindir}/%{name} -perl -pi -e 's#/usr/lib64/%{name}#%{_libdir}/%{name}#g' %{buildroot}/%{_bindir}/%{name} +cp -a build-scripts/common-resources/common-linux/tuxguitar.sh %{buildroot}/%{_bindir}/%{name} # Fix permissions chmod 755 %{buildroot}/%{_bindir}/%{name} @@ -173,62 +111,44 @@ # mime types mkdir -p %{buildroot}/%{_datadir}/mime/packages/ -cp -a misc/tuxguitar.xml %{buildroot}/%{_datadir}/mime/packages/ +cp -a build-scripts/common-resources/common-linux/share/mime/packages/tuxguitar.xml %{buildroot}/%{_datadir}/mime/packages/ # data files mkdir -p %{buildroot}/%{_datadir}/%{name} cp -a TuxGuitar/share/* %{buildroot}/%{_datadir}/%{name} -cp -a misc/tuxguitar.tg %{buildroot}/%{_datadir}/%{name} -cp -a build-scripts/%{name}-linux-%{bit}/target/%{name}-%{version}-linux-%{bit}/dist/* %{buildroot}/%{_datadir}/%{name} - -STYLE=Oxygen - -for dim in 16 24 32 48 64 96; do - mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${dim}x${dim}/apps/ - mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${dim}x${dim}/mimetypes/ - cp -a TuxGuitar/share/skins/${STYLE}/icon-${dim}x${dim}.png %{buildroot}%{_datadir}/icons/hicolor/${dim}x${dim}/apps/%{name}.png - cp -a TuxGuitar/share/skins/${STYLE}/icon-${dim}x${dim}.png %{buildroot}%{_datadir}/icons/hicolor/${dim}x${dim}/mimetypes/audio-x-%{name}.png - cp -a TuxGuitar/share/skins/${STYLE}/icon-${dim}x${dim}.png %{buildroot}%{_datadir}/icons/hicolor/${dim}x${dim}/mimetypes/audio-x-gtp.png - cp -a TuxGuitar/share/skins/${STYLE}/icon-${dim}x${dim}.png %{buildroot}%{_datadir}/icons/hicolor/${dim}x${dim}/mimetypes/audio-x-ptb.png -done +cp -a build-scripts/%{name}-linux-swt-%{_arch}/target/%{name}-%{version}-linux-swt-%{_arch}/dist/* %{buildroot}/%{_datadir}/%{name} # desktop files install -dm 755 %{buildroot}/%{_datadir}/applications -install -pm 644 misc/tuxguitar.desktop %{buildroot}/%{_datadir}/applications/ +install -pm 644 build-scripts/common-resources/common-linux/share/applications/tuxguitar.desktop %{buildroot}/%{_datadir}/applications/ -#install also big icon -install -D -m 644 TuxGuitar/share/skins/Lavender/icon-48x48.png %{buildroot}%{_datadir}/pixmaps/tuxguitar.png +# icon +install -D -m 644 build-scripts/common-resources/common-linux/share/pixmaps/tuxguitar.xpm %{buildroot}%{_datadir}/pixmaps/tuxguitar.xpm %suse_update_desktop_file -n -i tuxguitar AudioVideo Music Java # man page mkdir -p %{buildroot}/%{_mandir}/man1 -cp -a misc/%{name}.1 %{buildroot}/%{_mandir}/man1/ +cp -a build-scripts/common-resources/common-linux/share/man/man1/%{name}.1 %{buildroot}/%{_mandir}/man1/ %fdupes -s %{buildroot} ln -sf %{_jnidir}/%{name}/%{name}-alsa.jar %{buildroot}%{_javadir}/%{name}/ -%if 0%{?suse_version} >= 1500 ln -sf %{_jnidir}/%{name}/%{name}-fluidsynth.jar %{buildroot}%{_javadir}/%{name}/ -%endif ln -sf %{_jnidir}/%{name}/%{name}-jack.jar %{buildroot}%{_javadir}/%{name}/ -ln -sf %{_jnidir}/%{name}/%{name}-oss.jar %{buildroot}%{_javadir}/%{name}/ +ln -sf %{_jnidir}/%{name}/%{name}-synth-lv2.jar %{buildroot}%{_javadir}/%{name}/ %files -f .mfiles %license LICENSE -%doc AUTHORS CHANGES README +%doc AUTHORS CHANGES README.md %{_libdir}/%{name} %{_datadir}/%{name} -%{_datadir}/icons/hicolor/*/*/* %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/pixmaps/%{name}.xpm %{_datadir}/mime/packages/%{name}.xml %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{?ext_man} - %{_javadir}/%{name}/tuxguitar-alsa.jar -%if 0%{?suse_version} >= 1500 %{_javadir}/%{name}/tuxguitar-fluidsynth.jar -%endif %{_javadir}/%{name}/tuxguitar-jack.jar -%{_javadir}/%{name}/tuxguitar-oss.jar +%{_javadir}/%{name}/tuxguitar-synth-lv2.jar ++++++ tuxguitar-1.5.4-src.tar.gz -> 1.6.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/tuxguitar/tuxguitar-1.5.4-src.tar.gz /work/SRC/openSUSE:Factory/.tuxguitar.new.28202/1.6.0.tar.gz differ: char 13, line 1 ++++++ desktop.patch ++++++ --- /build-scripts/common-resources/common-linux/share/applications/tuxguitar.desktop 2023-09-28 18:49:24.877329003 +0200 +++ /build-scripts/common-resources/common-linux/share/applications/tuxguitar.desktop 2023-09-28 18:49:24.877329003 +0200 @@ -10,6 +10,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 ++++++ no-vst.patch ++++++ --- /var/tmp/diff_new_pack.KdKB5c/_old 2023-10-10 21:01:38.941016990 +0200 +++ /var/tmp/diff_new_pack.KdKB5c/_new 2023-10-10 21:01:38.957017570 +0200 @@ -1,49 +1,27 @@ ---- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-x86_64/pom.xml 2020-05-12 19:46:43.000000000 +0200 -+++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-x86_64/pom.xml 2020-07-07 12:02:17.178253095 +0200 -@@ -372,7 +372,7 @@ +--- tuxguitar-1.6.0-src/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml 2023-09-25 22:58:41.952618096 +0200 ++++ tuxguitar-1.6.0-src/build-scripts/tuxguitar-linux-swt-x86_64/pom.xml 2023-09-25 22:58:41.952618096 +0200 +@@ -380,7 +380,7 @@ <module>../native-modules/tuxguitar-jack-linux-x86_64</module> - <module>../native-modules/tuxguitar-oss-linux-x86_64</module> <module>../native-modules/tuxguitar-fluidsynth-linux-x86_64</module> -- <module>../native-modules/tuxguitar-synth-vst-remote-linux-x86_64</module> -+ <!-- <module>../native-modules/tuxguitar-synth-vst-remote-linux-x86_64</module> --> - </modules> - - <build> -@@ -400,10 +400,10 @@ - <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}/"> -+ <!-- <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-x86_64/target/build" /> - </copy> -- <chmod file="${project.build.directory}/${project.finalName}/vst-client/*.bin" perm="775" /> -+ <chmod file="${project.build.directory}/${project.finalName}/vst-client/*.bin" perm="775" /> --> - - <chmod file="${project.build.directory}/${project.finalName}/lib/*.so" perm="775" /> - <!-- /PLUGINS FILES --> ---- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-x86/pom.xml 2020-05-12 19:46:43.000000000 +0200 -+++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-x86/pom.xml 2020-07-07 12:02:17.178253095 +0200 -@@ -372,7 +372,7 @@ - <module>../native-modules/tuxguitar-jack-linux-x86</module> - <module>../native-modules/tuxguitar-oss-linux-x86</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-x86</module> -- <module>../native-modules/tuxguitar-synth-vst-remote-linux-x86</module> -+ <!-- <module>../native-modules/tuxguitar-synth-vst-remote-linux-x86</module> --> + <module>../native-modules/tuxguitar-synth-lv2-linux-x86_64</module> +- <module>../native-modules/tuxguitar-synth-vst-linux-x86_64</module> ++ <!-- <module>../native-modules/tuxguitar-synth-vst-linux-x86_64</module> --> </modules> <build> -@@ -400,10 +400,10 @@ +@@ -408,11 +408,13 @@ <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-x86/target/build" /> + <fileset dir="../native-modules/tuxguitar-synth-lv2-linux-x86_64/target/build" /> </copy> -- <copy todir="${project.build.directory}/${project.finalName}/"> -+ <!-- <copy todir="${project.build.directory}/${project.finalName}/"> - <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-x86/target/build" /> ++ <!-- + <copy todir="${project.build.directory}/${project.finalName}/"> + <fileset dir="../native-modules/tuxguitar-synth-vst-linux-x86_64/target/build" /> </copy> -- <chmod file="${project.build.directory}/${project.finalName}/vst-client/*.bin" perm="775" /> -+ <chmod file="${project.build.directory}/${project.finalName}/vst-client/*.bin" perm="775" /> --> - - <chmod file="${project.build.directory}/${project.finalName}/lib/*.so" perm="775" /> ++ --> + <chmod file="${project.build.directory}/${project.finalName}/lv2-client/*.bin" perm="755" /> +- <chmod file="${project.build.directory}/${project.finalName}/vst-client/*.bin" perm="755" /> ++ <!-- <chmod file="${project.build.directory}/${project.finalName}/vst-client/*.bin" perm="755" /> --> <!-- /PLUGINS FILES --> + </target> + </configuration> ++++++ tuxguitar-default-soundfont.patch ++++++ --- /var/tmp/diff_new_pack.KdKB5c/_old 2023-10-10 21:01:38.973018151 +0200 +++ /var/tmp/diff_new_pack.KdKB5c/_new 2023-10-10 21:01:38.977018296 +0200 @@ -1,28 +1,22 @@ -diff -rupN tuxguitar-1.4-src.org/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg tuxguitar-1.4-src/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg ---- tuxguitar-1.4-src.org/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg -+++ tuxguitar-1.4-src/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg +--- tuxguitar-1.6.0-src/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg ++++ tuxguitar-1.6.0-src/build-scripts/common-resources/common-linux/dist/tuxguitar-fluidsynth.cfg @@ -1,7 +1,8 @@ #tuxguitar-fluidsynth #Fri Oct 30 14:24:16 ART 2015 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 -@@ -11,4 +11,4 @@ synth.sample-rate=44100.0 - audio.sample-format=float - audio.period-size=512 - audio.periods=32 --audio.driver=pulseaudio -+audio.driver=alsa -diff -rupN tuxguitar-1.4-src.org/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg tuxguitar-1.4-src/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg ---- tuxguitar-1.4-src.org/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg -+++ tuxguitar-1.4-src/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg + +--- tuxguitar-1.6.0-src/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg 2023-04-11 14:21:06.300904783 +0200 ++++ tuxguitar-1.6.0-src/build-scripts/common-resources/common-linux/dist/tuxguitar-jsa.cfg 2023-04-11 14:21:06.300904783 +0200 @@ -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 + ++++++ tuxguitar-startscript.patch ++++++ --- /var/tmp/diff_new_pack.KdKB5c/_old 2023-10-10 21:01:38.989018731 +0200 +++ /var/tmp/diff_new_pack.KdKB5c/_new 2023-10-10 21:01:38.993018876 +0200 @@ -1,143 +1,78 @@ ---- tuxguitar-1.5.4-src/misc/tuxguitar.sh 2020-05-12 19:46:29.000000000 +0200 -+++ tuxguitar-1.5.4-src/misc/tuxguitar.sh 2020-07-08 09:19:22.039193449 +0200 -@@ -65,6 +65,8 @@ - [ -r "$t" ] && f="$t" - t="/usr/lib/java/swt.jar" - [ -r "$t" ] && f="$t" +--- tuxguitar-1.6.0-src/build-scripts/common-resources/common-linux/tuxguitar.sh ++++ tuxguitar-1.6.0-src/build-scripts/common-resources/common-linux/tuxguitar.sh +@@ -1,20 +1,67 @@ + #!/bin/sh +-##SCRIPT DIR +-TG_DIR=`dirname $(realpath "$0")` ++ ++# system dependencies ++swt_guess_() ++{ ++ t="/usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.*.jar" ++ [ -r "$t" ] && f="$t" ++ t="/etc/alternatives/swt.jar" ++ [ -r "$t" ] && f="$t" ++ t="/usr/share/java/swt.jar" ++ [ -r "$t" ] && f="$t" ++ t="/usr/lib/java/swt.jar" ++ [ -r "$t" ] && f="$t" + t="/usr/lib64/java/swt.jar" + [ -r "$t" ] && f="$t" - t="/usr/lib/java/swt-gtk-3.5.1.jar" - [ -r "$t" ] && f="$t" - t="/usr/share/java/swt-gtk-3.4.jar" -@@ -114,7 +116,7 @@ - - # java - [ -z ${JAVA_HOME} ] && t=$(java_guess_) && [ -d "$t" ] && JAVA_HOME="$t" -- if [ -d "${JAVA_HOME}" ] ; then -+ if [ -d "${JAVA_HOME}/jre/bin/java" ] ; then - export JAVA_HOME - JAVA="${JAVA:=${JAVA_HOME}/jre/bin/java}" - [ -x ${JAVA} ] && export JAVA -@@ -124,13 +126,10 @@ - fi - - # mozilla -- [ -z ${MOZILLA_FIVE_HOME} ] \ -- && t=$(mozilla_guess_) && [ -d "$t" ] && MOZILLA_FIVE_HOME="$t" -- if [ -d "$MOZILLA_FIVE_HOME" ] ; then -- export MOZILLA_FIVE_HOME -- export LD_LIBRARY_PATH="$MOZILLA_FIVE_HOME" -- else -- echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar' -+ if [ -z $MOZILLA_FIVE_HOME ]; then -+ MOZILLA_FIVE_HOME=/usr/lib64/firefox -+ [ ! -d ${MOZILLA_FIVE_HOME} ] && MOZILLA_FIVE_HOME=/usr/lib64/mozilla -+ [ ! -d ${MOZILLA_FIVE_HOME} ] && MOZILLA_FIVE_HOME=/usr/lib64/iceweasel - fi - - [ ! -z ${DEBUG} ] && echo "# MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME}" -@@ -141,10 +140,10 @@ - tuxguitar_() - { - local PACKAGE=${PACKAGE:=tuxguitar} -- local PACKAGE_HOME=${PACKAGE_HOME:=/usr/share/${PACKAGE}/} -+ local PACKAGE_HOME=${PACKAGE_HOME:=/usr/share/java/${PACKAGE}/} - # local PACKAGE_MAIN=${PACKAGE_MAIN:=org.herac.tuxguitar.gui.TGMain} - local PACKAGE_MAIN=${PACKAGE_MAIN:=org.herac.tuxguitar.app.TGMain} -- local PACKAGE_LIB=${PACKAGE_LIB:=/usr/lib/jni} -+ local PACKAGE_LIB=${PACKAGE_LIB:=/usr/lib64/tuxguitar} - # java env - JAVA=${JAVA:=java} - CLASSPATH=${CLASSPATH} -@@ -152,12 +151,78 @@ - [ -d "$t" ] && CLASSPATH=${CLASSPATH}:$t - t="${PACKAGE_HOME}/${PACKAGE}.jar" - [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -- t="/usr/share/java/itext.jar" -+ t=${PACKAGE_HOME}/${PACKAGE}-alsa.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-ascii.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-awt-graphics.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-browser-ftp.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-community.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-compat.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-converter.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-editor-utils.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-fluidsynth.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-gervill.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-gm-settings.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-gm-utils.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-gpx.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-gtp.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-gtp-ui.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-image.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-jack.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-jack-ui.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-jsa.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-lib.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-lilypond.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-midi.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-musicxml.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-oss.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-pdf.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-pdf-ui.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-ptb.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-svg.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-tef.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-tray.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-tuner.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-ui-toolkit.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-ui-toolkit-swt.jar -+ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-viewer.jar - [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t - t=$(swt_guess_) - [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t - -- JAVA_FLAGS=${JAVA_FLAGS:="-Xms128m -Xmx128m"} -+ JAVA_FLAGS=${JAVA_FLAGS:="-Xms128m -Xmx512m"} - JAVA_FLAGS=" ${JAVA_FLAGS} \ - -Djava.library.path=${PACKAGE_LIB} \ - -D${PACKAGE}.share.path=/usr/share/${PACKAGE} \ -@@ -170,6 +235,9 @@ - [ ! -z ${DEBUG} ] && ${JAVA} -version - [ ! -z ${DEBUG} ] && ${JAVA} ${JAVA_FLAGS} ${PACKAGE_MAIN} --version - -+ SWT_GTK3=0 -+ export SWT_GTK3 ++ file -L "$f" >/dev/null 2>&1 || f="" ++ echo "$f" ++} ++ ++itext_pdf_guess_() ++{ ++ t="/usr/share/java/itext.jar" ++ [ -r "$t" ] && f="$t" ++ t="/usr/share/java/itext-pdf.jar" ++ [ -r "$t" ] && f="$t" ++ t="/usr/share/java/itextpdf/itextpdf.jar" ++ [ -r "$t" ] && f="$t" ++ file -L "$f" >/dev/null 2>&1 || f="" ++ echo "$f" ++} ++ ++itext_xmlworker_guess_() ++{ ++ t="/usr/share/java/xmlworker.jar" ++ [ -r "$t" ] && f="$t" ++ t="/usr/share/java/itext-xmlworker.jar" ++ [ -r "$t" ] && f="$t" ++ t="/usr/share/java/itextpdf/xmlworker.jar" ++ [ -r "$t" ] && f="$t" ++ file -L "$f" >/dev/null 2>&1 || f="" ++ echo "$f" ++} ++ + ##JAVA + JAVA=`which java` + ##LIBRARY_PATH +-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TG_DIR}/lib/ ++LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib64/tuxguitar + ##CLASSPATH +-CLASSPATH=${CLASSPATH}:${TG_DIR}/lib/* +-CLASSPATH=${CLASSPATH}:${TG_DIR}/share/ +-CLASSPATH=${CLASSPATH}:${TG_DIR}/dist/ ++CLASSPATH=/usr/share/java/tuxguitar/tuxguitar.jar:/usr/share/java/tuxguitar/*: ++t=$(itext_pdf_guess_) ++[ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t ++t=$(itext_xmlworker_guess_) ++[ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t ++t=$(swt_guess_) ++[ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + - ${JAVA} ${JAVA_FLAGS} ${PACKAGE_MAIN} $arg "$@" - } - + ##MAINCLASS + MAINCLASS=org.herac.tuxguitar.app.TGMainSingleton + ##JVM ARGUMENTS + VM_ARGS="-Xmx512m" ++## SHAREPATH ++SHAREPATH=/usr/share/tuxguitar + ##EXPORT VARS + export CLASSPATH + export LD_LIBRARY_PATH + ##LAUNCH +-${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} "$@"
