[arch-commits] Commit in hydrogen/repos (6 files)

[Dave Reisner]

    Date: Monday, January 16, 2012 @ 14:49:23
  Author: dreisner
Revision: 146710

db-move: moved hydrogen from [testing] to [extra] (i686)

Added:
  hydrogen/repos/extra-i686/PKGBUILD
    (from rev 146703, hydrogen/repos/testing-i686/PKGBUILD)
  hydrogen/repos/extra-i686/install.patch
    (from rev 146703, hydrogen/repos/testing-i686/install.patch)
  hydrogen/repos/extra-i686/lrdf_raptor2.patch
    (from rev 146703, hydrogen/repos/testing-i686/lrdf_raptor2.patch)
Deleted:
  hydrogen/repos/extra-i686/PKGBUILD
  hydrogen/repos/extra-i686/lrdf_raptor2.patch
  hydrogen/repos/testing-i686/

--------------------+
 PKGBUILD           |   76 ++++++++++++++++++++++++++-------------------------
 install.patch      |   12 ++++++++
 lrdf_raptor2.patch |   22 +++++++-------
 3 files changed, 63 insertions(+), 47 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-01-16 19:49:21 UTC (rev 146709)
+++ extra-i686/PKGBUILD	2012-01-16 19:49:23 UTC (rev 146710)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: tobias <tobias at archlinux.org>
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: K. Piche <kpiche at rogers.com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=hydrogen
-pkgver=0.9.5
-pkgrel=1
-pkgdesc="Advanced Drum Machine"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt' 'jack')
-makedepends=('scons')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        lrdf_raptor2.patch)
-md5sums=('e96f291d60e58f5d62fe616cee577dc0'
-         '2124851e890f46158189b5fa90006d40')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export QTDIR=/usr
-  patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
-  scons prefix=/usr libarchive=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  scons DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: hydrogen/repos/extra-i686/PKGBUILD (from rev 146703, hydrogen/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-01-16 19:49:23 UTC (rev 146710)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: tobias <tobias at archlinux.org>
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: K. Piche <kpiche at rogers.com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=hydrogen
+pkgver=0.9.5
+pkgrel=2
+pkgdesc="Advanced Drum Machine"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.hydrogen-music.org/"
+depends=('libarchive' 'liblrdf' 'qt' 'jack')
+makedepends=('scons')
+#options=('!makeflags')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        lrdf_raptor2.patch
+        install.patch)
+md5sums=('e96f291d60e58f5d62fe616cee577dc0'
+         '2124851e890f46158189b5fa90006d40'
+         'ce3a83a069b55e46aa532b55e803c9a5')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  export QTDIR=/usr
+  patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
+  # http://www.assembla.com/spaces/hydrogen/tickets/204
+  patch -Np0 -i "${srcdir}/install.patch"
+  scons prefix=/usr libarchive=1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  scons DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: hydrogen/repos/extra-i686/install.patch (from rev 146703, hydrogen/repos/testing-i686/install.patch)
===================================================================
--- extra-i686/install.patch	                        (rev 0)
+++ extra-i686/install.patch	2012-01-16 19:49:23 UTC (rev 146710)
@@ -0,0 +1,12 @@
+*** Sconstruct.org	2011-11-06 12:15:40.018119106 +0100
+--- Sconstruct	2011-11-06 12:16:21.124122432 +0100
+***************
+*** 298,304 ****
+  
+          for N in glob.glob('./data/i18n/hydrogen.*'):
+              env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
+- 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
+  
+  	#add every img in ./data/img to the install list. 
+  	os.path.walk("./data/img/",install_images,env) 
+--- 298,303 ----

Deleted: extra-i686/lrdf_raptor2.patch
===================================================================
--- extra-i686/lrdf_raptor2.patch	2012-01-16 19:49:21 UTC (rev 146709)
+++ extra-i686/lrdf_raptor2.patch	2012-01-16 19:49:23 UTC (rev 146710)
@@ -1,11 +0,0 @@
-diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
---- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
-+++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
-@@ -83,6 +83,7 @@
- 	includes.append( './' )
- 	includes.append( 'gui/src/' )
- 	includes.append( '3rdparty/install/include' )
-+	includes.append( '/usr/include/raptor2' )
- 
- 	if sys.platform == "darwin":
- 		ldflags.append( '-L/opt/local/lib' )

Copied: hydrogen/repos/extra-i686/lrdf_raptor2.patch (from rev 146703, hydrogen/repos/testing-i686/lrdf_raptor2.patch)
===================================================================
--- extra-i686/lrdf_raptor2.patch	                        (rev 0)
+++ extra-i686/lrdf_raptor2.patch	2012-01-16 19:49:23 UTC (rev 146710)
@@ -0,0 +1,11 @@
+diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
+--- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
++++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
+@@ -83,6 +83,7 @@
+ 	includes.append( './' )
+ 	includes.append( 'gui/src/' )
+ 	includes.append( '3rdparty/install/include' )
++	includes.append( '/usr/include/raptor2' )
+ 
+ 	if sys.platform == "darwin":
+ 		ldflags.append( '-L/opt/local/lib' )