+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.3.ebuild,v 1.16 2005/07/25 15:29:11 caleb Exp $
-
-inherit kde flag-o-matic eutils
-set-kdedir 3.2
-
-DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
-HOMEPAGE="http://multimedia.kde.org/"
-SRC_URI="mirror://kde/stable/${PV/1.2.3/3.2.3}/src/${PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="alsa oggvorbis esd artswrappersuid mad"
-
-DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
- oggvorbis? ( media-libs/libvorbis media-libs/libogg )
- esd? ( media-sound/esound )
- mad? ( media-libs/libmad media-libs/libid3tag )
- media-libs/audiofile
- >=dev-libs/glib-2
- $(qt_min_version 3.2)
- >=sys-apps/portage-2.0.49-r8"
-
-# patch to configure.in.in that makes the vorbis, libmad deps optional
-# has no version number in its filename because it's the same for all
-# arts versions - the patched file hasn't changed in a year's time
-# PATCHES="$FILESDIR/optional-deps.diff"
-
-src_unpack() {
- kde_src_unpack
- kde_sandbox_patch ${S}/soundserver
- # for the configure.in.in patch, for some reason it's not automatically picked up
- # rm -f $S/configure
-
- cd ${S}
- use amd64 && epatch ${FILESDIR}/${P}-buffer.patch
- # this patch fixes the high cpu usage of mp3 and vorbis
- epatch ${FILESDIR}/arts-vorbis-fix.dif
-}
-
-src_compile() {
- #fix bug 13453
- filter-flags -foptimize-sibling-calls
-
- #fix bug 41980
- use sparc && filter-flags -fomit-frame-pointer
-
- myconf="$myconf `use_enable alsa`"
- myconf="$myconf `use_enable oggvorbis vorbis`"
- myconf="$myconf `use_enable mad libmad`"
-
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
- dodoc ${S}/doc/{NEWS,README,TODO}
-
- # moved here from kdelibs so that when arts is installed
- # without kdelibs it's still in the path.
- dodir /etc/env.d
-echo "PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${PREFIX}/lib
-CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/48kdepaths-3.2.3 # number goes down with version upgrade
-
- echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/57kdedir-3.2.3 # number goes up with version upgrade
-
- # used for realtime priority, but off by default as it is a security hazard
- use artswrappersuid && chmod +s ${D}/${PREFIX}/bin/artswrapper
-}
-
-pkg_postinst() {
- if ! use artswrappersuid ; then
- einfo "Run chmod +s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
- einfo "and so avoid possible skips in sound. However, on untrusted systems this"
- einfo "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
- einfo "priority, and so is off by default. See bug #7883."
- einfo "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
- fi
-}
+++ /dev/null
-MD5 fca8a9ec7538c4fe8e4c79767bb2a7e8 arts-1.2.3.tar.bz2 964576
+++ /dev/null
-MD5 3bb32c543a38bc28933e4fd16cfb4fc4 kde-i18n-ar-3.2.3.tar.bz2 2434118
-MD5 87b6277bf2dd735bcd323ee3773988c1 kde-i18n-az-3.2.3.tar.bz2 1652079
-MD5 bcd384102382fec7e2a66438d7b20b94 kde-i18n-bg-3.2.3.tar.bz2 2363102
-MD5 3bead3a0eced89efa24b356e86f1ab57 kde-i18n-bn-3.2.3.tar.bz2 837896
-MD5 4985f7c4ed57a68b149b549daec04ddc kde-i18n-bs-3.2.3.tar.bz2 2375821
-MD5 dda3119fceab9092414208cc2b783d15 kde-i18n-ca-3.2.3.tar.bz2 3291055
-MD5 b302e927b0d2a9116edfeee3c463c6c5 kde-i18n-cs-3.2.3.tar.bz2 3074432
-MD5 69fe9d51b21c73e78529f78ee7ba0e6f kde-i18n-cy-3.2.3.tar.bz2 1868726
-MD5 40087524f3c77f4b960911cdc936b12e kde-i18n-da-3.2.3.tar.bz2 11708803
-MD5 0a26b25a0057747043faf860919bc65b kde-i18n-de-3.2.3.tar.bz2 16378656
-MD5 141619407d004be6bfd32c1bd25a4cdb kde-i18n-el-3.2.3.tar.bz2 1917657
-MD5 85d057d84d3afc7467211cdd7fc4de99 kde-i18n-en_GB-3.2.3.tar.bz2 3655181
-MD5 271768ec3f63531e62fad59ef0b26791 kde-i18n-es-3.2.3.tar.bz2 7950128
-MD5 f80efd888f668eef4e71c28e57e55060 kde-i18n-et-3.2.3.tar.bz2 6293921
-MD5 b6666d9acfacb90805e59669e8de6baa kde-i18n-eu-3.2.3.tar.bz2 1914612
-MD5 044353a85ee816454e5845bf5d86d45c kde-i18n-fa-3.2.3.tar.bz2 1008328
-MD5 63b02e4681f96875362b27a0a92fa5d0 kde-i18n-fi-3.2.3.tar.bz2 2808553
-MD5 f90e90e2db9e3d7841425dc99e1ae99d kde-i18n-fr-3.2.3.tar.bz2 16486780
-MD5 537ab564ebf28f45c90a5c082bc38ab5 kde-i18n-gl-3.2.3.tar.bz2 1680654
-MD5 f4b680add4095b98ab12a84b38a7bb68 kde-i18n-he-3.2.3.tar.bz2 2505362
-MD5 3b84d297a2e4cf410529ca2934530f40 kde-i18n-hi-3.2.3.tar.bz2 2816139
-MD5 5d94deb17e83d57f2be1b9a4e8016b85 kde-i18n-hr-3.2.3.tar.bz2 2353925
-MD5 348ed36b02e91e48259496a59c0d2943 kde-i18n-hsb-3.2.3.tar.bz2 831939
-MD5 a5f47df018f50d3dd621e4e7d250a582 kde-i18n-hu-3.2.3.tar.bz2 4064723
-MD5 5796acb83ad9b46d424ed1615aa7ae0b kde-i18n-is-3.2.3.tar.bz2 2965322
-MD5 447cf9ddc51c516099e4c35d7ce8ff97 kde-i18n-it-3.2.3.tar.bz2 9423553
-MD5 4d27d60093a9e8d9f756900f74b2ebd0 kde-i18n-ja-3.2.3.tar.bz2 3618540
-MD5 7eecc374a965db2988d51432964b9e68 kde-i18n-lt-3.2.3.tar.bz2 1842117
-MD5 ff12106e4c03a45d121b0ebd421d3c24 kde-i18n-mn-3.2.3.tar.bz2 1196675
-MD5 0fdbad18353afd263cf3f827a003027c kde-i18n-ms-3.2.3.tar.bz2 770954
-MD5 59dd3c16dc5fa05179ab2fe91bae0f76 kde-i18n-nb-3.2.3.tar.bz2 3401940
-MD5 e49122065ab64398ec6792b70c2b6709 kde-i18n-nds-3.2.3.tar.bz2 927426
-MD5 6157e05e518eed6ccfb33d0ab95efc54 kde-i18n-nl-3.2.3.tar.bz2 8105192
-MD5 194ebc9716e29781525b98ab99d59844 kde-i18n-nn-3.2.3.tar.bz2 2872189
-MD5 1ae629e75a0e6c165d1fc69a0cdf33c7 kde-i18n-pl-3.2.3.tar.bz2 3432492
-MD5 b309ab5f52f5d80c0a5ec5a0a0d2145a kde-i18n-pt-3.2.3.tar.bz2 6514349
-MD5 813a76673a09a19b88c7d38ee7be8677 kde-i18n-pt_BR-3.2.3.tar.bz2 4571938
-MD5 42886f19ff9e79e54367d5b314036b83 kde-i18n-ro-3.2.3.tar.bz2 3672129
-MD5 57038a40fe2d584cb806dfa5644fcb94 kde-i18n-ru-3.2.3.tar.bz2 5580609
-MD5 30c5b9dd8e486b0d6da72a64b7fd5ea3 kde-i18n-sk-3.2.3.tar.bz2 5876725
-MD5 98abc2952445f2249616bd83792ed594 kde-i18n-sl-3.2.3.tar.bz2 5537159
-MD5 364cd41318001c022522fc0a2c5ae269 kde-i18n-sr-3.2.3.tar.bz2 3431582
-MD5 696be8a9eb97adc1e16efa1ef4dc230d kde-i18n-sv-3.2.3.tar.bz2 20644480
-MD5 81ca3f87330e09300c9d3273396aa143 kde-i18n-ta-3.2.3.tar.bz2 3445623
-MD5 99916259ed25b00b0e75781172dc0500 kde-i18n-tr-3.2.3.tar.bz2 2834869
-MD5 9f63449332cd9efe0295d1706e1bb870 kde-i18n-uk-3.2.3.tar.bz2 2444106
-MD5 f91d6874090e0cf6a6f02c45184260aa kde-i18n-uz-3.2.3.tar.bz2 932588
-MD5 0190ab8c739eecb3dac743045987615e kde-i18n-zh_CN-3.2.3.tar.bz2 2929375
-MD5 e556bf4a662de0c04a53e4f06e08b37e kde-i18n-zh_TW-3.2.3.tar.bz2 2025840
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.2.3.ebuild,v 1.9 2005/01/02 17:24:53 carlo Exp $
-
-inherit kde
-MY_PV=${PV}
-
-IUSE=""
-DESCRIPTION="KDE ${PV} - i18n: ${PN}"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc amd64 ppc ~alpha ~ia64 hppa"
-SLOT="$KDEMAJORVER.$KDEMINORVER"
-RESTRICT="nomirror"
-DEPEND="~kde-base/kdebase-${PV}
- >=sys-apps/portage-2.0.49-r8"
-need-kde ${PV}
-
-SRC_URI="linguas_ar? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-ar-${PV}.tar.bz2 )
- linguas_az? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-az-${PV}.tar.bz2 )
- linguas_bg? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-bg-${PV}.tar.bz2 )
- linguas_bn? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-bn-${PV}.tar.bz2 )
- linguas_bs? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-bs-${PV}.tar.bz2 )
- linguas_ca? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-ca-${PV}.tar.bz2 )
- linguas_cs? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-cs-${PV}.tar.bz2 )
- linguas_cy? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-cy-${PV}.tar.bz2 )
- linguas_da? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-da-${PV}.tar.bz2 )
- linguas_de? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-de-${PV}.tar.bz2 )
- linguas_el? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-el-${PV}.tar.bz2 )
- linguas_en_GB? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-en_GB-${PV}.tar.bz2 )
- linguas_es? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-es-${PV}.tar.bz2 )
- linguas_et? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-et-${PV}.tar.bz2 )
- linguas_eu? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-eu-${PV}.tar.bz2 )
- linguas_fa? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-fa-${PV}.tar.bz2 )
- linguas_fi? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-fi-${PV}.tar.bz2 )
- linguas_fr? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-fr-${PV}.tar.bz2 )
- linguas_gl? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-gl-${PV}.tar.bz2 )
- linguas_he? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-he-${PV}.tar.bz2 )
- linguas_hi? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-hi-${PV}.tar.bz2 )
- linguas_hr? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-hr-${PV}.tar.bz2 )
- linguas_hsb? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-hsb-${PV}.tar.bz2 )
- linguas_hu? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-hu-${PV}.tar.bz2 )
- linguas_is? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-is-${PV}.tar.bz2 )
- linguas_it? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-it-${PV}.tar.bz2 )
- linguas_ja? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-ja-${PV}.tar.bz2 )
- linguas_lt? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-lt-${PV}.tar.bz2 )
- linguas_mn? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-mn-${PV}.tar.bz2 )
- linguas_ms? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-ms-${PV}.tar.bz2 )
- linguas_nb? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-nb-${PV}.tar.bz2 )
- linguas_nds? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-nds-${PV}.tar.bz2 )
- linguas_nl? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-nl-${PV}.tar.bz2 )
- linguas_nn? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-nn-${PV}.tar.bz2 )
- linguas_pl? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-pl-${PV}.tar.bz2 )
- linguas_pt? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-pt-${PV}.tar.bz2 )
- linguas_pt_BR? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-pt_BR-${PV}.tar.bz2 )
- linguas_ro? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-ro-${PV}.tar.bz2 )
- linguas_ru? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-ru-${PV}.tar.bz2 )
- linguas_sk? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-sk-${PV}.tar.bz2 )
- linguas_sl? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-sl-${PV}.tar.bz2 )
- linguas_sr? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-sr-${PV}.tar.bz2 )
- linguas_sv? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-sv-${PV}.tar.bz2 )
- linguas_ta? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-ta-${PV}.tar.bz2 )
- linguas_tr? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-tr-${PV}.tar.bz2 )
- linguas_uk? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-uk-${PV}.tar.bz2 )
- linguas_uz? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-uz-${PV}.tar.bz2 )
- linguas_zh_CN? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-zh_CN-${PV}.tar.bz2 )
- linguas_zh_TW? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-zh_TW-${PV}.tar.bz2 )"
-
-src_unpack() {
-
- if [ -z "${LINGUAS}" ]; then
- ewarn
- ewarn "You must define a LINGUAS environment variable that contains a list"
- ewarn "of the language codes for which languages you would like to install."
- ewarn "e.g.: LINGUAS=\"se de pt\""
- ewarn
- die
- fi
-
- base_src_unpack unpack
-}
-
-src_compile() {
- local _S=${S}
- for dir in `ls ${WORKDIR}`; do
- S=${WORKDIR}/$dir
- kde_src_compile myconf
- myconf="$myconf --prefix=$KDEDIR -C"
- kde_src_compile configure
- kde_src_compile make
- done
- S=${_S}
-}
-
-src_install() {
- local _S=${S}
- for dir in `ls ${WORKDIR}`; do
- cd ${WORKDIR}/$dir
- make install DESTDIR=${D} destdir=${D}
- done
- S=${_S}
-}
-
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.2.3.ebuild,v 1.12 2005/07/27 18:41:17 greg_g Exp $
-
-DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="3.2"
-KEYWORDS="x86 ppc amd64 sparc hppa"
-IUSE=""
-
-# removed: kdebindings, kdesdk, kdoc since these are developer-only packages
-RDEPEND="~kde-base/kdelibs-${PV}
- ~kde-base/kdebase-${PV}
- ~kde-base/kdeaddons-${PV}
- ~kde-base/kdeadmin-${PV}
- ~kde-base/kdeartwork-${PV}
- ~kde-base/kdeedu-${PV}
- ~kde-base/kdegames-${PV}
- ~kde-base/kdegraphics-${PV}
- ~kde-base/kdemultimedia-${PV}
- ~kde-base/kdenetwork-${PV}
- ~kde-base/kdepim-${PV}
- ~kde-base/kdenetwork-${PV}
- ~kde-base/kdetoys-${PV}
- ~kde-base/kdeutils-${PV}
- ~kde-base/kdeaccessibility-${PV}"
+++ /dev/null
-MD5 18a949124ff7f5ba8c7e7d107d8ec794 kdeaccessibility-3.2.3.tar.bz2 1229233
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.2.3.ebuild,v 1.9 2005/01/14 23:17:06 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE accessibility module"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE=""
+++ /dev/null
-MD5 5997388ff74ed1c95dd07c778d66fdae kdeaddons-3.2.3.tar.bz2 1291314
+++ /dev/null
-diff -udBbr kdeaddons-3.2.2/work/kdeaddons-3.2.2/noatun-plugins/synaescope/polygon.h kdeaddons-3.2.2-fix1/work/kdeaddons-3.2.2/noatun-plugins/synaescope/polygon.h
---- noatun-plugins/synaescope/polygon.h 2001-04-17 03:20:34.000000000 +0400
-+++ noatun-plugins/synaescope/polygon.h 2004-04-24 09:51:48.355249296 +0400
-@@ -25,6 +25,10 @@
- template<class Pixel, class Combiner, int superSampleShift>
- struct PolygonEngine : public Bitmap<Pixel>
- {
-+ using Bitmap<Pixel>::width;
-+ using Bitmap<Pixel>::height;
-+ using Bitmap<Pixel>::data;
-+
- PolygonEngine() : Bitmap<Pixel>(1) { }
-
- #define super (1<<superSampleShift)
-diff -udBbr kdeaddons-3.2.2/work/kdeaddons-3.2.2/noatun-plugins/tippercanoe/polygon.h kdeaddons-3.2.2-fix1/work/kdeaddons-3.2.2/noatun-plugins/tippercanoe/polygon.h
---- noatun-plugins/tippercanoe/polygon.h 2001-04-17 02:04:03.000000000 +0400
-+++ noatun-plugins/tippercanoe/polygon.h 2004-04-24 09:58:30.243153048 +0400
-@@ -23,6 +23,10 @@
-
- template<class Pixel, class Combiner, int superSampleShift>
- struct PolygonEngine : public Bitmap<Pixel> {
-+ using Bitmap<Pixel>::width;
-+ using Bitmap<Pixel>::height;
-+ using Bitmap<Pixel>::data;
-+
- PolygonEngine() : Bitmap<Pixel>(1) { }
-
- #define super (1<<superSampleShift)
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.2.3.ebuild,v 1.9 2005/01/23 20:05:22 corsair Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-
-KEYWORDS="x86 ppc sparc amd64 hppa"
-IUSE="sdl svga xmms esd"
-
-DEPEND="~kde-base/kdepim-${PV}
- ~kde-base/kdemultimedia-${PV}
- ~kde-base/arts-${PV//3./1.}
- esd? ( media-sound/esound )
- sdl? ( >=media-libs/libsdl-1.2 )
- svga? ( media-libs/svgalib )
- xmms? ( media-sound/xmms )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
-# This should continue to apply to upcoming versions since it's
-# Gentoo-specific and won't go upstream.
-PATCHES="$FILESDIR/${PN}-3.2.0-kvim.diff $FILESDIR/${PN}-3.2.3-gcc34.patch"
+++ /dev/null
-MD5 52cac3afb5ae527f7d65cdd27937ecf4 kdeadmin-3.2.3.tar.bz2 1551138
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.2.3.ebuild,v 1.8 2005/01/23 20:08:57 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE="pam"
-
-DEPEND="~kde-base/kdebase-${PV}
- pam? ( >=sys-libs/pam-0.72 )"
-
-myconf="$myconf --without-rpm"
-DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage ksysv"
-
-# we only want to compile the lilo config module on x86, but there we want to make sure it's
-# always compiled to ensure consistent behaviour of the package across both lilo and grub systems,
-# because configure when left to its own devices will build lilo-config or not basd on whether
-# lilo is present in the path.
-# so, we make configure build it by removing the configure.in.in file that checks for
-# lilo's presense
-src_unpack() {
- kde_src_unpack
- use x86 && echo > ${S}/lilo-config/configure.in.in
-}
-
-# TODO: add nis support
+++ /dev/null
-MD5 86bc54962ffee206fda15acfd228d52c kdeartwork-3.2.3.tar.bz2 17165998
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.2.3.ebuild,v 1.9 2005/01/23 20:07:41 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE artwork package"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64 ~mips"
-IUSE="opengl"
-
-DEPEND="opengl? ( virtual/opengl )
- ~kde-base/kdebase-${PV}"
-
-src_unpack() {
- kde_src_unpack
- sed -ie "s:X11R6/lib\(/X11\)\?:lib:g" kscreensaver/kxsconfig/Makefile.in
-}
-
-src_compile() {
- myconf="$myconf --with-dpms `use_with opengl gl`"
- kde_src_compile
-}
+++ /dev/null
-#! /bin/sh
-# Xsetup - run as root before the login dialog appears
-
-#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &
-
-SESSIONDIR="_PREFIX_/share/config/kdm/sessions"
-
-session_to_desktop_entry()
-{
-SESSION=$1
-SESSIONFILE="/etc/X11/Sessions/${SESSION}"
-
-if [ ! -d ${SESSIONDIR} ]; then
- echo "cannot create ${SESSION}.desktop:"
- echo "directory ${SESSIONDIR} does not exist."
- return;
-fi
-
-if [ ! -e ${SESSIONDIR}/${SESSION}.desktop ]; then
-
-cat > "${SESSIONDIR}/${SESSION}.desktop" <<EOF
-[Desktop Entry]
-Type=XSession
-Exec=${SESSIONFILE}
-TryExec=${SESSIONFILE}
-Name=${SESSION}
-EOF
-
-fi
-}
-
-echo "Creating menu entries for kdm in ${SESSIONDIR}..."
-
-for i in `ls /etc/X11/Sessions/`; do
- session_to_desktop_entry $i
-done
+++ /dev/null
-[Desktop0]
-BackgroundMode=VerticalGradient
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=14,120,131
-Color2=67,174,192
-CurrentWallpaper=0
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=fish
-Program=
-ReverseBlending=false
-UseSHM=false
-Wallpaper=default_blue.jpg
-WallpaperList=
-WallpaperMode=NoWallpaper
+++ /dev/null
-# KDM master configuration file
-#
-# Definition: the greeter is the login dialog, i.e., the part of KDM
-# which the user sees.
-#
-# You can configure every X-display individually.
-# Every display has a display name, which consists of a host name
-# (which is empty for local displays specified in the Xservers file),
-# a colon and a display number. Additionally, a display belongs to a
-# display class (which can be ignored in most cases; the control center
-# does not support this feature at all).
-# Sections with display-specific settings have the formal syntax
-# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
-# You can use the "*" wildcard for host, number and class. You may omit
-# trailing components; they are assumed to be "*" then.
-# The host part may be a domain specification like ".inf.tu-dresden.de".
-# From which section a setting is actually taken is determined by these
-# rules:
-# - an exact match takes precedence over a partial match (for the host part),
-# which in turn takes precedence over a wildcard
-# - precedence decreases from left to right for equally exact matches
-# Example: display name "myhost:0", class "dpy".
-# [X-myhost:0_dpy] precedes
-# [X-myhost:0_*] (same as [X-myhost:0]) precedes
-# [X-myhost:*_dpy] precedes
-# [X-myhost:*_*] (same as [X-myhost]) precedes
-# [X-*:0_dpy] precedes
-# [X-*:0_*] (same as [X-*:0]) precedes
-# [X-*:*_*] (same as [X-*])
-# These sections do NOT match this display:
-# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
-# If a setting is not found in any matching section, the default is used.
-#
-# Every comment applies to the following section or key. Note, that all
-# comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
-#
-
-[General]
-# This option exists solely for the purpose of a clean automatic upgrade.
-# Don't even think about changing it!
-ConfigVersion=2.1
-# If the value starts with a slash (/), it specifies the file, where X-servers
-# to be used by KDM are listed; the file is in the usual XDM-Xservers format.
-# Otherwise it's interpreted like one line of the Xservers file, i.e., it
-# specifies exactly one X-server.
-# Default is ":0 local@tty1 /usr/X11R6/bin/X vt7"
-# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to
-# do this best.
-Xservers=_PREFIX_/share/config/kdm/Xservers
-# Where KDM should store its PID. Default is "" (don't store)
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the pid file to prevent having multiple KDM
-# instances running at once. Leave it "true", unless you're brave.
-#LockPidFile=false
-# Where to store authorization files. Default is /var/run/xauth
-#AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
-# finds them having changed. Just keep it "true".
-#AutoRescan=false
-# Additional environment variables KDM should pass on to kdm_config, kdm_greet,
-# Xsetup, Xstartup, Xsession, and Xreset. LD_LIBRARY_PATH is a good candidate;
-# otherwise it shouldn't be necessary very often.
-#ExportList=SOME_VAR,ANOTHER_IMPORTANT_VAR
-# Where the command FiFos should be created. Make it empty to disable
-# the FiFos. Default is /var/run/xdmctl
-#FifoDir=/tmp
-# To which group the command FiFos should belong.
-# Default is -1 (effectively root)
-#FifoGroup=xdmctl
-# The directory kdm should store persistent working data in.
-# Default is /var/lib/kdm
-#DataDir=/var/lib/kdm
-# The directory kdm should store users' .dmrc files in. This is only needed
-# if the home directories are not readable before actually logging in (like
-# with AFS). Default is ""
-#DmrcDir=/nfs-shared/var/dmrcs
-
-[Xdmcp]
-# Whether KDM should listen to XDMCP requests. Default is true.
-Enable=false
-# The UDP port KDM should listen on for XDMCP requests. Don't change the 177.
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=_PREFIX_/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is _PREFIX_/share/config/kdm/Xaccess
-# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to
-# do this best.
-#Xaccess=
-# Number of seconds to wait for display to respond after the user has
-# selected a host from the chooser. Default is 15.
-#ChoiceTimeout=10
-# Strip domain name from remote display names if it is equal to the local
-# domain. Default is true
-#RemoveDomainname=false
-# Use the numeric IP address of the incoming connection instead of the
-# host name. Use this on multihomed hosts. Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# BroadcastQuery requests.
-# By default no program is invoked and "Willing to manage" is sent.
-Willing=_PREFIX_/share/config/kdm/Xwilling
-
-[Shutdown]
-# The command to run to halt the system. Default is /sbin/halt
-#HaltCmd=
-# The command to run to reboot the system. Default is /sbin/reboot
-#RebootCmd=
-# Whether one can shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether one can abort still running sessions when shutting down the system
-# via the global command FiFo. Default is true
-#AllowFifoNow=false
-# Offer LiLo boot options in shutdown dialog. Default is false
-#UseLilo=true
-# The location of the LiLo binary. Default is /sbin/lilo
-#LiloCmd=
-# The location of the LiLo map file. Default is /boot/map
-#LiloMap=
-
-# Rough estimations about how many seconds KDM will spend at most on
-# - opening a connection to the X-server (OpenTime):
-# OpenRepeat * (OpenTimeout + OpenDelay)
-# - starting a local X-server (ServerTime): ServerAttempts * ServerTimeout
-# - starting a display:
-# - local display: StartAttempts * (ServerTime + OpenTime)
-# - remote/foreign display: StartAttempts * OpenTime
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to start the display after various
-# errors. Default is 15
-#OpenDelay=
-# How long to wait before timing out XOpenDisplay. Default is 120
-#OpenTimeout=
-# How often to try the XOpenDisplay. Default is 5
-#OpenRepeat=
-# Try at most that many times to start a display. If this fails, the display
-# is disabled. Default is 4
-#StartAttempts=
-# The StartAttempt counter is reset after that many seconds. Default is 30
-#StartInterval=
-# Ping remote display every that many minutes. Default is 5
-#PingInterval=
-# Wait for a Pong that many minutes. Default is 5
-#PingTimeout=
-# Restart instead of resetting the local X-server after session exit.
-# Use it if the server leaks memory, etc. Default is false
-#TerminateServer=true
-# The signal needed to reset the local X-server. Default is 1 (SIGHUP)
-#ResetSignal=
-# The signal needed to terminate the local X-server. Default is 15 (SIGTERM)
-#TermSignal=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# Create X-authorizations for local displays. Default is true
-#Authorize=false
-# Which X-authorization mechanisms should be used.
-# Default is MIT-MAGIC-COOKIE-1
-#AuthNames=
-# The name of this X-server's Xauth file. Default is "", which means, that
-# a random name in the AuthDir directory will be used.
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend doesn't care for this, so you don't need it unless you
-# use an alternative chooser or another background generator than kdmdesktop.
-# Default is ""
-#Resources=
-# The xrdb program to use to read the above specified recources.
-# Default is /usr/X11R6/bin/xrdb
-#Xrdb=
-# A program to run before the greeter is shown. You should start kdmdesktop
-# there. Also, xconsole can be started by this script.
-# Default is ""
-Setup=_PREFIX_/share/config/kdm/Xsetup
-# A program to run before a user session starts. You should invoke sessreg
-# there and optionally change the ownership of the console, etc.
-# Default is ""
-Startup=_PREFIX_/share/config/kdm/Xstartup
-# A program to run after a user session exits. You should invoke sessreg
-# there and optionally change the ownership of the console, etc.
-# Default is ""
-Reset=_PREFIX_/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionsDirs) and start an appropriate
-# session according to it.
-# Default is /usr/X11R6/bin/xterm -ls -T
-Session=_PREFIX_/share/config/kdm/Xsession
-# The program to run if Session fails.
-# Default is /usr/X11R6/bin/xterm
-#FailsafeClient=
-# The PATH for the Session program. Default is
-# /bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-#UserPath=_PREFIX_/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-# The PATH for Setup, Startup and Reset, etc. Default is
-# /sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-#SystemPath=_PREFIX_:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-# The default system shell. Default is /bin/sh
-#SystemShell=/bin/bash
-# Where to put the user's X-server authorization file if ~/.Xauthority
-# cannot be created. Default is /tmp
-#UserAuthDir=
-# If "true", KDM will automatically restart a session after an X-server
-# crash (or if it is killed by Alt-Ctrl-BackSpace). Note, that enabling
-# this opens a security hole: a secured display lock can be circumvented
-# (unless you use KDE's built-in screen lock). Default is false
-#AutoReLogin=true
-# Allow root logins? Default is true
-AllowRootLogin=false
-# Allow to log in, when user has set an empty password? Default is true
-AllowNullPasswd=false
-# Who is allowed to shut down the system. This applies both to the
-# greeter and to the command FiFo. Default is All
-# "None" - no "Shutdown..." button is shown at all
-# "Root" - the root password must be entered to shut down
-# "All" - everybody can shut down the machine (Default)
-AllowShutdown=Root
-# Who is allowed to abort all still running sessions when shutting down.
-# Same options as for AllowShutdown. Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shutdown after all sessions exit (possibly at once) (Default)
-# "TryNow" - shutdown, if no sessions are open, otherwise do nothing
-# "ForceNow" - shutdown unconditionally
-#DefaultSdMode=ForceNow
-# If this is false the user must select the shutdown condition/timing already
-# in the shutdown dialog. If this is true he won't be bothered with the options,
-# but will be asked what to do if sessions are actually open. Default is true
-# NOTE: the interaction is currently not implemented. If this is set to true,
-# a normal forced shutdown will happen (without caring for the AllowSdForceNow
-# option!), i.e., KDM will behave exactly as before KDE 3.0.
-#InteractiveSd=false
-# The directories containing session type definitions in .desktop format.
-# Default is _PREFIX_/share/apps/kdm/sessions
-SessionsDirs=_PREFIX_/share/config/kdm/sessions
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Widget style of the greeter. "" means the built-in default which currently
-# is "Keramik". Default is ""
-#GUIStyle=Windows
-# Widget color scheme of the greeter. "" means the built-in default which
-# currently is quite greyish. Default is ""
-#ColorScheme=Pumpkin
-# What should be shown righthand of the input lines:
-# "Logo" - the image specified by LogoPixmap (Default)
-# "Clock" - a neat analog clock
-# "None" - nothing
-#LogoArea=None
-# The image to show when LogoArea=Logo. Default is kdelogo.png
-#LogoPixmap=
-# Normally, the greeter is centered on the screen. Use this, if you want
-# it to appear elsewhere on the screen. Default is false
-#GreeterPosFixed=true
-#GreeterPosX=200
-#GreeterPosY=100
-# The headline in the greeter.
-# The following character pairs are replaced:
-# - %d -> current display
-# - %h -> host name, possibly with domain name
-# - %n -> node name, most probably the host name without domain name
-# - %s -> the operating system
-# - %r -> the operating system's version
-# - %m -> the machine (hardware) type
-# - %% -> a single %
-# Default is "Welcome to %s at %n"
-#GreetString=K Desktop Environment (%n)
-# The font for the headline. Default is charter,20,bold
-#GreetFont=charter,20,5,0,50,0
-# The normal font used in the greeter. Default is helvetica,10
-#StdFont=helvetica,10,5,0,50,0
-# The font used for the "Login Failed" message. Default is helvetica,10,bold
-#FailFont=helvetica,10,5,0,75,0
-# Whether the fonts shown in the greeter should be antialiased. Default is false
-AntiAliasing=true
-# What to do with the Num Lock modifier for the time the greeter is running:
-# "On" -> - turn on
-# "Off" -> - turn off
-# "Keep" -> - don't change the state (Default)
-#NumLock=Off
-# Language to use in the greeter. Default is en_US
-#Language=de_DE
-# Specify, which user names (along with pictures) should be shown in the
-# greeter.
-# "NotHidden" - all users except those listed in HiddenUsers (Default)
-# "Selected" - only the users listed in SelectedUsers
-# "None" - no user list will be shown at all
-#ShowUsers=None
-# For ShowUsers=Selected. Default is ""
-#SelectedUsers=root,johndoe
-# For ShowUsers=NotHidden. Default is ""
-#HiddenUsers=root
-# Special case of HiddenUsers: users with a UID less than this number
-# (except root) will not be shown as well. Default is 0
-MinShowUID=1000
-# Complement to MinShowUID: users with a UID greater than this number will
-# not be shown as well. Default is 65535
-MaxShowUID=65000
-# If false, the users are listed in the order they appear in /etc/passwd.
-# If true, they are sorted alphabetically. Default is true
-#SortUsers=false
-# Specify, where the users' pictures should be taken from.
-# "AdminOnly" - from <FaceDir>/$USER.face[.icon] (Default)
-# "UserOnly" - from the user's $HOME/.face[.icon]
-# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
-# "PreferUser" - ... and the other way round
-#FaceSource=PreferUser
-# The directory containing the user images if FaceSource is not UserOnly.
-# Default is _PREFIX_/share/apps/kdm/faces
-#FaceDir=/usr/share/faces
-# Specify, if/which user should be preselected for log in.
-# Note, that enabling this feature can be considered a security hole,
-# as it presents a valid login name to a potential attacker, so he "only"
-# needs to guess the password.
-# "None" - don't preselect any user (Default)
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser field
-#PreselectUser=Previous
-# The user to preselect if PreselectUser=Default
-#DefaultUser=ethel
-# If this is true, the password input line is focused automatically if
-# a user is preselected. Default is false
-#FocusPasswd=true
-# The password input fields cloak the typed in text. Specify, how to do it:
-# "NoEcho" - nothing is shown at all, the cursor doesn't move
-# "OneStar" - "*" is shown for every typed letter (Default)
-# "ThreeStars" - "***" is shown for every typed letter
-#EchoMode=NoEcho
-# If true, krootimage will be automatically started by KDM. Otherwise, the
-# Setup script should be used to setup the background. Default is true
-#UseBackground=false
-# The configuration file to be used by krootimage.
-# Default is _PREFIX_/share/config/kdm/backgroundrc
-#BackgroundCfg=
-# Hold the X-server grabbed the whole time the greeter is visible. This
-# may be more secure, but it will disable any background and other
-# X-clients started from the Setup script. Default is false
-#GrabServer=true
-# How many seconds to wait for grab to succeed. Default is 3
-#GrabTimeout=
-# Use this number as a random seed when forging saved session types, etc. of
-# unknown users. This is used to avoid telling an attacker about existing users
-# by reverse conclusion. This value should be random but constant across the
-# login domain. Default is 0
-ForgingSeed=_RANDOM_
-# Specify greeter plugins that can be used to obtain authentication data.
-# This can be a plugin's base name (expands to $kde_modulesdir/kgreet_$base)
-# or a full pathname. Default is classic
-#PluginsLogin=sign
-# Same as PluginsLogin, but for the shutdown dialog.
-#PluginsShutdown=modern
-
-# Core config for local displays
-[X-:*-Core]
-# How often to try to run the X-server. Running includes executing it and
-# waiting for it to come up. Default is 1
-#ServerAttempts=
-# How long to wait for a local X-server to come up. Default is 15
-#ServerTimeout=
-# See above
-AllowShutdown=All
-# See above
-AllowRootLogin=true
-# See above
-AllowNullPasswd=true
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-#NoPassEnable=true
-# The users that don't need to provide a password to log in. NEVER list root!
-# Default is ""
-#NoPassUsers=fred,ethel
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# Warn, if local X-authorization cannot be created. Default is true
-# XXX this is a dummy currently
-#AuthComplain=false
-# The screen the greeter should be displayed on in multi-headed setups.
-# The numbering starts with 0 and corresponds to the listing order in the
-# active ServerLayout section of XF86Config. -1 means to use the upper-left
-# screen, -2 means to use the upper-right screen. Default is 0
-#GreeterScreen=-1
-# Specify whether the greeter of local displays should start up in host chooser
-# (remote) or login (local) mode and whether it is allowed to switch to the
-# other mode.
-# "LocalOnly" - only local login possible (Default)
-# "RemoteOnly" - only choice of remote host possible
-# "DefaultLocal" - start up in local mode, but allow switch to remote mode
-# "DefaultRemote" - ... and the other way round
-#LoginMode=DefaultLocal
-# A list of hosts to be automatically added to the remote login menu. The
-# special name "*" means broadcast. Default is "*"
-#ChooserHosts=*,ugly,sky,dino,kiste.local,login.crap.com
-
-# Core config for 1st local display
-[X-:0-Core]
-# Enable automatic login on this display. USE WITH EXTREME CARE!
-# Default is false
-#AutoLoginEnable=true
-# The user to log in automatically. NEVER specify root! Default is ""
-#AutoLoginUser=fred
-# The password for the user to log in automatically. This is NOT required
-# unless the user is to be logged into a NIS or Kerberos domain. If you use
-# it, you should "chmod 600 kdmrc" for obvious reasons. Default is ""
-#AutoLoginPass=secret!
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# See above
-#DefaultUser=johndoe
-
+++ /dev/null
---- startkde 2003-03-12 18:20:54.000000000 +0100
-+++ startkde 2003-03-12 18:26:10.000000000 +0100
-@@ -1,12 +1,34 @@
--#!/bin/sh
-+#!/bin/sh --login
- #
--# DEFAULT KDE STARTUP SCRIPT ( KDE-3.2 )
-+# GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.2 )
- #
-
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
-
-+# Gentoo part:
-+export PATH="_KDEDIR_/bin:${PATH}"
-+export KDEDIR="_KDEDIR_"
-+# Use env.d's KDEDIRS. They should only include locations like /usr though, not
-+# actual KDE installations
-+
-+# handle ~/.kde* dirs - separate ones for separate KDEs
-+cd ~
-+[ -d .kde ] && /bin/mv .kde .kde.backup
-+if [ ! -e .kde3.2 ]; then
-+ if [ -e .kde3.1 ]; then
-+ /bin/cp -r .kde3.1 .kde3.2
-+ else
-+ /bin/mkdir .kde3.2
-+ fi
-+fi
-+/bin/ln -sf .kde3.2 .kde
-+
-+#export KDEHOME="${HOME}/.kde3.2"
-+
-+# Gentoo part ends
-+
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
-
-@@ -112,12 +134,12 @@
- # especially necessary on slow machines, where starting KDE takes one or two
- # minutes until anything appears on the screen.
- #
--# Set the background to plain grey.
-+# Set the background to cyan (Gentoo version change).
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard KDE palette for those with
- # palettised displays.
-
--test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
-+test "$XDM_MANAGED" || bkg="-solid #5477A0"
- xsetroot -cursor_name left_ptr $bkg
-
- # The user's personal KDE directory is usually ~/.kde, but this setting
-@@ -163,7 +186,11 @@
- fi
-
- # the splashscreen and progress indicator
--ksplash --nodcop
-+if [ -n "$KSPLASH" ]; then
-+ $KSPLASH
-+else
-+ ksplash --nodcop
-+fi
-
- # We set LD_BIND_NOW to increase the efficiency of kdeinit.
- # kdeinit unsets this variable before loading applications.
+++ /dev/null
-MD5 fd05a338d155610856b06988d8dff117 kdebase-3.2.3.tar.bz2 17330422
+++ /dev/null
-Index: konqueror/konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1274.2.24
-diff -u -p -r1.1274.2.24 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24
-+++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000
-@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest(
- {
- kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
-
-+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
- QString frameName = args.frameName;
-
- if ( !frameName.isEmpty() )
-@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest(
- frameName.lower() != _parent )
- {
- KParts::BrowserHostExtension *hostExtension = 0;
-- KonqView *view = childView( frameName, &hostExtension, 0 );
-+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 );
- if ( !view )
- {
- KonqMainWindow *mainWindow = 0;
-- view = findChildView( frameName, &mainWindow, &hostExtension, 0 );
-+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 );
-
- if ( !view || !mainWindow )
- {
-@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest(
- }
- }
-
-- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
-- KonqView *view = childView( part );
-+ KonqView *view = childView( callingPart );
- openURL( view, url, args );
- }
-
-@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow
- if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" )
- {
- KParts::BrowserHostExtension *hostExtension = 0;
-- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) )
-+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) )
- {
- // Found a view. If url isn't empty, we should open it - but this never happens currently
- // findChildView put the resulting part in 'part', so we can just return now
-@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP
- return 0L;
- }
-
--KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
-+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
- {
-- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
-+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
-
- MapViews::ConstIterator it = m_mapViews.begin();
- MapViews::ConstIterator end = m_mapViews.end();
-@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co
- {
- KonqView* view = it.data();
- QString viewName = view->viewName();
-- //kdDebug() << " - viewName=" << viewName << " "
-- // << "frame names:" << view->frameNames().join( "," ) << endl;
-+ kdDebug() << " - viewName=" << viewName << " "
-+ << "frame names:" << view->frameNames().join( "," ) << endl;
- if ( !viewName.isEmpty() && viewName == name )
- {
-- //kdDebug() << "found existing view by name: " << view << endl;
-+ kdDebug() << "found existing view by name: " << view << endl;
- if ( hostExtension )
- *hostExtension = 0;
- if ( part )
-@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co
- }
-
- // First look for a hostextension containing this frame name
-- // (KonqView looks for it recursively)
-- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
-+ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+ if ( ext )
-+ {
-+ ext = ext->findFrameParent(callingPart, name);
-+ }
-+
-+// KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
-
- if ( ext )
- {
-@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co
- {
- if ( frameIt.current()->name() == name )
- {
-- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
-+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
- if ( hostExtension )
- *hostExtension = ext;
- if ( part )
-@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co
- }
-
- // static
--KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
-+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
- {
- if ( !s_lstViews )
- return 0;
-@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView
- QPtrListIterator<KonqMainWindow> it( *s_lstViews );
- for (; it.current(); ++it )
- {
-- KonqView *res = it.current()->childView( name, hostExtension, part );
-+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part );
- if ( res )
- {
- if ( mainWindow )
-Index: konqueror/konq_mainwindow.h
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v
-retrieving revision 1.423.2.4
-diff -u -p -r1.423.2.4 konq_mainwindow.h
---- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4
-+++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000
-@@ -145,10 +145,10 @@ public:
- void insertChildView( KonqView *childView );
- void removeChildView( KonqView *childView );
- KonqView *childView( KParts::ReadOnlyPart *view );
-- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
-+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
-
- // dcop idl bug! it can't handle KonqMainWindow *&mainWindow
-- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
-+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
-
- // Total number of views
- int viewCount() const { return m_mapViews.count(); }
+++ /dev/null
---- konqueror/konq_mainwindow.cc 6 Sep 2004 16:43:54 -0000 1.1274.2.26
-+++ konqueror/konq_mainwindow.cc 12 Dec 2004 17:10:07 -0000
-@@ -2113,6 +2113,17 @@ KonqView * KonqMainWindow::childView( KP
- QString viewName = view->viewName();
- kdDebug() << " - viewName=" << viewName << " "
- << "frame names:" << view->frameNames().join( "," ) << endl;
-+
-+ // First look for a hostextension containing this frame name
-+ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+ if ( ext )
-+ {
-+ ext = ext->findFrameParent(callingPart, name);
-+ kdDebug() << "BrowserHostExtension found part " << ext << endl;
-+ if (!ext)
-+ continue; // Don't use this window
-+ }
-+
- if ( !viewName.isEmpty() && viewName == name )
- {
- kdDebug() << "found existing view by name: " << view << endl;
-@@ -2123,15 +2134,6 @@ KonqView * KonqMainWindow::childView( KP
- return view;
- }
-
-- // First look for a hostextension containing this frame name
-- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-- if ( ext )
-- {
-- ext = ext->findFrameParent(callingPart, name);
-- }
--
--// KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
--
- if ( ext )
- {
- QPtrList<KParts::ReadOnlyPart> frames = ext->frames();
+++ /dev/null
---- kioslave/smb/kio_smb_auth.cpp 12 May 2004 09:39:16 -0000 1.24.2.2
-+++ kioslave/smb/kio_smb_auth.cpp 22 Nov 2004 11:12:19 -0000 1.24.2.3
-@@ -127,11 +127,9 @@ bool SMBSlave::checkPassword(SMBUrl &url
- .arg( url.host() )
- .arg( share );
- info.username = url.user();
-- info.password = url.pass();
-
- if ( openPassDlg(info) ) {
- url.setUser(info.username);
-- url.setPass(info.password);
- return true;
- }
- return false;
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.3-r3.ebuild,v 1.2 2005/01/17 15:41:51 danarmak Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE="ldap pam motif encode cups ssl opengl samba java"
-
-DEPEND="media-sound/cdparanoia
- >=kde-base/kdelibs-3.2.3-r1
- ldap? ( net-nds/openldap )
- pam? ( sys-libs/pam )
- motif? ( x11-libs/openmotif )
- encode? ( media-sound/lame )
- cups? ( net-print/cups )
- ssl? ( dev-libs/openssl )
- opengl? ( virtual/opengl )
- samba? ( net-fs/samba )
- java? ( || ( virtual/jdk virtual/jre ) )
- >=media-libs/freetype-2"
-RDEPEND="${DEPEND}
- sys-apps/eject"
-
-src_unpack() {
- kde_src_unpack
- epatch ${FILESDIR}/post-3.2.3-kdebase-htmlframes.patch
- epatch ${FILESDIR}/post-3.2.3-kdebase-htmlframes2.patch
- epatch ${FILESDIR}/post-3.2.3-kdebase-smb.diff
-}
-
-src_compile() {
- myconf="$myconf --with-dpms --with-cdparanoia"
- myconf="$myconf `use_with ldap` `use_with motif`"
- myconf="$myconf `use_with encode lame` `use_with cups`"
- myconf="$myconf `use_with opengl gl` `use_with ssl`"
-
- use pam \
- && myconf="$myconf --with-pam=yes" \
- || myconf="$myconf --with-pam=no --with-shadow"
-
- if use java ; then
- if has_version virtual/jdk ; then
- myconf="$myconf --with-java=$(java-config --jdk-home)"
- else
- myconf="$myconf --with-java=$(java-config --jre-home)"
- fi
- else
- myconf="$myconf --without-java"
- fi
-
- kde_src_compile myconf configure
- kde_remove_flag kdm/kfrontend -fomit-frame-pointer
- kde_src_compile make
-}
-
-src_install() {
- kde_src_install
- cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup" install
-
- insinto /etc/pam.d
- newins ${FILESDIR}/kde.pam kde
- # kde-np is new requirement for 3.2 autologins - #33690
- newins ${FILESDIR}/kde-np.pam kde-np
-
- # startkde script
- cd ${D}/${KDEDIR}/bin
- epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
- mv startkde startkde.orig
- sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde
- rm startkde.orig
- chmod a+x startkde
-
- # kcontrol modules
- cd ${D}/${KDEDIR}/etc/xdg/menus
- ln -s default_kde-settings.menu kde-settings.menu
- ln -s default_kde-information.menu kde-information.menu
- ln -s default_kde-screensavers.menu kde-screensavers.menu
-
- # x11 session script
- cd ${T}
- echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > kde-${PV}
- chmod a+x kde-${PV}
- exeinto /etc/X11/Sessions
- doexe kde-${PV}
-
- cd ${D}/${KDEDIR}/share/config/kdm || die
- dodir ${KDEDIR}/share/config/kdm/sessions
- sed -e "s:_PREFIX_:${PREFIX}:g" \
- -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \
- ${FILESDIR}/${PVR}/kdmrc > kdmrc
- sed -e "s:_PREFIX_:${PREFIX}:g" ${FILESDIR}/${PVR}/Xsetup > Xsetup
-
- cp ${FILESDIR}/${PVR}/backgroundrc .
-
- #backup splashscreen images, so they can be put back when unmerging
- #mosfet or so.
- if [ ! -d ${KDEDIR}/share/apps/ksplash.default ]
- then
- cd ${D}/${KDEDIR}/share/apps
- cp -rf ksplash/ ksplash.default
- fi
-
- # Show gnome icons when choosing new icon for desktop shortcut
- dodir /usr/share/pixmaps
- mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/
- rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
- cd ${D}/${KDEDIR}/share/apps/kdesktop/
- ln -sf /usr/share/pixmaps/ pics
-
- rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-
-}
-
-pkg_postinst() {
- mkdir -p ${KDEDIR}/share/templates/.source/emptydir
-}
+++ /dev/null
-MD5 1c41b731f26269fdb39f2c097a95dd9a kdeedu-3.2.3.tar.bz2 22367583
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.3.ebuild,v 1.9 2005/01/23 19:56:36 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE educational apps"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE=""
-
-src_unpack()
-{
- kde_src_unpack
-}
+++ /dev/null
-MD5 801b257188acca5e525a997bd03f1234 kdegames-3.2.3.tar.bz2 9085230
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.2.3.ebuild,v 1.9 2005/01/23 19:55:21 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE games (solitaire :-)"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE=""
+++ /dev/null
-MD5 af7092f2afc5a8565eb5017ecee6b67e kdegraphics-3.2.3.tar.bz2 5676995
+++ /dev/null
-MD5 af7092f2afc5a8565eb5017ecee6b67e kdegraphics-3.2.3.tar.bz2 5676995
+++ /dev/null
-diff -udBbr kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_bridge.h kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_bridge.h
---- kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_bridge.h 2003-10-26 13:52:36.000000000 +0300
-+++ kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_bridge.h 2004-04-22 00:12:13.212404080 +0400
-@@ -90,7 +90,7 @@
- // kdDebug(26004) << "KSVGBridge::put(), " << propertyName.qstring() << " Name: " << classInfo()->className << " Object: " << m_impl << endl;
-
- // Try to see if we know this property (and need to take special action)
-- if(m_impl->put(exec, propertyName, value, attr))
-+ if(this->m_impl->put(exec, propertyName, value, attr))
- return;
-
- // We don't -> set property in ObjectImp.
-diff -udBbr kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_lookup.h kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_lookup.h
---- kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_lookup.h 2003-08-17 15:49:23.000000000 +0400
-+++ kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_lookup.h 2004-04-21 23:34:50.954279128 +0400
-@@ -21,10 +21,13 @@
- #ifndef KSVG_LOOKUP_H
- #define KSVG_LOOKUP_H
-
-+#include <kdebug.h>
-+
- #include <kjs/object.h>
- #include <kjs/lookup.h>
- #include <kjs/interpreter.h> // for ExecState
-
-+//#include "ksvg_scriptinterpreter.h"
- class KSVGScriptInterpreter;
-
- #define KSVG_GET_COMMON \
-@@ -188,6 +191,7 @@
- * The "this" class must implement putValueProperty.
- * If it returns false, put() will return false, and KSVGRequest will set a dynamic property in ObjectImp
- */
-+/*
- template <class ThisImp>
- inline bool lookupPut(KJS::ExecState *exec,
- const KJS::Identifier &propertyName,
-@@ -218,6 +222,7 @@
- return true;
- }
- }
-+*/ /* moved to ksvg_scriptinterpreter.h */
- }
-
- // Same as kjs' DEFINE_PROTOTYPE, but with a pointer to the hashtable too, and no ClassName here
-diff -udBbr kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_scriptinterpreter.h kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_scriptinterpreter.h
---- kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_scriptinterpreter.h 2003-05-10 13:32:50.000000000 +0400
-+++ kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/ecma/ksvg_scriptinterpreter.h 2004-04-21 23:40:36.693718744 +0400
-@@ -68,6 +68,47 @@
- QPtrDict<KJS::ObjectImp> m_domObjects;
- };
-
-+namespace KSVG
-+{
-+
-+ /**
-+ * This one is for "put".
-+ * Lookup hash entry for property to be set, and set the value.
-+ * The "this" class must implement putValueProperty.
-+ * If it returns false, put() will return false, and KSVGRequest will set a dynamic property in ObjectImp
-+ */
-+ template <class ThisImp>
-+ inline bool lookupPut(KJS::ExecState *exec,
-+ const KJS::Identifier &propertyName,
-+ const KJS::Value &value,
-+ int attr,
-+ const KJS::HashTable *table,
-+ ThisImp *thisObj)
-+ {
-+ const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName);
-+
-+ if(!entry) // not found, forward to parents
-+ return thisObj->putInParents(exec, propertyName, value, attr);
-+ else if(entry->attr & KJS::Function) // Function: put as override property
-+ return false;
-+ else if(entry->attr & KJS::ReadOnly && !(attr & KJS::Internal)) // readonly! Can't put!
-+ {
-+#ifdef KJS_VERBOSE
-+ kdWarning(26004) <<" Attempt to change value of readonly property '" << propertyName.qstring() << "'" << endl;
-+#endif
-+ return true; // "we did it" -> don't put override property
-+ }
-+ else
-+ {
-+ if(static_cast<KSVGScriptInterpreter *>(exec->interpreter())->attributeSetMode())
-+ thisObj->m_attrFlags |= (1 << entry->value);
-+
-+ thisObj->putValueProperty(exec, entry->value, value, attr);
-+ return true;
-+ }
-+ }
-+}
-+
- // Lookup or create JS object around an existing "DOM Object"
- template<class DOMObj, class KJSDOMObj>
- inline KJS::Value cacheDOMObject(KJS::ExecState *exec, DOMObj *domObj)
-@@ -100,7 +141,7 @@
- {
- ClassCtor* ctor = new ClassCtor(exec); // create the ClassCtor instance
- KJS::Object newObject(new KSVGBridge<ClassCtor>(exec, ctor)); // create the bridge around it
-- exec->interpreter()->globalObject().put(exec, propertyName, newObject, Internal);
-+ exec->interpreter()->globalObject().put(exec, propertyName, newObject, KJS::Internal);
- return newObject;
- }
- }
-diff -udBbr kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/impl/SVGHelperImpl.h kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/impl/SVGHelperImpl.h
---- kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/impl/SVGHelperImpl.h 2003-08-28 00:08:25.000000000 +0400
-+++ kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/impl/SVGHelperImpl.h 2004-04-22 00:04:58.029561928 +0400
-@@ -23,6 +23,7 @@
-
- #include <dom/dom_element.h>
-
-+#include "SVGElementImpl.h"
- #include "SVGLengthImpl.h"
-
- #include "ksvg_lookup.h"
-@@ -56,7 +57,7 @@
- {
- T *cast = dynamic_cast<T *>(element->ownerDoc()->getElementFromHandle(node.handle()));
- if(cast)
-- cast->putValueProperty(element->ownerDoc()->ecmaEngine()->globalExec(), token, KJS::String(value), Internal);
-+ cast->putValueProperty(element->ownerDoc()->ecmaEngine()->globalExec(), token, KJS::String(value), KJS::Internal);
- }
- }
-
-diff -udBbr kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/impl/SVGList.h kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/impl/SVGList.h
---- kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/impl/SVGList.h 2004-01-17 15:52:40.000000000 +0300
-+++ kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/impl/SVGList.h 2004-04-21 23:41:08.040953240 +0400
-@@ -48,7 +48,7 @@
- {
- public:
- SVGList() { m_impl.setAutoDelete(false); }
-- SVGList(const SVGList &) { *this = other; }
-+ SVGList(const SVGList &other) { *this = other; }
- ~SVGList() { clear(); }
-
- SVGList<T> &operator=(const SVGList<T> &other)
-diff -udBbr kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/plugin/backends/libart/LibartCanvas.cpp kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/plugin/backends/libart/LibartCanvas.cpp
---- kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/plugin/backends/libart/LibartCanvas.cpp 2003-11-30 12:46:17.000000000 +0300
-+++ kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/plugin/backends/libart/LibartCanvas.cpp 2004-04-22 00:15:04.624345504 +0400
-@@ -176,7 +176,7 @@
-
- CanvasPaintServer *LibartCanvas::createPaintServer(SVGElementImpl *pserver)
- {
-- LibartPaintServer *result;
-+ LibartPaintServer *result = NULL;
- if(dynamic_cast<SVGLinearGradientElementImpl *>(pserver))
- result = new LibartLinearGradient(dynamic_cast<SVGLinearGradientElementImpl *>(pserver));
- else if(dynamic_cast<SVGRadialGradientElementImpl *>(pserver))
-diff -udBbr kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/core/CanvasFactory.cpp kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/core/CanvasFactory.cpp
---- kdegraphics-3.2.3/work/kdegraphics-3.2.3/ksvg/core/CanvasFactory.cpp 2003-11-30 12:46:12.000000000 +0300
-+++ kdegraphics-3.2.3-fix1/work/kdegraphics-3.2.3/ksvg/core/CanvasFactory.cpp 2004-04-22 00:48:56.135508864 +0400
-@@ -26,6 +26,7 @@
-
- #include "KSVGCanvas.h"
- #include "CanvasFactory.h"
-+#include "CanvasItem.h"
-
- using namespace KSVG;
-
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.2.3-r3.ebuild,v 1.4 2005/01/12 03:50:41 weeve Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ia64"
-IUSE="gphoto2 tetex scanner opengl"
-
-DEPEND="~kde-base/kdebase-${PV}
- gphoto2? ( media-gfx/gphoto2 )
- scanner? ( media-gfx/sane-backends )
- tetex? ( virtual/tetex )
- dev-libs/fribidi
- opengl? ( virtual/glut virtual/opengl )
- media-libs/imlib
- virtual/ghostscript
- media-libs/tiff
- x86? ( scanner? ( sys-libs/libieee1284 ) )"
-RDEPEND="${DEPEND}
- app-text/xpdf"
-
-src_unpack() {
- kde_src_unpack
- epatch ${FILESDIR}/${P}-gcc34-compile.patch
- epatch ${FILESDIR}/post-3.2.3-kdegraphics_2.diff
- epatch ${FILESDIR}/post-3.2.3-kdegraphics-2.diff
-}
-
-src_compile() {
-
- use gphoto2 \
- && myconf="$myconf --with-kamera \
- --with-gphoto2-includes=/usr/include/gphoto2 \
- --with-gphoto2-libraries=/usr/lib/gphoto2" \
- || myconf="$myconf --without-kamera"
-
- use tetex && myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
-
- use scanner || DO_NOT_COMPILE="$DO_NOT_COMPILE kooka libkscan"
-
- myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"
- kde_src_compile
-}
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.2.3-r4.ebuild,v 1.6 2005/02/21 16:45:29 agriffis Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ia64"
-IUSE="gphoto2 tetex scanner opengl"
-
-DEPEND="~kde-base/kdebase-${PV}
- gphoto2? ( media-gfx/gphoto2 )
- scanner? ( media-gfx/sane-backends )
- tetex? ( virtual/tetex )
- dev-libs/fribidi
- opengl? ( virtual/glut virtual/opengl )
- media-libs/imlib
- virtual/ghostscript
- media-libs/tiff
- x86? ( scanner? ( sys-libs/libieee1284 ) )"
-RDEPEND="${DEPEND}
- app-text/xpdf"
-
-src_unpack() {
- kde_src_unpack
- epatch ${FILESDIR}/${P}-gcc34-compile.patch
- epatch ${FILESDIR}/post-3.2.3-kdegraphics_2.diff
- epatch ${FILESDIR}/post-3.2.3-kdegraphics-2.diff
- epatch ${FILESDIR}/CAN-2005-0064.patch
-}
-
-src_compile() {
-
- use gphoto2 \
- && myconf="$myconf --with-kamera \
- --with-gphoto2-includes=/usr/include/gphoto2 \
- --with-gphoto2-libraries=/usr/lib/gphoto2" \
- || myconf="$myconf --without-kamera"
-
- use tetex && myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
-
- use scanner || DO_NOT_COMPILE="$DO_NOT_COMPILE kooka libkscan"
-
- myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"
- kde_src_compile
-}
+++ /dev/null
-MD5 d9d1c4bd2016a96f156b491ca908dc16 kdelibs-3.2.3.tar.bz2 12737024
-MD5 ca12b078c7288ce9b2653e639a5b3ee0 post-3.2.3-kdelibs-kcookiejar.patch 5384
-MD5 345ce2e01cfdfa4754c47894c0271dcc post-3.2.3-kdelibs-kstandarddirs.patch 1417
-MD5 4d61d568e822d781308caa73050930bd post-3.2.3-kdelibs-htmlframes2.patch 1186
-MD5 94e76ec98cd58ce27cad8f886d241986 post-3.2.3-kdelibs-kio.diff 1509
-MD5 0046c691fa833b2ff8d7eac15312a68b post-3.2.3-kdelibs-dcopserver.patch 4751
-MD5 a639b7b592f005e911c454a0a8c9c542 post-3.2.3-kdelibs-kioslave.patch 549
+++ /dev/null
-MD5 d9d1c4bd2016a96f156b491ca908dc16 kdelibs-3.2.3.tar.bz2 12737024
-MD5 ca12b078c7288ce9b2653e639a5b3ee0 post-3.2.3-kdelibs-kcookiejar.patch 5384
-MD5 345ce2e01cfdfa4754c47894c0271dcc post-3.2.3-kdelibs-kstandarddirs.patch 1417
-MD5 4d61d568e822d781308caa73050930bd post-3.2.3-kdelibs-htmlframes2.patch 1186
-MD5 94e76ec98cd58ce27cad8f886d241986 post-3.2.3-kdelibs-kio.diff 1509
-MD5 0046c691fa833b2ff8d7eac15312a68b post-3.2.3-kdelibs-dcopserver.patch 4751
-MD5 0948701bffb082c65784dc8a2b648ef0 post-3.2.3-kdelibs-dcop.patch 1901
-MD5 a639b7b592f005e911c454a0a8c9c542 post-3.2.3-kdelibs-kioslave.patch 549
+++ /dev/null
---- khtml/khtml_ext.cpp 24 Apr 2004 08:20:46 -0000 1.85.2.2
-+++ khtml/khtml_ext.cpp 3 Aug 2004 14:36:43 -0000
-@@ -646,6 +646,19 @@ bool KHTMLPartBrowserHostExtension::open
- return m_part->openURLInFrame( url, urlArgs );
- }
-
-+void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data )
-+{
-+ if (id == VIRTUAL_FIND_FRAME_PARENT)
-+ {
-+ FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data);
-+ KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame);
-+ if (parentPart)
-+ param->parent = parentPart->browserHostExtension();
-+ return;
-+ }
-+ BrowserHostExtension::virtual_hook( id, data );
-+}
-+
- // BCI: remove in KDE 4
- KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const QString &text, const QString &icon, const QObject *receiver, const char *slot, QObject *parent, const char *name )
- : KAction( text, icon, 0, receiver, slot, parent, name )
-Index: khtml/khtml_ext.h
-===================================================================
-RCS file: /home/kde/kdelibs/khtml/khtml_ext.h,v
-retrieving revision 1.26.2.1
-diff -u -p -r1.26.2.1 khtml_ext.h
---- khtml/khtml_ext.h 29 Feb 2004 15:27:43 -0000 1.26.2.1
-+++ khtml/khtml_ext.h 3 Aug 2004 14:36:43 -0000
-@@ -98,6 +98,9 @@ public:
- virtual const QPtrList<KParts::ReadOnlyPart> frames() const;
-
- virtual bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs );
-+
-+protected:
-+ virtual void virtual_hook( int id, void* data );
- private:
- KHTMLPart *m_part;
- };
-Index: khtml/khtml_part.cpp
-===================================================================
-RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
-retrieving revision 1.959.2.20
-diff -u -p -r1.959.2.20 khtml_part.cpp
---- khtml/khtml_part.cpp 29 Jun 2004 09:08:16 -0000 1.959.2.20
-+++ khtml/khtml_part.cpp 3 Aug 2004 14:36:46 -0000
-@@ -757,12 +757,16 @@ DOM::Document KHTMLPart::document() cons
- return d->m_doc;
- }
-
--
- KParts::BrowserExtension *KHTMLPart::browserExtension() const
- {
- return d->m_extension;
- }
-
-+KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const
-+{
-+ return d->m_hostExtension;
-+}
-+
- KHTMLView *KHTMLPart::view() const
- {
- return d->m_view;
-@@ -880,29 +884,18 @@ QVariant KHTMLPart::crossFrameExecuteScr
- // we always allow these
- }
- else {
-- while (destpart->parentPart())
-- destpart = destpart->parentPart();
-- destpart = destpart->findFrame(target);
--
-+ destpart = findFrame(target);
- if (!destpart)
-- destpart = this; // ### doesn't make sense, does it?
-+ destpart = this;
- }
-
- // easy way out?
- if (destpart == this)
- return executeScript(DOM::Node(), script);
-
--
- // now compare the domains
-- if (!destpart->htmlDocument().isNull() &&
-- !htmlDocument().isNull()) {
-- DOM::DOMString actDomain = htmlDocument().domain();
-- DOM::DOMString destDomain = destpart->htmlDocument().domain();
--
-- if (actDomain == destDomain)
-- return destpart->executeScript(DOM::Node(), script);
-- }
--
-+ if (destpart->checkFrameAccess(this))
-+ return destpart->executeScript(DOM::Node(), script);
-
- // eww, something went wrong. better execute it in our frame
- return executeScript(DOM::Node(), script);
-@@ -3358,7 +3351,7 @@ void KHTMLPart::urlSelected( const QStri
- if ( hasTarget )
- {
- // unknown frame names should open in a new window.
-- khtml::ChildFrame *frame = recursiveFrameRequest( cURL, args, false );
-+ khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false );
- if ( frame )
- {
- args.metaData()["referrer"] = d->m_referrer;
-@@ -4364,6 +4357,7 @@ void KHTMLPart::slotChildDocCreated()
- void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
- {
- khtml::ChildFrame *child = frame( sender()->parent() );
-+ KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()));
-
- // TODO: handle child target correctly! currently the script are always executed fur the parent
- QString urlStr = url.url();
-@@ -4395,7 +4389,7 @@ void KHTMLPart::slotChildURLRequest( con
- }
- else if ( frameName != QString::fromLatin1( "_self" ) )
- {
-- khtml::ChildFrame *_frame = recursiveFrameRequest( url, args );
-+ khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args );
-
- if ( !_frame )
- {
-@@ -4437,46 +4431,92 @@ khtml::ChildFrame *KHTMLPart::frame( con
- return 0L;
- }
-
--//#define DEBUG_FINDFRAME
-+//#define DEBUG_FINDFRAME
-
--KHTMLPart *KHTMLPart::findFrame( const QString &f )
-+bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart)
- {
-+ if (callingHtmlPart == this)
-+ return true; // trivial
-+
-+ if (htmlDocument().isNull()) {
- #ifdef DEBUG_FINDFRAME
-- kdDebug(6050) << "KHTMLPart::findFrame '" << f << "'" << endl;
-- FrameIt it2 = d->m_frames.begin();
-- FrameIt end = d->m_frames.end();
-- for (; it2 != end; ++it2 )
-- kdDebug(6050) << " - having frame '" << (*it2).m_name << "'" << endl;
-+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl;
- #endif
-- // ### http://www.w3.org/TR/html4/appendix/notes.html#notes-frames
-- ConstFrameIt it = d->m_frames.find( f );
-- if ( it == d->m_frames.end() )
-- {
-+ return false; // we are empty?
-+ }
-+
-+ // now compare the domains
-+ if (callingHtmlPart && !callingHtmlPart->htmlDocument().isNull() &&
-+ !htmlDocument().isNull()) {
-+ DOM::DOMString actDomain = callingHtmlPart->htmlDocument().domain();
-+ DOM::DOMString destDomain = htmlDocument().domain();
-+
- #ifdef DEBUG_FINDFRAME
-- kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " not found" << endl;
-+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl;
- #endif
-- return 0L;
-+
-+ if (actDomain == destDomain)
-+ return true;
- }
-- else {
-- KParts::ReadOnlyPart *p = (*it).m_part;
-- if ( p && p->inherits( "KHTMLPart" ))
-- {
- #ifdef DEBUG_FINDFRAME
-- kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " is a KHTMLPart, ok" << endl;
-+ else
-+ {
-+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl;
-+ }
- #endif
-- return (KHTMLPart*)p;
-- }
-- else
-- {
-+ return false;
-+}
-+
-+KHTMLPart *
-+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
-+{
- #ifdef DEBUG_FINDFRAME
-- if (p)
-- kdWarning() << "KHTMLPart::findFrame frame " << f << " found but isn't a KHTMLPart ! " << p->className() << endl;
-- else
-- kdWarning() << "KHTMLPart::findFrame frame " << f << " found but m_part=0L" << endl;
-+ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
-+#endif
-+ // Check access
-+ KHTMLPart *callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
-+
-+ if (!checkFrameAccess(callingHtmlPart))
-+ return 0;
-+
-+ FrameIt it = d->m_frames.find( f );
-+ FrameIt end = d->m_frames.end();
-+ if ( it != end )
-+ {
-+#ifdef DEBUG_FINDFRAME
-+ kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl;
- #endif
-- return 0L;
-+ if (childFrame)
-+ *childFrame = &(*it);
-+ return this;
-+ }
-+
-+ it = d->m_frames.begin();
-+ for (; it != end; ++it )
-+ {
-+ KParts::ReadOnlyPart *p = (*it).m_part;
-+ if ( p && p->inherits( "KHTMLPart" ))
-+ {
-+ KHTMLPart *frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame);
-+ if (frameParent)
-+ return frameParent;
- }
- }
-+ return 0;
-+}
-+
-+
-+KHTMLPart *KHTMLPart::findFrame( const QString &f )
-+{
-+ khtml::ChildFrame *childFrame;
-+ KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame);
-+ if (parentFrame)
-+ {
-+ KParts::ReadOnlyPart *p = childFrame->m_part;
-+ if ( p && p->inherits( "KHTMLPart" ))
-+ return static_cast<KHTMLPart *>(p);
-+ }
-+ return 0;
- }
-
- KParts::ReadOnlyPart *KHTMLPart::currentFrame() const
-@@ -4514,37 +4554,29 @@ KHTMLPart *KHTMLPart::parentPart()
- return (KHTMLPart *)parent();
- }
-
--khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args,
-- bool callParent )
-+khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url,
-+ const KParts::URLArgs &args, bool callParent )
- {
-- FrameIt it = d->m_frames.find( args.frameName );
--
-- if ( it != d->m_frames.end() )
-- return &(*it);
--
-- it = d->m_frames.begin();
-- FrameIt end = d->m_frames.end();
-- for (; it != end; ++it )
-- if ( (*it).m_part && (*it).m_part->inherits( "KHTMLPart" ) )
-- {
-- KHTMLPart *childPart = (KHTMLPart *)(KParts::ReadOnlyPart *)(*it).m_part;
--
-- khtml::ChildFrame *res = childPart->recursiveFrameRequest( url, args, false );
-- if ( !res )
-- continue;
--
-- childPart->requestObject( res, url, args );
-- return 0L;
-- }
-+#ifdef DEBUG_FINDFRAME
-+ kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl;
-+#endif
-+ khtml::ChildFrame *childFrame;
-+ KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame);
-+ if (childPart)
-+ {
-+ if (childPart == this)
-+ return childFrame;
-+
-+ childPart->requestObject( childFrame, url, args );
-+ return 0;
-+ }
-
- if ( parentPart() && callParent )
- {
-- khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( url, args );
-+ khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent );
-
-- if ( res )
-- parentPart()->requestObject( res, url, args );
--
-- return 0L;
-+ if ( res )
-+ parentPart()->requestObject( res, url, args );
- }
-
- return 0L;
-@@ -4552,7 +4584,7 @@ khtml::ChildFrame *KHTMLPart::recursiveF
-
- void KHTMLPart::saveState( QDataStream &stream )
- {
-- kdDebug( 6050 ) << "KHTMLPart::saveState saving URL " << m_url.url() << endl;
-+ kdDebug( 6050 ) << "KHTMLPart::saveState this = " << this << " saving URL " << m_url.url() << endl;
-
- stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY()
- << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight();
-Index: khtml/khtml_part.h
-===================================================================
-RCS file: /home/kde/kdelibs/khtml/khtml_part.h,v
-retrieving revision 1.248.2.5
-diff -u -p -r1.248.2.5 khtml_part.h
---- khtml/khtml_part.h 29 Jun 2004 09:08:16 -0000 1.248.2.5
-+++ khtml/khtml_part.h 3 Aug 2004 14:36:47 -0000
-@@ -287,6 +287,7 @@ public:
- */
- KParts::BrowserExtension *browserExtension() const;
- KParts::LiveConnectExtension *liveConnectExtension( const khtml::RenderPart *) const;
-+ KParts::BrowserHostExtension *browserHostExtension() const;
-
- /**
- * Returns a pointer to the HTML document's view.
-@@ -812,6 +813,16 @@ public:
- KHTMLPart *findFrame( const QString &f );
-
- /**
-+ * @internal
-+ * Recursively finds the part containing the frame with name @p f
-+ * and checks if it is accessible by @p callingPart
-+ * Returns 0L if no suitable frame can't be found.
-+ * Returns parent part if a suitable frame was found and
-+ * frame info in @p *childFrame
-+ */
-+ KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame=0 );
-+
-+ /**
- * Return the current frame (the one that has focus)
- * Not necessarily a direct child of ours, framesets can be nested.
- * Returns "this" if this part isn't a frameset.
-@@ -1376,6 +1387,8 @@ private:
-
- bool restoreURL( const KURL &url );
- void emitSelectionChanged();
-+ // Returns whether callingHtmlPart may access this part
-+ bool checkFrameAccess(KHTMLPart *callingHtmlPart);
- bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs );
- void startAutoScroll();
- void stopAutoScroll();
-@@ -1434,7 +1447,7 @@ private:
- DOM::DocumentImpl *xmlDocImpl() const;
- khtml::ChildFrame *frame( const QObject *obj );
-
-- khtml::ChildFrame *recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, bool callParent = true );
-+ khtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true );
-
- bool checkLinkSecurity( const KURL &linkURL,const QString &message = QString::null, const QString &button = QString::null );
- QVariant executeScript( const QString& filename, int baseLine, const DOM::Node &n, const QString& script );
-Index: kparts/browserextension.cpp
-===================================================================
-RCS file: /home/kde/kdelibs/kparts/browserextension.cpp,v
-retrieving revision 1.60.2.1
-diff -u -p -r1.60.2.1 browserextension.cpp
---- kparts/browserextension.cpp 10 Apr 2004 15:08:49 -0000 1.60.2.1
-+++ kparts/browserextension.cpp 3 Aug 2004 14:36:48 -0000
-@@ -636,6 +636,17 @@ BrowserHostExtension *BrowserHostExtensi
- void BrowserExtension::virtual_hook( int, void* )
- { /*BASE::virtual_hook( id, data );*/ }
-
-+BrowserHostExtension *
-+BrowserHostExtension::findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame)
-+{
-+ FindFrameParentParams param;
-+ param.parent = 0;
-+ param.callingPart = callingPart;
-+ param.frame = frame;
-+ virtual_hook(VIRTUAL_FIND_FRAME_PARENT, ¶m);
-+ return param.parent;
-+}
-+
- void BrowserHostExtension::virtual_hook( int, void* )
- { /*BASE::virtual_hook( id, data );*/ }
-
-Index: kparts/browserextension.h
-===================================================================
-RCS file: /home/kde/kdelibs/kparts/browserextension.h,v
-retrieving revision 1.110
-diff -u -p -r1.110 browserextension.h
---- kparts/browserextension.h 26 Sep 2003 07:13:13 -0000 1.110
-+++ kparts/browserextension.h 3 Aug 2004 14:36:48 -0000
-@@ -671,10 +671,16 @@ public:
- *
- * Note that this method does not query the child objects recursively.
- */
--
- virtual const QPtrList<KParts::ReadOnlyPart> frames() const;
-
- /**
-+ * @internal
-+ * Returns the part that contains @p frame and that may be accessed
-+ * by @p callingPart
-+ */
-+ BrowserHostExtension *findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame);
-+
-+ /**
- * Opens the given url in a hosted child frame. The frame name is specified in the
- * frameName variable in the urlArgs argument structure (see KParts::URLArgs ) .
- */
-@@ -687,6 +693,19 @@ public:
- static BrowserHostExtension *childObject( QObject *obj );
-
- protected:
-+ /** This 'enum' along with the structure below is NOT part of the public API.
-+ * It's going to disappear in KDE 4.0 and is likely to change inbetween.
-+ *
-+ * @internal
-+ */
-+ enum { VIRTUAL_FIND_FRAME_PARENT = 0x10 };
-+ struct FindFrameParentParams
-+ {
-+ BrowserHostExtension *parent;
-+ KParts::ReadOnlyPart *callingPart;
-+ QString frame;
-+ };
-+
- virtual void virtual_hook( int id, void* data );
- private:
- class BrowserHostExtensionPrivate;
+++ /dev/null
-===================================================================
-RCS file: /home/kde/kdelibs/kdecore/kidna.cpp,v
-retrieving revision 1.9.4.1
-retrieving revision 1.9.4.2
-diff -u -r1.9.4.1 -r1.9.4.2
---- kdecore/kidna.cpp 2004/02/04 11:43:34 1.9.4.1
-+++ kdecore/kidna.cpp 2005/03/03 13:19:45 1.9.4.2
-@@ -21,6 +21,7 @@
-
- #include "kidna.h"
-
-+#include <qstringlist.h>
- #include <kdebug.h>
-
- #include "ltdl.h"
-@@ -65,6 +66,22 @@
- KIDNA_lib_load_failed = false; // Succes
- }
-
-+static QStringList *KIDNA_idnDomains = 0;
-+
-+static bool idnSupportForHost(const QString &host)
-+{
-+ if (!KIDNA_idnDomains)
-+ {
-+ const char *kde_use_idn = getenv("KDE_USE_IDN");
-+ if (!kde_use_idn)
-+ kde_use_idn = "at:ch:cn:de:dk:kr:jp:li:no:se:tw";
-+ KIDNA_idnDomains = new QStringList(QStringList::split(':', QString::fromLatin1(kde_use_idn).lower()));
-+ }
-+
-+ QString tld = host.mid(host.findRev('.')+1).lower();
-+ return KIDNA_idnDomains->contains(tld);
-+}
-+
- QCString KIDNA::toAsciiCString(const QString &idna)
- {
- int l = idna.length();
-@@ -86,7 +103,7 @@
- KIDNA_load_lib();
- }
-
-- if (KIDNA_lib_load_failed)
-+ if (KIDNA_lib_load_failed || !idnSupportForHost(idna))
- {
- return 0; // Can't convert
- }
-@@ -132,7 +149,7 @@
- KIDNA_load_lib();
- }
-
-- if (KIDNA_lib_load_failed)
-+ if (KIDNA_lib_load_failed || !idnSupportForHost(idna))
- {
- return QString::null; // Can't convert
- }
-@@ -164,7 +181,7 @@
- KIDNA_load_lib();
- }
-
-- if (KIDNA_lib_load_failed)
-+ if (KIDNA_lib_load_failed || !idnSupportForHost(idna))
- {
- return idna.lower(); // Return as is
- }
-===================================================================
-RCS file: /home/kde/kdelibs/kio/kssl/ksslpeerinfo.cc,v
-retrieving revision 1.44
-retrieving revision 1.44.2.1
-diff -u -r1.44 -r1.44.2.1
---- kio/kssl/ksslpeerinfo.cc 2003/05/29 16:50:21 1.44
-+++ kio/kssl/ksslpeerinfo.cc 2005/03/04 12:13:28 1.44.2.1
-@@ -30,6 +30,7 @@
- #include <ksockaddr.h>
- #include <kextsock.h>
- #include <netsupp.h>
-+#include "kidna.h"
-
- #include "ksslx509map.h"
-
-@@ -59,7 +60,7 @@
- while(d->peerHost.endsWith("."))
- d->peerHost.truncate(d->peerHost.length()-1);
-
-- d->peerHost = d->peerHost.lower();
-+ d->peerHost = KIDNA::toAscii(d->peerHost);
- }
-
- bool KSSLPeerInfo::certMatchesAddress() {
+++ /dev/null
---- khtml/khtml_ext.cpp 3 Aug 2004 14:38:41 -0000 1.85.2.3
-+++ khtml/khtml_ext.cpp 8 Dec 2004 02:09:29 -0000
-@@ -442,40 +442,44 @@ void KHTMLPopupGUIClient::slotSaveImageA
- saveURL( d->m_khtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData );
- }
-
- void KHTMLPopupGUIClient::slotCopyLinkLocation()
- {
-+ KURL safeURL(d->m_url);
-+ safeURL.setPass(QString::null);
- #ifndef QT_NO_MIMECLIPBOARD
- // Set it in both the mouse selection and in the clipboard
- KURL::List lst;
-- lst.append( d->m_url );
-+ lst.append( safeURL );
- QApplication::clipboard()->setSelectionMode(true);
- QApplication::clipboard()->setData( new KURLDrag( lst ) );
- QApplication::clipboard()->setSelectionMode(false);
- QApplication::clipboard()->setData( new KURLDrag( lst ) );
- #else
-- QApplication::clipboard()->setText( d->m_url.url() ); //FIXME(E): Handle multiple entries
-+ QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
- #endif
- }
-
- void KHTMLPopupGUIClient::slotStopAnimations()
- {
- d->m_khtml->stopAnimations();
- }
-
- void KHTMLPopupGUIClient::slotCopyImageLocation()
- {
-+ KURL safeURL(d->m_imageURL);
-+ safeURL.setPass(QString::null);
- #ifndef QT_NO_MIMECLIPBOARD
- // Set it in both the mouse selection and in the clipboard
- KURL::List lst;
-- lst.append( d->m_imageURL);
-+ lst.append( safeURL );
- QApplication::clipboard()->setSelectionMode(true);
- QApplication::clipboard()->setData( new KURLDrag( lst ) );
- QApplication::clipboard()->setSelectionMode(false);
- QApplication::clipboard()->setData( new KURLDrag( lst ) );
- #else
-- QApplication::clipboard()->setText(d->m_imageURL.url()); //FIXME(E): Handle multiple entries
-+ QApplication::clipboard()->setText( safeURL.url() ); //FIXME(E): Handle multiple entries
- #endif
- }
-
- void KHTMLPopupGUIClient::slotViewImage()
- {
---- khtml/khtml_part.cpp 8 Aug 2004 11:10:55 -0000 1.959.2.23
-+++ khtml/khtml_part.cpp 8 Dec 2004 02:09:32 -0000
-@@ -5465,10 +5465,12 @@ void KHTMLPart::khtmlMouseMoveEvent( kht
- // Text or image link...
- u = completeURL( d->m_strSelectedURL );
- pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
- }
-
-+ u.setPass(QString::null);
-+
- KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
- if ( !d->m_referrer.isEmpty() )
- urlDrag->metaData()["referrer"] = d->m_referrer;
-
- if( img ) {
-
+++ /dev/null
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/eps.cpp kdelibs-3.2.5/work/kdelibs/kimgio/eps.cpp
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/eps.cpp 2003-09-21 10:39:17.000000000 +0200
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/eps.cpp 2005-04-20 14:07:22.000000000 +0200
-@@ -121,7 +121,7 @@ static bool bbox ( QIODevice *io, int *x
- return ret;
- }
-
--void kimgio_eps_read (QImageIO *image)
-+void kimgio_eps_read (QImageIO *image)
- {
- kdDebug(399) << "kimgio EPS: starting..." << endl;
-
-@@ -245,39 +245,34 @@ void kimgio_eps_read (QImageIO *image)
- }
-
- // Sven Wiegand <SWiegand@tfh-berlin.de> -- eps output filter (from KSnapshot)
--void kimgio_eps_write( QImageIO *imageio )
-+void kimgio_eps_write( QImageIO *imageio )
- {
-- QPrinter psOut;
-+ QPrinter psOut(QPrinter::PrinterResolution);
- QPainter p;
-
- // making some definitions (papersize, output to file, filename):
- psOut.setCreator( "KDE " KDE_VERSION_STRING );
- psOut.setOutputToFile( true );
-
-- KTempFile tmpFile;
-+ // Extension must be .eps so that Qt generates EPS file
-+ KTempFile tmpFile(QString::null, ".eps");
- tmpFile.setAutoDelete(true);
- if ( tmpFile.status() != 0)
- return;
- tmpFile.close(); // Close the file, we just want the filename
-
- psOut.setOutputFileName(tmpFile.name());
-+ psOut.setFullPage(true);
-
- // painting the pixmap to the "printer" which is a file
- p.begin( &psOut );
--
-- p.translate( -36, 820 - imageio->image().height() );
--
-+ // Qt uses the clip rect for the bounding box
-+ p.setClipRect( 0, 0, imageio->image().width(), imageio->image().height(), QPainter::CoordPainter);
- p.drawImage( QPoint( 0, 0 ), imageio->image() );
- p.end();
-
-- // write BoundingBox to File
-+ // Copy file to imageio struct
- QFile inFile(tmpFile.name());
-- QString szBoxInfo;
--
-- szBoxInfo.sprintf("%%%%BoundingBox: 0 0 %d %d\n",
-- imageio->image().width(),
-- imageio->image().height());
--
- inFile.open( IO_ReadOnly );
-
- QTextStream in( &inFile );
-@@ -287,7 +282,6 @@ void kimgio_eps_write( QImageIO *imageio
-
- QString szInLine = in.readLine();
- out << szInLine << '\n';
-- out << szBoxInfo;
-
- while( !in.atEnd() ){
- szInLine = in.readLine();
-@@ -298,4 +292,3 @@ void kimgio_eps_write( QImageIO *imageio
-
- imageio->setStatus(0);
- }
--
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/g3r.cpp kdelibs-3.2.5/work/kdelibs/kimgio/g3r.cpp
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/g3r.cpp 2000-07-03 18:37:32.000000000 +0200
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/g3r.cpp 2005-04-20 14:07:22.000000000 +0200
-@@ -11,8 +11,9 @@
-
- #include "g3r.h"
-
--void kimgio_g3_read( QImageIO *io )
-+void kimgio_g3_read( QImageIO *io )
- {
-+ // This won't work if io is not a QFile !
- TIFF *tiff = TIFFOpen(QFile::encodeName(io->fileName()), "r");
- if (!tiff)
- return;
-@@ -20,13 +21,14 @@ void kimgio_g3_read( QImageIO *io )
- uint32 width, height;
- tsize_t scanlength;
-
-- TIFFGetField( tiff, TIFFTAG_IMAGEWIDTH, &width );
-- TIFFGetField( tiff, TIFFTAG_IMAGELENGTH, &height );
-+ if( TIFFGetField( tiff, TIFFTAG_IMAGEWIDTH, &width ) != 1
-+ || TIFFGetField( tiff, TIFFTAG_IMAGELENGTH, &height ) != 1 )
-+ return;
- scanlength = TIFFScanlineSize(tiff);
-
- QImage image(width, height, 1, 0, QImage::BigEndian);
-
-- if (scanlength != image.bytesPerLine())
-+ if (image.isNull() || scanlength != image.bytesPerLine())
- {
- TIFFClose(tiff);
- return;
-@@ -42,7 +44,7 @@ void kimgio_g3_read( QImageIO *io )
- }
-
-
--void kimgio_g3_write(QImageIO *)
-+void kimgio_g3_write(QImageIO *)
- {
- // TODO: stub
- }
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/ico.cpp kdelibs-3.2.5/work/kdelibs/kimgio/ico.cpp
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/ico.cpp 2003-09-07 14:17:55.000000000 +0200
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/ico.cpp 2005-04-20 14:07:22.000000000 +0200
-@@ -113,6 +115,8 @@ namespace
- // closest size match precedes everything else
- if ( std::abs( int( lhs.width - size ) ) <
- std::abs( int( rhs.width - size ) ) ) return true;
-+ else if ( std::abs( int( lhs.width - size ) ) >
-+ std::abs( int( rhs.width - size ) ) ) return false;
- else if ( colors == 0 )
- {
- // high/true color requested
-@@ -137,24 +141,38 @@ namespace
- {
- BMP_INFOHDR header;
- stream >> header;
-- if ( header.biSize != BMP_INFOHDR::Size ||
-+ if ( stream.atEnd() || header.biSize != BMP_INFOHDR::Size ||
- header.biSize > rec.size ||
- header.biCompression != BMP_INFOHDR::RGB ||
- ( header.biBitCount != 1 && header.biBitCount != 4 &&
- header.biBitCount != 8 && header.biBitCount != 24 &&
- header.biBitCount != 32 ) ) return false;
-
-- unsigned colors = header.biBitCount >= 24 ?
-- 0 : header.biClrUsed ?
-- header.biClrUsed : 1 << header.biBitCount;
-+ unsigned paletteSize, paletteEntries;
-+
-+ if (header.biBitCount > 8)
-+ {
-+ paletteEntries = 0;
-+ paletteSize = 0;
-+ }
-+ else
-+ {
-+ paletteSize = (1 << header.biBitCount);
-+ paletteEntries = paletteSize;
-+ if (header.biClrUsed && header.biClrUsed < paletteSize)
-+ paletteEntries = header.biClrUsed;
-+ }
-+
- // Always create a 32-bit image to get the mask right
-+ // Note: this is safe as rec.width, rec.height are bytes
- icon.create( rec.width, rec.height, 32 );
- if ( icon.isNull() ) return false;
- icon.setAlphaBuffer( true );
-
-- QMemArray< QRgb > colorTable( 1 << header.biBitCount );
-+ QMemArray< QRgb > colorTable( paletteSize );
-+
- colorTable.fill( QRgb( 0 ) );
-- for ( unsigned i = 0; i < colors; ++i )
-+ for ( unsigned i = 0; i < paletteEntries; ++i )
- {
- unsigned char rgb[ 4 ];
- stream.readRawBytes( reinterpret_cast< char* >( &rgb ),
-@@ -163,9 +181,10 @@ namespace
- }
-
- unsigned bpl = ( rec.width * header.biBitCount + 31 ) / 32 * 4;
-+
- unsigned char* buf = new unsigned char[ bpl ];
- unsigned char** lines = icon.jumpTable();
-- for ( unsigned y = rec.height; y--; )
-+ for ( unsigned y = rec.height; !stream.atEnd() && y--; )
- {
- stream.readRawBytes( reinterpret_cast< char* >( buf ), bpl );
- unsigned char* pixel = buf;
-@@ -230,7 +249,7 @@ extern "C" void kimgio_ico_read( QImageI
- stream.setByteOrder( QDataStream::LittleEndian );
- IcoHeader header;
- stream >> header;
-- if ( !header.count ||
-+ if ( stream.atEnd() || !header.count ||
- ( header.type != IcoHeader::Icon && header.type != IcoHeader::Cursor) )
- return;
-
-@@ -265,12 +284,14 @@ extern "C" void kimgio_ico_read( QImageI
- stream >> rec;
- icons.push_back( rec );
- }
-- IconList::const_iterator selected =
-- requestedIndex >= 0 ?
-- std::min( icons.begin() + requestedIndex, icons.end() ) :
-- std::min_element( icons.begin(), icons.end(),
-+ IconList::const_iterator selected;
-+ if (requestedIndex >= 0) {
-+ selected = std::min( icons.begin() + requestedIndex, icons.end() );
-+ } else {
-+ selected = std::min_element( icons.begin(), icons.end(),
- LessDifference( requestedSize, requestedColors ) );
-- if ( selected == icons.end() ||
-+ }
-+ if ( stream.atEnd() || selected == icons.end() ||
- offset + selected->offset > io->ioDevice()->size() )
- return;
-
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/jp2.cpp kdelibs-3.2.5/work/kdelibs/kimgio/jp2.cpp
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/jp2.cpp 2003-10-26 11:54:06.000000000 +0100
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/jp2.cpp 2005-04-20 14:07:22.000000000 +0200
-@@ -157,8 +157,9 @@ namespace {
- void
- draw_view_gray( gs_t& gs, QImage& qti )
- {
-- qti.create( jas_image_width( gs.image ), jas_image_height( gs.image ),
-- 8, 256 );
-+ if( !qti.create( jas_image_width( gs.image ), jas_image_height( gs.image ),
-+ 8, 256 ))
-+ return;
- for( int i = 0; i < 256; ++i )
- qti.setColor( i, qRgb( i, i, i ) );
-
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/pcx.cpp kdelibs-3.2.5/work/kdelibs/kimgio/pcx.cpp
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/pcx.cpp 2003-10-26 11:54:06.000000000 +0100
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/pcx.cpp 2005-04-20 14:07:22.000000000 +0200
-@@ -1,5 +1,5 @@
- /* This file is part of the KDE project
-- Copyright (C) 2002-2003 Nadeem Hasan <nhasan@kde.org>
-+ Copyright (C) 2002-2005 Nadeem Hasan <nhasan@kde.org>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
-@@ -44,6 +44,11 @@ static QDataStream &operator>>( QDataStr
- s >> ph.HScreenSize;
- s >> ph.VScreenSize;
-
-+ // Skip the rest of the header
-+ Q_UINT8 byte;
-+ while ( s.device()->at() < 128 )
-+ s >> byte;
-+
- return s;
- }
-
-@@ -85,25 +90,22 @@ static QDataStream &operator<<( QDataStr
- return s;
- }
-
--static PCXHEADER header;
--static QImage img;
--static Q_UINT16 w, h;
--
--void PCXHEADER::reset()
-+PCXHEADER::PCXHEADER()
- {
-+ // Initialize all data to zero
- QByteArray dummy( 128 );
- dummy.fill( 0 );
- QDataStream s( dummy, IO_ReadOnly );
- s >> *this;
- }
-
--static void readLine( QDataStream &s, QByteArray &buf )
-+static void readLine( QDataStream &s, QByteArray &buf, const PCXHEADER &header )
- {
- Q_UINT32 i=0;
- Q_UINT32 size = buf.size();
- Q_UINT8 byte, count;
-
-- if ( header.Encoding == 1 )
-+ if ( header.isCompressed() )
- {
- // Uncompress the image data
- while ( i < size )
-@@ -130,13 +132,14 @@ static void readLine( QDataStream &s, QB
- }
- }
-
--static void readImage1( QDataStream &s )
-+static void readImage1( QImage &img, QDataStream &s, const PCXHEADER &header )
- {
- QByteArray buf( header.BytesPerLine );
-
-- img.create( w, h, 1, 2, QImage::BigEndian );
-+ if(!img.create( header.width(), header.height(), 1, 2, QImage::BigEndian ))
-+ return;
-
-- for ( int y=0; y<h; ++y )
-+ for ( int y=0; y<header.height(); ++y )
- {
- if ( s.atEnd() )
- {
-@@ -144,10 +147,11 @@ static void readImage1( QDataStream &s )
- return;
- }
-
-- readLine( s, buf );
--
-- for ( int x=0; x<header.BytesPerLine; ++x )
-- *( img.scanLine( y )+x ) = buf[ x ];
-+ readLine( s, buf, header );
-+ uchar *p = img.scanLine( y );
-+ unsigned int bpl = QMIN((header.width()+7)/8, header.BytesPerLine);
-+ for ( unsigned int x=0; x< bpl; ++x )
-+ p[ x ] = buf[x];
- }
-
- // Set the color palette
-@@ -155,14 +159,15 @@ static void readImage1( QDataStream &s )
- img.setColor( 1, qRgb( 255, 255, 255 ) );
- }
-
--static void readImage4( QDataStream &s )
-+static void readImage4( QImage &img, QDataStream &s, const PCXHEADER &header )
- {
- QByteArray buf( header.BytesPerLine*4 );
-- QByteArray pixbuf( w );
-+ QByteArray pixbuf( header.width() );
-
-- img.create( w, h, 8, 16, QImage::IgnoreEndian );
-+ if(!img.create( header.width(), header.height(), 8, 16 ))
-+ return;
-
-- for ( int y=0; y<h; ++y )
-+ for ( int y=0; y<header.height(); ++y )
- {
- if ( s.atEnd() )
- {
-@@ -171,20 +176,19 @@ static void readImage4( QDataStream &s )
- }
-
- pixbuf.fill( 0 );
-- readLine( s, buf );
-+ readLine( s, buf, header );
-
- for ( int i=0; i<4; i++ )
- {
- Q_UINT32 offset = i*header.BytesPerLine;
-- for ( int x=0; x<w; ++x )
-+ for ( unsigned int x=0; x<header.width(); ++x )
- if ( buf[ offset + ( x/8 ) ] & ( 128 >> ( x%8 ) ) )
- pixbuf[ x ] += ( 1 << i );
- }
-
- uchar *p = img.scanLine( y );
--
-- for ( int x=0; x<w; ++x )
-- *p++ = pixbuf[ x ];
-+ for ( unsigned int x=0; x<header.width(); ++x )
-+ p[ x ] = pixbuf[ x ];
- }
-
- // Read the palette
-@@ -192,13 +196,14 @@ static void readImage4( QDataStream &s )
- img.setColor( i, header.ColorMap.color( i ) );
- }
-
--static void readImage8( QDataStream &s )
-+static void readImage8( QImage &img, QDataStream &s, const PCXHEADER &header )
- {
- QByteArray buf( header.BytesPerLine );
-
-- img.create( w, h, 8, 256, QImage::IgnoreEndian );
-+ if(!img.create( header.width(), header.height(), 8, 256 ))
-+ return;
-
-- for ( int y=0; y<h; ++y )
-+ for ( int y=0; y<header.height(); ++y )
- {
- if ( s.atEnd() )
- {
-@@ -206,19 +211,19 @@ static void readImage8( QDataStream &s )
- return;
- }
-
-- readLine( s, buf );
-+ readLine( s, buf, header );
-
- uchar *p = img.scanLine( y );
--
-- for ( int x=0; x<header.BytesPerLine; ++x )
-- *p++ = buf[ x ];
-+ unsigned int bpl = QMIN(header.BytesPerLine, header.width());
-+ for ( unsigned int x=0; x<bpl; ++x )
-+ p[ x ] = buf[ x ];
- }
-
- Q_UINT8 flag;
- s >> flag;
-- kdDebug() << "Flag: " << flag << endl;
-+ kdDebug( 399 ) << "Palette Flag: " << flag << endl;
-
-- if ( flag == 12 && header.Version == 5 )
-+ if ( flag == 12 && ( header.Version == 5 || header.Version == 2 ) )
- {
- // Read the palette
- Q_UINT8 r, g, b;
-@@ -230,15 +235,16 @@ static void readImage8( QDataStream &s )
- }
- }
-
--static void readImage24( QDataStream &s )
-+static void readImage24( QImage &img, QDataStream &s, const PCXHEADER &header )
- {
- QByteArray r_buf( header.BytesPerLine );
- QByteArray g_buf( header.BytesPerLine );
- QByteArray b_buf( header.BytesPerLine );
-
-- img.create( w, h, 32 );
-+ if(!img.create( header.width(), header.height(), 32 ))
-+ return;
-
-- for ( int y=0; y<h; ++y )
-+ for ( int y=0; y<header.height(); ++y )
- {
- if ( s.atEnd() )
- {
-@@ -246,18 +252,17 @@ static void readImage24( QDataStream &s
- return;
- }
-
-- readLine( s, r_buf );
-- readLine( s, g_buf );
-- readLine( s, b_buf );
-+ readLine( s, r_buf, header );
-+ readLine( s, g_buf, header );
-+ readLine( s, b_buf, header );
-
- uint *p = ( uint * )img.scanLine( y );
--
-- for ( int x=0; x<header.BytesPerLine; ++x )
-- *p++ = qRgb( r_buf[ x ], g_buf[ x ], b_buf[ x ] );
-+ for ( unsigned int x=0; x<header.width(); ++x )
-+ p[ x ] = qRgb( r_buf[ x ], g_buf[ x ], b_buf[ x ] );
- }
- }
-
--void kimgio_pcx_read( QImageIO *io )
-+void kimgio_pcx_read( QImageIO *io )
- {
- QDataStream s( io->ioDevice() );
- s.setByteOrder( QDataStream::LittleEndian );
-@@ -268,6 +273,8 @@ void kimgio_pcx_read( QImageIO *io )
- return;
- }
-
-+ PCXHEADER header;
-+
- s >> header;
-
- if ( header.Manufacturer != 10 || s.atEnd())
-@@ -276,10 +283,8 @@ void kimgio_pcx_read( QImageIO *io )
- return;
- }
-
-- w = ( header.XMax-header.XMin ) + 1;
-- h = ( header.YMax-header.YMin ) + 1;
--
-- img.reset();
-+ int w = header.width();
-+ int h = header.height();
-
- kdDebug( 399 ) << "Manufacturer: " << header.Manufacturer << endl;
- kdDebug( 399 ) << "Version: " << header.Version << endl;
-@@ -292,26 +297,23 @@ void kimgio_pcx_read( QImageIO *io )
- kdDebug( 399 ) << "BytesPerLine: " << header.BytesPerLine << endl;
- kdDebug( 399 ) << "NPlanes: " << header.NPlanes << endl;
-
-- // Skip the rest of the header
-- Q_UINT8 byte;
-- while ( s.device()->at() < 128 )
-- s >> byte;
-+ QImage img;
-
- if ( header.Bpp == 1 && header.NPlanes == 1 )
- {
-- readImage1( s );
-+ readImage1( img, s, header );
- }
- else if ( header.Bpp == 1 && header.NPlanes == 4 )
- {
-- readImage4( s );
-+ readImage4( img, s, header );
- }
- else if ( header.Bpp == 8 && header.NPlanes == 1 )
- {
-- readImage8( s );
-+ readImage8( img, s, header );
- }
- else if ( header.Bpp == 8 && header.NPlanes == 3 )
- {
-- readImage24( s );
-+ readImage24( img, s, header );
- }
-
- kdDebug( 399 ) << "Image Bytes: " << img.numBytes() << endl;
-@@ -359,7 +361,7 @@ static void writeLine( QDataStream &s, Q
- }
- }
-
--static void writeImage1( QDataStream &s )
-+static void writeImage1( QImage &img, QDataStream &s, PCXHEADER &header )
- {
- img = img.convertBitOrder( QImage::BigEndian );
-
-@@ -367,29 +369,27 @@ static void writeImage1( QDataStream &s
- header.NPlanes = 1;
- header.BytesPerLine = img.bytesPerLine();
-
-- header.ColorMap.setColor( 0, qRgb( 0, 0, 0 ) );
-- header.ColorMap.setColor( 1, qRgb( 255, 255, 255 ) );
--
- s << header;
-
- QByteArray buf( header.BytesPerLine );
-
-- for ( int y=0; y<h; ++y )
-+ for ( int y=0; y<header.height(); ++y )
- {
- Q_UINT8 *p = img.scanLine( y );
-
-+ // Invert as QImage uses reverse palette for monochrome images?
- for ( int i=0; i<header.BytesPerLine; ++i )
-- buf[ i ] = p[ i ];
-+ buf[ i ] = ~p[ i ];
-
- writeLine( s, buf );
- }
- }
-
--static void writeImage4( QDataStream &s )
-+static void writeImage4( QImage &img, QDataStream &s, PCXHEADER &header )
- {
- header.Bpp = 1;
- header.NPlanes = 4;
-- header.BytesPerLine = w/8;
-+ header.BytesPerLine = header.width()/8;
-
- for ( int i=0; i<16; ++i )
- header.ColorMap.setColor( i, img.color( i ) );
-@@ -401,14 +401,14 @@ static void writeImage4( QDataStream &s
- for ( int i=0; i<4; ++i )
- buf[ i ].resize( header.BytesPerLine );
-
-- for ( int y=0; y<h; ++y )
-+ for ( int y=0; y<header.height(); ++y )
- {
- Q_UINT8 *p = img.scanLine( y );
-
- for ( int i=0; i<4; ++i )
- buf[ i ].fill( 0 );
-
-- for ( int x=0; x<w; ++x )
-+ for ( unsigned int x=0; x<header.width(); ++x )
- {
- for ( int i=0; i<4; ++i )
- if ( *( p+x ) & ( 1 << i ) )
-@@ -420,7 +420,7 @@ static void writeImage4( QDataStream &s
- }
- }
-
--static void writeImage8( QDataStream &s )
-+static void writeImage8( QImage &img, QDataStream &s, PCXHEADER &header )
- {
- header.Bpp = 8;
- header.NPlanes = 1;
-@@ -430,7 +430,7 @@ static void writeImage8( QDataStream &s
-
- QByteArray buf( header.BytesPerLine );
-
-- for ( int y=0; y<h; ++y )
-+ for ( int y=0; y<header.height(); ++y )
- {
- Q_UINT8 *p = img.scanLine( y );
-
-@@ -449,23 +449,23 @@ static void writeImage8( QDataStream &s
- s << RGB( img.color( i ) );
- }
-
--static void writeImage24( QDataStream &s )
-+static void writeImage24( QImage &img, QDataStream &s, PCXHEADER &header )
- {
- header.Bpp = 8;
- header.NPlanes = 3;
-- header.BytesPerLine = w;
-+ header.BytesPerLine = header.width();
-
- s << header;
-
-- QByteArray r_buf( w );
-- QByteArray g_buf( w );
-- QByteArray b_buf( w );
-+ QByteArray r_buf( header.width() );
-+ QByteArray g_buf( header.width() );
-+ QByteArray b_buf( header.width() );
-
-- for ( int y=0; y<h; ++y )
-+ for ( int y=0; y<header.height(); ++y )
- {
- uint *p = ( uint * )img.scanLine( y );
-
-- for ( int x=0; x<w; ++x )
-+ for ( unsigned int x=0; x<header.width(); ++x )
- {
- QRgb rgb = *p++;
- r_buf[ x ] = qRed( rgb );
-@@ -479,15 +479,15 @@ static void writeImage24( QDataStream &s
- }
- }
-
--void kimgio_pcx_write( QImageIO *io )
-+void kimgio_pcx_write( QImageIO *io )
- {
- QDataStream s( io->ioDevice() );
- s.setByteOrder( QDataStream::LittleEndian );
-
-- img = io->image();
-+ QImage img = io->image();
-
-- w = img.width();
-- h = img.height();
-+ int w = img.width();
-+ int h = img.height();
-
- kdDebug( 399 ) << "Width: " << w << endl;
- kdDebug( 399 ) << "Height: " << h << endl;
-@@ -495,6 +495,8 @@ void kimgio_pcx_write( QImageIO *io )
- kdDebug( 399 ) << "BytesPerLine: " << img.bytesPerLine() << endl;
- kdDebug( 399 ) << "Num Colors: " << img.numColors() << endl;
-
-+ PCXHEADER header;
-+
- header.Manufacturer = 10;
- header.Version = 5;
- header.Encoding = 1;
-@@ -509,19 +511,19 @@ void kimgio_pcx_write( QImageIO *io )
-
- if ( img.depth() == 1 )
- {
-- writeImage1( s );
-+ writeImage1( img, s, header );
- }
- else if ( img.depth() == 8 && img.numColors() <= 16 )
- {
-- writeImage4( s );
-+ writeImage4( img, s, header );
- }
- else if ( img.depth() == 8 )
- {
-- writeImage8( s );
-+ writeImage8( img, s, header );
- }
- else if ( img.depth() == 32 )
- {
-- writeImage24( s );
-+ writeImage24( img, s, header );
- }
-
- io->setStatus( 0 );
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/pcx.h kdelibs-3.2.5/work/kdelibs/kimgio/pcx.h
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/pcx.h 2003-01-04 01:48:25.000000000 +0100
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/pcx.h 2005-04-20 14:07:22.000000000 +0200
-@@ -49,7 +49,7 @@ class Palette
- rgb[ i ] = RGB( color );
- }
-
-- QRgb color( int i )
-+ QRgb color( int i ) const
- {
- return qRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b );
- }
-@@ -60,12 +60,11 @@ class Palette
- class PCXHEADER
- {
- public:
-- PCXHEADER()
-- {
-- reset();
-- }
-+ PCXHEADER();
-
-- void reset();
-+ inline int width() const { return ( XMax-XMin ) + 1; }
-+ inline int height() const { return ( YMax-YMin ) + 1; }
-+ inline bool isCompressed() const { return ( Encoding==1 ); }
-
- Q_UINT8 Manufacturer; // Constant Flag, 10 = ZSoft .pcx
- Q_UINT8 Version; // Version information·
-@@ -99,7 +98,7 @@ class PCXHEADER
- // found only in PB IV/IV Plus
- Q_UINT16 VScreenSize; // Vertical screen size in pixels. New field
- // found only in PB IV/IV Plus
--};
-+} KDE_PACKED;
-
- #endif // PCX_H
-
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/tga.cpp kdelibs-3.2.5/work/kdelibs/kimgio/tga.cpp
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/tga.cpp 2003-03-02 13:59:11.000000000 +0100
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/tga.cpp 2005-04-20 14:07:22.000000000 +0200
-@@ -1,5 +1,6 @@
- /* This file is part of the KDE project
- Copyright (C) 2003 Dominik Seichter <domseichter@web.de>
-+ Copyright (C) 2004 Ignacio Castaño <castano@ludicon.com>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the Lesser GNU General Public
-@@ -9,238 +10,376 @@
-
- /* this code supports:
- * reading:
-- * run length encoded true color tga files
-- * uncompressed true color tga files
-+ * uncompressed and run length encoded indexed, grey and color tga files.
-+ * image types 1, 2, 3, 9, 10 and 11.
-+ * only RGB color maps with no more than 256 colors.
-+ * pixel formats 8, 15, 24 and 32.
- * writing:
- * uncompressed true color tga files
- */
-
- #include "tga.h"
-
-+#include <assert.h>
-+
- #include <qimage.h>
- #include <qdatastream.h>
-
--/*
-- * uncompressed TGA magic header
-- */
--unsigned char targaMagic[12] = { 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-+#include <kdebug.h>
-
--/*
-- * compressed TGA magic header
-- */
--unsigned char compMagic[12] = { 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-+typedef Q_UINT32 uint;
-+typedef Q_UINT16 ushort;
-+typedef Q_UINT8 uchar;
-+
-+namespace { // Private.
-+
-+ // Header format of saved files.
-+ uchar targaMagic[12] = { 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-+
-+ enum TGAType {
-+ TGA_TYPE_INDEXED = 1,
-+ TGA_TYPE_RGB = 2,
-+ TGA_TYPE_GREY = 3,
-+ TGA_TYPE_RLE_INDEXED = 9,
-+ TGA_TYPE_RLE_RGB = 10,
-+ TGA_TYPE_RLE_GREY = 11
-+ };
-+
-+#define TGA_INTERLEAVE_MASK 0xc0
-+#define TGA_INTERLEAVE_NONE 0x00
-+#define TGA_INTERLEAVE_2WAY 0x40
-+#define TGA_INTERLEAVE_4WAY 0x80
-+
-+#define TGA_ORIGIN_MASK 0x30
-+#define TGA_ORIGIN_LEFT 0x00
-+#define TGA_ORIGIN_RIGHT 0x10
-+#define TGA_ORIGIN_LOWER 0x00
-+#define TGA_ORIGIN_UPPER 0x20
-+
-+ /** Tga Header. */
-+ struct TgaHeader {
-+ uchar id_length;
-+ uchar colormap_type;
-+ uchar image_type;
-+ ushort colormap_index;
-+ ushort colormap_length;
-+ uchar colormap_size;
-+ ushort x_origin;
-+ ushort y_origin;
-+ ushort width;
-+ ushort height;
-+ uchar pixel_size;
-+ uchar flags;
-
--/*
-- * the origin of the image (default is TOP_LEFT)
-- */
--enum { TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT };
-+ enum { SIZE = 18 }; // const static int SIZE = 18;
-+ };
-
--/*
-- * Read one pixel and return its color
-- */
--int getData( QDataStream* s, int bpp )
--{
-- unsigned char* data = new unsigned char[bpp];
-+ static QDataStream & operator>> ( QDataStream & s, TgaHeader & head )
-+ {
-+ s >> head.id_length;
-+ s >> head.colormap_type;
-+ s >> head.image_type;
-+ s >> head.colormap_index;
-+ s >> head.colormap_length;
-+ s >> head.colormap_size;
-+ s >> head.x_origin;
-+ s >> head.y_origin;
-+ s >> head.width;
-+ s >> head.height;
-+ s >> head.pixel_size;
-+ s >> head.flags;
-+ return s;
-+ }
-
-- for( int d = 0; d < bpp; d++ )
-- *s >> data[d];
-+ static bool IsSupported( const TgaHeader & head )
-+ {
-+ if( head.image_type != TGA_TYPE_INDEXED &&
-+ head.image_type != TGA_TYPE_RGB &&
-+ head.image_type != TGA_TYPE_GREY &&
-+ head.image_type != TGA_TYPE_RLE_INDEXED &&
-+ head.image_type != TGA_TYPE_RLE_RGB &&
-+ head.image_type != TGA_TYPE_RLE_GREY )
-+ {
-+ return false;
-+ }
-+ if( head.image_type == TGA_TYPE_INDEXED ||
-+ head.image_type == TGA_TYPE_RLE_INDEXED )
-+ {
-+ if( head.colormap_length > 256 || head.colormap_size != 24 )
-+ {
-+ return false;
-+ }
-+ }
-+ if( head.width == 0 || head.height == 0 )
-+ {
-+ return false;
-+ }
-+ if( head.pixel_size != 8 && head.pixel_size != 16 &&
-+ head.pixel_size != 24 && head.pixel_size != 32 )
-+ {
-+ return false;
-+ }
-+ return true;
-+ }
-
-- int color = 0;
-- if( bpp == 4 )
-- color = qRgba( data[0], data[1], data[2], data[3] );
-- else
-- color = qRgb( data[0], data[1], data[2] );
-+ struct Color555 {
-+ ushort b : 5;
-+ ushort g : 5;
-+ ushort r : 5;
-+ };
-
-- delete [] data;
-- return color;
--}
-+ static bool HasAlpha( const TgaHeader & tga )
-+ {
-+ return tga.pixel_size == 32;
-+ }
-
--/*
-- * checks wether y is inside of the image
-- * when origin is of mode m
-- */
--bool checky( int y, int h, int m )
--{
-- if( m == TOP_LEFT )
-- return (y < h);
-- else if( m == BOTTOM_LEFT || m == BOTTOM_RIGHT )
-- return ( y >= 0 );
-+ struct TgaHeaderInfo {
-+ bool rle;
-+ bool pal;
-+ bool rgb;
-+ bool grey;
-+ bool supported;
-
-- return false;
--}
-+ TgaHeaderInfo( const TgaHeader & tga ) : rle(false), pal(false), rgb(false), grey(false), supported(true)
-+ {
-+ switch( tga.image_type ) {
-+ case TGA_TYPE_RLE_INDEXED:
-+ rle = true;
-+ // no break is intended!
-+ case TGA_TYPE_INDEXED:
-+ if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
-+ supported = false;
-+ }
-+ pal = true;
-+ break;
-
-- /*
-- * checks wether x is inside of the image
-- * when origin is of mode m
-- */
-- bool checkx( int x, int w, int m )
-+ case TGA_TYPE_RLE_RGB:
-+ rle = true;
-+ // no break is intended!
-+ case TGA_TYPE_RGB:
-+ rgb = true;
-+ break;
-+
-+ case TGA_TYPE_RLE_GREY:
-+ rle = true;
-+ // no break is intended!
-+ case TGA_TYPE_GREY:
-+ grey = true;
-+ break;
-+
-+ default:
-+ // Error, unknown image type.
-+ supported = false;
-+ }
-+ }
-+ };
-+
-+
-+
-+ static bool LoadTGA( QDataStream & s, const TgaHeader & tga, QImage &img )
- {
-- if( m == TOP_LEFT || m == BOTTOM_LEFT )
-- return (x < w);
-- else if( m == BOTTOM_RIGHT )
-- return ( x >= 0 );
-+ // Create image.
-+ if( !img.create( tga.width, tga.height, 32 )) {
-+ return false;
-+ }
-
-+ TgaHeaderInfo info(tga);
-+ if( !info.supported ) {
-+ // File not supported.
-+ kdDebug(399) << "This TGA file is not supported." << endl;
- return false;
- }
-
-- void kimgio_tga_read( QImageIO *io )
-- {
-- unsigned char header[6];
-- bool compressed = false;
-+ // Enable alpha buffer for transparent images.
-+ if( HasAlpha( tga ) ) {
-+ img.setAlphaBuffer( true );
-+ }
-
-- QDataStream s( io->ioDevice() );
-- s.setByteOrder( QDataStream::LittleEndian );
-+ uint pixel_size = (tga.pixel_size/8);
-+ uint size = tga.width * tga.height * pixel_size;
-
-- /*
-- * check whether it is a targa file or not
-- */
-- for( int i = 0; i < 12; i++ ) {
-- unsigned char a;
-- s >> a;
-- if( a != targaMagic[i] && a!= compMagic[i]) {
-- io->setImage( 0 );
-- io->setStatus( -1 );
-- return;
-+
-+ // Read palette.
-+ char palette[768];
-+ if( info.pal ) {
-+ // @todo Support palettes in other formats!
-+ s.readRawBytes( palette, 3 * tga.colormap_length );
- }
-
-- // check if it is a compressed targa file
-- if( i == 2 && a == compMagic[i] )
-- compressed = true;
-- }
--
-- for( int i = 0; i < 6; i++ )
-- s >> header[i];
--
-- int width = header[1] * 256 + header[0];
-- int height = header[3] * 256 + header[2];
-- int bpp = header[4];
-- int bit = header[5];
-- int bytesPerPixel = bpp / 8;
--
-- /* Bit values:
-- * bit 0-3: number of alpha bits per fixel
-- * bit 4-5: origin of image:
-- * - 0 0 bottom left
-- * - 1 0 bottom right
-- * - 0 1 top left // that's what we write
-- * - 1 1 top right
-- */
-+ // Allocate image.
-+ uchar * const image = new uchar[size];
-
-- int mode;
-- if( (bit | 0) == 0 )
-- mode = BOTTOM_LEFT;
-- else if( (bit & 8) == 8 )
-- /*
-- * should be BOTTOM_RIGHT,
-- * but GIMP writes them this way.
-- */
-- mode = BOTTOM_LEFT;
-- else if( (bit & 32) == 32 )
-- mode = TOP_LEFT;
-- else
-- mode = TOP_LEFT;
-+ if( info.rle ) {
-+ // Decode image.
-+ char * dst = (char *)image;
-+ int num = size;
-+
-+ while (num > 0) {
-+ // Get packet header.
-+ uchar c;
-+ s >> c;
-+
-+ uint count = (c & 0x7f) + 1;
-+ num -= count * pixel_size;
-+
-+ if (c & 0x80) {
-+ // RLE pixels.
-+ assert(pixel_size <= 8);
-+ char pixel[8];
-+ s.readRawBytes( pixel, pixel_size );
-+ do {
-+ memcpy(dst, pixel, pixel_size);
-+ dst += pixel_size;
-+ } while (--count);
-+ }
-+ else {
-+ // Raw pixels.
-+ count *= pixel_size;
-+ s.readRawBytes( dst, count );
-+ dst += count;
-+ }
-+ }
-+ }
-+ else {
-+ // Read raw image.
-+ s.readRawBytes( (char *)image, size );
-+ }
-+
-+ // Convert image to internal format.
-+ int y_start, y_step, y_end;
-+ if( tga.flags & TGA_ORIGIN_UPPER ) {
-+ y_start = 0;
-+ y_step = 1;
-+ y_end = tga.height - 1;
-+ }
-+ else {
-+ y_start = tga.height - 1;
-+ y_step = -1;
-+ y_end = 0;
-+ }
-+
-+ uchar * src = image;
-
-- if( bytesPerPixel != 3 && bytesPerPixel != 4 ) {
-+ for( int y = y_start; y != y_end; y += y_step ) {
-+ QRgb * scanline = (QRgb *) img.scanLine( y );
-+
-+ if( info.pal ) {
-+ // Paletted.
-+ for( int x = 0; x < tga.width; x++ ) {
-+ uchar idx = *src++;
-+ scanline[x] = qRgb( palette[3*idx+2], palette[3*idx+1], palette[3*idx+0] );
-+ }
-+ }
-+ else if( info.grey ) {
-+ // Greyscale.
-+ for( int x = 0; x < tga.width; x++ ) {
-+ scanline[x] = qRgb( *src, *src, *src );
-+ src++;
-+ }
-+ }
-+ else {
-+ // True Color.
-+ if( tga.pixel_size == 16 ) {
-+ for( int x = 0; x < tga.width; x++ ) {
-+ Color555 c = *reinterpret_cast<Color555 *>(src);
-+ scanline[x] = qRgb( (c.r << 3) | (c.r >> 2), (c.g << 3) | (c.g >> 2), (c.b << 3) | (c.b >> 2) );
-+ src += 2;
-+ }
-+ }
-+ else if( tga.pixel_size == 24 ) {
-+ for( int x = 0; x < tga.width; x++ ) {
-+ scanline[x] = qRgb( src[2], src[1], src[0] );
-+ src += 3;
-+ }
-+ }
-+ else if( tga.pixel_size == 32 ) {
-+ for( int x = 0; x < tga.width; x++ ) {
-+ scanline[x] = qRgba( src[2], src[1], src[0], src[3] );
-+ src += 4;
-+ }
-+ }
-+ }
-+ }
-+
-+ // Free image.
-+ delete [] image;
-+
-+ return true;
-+ }
-+
-+} // namespace
-+
-+
-+void kimgio_tga_read( QImageIO *io )
-+{
-+ //kdDebug(399) << "Loading TGA file!" << endl;
-+
-+ QDataStream s( io->ioDevice() );
-+ s.setByteOrder( QDataStream::LittleEndian );
-+
-+
-+ // Read image header.
-+ TgaHeader tga;
-+ s >> tga;
-+ s.device()->at( TgaHeader::SIZE + tga.id_length );
-+
-+ // Check image file format.
-+ if( s.atEnd() ) {
-+ kdDebug(399) << "This TGA file is not valid." << endl;
- io->setImage( 0 );
- io->setStatus( -1 );
- return;
- }
-
-- QImage img;
-- if( !img.create( width, height, (bpp == 24 ? 32 : bpp) )) {
-+ // Check supported file types.
-+ if( !IsSupported(tga) ) {
-+ kdDebug(399) << "This TGA file is not supported." << endl;
- io->setImage( 0 );
- io->setStatus( -1 );
- return;
- }
-
-- /*
-- * Enable alpha buffer for transparent images
-- */
-- if( img.depth() == 32 )
-- img.setAlphaBuffer( true );
-
-+ QImage img;
-+ bool result = LoadTGA(s, tga, img);
-
-- int x = 0;
-- int y = 0;
-- int addy = 1;
-- int addx = 1;
-- if( mode == BOTTOM_LEFT || mode == BOTTOM_RIGHT ) {
-- y = height - 1;
-- addy = -1;
-- }
--
-- if( mode == BOTTOM_RIGHT || mode == TOP_RIGHT ) {
-- x = width - 1;
-- addx = -1;
-- }
--
-- /*
-- * we have to restore the value of x after each loop
-- */
-- int oldx = x;
-- if( !compressed ) {
-- for( ; checky( y, height, mode ); y += addy )
-- for( x = oldx; checkx( x, width, mode ); x += addx ) {
-- img.setPixel( x, y, getData( &s, bytesPerPixel ) );
-- }
-- } else {
-- unsigned char cur;
-- while( checky( y, height, mode ) ) {
-- while( checkx( x, width, mode ) ) {
-- s >> cur;
-- if( (cur & 128) == 128 ) {
-- // found a RLE chunk
-- int length = (cur & 127) + 1;
-- int color = getData( &s, bytesPerPixel );
-- for( int i = 0; i < length; i++ ) {
-- img.setPixel( x, y, color );
-- x += addx;
-- }
-- } else {
-- int length = (cur & 127) + 1;
-- for( int i = 0; i < length; i++ ) {
-- img.setPixel( x, y, getData( &s, bytesPerPixel ) );
-- x += addx;
-- }
-- }
-- }
-- y += addy;
-- x = oldx;
-- }
-+ if( result == false ) {
-+ kdDebug(399) << "Error loading TGA file." << endl;
-+ io->setImage( 0 );
-+ io->setStatus( -1 );
-+ return;
- }
-
-- img = img.swapRGB();
-
- io->setImage( img );
- io->setStatus( 0 );
- }
-
-
--void kimgio_tga_write( QImageIO *io )
-+void kimgio_tga_write( QImageIO *io )
- {
- QDataStream s( io->ioDevice() );
- s.setByteOrder( QDataStream::LittleEndian );
-
-- QImage img = io->image().swapRGB();
-+ const QImage img = io->image();
-+ const bool hasAlpha = img.hasAlphaBuffer();
- for( int i = 0; i < 12; i++ )
- s << targaMagic[i];
-
- // write header
-- s << (unsigned char)0;
-- s << (unsigned char)(img.width() / 256); // width
-- s << (unsigned char)0;
-- s << (unsigned char)(img.height() / 256); // height
-- s << (unsigned char)img.depth(); // depth
-- s << (unsigned char)36;
-+ s << Q_UINT16( img.width() ); // width
-+ s << Q_UINT16( img.height() ); // height
-+ s << Q_UINT8( hasAlpha ? 32 : 24 ); // depth (24 bit RGB + 8 bit alpha)
-+ s << Q_UINT8( hasAlpha ? 0x24 : 0x20 ); // top left image (0x20) + 8 bit alpha (0x4)
-
- for( int y = 0; y < img.height(); y++ )
- for( int x = 0; x < img.width(); x++ ) {
-- int color = img.pixel( x, y );
-- s << (unsigned char)qRed( color );
-- s << (unsigned char)qGreen( color );
-- s << (unsigned char)qBlue( color );
-- if( img.depth() == 32 )
-- s << (unsigned char)qAlpha( color );
-+ const QRgb color = img.pixel( x, y );
-+ s << Q_UINT8( qBlue( color ) );
-+ s << Q_UINT8( qGreen( color ) );
-+ s << Q_UINT8( qRed( color ) );
-+ if( hasAlpha )
-+ s << Q_UINT8( qAlpha( color ) );
- }
-
- io->setStatus( 0 );
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/tiffr.cpp kdelibs-3.2.5/work/kdelibs/kimgio/tiffr.cpp
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/tiffr.cpp 2002-09-30 09:23:07.000000000 +0200
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/tiffr.cpp 2005-04-20 14:07:22.000000000 +0200
-@@ -8,6 +8,7 @@
-
- #include <qimage.h>
- #include <qfile.h>
-+
-
- #include <assert.h>
-
-@@ -59,7 +60,7 @@ static void tiff_unmap( thandle_t, tdata
- {
- }
-
--void kimgio_tiff_read( QImageIO *io )
-+void kimgio_tiff_read( QImageIO *io )
- {
- TIFF *tiff;
- uint32 width, height;
-@@ -78,10 +79,15 @@ void kimgio_tiff_read( QImageIO *io )
- }
-
- // create image with loaded dimensions
-- TIFFGetField( tiff, TIFFTAG_IMAGEWIDTH, &width );
-- TIFFGetField( tiff, TIFFTAG_IMAGELENGTH, &height );
-+ if( TIFFGetField( tiff, TIFFTAG_IMAGEWIDTH, &width ) != 1
-+ || TIFFGetField( tiff, TIFFTAG_IMAGELENGTH, &height ) != 1 )
-+ return;
-
- QImage image( width, height, 32 );
-+ if( image.isNull()) {
-+ TIFFClose( tiff );
-+ return;
-+ }
- data = (uint32 *)image.bits();
-
- //Sven: changed to %ld for 64bit machines
-@@ -137,7 +143,7 @@ void kimgio_tiff_read( QImageIO *io )
- io->setStatus ( 0 );
- }
-
--void kimgio_tiff_write( QImageIO * )
-+void kimgio_tiff_write( QImageIO * )
- {
- // TODO: stub
- }
-diff -u -p -b kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/xview.cpp kdelibs-3.2.5/work/kdelibs/kimgio/xview.cpp
---- kdelibs-3.2.3-r9/work/kdelibs-3.2.3/kimgio/xview.cpp 2003-09-07 14:17:55.000000000 +0200
-+++ kdelibs-3.2.5/work/kdelibs/kimgio/xview.cpp 2005-04-20 14:07:22.000000000 +0200
-@@ -7,13 +7,19 @@
-
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- #include <qimage.h>
-
-+
-+
- #include "xview.h"
-
- #define BUFSIZE 1024
-
--void kimgio_xv_read( QImageIO *_imageio )
-+static const int b_255_3[]= {0,85,170,255}, // index*255/3
-+ rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7
-+
-+void kimgio_xv_read( QImageIO *_imageio )
- {
- int x=-1;
- int y=-1;
-@@ -48,10 +54,14 @@ void kimgio_xv_read( QImageIO *_imageio
- sscanf(str, "%d %d %d", &x, &y, &maxval);
-
- if (maxval != 255) return;
-+ int blocksize = x*y;
-+ if(x < 0 || y < 0 || blocksize < x || blocksize < y)
-+ return;
-
- // now follows a binary block of x*y bytes.
-- int blocksize = x*y;
-- char *block = new char[ blocksize ];
-+ char *block = (char*) malloc(blocksize);
-+ if(!block)
-+ return;
-
- if (iodev->readBlock(block, blocksize) != blocksize )
- {
-@@ -60,6 +70,10 @@ void kimgio_xv_read( QImageIO *_imageio
-
- // Create the image
- QImage image( x, y, 8, maxval + 1, QImage::BigEndian );
-+ if( image.isNull()) {
-+ free(block);
-+ return;
-+ }
-
- // how do the color handling? they are absolute 24bpp
- // or at least can be calculated as such.
-@@ -67,29 +81,9 @@ void kimgio_xv_read( QImageIO *_imageio
-
- for ( int j = 0; j < 256; j++ )
- {
--// ----------- OLIVER EIDEN
--// That is the old-code !
--/* r = ((int) ((j >> 5) & 0x07)) << 5;
-- g = ((int) ((j >> 2) & 0x07)) << 5;
-- b = ((int) ((j >> 0) & 0x03)) << 6;*/
--
--
--// That is the code-how xv, decode 3-3-2 pixmaps, it is slighly different,
--// but yields much better visuals results
--/* r = (((int) ((j >> 5) & 0x07)) *255) / 7;
-- g = (((int) ((j >> 2) & 0x07)) *255) / 7;
-- b = (((int) ((j >> 0) & 0x03)) *255) / 3;*/
--
--// This is the same as xv, with multiplications/divisions replaced by indexing
--
--// Look-up table to avoid multiplications and divisons
-- static int b_255_3[]= {0,85,170,255}, // index*255/3
-- rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7
--
- r = rg_255_7[((j >> 5) & 0x07)];
- g = rg_255_7[((j >> 2) & 0x07)];
- b = b_255_3[((j >> 0) & 0x03)];
--// ---------------
- image.setColor( j, qRgb( r, g, b ) );
- }
-
-@@ -102,11 +96,11 @@ void kimgio_xv_read( QImageIO *_imageio
- _imageio->setImage( image );
- _imageio->setStatus( 0 );
-
-- delete [] block;
-+ free(block);
- return;
- }
-
--void kimgio_xv_write( QImageIO *imageio )
-+void kimgio_xv_write( QImageIO *imageio )
- {
- QIODevice& f = *( imageio->ioDevice() );
-
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r7.ebuild,v 1.9 2005/07/25 15:19:25 caleb Exp $
-
-inherit kde eutils
-
-need-autoconf 2.5
-set-kdedir ${PV}
-
-DESCRIPTION="KDE libraries needed by all kde programs"
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
- mirror://kde/security_patches/post-3.2.3-kdelibs-kcookiejar.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-kstandarddirs.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-htmlframes2.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-kio.diff
- mirror://kde/security_patches/post-3.2.3-kdelibs-dcopserver.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-kioslave.patch"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc sparc x86"
-IUSE="alsa cups ipv6 ssl doc ldap"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=">=sys-devel/autoconf-2.58
- >=sys-devel/automake-1.8
- >=app-arch/bzip2-1.0.2
- >=dev-libs/libxslt-1.0.31
- >=dev-libs/libxml2-2.5.8
- >=dev-libs/libpcre-3.9
- ssl? ( >=dev-libs/openssl-0.9.6k )
- alsa? ( media-libs/alsa-lib virtual/alsa )
- cups? ( >=net-print/cups-1.1.19 )
- ldap? ( >=net-nds/openldap-2.0.25 )
- media-libs/tiff
- >=app-admin/fam-2.6.10
- virtual/ghostscript
- media-libs/libart_lgpl
- sys-devel/gettext
- ~kde-base/arts-1.2.3
- $(qt_min_version 3.2.3)"
-RDEPEND="${DEPEND}
- app-text/sgml-common
- cups? ( net-print/cups )
- doc? ( app-doc/doxygen )
- dev-lang/python"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- # This is an ugly hack: it makes base_src_unpack do nothing, but still lets us enjoy
- # the other things kde_src_unpack does.
- kde_src_unpack nounpack
-
- epatch ${DISTDIR}/post-3.2.3-kdelibs-kcookiejar.patch
- epatch ${DISTDIR}/post-3.2.3-kdelibs-kstandarddirs.patch
- epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes.patch
- epatch ${DISTDIR}/post-3.2.3-kdelibs-htmlframes2.patch
- epatch ${FILESDIR}/post-3.2.3-kdelibs-khtml.diff
- epatch ${DISTDIR}/post-3.2.3-kdelibs-kioslave.patch
- epatch ${FILESDIR}/kde3-dcopidlng.patch
- cd ${S}/kio && patch -p0 < ${DISTDIR}/post-3.2.3-kdelibs-kio.diff
- cd ${S}/dcop && patch -p0 < ${DISTDIR}/post-3.2.3-kdelibs-dcopserver.patch
- cd ${S}
- make -f admin/Makefile.common || die
-}
-
-src_compile() {
- kde_src_compile myconf
-
- myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
- myconf="$myconf `use_with alsa` `use_enable cups`"
-
- 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"
-
- use x86 && myconf="$myconf --enable-fast-malloc=full"
-
- kde_src_compile configure make
-
- use doc && make apidox
-}
-
-src_install() {
- kde_src_install
- dohtml *.html
-
- if use doc ; then
- einfo "Copying API documentation..."
- dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
- cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
- else
- rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
- fi
-
- # needed to fix lib64 issues on amd64, see bug #45669
- use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
-
-}
-
-pkg_postinst() {
- if use doc ; then
- rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
- ln -sf $KDEDIR/share/doc/HTML/en/common \
- $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
- fi
-}
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r9.ebuild,v 1.8 2005/07/25 15:19:25 caleb Exp $
-
-inherit kde eutils
-
-need-autoconf 2.5
-set-kdedir ${PV}
-
-DESCRIPTION="KDE libraries needed by all kde programs"
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
- mirror://kde/security_patches/post-3.2.3-kdelibs-kcookiejar.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-kstandarddirs.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-htmlframes2.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-kio.diff
- mirror://kde/security_patches/post-3.2.3-kdelibs-dcopserver.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-dcop.patch
- mirror://kde/security_patches/post-3.2.3-kdelibs-kioslave.patch"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.2"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc sparc x86"
-IUSE="alsa cups ipv6 ssl doc ldap"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=">=sys-devel/autoconf-2.58
- >=sys-devel/automake-1.8
- >=app-arch/bzip2-1.0.2
- >=dev-libs/libxslt-1.0.31
- >=dev-libs/libxml2-2.5.8
- >=dev-libs/libpcre-3.9
- ssl? ( >=dev-libs/openssl-0.9.6k )
- alsa? ( media-libs/alsa-lib virtual/alsa )
- cups? ( >=net-print/cups-1.1.19 )
- ldap? ( >=net-nds/openldap-2.0.25 )
- media-libs/tiff
- >=app-admin/fam-2.6.10
- virtual/ghostscript
- media-libs/libart_lgpl
- sys-devel/gettext
- ~kde-base/arts-1.2.3
- $(qt_min_version 3.2.3)"
-RDEPEND="${DEPEND}
- app-text/sgml-common
- cups? ( net-print/cups )
- doc? ( app-doc/doxygen )
- dev-lang/python"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- # This is an ugly hack: it makes base_src_unpack do nothing, but still lets us enjoy
- # the other things kde_src_unpack does.
- kde_src_unpack nounpack
-
- epatch ${DISTDIR}/post-3.2.3-kdelibs-kcookiejar.patch
- epatch ${DISTDIR}/post-3.2.3-kdelibs-kstandarddirs.patch
- epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes.patch
- epatch ${DISTDIR}/post-3.2.3-kdelibs-htmlframes2.patch
- epatch ${FILESDIR}/post-3.2.3-kdelibs-khtml.diff
- epatch ${DISTDIR}/post-3.2.3-kdelibs-kioslave.patch
- epatch ${FILESDIR}/kde3-dcopidlng.patch
- cd ${S}/kio && patch -p0 < ${DISTDIR}/post-3.2.3-kdelibs-kio.diff
- cd ${S}/dcop && patch -p0 < ${DISTDIR}/post-3.2.3-kdelibs-dcopserver.patch
- cd ${S}
- epatch ${DISTDIR}/post-3.2.3-kdelibs-dcop.patch
- epatch ${FILESDIR}/post-3.2.3-kdelibs-idn.patch
-
- # kimgio input validation errors, see bug #88862
- epatch "${FILESDIR}/post-3.2.3-kdelibs-kimgio.diff"
- make -f admin/Makefile.common || die
-}
-
-src_compile() {
- kde_src_compile myconf
-
- myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
- myconf="$myconf `use_with alsa` `use_enable cups`"
-
- 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"
-
- use x86 && myconf="$myconf --enable-fast-malloc=full"
-
- kde_src_compile configure make
-
- use doc && make apidox
-}
-
-src_install() {
- kde_src_install
- dohtml *.html
-
- if use doc ; then
- einfo "Copying API documentation..."
- dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
- cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
- else
- rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
- fi
-
- # needed to fix lib64 issues on amd64, see bug #45669
- use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
-
-}
-
-pkg_postinst() {
- if use doc ; then
- rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
- ln -sf $KDEDIR/share/doc/HTML/en/common \
- $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
- fi
-}
-
-
+++ /dev/null
---- arts/modules/synth/Makefile.am 2003/08/26 08:43:25 1.8
-+++ arts/modules/synth/Makefile.am 2004/08/18 05:52:18 1.9
-@@ -25,6 +25,7 @@ libartsmodulessynth_la_SOURCES = artsmod
- synth_capture_wav_impl.cc \
- synth_midi_test_impl.cc synth_sequence_impl.cc synth_sequence_freq_impl.cc \
- synth_midi_debug_impl.cc objectcache_impl.cc synth_nil_impl.cc synth_debug_impl.cc synth_data_impl.cc
-+libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h
-
- libartsmodulessynth_la_LIBADD = \
- $(top_builddir)/arts/runtime/libartsbuilder.la \
+++ /dev/null
-MD5 f49a1cf9c5d405aed791808b4bbf035d kdemultimedia-3.2.3.tar.bz2 4847891
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.3.ebuild,v 1.11 2005/02/08 15:04:11 greg_g Exp $
-
-inherit kde-dist flag-o-matic eutils
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE="flac encode oggvorbis alsa gstreamer"
-
-DEPEND="~kde-base/kdebase-${PV}
- media-sound/cdparanoia
- flac? ( media-libs/flac )
- encode? ( media-sound/lame )
- oggvorbis? ( media-libs/libvorbis media-libs/libogg )
- >=media-libs/xine-lib-1_beta12
- alsa? ( media-libs/alsa-lib )
- gstreamer? ( media-libs/gstreamer )
- media-libs/musicbrainz
- media-libs/taglib"
-
-src_unpack() {
- kde_src_unpack
- epatch ${FILESDIR}/3.2.3-Makefile-synth.am.diff
- make -f admin/Makefile.common
-}
-
-src_compile() {
- replace-flags -O3 -O2
- # Still persists with 3.2.1 - kaboodle
- filter-flags "-fno-default-inline"
-
- myconf="$myconf --with-xine-prefix=/usr"
-
- # make -j2 fails, at least on ppc
- use ppc && export MAKEOPTS="$MAKEOPTS -j1"
- use hppa && append-flags -ffunction-sections
-
- # alsa 0.9 not supported
- use alsa && myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
- use oggvorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis"
- use encode && myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
-
- myconf="$myconf --disable-strict --disable-warnings"
-
- kde_src_compile
-}
+++ /dev/null
-MD5 a58915e964d8f6ec87c76acaab9f8929 kdenetwork-3.2.3.tar.bz2 6194940
+++ /dev/null
-MD5 a58915e964d8f6ec87c76acaab9f8929 kdenetwork-3.2.3.tar.bz2 6194940
+++ /dev/null
---- kopete/protocols/yahoo/libyahoo2/libyahoo2.c 14 Jan 2004 02:07:29 -0000 1.18
-+++ kopete/protocols/yahoo/libyahoo2/libyahoo2.c 26 Jun 2004 00:37:08 -0000 1.18.2.3
-@@ -1816,6 +1816,8 @@ static void yahoo_process_auth_0x0b(stru
- * challenge. */
-
- shaUpdate(&ctx1, pass_hash_xor1, 64);
-+ if (j >= 3 )
-+ ctx1.sizeLo = 0x1ff;
- shaUpdate(&ctx1, magic_key_char, 4);
- shaFinal(&ctx1, digest1);
-
-@@ -1905,6 +1907,8 @@ static void yahoo_process_auth_0x0b(stru
- * challenge. */
-
- shaUpdate(&ctx1, crypt_hash_xor1, 64);
-+ if (j >= 3 )
-+ ctx1.sizeLo = 0x1ff;
- shaUpdate(&ctx1, magic_key_char, 4);
- shaFinal(&ctx1, digest1);
-
---- kopete/protocols/yahoo/libyahoo2/yahoo_fn.c 14 Jan 2004 02:07:29 -0000 1.18
-+++ kopete/protocols/yahoo/libyahoo2/yahoo_fn.c 26 Jun 2004 00:37:08 -0000 1.18.2.3
-@@ -4386,7 +4386,7 @@ struct yahoo_fn yahoo_fntable[5][96] =
- { XOR, 0x77D64B90, 0 },
- { BITFLD, (long)table_103, 0 },
- { LOOKUP, (long)table_104, 0 },
-- { MULADD, 0x7D1428CB, 0x89F6853D },
-+ { MULADD, 0x7D1428CB, 0x3D },
- { XOR, 0x6F872C49, 0 },
- { XOR, 0x2E484655, 0 },
- { MULADD, 0x1E3349F7, 0x41F5 },
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.2.3-r1.ebuild,v 1.11 2005/02/08 15:00:21 greg_g Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE network apps: kopete, kppp, kget. kmail and knode are now in kdepim."
-
-KEYWORDS="x86 ppc ~amd64 sparc hppa alpha ~ia64"
-IUSE="slp samba wifi jabber ssl"
-
-DEPEND="~kde-base/kdebase-${PV}
- slp? ( net-libs/openslp )
- samba? ( net-fs/samba )
- jabber? ( net-dns/libidn )
- ssl? ( app-crypt/qca-tls )
- wifi? ( net-wireless/wireless-tools )"
-
-src_unpack() {
- kde_src_unpack
- epatch ${FILESDIR}/yahoo-fix-connect-062404.patch
-}
-
-src_compile() {
- myconf="$myconf `use_enable slp`"
- use wifi || DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
-
- chmod +s ${D}/${KDEDIR}/bin/reslisa
-
- # empty config file needed for lisa to work with default settings
- touch ${D}/etc/lisarc
-
- # lisa, reslisa initscripts
- dodir /etc/init.d
- sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
- sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
- chmod +x ${D}/etc/init.d/*
-
- insinto /etc/conf.d
- newins ${FILESDIR}/lisa.conf lisa
- newins ${FILESDIR}/reslisa.conf reslisa
-}
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.2.3.ebuild,v 1.10 2005/02/08 15:00:21 greg_g Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE network apps: kopete, kppp, kget. kmail and knode are now in kdepim."
-
-KEYWORDS="x86 ppc amd64 sparc"
-IUSE="slp samba wifi jabber ssl"
-
-DEPEND="~kde-base/kdebase-${PV}
- slp? ( net-libs/openslp )
- samba? ( net-fs/samba )
- jabber? ( net-dns/libidn )
- ssl? ( app-crypt/qca-tls )
- wifi? ( net-wireless/wireless-tools )"
-
-src_unpack() {
- kde_src_unpack
-}
-
-src_compile() {
- myconf="$myconf `use_enable slp`"
- use wifi || DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
-
- chmod +s ${D}/${KDEDIR}/bin/reslisa
-
- # empty config file needed for lisa to work with default settings
- touch ${D}/etc/lisarc
-
- # lisa, reslisa initscripts
- dodir /etc/init.d
- sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
- sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
- chmod +x ${D}/etc/init.d/*
-
- insinto /etc/conf.d
- newins ${FILESDIR}/lisa.conf lisa
- newins ${FILESDIR}/reslisa.conf reslisa
-}
+++ /dev/null
-MD5 06d3e5d1ee0cd7f2a55bd26d05ee4987 kdepim-3.2.3.tar.bz2 7711686
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.3.ebuild,v 1.11 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="x86 ppc amd64 sparc hppa"
-IUSE="pda crypt ldap cjk"
-
-DEPEND="~kde-base/kdenetwork-${PV}
- pda? ( app-pda/pilot-link dev-libs/libmal )
- ldap? ( net-nds/openldap )
- crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
-
-src_unpack() {
- kde_src_unpack
- cd ${S}
- use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
-}
-
-src_compile() {
- use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
- kde_src_compile
-}
-
-src_install() {
- kde_src_install
- docinto html
- dodoc *.html
-}
+++ /dev/null
-MD5 82808f2780ae970fb38d44512ff9e2f3 kdesdk-3.2.3.tar.bz2 3886983
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.2.3.ebuild,v 1.11 2005/06/28 19:25:28 caleb Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
-KEYWORDS="x86 sparc amd64 ppc hppa"
-
-DEPEND="media-gfx/graphviz
- sys-devel/flex"
-
-RDEPEND="$DEPEND"
+++ /dev/null
-MD5 22bb5193eaaea38a7eb9a16d935af20f kdetoys-3.2.3.tar.bz2 2348640
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.2.3.ebuild,v 1.9 2005/01/23 20:00:10 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE toys"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE=""
+++ /dev/null
-MD5 3a98f8a0a6f4582e03d4503708cb218a kdeutils-3.2.3.tar.bz2 2482811
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.2.3.ebuild,v 1.10 2005/02/08 14:53:40 greg_g Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE utilities"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64 ~mips"
-IUSE=""
-
-DEPEND="~kde-base/kdebase-${PV}
- app-crypt/gnupg"
-
-src_unpack()
-{
- kde_src_unpack
-}
projects / gentoo.git / commitdiff