From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/sunpinyin-2.0.3-force-switch.patch | 30 +++++++++++++ .../sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch | 49 ++++++++++++++++++++++ .../sunpinyin/files/sunpinyin-2.0.4-pod2man.patch | 17 ++++++++ ...unpinyin-2.0.4_pre20130108-gcc6-use-float.patch | 17 ++++++++ 4 files changed, 113 insertions(+) create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch create mode 100644 app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch (limited to 'app-i18n/sunpinyin/files') diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch new file mode 100644 index 000000000000..f2f6b389ba09 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch @@ -0,0 +1,30 @@ +diff --git a/SConstruct b/SConstruct +index 68cd365..9bb6ebc 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -180,12 +180,6 @@ libdir = env['LIBDIR'] + libdatadir = env['LIBDATADIR'] + '/sunpinyin/data' + headersdir = env['PREFIX'] + '/include/sunpinyin-2.0' + +-if GetOS() != 'Darwin': +- env.Append(LINKFLAGS=['-Wl,-soname=libsunpinyin.so.%d' % abi_major]) +- +-if GetOption('rpath') is not None and GetOS() != 'Darwin': +- env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath')) +- + # pass through environmental variables + envvar = [('CC', 'CC'), + ('CXX', 'CXX'), +@@ -202,6 +196,12 @@ extra_cflags=' -DHAVE_CONFIG_H -DSUNPINYIN_DATA_DIR=\'"%s"\'' % libdatadir + env.Append(CFLAGS=extra_cflags) + env.Append(CXXFLAGS=extra_cflags) + ++if GetOS() != 'Darwin': ++ env.Append(LINKFLAGS=' -Wl,-soname=libsunpinyin.so.%d' % abi_major) ++ ++if GetOption('rpath') is not None and GetOS() != 'Darwin': ++ env.Append(LINKFLAGS=' -Wl,-R -Wl,%s' % GetOption('rpath')) ++ + # + #==============================configure================================ + # diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch new file mode 100644 index 000000000000..c523449ef514 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-gcc-4.7.patch @@ -0,0 +1,49 @@ +From 3d35aa0370d9c7bd455098caa9ba22ebe1f82968 Mon Sep 17 00:00:00 2001 +From: Yong Sun +Date: Wed, 4 Apr 2012 18:41:39 +0800 +Subject: [PATCH] Integrated patch from YunQiang Su, fixed FTBFS with gcc-4.7 + +--- + SConstruct | 3 ++- + src/portability.h | 5 ++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 97abf47..354fd19 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -313,7 +313,8 @@ def DoConfigure(): + conf.CheckCHeader('sys/param.h') + conf.CheckCHeader('sys/stat.h') + conf.CheckCHeader('sys/types.h') +- conf.CheckCHeader('unistd.h') ++ if conf.CheckCHeader('unistd.h'): ++ conf.Define('DHAVE_UNISTD_H', 1) + conf.CheckCHeader('wchar.h') + + # add essential package requirements +diff --git a/src/portability.h b/src/portability.h +index 949d4f2..cf43bd0 100644 +--- a/src/portability.h ++++ b/src/portability.h +@@ -44,15 +44,14 @@ + #include + #include + +-#if defined(sun) ++#if defined(HAVE_UNISTD_H) + #include + #ifdef __cplusplus + #include + #else + #include + #endif //__cpluscplus +-#endif //defined(sun) +- ++#endif //defined(HAVE_UNISTD_H) + + #ifndef HOST_OS_GNUC_2 + #if defined(DEBUG) && !defined(NDEBUG) +-- +1.7.8.5 + diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch new file mode 100644 index 000000000000..54831df21220 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch @@ -0,0 +1,17 @@ +From: Guo Yixuan +Bug: https://code.google.com/archive/p/sunpinyin/issues/327 +Gentoo-Bug: 553796 + +diff --git a/man/SConscript b/man/SConscript +index f3ebd03..e1551eb 100644 +--- a/man/SConscript ++++ b/man/SConscript +@@ -1,7 +1,7 @@ + import os + Import('env') + +-pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET') ++pod2man = Builder(action = 'pod2man $SOURCE $TARGET') + env.Append(BUILDERS = {'Man': pod2man}) + + env.Man('mmseg.1', 'mmseg.pod') diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch new file mode 100644 index 000000000000..77fe2831c7d8 --- /dev/null +++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch @@ -0,0 +1,17 @@ +--- sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h.old 2016-09-20 02:54:15.046257131 -0400 ++++ sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h 2016-09-20 02:55:48.041124978 -0400 +@@ -53,10 +53,10 @@ + typedef std::map RealIndexMap; // map real values to their indices + typedef std::map TLexicon; // map word to wid + +-#define EffectivePr(a) (float((usingLogPr) ? ((a) / log(2.0)) : (-log2((a))))) +-#define OriginalPr(b) (float((usingLogPr) ? ((b) * log(2.0)) : (exp2(-(b))))) +-#define EffectiveBow(a) (float((usingLogPr) ? (exp(-(a))) : ((a)))) +-#define OriginalBow(b) (float((usingLogPr) ? (-log((b))) : ((b)))) ++#define EffectivePr(a) (float((usingLogPr) ? ((a) / logf(2.0f)) : (-log2f((a))))) ++#define OriginalPr(b) (float((usingLogPr) ? ((b) * logf(2.0f)) : (exp2f(-(b))))) ++#define EffectiveBow(a) (float((usingLogPr) ? (expf(-(a))) : ((a)))) ++#define OriginalBow(b) (float((usingLogPr) ? (-logf((b))) : ((b)))) + + #endif //_SLM_PACK_COMMON_H + -- cgit v1.2.3