diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-02-24 21:53:46 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-02-24 21:53:46 +0000 |
| commit | 58eab67ade918f72082667ee3dceabbf4171a08d (patch) | |
| tree | f258116e317c2c46f207f66a4b2c8f4dedef736b /app-office/calligra | |
| parent | Move CC0-1.0-Universal from MISC-FREE to GPL-COMPATIBLE license group. Add EU... (diff) | |
| download | gentoo-2-58eab67ade918f72082667ee3dceabbf4171a08d.tar.gz gentoo-2-58eab67ade918f72082667ee3dceabbf4171a08d.tar.bz2 gentoo-2-58eab67ade918f72082667ee3dceabbf4171a08d.zip | |
Build koabstraction only if possible, bug 402655
(Portage version: 2.1.10.48/cvs/Linux x86_64)
Diffstat (limited to 'app-office/calligra')
| -rw-r--r-- | app-office/calligra/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/calligra/calligra-2.3.87.ebuild | 7 | ||||
| -rw-r--r-- | app-office/calligra/files/calligra-2.3.87-koabstr.patch | 28 |
3 files changed, 38 insertions, 3 deletions
diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog index 66e8fce7be1e..baf8eabc21c9 100644 --- a/app-office/calligra/ChangeLog +++ b/app-office/calligra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/calligra # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.21 2012/02/24 20:52:30 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.22 2012/02/24 21:53:46 dilfridge Exp $ + + 24 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> + calligra-2.3.87.ebuild, +files/calligra-2.3.87-koabstr.patch: + Build koabstraction only if possible, bug 402655 24 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> -calligra-2.3.86.ebuild, calligra-2.3.87.ebuild, calligra-9999.ebuild: diff --git a/app-office/calligra/calligra-2.3.87.ebuild b/app-office/calligra/calligra-2.3.87.ebuild index c623e9da1dbd..67ec1a60e354 100644 --- a/app-office/calligra/calligra-2.3.87.ebuild +++ b/app-office/calligra/calligra-2.3.87.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/calligra/calligra-2.3.87.ebuild,v 1.2 2012/02/24 20:52:30 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.87.ebuild,v 1.3 2012/02/24 21:53:46 dilfridge Exp $ # note: files that need to be checked for dependencies etc: # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt @@ -115,7 +115,10 @@ DEPEND="${RDEPEND}" RESTRICT=test # bug 394273 -PATCHES=( "${FILESDIR}/${P}-marble.patch" ) +PATCHES=( + "${FILESDIR}/${P}-marble.patch" + "${FILESDIR}/${P}-koabstr.patch" +) src_configure() { local cal_ft diff --git a/app-office/calligra/files/calligra-2.3.87-koabstr.patch b/app-office/calligra/files/calligra-2.3.87-koabstr.patch new file mode 100644 index 000000000000..83e4da932f0e --- /dev/null +++ b/app-office/calligra/files/calligra-2.3.87-koabstr.patch @@ -0,0 +1,28 @@ +From b4c55f40811cdb7ae990eeeca26757ad85ba42c8 Mon Sep 17 00:00:00 2001 +From: Andreas K. Huettel (dilfridge) <mail@akhuettel.de> +Date: Fri, 24 Feb 2012 22:24:14 +0100 +Subject: [PATCH] Only build koabstraction if words, tables and stage are really built (not just can be built) + +--- + CMakeLists.txt | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8701780..5d8434e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -600,9 +600,9 @@ if(SHOULD_BUILD_ACTIVE) + endif(SHOULD_BUILD_ACTIVE) + + +-if(NOT SHOULD_BUILD_TABLES OR NOT SHOULD_BUILD_WORDS OR NOT SHOULD_BUILD_STAGE) ++if(NOT SHOULD_BUILD_TABLES OR NOT BUILD_tables OR NOT SHOULD_BUILD_WORDS OR NOT BUILD_words OR NOT SHOULD_BUILD_STAGE OR NOT BUILD_stage) + set(SHOULD_BUILD_KOABSTRACTION FALSE) +-endif(NOT SHOULD_BUILD_TABLES OR NOT SHOULD_BUILD_WORDS OR NOT SHOULD_BUILD_STAGE) ++endif(NOT SHOULD_BUILD_TABLES OR NOT BUILD_tables OR NOT SHOULD_BUILD_WORDS OR NOT BUILD_words OR NOT SHOULD_BUILD_STAGE OR NOT BUILD_stage) + + if(SHOULD_BUILD_KOABSTRACTION) + # koabstraction depends on kotext & flake +-- +1.7.3.4 + |