diff options
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kdebase/Manifest | 25 | ||||
| -rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.5.7-r2 | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/files/konqueror-3.5.7-location.patch | 12 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.5.7-r2.ebuild | 220 |
5 files changed, 263 insertions, 8 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index fc0243d19218..f9160e7c5aca 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.374 2007/07/10 18:36:59 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.375 2007/07/20 19:57:48 cryos Exp $ + +*kdebase-3.5.7-r2 (20 Jul 2007) + + 20 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org> + +files/konqueror-3.5.7-location.patch, +kdebase-3.5.7-r2.ebuild: + Applied patch to prevent URI address bar spoofing, should solve bug 185603. *kdebase-3.5.7-r1 (10 Jul 2007) diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index 4a6cbd5446f3..edd37c7aea2c 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -41,6 +41,10 @@ AUX kdesktop-3.5.3-screensaver.patch 3336 RMD160 f8ac6f039ea14dbbf1f8579cd610a8f MD5 c1c21846f3ff96630e1faebbd6a450c8 files/kdesktop-3.5.3-screensaver.patch 3336 RMD160 f8ac6f039ea14dbbf1f8579cd610a8f5e0f26bd2 files/kdesktop-3.5.3-screensaver.patch 3336 SHA256 0e6fa9e399914805c72042ddb358ea3760f30f6d1b2b782f744a3fe20d9c18d8 files/kdesktop-3.5.3-screensaver.patch 3336 +AUX konqueror-3.5.7-location.patch 454 RMD160 868630c762c1c35174fc3d7c0b1de83711c31c13 SHA1 79be2ce4f11a0c0054952cf279a08ab9ca3f1b4a SHA256 f22aaf1dcb994f5e2fb87483489184527f0ff9b1f42162e56ed37c79c668236c +MD5 c4ab2990ca8270c5fbe13d5d3bdb933f files/konqueror-3.5.7-location.patch 454 +RMD160 868630c762c1c35174fc3d7c0b1de83711c31c13 files/konqueror-3.5.7-location.patch 454 +SHA256 f22aaf1dcb994f5e2fb87483489184527f0ff9b1f42162e56ed37c79c668236c files/konqueror-3.5.7-location.patch 454 AUX kwin-3.5.5-input-shape.patch 2920 RMD160 d059a3386e6ff4ed06b5c843cc68105524808820 SHA1 3e1d3993ba87c157c6bf2c2db9f07a235e657568 SHA256 29f7c0677f0d799f983122e5ce05689ac326046452b6c9f6f71d2488161ac9db MD5 acec9d692344d8f456265c517248496b files/kwin-3.5.5-input-shape.patch 2920 RMD160 d059a3386e6ff4ed06b5c843cc68105524808820 files/kwin-3.5.5-input-shape.patch 2920 @@ -87,14 +91,18 @@ EBUILD kdebase-3.5.7-r1.ebuild 6935 RMD160 38827b25100ceb02ebd60e0940e88d6628052 MD5 7ab0797f26e72be778f6e021808cec3a kdebase-3.5.7-r1.ebuild 6935 RMD160 38827b25100ceb02ebd60e0940e88d662805248e kdebase-3.5.7-r1.ebuild 6935 SHA256 6dde21afd46cd797886d7b65770cf42348f0504a73354c78841b745df46a96c6 kdebase-3.5.7-r1.ebuild 6935 +EBUILD kdebase-3.5.7-r2.ebuild 6974 RMD160 16dca7795eef49c0ad9ebce32e63eb7a008f7b50 SHA1 81c6c918f299d4178f4bdb8fdc0956c734278c0b SHA256 d15b23828d7ab868eae95e644fe1429fc251ddd1f4ef2a1aea8b1da4cd970f59 +MD5 b89c830cfb1691ff1aecd71b261228b9 kdebase-3.5.7-r2.ebuild 6974 +RMD160 16dca7795eef49c0ad9ebce32e63eb7a008f7b50 kdebase-3.5.7-r2.ebuild 6974 +SHA256 d15b23828d7ab868eae95e644fe1429fc251ddd1f4ef2a1aea8b1da4cd970f59 kdebase-3.5.7-r2.ebuild 6974 EBUILD kdebase-3.5.7.ebuild 6878 RMD160 356a44f822a9e5f216839700d90b2b7e81f624a8 SHA1 a482cfed168c96bae4bc6a109bc00a7fa44a4790 SHA256 7a088d339fa3a134c9293a6ba876945f5ec7a7dd79f53f9db9e215262927ebff MD5 5d7d7b89b09539b997a235f7546b347a kdebase-3.5.7.ebuild 6878 RMD160 356a44f822a9e5f216839700d90b2b7e81f624a8 kdebase-3.5.7.ebuild 6878 SHA256 7a088d339fa3a134c9293a6ba876945f5ec7a7dd79f53f9db9e215262927ebff kdebase-3.5.7.ebuild 6878 -MISC ChangeLog 63514 RMD160 c78fc64dbb01eefdfbe2cd83fec9f58bd7dfe8f7 SHA1 1a718b31cb5941163cd914e7403390b2b362443c SHA256 2e6f5c847c1f2d63d49e8fa391b778dbc101ec77db8c99e7dd8a5e358256a2a3 -MD5 c689d00d9cbc27e9b9f72ab9344da125 ChangeLog 63514 -RMD160 c78fc64dbb01eefdfbe2cd83fec9f58bd7dfe8f7 ChangeLog 63514 -SHA256 2e6f5c847c1f2d63d49e8fa391b778dbc101ec77db8c99e7dd8a5e358256a2a3 ChangeLog 63514 +MISC ChangeLog 63740 RMD160 3bea53782f84643cbd1c22f0477063298be52490 SHA1 994cfab3c4e9035ec1603d11583544c278ae82af SHA256 1c94f3f18c52a9e72794812d29db7ef212cb6b15416ace1ea8bf317d63be5ade +MD5 61e3e4568beeb8b37cd232f88bda2ecf ChangeLog 63740 +RMD160 3bea53782f84643cbd1c22f0477063298be52490 ChangeLog 63740 +SHA256 1c94f3f18c52a9e72794812d29db7ef212cb6b15416ace1ea8bf317d63be5ade ChangeLog 63740 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -123,10 +131,13 @@ SHA256 6a5a2b865af05be7ff99dde4fa36a42340da5fdce36b8c595f4563bfb9a5f3e4 files/di MD5 82b7ea4779ba9576547630f3a00909a4 files/digest-kdebase-3.5.7-r1 521 RMD160 e3b42129f398e63f64671bb8e55a7f76f7f450e7 files/digest-kdebase-3.5.7-r1 521 SHA256 6a5a2b865af05be7ff99dde4fa36a42340da5fdce36b8c595f4563bfb9a5f3e4 files/digest-kdebase-3.5.7-r1 521 +MD5 82b7ea4779ba9576547630f3a00909a4 files/digest-kdebase-3.5.7-r2 521 +RMD160 e3b42129f398e63f64671bb8e55a7f76f7f450e7 files/digest-kdebase-3.5.7-r2 521 +SHA256 6a5a2b865af05be7ff99dde4fa36a42340da5fdce36b8c595f4563bfb9a5f3e4 files/digest-kdebase-3.5.7-r2 521 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.5 (GNU/Linux) -iD8DBQFGk9HYCkvF58q80IkRAgJ1AKCrmM0DYtzpRBU9DcF66n1C3KPkZACdHN8L -QN6KBFYjk40oBDCeoq//CB0= -=41S9 +iD8DBQFGoRO+ntT9W3vfTuoRAurdAJ9zE0I5zGqufd3aIP+NM2fTOio6mQCdFLcS +7W1aHj2cP8LnD4Tgu9xSvhE= +=GGnK -----END PGP SIGNATURE----- diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.7-r2 b/kde-base/kdebase/files/digest-kdebase-3.5.7-r2 new file mode 100644 index 000000000000..cc5ae557a958 --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.5.7-r2 @@ -0,0 +1,6 @@ +MD5 da0b6ef72a164f0a1af0943ef045ed17 kdebase-3.5-patchset-05.tar.bz2 16068 +RMD160 dc1572fbb3cf3ce9a8e424edd3408b8912c6bfd5 kdebase-3.5-patchset-05.tar.bz2 16068 +SHA256 d1d3c8b51c68610c76c61ba4923618a16609bb76af547d8d26bb9a3f6990bd4d kdebase-3.5-patchset-05.tar.bz2 16068 +MD5 b421e01b3ee712549ee967f58ed24de0 kdebase-3.5.7.tar.bz2 24395088 +RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 kdebase-3.5.7.tar.bz2 24395088 +SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d kdebase-3.5.7.tar.bz2 24395088 diff --git a/kde-base/kdebase/files/konqueror-3.5.7-location.patch b/kde-base/kdebase/files/konqueror-3.5.7-location.patch new file mode 100644 index 000000000000..7061e6a1b940 --- /dev/null +++ b/kde-base/kdebase/files/konqueror-3.5.7-location.patch @@ -0,0 +1,12 @@ +Index: konqueror/konq_combo.cc +=================================================================== +--- konqueror/konq_combo.cc (revision 643782) ++++ konqueror/konq_combo.cc (working copy) +@@ -158,6 +158,7 @@ + kapp->dcopClient()->send( "konqueror*", "KonquerorIface", + "addToCombo(QString,QCString)", data); + } ++ lineEdit()->setCursorPosition( 0 ); + } + + void KonqCombo::setTemporary( const QString& text ) diff --git a/kde-base/kdebase/kdebase-3.5.7-r2.ebuild b/kde-base/kdebase/kdebase-3.5.7-r2.ebuild new file mode 100644 index 000000000000..f43ac794386d --- /dev/null +++ b/kde-base/kdebase/kdebase-3.5.7-r2.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.7-r2.ebuild,v 1.1 2007/07/20 19:57:48 cryos Exp $ + +inherit kde-dist eutils flag-o-matic + +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-3.5-patchset-05.tar.bz2" + +DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl +pam samba xcomposite xscreensaver xinerama kdehiddenvisibility" + +# hal: enables hal backend for 'media:' ioslave + +DEPEND=">=media-libs/freetype-2 + media-libs/fontconfig + dev-libs/openssl + pam? ( kde-base/kdebase-pam ) + >=dev-libs/cyrus-sasl-2 + ldap? ( >=net-nds/openldap-2 ) + cups? ( net-print/cups ) + opengl? ( virtual/opengl ) + openexr? ( >=media-libs/openexr-1.2.2-r2 ) + samba? ( >=net-fs/samba-3.0.4 ) + lm_sensors? ( sys-apps/lm_sensors ) + logitech-mouse? ( >=dev-libs/libusb-0.1.10a ) + ieee1394? ( sys-libs/libraw1394 ) + hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.34 ) + =sys-apps/hal-0.5* ) + xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage ) + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXext + xscreensaver? ( x11-libs/libXScrnSaver ) + xinerama? ( x11-libs/libXinerama )" + +RDEPEND="${DEPEND} + sys-apps/usbutils + sys-devel/gdb + java? ( >=virtual/jre-1.4 ) + kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) ) + virtual/ssh + www-misc/htdig + x11-apps/mkfontdir + x11-apps/setxkbmap + x11-apps/xinit + || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrandr + x11-apps/xsetroot + x11-apps/xset" + +DEPEND="${DEPEND} + xcomposite? ( x11-proto/compositeproto x11-proto/damageproto ) + xscreensaver? ( x11-proto/scrnsaverproto ) + xinerama? ( x11-proto/xineramaproto ) + x11-apps/bdftopcf + x11-apps/xhost" + +need-kde 3.5.7 + +PATCHES="${FILESDIR}/kate-3.5.7-session-save.patch + ${FILESDIR}/konqueror-3.5.7-location.patch" + +pkg_setup() { + kde_pkg_setup + if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then + eerror "To enable HAL support in this package is required to have" + eerror "sys-apps/dbus compiled with Qt 3 support." + eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"." + die "Please reemerge sys-apps/dbus with USE=\"qt3\"." + fi +} + +src_unpack() { + kde_src_unpack + + # Avoid using imake (kde bug 114466). + #epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch" + # ...included in patch set + rm -f "${S}/configure" + + # FIXME - disable broken tests + sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/smtp/Makefile.am || die "sed failed" + sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/trash/Makefile.am || die "sed failed" + sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed" + + if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then + einfo "User ${USER} has no X access, disabling some tests." + for ioslave in media remote home system ; do + sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \ + -i kioslave/${ioslave}/Makefile.am || die "sed failed" + done + fi +} + +src_compile() { + local myconf="--with-dpms --enable-dnssd --with-sssl + --with-usbids=/usr/share/misc/usb.ids + $(use_with ieee1394 libraw1394) + $(use_with hal) + $(use_with ldap) + $(use_with lm_sensors sensors) + $(use_with logitech-mouse libusb) + $(use_with openexr) + $(use_with opengl gl) + $(use_with pam) + $(use_with samba) + $(use_with xcomposite composite) + $(use_with xinerama) + $(use_with xscreensaver)" + + if ! use pam && use elibc_glibc; then + myconf="${myconf} --with-shadow" + fi + + # the java test is problematic (see kde bug 100729) and + # useless. All that's needed for java applets to work is + # to have the 'java' executable in PATH. + myconf="${myconf} --without-java" + + export BINDNOW_FLAGS="$(bindnow-flags)" + + kde_src_compile +} + +src_install() { + kde_src_install + cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install + + # startup and shutdown scripts + insinto ${KDEDIR}/env + doins "${WORKDIR}/patches/agent-startup.sh" + + exeinto ${KDEDIR}/shutdown + doexe "${WORKDIR}/patches/agent-shutdown.sh" + + # freedesktop environment variables + cat <<EOF > "${T}/xdg.sh" +export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" +EOF + insinto "${KDEDIR}/env" + doins "${T}/xdg.sh" + + # x11 session script + cat <<EOF > "${T}/kde-${SLOT}" +#!/bin/sh +exec ${KDEDIR}/bin/startkde +EOF + exeinto /etc/X11/Sessions + doexe "${T}/kde-${SLOT}" + + # freedesktop compliant session script + sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ + "${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop" + insinto /usr/share/xsessions + doins "${T}/kde-${SLOT}.desktop" + + # Customize the kdmrc configuration + sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ + "${D}/${KDEDIR}/share/config/kdm/kdmrc" || die + + rmdir "${D}/${KDEDIR}/share/templates/.source/emptydir" + + dodir ${PREFIX}/share/services/searchproviders + insinto ${PREFIX}/share/services/searchproviders + doins ${FILESDIR}/*.desktop +} + +pkg_preinst() { + kde_pkg_preinst + + # We need to symlink here, as kfmclient freaks out completely, + # if it does not find konqueror.desktop in the legacy path. + dodir ${PREFIX}/share/applications/kde + dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop +} + +pkg_postinst() { + kde_pkg_postinst + + # set the default kdm face icon if it's not already set by the system admin + if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then + mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ + "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" + fi + if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then + mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ + "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" + fi + + mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir" + + echo + elog "To enable gpg-agent and/or ssh-agent in KDE sessions," + elog "edit ${KDEDIR}/env/agent-startup.sh and" + elog "${KDEDIR}/shutdown/agent-shutdown.sh" + echo + elog "We've added three Gentoo-related web shortcuts to Konqueror:" + elog "- gb Gentoo Bugzilla searching" + elog "- gf Gentoo Forums searching" + elog "- gp Gentoo Package searching" + echo + elog "You'll have to activate them in 'Configure Konqueror...'." + echo + elog "If you can't open new konqueror windows and get something like" + elog "'WARNING: Outdated database found' when starting konqueror in a console, run" + elog "kbuildsycoca as the user you're running KDE under." + elog "This is NOT a bug." + echo +} |