Remove upstream applied patches
Liang Guo
7 years ago
| 1 | 1 |
|
| 2 | 2 |
* New upstream snapshot 20160910
|
| 3 | 3 |
* Refresh debian/copyright
|
|
4 |
* Remove debian/patches/{strndup_in_cxx.patch,
|
|
5 |
detect-endianness-for-arm64.patch, pod2man.patch, gcc-6.patch},
|
|
6 |
applied upstream
|
| 4 | 7 |
|
| 5 | 8 |
-- Liang Guo <guoliang@debian.org> Thu, 13 Oct 2016 02:44:02 +0800
|
| 6 | 9 |
|
debian/patches/detect-endianness-for-arm64.patch
less
more
| 0 | |
--- sunpinyin-2.0.3+git20140127.orig/SConstruct
|
| 1 | |
+++ sunpinyin-2.0.3+git20140127/SConstruct
|
| 2 | |
@@ -312,7 +312,7 @@ def AppendEndianCheck(conf):
|
| 3 | |
#elif defined(__sparc) || defined(__sparc__) \
|
| 4 | |
|| defined(_POWER) || defined(__powerpc__) \
|
| 5 | |
|| defined(__ppc__) || defined(__hpux) || defined(__hppa) \
|
| 6 | |
- || defined(_MIPSEB) || defined(_POWER) \
|
| 7 | |
+ || defined(_MIPSEB) || defined(_POWER) || defined(__aarch64_be__) \
|
| 8 | |
|| defined(__s390__) || (defined(__sh__) && defined(__BIG_ENDIAN__))
|
| 9 | |
# define WORDS_BIGENDIAN 1
|
| 10 | |
|
| 11 | |
@@ -323,7 +323,7 @@ def AppendEndianCheck(conf):
|
| 12 | |
|| defined(__amd64__) || defined(_M_AMD64) \
|
| 13 | |
|| defined(__x86_64) || defined(__x86_64__) \
|
| 14 | |
|| defined(_M_X64) || defined(__bfin__) \
|
| 15 | |
- || defined(__alpha__) || defined(__ARMEL__) \
|
| 16 | |
+ || defined(__alpha__) || defined(__ARMEL__) || defined(__aarch64__) \
|
| 17 | |
|| defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__))
|
| 18 | |
# undef WORDS_BIGENDIAN
|
| 19 | |
|
| 0 | |
Index: sunpinyin/SConstruct
|
| 1 | |
===================================================================
|
| 2 | |
--- sunpinyin.orig/SConstruct 2013-10-24 18:31:41.564226867 +0800
|
| 3 | |
+++ sunpinyin/SConstruct 2013-10-24 20:05:37.381042455 +0800
|
| 4 | |
@@ -250,7 +250,7 @@
|
|
0 |
--- a/SConstruct
|
|
1 |
+++ b/SConstruct
|
|
2 |
@@ -253,7 +253,7 @@
|
| 5 | 3 |
man1dir = os.path.join(mandir, 'man1')
|
| 6 | 4 |
docdir = os.path.join(env['PREFIX'], 'share/doc/sunpinyin')
|
| 7 | 5 |
headersdir = os.path.join(env['PREFIX'], 'include/sunpinyin-2.0')
|
| 0 | |
From: Rico Tzschichholz <ricotz@ubuntu.com>
|
| 1 | |
Subject: Fix compile with GCC-6
|
| 2 | |
Index: sunpinyin/src/pinyin/segmentor.h
|
| 3 | |
===================================================================
|
| 4 | |
--- sunpinyin.orig/src/pinyin/segmentor.h
|
| 5 | |
+++ sunpinyin/src/pinyin/segmentor.h
|
| 6 | |
@@ -62,7 +62,7 @@ struct IPySegmentor {
|
| 7 | |
return true;
|
| 8 | |
|
| 9 | |
if (m_start == other.m_start)
|
| 10 | |
- return m_len < m_len;
|
| 11 | |
+ return m_len < other.m_len;
|
| 12 | |
|
| 13 | |
return false;
|
| 14 | |
}
|
| 0 | |
diff --git a/man/SConscript b/man/SConscript
|
| 1 | |
index f3ebd03..e1551eb 100644
|
| 2 | |
--- a/man/SConscript
|
| 3 | |
+++ b/man/SConscript
|
| 4 | |
@@ -1,7 +1,7 @@
|
| 5 | |
import os
|
| 6 | |
Import('env')
|
| 7 | |
|
| 8 | |
-pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET')
|
| 9 | |
+pod2man = Builder(action = 'pod2man $SOURCE $TARGET')
|
| 10 | |
env.Append(BUILDERS = {'Man': pod2man})
|
| 11 | |
|
| 12 | |
env.Man('mmseg.1', 'mmseg.pod')
|
| 0 | 0 |
fix-data-dir.diff
|
| 1 | |
strndup_in_cxx.patch
|
| 2 | |
detect-endianness-for-arm64.patch
|
| 3 | |
pod2man.patch
|
| 4 | |
gcc-6.patch
|
debian/patches/strndup_in_cxx.patch
less
more
| 0 | |
Index: sunpinyin/src/portability.cpp
|
| 1 | |
===================================================================
|
| 2 | |
--- sunpinyin.orig/src/portability.cpp 2013-10-24 18:17:25.408720136 +0800
|
| 3 | |
+++ sunpinyin/src/portability.cpp 2013-10-24 18:17:25.404720144 +0800
|
| 4 | |
@@ -265,27 +265,5 @@
|
| 5 | |
return sz;
|
| 6 | |
}
|
| 7 | |
|
| 8 | |
-#if !defined (HAVE_STRNDUP)
|
| 9 | |
-extern "C" char *
|
| 10 | |
-strndup(const char *s, size_t n)
|
| 11 | |
-{
|
| 12 | |
- size_t nMost;
|
| 13 | |
- char *p = NULL;
|
| 14 | |
-
|
| 15 | |
- if (!s)
|
| 16 | |
- return NULL;
|
| 17 | |
-
|
| 18 | |
-#ifdef __cplusplus
|
| 19 | |
- nMost = std::min(strlen(s) + 1, n + 1);
|
| 20 | |
-#else
|
| 21 | |
- nMost = min(strlen(s) + 1, n + 1);
|
| 22 | |
-#endif
|
| 23 | |
- p = (char*)malloc(nMost);
|
| 24 | |
- memcpy(p, s, nMost);
|
| 25 | |
- p[nMost - 1] = '\0';
|
| 26 | |
-
|
| 27 | |
- return p;
|
| 28 | |
-}
|
| 29 | |
-#endif //HAVE_STRNDUP
|
| 30 | |
|
| 31 | |
// -*- indent-tabs-mode: nil -*- vim:et:ts=4
|
| 32 | |
Index: sunpinyin/src/portability.h
|
| 33 | |
===================================================================
|
| 34 | |
--- sunpinyin.orig/src/portability.h 2013-10-24 18:17:25.408720136 +0800
|
| 35 | |
+++ sunpinyin/src/portability.h 2013-10-24 18:17:25.404720144 +0800
|
| 36 | |
@@ -326,10 +326,6 @@
|
| 37 | |
}
|
| 38 | |
#endif
|
| 39 | |
|
| 40 | |
-#if !defined (HAVE_STRNDUP)
|
| 41 | |
-extern "C" char *strndup(const char *s, size_t n);
|
| 42 | |
-#endif //HAVE_STRNDUP
|
| 43 | |
-
|
| 44 | |
#endif
|
| 45 | |
|
| 46 | |
// -*- indent-tabs-mode: nil -*- vim:et:ts=4
|