Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a129b0fdec25982263337eef7e1cceeca6564414

commit a129b0fdec25982263337eef7e1cceeca6564414
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Tue Aug 23 09:17:22 2011 +0200

libreoffice-3.4.2.3-1-i686

- add patch to build with gcc-4.6

diff --git 
a/source/xapps/libreoffice/0001-workaround-for-x86-gcc-4.6.1-link-failure.patch 
b/source/xapps/libreoffice/0001-workaround-for-x86-gcc-4.6.1-link-failure.patch
new file mode 100644
index 0000000..d546819
--- /dev/null
+++ 
b/source/xapps/libreoffice/0001-workaround-for-x86-gcc-4.6.1-link-failure.patch
@@ -0,0 +1,45 @@
+From 148e0ccb50ce419e18e452eb7ccfe03cb4881634 Mon Sep 17 00:00:00 2001
+From: =?latin2?q?Caol=E1n=20McNamara?= <caol...@redhat.com>
+Date: Tue, 5 Jul 2011 10:22:23 +0100
+Subject: [PATCH] workaround for x86 gcc 4.6.1 link failure
+
+---
+ sc/Library_vbaobj.mk |   15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
+index 51d0ed5..58dc936 100644
+--- a/sc/Library_vbaobj.mk
++++ b/sc/Library_vbaobj.mk
+@@ -123,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
+         sc/source/ui/vba/vbaquerytable \
+         sc/source/ui/vba/vbarange \
+         sc/source/ui/vba/vbasheetobject \
+-        sc/source/ui/vba/vbasheetobjects \
+         sc/source/ui/vba/vbastyle \
+         sc/source/ui/vba/vbastyles \
+         sc/source/ui/vba/vbatextboxshape \
+@@ -138,6 +137,20 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
+         sc/source/ui/vba/vbawsfunction \
+ ))
+
++#32bit Fedora gcc 4.6.1 fails to link sc without this
++#TO-DO: make standalone reproducer for this and file
++#gcc bug
++ifeq ($(strip $(COM)),GCC)
++$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
++        sc/source/ui/vba/vbasheetobjects \
++        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
++))
++else
++$(eval $(call gb_Library_add_exception_objects,vbaobj,\
++    sc/source/ui/vba/vbasheetobjects \
++))
++endif
++
+ ifeq ($(OS),WNT)
+ $(eval $(call gb_Library_add_linked_libs,vbaobj,\
+       advapi32 \
+--
+1.7.6
+
diff --git a/source/xapps/libreoffice/FrugalBuild 
b/source/xapps/libreoffice/FrugalBuild
index a2e9a75..c9b8035 100644
--- a/source/xapps/libreoffice/FrugalBuild
+++ b/source/xapps/libreoffice/FrugalBuild
@@ -35,12 +35,13 @@ modules=('artwork' 'base' 'bootstrap' 'calc'
'impress' 'translations' 'libs-core' 'libs-extern-sys'
'libs-extern' 'libs-gui' 'postprocess' 'sdk' 'testing'
'ure' 'writer')
-source=()
+source=(0001-workaround-for-x86-gcc-4.6.1-link-failure.patch)
+signatures=('')
ext=bz2
for i in ${modules[@]}
do
source=(${source[@]} $mirror/libreoffice-$i-$pkgver.tar.$ext)
-       signatures=(${signatures[@]} 
$mirror/libreoffice-$i-$pkgver.tar.$ext.asc)
+       signatures=("${signatures[@]}" 
$mirror/libreoffice-$i-$pkgver.tar.$ext.asc)
done
ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 \
http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 \
@@ -168,6 +169,7 @@ build()
do
Fconfopts="$Fconfopts --enable-ext-$i"
done
+       Fpatchall
# FIXME --with-openclipart=/usr/share/openclipart does not fail,
# but slows down the build at the moment and in the end it does
# not do anything, so disable it for now.
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to