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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A06C5158086 for ; Tue, 7 Dec 2021 17:07:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 006BD2BC018; Tue, 7 Dec 2021 17:07:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1AB12BC018 for ; Tue, 7 Dec 2021 17:07:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED3813431FB for ; Tue, 7 Dec 2021 17:07:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63D7B1C6 for ; Tue, 7 Dec 2021 17:07:11 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1638896812.84639be4799b6b9703051c21dd9ff58ed3bb99e0.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/droidcam/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/droidcam/droidcam-1.8.1-r1.ebuild X-VCS-Directories: media-video/droidcam/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 84639be4799b6b9703051c21dd9ff58ed3bb99e0 X-VCS-Branch: master Date: Tue, 7 Dec 2021 17:07:11 +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: 1bb21ec6-b47d-4d11-bab0-df6a6783f6fe X-Archives-Hash: 4285bf48873311df96e5e61de213e1e2 commit: 84639be4799b6b9703051c21dd9ff58ed3bb99e0 Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Dec 7 17:06:52 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Dec 7 17:06:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84639be4 media-video/droidcam: patch before sed Closes: https://bugs.gentoo.org/828514 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> media-video/droidcam/droidcam-1.8.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/droidcam/droidcam-1.8.1-r1.ebuild b/media-video/droidcam/droidcam-1.8.1-r1.ebuild index d81482560789..ffafcc099bd0 100644 --- a/media-video/droidcam/droidcam-1.8.1-r1.ebuild +++ b/media-video/droidcam/droidcam-1.8.1-r1.ebuild @@ -51,15 +51,15 @@ PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch" src_prepare() { if ! use gtk; then - sed -i -e '/cflags gtk+/d' Makefile || die default + sed -i -e '/cflags gtk+/d' Makefile || die else + xdg_src_prepare # remove path and extension from Icon and Exec entry sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \ -e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \ droidcam.desktop || die sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die - xdg_src_prepare fi }