From 91229eb4a5d2ff47886b893c9b411d65a67156ff Mon Sep 17 00:00:00 2001 From: Wulf Krueger Date: Tue, 10 Jul 2007 18:36:59 +0000 Subject: Added the patch from KDE bug 147195 to prevent kate from crashing when asking to save a session. Fixes our bug 184322. Package-Manager: portage-2.1.3_rc7 --- kde-base/kdebase/ChangeLog | 9 +- kde-base/kdebase/Manifest | 29 ++- kde-base/kdebase/files/digest-kdebase-3.5.7-r1 | 6 + .../kdebase/files/kate-3.5.7-session-save.patch | 18 ++ kde-base/kdebase/kdebase-3.5.7-r1.ebuild | 219 +++++++++++++++++++++ 5 files changed, 276 insertions(+), 5 deletions(-) create mode 100644 kde-base/kdebase/files/digest-kdebase-3.5.7-r1 create mode 100644 kde-base/kdebase/files/kate-3.5.7-session-save.patch create mode 100644 kde-base/kdebase/kdebase-3.5.7-r1.ebuild (limited to 'kde-base') diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index dea612648a11..fc0243d19218 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,13 @@ # 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.373 2007/07/08 04:20:12 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.374 2007/07/10 18:36:59 philantrop Exp $ + +*kdebase-3.5.7-r1 (10 Jul 2007) + + 10 Jul 2007; Wulf C. Krueger + +files/kate-3.5.7-session-save.patch, +kdebase-3.5.7-r1.ebuild: + Added the patch from KDE bug 147195 to prevent kate from crashing when + asking to save a session. Fixes our bug 184322. 08 Jul 2007; Michael Sterrett kdebase-3.5.5-r1.ebuild, kdebase-3.5.5-r3.ebuild, kdebase-3.5.5-r4.ebuild, diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest index e2001f1f55c5..4a6cbd5446f3 100644 --- a/kde-base/kdebase/Manifest +++ b/kde-base/kdebase/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX Gentoo_Bugzilla.desktop 283 RMD160 84ec8315ffead9bc04bc358d971e7ab653971f17 SHA1 65d287acd1d1dfc0ce158891fb555877cbad559e SHA256 6c72e294f8e11d2e3fe6ca26d004d6926530e9ed919c2ed4c8f7b1361ef18ddf MD5 623e6822f901f18407fc96b8ac0daa30 files/Gentoo_Bugzilla.desktop 283 RMD160 84ec8315ffead9bc04bc358d971e7ab653971f17 files/Gentoo_Bugzilla.desktop 283 @@ -22,6 +25,10 @@ AUX kate-3.5.5-visibility.patch 2248 RMD160 58915fcb0f8083e25a2ed85022312b53a6bc MD5 c0e7ab602ca07d635870a66aa125e636 files/kate-3.5.5-visibility.patch 2248 RMD160 58915fcb0f8083e25a2ed85022312b53a6bce816 files/kate-3.5.5-visibility.patch 2248 SHA256 d6546f8f188d6d4f5d75de61ede58f901d2a7d3410d7bb853ad40205aba2d560 files/kate-3.5.5-visibility.patch 2248 +AUX kate-3.5.7-session-save.patch 830 RMD160 b985212c85c11b563bbeb0a8348e2771e8b6e43d SHA1 910d98f125e0d20a54a25069e7df296eb8857657 SHA256 191b6fea38483d631ba87b8fdeff6ad65ace7f9aba8e0aeb2f8ecfb6bf1d336a +MD5 4e94724dabfaf7a3abf9ad801bd7ec27 files/kate-3.5.7-session-save.patch 830 +RMD160 b985212c85c11b563bbeb0a8348e2771e8b6e43d files/kate-3.5.7-session-save.patch 830 +SHA256 191b6fea38483d631ba87b8fdeff6ad65ace7f9aba8e0aeb2f8ecfb6bf1d336a files/kate-3.5.7-session-save.patch 830 AUX kdebase-kioslaves-3.5.5-fstab.patch 3103 RMD160 53a4f0ded4d368f93eb29650d12d266735d7bf9e SHA1 1ffe0d67e77970774a5a2420f79b0579716dc8a7 SHA256 6a17470a3245a59c6e84a0142e64633e74b2bb12649e9c46c0903dd8fa4edb29 MD5 76bc9dcbf83bccc0cbb0aaaf8560772e files/kdebase-kioslaves-3.5.5-fstab.patch 3103 RMD160 53a4f0ded4d368f93eb29650d12d266735d7bf9e files/kdebase-kioslaves-3.5.5-fstab.patch 3103 @@ -76,14 +83,18 @@ EBUILD kdebase-3.5.6-r3.ebuild 6222 RMD160 7e2c3f61e0231bf80e1d7758f180e7f58d79c MD5 ce50cc7eea2d2a5784aa41b9686f6d85 kdebase-3.5.6-r3.ebuild 6222 RMD160 7e2c3f61e0231bf80e1d7758f180e7f58d79c44e kdebase-3.5.6-r3.ebuild 6222 SHA256 1c2525583a3e4bfcb53e5e8a3ffd9d03d597c8dd8186cf313fddb9e94ac73771 kdebase-3.5.6-r3.ebuild 6222 +EBUILD kdebase-3.5.7-r1.ebuild 6935 RMD160 38827b25100ceb02ebd60e0940e88d662805248e SHA1 4cd4c8fc0e3a8543b11d3c50dd900ec49d536570 SHA256 6dde21afd46cd797886d7b65770cf42348f0504a73354c78841b745df46a96c6 +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.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 63235 RMD160 4927f89a3b85986a93551b85d922c2541cf300ac SHA1 8e3f8caaff2f7d0b8a9c62d0fede7d9c71c20dc4 SHA256 b6d1ca60d94bb8ead2267012d7dbfaafdc3b7af812414f18b3d7e7cc2b0cbe07 -MD5 3796edc3dd454051690d663f4ecdb862 ChangeLog 63235 -RMD160 4927f89a3b85986a93551b85d922c2541cf300ac ChangeLog 63235 -SHA256 b6d1ca60d94bb8ead2267012d7dbfaafdc3b7af812414f18b3d7e7cc2b0cbe07 ChangeLog 63235 +MISC ChangeLog 63514 RMD160 c78fc64dbb01eefdfbe2cd83fec9f58bd7dfe8f7 SHA1 1a718b31cb5941163cd914e7403390b2b362443c SHA256 2e6f5c847c1f2d63d49e8fa391b778dbc101ec77db8c99e7dd8a5e358256a2a3 +MD5 c689d00d9cbc27e9b9f72ab9344da125 ChangeLog 63514 +RMD160 c78fc64dbb01eefdfbe2cd83fec9f58bd7dfe8f7 ChangeLog 63514 +SHA256 2e6f5c847c1f2d63d49e8fa391b778dbc101ec77db8c99e7dd8a5e358256a2a3 ChangeLog 63514 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -109,3 +120,13 @@ SHA256 f5d1e7033a5c901ecfdd5db86217faa7c593376a302b1bc2d7862420c014383a files/di MD5 82b7ea4779ba9576547630f3a00909a4 files/digest-kdebase-3.5.7 521 RMD160 e3b42129f398e63f64671bb8e55a7f76f7f450e7 files/digest-kdebase-3.5.7 521 SHA256 6a5a2b865af05be7ff99dde4fa36a42340da5fdce36b8c595f4563bfb9a5f3e4 files/digest-kdebase-3.5.7 521 +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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.5 (GNU/Linux) + +iD8DBQFGk9HYCkvF58q80IkRAgJ1AKCrmM0DYtzpRBU9DcF66n1C3KPkZACdHN8L +QN6KBFYjk40oBDCeoq//CB0= +=41S9 +-----END PGP SIGNATURE----- diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.7-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.7-r1 new file mode 100644 index 000000000000..cc5ae557a958 --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.5.7-r1 @@ -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/kate-3.5.7-session-save.patch b/kde-base/kdebase/files/kate-3.5.7-session-save.patch new file mode 100644 index 000000000000..fe8029365357 --- /dev/null +++ b/kde-base/kdebase/files/kate-3.5.7-session-save.patch @@ -0,0 +1,18 @@ +--- branches/KDE/3.5/kdebase/kate/app/katesession.cpp 2007/06/16 03:24:38 676114 ++++ branches/KDE/3.5/kdebase/kate/app/katesession.cpp 2007/06/16 03:24:56 676115 +@@ -381,13 +381,13 @@ + + if (sesExit == "ask") + { +- KDialogBase dlg( i18n ("Save Session?") ++ KDialogBase* dlg = new KDialogBase(i18n ("Save Session?") + , KDialogBase::Yes | KDialogBase::No + , KDialogBase::Yes, KDialogBase::No + ); + + bool dontAgain = false; +- int res = KMessageBox::createKMessageBox(&dlg, QMessageBox::Question, ++ int res = KMessageBox::createKMessageBox(dlg, QMessageBox::Question, + i18n("Save current session?"), QStringList(), + i18n("Do not ask again"), &dontAgain, KMessageBox::Notify); + diff --git a/kde-base/kdebase/kdebase-3.5.7-r1.ebuild b/kde-base/kdebase/kdebase-3.5.7-r1.ebuild new file mode 100644 index 000000000000..0bb9d6b90c87 --- /dev/null +++ b/kde-base/kdebase/kdebase-3.5.7-r1.ebuild @@ -0,0 +1,219 @@ +# 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-r1.ebuild,v 1.1 2007/07/10 18:36:59 philantrop 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" + +pkg_setup() { + kde_pkg_setup + if use hal && has_version '> /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 < "${T}/xdg.sh" +export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" +EOF + insinto "${KDEDIR}/env" + doins "${T}/xdg.sh" + + # x11 session script + cat < "${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 +} -- cgit v1.2.3-65-gdbad