summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Mehnert <hannes@gentoo.org>2003-02-28 12:10:33 +0000
committerHannes Mehnert <hannes@gentoo.org>2003-02-28 12:10:33 +0000
commit0cdd116f0025a58652650938fb07af4b64640401 (patch)
tree51fd7cf20d1659f5f17ae1b16eb8bc3cc65bf5ce /kde-base
parentChanged rsyncd.conf again, should close #15720 (diff)
downloadgentoo-2-0cdd116f0025a58652650938fb07af4b64640401.tar.gz
gentoo-2-0cdd116f0025a58652650938fb07af4b64640401.tar.bz2
gentoo-2-0cdd116f0025a58652650938fb07af4b64640401.zip
added patch to work with >=libxml2-2.5.2
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/ChangeLog5
-rw-r--r--kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff22
-rw-r--r--kde-base/kdelibs/kdelibs-3.1-r2.ebuild5
3 files changed, 29 insertions, 3 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 5c72507e108b..2b6cfddb29c8 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/kdelibs
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.58 2003/02/24 20:09:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.59 2003/02/28 12:10:33 hannes Exp $
+
+ 28 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1-r2.ebuild:
+ added fix for >=libxml2-2.5.2. closes bug #15245
15 Feb 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1-r2.ebuild:
Added ~sparc keyword.
diff --git a/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff b/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff
new file mode 100644
index 000000000000..a859d81227ae
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.1-libxml2-2.5.2.diff
@@ -0,0 +1,22 @@
+--- kdoctools/customization/entities/general.entities 2002-10-28 14:38:14.000000000 -0500
++++ kdoctools/customization/entities/general.entities 2003-02-12 14:05:19.000000000 -0500
+@@ -351,7 +351,7 @@
+ <!ENTITY SMTP "<acronym>SMTP</acronym>">
+ <!ENTITY SGI "<trademark>SGI</trademark>">
+ <!ENTITY Solaris "<trademark>Solaris</trademark>">
+-<!ENTITY SuSE '<trademark class="registered"><acronym>SuSE</acronym></trademark>'>
++<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'>
+ <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'>
+ <!ENTITY tkmidi "<application>tkmidi</application>">
+ <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'>
+--- kdoctools/customization/obsolete/general.entities 2002-04-16 11:57:18.000000000 -0400
++++ kdoctools/customization/obsolete/general.entities 2003-02-12 14:04:53.000000000 -0500
+@@ -354,7 +354,7 @@
+ <!ENTITY SMTP "<acronym>SMTP</acronym>">
+ <!ENTITY SGI "<trademark>SGI</trademark>">
+ <!ENTITY Solaris "<trademark>Solaris</trademark>">
+-<!ENTITY SuSE '<trademark class="registered"><acronym>SuSE</acronym></trademark>'>
++<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'>
+ <!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'>
+ <!ENTITY tkmidi "<application>tkmidi</application>">
+ <!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'>
diff --git a/kde-base/kdelibs/kdelibs-3.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.1-r2.ebuild
index 8798d370a28b..6e81d6eb42ad 100644
--- a/kde-base/kdelibs/kdelibs-3.1-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1-r2.ebuild,v 1.7 2003/02/15 20:56:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1-r2.ebuild,v 1.8 2003/02/28 12:10:33 hannes Exp $
inherit kde kde.org
#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
@@ -12,7 +12,8 @@ SLOT="3.1"
LICENSE="GPL-2 LGPL-2"
PATCHES="${FILESDIR}/${P}-bookmark.diff
- ${FILESDIR}/${P}-zip.diff"
+ ${FILESDIR}/${P}-zip.diff
+ ${FILESDIR}/${P}-libxml2-2.5.2.diff"
# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
# so we recreate the entire DEPEND from scratch.