diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-07-24 08:14:50 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-07-24 08:14:50 +0000 |
commit | 735b86f6a8c0e70d14eabda5991a6ba1f29f778b (patch) | |
tree | 862a1768732d81fac163a19a9c1236b7deeabad0 | |
parent | Removed dev-ruby/amrita from tree. (diff) | |
download | gentoo-2-735b86f6a8c0e70d14eabda5991a6ba1f29f778b.tar.gz gentoo-2-735b86f6a8c0e70d14eabda5991a6ba1f29f778b.tar.bz2 gentoo-2-735b86f6a8c0e70d14eabda5991a6ba1f29f778b.zip |
Apply patch from kde-testing that fixes doc building.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch | 12 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.4.5.ebuild | 5 |
3 files changed, 20 insertions, 3 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 14c1ce9007c1..1247c632e198 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.694 2010/07/23 23:00:29 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.695 2010/07/24 08:14:49 scarabeus Exp $ + + 24 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> kdelibs-4.4.5.ebuild, + +files/kdelibs-4.4.90-xslt.patch: + Apply patch from kde-testing that fixes doc building. 23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> kdelibs-4.4.5.ebuild: Use virtual/jpeg. diff --git a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch new file mode 100644 index 000000000000..0d25ada337b0 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch @@ -0,0 +1,12 @@ +diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl +--- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl 2008-05-21 13:07:13.000000000 +0200 ++++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl 2010-07-08 23:32:28.184204481 +0200 +@@ -35,7 +35,7 @@ + </entry> + </xsl:template> + +-<xsl:template match="sect*/title|emphasis"> ++<xsl:template match="*[starts-with(local-name(), 'sect')]/title|emphasis"> + <entry header="2"> + <xsl:apply-templates/> + </entry> diff --git a/kde-base/kdelibs/kdelibs-4.4.5.ebuild b/kde-base/kdelibs/kdelibs-4.4.5.ebuild index f9cf0c40af1b..92341eeba955 100644 --- a/kde-base/kdelibs/kdelibs-4.4.5.ebuild +++ b/kde-base/kdelibs/kdelibs-4.4.5.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/kdelibs/kdelibs-4.4.5.ebuild,v 1.3 2010/07/23 23:00:29 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.5.ebuild,v 1.4 2010/07/24 08:14:49 scarabeus Exp $ EAPI="3" @@ -30,7 +30,7 @@ COMMONDEPEND=" media-libs/fontconfig media-libs/freetype:2 media-libs/giflib - virtual/jpeg + media-libs/jpeg:0 >=media-libs/libpng-1.4 sys-libs/zlib >=x11-misc/shared-mime-info-0.60 @@ -126,6 +126,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" "${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch" "${FILESDIR}/${PN}-4.4.3-mimetypes.patch" + "${FILESDIR}/${PN}-4.4.90-xslt.patch" ) src_prepare() { |