1 |
commit: 9b6db99d7f9db07f5a6c8de1a49166bfc72e902b |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Mon Apr 19 17:21:30 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 25 12:59:34 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6db99d |
7 |
|
8 |
app-text/vilistextum: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/20458 |
11 |
Package-Manager: Portage-3.0.18, 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/vilistextum-2.8.0-blockquote.patch | 120 --------------------- |
16 |
.../files/vilistextum-2.8.0-gentoo.patch | 11 -- |
17 |
.../files/vilistextum-2.8.0-list-alignment.patch | 43 -------- |
18 |
3 files changed, 174 deletions(-) |
19 |
|
20 |
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch |
21 |
deleted file mode 100644 |
22 |
index 74d44309669..00000000000 |
23 |
--- a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch |
24 |
+++ /dev/null |
25 |
@@ -1,120 +0,0 @@ |
26 |
-Many clients seem to use blockquote tags to flag quotes these days, so |
27 |
-write them out as quotes, so they remain readable. |
28 |
- |
29 |
---- a/src/html_tags.c 2019-10-23 16:25:27.000000000 +0200 |
30 |
-+++ b/src/html_tags.c 2020-02-05 20:11:57.308596941 +0100 |
31 |
-@@ -261,6 +261,7 @@ |
32 |
- line_break(); |
33 |
- } else { |
34 |
- start_p(); |
35 |
-+ quote++; |
36 |
- } |
37 |
- } /* html_pre */ |
38 |
- |
39 |
-@@ -271,6 +272,7 @@ |
40 |
- line_break(); |
41 |
- } else { |
42 |
- paragraphen_ende(); |
43 |
-+ quote -= quote != 0; |
44 |
- } |
45 |
- } /* html_pre_end */ |
46 |
- |
47 |
---- a/src/multibyte.h 2020-02-05 20:08:43.863715764 +0100 |
48 |
-+++ b/src/multibyte.h 2020-02-05 20:12:34.401382354 +0100 |
49 |
-@@ -18,6 +18,7 @@ |
50 |
- #define ATOI(n) wcstoi(n) |
51 |
- |
52 |
- #define ONESPACE L" " |
53 |
-+ #define QUOTE L">" |
54 |
- #define WORT_PLUS_STRING(str) wort_plus_string(L##str) |
55 |
- |
56 |
- #define STRSTR(haystack, needle) wcsstr(haystack, L##needle) |
57 |
-@@ -43,6 +44,7 @@ |
58 |
- #define ATOI(n) atoi(n) |
59 |
- |
60 |
- #define ONESPACE " " |
61 |
-+ #define QUOTE ">" |
62 |
- #define WORT_PLUS_STRING(str) wort_plus_string(str) |
63 |
- |
64 |
- #define STRSTR(haystack, needle) strstr(haystack, needle) |
65 |
---- a/src/text.c 2019-10-23 16:25:27.000000000 +0200 |
66 |
-+++ b/src/text.c 2020-02-05 20:16:04.852164539 +0100 |
67 |
-@@ -28,6 +28,7 @@ |
68 |
- int breite=76, |
69 |
- hr_breite=76, |
70 |
- paragraph=0, |
71 |
-+ quote=0, |
72 |
- |
73 |
- tab=4, /* tabulator */ |
74 |
- spaces=0, /* spaces at beginning of line */ |
75 |
-@@ -378,6 +379,12 @@ |
76 |
- printf(" z0: zeilen_pos: %d\n",zeilen_pos); |
77 |
- #endif |
78 |
- print_zeile(); |
79 |
-+ if (quote > 0) |
80 |
-+ { |
81 |
-+ i=0; |
82 |
-+ while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; } |
83 |
-+ zeile_plus_wort(ONESPACE,1,1); |
84 |
-+ } |
85 |
- i=0; |
86 |
- while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; } |
87 |
- if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); } |
88 |
-@@ -398,6 +405,12 @@ |
89 |
- printf(" z2: zeilen_len: %d\n",zeilen_len); |
90 |
- printf(" z2: zeilen_pos: %d\n",zeilen_pos); |
91 |
- #endif |
92 |
-+ if (quote > 0) |
93 |
-+ { |
94 |
-+ i=0; |
95 |
-+ while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; } |
96 |
-+ zeile_plus_wort(ONESPACE,1,1); |
97 |
-+ } |
98 |
- i=0; |
99 |
- while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; } |
100 |
- if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); } |
101 |
---- a/src/text.h 2019-10-23 16:25:27.000000000 +0200 |
102 |
-+++ b/src/text.h 2020-02-05 20:18:40.792261818 +0100 |
103 |
-@@ -26,6 +26,7 @@ |
104 |
- |
105 |
- int tab; |
106 |
- int spaces; |
107 |
-+int quote; |
108 |
- |
109 |
- void print_zeile(); |
110 |
- int is_zeile_empty(); |
111 |
---- a/tests/test_functions |
112 |
-+++ b/tests/test_functions |
113 |
-@@ -12,6 +12,9 @@ |
114 |
- rm -f testcases/$prefix.output.test |
115 |
- ../src/vilistextum 2>/dev/null $args testcases/$prefix.html testcases/$output_prefix.output.test |
116 |
- |
117 |
-+ # remove (block)quotes |
118 |
-+ sed -i -e 's/^>\+ //' testcases/$output_prefix.output.test |
119 |
-+ |
120 |
- diff >/dev/null testcases/$output_prefix.output testcases/$output_prefix.output.test |
121 |
- retval=$? |
122 |
- if [ $retval -ne 0 ]; then |
123 |
---- a/tests/testcases/utf-8-sampler.output |
124 |
-+++ b/tests/testcases/utf-8-sampler.output.test |
125 |
-@@ -100,8 +100,8 @@ |
126 |
- ვეპხის ტყაოსანი შოთა რუსთაველი |
127 |
- |
128 |
- ღმერთსი შემვედრე, ნუთუ კვლა დამხსნას სოფლისა შრომასა, ცეცხლს, წყალსა და |
129 |
--მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას ჩემსა |
130 |
--ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა. |
131 |
-+მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას |
132 |
-+ჩემსა ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა. |
133 |
- |
134 |
- Tamil poetry of Cupiramaniya Paarathiyar: சுப்ரமணிய பாரதியார் (1882-1921) |
135 |
- |
136 |
-@@ -446,7 +446,8 @@ |
137 |
- д, п, and/or т: |
138 |
- |
139 |
- Bulgarian: [ бгдпт ] [ бгдпт ] Мога да ям стъкло и не ме боли. |
140 |
-- Russian: [ бгдпт ] [ бгдпт ] Я могу есть стекло, это мне не вредит. |
141 |
-+ Russian: [ бгдпт ] [ бгдпт ] Я могу есть стекло, это мне не |
142 |
-+вредит. |
143 |
- Serbian: [ бгдпт ] [ бгдпт ] Могу јести стакло а да ми не шкоди. |
144 |
- |
145 |
- ------------------------------------------------------------------------ |
146 |
|
147 |
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch |
148 |
deleted file mode 100644 |
149 |
index a26ae717818..00000000000 |
150 |
--- a/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch |
151 |
+++ /dev/null |
152 |
@@ -1,11 +0,0 @@ |
153 |
---- a/src/Makefile.am |
154 |
-+++ b/src/Makefile.am |
155 |
-@@ -6,7 +6,7 @@ |
156 |
- main.c main.h util.c util.h \ |
157 |
- multibyte.h unicode_entities.c unicode_entities.h |
158 |
- |
159 |
--AM_CFLAGS = -Wall -O2 -ansi |
160 |
-+AM_CFLAGS = -Wall -ansi |
161 |
- AM_LDFLAGS = $(STATIC) |
162 |
- |
163 |
- EXTRA_DIST = kilistextum.kaptn |
164 |
|
165 |
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch b/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch |
166 |
deleted file mode 100644 |
167 |
index c308cfe1615..00000000000 |
168 |
--- a/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch |
169 |
+++ /dev/null |
170 |
@@ -1,43 +0,0 @@ |
171 |
---- a/src/lists.c |
172 |
-+++ b/src/lists.c |
173 |
-@@ -74,6 +74,7 @@ |
174 |
- } |
175 |
- |
176 |
- spaces += tab; |
177 |
-+ orderedlist++; |
178 |
- #ifdef proc_debug |
179 |
- printf("start_uls() ende\n"); |
180 |
- #endif |
181 |
-@@ -82,6 +83,7 @@ |
182 |
- void end_uls() |
183 |
- { |
184 |
- spaces -= tab; |
185 |
-+ orderedlist--; |
186 |
- line_break(); |
187 |
- |
188 |
- if (bullet_style=='%') { bullet_style='$'; } |
189 |
---- a/src/text.c |
190 |
-+++ b/src/text.c |
191 |
-@@ -387,7 +387,11 @@ |
192 |
- } |
193 |
- i=0; |
194 |
- while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; } |
195 |
-- if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); } |
196 |
-+ if (orderedlist>0) |
197 |
-+ { |
198 |
-+ i=(spaces%tab) + 1; |
199 |
-+ while (i>0) { zeile_plus_wort(ONESPACE,1,1); i--; } |
200 |
-+ } |
201 |
- zeile_plus_wort(wort, wort_len, wort_pos); |
202 |
- } |
203 |
- else if (zeilen_len != 0) |
204 |
---- a/src/text.h |
205 |
-+++ b/src/text.h |
206 |
-@@ -27,6 +27,7 @@ |
207 |
- int tab; |
208 |
- int spaces; |
209 |
- int quote; |
210 |
-+int orderedlist; |
211 |
- |
212 |
- void print_zeile(); |
213 |
- int is_zeile_empty(); |