commit:     f13cc53e08c5f5bbc7b9955309db55b902a0810f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar 22 08:47:22 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 14:01:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13cc53e

media-plugins/vdr-epgsearch: remove unused patches

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20055
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/vdr-epgsearch-2.2.0_clang.patch          | 35 -------------------
 .../vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch   | 11 ------
 .../files/vdr-epgsearch-2.2.0_makefile.patch       | 39 ----------------------
 3 files changed, 85 deletions(-)

diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_clang.patch 
b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_clang.patch
deleted file mode 100644
index 9c414509ea8..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_clang.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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 )
-
-diff -Naur vdr-plugin-epgsearch-2.2.0.orig/createcats.c 
vdr-plugin-epgsearch-2.2.0/createcats.c
---- vdr-plugin-epgsearch-2.2.0.orig/createcats.c       2017-05-01 
21:40:19.000000000 +0200
-+++ vdr-plugin-epgsearch-2.2.0/createcats.c    2021-02-27 11:59:41.175196651 
+0100
-@@ -65,7 +65,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 -Naur vdr-plugin-epgsearch-2.2.0.orig/epgsearchext.c 
vdr-plugin-epgsearch-2.2.0/epgsearchext.c
---- vdr-plugin-epgsearch-2.2.0.orig/epgsearchext.c     2017-05-01 
21:40:19.000000000 +0200
-+++ vdr-plugin-epgsearch-2.2.0/epgsearchext.c  2021-02-27 12:01:51.502220684 
+0100
-@@ -1497,7 +1497,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;

diff --git 
a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch
 
b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch
deleted file mode 100644
index 508ad7f5d9a..00000000000
--- 
a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_docsrc2man-no-gzip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/docsrc2man.sh    2021-02-25 22:14:42.139999981 +0100
-+++ b/docsrc2man.sh    2021-02-25 22:16:14.079999983 +0100
-@@ -37,8 +37,6 @@
-       done
- 
-       rm "$DOCSRC"/$LANGUAGE/*~ 2>/dev/null
--      gzip -f man/$LANGUAGE/*.[0-9]
--
- done
- 
- echo

diff --git 
a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.patch 
b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.patch
deleted file mode 100644
index 2871b46ccbe..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.2.0_makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Signed-off-by: Martin Dummer <[email protected]> ( 2021 Feb 21 )
-
---- a/Makefile 2021-02-26 08:43:13.903753021 +0100
-+++ b/Makefile 2021-02-26 08:48:50.793719332 +0100
-@@ -255,9 +255,6 @@
- docs:
-       ./docsrc2man.sh
-       ./docsrc2html.sh
--      ln -sf ./doc/en/epgsearch.4.txt MANUAL
--      ln -sf ./doc/en/epgsearch.1.txt README
--      ln -sf ./doc/de/epgsearch.1.txt README.DE
- 
- install-$(PLUGIN): libvdr-$(PLUGIN).so
-       install -D libvdr-$(PLUGIN).so 
$(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION)
-@@ -272,7 +269,7 @@
-       install -D libvdr-$(PLUGIN4).so 
$(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION)
- 
- install-conf:
--      mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)/conf.d
-+      mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
-       cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)
- 
- install-doc:
-@@ -291,7 +288,7 @@
-       mkdir -p $(DESTDIR)$(BINDIR)
-       cp createcats $(DESTDIR)$(BINDIR)
- 
--install: install-lib install-i18n install-conf install-doc install-bin
-+install: install-lib install-i18n install-conf install-bin
- 
- install-lib: install-$(PLUGIN) install-$(PLUGIN2) install-$(PLUGIN3) 
install-$(PLUGIN4)
- 
-@@ -322,3 +319,6 @@
-       @-rm -f $(OBJS) $(OBJS2) $(OBJS3) $(OBJS4) $(DEPFILE) *.so *.tgz core* 
createcats createcats.o pod2*.tmp
-       @-find . \( -name "*~" -o -name "#*#" \) -print0 | xargs -0r rm -f
-       @-rm -rf doc html man
-+
-+# make detection in vdr-plugin-2.eclass for new Makefile handling happy
-+# SOFILE

Reply via email to