[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-1-2-g7576571
The following commit has been merged in the master branch:
commit 7576571c94d16ef8921baae62b09403f734c869e
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jun 5 15:15:41 2012 +0200
readd -fsigned-char for ppc
diff --git a/changelog b/changelog
index 93f0fdd..23a0e11 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,12 @@
libreoffice (1:3.5.4-2) unstable; urgency=medium
+ * debian/patches/ppc-readd-fsigned-char.diff: backport
+ 7ef203d2bf72f7d96fd10d1297af06e82550a1c4 from master, as name says
+
* debian/rules:
- sigh. fix $(error clause in gcj builds
- -- Rene Engelhard <rene@debian.org> Tue, 05 Jun 2012 12:08:20 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 05 Jun 2012 15:13:17 +0200
libreoffice (1:3.5.4-1) unstable; urgency=medium
diff --git a/patches/ppc-readd-fsigned-char.diff b/patches/ppc-readd-fsigned-char.diff
new file mode 100644
index 0000000..dbec561
--- /dev/null
+++ b/patches/ppc-readd-fsigned-char.diff
@@ -0,0 +1,30 @@
+From 7ef203d2bf72f7d96fd10d1297af06e82550a1c4 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Mon, 14 May 2012 12:25:24 +0000
+Subject: Revert "sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove -fsigned-char"
+
+This reverts commit 875c9a28f49c7a73607fcdfac245b648801dccee.
+because it doesn't make sense to build the dmake modules
+without -fsigned-char and the gbuild modules with -fsigned-char
+
+and we're still got a few bugs where we assume chars are signed
+
+Conflicts:
+
+ solenv/inc/unxlngppc.mk
+
+Change-Id: I6ac07fa3ebadd83efd0da1ee69a010b62dfaad59
+---
+diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
+index 2c690b1..39d3028 100644
+--- a/solenv/inc/unxlngppc.mk
++++ b/solenv/inc/unxlngppc.mk
+@@ -31,3 +31,6 @@ CDEFAULTOPT=-Os
+ PICSWITCH:=-fPIC
+ .INCLUDE : unxlng.mk
+ CDEFS+=-DPOWERPC -DPPC
++CFLAGS+=-fsigned-char
++CFLAGSCC+=-fsigned-char
++CFLAGSCXX+=-fsigned-char
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 00dc761..7f11926 100644
--- a/patches/series
+++ b/patches/series
@@ -37,3 +37,4 @@ lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.diff
fix-Test-BigPtrArray-on-64bit-bigendian.diff
yyinput-fix-for-unsigned-char.diff
+ppc-readd-fsigned-char.diff
--
LibreOffice packaging repository
Reply to: