From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- app-i18n/nkf/files/nkf-2.1.3-strip.patch | 9 --------- app-i18n/nkf/files/nkf-2.1.4-python.patch | 13 ------------- app-i18n/nkf/files/nkf-2.1.4-test.patch | 11 +++++++++++ app-i18n/nkf/files/nkf-python.patch | 13 +++++++++++++ 4 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 app-i18n/nkf/files/nkf-2.1.3-strip.patch delete mode 100644 app-i18n/nkf/files/nkf-2.1.4-python.patch create mode 100644 app-i18n/nkf/files/nkf-2.1.4-test.patch create mode 100644 app-i18n/nkf/files/nkf-python.patch (limited to 'app-i18n/nkf/files') diff --git a/app-i18n/nkf/files/nkf-2.1.3-strip.patch b/app-i18n/nkf/files/nkf-2.1.3-strip.patch deleted file mode 100644 index 5cfac8820f82..000000000000 --- a/app-i18n/nkf/files/nkf-2.1.3-strip.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/NKF.python/setup.py -+++ b/NKF.python/setup.py -@@ -8,5 +8,4 @@ - author="Matsumoto Tadashi", - author_email="ma2@city.plala.jp", - ext_modules = [ -- Extension("nkf", ["NKF_python.c"], -- extra_link_args = ['-s'])]) -+ Extension("nkf", ["NKF_python.c"])]) diff --git a/app-i18n/nkf/files/nkf-2.1.4-python.patch b/app-i18n/nkf/files/nkf-2.1.4-python.patch deleted file mode 100644 index 6f9e2e687e07..000000000000 --- a/app-i18n/nkf/files/nkf-2.1.4-python.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/NKF.python/nkf.c -+++ b/NKF.python/nkf.c -@@ -78,8 +78,8 @@ - } - - #define PERL_XS 1 --#include "nkf-dist/utf8tbl.c" --#include "nkf-dist/nkf.c" -+#include "../utf8tbl.c" -+#include "../nkf.c" - - static PyObject * - pynkf_convert(unsigned char* str, int strlen, char* opts, int optslen) diff --git a/app-i18n/nkf/files/nkf-2.1.4-test.patch b/app-i18n/nkf/files/nkf-2.1.4-test.patch new file mode 100644 index 000000000000..26964ef4d64b --- /dev/null +++ b/app-i18n/nkf/files/nkf-2.1.4-test.patch @@ -0,0 +1,11 @@ +--- a/test.pl ++++ b/test.pl +@@ -120,7 +120,7 @@ + return; + } + +-do "nkf_test.pl"; ++do "./nkf_test.pl"; + unlink "nkf.in"; + unlink "nkf.out"; + diff --git a/app-i18n/nkf/files/nkf-python.patch b/app-i18n/nkf/files/nkf-python.patch new file mode 100644 index 000000000000..6f9e2e687e07 --- /dev/null +++ b/app-i18n/nkf/files/nkf-python.patch @@ -0,0 +1,13 @@ +--- a/NKF.python/nkf.c ++++ b/NKF.python/nkf.c +@@ -78,8 +78,8 @@ + } + + #define PERL_XS 1 +-#include "nkf-dist/utf8tbl.c" +-#include "nkf-dist/nkf.c" ++#include "../utf8tbl.c" ++#include "../nkf.c" + + static PyObject * + pynkf_convert(unsigned char* str, int strlen, char* opts, int optslen) -- cgit v1.2.3