[Libreoffice-commits] .: 2 commits - boost/aliasing.patch boost/makefile.mk hunspell/hunspell-1.2.8-thesfix.patch hunspell/hunspell-1.2.9-crashfix.patch hunspell/hunspell-mingw.patch hunspell/hunspell-solaris.patch hunspell/hunspell-stacksmash.patch hunspell/hunspell-valgrind.patch hunspell/hunspell-wntconfig.patch hunspell/makefile.mk
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Feb 8 06:50:23 PST 2011
boost/aliasing.patch | 43 +++++++++++++++++++++++++++++++++
boost/makefile.mk | 2 +
hunspell/hunspell-1.2.8-thesfix.patch | 28 ---------------------
hunspell/hunspell-1.2.9-crashfix.patch | 11 --------
hunspell/hunspell-mingw.patch | 4 +--
hunspell/hunspell-solaris.patch | 4 +--
hunspell/hunspell-stacksmash.patch | 28 ---------------------
hunspell/hunspell-valgrind.patch | 13 ---------
hunspell/hunspell-wntconfig.patch | 4 +--
hunspell/makefile.mk | 9 ++----
10 files changed, 54 insertions(+), 92 deletions(-)
New commits:
commit 14e34dbf3b8e7a765331421d28b411deadad21fe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 8 14:50:08 2011 +0000
Resolves: fdo#34031 bump to hunspell 1.3.1
diff --git a/hunspell/hunspell-1.2.8-thesfix.patch b/hunspell/hunspell-1.2.8-thesfix.patch
deleted file mode 100644
index c41fde4..0000000
--- a/hunspell/hunspell-1.2.8-thesfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- misc/hunspell-1.2.8/src/hunspell/hunspell.cxx 2010-03-16 14:37:36.998879385 +0100
-+++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.cxx 2010-03-16 14:37:10.416222464 +0100
-@@ -1666,7 +1666,7 @@
- if (!q2) return 0; // bad XML input
- if (check_xml_par(q, "type=", "analyze")) {
- int n = 0, s = 0;
-- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
-+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
- if (n == 0) return 0;
- // convert the result to <code><a>ana1</a><a>ana2</a></code> format
- for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
-@@ -1687,13 +1687,13 @@
- (*slst)[0] = r;
- return 1;
- } else if (check_xml_par(q, "type=", "stem")) {
-- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
-+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
- } else if (check_xml_par(q, "type=", "generate")) {
-- int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
-+ int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
- if (n == 0) return 0;
- char * q3 = strstr(q2 + 1, "<word");
- if (q3) {
-- if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
-+ if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
- return generate(slst, cw, cw2);
- }
- } else {
diff --git a/hunspell/hunspell-1.2.9-crashfix.patch b/hunspell/hunspell-1.2.9-crashfix.patch
deleted file mode 100644
index 73244d2..0000000
--- a/hunspell/hunspell-1.2.9-crashfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/hunspell-1.2.9/src/hunspell/affixmgr.cxx 2010-02-27 12:59:53.000000000 +0100
-+++ misc/build/hunspell-1.2.9/src/hunspell/affixmgr.cxx 2011-01-06 16:18:23.361159724 +0100
-@@ -1542,7 +1542,7 @@
- }
-
- if (!rv) {
-- if (compoundflag &&
-+ if (compoundflag && !words &&
- !(rv = prefix_check(st, i, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN, compoundflag))) {
- if ((rv = suffix_check(st, i, 0, NULL, NULL, 0, NULL,
- FLAG_NULL, compoundflag, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN)) && !hu_mov_rule &&
diff --git a/hunspell/hunspell-mingw.patch b/hunspell/hunspell-mingw.patch
index 0120e01..391aa92 100644
--- a/hunspell/hunspell-mingw.patch
+++ b/hunspell/hunspell-mingw.patch
@@ -1,5 +1,5 @@
---- misc/hunspell-1.2.9/src/tools/hunspell.cxx 2010-02-27 23:37:14.000000000 +0900
-+++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx 2010-04-25 07:57:39.233875000 +0900
+--- misc/hunspell-1.3.1/src/tools/hunspell.cxx 2010-02-27 23:37:14.000000000 +0900
++++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx 2010-04-25 07:57:39.233875000 +0900
@@ -27,7 +27,9 @@
#ifdef WIN32
diff --git a/hunspell/hunspell-solaris.patch b/hunspell/hunspell-solaris.patch
index 37c5101..3a51462 100644
--- a/hunspell/hunspell-solaris.patch
+++ b/hunspell/hunspell-solaris.patch
@@ -1,5 +1,5 @@
---- misc/hunspell-1.2.9.orig/src/tools/hunspell.cxx 2010-02-27 23:42:05.000000000 +0000
-+++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx 2010-02-27 23:43:02.000000000 +0000
+--- misc/hunspell-1.3.1.orig/src/tools/hunspell.cxx 2010-02-27 23:42:05.000000000 +0000
++++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx 2010-02-27 23:43:02.000000000 +0000
@@ -10,6 +10,9 @@
#include "hunspell.hxx"
#include "csutil.hxx"
diff --git a/hunspell/hunspell-stacksmash.patch b/hunspell/hunspell-stacksmash.patch
deleted file mode 100644
index 8765b6d..0000000
--- a/hunspell/hunspell-stacksmash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- misc/hunspell-1.2.9/src/hunspell/hunspell.cxx 2010-03-04 10:25:06.000000000 +0000
-+++ misc/build/hunspell-1.2.9/src/hunspell/hunspell.cxx 2010-03-04 10:25:38.000000000 +0000
-@@ -1665,7 +1665,7 @@
- if (!q2) return 0; // bad XML input
- if (check_xml_par(q, "type=", "analyze")) {
- int n = 0, s = 0;
-- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
-+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
- if (n == 0) return 0;
- // convert the result to <code><a>ana1</a><a>ana2</a></code> format
- for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
-@@ -1686,13 +1686,13 @@
- (*slst)[0] = r;
- return 1;
- } else if (check_xml_par(q, "type=", "stem")) {
-- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
-+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
- } else if (check_xml_par(q, "type=", "generate")) {
-- int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
-+ int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
- if (n == 0) return 0;
- char * q3 = strstr(q2 + 1, "<word");
- if (q3) {
-- if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
-+ if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
- return generate(slst, cw, cw2);
- }
- } else {
diff --git a/hunspell/hunspell-valgrind.patch b/hunspell/hunspell-valgrind.patch
deleted file mode 100644
index 5ae1a86..0000000
--- a/hunspell/hunspell-valgrind.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- misc/hunspell-1.2.9/tests/test.sh
-+++ misc/build/hunspell-1.2.9/tests/test.sh
-@@ -41,8 +41,8 @@
- if [ ! -d $TEMPDIR/badlogs ]; then
- mkdir $TEMPDIR/badlogs
- fi
-- alias hunspell='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-hunspell'
-- alias analyze='valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/.libs/lt-analyze'
-+ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
-+ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
- fi
-
- # Tests good words
diff --git a/hunspell/hunspell-wntconfig.patch b/hunspell/hunspell-wntconfig.patch
index 9b6bc9c..1d35c36 100644
--- a/hunspell/hunspell-wntconfig.patch
+++ b/hunspell/hunspell-wntconfig.patch
@@ -1,4 +1,4 @@
---- misc/hunspell-1.2.9/config.h 2010-02-25 14:38:38.000000000 +0000
-+++ misc/build/hunspell-1.2.9/config.h 2010-02-25 14:38:42.000000000 +0000
+--- misc/hunspell-1.3.1/config.h 2010-02-25 14:38:38.000000000 +0000
++++ misc/build/hunspell-1.3.1/config.h 2010-02-25 14:38:42.000000000 +0000
@@ -1 +0,0 @@
-dummy
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index a4f7b06..440e63b 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -36,16 +36,13 @@ TARGET=hunspell
# --- Files --------------------------------------------------------
-TARFILE_NAME=hunspell-1.2.9
-TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
+TARFILE_NAME=hunspell-1.3.1
+TARFILE_MD5=9ed97fce60a9a65852402248a6659492
ADDITIONAL_FILES+=config.h
PATCH_FILES=\
hunspell-wntconfig.patch \
- hunspell-solaris.patch \
- hunspell-stacksmash.patch \
- hunspell-valgrind.patch \
- hunspell-1.2.9-crashfix.patch
+ hunspell-solaris.patch
.IF "$(GUI)"=="UNX"
commit 71534511a81585405608e73f9dd4cf8426b33f0e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 8 09:43:28 2011 +0000
still need aliasing fixes
diff --git a/boost/aliasing.patch b/boost/aliasing.patch
new file mode 100644
index 0000000..5ca5ed0
--- /dev/null
+++ b/boost/aliasing.patch
@@ -0,0 +1,43 @@
+--- misc/boost_1_44_0/boost/function/function_base.hpp
++++ misc/build/boost_1_44_0/boost/function/function_base.hpp
+@@ -2,6 +2,7 @@
+
+ // Copyright Douglas Gregor 2001-2006
+ // Copyright Emil Dotchevski 2007
++// Copyright Dean Michael Berris 2009
+ // Use, modification and distribution is subject to the Boost Software License, Version 1.0.
+ // (See accompanying file LICENSE_1_0.txt or copy at
+ // http://www.boost.org/LICENSE_1_0.txt)
+@@ -44,6 +45,13 @@
+ # pragma warning( disable : 4127 ) // "conditional expression is constant"
+ #endif
+
++#if defined(__GNUC__)
++// Because GCC complains of strict aliasing problems, we make it
++// treat the header as a system header, becoming more forgiving with
++// treating implementation details that may be potentially harmful.
++# pragma GCC system_header
++#endif
++
+ // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
+ #ifdef BOOST_NO_STD_TYPEINFO
+ // Embedded VC++ does not have type_info in namespace std
+@@ -314,15 +322,15 @@
+ {
+ if (op == clone_functor_tag || op == move_functor_tag) {
+ const functor_type* in_functor =
+- reinterpret_cast<const functor_type*>(&in_buffer.data);
++ static_cast<const functor_type*>(static_cast<void*>(&in_buffer.data));
+ new ((void*)&out_buffer.data) functor_type(*in_functor);
+
+ if (op == move_functor_tag) {
+- reinterpret_cast<functor_type*>(&in_buffer.data)->~Functor();
++ static_cast<functor_type*>(static_cast<void*>(&in_buffer.data))->~Functor();
+ }
+ } else if (op == destroy_functor_tag) {
+ // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type.
+- reinterpret_cast<functor_type*>(&out_buffer.data)->~Functor();
++ static_cast<functor_type*>(static_cast<void*>(&out_buffer.data))->~Functor();
+ } else if (op == check_functor_type_tag) {
+ const detail::sp_typeinfo& check_type
+ = *out_buffer.type.type;
diff --git a/boost/makefile.mk b/boost/makefile.mk
index fb7c1c2..c7cb3d9 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -51,6 +51,8 @@ all:
TARFILE_NAME=boost_1_44_0
TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a
PATCH_FILES=$(TARFILE_NAME).patch
+# See https://svn.boost.org/trac/boost/ticket/3780
+PATCH_FILES+=aliasing.patch
#https://svn.boost.org/trac/boost/ticket/4713
PATCH_FILES+=boost.4713.warnings.patch
#https://svn.boost.org/trac/boost/ticket/5119
More information about the Libreoffice-commits
mailing list