[arch-commits] Commit in tuxguitar/trunk (PKGBUILD tuxguitar.desktop)

[Sergej Pupykin]

    Date: Monday, February 11, 2013 @ 16:15:06
  Author: spupykin
Revision: 84140

upgpkg: tuxguitar 1.2-6

upd

Modified:
  tuxguitar/trunk/PKGBUILD
  tuxguitar/trunk/tuxguitar.desktop

-------------------+
 PKGBUILD          |   59 +++++++++++++++++++++++++++++++++++-----------------
 tuxguitar.desktop |    2 -
 2 files changed, 41 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-11 14:03:46 UTC (rev 84139)
+++ PKGBUILD	2013-02-11 15:15:06 UTC (rev 84140)
@@ -4,7 +4,7 @@
 
 pkgname=tuxguitar
 pkgver=1.2
-pkgrel=5
+pkgrel=6
 _jdk=java-7-openjdk
 pkgdesc="multitrack guitar tablature editor and player"
 arch=('i686' 'x86_64')
@@ -19,13 +19,11 @@
 	tuxguitar.desktop
 	tuxguitar.xml)
 md5sums=('f41ed20e77c6c3d8968991a29c71b912'
-         'eea5247daa70ce6fc15e95b1080af486'
+         '0afa7f3248b9317d73ad8ccdc5e5aaf0'
          '59ce4eb8dcc0d0dde81e6cf2820aa9b0')
 
-package() {
+build() {
   cd $srcdir/tuxguitar-src-$pkgver
-  mkdir -p $pkgdir/usr/share/tuxguitar
-  mkdir -p $pkgdir/usr/bin
 
   export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH
 
@@ -48,20 +46,12 @@
   (cd TuxGuitar-gervill/ && ant)
   (cd TuxGuitar-jsa/ && ant)
 
-  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/
-  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \;
-  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/
-  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/
-
   # alsa
   pushd TuxGuitar-alsa/jni
   gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \
 	-c -o org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o \
 	org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c
   gcc  -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound
-  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
   popd
 
   # oss
@@ -70,9 +60,6 @@
 	-c -o org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o \
 	org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c
   gcc  -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib
-  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
   popd
 
   # jack
@@ -81,9 +68,6 @@
 	-c -o org_herac_tuxguitar_jack_JackClient.o \
 	org_herac_tuxguitar_jack_JackClient.c
   gcc  -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack
-  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
-  mkdir -p $pkgdir/usr/share/tuxguitar/lib
-  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
   popd
 
   # fluidsynth
@@ -92,6 +76,43 @@
 	-c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o \
 	org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
   gcc  -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth
+  popd
+}
+
+package() {
+  cd $srcdir/tuxguitar-src-$pkgver
+
+  mkdir -p $pkgdir/usr/share/tuxguitar
+  mkdir -p $pkgdir/usr/bin
+
+  cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/
+  find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \;
+  mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/
+  cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/
+
+  # alsa
+  pushd TuxGuitar-alsa/jni
+  install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so
+  popd
+
+  # oss
+  pushd TuxGuitar-oss/jni
+  install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so
+  popd
+
+  # jack
+  pushd TuxGuitar-jack/jni
+  install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so
+  mkdir -p $pkgdir/usr/share/tuxguitar/lib
+  ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so
+  popd
+
+  # fluidsynth
+  pushd TuxGuitar-fluidsynth/jni
   install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so
   mkdir -p $pkgdir/usr/share/tuxguitar/lib
   ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so

Modified: tuxguitar.desktop
===================================================================
--- tuxguitar.desktop	2013-02-11 14:03:46 UTC (rev 84139)
+++ tuxguitar.desktop	2013-02-11 15:15:06 UTC (rev 84140)
@@ -8,6 +8,6 @@
 Terminal=false
 Type=Application
 Categories=Application;AudioVideo;Audio;
-Exec=tuxguitar %F
+Exec=tuxguitar %F -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
 MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb;
 #eof "$Id: tuxguitar.desktop,v 1.2 2008/09/15 07:54:28 sergej Exp $"