diff options
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kdelibs/Manifest | 29 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/digest-kdelibs-3.5.3-r4 | 6 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.5.3-konqcrash.patch | 13 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-3.5.3-r4.ebuild | 174 |
5 files changed, 226 insertions, 5 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index fb6813363e4a..4e9942c06c6d 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.346 2006/07/17 02:11:44 psi29a Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.347 2006/07/20 18:12:51 flameeyes Exp $ + +*kdelibs-3.5.3-r4 (20 Jul 2006) + + 20 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/kdelibs-3.5.3-konqcrash.patch, +kdelibs-3.5.3-r4.ebuild: + Add patch to fix Konqueror crash. Patch from Dirk Mueller <mueller@kde.org>, + thanks to Hanno Boeck for reporting. See bug #141173. 16 Jul 2006; <psi29a@gentoo.org> kdelibs-3.5.2-r6.ebuild: marked as stable diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 7d7d1872ab7b..c2b4108a608a 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX kde3-dcopidlng.patch 681 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 SHA1 102b786b497b61e6bce22c67f2b505aaea6b5b03 SHA256 5ecc91e40a6e33b9f2a5057867409bc88e350f16595d02a756803c5e5d169bbe MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 files/kde3-dcopidlng.patch 681 @@ -38,6 +41,10 @@ AUX kdelibs-3.5.2-xorg7-rgbtxt.patch 633 RMD160 778c7cbf959ec1ed49ced9c1883d77c1 MD5 073d3bf868dd8f07df2029d692308cb4 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633 RMD160 778c7cbf959ec1ed49ced9c1883d77c178f5c7b5 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633 SHA256 a16796bcda093dcbb51fb62c7e7bd0db1d174cc7b691a6bdbd863fd803d4ed25 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633 +AUX kdelibs-3.5.3-konqcrash.patch 510 RMD160 f2d36d41f28bb716660ec721a34f05f199177378 SHA1 b781dc6155bec8bedf3313316152c23967ef084d SHA256 57e9f452df9e022c963419478b4d7082e3e5617d55005c5d9be72144ccef8625 +MD5 edb9959440246291035a4fb2c5489402 files/kdelibs-3.5.3-konqcrash.patch 510 +RMD160 f2d36d41f28bb716660ec721a34f05f199177378 files/kdelibs-3.5.3-konqcrash.patch 510 +SHA256 57e9f452df9e022c963419478b4d7082e3e5617d55005c5d9be72144ccef8625 files/kdelibs-3.5.3-konqcrash.patch 510 AUX post-3.3.2-kdelibs-kate.diff 2212 RMD160 78afa73da3f39e123a4d24aa216a5260f2484372 SHA1 d5f23539d489ff1e34450de09cda962e320511ff SHA256 7f02119f028936033afe7e7e49aa661c73a1b7af6801a281c832544d76b37ea1 MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212 RMD160 78afa73da3f39e123a4d24aa216a5260f2484372 files/post-3.3.2-kdelibs-kate.diff 2212 @@ -84,14 +91,18 @@ EBUILD kdelibs-3.5.3-r3.ebuild 4951 RMD160 cdb412f79bf9d1d1d2e61b21dd355678cffd7 MD5 6e67276853eff8c25553c891d626a549 kdelibs-3.5.3-r3.ebuild 4951 RMD160 cdb412f79bf9d1d1d2e61b21dd355678cffd7c49 kdelibs-3.5.3-r3.ebuild 4951 SHA256 5737ff67ddcb1f546d5a2aa9eb7d9f37c9bbd2f23b86f12339c4b8edbbf6edc6 kdelibs-3.5.3-r3.ebuild 4951 +EBUILD kdelibs-3.5.3-r4.ebuild 4938 RMD160 afeda0e9d00b5edf87c1bfb0ef0717020212a548 SHA1 d99eee54a56603efb3789589505a9163042e6e0b SHA256 e20657a4ff96d68c955ba0eeb9b36cda43116504a2e77cdd6a170267e852c169 +MD5 0bbc99cae823b80dfa235978dfe01dd4 kdelibs-3.5.3-r4.ebuild 4938 +RMD160 afeda0e9d00b5edf87c1bfb0ef0717020212a548 kdelibs-3.5.3-r4.ebuild 4938 +SHA256 e20657a4ff96d68c955ba0eeb9b36cda43116504a2e77cdd6a170267e852c169 kdelibs-3.5.3-r4.ebuild 4938 EBUILD kdelibs-3.5.3.ebuild 5046 RMD160 da4717dfee2ba4293da1f80ea16e4ffe188fd545 SHA1 2380bae7b944fa3078b91180bf49d07f4d1012ed SHA256 a82a1520bd073daab91a8336e3e905b3ca23a2d2167ada7fddfb67d22136c0b4 MD5 23f3433009390185ba6b8b949cf65ab0 kdelibs-3.5.3.ebuild 5046 RMD160 da4717dfee2ba4293da1f80ea16e4ffe188fd545 kdelibs-3.5.3.ebuild 5046 SHA256 a82a1520bd073daab91a8336e3e905b3ca23a2d2167ada7fddfb67d22136c0b4 kdelibs-3.5.3.ebuild 5046 -MISC ChangeLog 56562 RMD160 60b2865c403df45ae36765daddac54cfb321e8b3 SHA1 f20e4f09b52639b74ea803f7de618df038bc2688 SHA256 44730a82d63f7ac4007e53f180a006a2ea48b208ad6f8bdbedbb072305b1f5c4 -MD5 f5abf467f91e89c8fae6f59ffd3c7d7f ChangeLog 56562 -RMD160 60b2865c403df45ae36765daddac54cfb321e8b3 ChangeLog 56562 -SHA256 44730a82d63f7ac4007e53f180a006a2ea48b208ad6f8bdbedbb072305b1f5c4 ChangeLog 56562 +MISC ChangeLog 56853 RMD160 63c4f23de0f1e6835256be5511d923abe7b82e80 SHA1 5970e9e6a5076830ebf3dd3ef0edfc403e38eb1a SHA256 782829078393d94c8666c2de5ab376ea76b675edbbc990e1a027789b5ed3e1b5 +MD5 6a5338f88afc8a2213f45b21015e56b5 ChangeLog 56853 +RMD160 63c4f23de0f1e6835256be5511d923abe7b82e80 ChangeLog 56853 +SHA256 782829078393d94c8666c2de5ab376ea76b675edbbc990e1a027789b5ed3e1b5 ChangeLog 56853 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -117,3 +128,13 @@ SHA256 7332c5ad9a8ee034fc8082bbc008adf283112c1183dc24700122b6813ce36b5c files/di MD5 421f606a7ee4c071cb3963ae33d6eb9b files/digest-kdelibs-3.5.3-r3 521 RMD160 d33b09146fb1258729097e4a890a17a7cc49e073 files/digest-kdelibs-3.5.3-r3 521 SHA256 6bc472f8c88e231f1eb73e4108756faf100390cc2f96c7459c73c8e07dc6f39a files/digest-kdelibs-3.5.3-r3 521 +MD5 421f606a7ee4c071cb3963ae33d6eb9b files/digest-kdelibs-3.5.3-r4 521 +RMD160 d33b09146fb1258729097e4a890a17a7cc49e073 files/digest-kdelibs-3.5.3-r4 521 +SHA256 6bc472f8c88e231f1eb73e4108756faf100390cc2f96c7459c73c8e07dc6f39a files/digest-kdelibs-3.5.3-r4 521 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.4 (GNU/Linux) + +iD8DBQFEv8e1AiZjviIA2XgRAq0QAKDl5nILwdJ6Co9aGGCA7hKPFmAF2ACfX6uS +bGnmW1fQ3EcirtX/NC8WsIw= +=nF2W +-----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r4 b/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r4 new file mode 100644 index 000000000000..d6d1bffc9da9 --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.3-r4 @@ -0,0 +1,6 @@ +MD5 08fe95f3fbe2301d14e5f237ed81bc1a kdelibs-3.5-patchset-03.tar.bz2 16346 +RMD160 067ca7474b987dac704f8e350cb8af57e632ce8d kdelibs-3.5-patchset-03.tar.bz2 16346 +SHA256 a2a16afe41617a363bc59733bf76747fb4635243bfa7007374ccb44cff8cd04e kdelibs-3.5-patchset-03.tar.bz2 16346 +MD5 972c2c6855f912179bd7830bf2ed91d8 kdelibs-3.5.3.tar.bz2 15424888 +RMD160 be39edfea7bfe1f0c0408be8fe9f37077954e545 kdelibs-3.5.3.tar.bz2 15424888 +SHA256 ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9 kdelibs-3.5.3.tar.bz2 15424888 diff --git a/kde-base/kdelibs/files/kdelibs-3.5.3-konqcrash.patch b/kde-base/kdelibs/files/kdelibs-3.5.3-konqcrash.patch new file mode 100644 index 000000000000..13ec8de97f8d --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-3.5.3-konqcrash.patch @@ -0,0 +1,13 @@ +Index: khtml/dom/dom_node.cpp +=================================================================== +--- khtml/dom/dom_node.cpp (revision 562181) ++++ khtml/dom/dom_node.cpp (revision 562182) +@@ -273,7 +273,7 @@ + NodeImpl *r = impl->replaceChild( newChild.impl, oldChild.impl, exceptioncode ); + if (exceptioncode) + throw DOMException(exceptioncode); +- if (!newChild.impl->closed()) newChild.impl->close(); ++ if (newChild.impl && !newChild.impl->closed()) newChild.impl->close(); + return r; + } + diff --git a/kde-base/kdelibs/kdelibs-3.5.3-r4.ebuild b/kde-base/kdelibs/kdelibs-3.5.3-r4.ebuild new file mode 100644 index 000000000000..15debc61ca88 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.5.3-r4.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.3-r4.ebuild,v 1.1 2006/07/20 18:12:51 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-03.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.5" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff +zeroconf kernel_linux fam" + +# 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-${PV} ) + app-arch/bzip2 + >=media-libs/freetype-2 + media-libs/fontconfig + >=dev-libs/libxslt-1.1.15 + >=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 ) + spell? ( || ( ( app-text/aspell app-dicts/aspell-en ) + app-text/ispell ) ) + zeroconf? ( net-misc/mDNSResponder ) + fam? ( virtual/fam ) + virtual/ghostscript" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + sys-devel/gettext + dev-util/pkgconfig" + +RDEPEND="${RDEPEND} + || ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 )" + +PATCHES="${FILESDIR}/${P}-konqcrash.patch" + +pkg_setup() { + if use legacyssl ; then + echo "" + eerror "Warning:" + ewarn "You have the legacyssl use flag enabled, which fixes issues with some broken" + ewarn "sites, but breaks others instead. It is strongly discouraged to use it." + ewarn "For more information, see bug #128922." + echo "" + 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.2-kssl-3des.patch || die "Patch did not apply." + fi + + if use cups && has_version '>=net-print/cups-1.2_pre'; then + cd "${S}" + + EPATCH_EXCLUDE="kubuntu_39_cups12_compile_fixes.diff" \ + EPATCH_SUFFIX="diff" \ + EPATCH_MULTI_MSG="Applying KUbuntu patches for CUPS 1.2 support ..." \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}/kdeprint-3.5.2-cups-1.2-patches/" + fi +} + +src_compile() { + rm -f ${S}/configure + + # hspell is disabled because it requires version 0.9 of hspell that + # is not in portage yet; leaving it to autodetection tries to use it + # and then fails because of missing required functions + + myconf="--with-distribution=Gentoo + $(use_enable fam libfam) $(use_enable kernel_linux dnotify) + --with-libart --with-libidn --without-utempter + $(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_enable zeroconf dnssd) + --without-hspell" + + if use spell && has_version app-text/aspell; then + myconf="${myconf} --with-aspell" + else + myconf="${myconf} --without-aspell" + fi + + if has_version x11-apps/rgb; then + myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt" + fi + + myconf="${myconf} --disable-fast-malloc" + + # 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 + + if ! use arts ; then + 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" +EOF + fi + +} + +pkg_postinst() { + if use zeroconf; then + echo + einfo "To make zeroconf support available in KDE" + einfo "make sure that the 'mdnsd' daemon is running." + einfo "Make sure also that multicast dns lookups are" + einfo "enabled by editing the 'hosts:' line in" + einfo "/etc/nsswitch.conf to include 'mdns', e.g.:" + einfo "hosts: files mdns dns" + echo + fi +} |