diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2018-08-29 12:17:03 +0200 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2018-08-29 12:17:03 +0200 |
| commit | c20e014a0a9927935e6e0c5e2533b35504148f59 (patch) | |
| tree | 22fa70b3af34a5bfed9f1eaccb638c48e2654314 /media-video/vdr | |
| parent | Revert "leechcraft.eclass: add support for EAPI 7" (diff) | |
| download | gentoo-c20e014a0a9927935e6e0c5e2533b35504148f59.tar.gz gentoo-c20e014a0a9927935e6e0c5e2533b35504148f59.tar.bz2 gentoo-c20e014a0a9927935e6e0c5e2533b35504148f59.zip | |
media-video/vdr: gcc7 compile issius fixed in extpng
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'media-video/vdr')
| -rw-r--r-- | media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch | 16 | ||||
| -rw-r--r-- | media-video/vdr/vdr-2.2.0-r3.ebuild | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch new file mode 100644 index 000000000000..e00453c2a728 --- /dev/null +++ b/media-video/vdr/files/vdr-2.2.0_gcc7extpng.patch @@ -0,0 +1,16 @@ +fix compile issius gcc7: ISO C++ forbids comparison between pointer and integer +https://www.linuxtv.org/pipermail/vdr/2017-March/029230.html + +Signed-of by: Joerg Bornkessel <hd_brummy@gentoo.org> (29 Aug 2018) +diff -Naur vdr-2.2.0.orig/osdbase.c vdr-2.2.0/osdbase.c +--- vdr-2.2.0.orig/osdbase.c 2018-08-29 11:59:49.522326559 +0200 ++++ vdr-2.2.0/osdbase.c 2018-08-29 11:59:13.861326559 +0200 +@@ -525,7 +525,7 @@ + #ifdef USE_MENUSELECTION + i = 0; + item_nr = 0; +- if (s && (s = skipspace(s)) != '\0' && '0' <= s[i] && s[i] <= '9') { ++ if (s && (s = skipspace(s)) != NULL && '0' <= s[i] && s[i] <= '9') { + do { + item_nr = item_nr * 10 + (s[i] - '0'); + } diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild index dbb8e986c4a5..1da9aad71f86 100644 --- a/media-video/vdr/vdr-2.2.0-r3.ebuild +++ b/media-video/vdr/vdr-2.2.0-r3.ebuild @@ -219,6 +219,7 @@ src_prepare() { #gcc-7.2, this will fix only the core vdr, not the extpatch eapply "${FILESDIR}/${P}_unsignedtosigned.patch" eapply "${FILESDIR}/${P}_glibc-2.24.patch" + eapply "${FILESDIR}/${P}_gcc7extpng.patch" # fix some makefile issues sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \ |