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 | 7300fa437f7794ed3b9928e1d3d238fc9c4dfa2f (patch) | |
tree | c1503ba9a59c18d2b5116b125aa3b6e26975d5be /kde-base | |
parent | Make sure "gmcs" is preferred over "csc" wrt #329651 by Conway S. Smith. (diff) | |
download | historical-7300fa437f7794ed3b9928e1d3d238fc9c4dfa2f.tar.gz historical-7300fa437f7794ed3b9928e1d3d238fc9c4dfa2f.tar.bz2 historical-7300fa437f7794ed3b9928e1d3d238fc9c4dfa2f.zip |
Apply patch from kde-testing that fixes doc building.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdelibs/Manifest | 5 | ||||
-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 |
4 files changed, 23 insertions, 5 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/Manifest b/kde-base/kdelibs/Manifest index 3acabe19fdac..589c3a1ee192 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -19,11 +19,12 @@ AUX kdelibs-4.3.80-module-suffix.patch 3919 RMD160 ed225d685594d53df9792b1472925 AUX kdelibs-4.4.2-hang.patch 2328 RMD160 776f7485b67ee3b851b060040676c366dc23db4a SHA1 6d6ac98f2ae5b566cbbfc91418ab265bb8793863 SHA256 da18313fe70d7afd69f871c51363c8b412f081815c0cbd6c5c5073fc4999b1d8 AUX kdelibs-4.4.3-mimetypes.patch 1887 RMD160 f1f371f6b405ce93b12a7ebc2631142fa1fa20a9 SHA1 64005d1d00ffb1e58572327a8aece9761e8008ab SHA256 4c724b2c3a569661b3b6035b8011293543d6c3cc6d59fe74310d9d1716e0881d AUX kdelibs-4.4.66-macos-unbundle.patch 4618 RMD160 a968d41e3b8c3f05e3b64a7487b0da0ae34fa8cc SHA1 36412cbe6b50b8b3ac5ae598910ac51dd37a48b7 SHA256 3a3b753af670cfadfb67a591c6cca5ed62ceffb97dcb326b9f2e684db1ba596d +AUX kdelibs-4.4.90-xslt.patch 553 RMD160 b667c3330a2721ab0de237f50af81ec830954c0f SHA1 24faa51f5d3645858ca55c744b9b76952eb383c6 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b DIST kdelibs-4.3.5.tar.bz2 10524879 RMD160 6b8e060854d637072fe94f0e3397ff1dd9b86583 SHA1 35dcbc06b468451cb4e839aa5771b4e6bc512188 SHA256 65823e34e2b4f6579251f3dddb23774f381c3576cca420417964027b8fe4b40e DIST kdelibs-4.4.4.tar.bz2 14086349 RMD160 9f755332927f9d3df3d80a6e72d45af0055b158f SHA1 80bc85618e628986da6ac364507188ae2c8ff95b SHA256 6f08a0c6b1be8ba5ec758722f731598efb52978fc876ec4f59728e55df6f9bcb DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f59c1 SHA1 73e37abee48536b85782d1a17f1b282313b16c4d SHA256 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085 EBUILD kdelibs-4.3.5.ebuild 8917 RMD160 6db0b2c668d78bbe3cd7ec791942fe4fb7a7742e SHA1 39363a747e7d7157972b2560bb1b13a5069b40fc SHA256 38741bcae260af8564e158d0534542bb84b1d7f159b685cb77abfc3c98e4c44a EBUILD kdelibs-4.4.4.ebuild 9275 RMD160 e4ac12f50878e7278d6962d7082530d01504cb9a SHA1 93068b445175fa24be3df615bb2c47c7b5ff72ff SHA256 0d1d08f95d3eae5a2fc8eb726cc68403dc1b9102ac8abc8b2dfd3441dbb921f0 -EBUILD kdelibs-4.4.5.ebuild 9282 RMD160 550f7cd66cb0e0fe761555ec5fa8dc8f75625f30 SHA1 57775deeb2000b3344cfbe8a52bb4e85dea8e666 SHA256 d6734b14cf933ac32539030f7d37b3d4ec5876de211c939d3e7b459e4ca7ded4 -MISC ChangeLog 115598 RMD160 adbcdb9ad4c0949a4bf71c95101bae5bfadd7ee3 SHA1 2b08d0b0026d0b3453f15b09a6c89af3b4e26024 SHA256 c58b49348a360624a9de25b4ad73e2358c870a70f4aee409f11dbd4c8a69d35f +EBUILD kdelibs-4.4.5.ebuild 9326 RMD160 e2e0fdeec428cfcbb92adcd044d87f0506392833 SHA1 c74cdd00ab61f91185d6c7c9a3b098616dc36f20 SHA256 61dc4f64336931c1585459a84416609ab1ee891349fc3bbd4773023dd18bbde7 +MISC ChangeLog 115768 RMD160 ba9a5f1bd96cae3f524062bbb237c61b7b04b630 SHA1 c2e003f79fb168afdeeab4cc0ec5bcfd4abd5f47 SHA256 bb9d0fe72324205146398f30e8862ca87018de9e657d90ab7aacf1814dc4cd57 MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a 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() { |