diff options
author | Caleb Tennis <caleb@gentoo.org> | 2004-04-21 01:49:48 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2004-04-21 01:49:48 +0000 |
commit | 929398e5e3818c4dc31fdadde885a4b4848b746a (patch) | |
tree | 09659797d4a1888bd6b05f1b9c62b6dedc44cddd /kde-base/kdelibs | |
parent | remove old version (diff) | |
download | historical-929398e5e3818c4dc31fdadde885a4b4848b746a.tar.gz historical-929398e5e3818c4dc31fdadde885a4b4848b746a.tar.bz2 historical-929398e5e3818c4dc31fdadde885a4b4848b746a.zip |
Remove old version
Diffstat (limited to 'kde-base/kdelibs')
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 7 | ||||
-rw-r--r-- | kde-base/kdelibs/files/digest-kdelibs-3.0.5b-r1 | 1 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.0.5b-http.patch | 48 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.0.5b-khtml.patch | 27 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.0.5b-libxml2-2.5.2.diff | 11 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild | 70 |
6 files changed, 6 insertions, 158 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index bc56ad71c96c..adb98d59300f 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.132 2004/04/21 01:03:56 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.133 2004/04/21 01:49:48 caleb Exp $ + + 20 Apr 2004; Caleb Tennis <caleb@gentoo.org> + -files/kdelibs-3.0.5b-http.patch, -files/kdelibs-3.0.5b-khtml.patch, + -files/kdelibs-3.0.5b-libxml2-2.5.2.diff, -kdelibs-3.0.5b-r1.ebuild: + Remove old version 20 Apr 2004; Caleb Tennis <caleb@gentoo.org> +files/kdelibs-3.2.2-su.cpp.diff: diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.0.5b-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.0.5b-r1 deleted file mode 100644 index 13369594cf91..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.0.5b-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 50b483665bc868f2dbc53aaaa3c2f302 kdelibs-3.0.5b.tar.bz2 7610088 diff --git a/kde-base/kdelibs/files/kdelibs-3.0.5b-http.patch b/kde-base/kdelibs/files/kdelibs-3.0.5b-http.patch deleted file mode 100644 index 0c724255e97e..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.0.5b-http.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- kioslave/http/http.cc 7 Dec 2002 16:17:53 -0000 1.470.2.20 -+++ kioslave/http/http.cc 4 Jul 2003 13:29:57 -0000 -@@ -195,20 +195,33 @@ - m_maxCacheAge = config()->readNumEntry("MaxCacheAge", DEFAULT_MAX_CACHE_AGE); - m_request.window = config()->readEntry("window-id"); - -- bool sendReferrer = config()->readBoolEntry("SendReferrer", true); -- if ( sendReferrer ) -- m_request.referrer = metaData("referrer"); -- else -- m_request.referrer = QString::null; -- -- if (!m_request.referrer.startsWith("http")) -+ -+ m_request.referrer = QString::null; -+ if ( config()->readBoolEntry("SendReferrer", true) ) - { -- if (m_request.referrer.startsWith("webdav")) -- m_request.referrer.replace(0, 6, "http"); -- else -- m_request.referrer = QString::null; -+ KURL referrerURL = metaData("referrer"); -+ if (referrerURL.isValid()) -+ { -+ // Sanitize -+ QString protocol = referrerURL.protocol(); -+ if (protocol.startsWith("webdav")) -+ { -+ protocol.replace(0, 6, "http"); -+ referrerURL.setProtocol(protocol); -+ } -+ -+ if ((protocol == "http") || -+ ((protocol == "https") && ((m_protocol == "https") || (m_protocol == "webdavs"))) -+ ) -+ { -+ referrerURL.setRef(QString::null); -+ referrerURL.setUser(QString::null); -+ referrerURL.setPass(QString::null); -+ m_request.referrer = referrerURL.url(); -+ } -+ } - } -- -+ - if ( config()->readBoolEntry("SendLanguageSettings", true) ) - { - m_request.charsets = config()->readEntry( "Charsets", "iso-8859-1" ); diff --git a/kde-base/kdelibs/files/kdelibs-3.0.5b-khtml.patch b/kde-base/kdelibs/files/kdelibs-3.0.5b-khtml.patch deleted file mode 100644 index df0e96dac366..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.0.5b-khtml.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- khtml/html/html_documentimpl.cpp 6 Sep 2002 23:13:21 -0000 1.139.2.2 -+++ khtml/html/html_documentimpl.cpp 10 Jul 2003 11:15:34 -0000 -@@ -84,7 +84,23 @@ - DOMString HTMLDocumentImpl::referrer() const - { - if ( view() ) -- return view()->part()->referrer(); -+ { -+ KURL referrerURL = view()->part()->referrer(); -+ if (referrerURL.isValid()) -+ { -+ QString protocol = referrerURL.protocol(); -+ -+ if ((protocol == "http") || -+ ((protocol == "https") && (view()->part()->url().protocol() == "https"))) -+ { -+ referrerURL.setRef(QString::null); -+ referrerURL.setUser(QString::null); -+ referrerURL.setPass(QString::null); -+ return referrerURL.url(); -+ } -+ } -+ } -+ - return DOMString(); - } - diff --git a/kde-base/kdelibs/files/kdelibs-3.0.5b-libxml2-2.5.2.diff b/kde-base/kdelibs/files/kdelibs-3.0.5b-libxml2-2.5.2.diff deleted file mode 100644 index 19c0ef9c9aab..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.0.5b-libxml2-2.5.2.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- kdoctools/customization/entities/general.entities~ 2003-03-14 23:11:41.000000000 +0100 -+++ kdoctools/customization/entities/general.entities 2003-03-14 23:12:24.000000000 +0100 -@@ -353,7 +353,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.0.5b-r1.ebuild b/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild deleted file mode 100644 index 793e9185fc8b..000000000000 --- a/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild,v 1.6 2004/03/16 18:20:07 caleb Exp $ -inherit kde eutils -#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! - -IUSE="alsa cups ipv6 ssl" -DESCRIPTION="KDE $PV - base libraries needed by all kde programs" -KEYWORDS="x86 ppc ~alpha sparc" -HOMEPAGE="http//www.kde.org/" -SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2" -SLOT="3.0" -LICENSE="GPL-2 LGPL-2" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire -# DEPEND from scratch. -DEPEND="" -RDEPEND="" -newdepend "dev-lang/perl - >=media-libs/audiofile-0.1.9 - >=app-arch/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 virtual/alsa ) - cups? ( >=net-print/cups-1.1.14 ) - >=media-libs/tiff-3.5.5 - app-admin/fam - ~kde-base/arts-1.0.5b - virtual/ghostscript - sys-devel/gettext" - -newdepend "/autotools" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python - >=sys-apps/portage-2.0.36" # for bug #7359 - -myconf="$myconf --with-distribution=Gentoo" -use ipv6 || myconf="$myconf --with-ipv6-lookup=no" -use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" -use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" -use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - -[ "$ARCH" == "x86" ] && myconf="$myconf --enable-fast-malloc=full" - -qtver-from-kdever ${PV} -need-qt $selected_version - -set-kdedir $PV - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-libxml2-2.5.2.diff - epatch ${FILESDIR}/${P}-http.patch - epatch ${FILESDIR}/${P}-khtml.patch - kde_sandbox_patch ${S}/kio/misc/kpac -} - - -src_install() { - - kde_src_install - dohtml *.html - -} |