Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (1d927c7c2950d4a1ce5f3cdaef12d3383df27b80)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (1d927c7c2950d4a1ce5f3cdaef12d3383df27b80)
  • Date: Sun, 29 Aug 2010 22:12:39 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

editors/openoffice/HISTORY | 4 ++
editors/openoffice/PRE_BUILD | 1
editors/openoffice/sal_cppu.gcc45.patch | 44
++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+)

New commits:
commit 1d927c7c2950d4a1ce5f3cdaef12d3383df27b80
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

editors/openoffice: added patch for building with g++ 4.5

diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index 564a3a1..7a82f88 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,7 @@
+2010-08-29 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD, sal_cppu.gcc45.patch: added patch for building with
+ g++ 4.5, http://www.openoffice.org/issues/show_bug.cgi?id=109853
+
2010-08-28 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 3.2.1

diff --git a/editors/openoffice/PRE_BUILD b/editors/openoffice/PRE_BUILD
index a123238..a3efc15 100755
--- a/editors/openoffice/PRE_BUILD
+++ b/editors/openoffice/PRE_BUILD
@@ -7,6 +7,7 @@ if [[ "${OOO_BINFILTER}" = 'y' ]]; then
fi &&

cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/sal_cppu.gcc45.patch &&
#
# Fix finding location of QT4 binaries to our setup
#
diff --git a/editors/openoffice/sal_cppu.gcc45.patch
b/editors/openoffice/sal_cppu.gcc45.patch
new file mode 100644
index 0000000..19a051e
--- /dev/null
+++ b/editors/openoffice/sal_cppu.gcc45.patch
@@ -0,0 +1,44 @@
+diff -r 33d9b7330d20 cppu/inc/uno/lbnames.h
+--- a/cppu/inc/uno/lbnames.h Thu May 20 16:10:52 2010 +0100
++++ b/cppu/inc/uno/lbnames.h Thu May 20 16:28:58 2010 +0100
+@@ -49,22 +49,12 @@
+ #error "sunpro cc version must be 5.x"
+ provoking error here, because PP ignores #error
+ #endif /* defined (__SUNPRO_CC) */
+-/* g++ 2.x, 3.0 */
++/* g++ 2.x, 3.x, etc. */
+ #elif defined (__GNUC__)
+-#if (__GNUC__ == 2 && __GNUC_MINOR__ == 91)
++#if (__GNUC__ <= 2)
+ #define TMP_CPPU_ENV gcc2
+-#elif (__GNUC__ == 2 && __GNUC_MINOR__ == 95)
+-#define TMP_CPPU_ENV gcc2
+-#elif (__GNUC__ == 2)
+-#error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to
try your gcc 2 version."
+-#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
+-#define __CPPU_ENV gcc3
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
+-#define __CPPU_ENV gcc3
+-#elif (__GNUC__ == 3)
+-#error "Tested gcc 3 version is <= 3.4. Patch uno/lbnames.h to try your
gcc 3 version."
+ #else
+-#error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major
version."
++#define TMP_CPPU_ENV gcc3
+ #endif /* defined (__GNUC__) */
+ #endif /* defined (_MSC_VER) */
+
+diff -r 33d9b7330d20 sal/cpprt/makefile.mk
+--- a/sal/cpprt/makefile.mk Thu May 20 16:10:52 2010 +0100
++++ b/sal/cpprt/makefile.mk Thu May 20 16:28:58 2010 +0100
+@@ -39,6 +39,11 @@
+ CFLAGS+= $(LFS_CFLAGS)
+ CXXFLAGS+= $(LFS_CFLAGS)
+
++#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43257
++.IF "$(COM)"=="GCC" && "$(CCNUMVER)" >= "000400050000" && "$(CCNUMVER)" <
"000400060000"
++CFLAGSCXX+=-fno-ipa-sra
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+
+ SLOFILES = \



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (1d927c7c2950d4a1ce5f3cdaef12d3383df27b80), Pol Vinogradov, 08/29/2010

Archive powered by MHonArc 2.6.24.

Top of Page