diff options
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdebase/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kdebase/files/digest-kdebase-3.5.3-r3 | 6 | ||||
| -rw-r--r-- | kde-base/kdebase/files/kdesktop-3.5.3-screensaver.patch | 101 | ||||
| -rw-r--r-- | kde-base/kdebase/kdebase-3.5.3-r3.ebuild | 194 |
4 files changed, 308 insertions, 1 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index 30632e4ec4b2..727541758d97 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.297 2006/07/01 15:10:12 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.298 2006/07/01 23:15:39 genstef Exp $ + +*kdebase-3.5.3-r3 (01 Jul 2006) + + 01 Jul 2006; Stefan Schweizer <genstef@gentoo.org> + +files/kdesktop-3.5.3-screensaver.patch, +kdebase-3.5.3-r3.ebuild: + Add patch to fix KDE bug #128610 (screensaver not working). 01 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Regen manifest. diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.3-r3 b/kde-base/kdebase/files/digest-kdebase-3.5.3-r3 new file mode 100644 index 000000000000..cfd18542a977 --- /dev/null +++ b/kde-base/kdebase/files/digest-kdebase-3.5.3-r3 @@ -0,0 +1,6 @@ +MD5 71b9ee636bc39514d3d445b7034b7aa7 kdebase-3.5-patchset-02.tar.bz2 7118 +RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 kdebase-3.5-patchset-02.tar.bz2 7118 +SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b kdebase-3.5-patchset-02.tar.bz2 7118 +MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194 +RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194 +SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194 diff --git a/kde-base/kdebase/files/kdesktop-3.5.3-screensaver.patch b/kde-base/kdebase/files/kdesktop-3.5.3-screensaver.patch new file mode 100644 index 000000000000..8edf3a6b97c4 --- /dev/null +++ b/kde-base/kdebase/files/kdesktop-3.5.3-screensaver.patch @@ -0,0 +1,101 @@ +Index: kdesktop/lockeng.cc +=================================================================== +--- kdesktop/lockeng.cc (revision 548007) ++++ kdesktop/lockeng.cc (revision 548008) +@@ -42,9 +42,6 @@ + XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval, + &mXBlanking, &mXExposures); + +- // We'll handle blanking +- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); +- + mState = Waiting; + mXAutoLock = 0; + mEnabled = false; +@@ -158,6 +155,9 @@ + mXAutoLock->setDPMS(mDPMS); + //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); + ++ // We'll handle blanking ++ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); ++ + mXAutoLock->start(); + + kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl; +@@ -170,6 +170,7 @@ + mXAutoLock = 0; + } + ++ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); + kdDebug(1204) << "Saver Engine disabled" << endl; + } + +@@ -291,7 +292,6 @@ + kdDebug(1204) << "SaverEngine: stopping lock" << endl; + emitDCOPSignal("KDE_stop_screensaver()", QByteArray()); + +- + mLockProcess.kill(); + + if (mXAutoLock) +@@ -300,6 +300,7 @@ + } + processLockTransactions(); + mState = Waiting; ++ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); + } + + void SaverEngine::lockProcessExited() +@@ -314,6 +315,7 @@ + } + processLockTransactions(); + mState = Waiting; ++ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); + } + + //--------------------------------------------------------------------------- +@@ -322,6 +324,8 @@ + // + void SaverEngine::idleTimeout() + { ++ // disable X screensaver ++ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); + startLockProcess( DefaultLock ); + } + +Index: kdesktop/xautolock.cc +=================================================================== +--- kdesktop/xautolock.cc (revision 548007) ++++ kdesktop/xautolock.cc (revision 548008) +@@ -192,6 +192,7 @@ + + bool activate = false; + ++ kdDebug() << now << " " << mTrigger << endl; + if (now >= mTrigger) + { + resetTrigger(); +@@ -202,6 +203,8 @@ + BOOL on; + CARD16 state; + DPMSInfo( qt_xdisplay(), &state, &on ); ++ ++ kdDebug() << "DPMSInfo " << state << " " << on << endl; + // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time + // that is always smaller than DPMS timeout (X bug I guess). So if DPMS + // saving is active, simply always activate our saving too, otherwise +@@ -217,9 +220,11 @@ + #ifdef HAVE_XSCREENSAVER + static XScreenSaverInfo* mitInfo = 0; + if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); +- XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo); +- if (mitInfo->state == ScreenSaverDisabled) +- activate = false; ++ if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) { ++ kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; ++ if (mitInfo->state == ScreenSaverDisabled) ++ activate = false; ++ } + #endif + + if(mActive && activate) diff --git a/kde-base/kdebase/kdebase-3.5.3-r3.ebuild b/kde-base/kdebase/kdebase-3.5.3-r3.ebuild new file mode 100644 index 000000000000..6020f96c1069 --- /dev/null +++ b/kde-base/kdebase/kdebase-3.5.3-r3.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3-r3.ebuild,v 1.1 2006/07/01 23:15:39 genstef Exp $ + +inherit kde-dist eutils flag-o-matic + +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-3.5-patchset-02.tar.bz2" + +DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..." + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl +pam samba ssl zeroconf xcomposite xscreensaver xinerama" +# hal: enables hal backend for 'media:' ioslave + +DEPEND="arts? ( ~kde-base/arts-${PV} ) + >=media-libs/freetype-2 + media-libs/fontconfig + pam? ( kde-base/kdebase-pam ) + >=dev-libs/cyrus-sasl-2 + ldap? ( >=net-nds/openldap-2 ) + cups? ( net-print/cups ) + ssl? ( dev-libs/openssl ) + opengl? ( virtual/opengl ) + openexr? ( >=media-libs/openexr-1.2 ) + 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? ( >=sys-apps/dbus-0.33 + =sys-apps/hal-0.5* + sys-apps/pmount ) + zeroconf? ( net-misc/mDNSResponder ) + xcomposite? ( || ( ( + x11-libs/libXcomposite + x11-libs/libXdamage + ) <x11-base/xorg-x11-7 ) + ) + || ( ( + 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 ) + ) virtual/x11 )" + +RDEPEND="${DEPEND} + sys-apps/usbutils + java? ( >=virtual/jre-1.4 ) + virtual/eject + || ( ( + x11-apps/xmessage + x11-apps/xsetroot + x11-apps/xset + x11-apps/xrandr + x11-apps/mkfontdir + x11-apps/xinit + || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) + x11-apps/setxkbmap + ) virtual/x11 )" + +DEPEND="${DEPEND} + xcomposite? ( || ( ( + x11-proto/compositeproto + x11-proto/damageproto + ) <x11-base/xorg-x11-7 ) + ) + || ( ( + xscreensaver? ( x11-proto/scrnsaverproto ) + xinerama? ( x11-proto/xineramaproto ) + x11-apps/bdftopcf + ) virtual/x11 ) + dev-util/pkgconfig" + +PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch + ${FILESDIR}/kdesktop-3.5.3-screensaver.patch" + +pkg_setup() { + kde_pkg_setup + if use hal && ! 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" + rm -f ${S}/configure + + # Fix KDM symlink vulnerability, bug #136201 + epatch "${FILESDIR}/post-3.5.0-kdebase-kdm.diff" + + epatch "${FILESDIR}/kdm-3.5.3-strict-aliasing.patch" +} + +src_compile() { + local myconf="--with-dpms + $(use_with arts) $(use_with ldap) + $(use_with opengl gl) $(use_with ssl) + $(use_with samba) $(use_with openexr) + $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb) + $(use_with ieee1394 libraw1394) $(use_with hal) + $(use_enable zeroconf dnssd) + $(use_with xcomposite composite) + $(use_with xscreensaver) + $(use_with xinerama) + --with-usbids=/usr/share/misc/usb.ids" + + if use pam; then + myconf="${myconf} --with-pam=yes" + else + myconf="${myconf} --with-pam=no --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 ${FILESDIR}/agent-startup.sh + + exeinto ${KDEDIR}/shutdown + doexe ${FILESDIR}/agent-shutdown.sh + + # freedesktop environment variables + cat <<EOF > ${T}/xdg.sh +export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share" +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 +} + +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 + einfo "To enable gpg-agent and/or ssh-agent in KDE sessions," + einfo "edit ${KDEDIR}/env/agent-startup.sh and" + einfo "${KDEDIR}/shutdown/agent-shutdown.sh" + echo +} |