diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2009-05-26 15:19:40 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2009-05-26 15:19:40 +0000 |
| commit | de3a5974e52ba7c60834e2dc067cbd3a251e6223 (patch) | |
| tree | 58786c5c7e2b5983896ad83df6c4c12e16609595 /kde-base/kdelibs | |
| parent | Remove -Werror, causing build to abort with gcc-4.4.0. Bug #271251 (diff) | |
| download | gentoo-2-de3a5974e52ba7c60834e2dc067cbd3a251e6223.tar.gz gentoo-2-de3a5974e52ba7c60834e2dc067cbd3a251e6223.tar.bz2 gentoo-2-de3a5974e52ba7c60834e2dc067cbd3a251e6223.zip | |
Fix perl highlight syntax, bug 247817
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.5-perl.xml.patch | 11 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild | 4 |
3 files changed, 19 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 51208a615c7d..e4a92162f37b 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.593 2009/05/21 21:56:06 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.594 2009/05/26 15:19:40 tampakrap Exp $ + + 26 May 2009; Theo Chatzimichos <tampakrap@gentoo.org> + kdelibs-3.5.10-r5.ebuild, +files/kdelibs-3.5-perl.xml.patch: + Fix perl highlight syntax, bug 247817 21 May 2009; Peter Alfredsen <loki_val@gentoo.org> kdelibs-3.5.10-r5.ebuild, +files/kdelibs-3.5.10-glibc-2.10.patch: diff --git a/kde-base/kdelibs/files/kdelibs-3.5-perl.xml.patch b/kde-base/kdelibs/files/kdelibs-3.5-perl.xml.patch new file mode 100644 index 000000000000..74b476bda53d --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-3.5-perl.xml.patch @@ -0,0 +1,11 @@ +--- kate/data/perl.xml 2005-11-09 00:38:50.000000000 +0200 ++++ kate/data/perl.xml 2009-05-26 18:07:35.000000000 +0300 +@@ -363,7 +363,7 @@ + <RegExpr attribute="Normal Text" context="#stay" String="\w+[=]" /> + + <RegExpr attribute="Operator" context="find_quoted" String="\bq(?=[qwx]?\s*[^\w\s])" /> +- <RegExpr attribute="Operator" context="find_subst" String="\bs(?=\s*[^\w\s])" /> ++ <RegExpr attribute="Operator" context="find_subst" String="\bs(?=[^\w\s\]})])" /> + <RegExpr attribute="Operator" context="tr" String="\b(?:tr|y)\s*(?=[^\w\s\]})])" /> + + <RegExpr attribute="Operator" context="find_pattern" String="\b(?:m|qr)(?=\s*[^\w\s\]})])" /> diff --git a/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild b/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild index 1a5a5fbecaf7..c63bf62800a9 100644 --- a/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild,v 1.2 2009/05/21 21:56:06 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild,v 1.3 2009/05/26 15:19:40 tampakrap Exp $ EAPI="1" inherit kde flag-o-matic eutils multilib @@ -151,6 +151,8 @@ src_unpack() { #Fix glibc-2.10 compilation ( Bug 270404 ) epatch "${FILESDIR}/${P}-glibc-2.10.patch" + + epatch "${FILESDIR}/${PN}-3.5-perl.xml.patch" } src_compile() { |