Apply the patches for kwin and kdebase-kioslaves.

(Portage version: 2.1.2_pre3-r2)

5 files changed, 345 insertions, 1 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 72e746f01a4f..2b9be2c621d1 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # 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.312 2006/10/11 11:11:49 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.313 2006/10/16 22:36:19 flameeyes Exp $
+
+*kdebase-3.5.5-r1 (16 Oct 2006)
+
+  16 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdebase-kioslaves-3.5.5-fstab.patch,
+  +files/kwin-3.5.5-input-shape.patch, +kdebase-3.5.5-r1.ebuild:
+  Apply the patches for kwin and kdebase-kioslaves.
 
   11 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
   files/digest-kdebase-3.5.5, Manifest:
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.5-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.5-r1
new file mode 100644
index 000000000000..f51965cf1cbe
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.5-r1
@@ -0,0 +1,6 @@
+MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
+RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
+SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
+MD5 0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 23851886
+RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 kdebase-3.5.5.tar.bz2 23851886
+SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 kdebase-3.5.5.tar.bz2 23851886
diff --git a/kde-base/kdebase/files/kdebase-kioslaves-3.5.5-fstab.patch b/kde-base/kdebase/files/kdebase-kioslaves-3.5.5-fstab.patch
new file mode 100644
index 000000000000..3f0721e75fb7
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-kioslaves-3.5.5-fstab.patch
@@ -0,0 +1,73 @@
+From: Stephan Kulow <coolo@kde.org>
+To: kde-commits@kde.org
+Subject: branches/KDE/3.5/kdebase/kioslave/media/mediamanager
+Date: Mon, 09 Oct 2006 09:32:17 +0000
+Message-Id: <1160386337.725673.25740.nullmailer@svn.kde.org>
+Cc: kde-packager@kde.org
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+X-Length: 6245
+
+SVN commit 593835 by coolo:
+
+devices that are in fstab should show up no matter what HAL thinks
+CCMAIL: kde-packager@kde.org
+
+
+ M  +16 -7     halbackend.cpp  
+
+
+--- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp #593834:593835
+@@ -215,11 +215,6 @@
+              !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) )
+             return;
+ 
+-        if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
+-               !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
+-             ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
+-            return;
+-
+         /* Query drive udi */
+         QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
+         /* We don't list floppy volumes because we list floppy drives */
+@@ -240,7 +235,19 @@
+ 
+         /* Create medium */
+         Medium* medium = new Medium(udi, "");
++        setVolumeProperties(medium);
+ 
++        if ( isInFstab( medium ).isNull() )
++        {
++            // if it's not mountable by user and not by HAL, don't show it at all
++            if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
++                   !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
++                 ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
++            {
++                delete medium;
++                return;
++            }
++        }
+         QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
+         kdDebug() << "automount " << options["automount"] << endl;
+         if (options["automount"] == "true" && allowNotification ) {
+@@ -248,7 +255,6 @@
+             if (!error.isEmpty())
+                 kdDebug() << "error " << error << endl;
+         }
+-        setVolumeProperties(medium);
+         m_mediaList.addMedium(medium, allowNotification);
+ 
+         return;
+@@ -992,7 +998,10 @@
+ 
+     for (; it!=end; ++it)
+     {
+-        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl;
++        QString reald = (*it)->realDeviceName();
++        if ( reald.endsWith( "/" ) )
++            reald = reald.left( reald.length() - 1 );
++        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
+         if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) )
+ 	{
+             QStringList opts = (*it)->mountOptions();
diff --git a/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch b/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch
new file mode 100644
index 000000000000..94cd32d24636
--- /dev/null
+++ b/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch
@@ -0,0 +1,63 @@
+From l.lunak@kde.org Tue Oct 10 12:25:53 2006
+To: kde-commits@kde.org
+Subject: branches/KDE/3.5/kdebase/kwin
+Message-Id: <1160475953.522428.2616.nullmailer@svn.kde.org>
+Cc: kde-packager@kde.org,
+ 135250-done@bugs.kde.org
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+X-Length: 6070
+X-UID: 85
+
+SVN commit 594159 by lunakl:
+
+Build the input shape on a helper window instead of directly,
+this avoids having a hole in the shape temporarily. This seems
+to break non-click-to-focus mouse policies on some systems
+(works fine here though).
+BUG: 135250
+CCMAIL: kde-packager@kde.org
+
+
+
+ M  +19 -6     client.cpp  
+
+
+--- branches/KDE/3.5/kdebase/kwin/client.cpp #594158:594159
+@@ -477,16 +477,29 @@
+     // calls it or when the decoration is created/destroyed
+ 
+     if( Shape::version() >= 0x11 ) // 1.1, has input shape support
+-        { // there appears to be no way to find out if a window has input
+-          // shape set or not, so always set propagate the input shape
+-          // (it's the same like the bounding shape by default)
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
++        { // There appears to be no way to find out if a window has input
++          // shape set or not, so always propagate the input shape
++          // (it's the same like the bounding shape by default).
++          // Also, build the shape using a helper window, not directly
++          // in the frame window, because the sequence set-shape-to-frame,
++          // remove-shape-of-client, add-input-shape-of-client has the problem
++          // that after the second step there's a hole in the input shape
++          // until the real shape of the client is added and that can make
++          // the window lose focus (which is a problem with mouse focus policies)
++        static Window helper_window = None;
++        if( helper_window == None )
++            helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(),
++                0, 0, 1, 1, 0, 0, 0 );
++        XResizeWindow( qt_xdisplay(), helper_window, width(), height());
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0,
+                            frameId(), ShapeBounding, ShapeSet );
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
+                            clientPos().x(), clientPos().y(),
+                            window(), ShapeBounding, ShapeSubtract );
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
+                            clientPos().x(), clientPos().y(),
+                            window(), ShapeInput, ShapeUnion );
++        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
++                           helper_window, ShapeInput, ShapeSet );
+         }
+     }
diff --git a/kde-base/kdebase/kdebase-3.5.5-r1.ebuild b/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..bb9704f7acf7
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.5.5-r1.ebuild
@@ -0,0 +1,195 @@
+# 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.5-r1.ebuild,v 1.1 2006/10/16 22:36:19 flameeyes Exp $
+
+inherit kde-dist eutils flag-o-matic
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-03.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.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? ( >=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-7 )"
+
+RDEPEND="${DEPEND}
+	sys-apps/usbutils
+	java? ( >=virtual/jre-1.4 )
+	kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
+	|| ( (
+			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-7 )"
+
+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-7 )
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
+	${FILESDIR}/kdebase-kioslaves-3.5.5-fstab.patch
+	${FILESDIR}/kwin-3.5.5-input-shape.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"
+	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"
+}
+
+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
+}