commit: 6cbce064e37ce085c89d80e61fa4bf8a4c406e90 Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> AuthorDate: Tue Feb 16 22:29:39 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Feb 22 14:47:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbce064
media-plugins/vdr-epgsearch: 2.4.0 snapshot 20200402 new upstream patch level available, and clang compile fix Closes: https://bugs.gentoo.org/740300 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> Closes: https://github.com/gentoo/gentoo/pull/19497 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-plugins/vdr-epgsearch/Manifest | 1 + .../vdr-epgsearch-2.4.0_p20200402_clang.patch | 33 ++++++++ .../vdr-epgsearch-2.4.0_p20200402.ebuild | 88 ++++++++++++++++++++++ 3 files changed, 122 insertions(+) diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest index 65444331481..952abcccedc 100644 --- a/media-plugins/vdr-epgsearch/Manifest +++ b/media-plugins/vdr-epgsearch/Manifest @@ -2,3 +2,4 @@ DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 BLAKE2B 9ffc067c2aff29e3d79b620 DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4 DIST vdr-epgsearch-2.4.0.tgz 479041 BLAKE2B 1d0b87bca573c90d13fb07d39c2945be1451ac405739ba788482488994832d3fc053dd076d474cc4e78e9a6b3078952fac7e799945120ff220d58b7f2fc2f181 SHA512 4fec779edeee0b326624b6904b5e6b5f0c8243208938389787433638355436fe82899864d33f512c3a9e0feadde1f770d4ca562f06212f83f8d753a9a34700e4 DIST vdr-epgsearch-2.4.0_p20191202.tar.gz 480101 BLAKE2B 800fcaab72dba1f4977dc3040ddfa856d3ad0051b04658c84891ce4836d30593be740cc6712a853093c0e02a9f3fe915cb6079b7dc2ba47509060e2fb5046474 SHA512 494562cd9b2c1cdc94a3a93ea5fcfd3f0e034156ab40d7ee332a2dfd5994cb6528744ae2391e3437860804604dca0b6fc1a387487b6fda12e19a8f79caac451c +DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065 diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch new file mode 100644 index 00000000000..98e642593a4 --- /dev/null +++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch @@ -0,0 +1,33 @@ +when compiling with CC="clang" CXX="clang++" it aborts with + + +createcats.c:71:42: error: ordered comparison between pointer and zero ('char *' and 'int') + if (fgets(buffer, sizeof(buffer), f) > 0) { + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ + +This patch fixes it. + +Signed-off-by: Martin Dummer <[email protected]> ( 2021-02-16 ) + +--- a/epgsearchext.c 2021-02-14 02:29:17.347224714 +0100 ++++ b/epgsearchext.c 2021-02-14 09:12:46.606509411 +0100 +@@ -1424,7 +1424,7 @@ + int line = 0; + char buffer[MAXPARSEBUFFER]; + result = true; +- while (fgets(buffer, sizeof(buffer), f) > 0) { ++ while (fgets(buffer, sizeof(buffer), f) != NULL) { + line++; + char *p = strchr(buffer, '#'); + if (p == buffer) *p = 0; +--- a/createcats.c 2021-02-14 09:18:05.146499999 +0100 ++++ b/createcats.c 2021-02-14 09:18:25.974499384 +0100 +@@ -68,7 +68,7 @@ + + char *cReadLine::Read(FILE *f) + { +- if (fgets(buffer, sizeof(buffer), f) > 0) { ++ if (fgets(buffer, sizeof(buffer), f) != NULL) { + int l = strlen(buffer) - 1; + if (l >= 0 && buffer[l] == '\n') + buffer[l] = 0; diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild new file mode 100644 index 00000000000..0a99011a719 --- /dev/null +++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild @@ -0,0 +1,88 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions" +HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"; +GIT_COMMIT_ID="d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3" +SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre" +REQUIRED_USE="?? ( pcre tre )" + +DEPEND=" + >=media-video/vdr-2.4 + pcre? ( dev-libs/libpcre ) + tre? ( dev-libs/tre )" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/groff + dev-lang/perl" + +PATCHES=( + "${FILESDIR}/${PN}-2.4.0_makefile.patch" + "${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch" + "${FILESDIR}/${P}_clang.patch" +) + +QA_FLAGS_IGNORED=" + usr/lib/vdr/plugins/libvdr-.* + usr/lib64/vdr/plugins/libvdr-.* + usr/bin/createcats" +S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}" + +src_prepare() { + # remove untranslated .po files + rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \ + || die "cannot remove untranslated .po files" + + use conflictcheckonly || sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile" + use epgsearchonly || sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile" + use quicksearch || sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile" + + vdr-plugin-2_src_prepare + + fix_vdr_libsi_include conflictcheck.c + + # install conf-file disabled + sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf" + + # Get rid of the broken symlink + rm README || die "cannot remove broken symlink" +} + +src_compile() { + BUILD_PARAMS="SENDMAIL=/usr/bin/sendmail AUTOCONFIG=0" + + if use pcre; then + BUILD_PARAMS+=" REGEXLIB=pcre" + einfo "Using pcre for regexp searches" + fi + + if use tre; then + BUILD_PARAMS+=" REGEXLIB=tre" + einfo "Using tre for unlimited fuzzy searches" + fi + + vdr-plugin-2_src_compile +} + +src_install() { + local DOCS=( conf/*.templ HISTORY* README.Translators ) + vdr-plugin-2_src_install + + diropts -m 755 -o vdr -g vdr + insopts -m 644 -o vdr -g vdr + keepdir /etc/vdr/plugins/epgsearch + insinto /etc/vdr/plugins/epgsearch + doins conf/* + + doman man/en/* + doman -i18n=de man/de/* +}
