From 33001510803ac8d7da046da842d9b6aaeac64a09 Mon Sep 17 00:00:00 2001
From: Joerg Bornkessel <hd_brummy@gentoo.org>
Date: Sun, 21 Mar 2021 18:36:08 +0100
Subject: media-plugins/vdr-extrecmenu: fixed compile on llvm/clang

Closes: https://bugs.gentoo.org/740282
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
---
 media-plugins/vdr-extrecmenu/Manifest              |  2 +-
 .../files/vdr-extrecmenu-1.2.4_c++11.patch         | 25 ++++++++++++
 .../vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild  | 42 ---------------------
 .../vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild  | 44 ++++++++++++++++++++++
 4 files changed, 70 insertions(+), 43 deletions(-)
 create mode 100644 media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch
 delete mode 100644 media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild
 create mode 100644 media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild

diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index 711ce822c1c9..970de0115edd 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -1,3 +1,3 @@
 DIST dvdarchive-2.3-beta.sh.gz 3412 BLAKE2B aca97b4c7abcc907f1242482f0f0550cb38fcd357acb9ec6ebc4c978a8f50e9c63fe6fcc2932e426c5d7301f0eaccc5e2f8726e72abafe504e5503528ce782e9 SHA512 18262b1e6749961bae37894649f518f88ad2ca100b83965eb48ce7344bbf4f7bfac9d36c9b9d91744281c00c4b89fa49209cc98ca5d848b46225facf4ef7a48f
-DIST vdr-extrecmenu-1.2.4-r1.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4
+DIST vdr-extrecmenu-1.2.4-r2.tar.gz 729966 BLAKE2B 2ec2790cc57db3a9f1d12cdc43eea3e70076ef14d9f0392eb9ab4cda4bf30999a163526416276e661430bf9b684f7d313f5f7193997118e061bf5352c5bbe39a SHA512 d3103e5bc65f968bc4f512195eaa25b04fb5261281d79c7c486fe2532656b8ee7ddc00648d46e92c468b33f95e77c6ce3b2ca67a2debcc0c7021a4b525ac0aa4
 DIST vdr-extrecmenu-1.2.4.tgz 731823 BLAKE2B a226aadb843480b62798e2c4226af8bbb5bba41946f14222616ec43eec94a1b45150661ceb9ecb85e714673f408ab01849b6d55b6572da8028e6b47f9991916d SHA512 a750c6ad244e2afd3f04cafe634ec3c58baf4a38a809121a7c9045c327b4f10cb28b7aab4b7bd0e86d0b7febf85cc7fbc258bdd83386a60ddfe748347192f592
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch
new file mode 100644
index 000000000000..91df23911a42
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2.4_c++11.patch
@@ -0,0 +1,25 @@
+C++11 requires a space between literal and identifier
+https://bugs.gentoo.org/740282
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
+diff -Naur vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.orig/mymenueditrecording.c vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b/mymenueditrecording.c
+--- vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b.orig/mymenueditrecording.c	2021-03-21 17:25:40.260078140 +0100
++++ vdr-plugin-extrecmenu-77d10faec3c7b0abe25ba3b161dc3b4e2cad042b/mymenueditrecording.c	2021-03-21 17:26:15.560078140 +0100
+@@ -626,7 +626,7 @@
+ { //This has been taken from remotetimers-0.1.5, written by Frank Schmirler <vdrdev@schmirler.de>
+ 
+ #if VDRVERSNUM > 10713
+-  cString InfoFileName=cString::sprintf(Recording->IsPesRecording()?"%s/"INFOFILE_PES:"%s/"INFOFILE_TS,Recording->FileName());
++  cString InfoFileName=cString::sprintf(Recording->IsPesRecording()?"%s/" INFOFILE_PES:"%s/" INFOFILE_TS,Recording->FileName());
+ 	FILE *f = fopen(InfoFileName, "a");
+ 	if (f)
+ 	{
+@@ -641,7 +641,7 @@
+ 	else
+ 		esyslog("[extrecmenu] writing to '%s' failed: %m", *InfoFileName);
+ #else
+-  cString InfoFileName=cString::sprintf("%s/"INFOFILE_PES,Recording->FileName());
++  cString InfoFileName=cString::sprintf("%s/" INFOFILE_PES,Recording->FileName());
+   // check for write access as cRecording::WriteInfo() always returns true
+   if(access(InfoFileName,W_OK)==0)
+   {
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild
deleted file mode 100644
index 5139180dea0a..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-GIT_VERSION="77d10faec3c7b0abe25ba3b161dc3b4e2cad042b"
-
-DVDARCHIVE="dvdarchive-2.3-beta.sh"
-
-DESCRIPTION="VDR Plugin: Extended recordings menu"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu"
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-${GIT_VERSION}.tar.gz -> ${PF}.tar.gz
-	mirror://gentoo/${DVDARCHIVE}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND="media-video/vdr"
-
-S="${WORKDIR}/vdr-plugin-extrecmenu-${GIT_VERSION}"
-
-src_prepare() {
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die
-
-	cd "${WORKDIR}" || die
-	eapply -p0 "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
-
-	vdr-plugin-2_src_prepare
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	cd "${WORKDIR}"
-	newbin ${DVDARCHIVE} dvdarchive.sh
-
-	insinto /etc/vdr
-	doins "${FILESDIR}"/dvdarchive.conf
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild
new file mode 100644
index 000000000000..9292fd19242c
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+GIT_VERSION="77d10faec3c7b0abe25ba3b161dc3b4e2cad042b"
+
+DVDARCHIVE="dvdarchive-2.3-beta.sh"
+
+DESCRIPTION="VDR Plugin: Extended recordings menu"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-extrecmenu"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-extrecmenu.git/snapshot/vdr-plugin-extrecmenu-${GIT_VERSION}.tar.gz -> ${PF}.tar.gz
+	mirror://gentoo/${DVDARCHIVE}.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="media-video/vdr"
+
+S="${WORKDIR}/vdr-plugin-extrecmenu-${GIT_VERSION}"
+
+src_prepare() {
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po || die
+
+	eapply "${FILESDIR}/${P}_c++11.patch"
+
+	cd "${WORKDIR}" || die
+	eapply -p0 "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
+
+	vdr-plugin-2_src_prepare
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	cd "${WORKDIR}"
+	newbin ${DVDARCHIVE} dvdarchive.sh
+
+	insinto /etc/vdr
+	doins "${FILESDIR}"/dvdarchive.conf
+}
-- 
cgit v1.2.3-18-g5258