summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2020-02-05 20:38:56 +0100
committerFabian Groffen <grobian@gentoo.org>2020-02-05 20:39:13 +0100
commit0dbb5a6b28d23592e42e3060caea924973dc6aab (patch)
treeffe895f987ab22cf9935c8d04f2e19834d7bda61 /app-text/vilistextum/files
parentdev-python/pylibmc: Remove py2 (diff)
downloadgentoo-0dbb5a6b28d23592e42e3060caea924973dc6aab.tar.gz
gentoo-0dbb5a6b28d23592e42e3060caea924973dc6aab.tar.bz2
gentoo-0dbb5a6b28d23592e42e3060caea924973dc6aab.zip
app-text/vilistextum-2.8.0.20191023: version bump
Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'app-text/vilistextum/files')
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch120
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch11
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch27
-rw-r--r--app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch12
4 files changed, 170 insertions, 0 deletions
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
new file mode 100644
index 00000000000..74d44309669
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
@@ -0,0 +1,120 @@
+Many clients seem to use blockquote tags to flag quotes these days, so
+write them out as quotes, so they remain readable.
+
+--- a/src/html_tags.c 2019-10-23 16:25:27.000000000 +0200
++++ b/src/html_tags.c 2020-02-05 20:11:57.308596941 +0100
+@@ -261,6 +261,7 @@
+ line_break();
+ } else {
+ start_p();
++ quote++;
+ }
+ } /* html_pre */
+
+@@ -271,6 +272,7 @@
+ line_break();
+ } else {
+ paragraphen_ende();
++ quote -= quote != 0;
+ }
+ } /* html_pre_end */
+
+--- a/src/multibyte.h 2020-02-05 20:08:43.863715764 +0100
++++ b/src/multibyte.h 2020-02-05 20:12:34.401382354 +0100
+@@ -18,6 +18,7 @@
+ #define ATOI(n) wcstoi(n)
+
+ #define ONESPACE L" "
++ #define QUOTE L">"
+ #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
+
+ #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
+@@ -43,6 +44,7 @@
+ #define ATOI(n) atoi(n)
+
+ #define ONESPACE " "
++ #define QUOTE ">"
+ #define WORT_PLUS_STRING(str) wort_plus_string(str)
+
+ #define STRSTR(haystack, needle) strstr(haystack, needle)
+--- a/src/text.c 2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.c 2020-02-05 20:16:04.852164539 +0100
+@@ -28,6 +28,7 @@
+ int breite=76,
+ hr_breite=76,
+ paragraph=0,
++ quote=0,
+
+ tab=4, /* tabulator */
+ spaces=0, /* spaces at beginning of line */
+@@ -378,6 +379,12 @@
+ printf(" z0: zeilen_pos: %d\n",zeilen_pos);
+ #endif
+ print_zeile();
++ if (quote > 0)
++ {
++ i=0;
++ while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++ zeile_plus_wort(ONESPACE,1,1);
++ }
+ i=0;
+ while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+@@ -398,6 +405,12 @@
+ printf(" z2: zeilen_len: %d\n",zeilen_len);
+ printf(" z2: zeilen_pos: %d\n",zeilen_pos);
+ #endif
++ if (quote > 0)
++ {
++ i=0;
++ while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++ zeile_plus_wort(ONESPACE,1,1);
++ }
+ i=0;
+ while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+--- a/src/text.h 2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.h 2020-02-05 20:18:40.792261818 +0100
+@@ -26,6 +26,7 @@
+
+ int tab;
+ int spaces;
++int quote;
+
+ void print_zeile();
+ int is_zeile_empty();
+--- a/tests/test_functions
++++ b/tests/test_functions
+@@ -12,6 +12,9 @@
+ rm -f testcases/$prefix.output.test
+ ../src/vilistextum 2>/dev/null $args testcases/$prefix.html testcases/$output_prefix.output.test
+
++ # remove (block)quotes
++ sed -i -e 's/^>\+ //' testcases/$output_prefix.output.test
++
+ diff >/dev/null testcases/$output_prefix.output testcases/$output_prefix.output.test
+ retval=$?
+ if [ $retval -ne 0 ]; then
+--- a/tests/testcases/utf-8-sampler.output
++++ b/tests/testcases/utf-8-sampler.output.test
+@@ -100,8 +100,8 @@
+ ვეპხის ტყაოსანი შოთა რუსთაველი
+
+ ღმერთსი შემვედრე, ნუთუ კვლა დამხსნას სოფლისა შრომასა, ცეცხლს, წყალსა და
+-მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას ჩემსა
+-ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
++მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას
++ჩემსა ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
+
+ Tamil poetry of Cupiramaniya Paarathiyar: சுப்ரமணிய பாரதியார் (1882-1921)
+
+@@ -446,7 +446,8 @@
+ д, п, and/or т:
+
+ Bulgarian:   [ бгдпт ]   [ бгдпт ]   Мога да ям стъкло и не ме боли.
+- Russian: [ бгдпт ]   [ бгдпт ]   Я могу есть стекло, это мне не вредит.
++ Russian: [ бгдпт ]   [ бгдпт ]   Я могу есть стекло, это мне не
++вредит.
+ Serbian: [ бгдпт ]   [ бгдпт ]   Могу јести стакло а да ми не шкоди.
+
+ ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
new file mode 100644
index 00000000000..a26ae717818
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,7 @@
+ main.c main.h util.c util.h \
+ multibyte.h unicode_entities.c unicode_entities.h
+
+-AM_CFLAGS = -Wall -O2 -ansi
++AM_CFLAGS = -Wall -ansi
+ AM_LDFLAGS = $(STATIC)
+
+ EXTRA_DIST = kilistextum.kaptn
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
new file mode 100644
index 00000000000..e5cb3ba2a18
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
@@ -0,0 +1,27 @@
+* don't look in /usr/local
+* try to hack around not being able to use AM_ICONV
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,10 +21,6 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(getopt.h)
+
+-dnl add /usr/local
+-CFLAGS="$CFLAGS -I/usr/local/include"
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+@@ -41,7 +37,9 @@
+ AC_CHECK_HEADERS(iconv.h,,
+ AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
+
+-AC_CHECK_LIB(iconv, iconv,,
++dnl iconv_open_into is implemented only in GNU libiconv and not in other
++dnl iconv implementations
++AC_CHECK_LIB(iconv, libiconv_open_into,,
+ AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
+
+ dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
new file mode 100644
index 00000000000..a9c8a96a752
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
@@ -0,0 +1,12 @@
+towlower is defined by wctype.h
+
+--- a/src/multibyte.h
++++ b/src/multibyte.h
+@@ -2,6 +2,7 @@
+
+ #ifdef MULTIBYTE
+ #include <wchar.h>
++#include <wctype.h>
+ #define CHAR wchar_t
+ #define STRLEN(s) wcslen(s)
+ #define CPYSS(dest, src) wcscpy(dest, src) /* copy str to str */