[libreoffice/f17] Resolves: rhbz#811226 ARM FTBFS
Caolán McNamara
caolanm at fedoraproject.org
Thu May 17 11:11:45 UTC 2012
commit 5795d496853b8367d2889dbcf37cec1dc3e28635
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 17 12:11:40 2012 +0100
Resolves: rhbz#811226 ARM FTBFS
...uildissue-in-svtools-with-missing-include.patch | 28 ++++++
...ix-unable-to-find-string-literal-operator.patch | 26 ++++++
...-returns-a-int-truncating-to-unsigned-cha.patch | 91 ++++++++++++++++++++
libreoffice.spec | 11 ++-
4 files changed, 155 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-buildissue-in-svtools-with-missing-include.patch b/0001-Fix-buildissue-in-svtools-with-missing-include.patch
new file mode 100644
index 0000000..1ff4244
--- /dev/null
+++ b/0001-Fix-buildissue-in-svtools-with-missing-include.patch
@@ -0,0 +1,28 @@
+From 3534e99d18952fc87f98cf60eb7767374a1371c4 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <tchvatal at suse.cz>
+Date: Sun, 29 Apr 2012 10:45:59 +0200
+Subject: [PATCH] Fix buildissue in svtools with missing include.
+
+cpp: line 33, Fatal error: Cannot open include file
+"svtools/svtools.hrc"
+
+Change-Id: Ic7bd1af8f14cc0e44328c9f149c5dc45f04e5afb
+---
+ svtools/AllLangResTarget_svt.mk | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
+index 430eb23..4a4421a 100644
+--- a/svtools/AllLangResTarget_svt.mk
++++ b/svtools/AllLangResTarget_svt.mk
+@@ -46,6 +46,7 @@ $(eval $(call gb_SrsTarget_use_packages,svt/res,\
+ $(eval $(call gb_SrsTarget_set_include,svt/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/svtools/source/inc \
++ -I$(SRCDIR)/svtools/inc \
+ ))
+
+ $(eval $(call gb_SrsTarget_add_files,svt/res,\
+--
+1.7.7.6
+
diff --git a/0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch b/0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch
new file mode 100644
index 0000000..325bd31
--- /dev/null
+++ b/0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch
@@ -0,0 +1,26 @@
+From 8f823b7d39154d2044e08174a858f8ef357a151a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan at gmail.com>
+Date: Thu, 5 Jan 2012 17:32:21 +0100
+Subject: [PATCH] gcc-trunk: fix: unable to find string literal operator
+ 'operator FOO'
+
+---
+ sal/qa/osl/mutex/osl_Mutex.cxx | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
+index 10a95c1..f4f34d6 100644
+--- a/sal/qa/osl/mutex/osl_Mutex.cxx
++++ b/sal/qa/osl/mutex/osl_Mutex.cxx
+@@ -754,7 +754,7 @@ namespace osl_ClearableGuard
+ TimeValue aTimeVal_after;
+ osl_getSystemTime( &aTimeVal_after );
+ sal_Int32 nSec = aTimeVal_after.Seconds - aTimeVal_befor.Seconds;
+- printf("nSec is %"SAL_PRIdINT32"\n", nSec);
++ printf("nSec is %" SAL_PRIdINT32 "\n", nSec);
+
+ myThread.join();
+
+--
+1.7.7.6
+
diff --git a/0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch b/0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch
new file mode 100644
index 0000000..2a8f154
--- /dev/null
+++ b/0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch
@@ -0,0 +1,91 @@
+From 6b3bf27cb56d661725ac3fcfb756562e0ad75564 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 14 May 2012 14:00:59 +0100
+Subject: [PATCH] ppc: yyinput returns a int, truncating to (unsigned)char
+ does't work
+
+retain this as an int so that on platforms where char is unsigned
+we don't mangle the value and get this all wrong.
+
+Fixes database opening tables on ppc if -fsigned-char is removed
+
+Change-Id: I66f0c6b1b19191595f8b348377579f2daabf7ada
+---
+ connectivity/source/parse/sqlflex.l | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
+index d5b2f14..fd27cb8 100755
+--- a/connectivity/source/parse/sqlflex.l
++++ b/connectivity/source/parse/sqlflex.l
+@@ -76,7 +76,7 @@ using namespace connectivity;
+
+ static ::rtl::OUString aEmptyString;
+
+-static sal_Int32 gatherString(sal_Int32 delim, sal_Int32 nTyp);
++static sal_Int32 gatherString(int delim, sal_Int32 nTyp);
+ static sal_Int32 gatherName(const sal_Char*);
+ static sal_Int32 gatherNamePre(const sal_Char* );
+ // has to be set before the parser starts
+@@ -94,8 +94,8 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL;
+
+ #define YY_INPUT(buf,result,max_size) \
+ { \
+- buf[0] = xxx_pGLOBAL_SQLSCAN->SQLyygetc(); \
+- result = buf[0] != -1; \
++ int c = xxx_pGLOBAL_SQLSCAN->SQLyygetc(); \
++ result = (c == EOF) ? YY_NULL : (buf[0] = c, 1);\
+ }
+
+ #define YY_FATAL_ERROR(msg) \
+@@ -518,9 +518,9 @@ inline bool checkeof(int c) { return c == 0 || c == EOF; }
+ * nTyp == 1 -> SQL_NODE_STRING
+ * nTyp == 2 -> SQL_NODE_ACCESS_DATE
+ */
+-sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
++sal_Int32 gatherString(int delim, sal_Int32 nTyp)
+ {
+- sal_Char ch;
++ int ch;
+ ::rtl::OStringBuffer sBuffer(256);
+
+ while (!checkeof(ch = yyinput()))
+@@ -547,7 +547,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
+ }
+ else
+ {
+- sBuffer.append(ch);
++ sBuffer.append(static_cast<sal_Char>(ch));
+ }
+
+ }
+@@ -555,7 +555,7 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp)
+ break;
+ else
+ {
+- sBuffer.append(ch);
++ sBuffer.append(static_cast<sal_Char>(ch));
+ }
+ }
+ YY_FATAL_ERROR("Unterminated name string");
+@@ -746,7 +746,7 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt)
+
+ sal_Char *s = Buffer;
+ sal_Int32 nPos = 1;
+- sal_Int32 ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' ';
++ int ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' ';
+ *s++ = ch;
+ while (!checkeof(ch = yyinput()))
+ {
+@@ -800,7 +800,7 @@ void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IPars
+ //------------------------------------------------------------------------------
+ sal_Int32 OSQLScanner::SQLyygetc(void)
+ {
+- sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? -1 : m_sStatement.getStr()[m_nCurrentPos];
++ sal_Int32 nPos = (m_nCurrentPos >= m_sStatement.getLength()) ? EOF : m_sStatement.getStr()[m_nCurrentPos];
+ m_nCurrentPos++;
+ return nPos;
+ }
+--
+1.7.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 7395107..3bfd504 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@@ -150,6 +150,9 @@ Patch36: 0001-incrementing-index-twice-in-one-run-seems-wrong.patch
Patch37: 0001-fdo-49365-correctly-map-monitor-index-back-to-screen.patch
Patch38: 0001-rhbz-809019-count-mirrored-monitors-as-one.patch
Patch39: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
+Patch40: 0001-Fix-buildissue-in-svtools-with-missing-include.patch
+Patch41: 0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch
+Patch42: 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1018,6 +1021,9 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%if %{defined rhel} && 0%{?rhel} >= 7 || %{defined fedora} && 0%{?fedora} >= 18
%patch39 -p1 -b .fdo-49849-implement-Unicode-6.1-hebrew-line.patch
%endif
+%patch40 -p1 -b .0001-Fix-buildissue-in-svtools-with-missing-include.patch
+%patch41 -p1 -b .0001-gcc-trunk-fix-unable-to-find-string-literal-operator.patch
+%patch42 -p1 -b .0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@@ -2305,6 +2311,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Thu May 17 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.3.2-6
+- Resolves: rhbz#811226 ARM FTBFS
+
* Sun May 13 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.3.2-5
- Resolves: fdo#49849 line breaking fixes for Hebrew
More information about the scm-commits
mailing list