1 |
commit: eac33db41c7f20bda77418f9ed1ff6465f36c417 |
2 |
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> |
3 |
AuthorDate: Sat Jun 5 07:57:54 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 15 00:53:44 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac33db4 |
7 |
|
8 |
media-plugins/vdr-epgsearch: remove obsolete version |
9 |
|
10 |
upstream made new release, so remove obsoleted intermediate version |
11 |
|
12 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
13 |
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/21128 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
media-plugins/vdr-epgsearch/Manifest | 1 - |
18 |
...vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch | 18 ---- |
19 |
...-epgsearch-2.4.0_p20210426_gcc11-warnings.patch | 58 ------------- |
20 |
.../vdr-epgsearch-2.4.0_p20210426.ebuild | 97 ---------------------- |
21 |
4 files changed, 174 deletions(-) |
22 |
|
23 |
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest |
24 |
index 991a845deae..44ad6fb4a12 100644 |
25 |
--- a/media-plugins/vdr-epgsearch/Manifest |
26 |
+++ b/media-plugins/vdr-epgsearch/Manifest |
27 |
@@ -1,4 +1,3 @@ |
28 |
DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4 |
29 |
DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065 |
30 |
-DIST vdr-epgsearch-2.4.0_p20210426.tar.gz 481490 BLAKE2B 71c336f2f8838c435ca439a61be58884ef001954cf33fe99c1b20987baaa207e74b5a032f3fa9543f58b53157ecfabcd7fca08f7ebf49c015ba6893e7e6f7759 SHA512 4260ebbd3c18dd66b18ff7d05480a1affd0ba9a4dd130cf23e93cd7085218ebb8f60f5733ee1f616b74618ea68a367a001d330a60294faced7e04d4f10a5ffa3 |
31 |
DIST vdr-epgsearch-2.4.1.tar.gz 481899 BLAKE2B ab0325fbab73d3c6e6753b926ca0cde6ec971fd42f7b8badf4b306671bf3380c5784262fe1f24e6ce57fef1903ef533b450ea03c346242b5a72f26eeba8a6bd9 SHA512 031ee227a5d45bbf1344cc8195dfd38d23ff23303d55c8492e7b2f86f1f53402a68e6500888bf847cd3506ebc2cfbb73aef2b8b0d6ef98f210631642de1d1f9c |
32 |
|
33 |
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch |
34 |
deleted file mode 100644 |
35 |
index b0d756a73b4..00000000000 |
36 |
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-const.patch |
37 |
+++ /dev/null |
38 |
@@ -1,18 +0,0 @@ |
39 |
-the following change to const is necessary since gcc-11 |
40 |
- |
41 |
-thanks to seahawk1986 @ vdr-portal.de |
42 |
-https://www.vdr-portal.de/forum/index.php?thread/134005-vdr-2-4-6-kompiliert-mit-gcc-11-0-0-nicht/&postID=1340496#post1340496 |
43 |
- |
44 |
-Signed-off-by: Martin Dummer <martin.dummer@×××.net> |
45 |
- |
46 |
---- a/conflictcheck.h |
47 |
-+++ b/conflictcheck.h |
48 |
-@@ -73,7 +73,7 @@ |
49 |
- class TimerObjSort |
50 |
- { |
51 |
- public: |
52 |
-- bool operator()(cConflictCheckTimerObj* a, cConflictCheckTimerObj* b) { |
53 |
-+ bool operator()(const cConflictCheckTimerObj* a, const cConflictCheckTimerObj* b) const { |
54 |
- return (a->Compare(*b) < 0); |
55 |
- } |
56 |
- }; |
57 |
|
58 |
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch |
59 |
deleted file mode 100644 |
60 |
index fb5e672cf0e..00000000000 |
61 |
--- a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-2.4.0_p20210426_gcc11-warnings.patch |
62 |
+++ /dev/null |
63 |
@@ -1,58 +0,0 @@ |
64 |
-the following change removes a bunch of warnings since gcc-11 |
65 |
- |
66 |
-afuzzy.c: In function ‘int afuzzy_checkSUB(const char*, AFUZZY*)’: |
67 |
-afuzzy.c:197:19: warning: ISO C++17 does not allow ‘register’ storage class specifier [-Wregister] |
68 |
- |
69 |
-Signed-off-by: Martin Dummer <martin.dummer@×××.net> |
70 |
---- a/afuzzy.c |
71 |
-+++ b/afuzzy.c |
72 |
-@@ -194,8 +194,8 @@ |
73 |
- ******************************************************************************/ |
74 |
- int afuzzy_checkSUB(const char *t, AFUZZY *fuzzy) |
75 |
- { |
76 |
-- register char c; |
77 |
-- register int j, d; |
78 |
-+ char c; |
79 |
-+ int j, d; |
80 |
- |
81 |
- /* For eficciency this case should be little bit optimized */ |
82 |
- if (!fuzzy->k) { |
83 |
-@@ -207,7 +207,7 @@ |
84 |
- |
85 |
- if (R1 & fuzzy->mask_ok) |
86 |
- return 1; |
87 |
-- } /* end for (register int j = 0 ... */ |
88 |
-+ } /* end for (int j = 0 ... */ |
89 |
- return 0; |
90 |
- } |
91 |
- |
92 |
-@@ -229,16 +229,16 @@ |
93 |
- |
94 |
- memcpy(fuzzy->R, fuzzy->R1, fuzzy->r_size); |
95 |
- |
96 |
-- } /* end for (register int j = 0 ... */ |
97 |
-+ } /* end for (int j = 0 ... */ |
98 |
- |
99 |
- return 0; |
100 |
- } |
101 |
- |
102 |
- static int afuzzy_checkFLT(const char *t, AFUZZY *fuzzy) |
103 |
- { |
104 |
-- register Uint FilterR = 0; |
105 |
-- register Uint FilterR1; |
106 |
-- register int j; |
107 |
-+ Uint FilterR = 0; |
108 |
-+ Uint FilterR1; |
109 |
-+ int j; |
110 |
- |
111 |
- for (j = 0; t[j] != '\0'; j++) { |
112 |
- FilterR1 = (((FilterR << (fuzzy->k + 1)) | fuzzy->filter_shift) & |
113 |
-@@ -246,7 +246,7 @@ |
114 |
- if (FilterR1 & fuzzy->filter_ok) |
115 |
- return 1; |
116 |
- FilterR = FilterR1; |
117 |
-- } /* end for (register int j = 0 ... */ |
118 |
-+ } /* end for (int j = 0 ... */ |
119 |
- |
120 |
- return 0; |
121 |
- } |
122 |
|
123 |
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild |
124 |
deleted file mode 100644 |
125 |
index 14836980108..00000000000 |
126 |
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20210426.ebuild |
127 |
+++ /dev/null |
128 |
@@ -1,97 +0,0 @@ |
129 |
-# Copyright 2021 Gentoo Authors |
130 |
-# Distributed under the terms of the GNU General Public License v2 |
131 |
- |
132 |
-EAPI=7 |
133 |
- |
134 |
-inherit vdr-plugin-2 |
135 |
- |
136 |
-DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions" |
137 |
-HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html" |
138 |
-GIT_COMMIT_ID="fc309e3841d204554dba001b6f01fcc4c4cc0fc6" |
139 |
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz" |
140 |
-S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}" |
141 |
- |
142 |
-LICENSE="GPL-2+" |
143 |
-SLOT="0" |
144 |
-KEYWORDS="~amd64 ~x86" |
145 |
-IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre" |
146 |
-REQUIRED_USE="?? ( pcre tre )" |
147 |
- |
148 |
-DEPEND=" |
149 |
- >=media-video/vdr-2.4 |
150 |
- pcre? ( dev-libs/libpcre ) |
151 |
- tre? ( dev-libs/tre )" |
152 |
-RDEPEND="${DEPEND}" |
153 |
-BDEPEND=" |
154 |
- sys-apps/groff |
155 |
- dev-lang/perl" |
156 |
- |
157 |
-PATCHES=( |
158 |
- "${FILESDIR}/${PN}-2.4.0_makefile.patch" |
159 |
- "${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch" |
160 |
- "${FILESDIR}/${P}_gcc11-const.patch" |
161 |
- "${FILESDIR}/${P}_gcc11-warnings.patch" |
162 |
-) |
163 |
- |
164 |
-QA_FLAGS_IGNORED=" |
165 |
- usr/lib/vdr/plugins/libvdr-.* |
166 |
- usr/lib64/vdr/plugins/libvdr-.* |
167 |
- usr/bin/createcats" |
168 |
- |
169 |
-src_prepare() { |
170 |
- # remove untranslated .po files |
171 |
- 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 \ |
172 |
- || die "cannot remove untranslated .po files" |
173 |
- |
174 |
- if ! use conflictcheckonly; then |
175 |
- sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile" |
176 |
- fi |
177 |
- |
178 |
- if ! use epgsearchonly; then |
179 |
- sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile" |
180 |
- fi |
181 |
- |
182 |
- if ! use quicksearch; then |
183 |
- sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile" |
184 |
- fi |
185 |
- |
186 |
- vdr-plugin-2_src_prepare |
187 |
- |
188 |
- fix_vdr_libsi_include conflictcheck.c |
189 |
- |
190 |
- # install conf-file disabled |
191 |
- sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf" |
192 |
- |
193 |
- # Get rid of the broken symlink |
194 |
- rm README || die "cannot remove broken symlink" |
195 |
-} |
196 |
- |
197 |
-src_compile() { |
198 |
- BUILD_PARAMS="SENDMAIL=/usr/bin/sendmail AUTOCONFIG=0" |
199 |
- |
200 |
- if use pcre; then |
201 |
- BUILD_PARAMS+=" REGEXLIB=pcre" |
202 |
- einfo "Using pcre for regexp searches" |
203 |
- fi |
204 |
- |
205 |
- if use tre; then |
206 |
- BUILD_PARAMS+=" REGEXLIB=tre" |
207 |
- einfo "Using tre for unlimited fuzzy searches" |
208 |
- fi |
209 |
- |
210 |
- vdr-plugin-2_src_compile |
211 |
-} |
212 |
- |
213 |
-src_install() { |
214 |
- local DOCS=( conf/*.templ HISTORY* README.Translators ) |
215 |
- vdr-plugin-2_src_install |
216 |
- |
217 |
- diropts -m 755 -o vdr -g vdr |
218 |
- insopts -m 644 -o vdr -g vdr |
219 |
- keepdir /etc/vdr/plugins/epgsearch |
220 |
- insinto /etc/vdr/plugins/epgsearch |
221 |
- doins conf/* |
222 |
- |
223 |
- doman man/en/* |
224 |
- doman -i18n=de man/de/* |
225 |
-} |