[Frugalware-git] frugalware-current: libreoffice-3.4.2.3-1-i686
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 000..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
[Frugalware-git] frugalware-current: libreoffice-3.4.2.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f095ba92535d7a80eb6ca75e30d09e64c4143608 commit f095ba92535d7a80eb6ca75e30d09e64c4143608 Author: Miklos Vajna vmik...@frugalware.org Date: Thu Aug 18 12:26:43 2011 +0200 libreoffice-3.4.2.3-1-i686 - source fix diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index 0eab268..b3caf5d 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -4,7 +4,8 @@ pkgname=libreoffice pkgver=3.4.2.3 -branch=3.4 +minor=${pkgver%%.?} # x.y.z +major=${pkgver%%.?.?} # x.y pkgrel=1 pkgdesc=LibreOffice Productivity Suite, a fork of OpenOffice.org. url=http://www.documentfoundation.org/download/; @@ -26,7 +27,7 @@ makedepends=('curl=7.20.0-2' 'intltool' 'tcsh' 'ecj' 'apache-ant' \ groups=('xapps') archs=('i686' 'x86_64') replaces=('ooextras') -mirror=http://download.documentfoundation.org/libreoffice/src/; +mirror=http://download.documentfoundation.org/libreoffice/src/$minor; _F_archive_name=libreoffice-bootstrap up2date=Flasttar $mirror modules=('artwork' 'base' 'bootstrap' 'calc' @@ -41,14 +42,14 @@ do source=(${source[@]} $mirror/libreoffice-$i-$pkgver.tar.$ext) signatures=(${signatures[@]} $mirror/libreoffice-$i-$pkgver.tar.$ext.asc) done -ext_source=(http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll \ - http://download.go-oo.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \ - http://download.go-oo.org/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \ - http://download.go-oo.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \ - http://download.go-oo.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \ - http://download.go-oo.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \ - http://download.go-oo.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \ - http://download.go-oo.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) +ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll \ + http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \ + http://dev-www.libreoffice.org/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz \ + http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip \ + http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \ + http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \ + http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \ + http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) for i in ${ext_source[@]} do source=(${source[@]} $i) @@ -219,8 +220,8 @@ build() Fmkdir /usr/share/{applications,icons} for i in base calc draw impress math writer do - Fsed libreoffice$branch 'libreoffice' $Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Exec= - Fsed libreoffice${branch/.}- '' $Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Icon= + Fsed libreoffice$major 'libreoffice' $Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Exec= + Fsed libreoffice${major/.}- '' $Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Icon= Fln /usr/lib/libreoffice/share/xdg/$i.desktop /usr/share/applications/$i.desktop done cd - @@ -260,14 +261,14 @@ build() done ## Split KDE stuff - echo /usr/lib/libreoffice/basis$branch/program/fps_kde4.uno.so $Fdestdir/gid_Module_Optional_Kde - echo /usr/lib/libreoffice/basis$branch/program/libvclplug_kde4l*.so $Fdestdir/gid_Module_Optional_Kde + echo /usr/lib/libreoffice/basis$major/program/fps_kde4.uno.so $Fdestdir/gid_Module_Optional_Kde + echo /usr/lib/libreoffice/basis$major/program/libvclplug_kde4l*.so $Fdestdir/gid_Module_Optional_Kde Fsplit $pkgname-kde $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Kde|sort -u) ## Split GNOME stuff sed -i '/ucpgvfs1.uno.so/d' $Fdestdir/gid_Module_Optional_Gnome - echo /usr/lib/libreoffice/basis$branch/program/fps_gnome.uno.so $Fdestdir/gid_Module_Optional_Gnome - echo /usr/lib/libreoffice/basis$branch/program/libvclplug_gtkl*.so $Fdestdir/gid_Module_Optional_Gnome + echo /usr/lib/libreoffice/basis$major/program/fps_gnome.uno.so $Fdestdir/gid_Module_Optional_Gnome + echo /usr/lib/libreoffice/basis$major/program/libvclplug_gtkl*.so $Fdestdir/gid_Module_Optional_Gnome Fsplit $pkgname-gnome $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Gnome|sort -u) Fbuild_gnome_scriptlet ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libreoffice-3.4.2.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=12675140780e4f7064227e89378a25593c89c579 commit 12675140780e4f7064227e89378a25593c89c579 Author: Miklos Vajna vmik...@frugalware.org Date: Thu Aug 18 12:32:04 2011 +0200 libreoffice-3.4.2.3-1-i686 - cosmetics diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index b3caf5d..a2e9a75 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -260,12 +260,12 @@ build() done done - ## Split KDE stuff + # Split KDE stuff echo /usr/lib/libreoffice/basis$major/program/fps_kde4.uno.so $Fdestdir/gid_Module_Optional_Kde echo /usr/lib/libreoffice/basis$major/program/libvclplug_kde4l*.so $Fdestdir/gid_Module_Optional_Kde Fsplit $pkgname-kde $(grep -v '^%dir' $Fdestdir/gid_Module_Optional_Kde|sort -u) - ## Split GNOME stuff + # Split GNOME stuff sed -i '/ucpgvfs1.uno.so/d' $Fdestdir/gid_Module_Optional_Gnome echo /usr/lib/libreoffice/basis$major/program/fps_gnome.uno.so $Fdestdir/gid_Module_Optional_Gnome echo /usr/lib/libreoffice/basis$major/program/libvclplug_gtkl*.so $Fdestdir/gid_Module_Optional_Gnome ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libreoffice-3.4.2.3-1-i686
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e22fc95ffc639307b77fd92dc0b4e258a62bd3f commit 5e22fc95ffc639307b77fd92dc0b4e258a62bd3f Author: Miklos Vajna vmik...@frugalware.org Date: Tue Aug 2 10:34:13 2011 +0200 libreoffice-3.4.2.3-1-i686 - upgrade to 3.4.2 (fixes various crashers, eg in lomath) - fix icons in desktop files once again diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index d9fd96c..0eab268 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Laszlo Dvornik dvor...@gnome.hu pkgname=libreoffice -pkgver=3.4.1.3 +pkgver=3.4.2.3 branch=3.4 pkgrel=1 pkgdesc=LibreOffice Productivity Suite, a fork of OpenOffice.org. @@ -220,7 +220,7 @@ build() for i in base calc draw impress math writer do Fsed libreoffice$branch 'libreoffice' $Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Exec= - Fsed libreoffice${branch/.} 'libreoffice' $Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Icon= + Fsed libreoffice${branch/.}- '' $Fdestdir/usr/lib/libreoffice/share/xdg/$i.desktop # Fix Icon= Fln /usr/lib/libreoffice/share/xdg/$i.desktop /usr/share/applications/$i.desktop done cd - ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git