Add patch to fix systray icons appearing in the top-left corner of the screen at login. Thanks to Raymond Lewis Rebbeck in bug #124306.

(Portage version: 2.1_pre5-r1)

5 files changed, 215 insertions, 11 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 104b0c1880c6..1c5c66c64e40 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.260 2006/02/24 17:29:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.261 2006/02/28 22:47:52 flameeyes Exp $
+
+*kdebase-3.5.1-r3 (28 Feb 2006)
+
+  28 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kwin-3.5.1-systray.patch, +kdebase-3.5.1-r3.ebuild:
+  Add patch to fix systray icons appearing in the top-left corner of the
+  screen at login. Thanks to Raymond Lewis Rebbeck in bug #124306.
 
 *kdebase-3.5.1-r2 (24 Feb 2006)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index edae91443723..243620570ba1 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d9f4f512e6e835ad88a23df5573d09af ChangeLog 45291
 RMD160 48a70f5b667f6c8af0e3b695b7dd2852a696779f ChangeLog 45291
 SHA256 f89ca825e542094ade5665a4aa6adfdb5507cc9f132efea2652ec12df77a658e ChangeLog 45291
@@ -79,6 +76,9 @@ SHA256 55dfdfa182c6a8f9b39a15a5d897313cef65aa4369630e588f8410aab6970627 files/di
 MD5 4438fa374b4da526bac328d7346a802d files/digest-kdebase-3.5.1-r2 518
 RMD160 780914788cfe9180ceb9cf4494aeb8ff7e86f8df files/digest-kdebase-3.5.1-r2 518
 SHA256 5e2089f73b62efd9f20d7499ff0801b215a8a28d887d7629ca7bfa5764aea14a files/digest-kdebase-3.5.1-r2 518
+MD5 4438fa374b4da526bac328d7346a802d files/digest-kdebase-3.5.1-r3 518
+RMD160 780914788cfe9180ceb9cf4494aeb8ff7e86f8df files/digest-kdebase-3.5.1-r3 518
+SHA256 5e2089f73b62efd9f20d7499ff0801b215a8a28d887d7629ca7bfa5764aea14a files/digest-kdebase-3.5.1-r3 518
 MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
 RMD160 a7ce9d94fac98f513e0df2b59026c17e0999c33c files/kde-np.pam 379
 SHA256 e84fa10df5ec9b81b9a19d373fa60d4ebeaad4cd748a775f3dcc15921c7657e0 files/kde-np.pam 379
@@ -118,6 +118,9 @@ SHA256 bab26c70517b86d93423ea2c73e6ba85c14df1e317b0b91d5ed7aef4db736e78 files/ko
 MD5 568485759876c71e1165233732805315 files/konsole-3.5.1-detach-send2all.patch 951
 RMD160 e299f233a2960feb34ceea378ce80e09bebfbf33 files/konsole-3.5.1-detach-send2all.patch 951
 SHA256 7502f1ff32ccdd0d1570b51cee2c3519e490b10654485f7b4d200d4f41f91962 files/konsole-3.5.1-detach-send2all.patch 951
+MD5 eda269a8bc07c3484024540b83dba9ff files/kwin-3.5.1-systray.patch 819
+RMD160 2528e57a17fe4eddd9cdf94da308059c799ca0ab files/kwin-3.5.1-systray.patch 819
+SHA256 e2c29c5abfd7f744b290553a341eac5975cb4dd84db1f9a3bb9844a86037b2d4 files/kwin-3.5.1-systray.patch 819
 MD5 42226b3baf60c509e74036e7bb7a7b4e files/kxkb3.5.1.xx_XX_layouts.patch 806
 RMD160 9c0f77dd658e01795ad4ec0fa7ed11fcb2218af1 files/kxkb3.5.1.xx_XX_layouts.patch 806
 SHA256 fd3010f128ad54327558857135d0ab8f814b2e88cb4fb99086b4ac831c7dc83d files/kxkb3.5.1.xx_XX_layouts.patch 806
@@ -160,16 +163,12 @@ SHA256 86ac748dccd7b740709cb0cf1af1562f49eb7e1c35ce93a30a0d3c9a240c1c02 kdebase-
 MD5 d6e6b2323b7bc9ee1450d4448309e2c1 kdebase-3.5.1-r2.ebuild 5261
 RMD160 95bcc498b44b07622323891bcc5b2f1080475f7f kdebase-3.5.1-r2.ebuild 5261
 SHA256 18db3073793203879f530eacdc10f15de58e4836acc5e8e4c5ac088aab207bf0 kdebase-3.5.1-r2.ebuild 5261
