[libreoffice] 01/01: debian/patches/fix-powerpc-build.diff: as name says; fix bigendian build
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 6dfecda7c50044e2b4dfdfb047cd63718c45ff94
Author: Rene Engelhard <rene@debian.org>
Date: Mon Dec 7 17:53:53 2015 +0100
debian/patches/fix-powerpc-build.diff: as name says; fix bigendian build
---
changelog | 7 +++++++
patches/fix-powerpc-build.diff | 30 ++++++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 38 insertions(+)
diff --git a/changelog b/changelog
index b68a70d..93e6a74 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.1.0~beta2-2) UNRELEASED; urgency=medium
+
+ * debian/patches/fix-powerpc-build.diff: as name says; fix bigendian
+ build
+
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Dec 2015 17:47:52 +0100
+
libreoffice (1:5.1.0~beta2-1) experimental; urgency=medium
* New upstream beta release
diff --git a/patches/fix-powerpc-build.diff b/patches/fix-powerpc-build.diff
new file mode 100644
index 0000000..42be284
--- /dev/null
+++ b/patches/fix-powerpc-build.diff
@@ -0,0 +1,30 @@
+From 571f51c424ea50c31b85003fa68f420f0573065f Mon Sep 17 00:00:00 2001
+From: Noel Grandin <noel@peralex.com>
+Date: Mon, 7 Dec 2015 11:10:03 +0200
+Subject: fix powerpc build
+
+fallout from the wide char changes
+
+<sberg> noelgrandin, _rene_, ah, yeah, that's something that broke with 0b07406f7147b9abbb2095d9e038b13293cb8b10
+<IZBot> core - Use C++11 char16_t for sal_Unicode - http://cgit.freedesktop.org/libreoffice/core/commit/?id=0b07406f7147b9abbb2095d9e038b13293cb8b10
+
+Change-Id: If4303bd1d8577612250b1857b809b022d13759e4
+(cherry picked from commit b2d145193e34b57ca991063fc7c3cf8200339dea)
+
+diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
+index 516c7a2..5029d5f 100644
+--- a/include/oox/helper/helper.hxx
++++ b/include/oox/helper/helper.hxx
+@@ -218,6 +218,9 @@ public:
+ #ifdef OSL_BIGENDIAN
+ static void convertLittleEndian( sal_Int8& ) {} // present for usage in templates
+ static void convertLittleEndian( sal_uInt8& ) {} // present for usage in templates
++#if !defined SAL_W32 || defined __MINGW32__ // cf. sal/types.h sal_Unicode
++ static void convertLittleEndian( char16_t& rnValue ) { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); }
++#endif
+ static void convertLittleEndian( sal_Int16& rnValue ) { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); }
+ static void convertLittleEndian( sal_uInt16& rnValue ) { swap2( reinterpret_cast< sal_uInt8* >( &rnValue ) ); }
+ static void convertLittleEndian( sal_Int32& rnValue ) { swap4( reinterpret_cast< sal_uInt8* >( &rnValue ) ); }
+--
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index d15bf09..5cfb56d 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
poms.diff
+fix-powerpc-build.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: