Add patch to fix KDE Bug 140768 as requested by upstream.

Package-Manager: portage-2.1.2-r6

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 2e2f335e902472424c9f3ae0456605d2f33d0c7b..6a9b00bed2ad9f7a740b9aa3f4b812d701b439dd 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.415 2007/02/01 12:35:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.416 2007/02/02 20:56:05 flameeyes Exp $
+
+*kdelibs-3.5.6-r2 (02 Feb 2007)
+
+  02 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdelibs-3.5.6-khtml-kde-bug-140768.patch, +kdelibs-3.5.6-r2.ebuild:
+  Add patch to fix KDE Bug 140768 as requested by upstream.
 
   01 Feb 2007; Markus Rothe <corsair@gentoo.org> kdelibs-3.5.5-r7.ebuild:
   Stable on ppc64; bug #164079

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index da43be1711082689bd257c19cd989bd73978a01e..1a1f5dc7c5c0dfc1682916d7300a171df3ec4d49 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdelibs-3.5-lua.patch 847 RMD160 2242ecdf473a38912316d4bb3ff136bcec28016d SHA1 efab9ac15181c83d85d2b86320a85fcf7beb63ce SHA256 ffa1c718501314347c458589d8549b815ced5a1d99253af12023de4818f4b881
 MD5 36577db0924d94b8e4c0ab6019213ce2 files/kdelibs-3.5-lua.patch 847
 RMD160 2242ecdf473a38912316d4bb3ff136bcec28016d files/kdelibs-3.5-lua.patch 847
@@ -42,6 +45,10 @@ AUX kdelibs-3.5.5-noarts.patch 5474 RMD160 cab567315dbe7b18ccbf9718c98ab2d93786f
 MD5 30d5ee2beb41b46cb3f46c3211d36c96 files/kdelibs-3.5.5-noarts.patch 5474
 RMD160 cab567315dbe7b18ccbf9718c98ab2d93786f1d7 files/kdelibs-3.5.5-noarts.patch 5474
 SHA256 baf1ea16eed48f8a64e0ee25408161b130981e93f0fee718bb7cf71513a64420 files/kdelibs-3.5.5-noarts.patch 5474
+AUX kdelibs-3.5.6-khtml-kde-bug-140768.patch 1211 RMD160 5215d567765b871dd06af23cce293860fd8c2446 SHA1 91038c4218ce8af4bcc4f2135123bc531365bbfe SHA256 cf4033eccf1bd85ca6a32e8c894d418e743c02f35f30030e23dd9d4aef85cd22
+MD5 eb13fecb46d703561ff3b7518876042c files/kdelibs-3.5.6-khtml-kde-bug-140768.patch 1211
+RMD160 5215d567765b871dd06af23cce293860fd8c2446 files/kdelibs-3.5.6-khtml-kde-bug-140768.patch 1211
+SHA256 cf4033eccf1bd85ca6a32e8c894d418e743c02f35f30030e23dd9d4aef85cd22 files/kdelibs-3.5.6-khtml-kde-bug-140768.patch 1211
 DIST kdelibs-3.5-patchset-05.tar.bz2 36423 RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 SHA1 138232cf05ab131a51f3b3febfdd8a3cbc42d45f SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a
 DIST kdelibs-3.5.2-patchset.tar.bz2 17026 RMD160 07093c155a11256ba8e0df3144899ca1696db063 SHA1 94c5dbeee9b4a93c4a85b20f5ed247b2b7cd447d SHA256 c3e4d921bfe963ab49a11081fbd5b0b8fe3d1190054a22bb3933c64d51becf04
 DIST kdelibs-3.5.2.tar.bz2 15442103 RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 SHA1 c895d3473307b90ebfd3c4d40b3813f9243d69fb SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b
@@ -69,10 +76,14 @@ EBUILD kdelibs-3.5.6-r1.ebuild 5934 RMD160 9e7d577ca48cd14489dfe266e66a59ed13479
 MD5 8d78883bba10800cfbe6c1ff852e8123 kdelibs-3.5.6-r1.ebuild 5934
 RMD160 9e7d577ca48cd14489dfe266e66a59ed134798ad kdelibs-3.5.6-r1.ebuild 5934
 SHA256 678dab9921c9144a4b9a41a6c7893045088c843030880497abf93fcacea9e93b kdelibs-3.5.6-r1.ebuild 5934
-MISC ChangeLog 68203 RMD160 0e0f5782cd6faf330840f83d5e35be71ac3c2fe7 SHA1 07fdc41736aeeb722efe417f125e28d8f62c5b2c SHA256 d46221dc66b8c5c38017523cab00725e2154c9e5a5617763b44253595591f35e
-MD5 8f1b5575b352265e37c1d2633d95be21 ChangeLog 68203
-RMD160 0e0f5782cd6faf330840f83d5e35be71ac3c2fe7 ChangeLog 68203
-SHA256 d46221dc66b8c5c38017523cab00725e2154c9e5a5617763b44253595591f35e ChangeLog 68203
+EBUILD kdelibs-3.5.6-r2.ebuild 5989 RMD160 d5beac8f8290833f6a509ec5e11468dceed15ddc SHA1 38740d5241e895687f308447d97d09e55191dcdb SHA256 94eb57bc77b2067c57a365476729c662f360f70f59688d55a3b8dac73db0af14
+MD5 b35f7142e98610fcd00a104f32cbbc5a kdelibs-3.5.6-r2.ebuild 5989
+RMD160 d5beac8f8290833f6a509ec5e11468dceed15ddc kdelibs-3.5.6-r2.ebuild 5989
+SHA256 94eb57bc77b2067c57a365476729c662f360f70f59688d55a3b8dac73db0af14 kdelibs-3.5.6-r2.ebuild 5989
+MISC ChangeLog 68429 RMD160 90d383e41f37e5b846a618476619f0fc615a1805 SHA1 44f2211f9290815959768832c0a2f0f3fc27004d SHA256 925653f0d9384a10c490c5ce907e83d8b68a31e205c618fd6f3372f7e4d2e1b4
+MD5 4c4cc35214ed5803a14fc4bb0be21475 ChangeLog 68429
+RMD160 90d383e41f37e5b846a618476619f0fc615a1805 ChangeLog 68429
+SHA256 925653f0d9384a10c490c5ce907e83d8b68a31e205c618fd6f3372f7e4d2e1b4 ChangeLog 68429
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -92,3 +103,13 @@ SHA256 9180e5499945c7011b584d592a892bc3ecc4a2cfcc703ede9619ab6238639387 files/di
 MD5 b82df77d8d947cfd51e3fad1ce093674 files/digest-kdelibs-3.5.6-r1 807
 RMD160 e5e25e17340fbe888f9c28829d332c34148d1f06 files/digest-kdelibs-3.5.6-r1 807
 SHA256 d5b5e2137db88c1c903fdff689b4dd29929f9e1e8b4336fb64fb0e82094d5d88 files/digest-kdelibs-3.5.6-r1 807
+MD5 b82df77d8d947cfd51e3fad1ce093674 files/digest-kdelibs-3.5.6-r2 807
+RMD160 e5e25e17340fbe888f9c28829d332c34148d1f06 files/digest-kdelibs-3.5.6-r2 807
+SHA256 d5b5e2137db88c1c903fdff689b4dd29929f9e1e8b4336fb64fb0e82094d5d88 files/digest-kdelibs-3.5.6-r2 807
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFw6V7AiZjviIA2XgRArR1AKC2UPr5Vminb0JDsjq8LCG2UkSgFACfUGlL
+j1URdqXM5oon6Qtd7TpoI5M=
+=cPR9
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r2
new file mode 100644 (file)
index 0000000..1585f02
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r2
@@ -0,0 +1,9 @@
+MD5 6f8254317dd43af7aea2a347656f552a kdelibs-3.5-patchset-05.tar.bz2 36423
+RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 kdelibs-3.5-patchset-05.tar.bz2 36423
+SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a kdelibs-3.5-patchset-05.tar.bz2 36423
+MD5 d8ce997461cb1aa2255032f02fd14326 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+MD5 e4d137879a66e92b895b3de5413a61d8 kdelibs-3.5.6.tar.bz2 15509460
+RMD160 ce8c088e13f0e59238719600da9c768eac58b57d kdelibs-3.5.6.tar.bz2 15509460
+SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c kdelibs-3.5.6.tar.bz2 15509460

