[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6ceef3d829741c805bfefc9ed0bc118a425e1fca)

Vlad Glagolev scm at sourcemage.org
Sat Mar 14 13:40:16 EDT 2009


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 audio-creation/ardour2/FINAL          |    3 +++
 audio-creation/ardour2/HISTORY        |    6 ++++--
 audio-creation/ardour2/POST_RESURRECT |    3 +++
 audio-creation/ardour2/PRE_BUILD      |    1 +
 audio-creation/ardour2/mime.patch     |   10 ++++++++++
 5 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 6ceef3d829741c805bfefc9ed0bc118a425e1fca
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ardour2: correctly fixed the previous bug

diff --git a/audio-creation/ardour2/FINAL b/audio-creation/ardour2/FINAL
new file mode 100755
index 0000000..d0dc233
--- /dev/null
+++ b/audio-creation/ardour2/FINAL
@@ -0,0 +1,3 @@
+if is_depends_enabled $SPELL shared-mime-info; then
+  "$INSTALL_ROOT/usr/bin/update-mime-database" "$INSTALL_ROOT/usr/share/mime"
+fi
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index b9f544d..e3a3107 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,8 +1,10 @@
 2009-03-14 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
-	* PRE_BUILD: apply patch
-	* POST_REMOVE: added, to regenerate mime db on spell's removal
+	* PRE_BUILD: apply patches
+	* POST_{REMOVE,RESURRECT}, FINAL: added, to regenerate mime db on
+	  spell's installation and removal
 	* libsndfile-ext.patch: added, to use fixed external libsndfile
+	* mime.patch: added, to prevent mime db regeneration in INSTALL stage
 
 2009-01-28 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: updated to 2.7.1
diff --git a/audio-creation/ardour2/POST_RESURRECT b/audio-creation/ardour2/POST_RESURRECT
new file mode 100755
index 0000000..d0dc233
--- /dev/null
+++ b/audio-creation/ardour2/POST_RESURRECT
@@ -0,0 +1,3 @@
+if is_depends_enabled $SPELL shared-mime-info; then
+  "$INSTALL_ROOT/usr/bin/update-mime-database" "$INSTALL_ROOT/usr/share/mime"
+fi
diff --git a/audio-creation/ardour2/PRE_BUILD b/audio-creation/ardour2/PRE_BUILD
index dd34a1d..c17abc7 100755
--- a/audio-creation/ardour2/PRE_BUILD
+++ b/audio-creation/ardour2/PRE_BUILD
@@ -1,6 +1,7 @@
 default_pre_build  &&
 cd $SOURCE_DIRECTORY &&
 
+patch -p0 < "$SPELL_DIRECTORY/mime.patch" &&
 patch -p0 < "$SPELL_DIRECTORY/libsndfile-ext.patch" &&
 
 sed -i "s:soundtouch-1.0:soundtouch-1.4:" SConstruct
diff --git a/audio-creation/ardour2/mime.patch b/audio-creation/ardour2/mime.patch
new file mode 100644
index 0000000..08f34ae
--- /dev/null
+++ b/audio-creation/ardour2/mime.patch
@@ -0,0 +1,10 @@
+--- gtk2_ardour/SConscript.orig	2008-11-26 10:34:33.000000000 +0300
++++ gtk2_ardour/SConscript	2009-03-14 19:46:41.017107756 +0300
+@@ -523,7 +523,6 @@
+ 	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png'))
+ 	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png'))
+ 	env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png'))
+-	env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'mime'), [], 'update-mime-database $TARGET'))
+ 	# Update the icon cache #
+ 	env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'touch --no-create $TARGET'))
+ 	env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'gtk-update-icon-cache $TARGET'))



More information about the SM-Commit mailing list