Hello community, here is the log from the commit of package tuxguitar for openSUSE:Factory checked in at 2020-07-24 09:54:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuxguitar (Old) and /work/SRC/openSUSE:Factory/.tuxguitar.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tuxguitar" Fri Jul 24 09:54:09 2020 rev:5 rq:821257 version:1.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/tuxguitar/tuxguitar.changes 2018-10-08 17:46:45.758381564 +0200 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.3592/tuxguitar.changes 2020-07-24 09:55:35.289380626 +0200 @@ -1,0 +2,27 @@ +Wed Jul 8 10:09:21 UTC 2020 - Fridrich Strba <fst...@suse.com> + +- Add viewer and tray to the built modules + +------------------------------------------------------------------- +Wed Jul 8 07:43:09 UTC 2020 - Fridrich Strba <fst...@suse.com> + +- Update to version 1.5.4 +- Removed patches: + * tuxguitar-do-not-force-java-1.5.patch + * tuxguitar-jsa-build.patch + * tuxguitar-tray-build.patch + + not needed anymore, since we don't use the ant build system +- Modified patch. + * tuxguitar-startscript.patch + + adapt to work with openSUSE layout of directories +- Added patches: + * tuxguitar-startscript-itext.patch + + apply when building --with itext in order to have the + necessary libraries in the classpath + * no-vst.patch + + do not build the parts that need unavailable VST SDK + * tuxguitar-additional-arch.patch + + extend supported architectures to aarch64, ppc64, ppc64le, + and s390x + +------------------------------------------------------------------- Old: ---- tuxguitar-1.4-src-clean.tar.gz tuxguitar-do-not-force-java-1.5.patch tuxguitar-jsa-build.patch tuxguitar-tray-build.patch New: ---- no-vst.patch tuxguitar-1.5.4-src.tar.gz tuxguitar-additional-arch.patch tuxguitar-startscript-itext.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxguitar.spec ++++++ --- /var/tmp/diff_new_pack.K4bslG/_old 2020-07-24 09:55:37.077382471 +0200 +++ /var/tmp/diff_new_pack.K4bslG/_new 2020-07-24 09:55:37.081382475 +0200 @@ -1,7 +1,7 @@ # # spec file for package tuxguitar # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2008-2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> # Copyright (c) 2008-2017 Fedora project # @@ -14,58 +14,75 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Summary: A multitrack tablature editor and player written in Java-SWT -License: LGPL-2.1+ -Group: Applications/Multimedia +%bcond_without itext +%ifarch x86_64 +%global bit x86_64 +%endif +%ifarch armv7hl +%global bit armv7hl +%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.4 +Version: 1.5.4 Release: 0 -Url: http://www.tuxguitar.pw -# Source file cleaned of potentially proprietary SF2, DLL, EXE files: -# wget -N http://downloads.sourceforge.net/tuxguitar/tuxguitar-1.4-src.tar.gz -# tar zxf tuxguitar-1.4-src.tar.gz -# find tuxguitar-1.4-src -name "*.exe" -exec rm {} \; -# find tuxguitar-1.4-src -name "*.dll" -exec rm {} \; -# find tuxguitar-1.4-src -name "*.sf2" -exec rm {} \; -# tar zcf tuxguitar-1.4-src-clean.tar.gz tuxguitar-1.4-src -Source0: %{name}-%{version}-src-clean.tar.gz -Patch0: tuxguitar-startscript.patch -Patch1: tuxguitar-default-soundfont.patch -Patch2: tuxguitar-jsa-build.patch -Patch3: tuxguitar-tray-build.patch -Patch4: tuxguitar-do-not-force-java-1.5.patch - -Requires: eclipse-swt -Requires: java >= 1.7 -Requires: javapackages-tools -# 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 -Recommends: timidity -Recommends: snd_sf2 -# export to PDF feature requires itext -#Requires: itext -#BuildRequires: itext +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 +Patch0: tuxguitar-default-soundfont.patch +Patch1: no-vst.patch +Patch2: tuxguitar-additional-arch.patch +Patch3: tuxguitar-startscript.patch +Patch4: tuxguitar-startscript-itext.patch BuildRequires: alsa-devel BuildRequires: ant BuildRequires: ant-contrib BuildRequires: desktop-file-utils BuildRequires: eclipse-swt BuildRequires: fdupes -%if 0%{?suse_version} <= 1320 BuildRequires: fluidsynth-devel -%endif BuildRequires: jack-audio-connection-kit-devel BuildRequires: java-devel >= 1.7 BuildRequires: javapackages-tools +BuildRequires: maven-local BuildRequires: update-desktop-files +BuildRequires: mvn(org.apache.commons:commons-compress) +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 +Recommends: snd_sf2 +Recommends: timidity +%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 @@ -76,179 +93,119 @@ %prep %setup -q -n %{name}-%{version}-src +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 + %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%if %{with itext} %patch4 -p1 - -# Set debug="true" on javac part of the build scripts. -for file in $(find . -name build.xml); do - sed -i 's|debug="false"|debug="true"|' $file -done - -# Don't force compiling with JAVA 1.5 -find . -wholename "./*/build.properties" -exec sed -re "s/^ant.build.javac.source=1.5/#ant.build.javac.source=1.5/" -i {} \; -find . -wholename "./*/build.properties" -exec sed -re "s/^ant.build.javac.target=1.5/#ant.build.javac.target=1.5/" -i {} \; -# Fix build.properties files by providing paths to required jar files -sed "s/TuxGuitar-ui-toolkit\/tuxguitar-ui-toolkit-swt.jar/TuxGuitar-ui-toolkit-swt\/tuxguitar-ui-toolkit-swt.jar/" \ - -i TuxGuitar-image/build.properties -sed "s/TuxGuitar-ui-toolkit\/tuxguitar-ui-toolkit-swt.jar/TuxGuitar-ui-toolkit-swt\/tuxguitar-ui-toolkit-swt.jar/" \ - -i TuxGuitar-tray/build.properties -echo "path.tuxguitar-editor-utils=../TuxGuitar-editor-utils/tuxguitar-editor-utils.jar" \ - >> TuxGuitar-tray/build.properties -echo -e "\npath.tuxguitar-editor-utils=../TuxGuitar-editor-utils/tuxguitar-editor-utils.jar" \ - >> TuxGuitar-tray/build.properties -echo "path.tuxguitar-editor-utils=../TuxGuitar-editor-utils/tuxguitar-editor-utils.jar" \ - >> TuxGuitar-jsa/build.properties -# Use fluidsynth by default -%if 0%{?suse_version} <= 1320 -sed "s/tuxguitar-fluidsynth.enabled=false/tuxguitar-fluidsynth.enabled=true/" \ - -i build-scripts/common-resources/common-linux/dist/tuxguitar-plugin-settings.cfg -sed -re "s/midi.port=.*$/midi.port=tuxguitar-fluidsynth_\/usr\/share\/sounds\/sf2\/FluidR3_GM.sf2/" \ - -i build-scripts/common-resources/common-linux/dist/tuxguitar.cfg -%endif -# Update URL -sed "s/www.tuxguitar.com.ar/www.tuxguitar.pw/" -i TuxGuitar/dist/about_description.dist -# Remove duplicated files -rm -fr TuxGuitar/doc -rm -f TuxGuitar/dist/tuxguitar.cfg -# Remove not needed file -rm -f TuxGuitar/share/lang/toutf.pl - -%build -# Plugins to build: -%if 0%{?suse_version} <= 1320 -PLUGINS="alsa ascii browser-ftp compat converter fluidsynth gervill gm-settings gpx gtp \ - image jack jsa lilypond midi musicxml oss ptb svg tef tray tuner viewer" %else -#remove "fluidsynth" -PLUGINS="alsa ascii browser-ftp compat converter gervill gm-settings gpx gtp \ - image jack jsa lilypond midi musicxml oss ptb svg tef tray tuner viewer" +%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 -# FIXME: "pdf" plugin requires itext, but even after adding itext 1.4 from Education repo: -# error: package com.itextpdf.text does not exist -# JNI's to build -%if 0%{?suse_version} <= 1320 -JNIS="alsa fluidsynth jack oss" -%else -JNIS="alsa jack oss" -%endif -LIBSUFFIX=$(echo %{_lib}|sed 's|lib||') +%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_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.cocoa.macosx.x86_64 +%pom_remove_dep :org.eclipse.swt.carbon.macosx -# to pass to ant: -ANT_FLAGS=" \ - -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ - -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \ - -Dpath.swt=%{_libdir}/java/swt.jar \ - -Dlib.swt.jar=%{_libdir}/java/swt.jar \ - -Ddist.lib.path=%{_libdir}/%{name}/ \ - -Ddist.jar.path=%{_datadir}/%{name}/ \ - -Ddist.share.path=%{_datadir}/%{name}/ \ - -Dos.bin.dir=%{_bindir} \ - -Dos.lib.suffix=$LIBSUFFIX \ - -Dos.data.dir=%{_datadir}/ \ - -Ddist.default.style=Oxygen \ - -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg" -# -Dpath.itext=% {_javadir}/itext.jar \ - -# build jars -ant -f TuxGuitar-lib/build.xml -v -d $ANT_FLAGS all -ant -f TuxGuitar-editor-utils/build.xml -v -d $ANT_FLAGS all -ant -f TuxGuitar-ui-toolkit/build.xml -v -d $ANT_FLAGS all -ant -f TuxGuitar-ui-toolkit-swt/build.xml -v -d $ANT_FLAGS all -ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS all -ant -f TuxGuitar-gm-utils -v -d $ANT_FLAGS all -for jarname in $PLUGINS; do - ant -f TuxGuitar-$jarname/build.xml -v -d $ANT_FLAGS \ - -Dbuild.jar=../TuxGuitar/share/plugins/tuxguitar-$jarname.jar all -done +%pom_xpath_inject pom:modules "<module>../../TuxGuitar-tray</module> + <module>../../TuxGuitar-viewer</module>" build-scripts/%{name}-linux-%{bit} -# build jnis -for jni in $JNIS; do - make -C TuxGuitar-$jni/jni %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS} \ - -I%{_jvmdir}/java-openjdk/include \ - -I%{_jvmdir}/java-openjdk/include/linux \ - -fPIC" -done +%build +%{mvn_build} -j -f -- -e -f build-scripts/%{name}-linux-%{bit}/pom.xml -Dproject.build.sourceEncoding=UTF-8 -Dnative-modules=true %install -# install main content -install -dm 755 $RPM_BUILD_ROOT/%{_bindir} -install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/%{name} -install -pm 644 TuxGuitar/dist/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -cp -r TuxGuitar/share/* $RPM_BUILD_ROOT/%{_datadir}/%{name} -install -pm 755 misc/%{name}.sh $RPM_BUILD_ROOT/%{_bindir}/%{name} -install -pm 644 misc/%{name}.tg $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}.tg -install -pm 644 build-scripts/common-resources/common-linux/dist/*.cfg $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -for jardir in TuxGuitar* ; do - if [ -e $jardir/*jar ] - then - install -m 644 $jardir/*jar $RPM_BUILD_ROOT/%{_datadir}/%{name}/ - fi -done - +%mvn_install # install jnis we built -mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name} -cp -a TuxGuitar-*/jni/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/ +mkdir -p %{buildroot}%{_libdir}/%{name} +cp -a TuxGuitar-*/jni/*.so %{buildroot}%{_libdir}/%{name}/ -# mime-type file -install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages -install -pm 644 misc/%{name}.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/ - -# man -install -dm 755 $RPM_BUILD_ROOT/%{_mandir}/man1/ -install -pm 644 misc/%{name}.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ +# 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} + +# Fix permissions +chmod 755 %{buildroot}/%{_bindir}/%{name} +chmod 755 %{buildroot}%{_libdir}/%{name}/*.so + +# mime types +mkdir -p %{buildroot}/%{_datadir}/mime/packages/ +cp -a misc/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 # desktop files -install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications -install -pm 644 misc/tuxguitar.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ - -# mime-type icons -for sz in 16 24 32 48 64 96 ; do - install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${sz}x${sz}/mimetypes - install -pm 644 TuxGuitar/share/skins/Lavender/icon-${sz}x${sz}.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${sz}x${sz}/mimetypes/audio-x-tuxguitar.png - install -pm 644 TuxGuitar/share/skins/Lavender/icon-${sz}x${sz}.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${sz}x${sz}/mimetypes/audio-x-gtp.png - install -pm 644 TuxGuitar/share/skins/Lavender/icon-${sz}x${sz}.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${sz}x${sz}/mimetypes/audio-x-ptb.png -done +install -dm 755 %{buildroot}/%{_datadir}/applications +install -pm 644 misc/tuxguitar.desktop %{buildroot}/%{_datadir}/applications/ #install also big icon -install -D -m 644 TuxGuitar/share/skins/Lavender/icon-48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/tuxguitar.png +install -D -m 644 TuxGuitar/share/skins/Lavender/icon-48x48.png %{buildroot}%{_datadir}/pixmaps/tuxguitar.png %suse_update_desktop_file -n -i tuxguitar AudioVideo Music Java -%fdupes $RPM_BUILD_ROOT - -%check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null -touch --no-create %{_datadir}/mime/packages &> /dev/null || : -update-desktop-database &> /dev/null - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null - update-mime-database %{_datadir}/mime >& /dev/null ||: -fi -update-desktop-database &> /dev/null - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : - -%files -%defattr(-,root,root,-) -%doc README -%{_mandir}/*/* -%{_bindir}/%{name} +# man page +mkdir -p %{buildroot}/%{_mandir}/man1 +cp -a misc/%{name}.1 %{buildroot}/%{_mandir}/man1/ + +%fdupes -s %{buildroot} + +ln -sf %{_jnidir}/%{name}/%{name}-alsa.jar %{buildroot}%{_javadir}/%{name}/ +ln -sf %{_jnidir}/%{name}/%{name}-fluidsynth.jar %{buildroot}%{_javadir}/%{name}/ +ln -sf %{_jnidir}/%{name}/%{name}-jack.jar %{buildroot}%{_javadir}/%{name}/ +ln -sf %{_jnidir}/%{name}/%{name}-oss.jar %{buildroot}%{_javadir}/%{name}/ + +%files -f .mfiles +%license LICENSE +%doc AUTHORS CHANGES README %{_libdir}/%{name} %{_datadir}/%{name} -%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/*/* +%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_datadir}/mime/packages/%{name}.xml +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1%{?ext_man} + +%{_javadir}/%{name}/tuxguitar-alsa.jar +%{_javadir}/%{name}/tuxguitar-fluidsynth.jar +%{_javadir}/%{name}/tuxguitar-jack.jar +%{_javadir}/%{name}/tuxguitar-oss.jar %changelog ++++++ no-vst.patch ++++++ --- 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 @@ <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> --> </modules> <build> @@ -400,10 +400,10 @@ <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}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-x86/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.4-src-clean.tar.gz -> tuxguitar-1.5.4-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/tuxguitar/tuxguitar-1.4-src-clean.tar.gz /work/SRC/openSUSE:Factory/.tuxguitar.new.3592/tuxguitar-1.5.4-src.tar.gz differ: char 5, line 1 ++++++ tuxguitar-additional-arch.patch ++++++ ++++ 3931 lines (skipped) ++++++ tuxguitar-startscript-itext.patch ++++++ diff -urEbwB tuxguitar-1.5.4-src/misc/tuxguitar.sh tuxguitar-1.5.4-src/misc/tuxguitar.sh --- tuxguitar-1.5.4-src/misc/tuxguitar.sh 2020-07-08 09:20:35.395640489 +0200 +++ tuxguitar-1.5.4-src/misc/tuxguitar.sh 2020-07-08 09:20:48.879722675 +0200 @@ -104,6 +104,30 @@ echo "$d" } +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" +} + # env_() @@ -203,6 +227,10 @@ [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t t=${PACKAGE_HOME}/${PACKAGE}-pdf-ui.jar [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=$(itext_pdf_guess_) + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t + t=$(itext_xmlworker_guess_) + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t t=${PACKAGE_HOME}/${PACKAGE}-ptb.jar [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t t=${PACKAGE_HOME}/${PACKAGE}-svg.jar ++++++ tuxguitar-startscript.patch ++++++ --- /var/tmp/diff_new_pack.K4bslG/_old 2020-07-24 09:55:37.153382549 +0200 +++ /var/tmp/diff_new_pack.K4bslG/_new 2020-07-24 09:55:37.153382549 +0200 @@ -1,6 +1,5 @@ -diff -ru tuxguitar-1.4-src.org/misc/tuxguitar.sh tuxguitar-1.4-src/misc/tuxguitar.sh ---- tuxguitar-1.4-src.org/misc/tuxguitar.sh -+++ tuxguitar-1.4-src/misc/tuxguitar.sh +--- 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" @@ -19,11 +18,10 @@ export JAVA_HOME JAVA="${JAVA:=${JAVA_HOME}/jre/bin/java}" [ -x ${JAVA} ] && export JAVA -@@ -123,14 +125,11 @@ - export JAVA +@@ -124,13 +126,10 @@ fi --# mozilla + # mozilla - [ -z ${MOZILLA_FIVE_HOME} ] \ - && t=$(mozilla_guess_) && [ -d "$t" ] && MOZILLA_FIVE_HOME="$t" - if [ -d "$MOZILLA_FIVE_HOME" ] ; then @@ -31,7 +29,6 @@ - export LD_LIBRARY_PATH="$MOZILLA_FIVE_HOME" - else - echo '$MOZILLA_FIVE_HOME not valid : check doc shipped w/ tuxguitar' -+ # mozilla + if [ -z $MOZILLA_FIVE_HOME ]; then + MOZILLA_FIVE_HOME=/usr/lib64/firefox + [ ! -d ${MOZILLA_FIVE_HOME} ] && MOZILLA_FIVE_HOME=/usr/lib64/mozilla @@ -39,8 +36,12 @@ fi [ ! -z ${DEBUG} ] && echo "# MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME}" -@@ -144,7 +143,7 @@ - local PACKAGE_HOME=${PACKAGE_HOME:=/usr/share/${PACKAGE}/} +@@ -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} @@ -48,78 +49,79 @@ # java env JAVA=${JAVA:=java} CLASSPATH=${CLASSPATH} -@@ -154,10 +153,78 @@ +@@ -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" - [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-editor-utils.jar +- t="/usr/share/java/itext.jar" ++ t=${PACKAGE_HOME}/${PACKAGE}-alsa.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-gm-utils.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-ascii.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-lib.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-awt-graphics.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-ui-toolkit.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-browser-ftp.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/${PACKAGE}-ui-toolkit-swt.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-community.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ -+ # Plugins -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-alsa.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-compat.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-ascii.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-converter.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-awt-graphics.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-editor-utils.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-browser-ftp.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-fluidsynth.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-community.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-gervill.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-compat.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-gm-settings.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-converter.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-gm-utils.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-fluidsynth.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-gpx.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-gervill.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-gtp.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-gm-settings.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-gtp-ui.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-gpx.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-image.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-gtp.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-jack.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-gtp-ui.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-jack-ui.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-image.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-jsa.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-jack.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-lib.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-jack-ui.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-lilypond.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-jsa.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-midi.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-lilypond.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-musicxml.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-midi.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-oss.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-musicxml.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-pdf.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-oss.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-pdf-ui.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-pdf.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-ptb.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-ptb.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-svg.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-svg.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-tef.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-tef.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-tray.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-tray.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-tuner.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-tuner.jar ++ t=${PACKAGE_HOME}/${PACKAGE}-ui-toolkit.jar + [ -r "$t" ] && CLASSPATH=${CLASSPATH}:$t -+ t=${PACKAGE_HOME}/plugins/${PACKAGE}-viewer.jar ++ 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 @@ -128,15 +130,12 @@ JAVA_FLAGS=" ${JAVA_FLAGS} \ -Djava.library.path=${PACKAGE_LIB} \ -D${PACKAGE}.share.path=/usr/share/${PACKAGE} \ -@@ -170,6 +237,12 @@ +@@ -170,6 +235,9 @@ [ ! -z ${DEBUG} ] && ${JAVA} -version [ ! -z ${DEBUG} ] && ${JAVA} ${JAVA_FLAGS} ${PACKAGE_MAIN} --version + SWT_GTK3=0 + export SWT_GTK3 -+ -+ # Uncomment for debugging: -+ #echo "${JAVA} ${JAVA_FLAGS} ${PACKAGE_MAIN} $arg \"$@\"" + ${JAVA} ${JAVA_FLAGS} ${PACKAGE_MAIN} $arg "$@" }
