Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b6525def719e770027c4d620f51ab47c5aa9e70
commit 2b6525def719e770027c4d620f51ab47c5aa9e70
Author: Marius Cirsta <mcir...@frugalware.org>
Date: Sat Apr 30 03:33:25 2016 +0300
tuxguitar-1.3.2-1-x86_64
* version bump
* no more subpkgs
diff --git a/source/xapps-extra/tuxguitar/FrugalBuild
b/source/xapps-extra/tuxguitar/FrugalBuild
index 99de29e..51a70c4 100644
--- a/source/xapps-extra/tuxguitar/FrugalBuild
+++ b/source/xapps-extra/tuxguitar/FrugalBuild
@@ -3,8 +3,8 @@
# Contributor: bouleetbil <bouleet...@frogdev.info>
pkgname=tuxguitar
-pkgver=1.2
-pkgrel=5
+pkgver=1.3.2
+pkgrel=1
pkgdesc="TuxGuitar is a multitrack guitar tablature editor and player written
in Java-SWT."
options=('scriptlet')
groups=('xapps-extra')
@@ -12,131 +12,82 @@ archs=('i686' 'x86_64')
_F_gnome_desktop="y"
_F_desktop_icon=$pkgname
_F_desktop_categories="Application;Audio;"
-_F_sourceforge_name="tuxguitar-src"
_F_sourceforge_dirname=$pkgname
_F_sourceforge_realname="TuxGuitar"
+_F_sourceforge_ext="-src.tar.gz"
_F_sourceforge_pkgver=${pkgver/_/-}
Finclude sourceforge openjava gnome-scriptlet
-depends=(${depends[@]} 'swt' 'imagemagick')
-sha1sums=('57d1e56215778b7331eb1dbf8edb2e9b6799fcc7')
-
-_F_cd_path="$pkgname-src-$_F_sourceforge_pkgver"
-
-subpkgs=('tuxguitar-plugin-alsa' 'tuxguitar-plugin-ascii'
'tuxguitar-plugin-browser-ftp' 'tuxguitar-plugin-compat' \
+depends=(${depends[@]} 'swt' 'alsa-lib')
+makedepends=(${makedepends[@]} 'jack' 'fluidsynth' 'maven' 'imagemagick')
+source+=(fix-gcj.patch tuxguitar)
+sha1sums=('69ddf74f412219a644faafc665f3a903292b97b2' \
+ 'e0b075d3358c9ab0ad1e0be671002bccbf788e1e' \
+ 'a1f6fe6c25080067a26489153eec2839c0ed4a62')
+_F_cd_path="$pkgname-$pkgver-src"
+
+replaces=('tuxguitar-plugin-alsa' 'tuxguitar-plugin-ascii'
'tuxguitar-plugin-browser-ftp' 'tuxguitar-plugin-compat' \
'tuxguitar-plugin-converter' 'tuxguitar-plugin-gtp' 'tuxguitar-plugin-jsa'
'tuxguitar-plugin-lilypond' \
'tuxguitar-plugin-midi' 'tuxguitar-plugin-musicxml' 'tuxguitar-plugin-pdf' \
'tuxguitar-plugin-ptb' 'tuxguitar-plugin-tef' 'tuxguitar-plugin-tray'
'tuxguitar-plugin-community' \
'tuxguitar-plugin-gervill' 'tuxguitar-plugin-jack' 'tuxguitar-plugin-tuner')
-subdescs=('Plugin TuxGuitar-alsa' 'Plugin TuxGuitar-ascii' 'Plugin
TuxGuitar-browser-ftp' 'Plugin TuxGuitar-compat' \
- 'Plugin TuxGuitar-converter' 'Plugin TuxGuitar-gtp' 'Plugin
TuxGuitar-jsa' 'Plugin TuxGuitar-lilypond' \
- 'Plugin TuxGuitar-midi' 'Plugin TuxGuitar-musicxml' 'Plugin
TuxGuitar-pdf' \
- 'Plugin TuxGuitar-ptb' 'Plugin TuxGuitar-tef' 'Plugin
TuxGuitar-tray' 'Plugin TuxGuitar-community' \
- 'Plugin TuxGuitar-gervill' 'Plugin TuxGuitar-jack' 'Plugin
TuxGuitar-tuner')
-subrodepends=("tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver"
"tuxguitar=$pkgver" \
- "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver"
"tuxguitar=$pkgver" \
- "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver"
"tuxguitar=$pkgver" \
- "tuxguitar=$pkgver" "tuxguitar=$pkgver" "tuxguitar=$pkgver"
"tuxguitar=$pkgver" \
- "tuxguitar=$pkgver" "tuxguitar=$pkgver" )
-
-subdepends=("alsa-lib" "" "" "" \
- "" "" "" "" \
- "" "" "itext" \
- "" "" "" "" \
- "" "jack" "")
-
-subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' \
- 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' \
- 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' \
- 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' \
- 'xlib-extra' 'xlib-extra' )
-subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \
- 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \
- 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \
- 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \
- 'i686 x86_64' 'i686 x86_64' )
-
-subreplaces=('tuxguitar-plugin-oss' '' '' '' \
- '' '' '' '' \
- '' '' '' '' \
- '' '' '' '' \
- '' '' )
-subprovides=('tuxguitar-plugin-oss' '' '' '' \
- '' '' '' '' \
- '' '' '' '' \
- '' '' '' '' \
- '' '' )
-subconflcits=('tuxguitar-plugin-oss' '' '' '' \
- '' '' '' '' \
- '' '' '' '' \
- '' '' '' '' \
- '' '' )
+conflicts=("${replaces[@]}")
+provides=("${provides[@]}")
build() {
Fpatchall
- #fix itext classpath
- Fsed "lowagie" "itextpdf"
TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFWriter.java
-
- cd $_F_sourceforge_realname
- #setting paths
- Fsed "lib.swt.jni=lib/" "lib.swt.jni=/usr/lib/" build.properties
- Fsed "lib.swt.jar=lib/swt.jar" "lib.swt.jar=/usr/share/java/swt.jar"
build.properties
- Fsed "lib.itext.jar=lib/itext.jar"
"lib.itext.jar=/usr/share/java/itextpdf.jar" build.properties
- Fsed "dist.jar.path=./" "dist.jar.path=$Fdestdir/usr/share/$pkgname/"
build.properties
- Fsed "dist.bin.path=./" "dist.bin.path=$Fdestdir/usr/bin/"
build.properties
- Fsed "dist.share.path=share/"
"dist.share.path=$Fdestdir/usr/share/$pkgname/" build.properties
- Fsed "dist.doc.path=doc/"
"dist.doc.path=$Fdestdir/usr/share/doc/$pkgname/" build.properties
+ [ $CARCH == x86_64 ] && _arch=x86_64
+ [ $CARCH == i686 ] && _arch=x86
+
+ cd
$Fsrcdir/tuxguitar-$pkgver-src/build-scripts/tuxguitar-linux-${_arch} || Fdie
+
+ export PATH=$Fsrcdir:$PATH
+ export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$Fsrcdir"
#making Tuxguitar
- Fant -f build.xml all
- Fant -f build.xml 'install'
+ mvn install || Fdie
- cd .. || Fdie
- #delete broken plugin
- #Todo see the broken plugins
- #TuxGuitar-CoreAudio plugin for macOS
- rm TuxGuitar-CoreAudio -R || Fide
- rm TuxGuitar-fluidsynth -R || Fdie
- rm TuxGuitar-winmm -R || Fdie
- rm TuxGuitar-AudioUnit -R || Fdie
- rm TuxGuitar-carbon-integration -R || Fdie
- rm TuxGuitar-cocoa-integration -R || Fdie
- rm TuxGuitar-jws -R || Fdie
-
- CFLAGS="${CFLAGS[@]} -I/usr/lib/jvm/java-7-openjdk/include/
-I/usr/lib/jvm/java-7-openjdk/include/linux/"
- #build all plugins
- Fmkdir /usr/lib
- Fmkdir /usr/share/$pkgname/plugins
- tuxPlugins=`ls . | grep "TuxGuitar-" | grep -v oss`
- for pkg in $tuxPlugins
- do
- cd $pkg || Fdie
- Fant -f build.xml build
-
- compName=`echo $pkg | sed 's/[^-]*-\(.*\)\//\1/'`
- cp tuxguitar-$compName.jar
$Fdestdir/usr/share/$pkgname/plugins/ || Fdie
- Fsplit tuxguitar-plugin-$compName
/usr/share/$pkgname/plugins/tuxguitar-$compName.jar
-
- if [ -d jni ]
- then
- cd jni || Fdie
- make
- cp *so $Fdestdir/usr/lib/ || Fdie
- cd .. || Fdie
- fi
- cd .. || Fdie
- done
+ for i in TuxGuitar-lib TuxGuitar-gm-utils; do
+ cd $Fsrcdir/tuxguitar-$pkgver-src/$i || Fdie
+ mvn install || Fdie
+ done
+
+ cd $Fsrcdir/tuxguitar-$pkgver-src || Fdie
+ mvn install || Fdie
+
+ # native modules
+ for i in alsa jack fluidsynth; do
+ cd
$Fsrcdir/tuxguitar-$pkgver-src/build-scripts/native-modules/tuxguitar-$i-linux-${_arch}
|| Fdie
+ mvn install || Fdie
+ done
+
#convert image to png
Fmkdir usr/share/pixmaps
- convert misc/$pkgname.xpm $Fdestdir/usr/share/pixmaps/$pkgname.png ||
Fdie
+ convert $Fsrcdir/tuxguitar-$pkgver-src/misc/$pkgname.xpm
$Fdestdir/usr/share/pixmaps/$pkgname.png || Fdie
+
+ Fmkdir usr/bin
+
+ cd
$Fsrcdir/tuxguitar-$pkgver-src/build-scripts/tuxguitar-linux-${_arch} || Fdie
+ # tuxguitar
+ cp -a target/tuxguitar-$pkgver-linux-${_arch}
$Fdestdir/usr/share/tuxguitar || Fdie
+
+ Fexe tuxguitar usr/bin/tuxguitar
+
+ # native modules
+ for i in alsa jack fluidsynth; do
+ cp -a
$Fsrcdir/tuxguitar-$pkgver-src/build-scripts/native-modules/tuxguitar-$i-linux-${_arch}/target/build/*
$Fdestdir/usr/share/tuxguitar/ || Fdie
+ done
+
+ # desktop files
+ Ffile tuxguitar-$pkgver-src/misc/tuxguitar.xml
usr/share/mime/packages/tuxguitar.xml
+ Ffile tuxguitar-$pkgver-src/misc/tuxguitar.desktop
usr/share/applications/tuxguitar.desktop
- #Desktop Launcher
- Fdesktop2
+ #remove built int swt.jar, using our own
+ Frm usr/share/tuxguitar/lib/swt.jar
+ #use our own swt.jar
+ sed -i 's|\./lib/swt\.jar|/usr/share/java/swt.jar|'
$Fdestdir/usr/share/tuxguitar/tuxguitar.sh || Fdie
- #Corrected the launcher
- Fsed "$Fdestdir" "" "$Fdestdir/usr/bin/$pkgname"
- Fsed "/usr/bin/java" "/usr/lib/java/jre/bin/java"
$Fdestdir/usr/bin/$pkgname
Fbuild_gnome_scriptlet
}
diff --git a/source/xapps-extra/tuxguitar/fix-gcj.patch
b/source/xapps-extra/tuxguitar/fix-gcj.patch
new file mode 100644
index 0000000..605bf3f
--- /dev/null
+++ b/source/xapps-extra/tuxguitar/fix-gcj.patch
@@ -0,0 +1,66 @@
+---
tuxguitar-1.3.2-src.old/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml
2016-03-16 23:26:23.000000000 +0200
++++
tuxguitar-1.3.2-src.new/build-scripts/native-modules/tuxguitar-alsa-linux-x86/pom.xml
2016-04-29 22:17:38.962203460 +0300
+@@ -22,7 +22,7 @@
+
+
<tuxguitar-alsa.jni.path>${parent.relativePath}/TuxGuitar-alsa/jni/</tuxguitar-alsa.jni.path>
+
<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
+- <tuxguitar-alsa.jni.cflags>-I$(shell gcj
-print-file-name=include/) -m32 -fPIC</tuxguitar-alsa.jni.cflags>
++
<tuxguitar-alsa.jni.cflags>-I/usr/lib/jvm/java-8-openjdk/include/
-I/usr/lib/jvm/java-8-openjdk/include/linux/ -m32
-fPIC</tuxguitar-alsa.jni.cflags>
+ <tuxguitar-alsa.jni.ldflags>-m32
-fPIC</tuxguitar-alsa.jni.ldflags>
+ <tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
+
<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
+---
tuxguitar-1.3.2-src.old/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml
2016-03-16 23:26:22.000000000 +0200
++++
tuxguitar-1.3.2-src.new/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86/pom.xml
2016-04-29 22:18:06.742329549 +0300
+@@ -24,7 +24,7 @@
+
<tuxguitar-fluidsynth.jni.path>${parent.relativePath}/TuxGuitar-fluidsynth/jni/</tuxguitar-fluidsynth.jni.path>
+
<tuxguitar-fluidsynth.jni.rm>${tuxguitar.jni.rm}</tuxguitar-fluidsynth.jni.rm>
+
<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
+- <tuxguitar-fluidsynth.jni.cflags>-I$(shell gcj
-print-file-name=include/) -m32 -fPIC</tuxguitar-fluidsynth.jni.cflags>
++
<tuxguitar-fluidsynth.jni.cflags>-I/usr/lib/jvm/java-8-openjdk/include/
-I/usr/lib/jvm/java-8-openjdk/include/linux/ -m32
-fPIC</tuxguitar-fluidsynth.jni.cflags>
+ <tuxguitar-fluidsynth.jni.ldflags>-m32
-fPIC</tuxguitar-fluidsynth.jni.ldflags>
+
<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
+
<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
+---
tuxguitar-1.3.2-src.old/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml
2016-03-16 23:26:22.000000000 +0200
++++
tuxguitar-1.3.2-src.new/build-scripts/native-modules/tuxguitar-jack-linux-x86/pom.xml
2016-04-29 23:31:00.941757702 +0300
+@@ -24,7 +24,7 @@
+
<tuxguitar-jack.jni.path>${parent.relativePath}/TuxGuitar-jack/jni/</tuxguitar-jack.jni.path>
+
<tuxguitar-jack.jni.rm>${tuxguitar.jni.rm}</tuxguitar-jack.jni.rm>
+
<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
+- <tuxguitar-jack.jni.cflags>-I$(shell gcj
-print-file-name=include/) -m32 -fPIC</tuxguitar-jack.jni.cflags>
++
<tuxguitar-jack.jni.cflags>-I/usr/lib/jvm/java-8-openjdk/include/
-I/usr/lib/jvm/java-8-openjdk/include/linux/ -m32
-fPIC</tuxguitar-jack.jni.cflags>
+ <tuxguitar-jack.jni.ldflags>-m32
-fPIC</tuxguitar-jack.jni.ldflags>
+ <tuxguitar-jack.jni.ldlibs>`pkg-config --libs
jack`</tuxguitar-jack.jni.ldlibs>
+
<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
+---
tuxguitar-1.3.2-src.old/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml
2016-03-16 23:26:22.000000000 +0200
++++
tuxguitar-1.3.2-src.new/build-scripts/native-modules/tuxguitar-alsa-linux-x86_64/pom.xml
2016-04-29 18:58:00.233899501 +0300
+@@ -22,7 +22,7 @@
+
+
<tuxguitar-alsa.jni.path>${parent.relativePath}/TuxGuitar-alsa/jni/</tuxguitar-alsa.jni.path>
+
<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
+- <tuxguitar-alsa.jni.cflags>-I$(shell gcj
-print-file-name=include/) -m64 -fPIC</tuxguitar-alsa.jni.cflags>
++
<tuxguitar-alsa.jni.cflags>-I/usr/lib/jvm/java-8-openjdk/include/
-I/usr/lib/jvm/java-8-openjdk/include/linux/ -m64
-fPIC</tuxguitar-alsa.jni.cflags>
+ <tuxguitar-alsa.jni.ldflags>-m64
-fPIC</tuxguitar-alsa.jni.ldflags>
+ <tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
+
<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
+---
tuxguitar-1.3.2-src.old/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml
2016-03-16 23:26:22.000000000 +0200
++++
tuxguitar-1.3.2-src.new/build-scripts/native-modules/tuxguitar-fluidsynth-linux-x86_64/pom.xml
2016-04-29 19:44:23.363274789 +0300
+@@ -24,7 +24,7 @@
+
<tuxguitar-fluidsynth.jni.path>${parent.relativePath}/TuxGuitar-fluidsynth/jni/</tuxguitar-fluidsynth.jni.path>
+
<tuxguitar-fluidsynth.jni.rm>${tuxguitar.jni.rm}</tuxguitar-fluidsynth.jni.rm>
+
<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
+- <tuxguitar-fluidsynth.jni.cflags>-I$(shell gcj
-print-file-name=include/) -m64 -fPIC</tuxguitar-fluidsynth.jni.cflags>
++
<tuxguitar-fluidsynth.jni.cflags>-I/usr/lib/jvm/java-8-openjdk/include/
-I/usr/lib/jvm/java-8-openjdk/include/linux/ -m64
-fPIC</tuxguitar-fluidsynth.jni.cflags>
+ <tuxguitar-fluidsynth.jni.ldflags>-m64
-fPIC</tuxguitar-fluidsynth.jni.ldflags>
+
<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
+
<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
+---
tuxguitar-1.3.2-src.old/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml
2016-03-16 23:26:22.000000000 +0200
++++
tuxguitar-1.3.2-src.new/build-scripts/native-modules/tuxguitar-jack-linux-x86_64/pom.xml
2016-04-29 19:42:05.954631385 +0300
+@@ -24,7 +24,7 @@
+
<tuxguitar-jack.jni.path>${parent.relativePath}/TuxGuitar-jack/jni/</tuxguitar-jack.jni.path>
+
<tuxguitar-jack.jni.rm>${tuxguitar.jni.rm}</tuxguitar-jack.jni.rm>
+
<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
+- <tuxguitar-jack.jni.cflags>-I$(shell gcj
-print-file-name=include/) -m64 -fPIC</tuxguitar-jack.jni.cflags>
++
<tuxguitar-jack.jni.cflags>-I/usr/lib/jvm/java-8-openjdk/include/
-I/usr/lib/jvm/java-8-openjdk/include/linux/ -m64
-fPIC</tuxguitar-jack.jni.cflags>
+ <tuxguitar-jack.jni.ldflags>-m64
-fPIC</tuxguitar-jack.jni.ldflags>
+ <tuxguitar-jack.jni.ldlibs>`pkg-config --libs
jack`</tuxguitar-jack.jni.ldlibs>
+
<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
diff --git a/source/xapps-extra/tuxguitar/tuxguitar
b/source/xapps-extra/tuxguitar/tuxguitar
new file mode 100644
index 0000000..91156e7
--- /dev/null
+++ b/source/xapps-extra/tuxguitar/tuxguitar
@@ -0,0 +1,2 @@
+#!/bin/sh
+cd /usr/share/tuxguitar && exec ./tuxguitar.sh "\$@"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
