* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/
@ 2021-03-01 11:47 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-03-01 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 2d46e7f691fdf43f5c986b2a3c639c62d8e45674
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 28 12:16:26 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 11:47:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d46e7f6
media-plugins/vdr-epgsearch: remove unused patch
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19709
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/vdr-epgsearch-2.4.0_fix-docs.patch | 124 ---------------------
1 file changed, 124 deletions(-)
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
deleted file mode 100644
index ae6c6dc517e..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_fix-docs.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-https://projects.vdr-developer.org/issues/2581
-Manpages with encoding will not created correct
-
-Reviewed-by: Martin Dummer <martin.dummer@gmx.net> (2020 Jan 03)
---- a/doc-src/de/epgsearch.1.txt
-+++ b/doc-src/de/epgsearch.1.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearch> - Suchtimer und Ersatz für VDR's Standard-Programm-Menü
---- a/doc-src/de/epgsearch.conf.5.txt
-+++ b/doc-src/de/epgsearch.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearch.conf> - Die gespeicherten Suchtimer
---- a/doc-src/de/epgsearchblacklists.conf.5.txt
-+++ b/doc-src/de/epgsearchblacklists.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchblacklists.conf> - Die gespeicherten Auschlusslisten-Suchtimer
---- a/doc-src/de/epgsearchcats.conf.5.txt
-+++ b/doc-src/de/epgsearchcats.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchcats.conf> - Die Kategorien des erweiterten EPGs, sofern vorhanden.
---- a/doc-src/de/epgsearchchangrps.conf.5.txt
-+++ b/doc-src/de/epgsearchchangrps.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchchangrps.conf> - Liste der Kanalgruppen
---- a/doc-src/de/epgsearchcmds.conf.5.txt
-+++ b/doc-src/de/epgsearchcmds.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchcmds.conf> - EPG-Befehle
---- a/doc-src/de/epgsearchdirs.conf.5.txt
-+++ b/doc-src/de/epgsearchdirs.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchdirs.conf> - Liste von Aufnahmepfaden zur einfachen Auswahl
---- a/doc-src/de/epgsearchmenu.conf.5.txt
-+++ b/doc-src/de/epgsearchmenu.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchmenu.conf> - Konfiguration der Menüdarstellung
---- a/doc-src/de/epgsearchswitchtimers.conf.5.txt
-+++ b/doc-src/de/epgsearchswitchtimers.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchswitchtimer.conf> - Die gespeicherten Umschalttimer
---- a/doc-src/de/epgsearchtemplates.conf.5.txt
-+++ b/doc-src/de/epgsearchtemplates.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchtemplates.conf> - Die gespeicherten Suchtimer-Vorlagen
---- a/doc-src/de/epgsearchuservars.conf.5.txt
-+++ b/doc-src/de/epgsearchuservars.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchuservars.conf> - Die Uservariablen
---- a/doc-src/de/noannounce.conf.5.txt
-+++ b/doc-src/de/noannounce.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<noannounce.conf> - Liste von Sendungen, die nicht mehr per OSD angekündigt
---- a/doc-src/de/timersdone.conf.5.txt
-+++ b/doc-src/de/timersdone.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<timersdone.conf> - Liste von anstehenden Timern, die von Suchtimern erzeugt
---- a/doc-src/en/epgsearch.conf.5.txt
-+++ b/doc-src/en/epgsearch.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearch.conf> - The searchtimers
---- a/doc-src/en/epgsearchcats.conf.5.txt
-+++ b/doc-src/en/epgsearchcats.conf.5.txt
-@@ -1,4 +1,5 @@
- =encoding utf8
-+
- =head1 NAME
-
- F<epgsearchcats.conf> - Configuration of the additional EPG information
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/
@ 2021-03-22 14:05 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-03-22 14:05 UTC (permalink / raw
To: gentoo-commits
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 <martin.dummer@gmx.net> ( 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 <martin.dummer@gmx.net> ( 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/
@ 2021-09-23 19:02 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-09-23 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 5c0a1801d1d70319c50aa4ce288c12ffa688e536
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Sep 23 17:41:35 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 19:00:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c0a1801
media-plugins/vdr-epgsearch: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/22374
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/vdr-epgsearch-1.x.makefile.patch | 25 ----------------
.../vdr-epgsearch-2.4.0_p20200402_clang.patch | 33 ----------------------
2 files changed, 58 deletions(-)
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
deleted file mode 100644
index 25e27e958a4..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.x.makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile
---- vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.orig/Makefile 2015-02-21 21:01:08.926052710 +0100
-+++ vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42/Makefile 2015-02-21 21:03:42.768052710 +0100
-@@ -255,9 +255,9 @@
- 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
-+# 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 +272,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:
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
deleted file mode 100644
index 98e642593a4..00000000000
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20200402_clang.patch
+++ /dev/null
@@ -1,33 +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 <martin.dummer@gmx.net> ( 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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-23 19:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-01 11:47 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-epgsearch/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-03-22 14:05 Joonas Niilola
2021-09-23 19:02 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox