diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
commit | 33fcf0e7b95e530b849e59e90fdea4001e01283d (patch) | |
tree | 5eab4f238207cce42c8351067ade9999df065a1f /extra/hydrogen | |
parent | 3b0910bf6527c3b761d9579b2ed37a9a42595fa3 (diff) | |
parent | a1922d0ec660fdc1892f2783515f781c090df0a9 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnash/PKGBUILD
community/libopenraw/PKGBUILD
community/smalltalk/PKGBUILD
core/coreutils/PKGBUILD
core/libarchive/PKGBUILD
extra/dhcp/PKGBUILD
extra/gmime/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libreoffice/PKGBUILD
extra/lirc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sdl_image/PKGBUILD
extra/sdl_net/PKGBUILD
extra/sdl_ttf/PKGBUILD
extra/spamassassin/PKGBUILD
extra/tftp-hpa/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/tumbler/PKGBUILD
extra/vim/PKGBUILD
extra/wipe/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kde-np.pam
kde-unstable/kdebase-workspace/kde.pam
multilib/binutils-multilib/PKGBUILD
multilib/chuck/PKGBUILD
multilib/dev86/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/lib32-glibc.conf
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sdl_ttf/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/nspluginwrapper/PKGBUILD
multilib/q4wine/PKGBUILD
multilib/wine/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
Diffstat (limited to 'extra/hydrogen')
-rw-r--r-- | extra/hydrogen/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/hydrogen/install.patch | 12 |
2 files changed, 21 insertions, 5 deletions
diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD index b56f92c4c..5d2845d50 100644 --- a/extra/hydrogen/PKGBUILD +++ b/extra/hydrogen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135233 2011-08-11 10:28:18Z schiv $ +# $Id: PKGBUILD 146711 2012-01-16 19:49:24Z dreisner $ # Maintainer: tobias <tobias@archlinux.org> # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> @@ -6,24 +6,28 @@ pkgname=hydrogen pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced Drum Machine" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.hydrogen-music.org/" depends=('libarchive' 'liblrdf' 'qt' 'jack') makedepends=('scons') -options=('!makeflags') +#options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - lrdf_raptor2.patch) + lrdf_raptor2.patch + install.patch) md5sums=('e96f291d60e58f5d62fe616cee577dc0' - '2124851e890f46158189b5fa90006d40') + '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 } diff --git a/extra/hydrogen/install.patch b/extra/hydrogen/install.patch new file mode 100644 index 000000000..2e6e707a1 --- /dev/null +++ b/extra/hydrogen/install.patch @@ -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 ---- |