summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-08-12 02:16:14 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-08-12 02:16:14 +0000
commitc1eee39234e38c1c6212cd3827d7a24db7a0a635 (patch)
tree351f7e6f91117e80176d5492dd1eb3003ee7946f /media-video
parentAdd missing dep on qt-gui for the contacts module, thanks to Patrick Lauer in... (diff)
downloadgentoo-2-c1eee39234e38c1c6212cd3827d7a24db7a0a635.tar.gz
gentoo-2-c1eee39234e38c1c6212cd3827d7a24db7a0a635.tar.bz2
gentoo-2-c1eee39234e38c1c6212cd3827d7a24db7a0a635.zip
Fix desktop file, thanks to redneb in bug 430500.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/avidemux/ChangeLog8
-rw-r--r--media-video/avidemux/avidemux-2.5.6-r2.ebuild (renamed from media-video/avidemux/avidemux-2.5.6-r1.ebuild)8
2 files changed, 11 insertions, 5 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 5cd9af9a44ac..caebd2609b9e 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/avidemux
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.197 2012/05/05 08:58:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.198 2012/08/12 02:16:13 pesa Exp $
+
+*avidemux-2.5.6-r2 (12 Aug 2012)
+
+ 12 Aug 2012; Davide Pesavento <pesa@gentoo.org> +avidemux-2.5.6-r2.ebuild,
+ -avidemux-2.5.6-r1.ebuild:
+ Fix desktop file, thanks to redneb in bug 430500.
05 May 2012; Jeff Horelick <jdhore@gentoo.org> avidemux-2.5.6-r1.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-video/avidemux/avidemux-2.5.6-r1.ebuild b/media-video/avidemux/avidemux-2.5.6-r2.ebuild
index cccb8ad7e759..a1dceda81ff3 100644
--- a/media-video/avidemux/avidemux-2.5.6-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.5.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.6-r1.ebuild,v 1.6 2012/05/05 08:58:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.6-r2.ebuild,v 1.1 2012/08/12 02:16:13 pesa Exp $
EAPI=4
@@ -102,9 +102,9 @@ src_prepare() {
-e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
"${S}/cmake/Ts.cmake" || die "sed failed"
- # fix exec command wrt bug #316599 and #291453
- sed -i -e '/^Exec/ s:\[\$e\]::' avidemux2-gtk.desktop || die
- sed -i -e '/^Exec/ s:\(avidemux2_\)gtk:\1qt4:' avidemux2.desktop || die
+ # fix major issues in desktop files wrt bugs #291453, #316599, #430500
+ sed -i -re '/^(Exec|Path)/ s:\[\$e\]::' avidemux2-gtk.desktop || die
+ sed -i -re '/^Exec/ s:(avidemux2_)gtk:\1qt4:' avidemux2.desktop || die
# don't install Windows-only files
sed -i -e '/addons\/avsfilter/d' CMakeLists.txt || die