public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Stefan Strogin" <steils@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
Date: Wed, 28 Aug 2019 22:08:30 +0000 (UTC)	[thread overview]
Message-ID: <1567029981.7e2eb99fb1941a72a2779b954c2c71feb87af107.steils@gentoo> (raw)

commit:     7e2eb99fb1941a72a2779b954c2c71feb87af107
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 21:51:20 2019 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> 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 <toralf <AT> gentoo.org>
Reported-by: Bernd Feige <bernd.feige <AT> gmx.net>
Closes: https://bugs.gentoo.org/692898
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> 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
 }


             reply	other threads:[~2019-08-28 22:08 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-28 22:08 Stefan Strogin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-26 12:50 [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/ Sam James
2023-01-28 11:49 Andreas Sturmlechner
2023-01-09  7:27 Sam James
2023-01-07  7:20 Sam James
2023-01-07  7:17 Sam James
2022-06-19  9:06 Jakov Smolić
2022-03-09 12:37 Sam James
2021-11-07  0:01 Sam James
2021-01-01  1:06 Michał Górny
2020-10-31 11:11 David Seifert
2020-08-13  0:53 Stefan Strogin
2020-08-11 23:10 Thomas Deutschmann
2019-08-28 22:52 Stefan Strogin
2019-08-25 20:52 Stefan Strogin
2019-08-14  4:35 Stefan Strogin
2019-07-06 10:25 Andreas Sturmlechner
2019-07-06 10:25 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-05 15:38 Ulrich Müller
2017-12-21 17:39 Andreas Sturmlechner
2017-12-21 15:37 Andreas Sturmlechner
2017-12-09 13:52 Andreas Sturmlechner
2017-12-08 18:32 Andreas Sturmlechner
2017-12-08 18:32 Andreas Sturmlechner
2017-10-29  9:34 Andreas Sturmlechner
2017-10-04  8:02 Alexis Ballier
2017-10-04  8:02 Alexis Ballier
2017-10-04  8:02 Alexis Ballier
2017-10-04  8:02 Alexis Ballier
2017-10-04  8:02 Alexis Ballier
2017-06-30  5:28 Alexis Ballier
2016-05-07 13:59 Sergei Trofimovich
2016-05-05 19:48 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1567029981.7e2eb99fb1941a72a2779b954c2c71feb87af107.steils@gentoo \
    --to=steils@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox