diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-04 17:56:40 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-04 17:56:40 +0000 |
| commit | 5c5e483c630be1c4a8b3d33da3cd6ced9ef71a42 (patch) | |
| tree | deb73f0182d85e27ce234fe79b1e12969c0967bd /app-office | |
| parent | Punt libwpg from here. (diff) | |
| download | gentoo-2-5c5e483c630be1c4a8b3d33da3cd6ced9ef71a42.tar.gz gentoo-2-5c5e483c630be1c4a8b3d33da3cd6ced9ef71a42.tar.bz2 gentoo-2-5c5e483c630be1c4a8b3d33da3cd6ced9ef71a42.zip | |
Add as-needed patch, on request from scarabeus; fixes bug 376985
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-binfilter-as-needed.patch | 32 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.2.3.ebuild | 3 |
3 files changed, 39 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index a94bef32cb87..d4e7b7428da5 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.84 2011/08/04 16:31:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.85 2011/08/04 17:56:40 dilfridge Exp $ + + 04 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + libreoffice-3.4.2.3.ebuild, +files/libreoffice-binfilter-as-needed.patch: + Add as-needed patch, on request from scarabeus; fixes bug 376985 04 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild: diff --git a/app-office/libreoffice/files/libreoffice-binfilter-as-needed.patch b/app-office/libreoffice/files/libreoffice-binfilter-as-needed.patch new file mode 100644 index 000000000000..1dddb0edf5f5 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-binfilter-as-needed.patch @@ -0,0 +1,32 @@ +From 7f54882a2b2a769a49d539fac0922320de51c848 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Mon, 1 Aug 2011 21:16:58 +0200 +Subject: [PATCH] fix build with -Wl,--no-as-needed + +--- + binfilter/filter/source/bf_offwrp/makefile.mk | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk b/binfilter/filter/source/bf_offwrp/makefile.mk +index d65beed..0545931 100644 +--- a/binfilter/filter/source/bf_offwrp/makefile.mk ++++ b/binfilter/filter/source/bf_offwrp/makefile.mk +@@ -52,7 +52,6 @@ SHL1STDLIBS= \ + $(BFSVTOOLLIB) \ + $(BFOFALIB) \ + $(VCLLIB) \ +- $(SOTLIB) \ + $(SALLIB) \ + $(TOOLSLIB) \ + $(CPPULIB) \ +@@ -64,6 +63,7 @@ SHL1STDLIBS= \ + $(BFSCLIB) \ + $(BFSVXLIB) \ + $(BFSO3LIB) \ ++ $(SOTLIB) \ + $(UNOTOOLSLIB) \ + $(COMPHELPERLIB) \ + $(LEGACYSMGRLIB) +-- +1.7.3.4 + diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild index fb3813ac3cc5..3b4c9d6921c5 100644 --- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.18 2011/08/04 16:31:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.19 2011/08/04 17:56:40 dilfridge Exp $ EAPI=3 @@ -239,6 +239,7 @@ PATCHES=( "${FILESDIR}/${PN}-check-for-avx.patch" "${FILESDIR}/${PN}-append-no-avx.patch" "${FILESDIR}/${PN}-32b-qt4-libdir.patch" + "${FILESDIR}/${PN}-binfilter-as-needed.patch" ) # Uncoment me when updating to eapi4 |