diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2010-11-21 22:05:15 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2010-11-21 22:05:15 +0000 |
commit | f640a2ac4b933d1ec2403e2210a9fce18a06a8ac (patch) | |
tree | 5ec603133d86951e69bc1e2d8dbce8d02f64340d /kde-base | |
parent | Automated update of use.local.desc (diff) | |
download | gentoo-2-f640a2ac4b933d1ec2403e2210a9fce18a06a8ac.tar.gz gentoo-2-f640a2ac4b933d1ec2403e2210a9fce18a06a8ac.tar.bz2 gentoo-2-f640a2ac4b933d1ec2403e2210a9fce18a06a8ac.zip |
Fixed build for USE=-handbook
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/rocs/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/rocs/files/rocs-4.5.3-double-handbook.patch | 25 | ||||
-rw-r--r-- | kde-base/rocs/files/rocs-4.5.3-double.patch | 25 | ||||
-rw-r--r-- | kde-base/rocs/rocs-4.5.3.ebuild | 7 |
4 files changed, 36 insertions, 27 deletions
diff --git a/kde-base/rocs/ChangeLog b/kde-base/rocs/ChangeLog index 1f762b5a0ea5..f16db050d611 100644 --- a/kde-base/rocs/ChangeLog +++ b/kde-base/rocs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/rocs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.21 2010/11/11 22:45:55 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/ChangeLog,v 1.22 2010/11/21 22:05:15 dilfridge Exp $ + + 21 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org> rocs-4.5.3.ebuild, + files/rocs-4.5.3-double.patch, +files/rocs-4.5.3-double-handbook.patch: + Fixed build for USE=-handbook 11 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org> rocs-4.5.3.ebuild, +files/rocs-4.5.3-double.patch: diff --git a/kde-base/rocs/files/rocs-4.5.3-double-handbook.patch b/kde-base/rocs/files/rocs-4.5.3-double-handbook.patch new file mode 100644 index 000000000000..8a73450272a7 --- /dev/null +++ b/kde-base/rocs/files/rocs-4.5.3-double-handbook.patch @@ -0,0 +1,25 @@ +diff -ru rocs-4.5.3.orig/doc/rocs/index.docbook rocs-4.5.3/doc/rocs/index.docbook +--- rocs-4.5.3.orig/doc/rocs/index.docbook 2010-06-08 12:10:55.000000000 +0200 ++++ rocs-4.5.3/doc/rocs/index.docbook 2010-11-10 01:21:53.467410347 +0100 +@@ -180,9 +180,9 @@ + </programlisting> + <para>Node Variables:</para> + <programlisting> +- double x +- double y +- double width ++ qreal x ++ qreal y ++ qreal width + string value + string name + string color // in HEXA +@@ -197,7 +197,7 @@ + string color ( em hexa ) + string value + string name +- double width ++ qreal width + string style ( dot, dash, dash dot, solid ) + + node start(); diff --git a/kde-base/rocs/files/rocs-4.5.3-double.patch b/kde-base/rocs/files/rocs-4.5.3-double.patch index 2e4152776d00..2a654df9932d 100644 --- a/kde-base/rocs/files/rocs-4.5.3-double.patch +++ b/kde-base/rocs/files/rocs-4.5.3-double.patch @@ -1,28 +1,3 @@ -diff -ru rocs-4.5.3.orig/doc/rocs/index.docbook rocs-4.5.3/doc/rocs/index.docbook ---- rocs-4.5.3.orig/doc/rocs/index.docbook 2010-06-08 12:10:55.000000000 +0200 -+++ rocs-4.5.3/doc/rocs/index.docbook 2010-11-10 01:21:53.467410347 +0100 -@@ -180,9 +180,9 @@ - </programlisting> - <para>Node Variables:</para> - <programlisting> -- double x -- double y -- double width -+ qreal x -+ qreal y -+ qreal width - string value - string name - string color // in HEXA -@@ -197,7 +197,7 @@ - string color ( em hexa ) - string value - string name -- double width -+ qreal width - string style ( dot, dash, dash dot, solid ) - - node start(); diff -ru rocs-4.5.3.orig/rocs/src/Core/edge.h rocs-4.5.3/rocs/src/Core/edge.h --- rocs-4.5.3.orig/rocs/src/Core/edge.h 2010-06-08 12:10:59.000000000 +0200 +++ rocs-4.5.3/rocs/src/Core/edge.h 2010-11-10 01:23:28.283410355 +0100 diff --git a/kde-base/rocs/rocs-4.5.3.ebuild b/kde-base/rocs/rocs-4.5.3.ebuild index 2126f56293e5..833c8b6c38b3 100644 --- a/kde-base/rocs/rocs-4.5.3.ebuild +++ b/kde-base/rocs/rocs-4.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.5.3.ebuild,v 1.2 2010/11/11 22:45:55 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/rocs/rocs-4.5.3.ebuild,v 1.3 2010/11/21 22:05:15 dilfridge Exp $ EAPI="3" @@ -18,3 +18,8 @@ DEPEND=" RDEPEND="" PATCHES=( "${FILESDIR}/${P}-double.patch" ) + +src_prepare() { + kde4-meta_src_prepare + use handbook && epatch "${FILESDIR}/${P}-double-handbook.patch" +} |