+MD5 eddf598fa840fc46d95e5208395a516f kdebase-3.5.1-r3.ebuild 5299
+RMD160 618e5ad877e1048a573e00f4c155d348cdd0443c kdebase-3.5.1-r3.ebuild 5299
+SHA256 b577a73a2a82cad7b9e0ad1e44df3963afbe3b69bda285089e2b3c1081830522 kdebase-3.5.1-r3.ebuild 5299
 MD5 e4b268e5fd737ffd4858993020e915ab kdebase-3.5.1.ebuild 5116
 RMD160 29a90af9ace387020879187c1dd7580661e4ea0d kdebase-3.5.1.ebuild 5116
 SHA256 18607df8898fa044582cca3d40cb94ba255991b3398183dbe9aaeda5f8eca714 kdebase-3.5.1.ebuild 5116
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD/0KBAiZjviIA2XgRAjq4AKDoK9eN143/1Gc9yA/jK1ogu8w9mwCgqWAF
-MsksXJEIGG8tWWqvc+/dOvY=
-=2mpy
------END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.1-r3 b/kde-base/kdebase/files/digest-kdebase-3.5.1-r3
new file mode 100644
index 000000000000..5df56523fdfb
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.1-r3
@@ -0,0 +1,6 @@
+MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
+RMD160 c7e8356d2f46d2fd3a0e7e25f661843f09ff1296 kdebase-3.5.0-patches-1.tar.bz2 4654
+SHA256 599e92f2c488fef6fcd6f337b952e6ce72b27576df37dcb4b86f0961eb26e617 kdebase-3.5.0-patches-1.tar.bz2 4654
+MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
+RMD160 5308bfe188f49815e68392b2f3a48e7def34dee0 kdebase-3.5.1.tar.bz2 23587827
+SHA256 f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kdebase/files/kwin-3.5.1-systray.patch b/kde-base/kdebase/files/kwin-3.5.1-systray.patch
new file mode 100644
index 000000000000..76f623945870
--- /dev/null
+++ b/kde-base/kdebase/files/kwin-3.5.1-systray.patch
@@ -0,0 +1,19 @@
+*** kdebase-3.5.1.orig/kwin/events.cpp	2006-01-20 03:31:07.000000000 +1030
+--- kdebase-3.5.1/kwin/events.cpp	2006-02-28 08:48:32.000000000 +1030
+***************
+*** 324,337 ****
+              }
+          case MapNotify:
+              {
+- #if KDE_IS_VERSION( 3, 9, 90 )
+- #warning Consider dumping this workaround.
+- #endif
+-             // See bug #100177, especially comments #6 and #14. This workaround shouldn't be
+-             // necessary when X.org with that fix becomes available and it's an unnecessary
+-             // X roundtrip for an experimental unstable feature.
+-             if( addSystemTrayWin( e->xmap.window ))
+-                 return true;
+              return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt
+              }
+          case ReparentNotify:
+--- 324,329 ----
diff --git a/kde-base/kdebase/kdebase-3.5.1-r3.ebuild b/kde-base/kdebase/kdebase-3.5.1-r3.ebuild
new file mode 100644
index 000000000000..0f3b31d9012a
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.5.1-r3.ebuild
@@ -0,0 +1,173 @@
+# 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.1-r3.ebuild,v 1.1 2006/02/28 22:47:52 flameeyes Exp $
+
+inherit kde-dist eutils flag-o-matic
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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 )"
+
+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-misc/xkeyboard-config x11-misc/xkbdata )
+			x11-apps/setxkbmap
+		) virtual/x11 )
+	xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			x11-libs/libXdamage
+			) <=x11-base/xorg-x11-6.9 )
+		)
+	xscreensaver? ( || ( x11-libs/libXScrnSaver virtual/x11 ) )
+	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
+
+DEPEND="${DEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			x11-proto/damageproto
+			) <=x11-base/xorg-x11-6.9 )
+		)
+	xscreensaver? ( || ( x11-proto/scrnsaverproto virtual/x11 ) )
+	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kxkb3.5.1.xx_XX_layouts.patch
+	${FILESDIR}/kdebase-3.5.1-kicker.patch
+	${FILESDIR}/konsole-3.5.1-detach-send2all.patch
+	${FILESDIR}/kwin-3.5.1-systray.patch"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
+
+	# Avoid using imake (kde bug 114466).
+	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+
+	# For the noimake patch.
+	make -f admin/Makefile.common || die
+}
+
+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
+}