[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-3-13-g8e73211
The following commit has been merged in the master branch:
commit 8fa3ef8fd65216e83b969b562de6eb7ee9eb0bb6
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 12 22:47:52 2012 +0200
debian/patches/gcc-4.7.diff: add also fix for sal/qa/osl/osl_Mutex.cxx
diff --git a/changelog b/changelog
index fb9e459..4df86c0 100644
--- a/changelog
+++ b/changelog
@@ -4,9 +4,10 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
for ICU >= 4.9 support
* debian/patches/fix-system-lpsolve-build.diff: use -Wl$(COMMA)-rpath as
otherwise gbuild strips everything after the , away;
- makes it actually set the rpath
+ makes it actually set the rpath and fixes gcc 4.7 build
* debian/patches/comphelper-complex-test-fix-jdk7.diff: fix test build
with OpenJDK7
+ * debian/patches/gcc-4.7.diff: add also fix for sal/qa/osl/osl_Mutex.cxx
* debian/rules:
- readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if
@@ -25,7 +26,7 @@ libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
* debian/debian/shell-lib-extensions.sh: run unopkg list before trying
to sync; hopefully catches cases where unopkg doesn't (yet) work
- -- Rene Engelhard <rene@debian.org> Thu, 12 Apr 2012 14:38:29 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 12 Apr 2012 21:55:44 +0200
libreoffice (1:3.5.2-3) unstable; urgency=low
diff --git a/patches/gcc-4.7.diff b/patches/gcc-4.7.diff
index b55ed5e..6a6cf9a 100644
--- a/patches/gcc-4.7.diff
+++ b/patches/gcc-4.7.diff
@@ -120,3 +120,16 @@ index 093566b..cab945f 100644
libs/date_time/src/gregorian/makefile.mk
--
cgit v0.9.0.2-2-gbebe
+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();
+
--
LibreOffice packaging repository
Reply to: