diff options
| author | David Woodfall <dave@dawoodfall.net> | 2011-10-29 20:37:17 -0200 |
|---|---|---|
| committer | Niels Horn <niels.horn@slackbuilds.org> | 2011-10-29 20:37:17 -0200 |
| commit | 15b7a9ab86b823c45942dc3a9c4c013c2d7f7977 (patch) | |
| tree | 24558fb451dafb9e805f01d2956abc0b1da0479b | |
| parent | 65eff6c7457a9542592b983c251bc7e51aa92829 (diff) | |
audio/hydrogen: Fixed problem with scons installing images.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
| -rw-r--r-- | audio/hydrogen/hydrogen.SlackBuild | 4 | ||||
| -rw-r--r-- | audio/hydrogen/sconstruct-install-images.patch | 26 |
2 files changed, 29 insertions, 1 deletions
diff --git a/audio/hydrogen/hydrogen.SlackBuild b/audio/hydrogen/hydrogen.SlackBuild index 5806794454d1..41b280b0e1e4 100644 --- a/audio/hydrogen/hydrogen.SlackBuild +++ b/audio/hydrogen/hydrogen.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=hydrogen VERSION=${VERSION:-0.9.5} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -87,6 +87,8 @@ else EXTRACONF="$EXTRACONF jack=0" fi +patch --verbose -p1 < $CWD/sconstruct-install-images.patch + QTDIR=$QT4DIR \ scons \ prefix=/usr \ diff --git a/audio/hydrogen/sconstruct-install-images.patch b/audio/hydrogen/sconstruct-install-images.patch new file mode 100644 index 000000000000..4618d302c05d --- /dev/null +++ b/audio/hydrogen/sconstruct-install-images.patch @@ -0,0 +1,26 @@ +diff -Naur a/Sconstruct b/Sconstruct +--- a/Sconstruct 2011-03-15 12:22:35.000000000 +0000 ++++ b/Sconstruct 2011-10-28 03:17:21.000000000 +0100 +@@ -214,12 +214,7 @@ + for file in files: + if file.endswith(".png"): + +- if env['prefix'].endswith("/"): +- dname = dir[2:] +- else: +- dname = dir[1:] +- +- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/' + dname, source= dir + "/" + file)) ++ env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/img/gray' + file)) + + def get_hydrogen_gui( lib_hydrogen , opts ): + includes, cppflags, ldflags = get_platform_flags( opts ) +@@ -301,7 +296,7 @@ + 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) ++ os.path.walk("./data/img/gray",install_images,env) + + + env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/drumkits")) |