From: "Bernard Cafarelli" <voyageur@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmcdplay/files/, x11-plugins/wmcdplay/
Date: Sat, 9 Jul 2022 15:43:39 +0000 (UTC) [thread overview]
Message-ID: <1657381253.a52d11eee7e36e00c77191fd7e70ffdac436e107.voyageur@gentoo> (raw)
commit: a52d11eee7e36e00c77191fd7e70ffdac436e107
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 12:28:55 2022 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 15:40:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52d11ee
x11-plugins/wmcdplay: fix C++11 string literal
Closes: https://bugs.gentoo.org/732416
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../wmcdplay/files/wmcdplay-1.1-cpp11.patch | 30 ++++++++++++++++++++++
x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild | 3 ++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
new file mode 100644
index 000000000000..7fdd1021dab3
--- /dev/null
+++ b/x11-plugins/wmcdplay/files/wmcdplay-1.1-cpp11.patch
@@ -0,0 +1,30 @@
+From bd69f80f597ca589683d6f606e979b8f77e9e0a4 Mon Sep 17 00:00:00 2001
+From: Doug Torrance <dtorrance@piedmont.edu>
+Date: Wed, 29 Apr 2020 11:01:30 -0400
+Subject: [PATCH] wmcdplay: Add spaces between macro and string literals for
+ C++11
+
+We may get compile errors (e.g., [1]) otherwise.
+
+[1] https://clang.debian.net/logs/2020-02-24-9.0.1/
+ wmcdplay_1.1-2_unstable_clang9.0.1.log
+---
+ wmcdplay.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wmcdplay.cc b/wmcdplay.cc
+index 46ae03a..675b5dc 100644
+--- a/wmcdplay.cc
++++ b/wmcdplay.cc
+@@ -353,7 +353,7 @@ unsigned long mixColor(char *colorname1, int prop1, char *colorname2, int prop2)
+ void scanArgs(int argc, char **argv){
+ for(int i=1;i<argc;i++){
+ if(strcmp(argv[i], "-h")==0 || strcmp(argv[i], "-help")==0 || strcmp(argv[i], "--help")==0){
+- fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease "VERSION"\n");
++ fprintf(stderr, "wmcdplay - A cd player designed for WindowMaker\nRelease " VERSION "\n");
+ fprintf(stderr, "Copyright (C) 1998 Sam Hawker <shawkie@geocities.com>\n");
+ fprintf(stderr, "This software comes with ABSOLUTELY NO WARRANTY\n");
+ fprintf(stderr, "This software is free software, and you are welcome to redistribute it\n");
+--
+2.11.4.GIT
+
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
index 4751907aadbf..47fa6c9faf43 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/dockapps"
+PATCHES=( ${FILESDIR}/${P}-cpp11.patch )
DOCS=( ARTWORK README )
src_prepare() {
reply other threads:[~2022-07-09 15:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1657381253.a52d11eee7e36e00c77191fd7e70ffdac436e107.voyageur@gentoo \
--to=voyageur@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