diff --git a/kde-base/kdelibs/files/kdelibs-3.5.6-khtml-kde-bug-140768.patch b/kde-base/kdelibs/files/kdelibs-3.5.6-khtml-kde-bug-140768.patch
new file mode 100644 (file)
index 0000000..e72f678
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.6-khtml-kde-bug-140768.patch
@@ -0,0 +1,46 @@
+From: Leo Savernik <l.savernik@aon.at>
+To: kde-commits@kde.org
+Subject: branches/KDE/3.5/kdelibs/khtml/html
+X-Commit-Directories: (0) branches/KDE/3.5/kdelibs/khtml/html
+MIME-Version: 1.0
+Date: Tue, 30 Jan 2007 17:25:36 +0000
+Message-Id: <1170177936.253127.26374.nullmailer@svn.kde.org>
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+X-Length: 4145
+X-UID: 241
+
+SVN commit 628618 by savernik:
+
+Reverting r617941. This fixes jumping to the top right before loading a
+new page and also fixes page loading time increase.
+
+Attention packagers! Please include this patch in new versions of your
+khtml-3.5.6 packages. Web surfing experience can be considered broken
+without it.
+
+CCMAIL: kde-packager@kde.org
+BUG: 140768
+CCBUG: 140777    
+CCBUG: 24820
+
+
+ M  +1 -1      html_documentimpl.cpp  
+
+
+--- branches/KDE/3.5/kdelibs/khtml/html/html_documentimpl.cpp #628617:628618
+@@ -222,7 +222,7 @@
+ 
+ void HTMLDocumentImpl::slotHistoryChanged()
+ {
+-    if ( !m_render )
++    if ( true || !m_render )
+         return;
+ 
+     recalcStyle( Force );
+_______________________________________________
+Kde-packager mailing list
+Kde-packager@kde.org
+https://mail.kde.org/mailman/listinfo/kde-packager
+

diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r2.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r2.ebuild
new file mode 100644 (file)
index 0000000..0dbae31
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.6-r2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r2.ebuild,v 1.1 2007/02/02 20:56:05 flameeyes Exp $
+
+inherit kde flag-o-matic eutils multilib
+set-kdedir 3.5
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
+       mirror://gentoo/kdelibs-3.5-patchset-05.tar.bz2
+       mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
+zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+
+# Added aspell-en as dependency to work around bug 131512.
+RDEPEND="$(qt_min_version 3.3.3)
+       arts? ( >=kde-base/arts-3.5.5 )
+       app-arch/bzip2
+       >=media-libs/freetype-2
+       media-libs/fontconfig
+       >=dev-libs/libxslt-1.1.16
+       >=dev-libs/libxml2-2.6.6
+       >=dev-libs/libpcre-4.2
+       media-libs/libart_lgpl
+       net-dns/libidn
+       acl? ( kernel_linux? ( sys-apps/acl ) )
+       ssl? ( >=dev-libs/openssl-0.9.7d )
+       alsa? ( media-libs/alsa-lib )
+       cups? ( >=net-print/cups-1.1.19 )
+       tiff? ( media-libs/tiff )
+       kerberos? ( virtual/krb5 )
+       jpeg2k? ( media-libs/jasper )
+       openexr? ( >=media-libs/openexr-1.2.2-r2 )
+       zeroconf? (     !avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
+       fam? ( virtual/fam )
+       virtual/ghostscript
+       utempter? ( sys-libs/libutempter )
+       !kde-base/kde-env
+       lua? ( dev-lang/lua )
+       spell? ( app-text/aspell app-dicts/aspell-en
+               linguas_he? ( >=app-text/hspell-1.0 ) )"
+
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )
+       sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+       || ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 ) "
+
+PDEPEND="zeroconf? ( avahi? ( kde-misc/kdnssd-avahi ) )"
+
+# Testing code is rather broken and merely for developer purposes, so disable it.
+RESTRICT="test"
+
+pkg_setup() {
+       if use legacyssl ; then
+               echo ""
+               elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
+               elog "sites, but breaks others instead. It is strongly discouraged to use it."
+               elog "For more information, see bug #128922."
+               echo ""
+       fi
+       if ! use utempter ; then
+               echo ""
+               elog "On some setups that relies on the correct update of utmp records, not using"
+               elog "utempter might not update them correctly. If you experience unexpected"
+               elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
+               echo ""
+       fi
+
+       if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+               eerror "The alsa USE flag in this package enables ALSA support"
+               eerror "for libkmid, KDE midi library."
+               eerror "For this reason, you have to merge media-libs/alsa-lib"
+               eerror "with the midi USE flag enabled, or disable alsa USE flag"
+               eerror "for this package."
+               die "Missing midi USE flag on media-libs/alsa-lib"
+       fi
+}
+
+src_unpack() {
+       kde_src_unpack
+       if use legacyssl ; then
+               # This patch won't be included upstream, see bug #128922
+               epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
+       fi
+
+       epatch "${FILESDIR}/${P}-khtml-kde-bug-140768.patch"
+
+       # xinerama patch from Lubos Lunak
+       # http://ktown.kde.org/~seli/xinerama/
+       epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2"
+}
+
+src_compile() {
+       rm -f "${S}/configure"
+
+       myconf="--with-distribution=Gentoo --disable-fast-malloc
+                       $(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+                       --with-libart --with-libidn
+                       $(use_with acl) $(use_with ssl)
+                       $(use_with alsa) $(use_with arts)
+                       $(use_with kerberos gssapi) $(use_with tiff)
+                       $(use_with jpeg2k jasper) $(use_with openexr)
+                       $(use_enable cups)
+                       $(use_with utempter) $(use_with lua)
+                       $(use_enable kernel_linux sendfile) --enable-mitshm
+                       $(use_with spell aspell)"
+
+       if use zeroconf && ! use avahi; then
+               myconf="${myconf} --enable-dnssd"
+       else
+               myconf="${myconf} --disable-dnssd"
+       fi
+
+       if use spell; then
+               myconf="${myconf} $(use_with linguas_he hspell)"
+       else
+               myconf="${myconf} --without-hspell"
+       fi
+
+       if has_version x11-apps/rgb; then
+               myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+       fi
+
+       # fix bug 58179, bug 85593
+       # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
+       # closer look... - corsair
+       use ppc64 && append-flags "-mminimal-toc"
+
+       # work around bug #120858, gcc 3.4.x -Os miscompilation
+       use x86 && replace-flags "-Os" "-O2" # see bug #120858
+
+       export BINDNOW_FLAGS="$(bindnow-flags)"
+
+       kde_src_compile
+
+       if use doc; then
+               make apidox || die
+       fi
+}
+
+src_install() {
+       kde_src_install
+
+       if use doc; then
+               make DESTDIR="${D}" install-apidox || die
+       fi
+
+       # Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+       if [ "${SYMLINK_LIB}" = "yes" ]; then
+               dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+       fi
+
+       # Get rid of the disabled version of the kdnsd libraries
+       if use zeroconf && use avahi; then
+               rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
+       fi
+
+       dodir /etc/env.d
+
+       # List all the multilib libdirs
+       local libdirs
+       for libdir in $(get_all_libdirs); do
+               libdirs="${libdirs}:${PREFIX}/${libdir}"
+       done
+
+       cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
+PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="${PREFIX}:/usr:/usr/local"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+}
+
+pkg_postinst() {
+       if use zeroconf; then
+               echo
+               elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+               elog "is running. Make sure also that multicast dns lookups are enabled by editing"
+               elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+               elog "  hosts: files mdns dns"
+               echo
+       fi
+}