public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jörg Bornkessel" <hd_brummy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-graphlcd/
Date: Wed, 24 Mar 2021 20:23:55 +0000 (UTC)	[thread overview]
Message-ID: <1616617393.00404d295fd74b2509002563d851c5e15d11213f.hd_brummy@gentoo> (raw)

commit:     00404d295fd74b2509002563d851c5e15d11213f
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 24 20:23:13 2021 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Mar 24 20:23:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00404d29

media-plugins/vdr-graphlcd: llvm/clang compile fixed

Closes: https://bugs.gentoo.org/740296
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 ...aphlcd-1.0.1-r1.ebuild => vdr-graphlcd-1.0.1-r2.ebuild} | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1-r1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1-r2.ebuild
similarity index 87%
rename from media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1-r1.ebuild
rename to media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1-r2.ebuild
index bdaa50b4841..d17c604261c 100644
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1-r1.ebuild
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,13 +45,17 @@ pkg_setup() {
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
-	sed -i "s:/usr/local:/usr:" Makefile || die
-	sed -i "s:i18n.c:i18n.h:g" Makefile || die
-	sed -i "s:include \$(VDRDIR)/Make.global:-include \$(VDRDIR)/Make.global:" Makefile || die
+	sed -e "s:/usr/local:/usr:" \
+		-e "s:i18n.c:i18n.h:g" \
+		-e "s:include \$(VDRDIR)/Make.global:-include \$(VDRDIR)/Make.global:" \
+		-i Makefile || die
 
-	sed -i "s:SKIP_INSTALL_DOC ?= 0:SKIP_INSTALL_DOC ?= 1:" Makefile || die
+	sed -e "s:SKIP_INSTALL_DOC ?= 0:SKIP_INSTALL_DOC ?= 1:" -i Makefile || die
 
 	eapply "${FILESDIR}/${P}_no-font.patch"
+
+	# bug 740296
+	sed -e "s:\"PLUGIN_GRAPHLCDCONF:\" PLUGIN_GRAPHLCDCONF:" -i plugin.c || die
 }
 
 src_install() {


             reply	other threads:[~2021-03-24 20:24 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-24 20:23 Jörg Bornkessel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-21 15:12 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-graphlcd/ Conrad Kostecki
2024-07-21 15:12 Conrad Kostecki
2021-02-12 20:47 Jörg Bornkessel
2020-02-14 21:51 Jörg Bornkessel
2020-01-31  8:19 Michał Górny
2020-01-31  8:19 Michał Górny
2019-03-10 22:38 Patrice Clement
2018-03-26 19:18 Aaron Bauman

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=1616617393.00404d295fd74b2509002563d851c5e15d11213f.hd_brummy@gentoo \
    --to=hd_brummy@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