From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2E47C138334 for ; Wed, 28 Aug 2019 22:08:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B337E079E; Wed, 28 Aug 2019 22:08:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33219E079E for ; Wed, 28 Aug 2019 22:08:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C362734A58D for ; Wed, 28 Aug 2019 22:08:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67D4A4D3 for ; Wed, 28 Aug 2019 22:08:30 +0000 (UTC) From: "Stefan Strogin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" Message-ID: <1567029981.7e2eb99fb1941a72a2779b954c2c71feb87af107.steils@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/avidemux/avidemux-2.7.4-r1.ebuild media-video/avidemux/avidemux-2.7.4.ebuild X-VCS-Directories: media-video/avidemux/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: 7e2eb99fb1941a72a2779b954c2c71feb87af107 X-VCS-Branch: master Date: Wed, 28 Aug 2019 22:08:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3a59ccc-cecd-436f-83bc-f87a9995a0a8 X-Archives-Hash: ef8fc8c4d175aac79a753d2561fa630c commit: 7e2eb99fb1941a72a2779b954c2c71feb87af107 Author: Stefan Strogin gentoo org> AuthorDate: Wed Aug 28 21:51:20 2019 +0000 Commit: Stefan Strogin gentoo org> CommitDate: Wed Aug 28 22:06:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2eb99f media-video/avidemux: fix .desktop file Reported-by: Toralf Förster gentoo.org> Reported-by: Bernd Feige gmx.net> Closes: https://bugs.gentoo.org/692898 Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Stefan Strogin gentoo.org> ...demux-2.7.4.ebuild => avidemux-2.7.4-r1.ebuild} | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/media-video/avidemux/avidemux-2.7.4.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild similarity index 74% rename from media-video/avidemux/avidemux-2.7.4.ebuild rename to media-video/avidemux/avidemux-2.7.4-r1.ebuild index 8e047a6a29c..8bf214ecf0b 100644 --- a/media-video/avidemux/avidemux-2.7.4.ebuild +++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild @@ -49,23 +49,22 @@ src_prepare() { CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare done - # Fix icon name -> avidemux-2.7 - sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \ - die "Icon name fix failed." + if use qt5; then + # Fix icon name -> avidemux-2.7 + sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \ + die "Icon name fix failed." - # The desktop file is broken. It uses avidemux2 instead of avidemux3 - # so it will actually launch avidemux-2.7 if it is installed. - sed -i -e "/^Exec/ s:${PN}2:${PN}3:" appImage/${PN}.desktop || \ - die "Desktop file fix failed." - use qt5 && sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' appImage/${PN}.desktop || \ - die "Desktop file fix failed." + # The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5 + sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/${PN}.desktop || \ + die "Desktop file fix failed." - # QA warnings: missing trailing ';' and 'Application' is deprecated. - sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \ - die "Desktop file fix failed." + # QA warnings: missing trailing ';' and 'Application' is deprecated. + sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \ + die "Desktop file fix failed." - # Now rename the desktop file to not collide with 2.6. - mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed." + # Now rename the desktop file to not collide with 2.6. + mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed." + fi # Remove "Build Option" dialog because it doesn't reflect # what the GUI can or has been built with. (Bug #463628) @@ -122,8 +121,9 @@ src_install() { BUILD_DIR="${build}" cmake-utils_src_install done - cd "${S}" || die "Can't enter source folder" - newicon ${PN}_icon.png ${PN}-${SLOT}.png - - use qt5 && domenu ${PN}-${SLOT}.desktop + if use qt5; then + cd "${S}" || die "Can't enter source folder" + newicon ${PN}_icon.png ${PN}-${SLOT}.png + domenu ${PN}-${SLOT}.desktop + fi }