1 |
commit: 5c0a1801d1d70319c50aa4ce288c12ffa688e536 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Thu Sep 23 17:41:35 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 23 19:00:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c0a1801 |
7 |
|
8 |
media-plugins/vdr-epgsearch: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/22374 |
11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
.../files/vdr-epgsearch-1.x.makefile.patch | 25 ---------------- |
16 |
.../vdr-epgsearch-2.4.0_p20200402_clang.patch | 33 ---------------------- |
17 |
2 files changed, 58 deletions(-) |
18 |
|
19 |
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch |
20 |
deleted file mode 100644 |
21 |
index 25e27e958a4..00000000000 |
22 |
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch |
23 |
+++ /dev/null |
24 |
@@ -1,25 +0,0 @@ |
25 |
-diff -Naur vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile |
26 |
---- vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile 2015-02-21 21:01:08.926052710 +0100 |
27 |
-+++ vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile 2015-02-21 21:03:42.768052710 +0100 |
28 |
-@@ -255,9 +255,9 @@ |
29 |
- docs: |
30 |
- ./docsrc2man.sh |
31 |
- ./docsrc2html.sh |
32 |
-- ln -sf ./doc/en/epgsearch.4.txt MANUAL |
33 |
-- ln -sf ./doc/en/epgsearch.1.txt README |
34 |
-- ln -sf ./doc/de/epgsearch.1.txt README.DE |
35 |
-+# ln -sf ./doc/en/epgsearch.4.txt MANUAL |
36 |
-+# ln -sf ./doc/en/epgsearch.1.txt README |
37 |
-+# ln -sf ./doc/de/epgsearch.1.txt README.DE |
38 |
- |
39 |
- install-$(PLUGIN): libvdr-$(PLUGIN).so |
40 |
- install -D libvdr-$(PLUGIN).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) |
41 |
-@@ -272,7 +272,7 @@ |
42 |
- install -D libvdr-$(PLUGIN4).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN4).so.$(APIVERSION) |
43 |
- |
44 |
- install-conf: |
45 |
-- mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN)/conf.d |
46 |
-+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN) |
47 |
- cp -n conf/* $(DESTDIR)$(CONFDIR)/plugins/$(PLUGIN) |
48 |
- |
49 |
- install-doc: |
50 |
|
51 |
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 |
52 |
deleted file mode 100644 |
53 |
index 98e642593a4..00000000000 |
54 |
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch |
55 |
+++ /dev/null |
56 |
@@ -1,33 +0,0 @@ |
57 |
-when compiling with CC="clang" CXX="clang++" it aborts with |
58 |
- |
59 |
- |
60 |
-createcats.c:71:42: error: ordered comparison between pointer and zero ('char *' and 'int') |
61 |
- if (fgets(buffer, sizeof(buffer), f) > 0) { |
62 |
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ |
63 |
- |
64 |
-This patch fixes it. |
65 |
- |
66 |
-Signed-off-by: Martin Dummer <martin.dummer@×××.net> ( 2021-02-16 ) |
67 |
- |
68 |
---- a/epgsearchext.c 2021-02-14 02:29:17.347224714 +0100 |
69 |
-+++ b/epgsearchext.c 2021-02-14 09:12:46.606509411 +0100 |
70 |
-@@ -1424,7 +1424,7 @@ |
71 |
- int line = 0; |
72 |
- char buffer[MAXPARSEBUFFER]; |
73 |
- result = true; |
74 |
-- while (fgets(buffer, sizeof(buffer), f) > 0) { |
75 |
-+ while (fgets(buffer, sizeof(buffer), f) != NULL) { |
76 |
- line++; |
77 |
- char *p = strchr(buffer, '#'); |
78 |
- if (p == buffer) *p = 0; |
79 |
---- a/createcats.c 2021-02-14 09:18:05.146499999 +0100 |
80 |
-+++ b/createcats.c 2021-02-14 09:18:25.974499384 +0100 |
81 |
-@@ -68,7 +68,7 @@ |
82 |
- |
83 |
- char *cReadLine::Read(FILE *f) |
84 |
- { |
85 |
-- if (fgets(buffer, sizeof(buffer), f) > 0) { |
86 |
-+ if (fgets(buffer, sizeof(buffer), f) != NULL) { |
87 |
- int l = strlen(buffer) - 1; |
88 |
- if (l >= 0 && buffer[l] == '\n') |
89 |
- buffer[l] = 0; |