commit: 3fe38f8ba494491c1f70565dcc8319748f648af6 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Fri Feb 28 13:35:42 2020 +0000 Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Fri Feb 28 13:35:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe38f8b
media-plugins/vdr-loadepg: version bump cleanup old this will Closes: https://bugs.gentoo.org/710962 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org> media-plugins/vdr-loadepg/Manifest | 2 +- ...intf.patch => vdr-loadepg-0.2.7_asprintf.patch} | 50 +++++++++++----------- ...adepg-0.2.5.ebuild => vdr-loadepg-0.2.7.ebuild} | 9 ++-- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/media-plugins/vdr-loadepg/Manifest b/media-plugins/vdr-loadepg/Manifest index a2e18cbd32f..c61c0625e53 100644 --- a/media-plugins/vdr-loadepg/Manifest +++ b/media-plugins/vdr-loadepg/Manifest @@ -1 +1 @@ -DIST vdr-loadepg-0.2.5.tgz 54958 BLAKE2B 42fac197ec3708659665d503c91b1db53268b63f3a11eaab17632a445300cf9566d6bfb0a72ab728ae74df09b1af3f5b27f2298287db8702fa035614cd0d6750 SHA512 193fdd3298a547c4a503f0a64553e28611f3920743c3b224fd5bb3f57b88c4345859e3127e0f7e7aa968b32f1a7f1d5ceed6ce29414cbfe700c1f14efe889adb +DIST vdr-loadepg-0.2.7.tgz 55847 BLAKE2B 6bd61ef1af71928b57f4ac964b01df7f66de6dcf8dcb804e62725a204decd7b1440e602ceda5fc01806c42383fe51829419dae4a449c74ae5f9335086e68cb5b SHA512 4bd10c6289e6013afe020476844a2b3f446f6c37e8273316987e1591e0da0e79dbfe00a7667ca8a905b868045fcb32931d5b2b8f8cd14097e6f3246c05b5bc66 diff --git a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch similarity index 54% rename from media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch rename to media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch index c650ff61d7c..92a8b76f8e0 100644 --- a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch +++ b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch @@ -3,58 +3,58 @@ https://bugs.gentoo.org/663348 compile fix for invalid conversion from char to const char* thx to Michael Brakemeier for point this out -Signed-of-by: Joerg Bornkessel <hd_bru...@astrali.de> (17 Nov 2019) -diff -Naur loadepg-0.2.5.orig/loadepg.c loadepg-0.2.5/loadepg.c ---- loadepg-0.2.5.orig/loadepg.c 2019-11-17 14:49:27.637235533 +0100 -+++ loadepg-0.2.5/loadepg.c 2019-11-17 14:50:23.690235533 +0100 -@@ -159,7 +159,7 @@ +Signed-off-by: Joerg Bornkessel <hd_bru...@gentoo.org> (29 Feb 2020) +diff -Naur vdr-loadepg-0.2.7.orig/loadepg.c vdr-loadepg-0.2.7/loadepg.c +--- vdr-loadepg-0.2.7.orig/loadepg.c 2020-02-28 14:08:35.713790460 +0100 ++++ vdr-loadepg-0.2.7/loadepg.c 2020-02-28 14:11:05.457790460 +0100 +@@ -162,7 +162,7 @@ (lProviders + nProviders)->SourceId = cSource::FromString(string2); asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2); asprintf(&(lProviders + nProviders)->Parm2, "%s", string3); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; IsSkyThemesNull = true; } -@@ -169,8 +169,8 @@ +@@ -172,8 +172,8 @@ (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1; (lProviders + nProviders)->SourceId = cSource::FromString(string2); asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2); -- asprintf(&(lProviders + nProviders)->Parm2, '\0'); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm2, ""); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0'); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm2, (char *) ""); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; } else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5) -@@ -179,8 +179,8 @@ +@@ -182,8 +182,8 @@ (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2; (lProviders + nProviders)->SourceId = cSource::FromString(string2); asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2); -- asprintf(&(lProviders + nProviders)->Parm2, '\0'); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm2, ""); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0'); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm2, (char *) ""); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; } else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2) -@@ -189,8 +189,8 @@ +@@ -192,8 +192,8 @@ (lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE; (lProviders + nProviders)->SourceId = 0; asprintf(&(lProviders + nProviders)->Parm1, "%s", string2); -- asprintf(&(lProviders + nProviders)->Parm2, '\0'); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm2, ""); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0'); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm2, (char *) ""); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; } else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3) -@@ -200,7 +200,7 @@ +@@ -203,7 +203,7 @@ (lProviders + nProviders)->SourceId = 0; asprintf(&(lProviders + nProviders)->Parm1, "%s", string2); asprintf(&(lProviders + nProviders)->Parm2, "%s", string3); -- asprintf(&(lProviders + nProviders)->Parm3, '\0'); -+ asprintf(&(lProviders + nProviders)->Parm3, ""); +- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0'); ++ asprintf(&(lProviders + nProviders)->Parm3, (char *) ""); nProviders ++; } } diff --git a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild similarity index 76% rename from media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild rename to media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild index 813116671ac..ebf8317197a 100644 --- a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild +++ b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,19 +12,22 @@ SRC_URI="http://lukkinosat.altervista.org/${P}.tgz"; KEYWORDS="~amd64 ~x86" SLOT="0" LICENSE="GPL-2" -IUSE="" DEPEND="media-video/vdr" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P}" src_prepare() { # remove untranslated po files - rm "${S}/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,fr_FR,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po" + rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,fr_FR,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po vdr-plugin-2_src_prepare fix_vdr_libsi_include loadepg.h eapply "${FILESDIR}/${P}_asprintf.patch" + } src_install() {
