diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-30 12:41:44 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-30 12:41:44 +0000 |
| commit | b70ab4258324426e7d1426eda6f3f41e7c8dd7ca (patch) | |
| tree | 0a7145b43b0434543c2fe039352db82341d24b83 /app-office | |
| parent | Stable for amd64, wrt bug #412657 (diff) | |
| download | gentoo-2-b70ab4258324426e7d1426eda6f3f41e7c8dd7ca.tar.gz gentoo-2-b70ab4258324426e7d1426eda6f3f41e7c8dd7ca.tar.bz2 gentoo-2-b70ab4258324426e7d1426eda6f3f41e7c8dd7ca.zip | |
Fix missing include. Fixes bug#413777.
(Portage version: 2.2.0_alpha101/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-3.5.3-svtools-includes.patch | 29 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.5.3.2.ebuild | 3 |
3 files changed, 36 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index f311a2d446f5..9b60f8d62bbc 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.296 2012/04/30 09:37:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.297 2012/04/30 12:41:44 scarabeus Exp $ + + 30 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +files/libreoffice-3.5.3-svtools-includes.patch, libreoffice-3.5.3.2.ebuild: + Fix missing include. Fixes bug#413777. 30 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.2.2.ebuild, libreoffice-3.5.3.2.ebuild, libreoffice-3.5.9999.ebuild, diff --git a/app-office/libreoffice/files/libreoffice-3.5.3-svtools-includes.patch b/app-office/libreoffice/files/libreoffice-3.5.3-svtools-includes.patch new file mode 100644 index 000000000000..2d180968ed05 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.5.3-svtools-includes.patch @@ -0,0 +1,29 @@ +From bf277a00e352733bf52720fe4f9a1a91dcfb2e93 Mon Sep 17 00:00:00 2001 +From: Tomas Chvatal <tchvatal@suse.cz> +Date: Sun, 29 Apr 2012 08:45:59 +0000 +Subject: Fix buildissue in svtools with missing include. + +cpp: line 33, Fatal error: Cannot open include file +"svtools/svtools.hrc" + +Change-Id: Ic7bd1af8f14cc0e44328c9f149c5dc45f04e5afb +(cherry picked from commit 3534e99d18952fc87f98cf60eb7767374a1371c4) + +Conflicts: + + svtools/AllLangResTarget_svt.mk +--- +diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk +index e5d0a5b..d65a45b 100644 +--- a/svtools/AllLangResTarget_svt.mk ++++ b/svtools/AllLangResTarget_svt.mk +@@ -40,6 +40,7 @@ $(eval $(call gb_SrsTarget_set_include,svt/res,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(realpath $(SRCDIR)/svtools/source/inc) \ ++ -I$(realpath $(SRCDIR)/svtools/inc) \ + )) + + $(eval $(call gb_SrsTarget_add_files,svt/res,\ +-- +cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/libreoffice-3.5.3.2.ebuild b/app-office/libreoffice/libreoffice-3.5.3.2.ebuild index c17c3d38aa1e..3ee6bf20b947 100644 --- a/app-office/libreoffice/libreoffice-3.5.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.3.2.ebuild,v 1.3 2012/04/30 09:37:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.3.2.ebuild,v 1.4 2012/04/30 12:41:44 scarabeus Exp $ EAPI=4 @@ -192,6 +192,7 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( + "${FILESDIR}/${PN}-3.5.3-svtools-includes.patch" # this can't be upstreamed :( "${FILESDIR}/${PN}-system-pyuno.patch" "${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch" |