Wed Nov 19 23:07:17 UTC 2008

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22548

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.1.2-ldap.patch 
	kdebase-workspace-4.1.65-consolekit-kdm.patch 
	kdebase-workspace-4.1.72-plasma-konsole.patch 
	kdebase-workspace-4.1.72-redhat-startkde.patch 
	kdebase-workspace-4.1.80-session-button.patch 
Removed Files:
	kdebase-workspace-4.0.72-klipper-url.patch 
	kdebase-workspace-4.0.72-plasma-konsole.patch 
	kdebase-workspace-4.0.85-plasma-default-wallpaper.patch 
	kdebase-workspace-4.0.98-consolekit-kdm.patch 
	kdebase-workspace-4.0.98-kickoff-suspend.patch 
	kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch 
	kdebase-workspace-4.1.0-kde#152914.patch 
	kdebase-workspace-4.1.0-plasma-tooltips.patch 
	kdebase-workspace-4.1.2-multihead.patch 
	kdebase-workspace-4.1.2-panel-autohide-866998.patch 
	kdebase-workspace-4.1.2-panel-autohide-868231.patch 
	kdebase-workspace-4.1.2-panel-autohide-869277.patch 
	kdebase-workspace-4.1.2-panel-autohide-871058.patch 
	kdebase-workspace-4.1.2-panel-autohide-coords.patch 
	kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch 
	kdebase-workspace-4.1.2-redhat-startkde.patch 
	kdebase-workspace-4.1.2-session-button.patch 
Log Message:
- merged
- drop kdebase-workspace-4.1.2-kdm-i18n.patch, it's included in upstream
- drop kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, it's included in upstream
- add kdebase-workspace-4.1.80-session-button.patch
- add kdebase-workspace-4.1.2-ldap.patch



kdebase-workspace-4.1.2-ldap.patch:

--- NEW FILE kdebase-workspace-4.1.2-ldap.patch ---
diff -up kdebase-workspace-4.1.2/kcontrol/kdm/CMakeLists.txt.ldap kdebase-workspace-4.1.2/kcontrol/kdm/CMakeLists.txt
--- kdebase-workspace-4.1.2/kcontrol/kdm/CMakeLists.txt.ldap	2008-11-04 18:09:52.000000000 +0100
+++ kdebase-workspace-4.1.2/kcontrol/kdm/CMakeLists.txt	2008-11-04 18:17:11.000000000 +0100
@@ -27,7 +27,7 @@ set(kcm_kdm_PART_SRCS ${kcmbackgroundlib
 kde4_add_plugin(kcm_kdm ${kcm_kdm_PART_SRCS})
 
 
-target_link_libraries(kcm_kdm ${KDE4_KDE3SUPPORT_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_KNEWSTUFF2_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kcm_kdm ${KDE4_KDE3SUPPORT_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_KNEWSTUFF2_LIBS} ${X11_LIBRARIES} -lldap)
 
 install(TARGETS kcm_kdm  DESTINATION ${PLUGIN_INSTALL_DIR})
 

kdebase-workspace-4.1.65-consolekit-kdm.patch:

--- NEW FILE kdebase-workspace-4.1.65-consolekit-kdm.patch ---
diff -Nrup kdebase.broken/workspace/cmake/modules/FindCkConnector.cmake kdebase/workspace/cmake/modules/FindCkConnector.cmake
--- kdebase.broken/workspace/cmake/modules/FindCkConnector.cmake	1969-12-31 19:00:00.000000000 -0500
+++ kdebase/workspace/cmake/modules/FindCkConnector.cmake	2008-09-09 19:51:12.000000000 -0400
@@ -0,0 +1,58 @@
+# - Try to find the ConsoleKit connector library (libck-connector)
+# Once done this will define
+#
+#  CKCONNECTOR_FOUND - system has the CK Connector
+#  CKCONNECTOR_INCLUDE_DIR - the CK Connector include directory
+#  CKCONNECTOR_LIBRARIES - The libraries needed to use CK Connector
+
+# Copyright (c) 2008, Kevin Kofler, <kevin.kofler at chello.at>
+# modeled after FindLibArt.cmake:
+# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES)
+
+  # in cache already
+  SET(CKCONNECTOR_FOUND TRUE)
+
+else (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES)
+
+  IF (NOT WIN32)
+    INCLUDE(UsePkgConfig)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    PKGCONFIG(ck-connector _ckConnectorIncDir _ckConnectorLinkDir _ckConnectorLinkFlags _ckConnectorCflags)
+  ENDIF (NOT WIN32)
+
+  FIND_PATH(CKCONNECTOR_INCLUDE_DIR ck-connector.h
+     ${_ckConnectorIncDir}/ConsoleKit/ck-connector
+     ${_ckConnectorIncDir}
+  )
+
+  FIND_LIBRARY(CKCONNECTOR_LIBRARIES NAMES ck-connector
+     PATHS
+     ${_ckConnectorLinkDir}
+  )
+
+
+  if (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES)
+     set(CKCONNECTOR_FOUND TRUE)
+  endif (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES)
+
+
+  if (CKCONNECTOR_FOUND)
+     if (NOT CkConnector_FIND_QUIETLY)
+        message(STATUS "Found ck-connector: ${CKCONNECTOR_LIBRARIES}")
+     endif (NOT CkConnector_FIND_QUIETLY)
+  else (CKCONNECTOR_FOUND)
+     if (CkConnector_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find ck-connector")
+     endif (CkConnector_FIND_REQUIRED)
+  endif (CKCONNECTOR_FOUND)
+
+  MARK_AS_ADVANCED(CKCONNECTOR_INCLUDE_DIR CKCONNECTOR_LIBRARIES)
+
+endif (CKCONNECTOR_INCLUDE_DIR AND CKCONNECTOR_LIBRARIES)
diff -Nrup kdebase.broken/workspace/cmake/modules/FindDBus.cmake kdebase/workspace/cmake/modules/FindDBus.cmake
--- kdebase.broken/workspace/cmake/modules/FindDBus.cmake	1969-12-31 19:00:00.000000000 -0500
+++ kdebase/workspace/cmake/modules/FindDBus.cmake	2008-09-09 19:51:12.000000000 -0400
@@ -0,0 +1,39 @@
+
+if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+	# Already in cache, be silent
+	set(DBUS_FIND_QUIETLY TRUE)	
+endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+
+set(DBUS_LIBRARY)
+set(DBUS_INCLUDE_DIR)
+set(DBUS_ARCH_INCLUDE_DIR)
+
+FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h
+	/usr/include
+	/usr/include/dbus-1.0
+	/usr/local/include
+)
+
+FIND_PATH(DBUS_ARCH_INCLUDE_DIR dbus/dbus-arch-deps.h
+	/usr/lib${LIB_SUFFIX}/include
+	/usr/lib${LIB_SUFFIX}/dbus-1.0/include
+	/usr/lib64/include
+	/usr/lib64/dbus-1.0/include
+	/usr/lib/include
+	/usr/lib/dbus-1.0/include
+)
+
+FIND_LIBRARY(DBUS_LIBRARY NAMES dbus-1 dbus
+	PATHS
+	/usr/lib
+	/usr/local/lib
+)
+
+if(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+   MESSAGE( STATUS "dbus found: includes in ${DBUS_INCLUDE_DIR}, library in ${DBUS_LIBRARY}")
+   set(DBUS_FOUND TRUE)
+else(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+   MESSAGE( STATUS "dbus not found")
+endif(DBUS_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_ARCH_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(DBUS_INCLUDE_DIR DBUS_LIBRARY DBUS_ARCH_INCLUDE_DIR)
diff -Nrup kdebase.broken/workspace/kdm/backend/client.c kdebase/workspace/kdm/backend/client.c
--- kdebase.broken/workspace/kdm/backend/client.c	2008-09-09 19:44:10.000000000 -0400
+++ kdebase/workspace/kdm/backend/client.c	2008-09-09 19:51:12.000000000 -0400
@@ -1180,7 +1180,11 @@ sendMsg( int lv, const char *msg, ... )
 */
 
 int
+#ifdef HAVE_CKCONNECTOR
+startClient( volatile int *pid, const char *ck_session_cookie )
+#else
 startClient( volatile int *pid )
+#endif
 {
 	const char *home, *sessargs, *desksess;
 	char **env, *xma;
@@ -1269,6 +1273,11 @@ startClient( volatile int *pid )
 	if (krbtkfile[0] != '\0')
 		env = setEnv( env, "KRBTKFILE", krbtkfile );
 #endif
+#ifdef HAVE_CKCONNECTOR
+	if (ck_session_cookie != NULL) {
+		env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
+	}
+#endif
 	userEnviron = inheritEnv( env, envvars );
 	env = systemEnv( 0, curuser );
 	systemEnviron = setEnv( env, "HOME", p->pw_dir );
diff -Nrup kdebase.broken/workspace/kdm/backend/CMakeLists.txt kdebase/workspace/kdm/backend/CMakeLists.txt
--- kdebase.broken/workspace/kdm/backend/CMakeLists.txt	2008-09-09 19:44:10.000000000 -0400
+++ kdebase/workspace/kdm/backend/CMakeLists.txt	2008-09-09 19:51:12.000000000 -0400
@@ -60,6 +60,10 @@ target_link_libraries( kdm
 	${SOCKET_LIBRARIES}
 	${RESOLV_LIBRARIES}
 )
+if (CKCONNECTOR_FOUND)
+	include_directories(${CKCONNECTOR_INCLUDE_DIR} ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
+	target_link_libraries( kdm ${CKCONNECTOR_LIBRARIES} ${DBUS_LIBRARY} )
+endif (CKCONNECTOR_FOUND)
 if(UTIL_LIBRARIES)
 	target_link_libraries( kdm ${UTIL_LIBRARIES} )
 endif(UTIL_LIBRARIES)
diff -Nrup kdebase.broken/workspace/kdm/backend/dm.h kdebase/workspace/kdm/backend/dm.h
--- kdebase.broken/workspace/kdm/backend/dm.h	2008-09-09 19:44:10.000000000 -0400
+++ kdebase/workspace/kdm/backend/dm.h	2008-09-09 19:51:12.000000000 -0400
@@ -504,7 +504,11 @@ char **gRecvArgv( void );
 #define GCONV_BINARY  5
 typedef char *(*GConvFunc)( int what, const char *prompt );
 int verify( GConvFunc gconv, int rootok );
+#ifdef HAVE_CKCONNECTOR
+int startClient( volatile int *pid, const char *ck_session_cookie );
+#else
 int startClient( volatile int *pid );
+#endif
 void clientExited( void );
 void sessionExit( int status ) ATTR_NORETURN;
 int readDmrc( void );
diff -Nrup kdebase.broken/workspace/kdm/backend/session.c kdebase/workspace/kdm/backend/session.c
--- kdebase.broken/workspace/kdm/backend/session.c	2008-09-09 19:44:10.000000000 -0400
+++ kdebase/workspace/kdm/backend/session.c	2008-09-09 19:56:54.000000000 -0400
@@ -45,6 +45,14 @@ from the copyright holder.
 #include <ctype.h>
 #include <signal.h>
 
+#ifdef HAVE_CKCONNECTOR
+#include <ck-connector.h>
+#include <dbus/dbus.h>
+/* for getpwnam */
+#include <sys/types.h>
+#include <pwd.h>
+#endif
+
 struct display *td;
 const char *td_setup = "auto";
 
@@ -553,6 +561,19 @@ manageSession( void )
 	volatile time_t tdiff = 0;
 	sigset_t ss;
 
+#ifdef HAVE_CKCONNECTOR
+        DBusError error;
+        CkConnector *connector;
+        char *ck_session_cookie;
+        struct passwd *pwent;
+        char devicebuf[20] = "";
+        char *device = devicebuf;
+        dbus_bool_t is_local;
+#ifdef XDMCP
+        char *remote_host_name = "";
+#endif
+#endif
+
 	debug( "manageSession %s\n", td->name );
 	if ((ex = Setjmp( abortSession ))) {
 		closeGreeter( True );
@@ -627,7 +648,57 @@ manageSession( void )
 	if (td_setup)
 		setupDisplay( td_setup );
 
+#ifdef HAVE_CKCONNECTOR
+#ifdef HAVE_VTS
+	if (td->serverVT > 0) {
+		/* FIXME: how does xorg construct this */
+		sprintf(device, "/dev/tty%d", td->serverVT);
+	}	
+#endif
+
+	pwent = getpwnam(curuser);
+	if (pwent == NULL) {
+		debug ("NULL user\n");
+		ck_session_cookie = NULL;
+	} else {
+		connector = ck_connector_new ();
+		if (connector != NULL) {
+			is_local = ((td->displayType & d_location) == dLocal);
+#ifdef XDMCP
+			if (!is_local && td->remoteHost)
+				remote_host_name = td->remoteHost;
+#endif
+
+			dbus_error_init (&error);
+			if ( !(ck_connector_open_session_with_parameters (connector,
+				&error, "unix-user", &(pwent->pw_uid),
+				"x11-display-device", &device,
+				"x11-display", &(td->name),
+				"is-local", &is_local,
+#ifdef XDMCP
+				"remote-host-name", &remote_host_name,
+#endif
+				NULL))) {
+				if (dbus_error_is_set (&error)) {
+					logError( "ConsoleKit open: %s\n", error.message);
+					dbus_error_free (&error);
+				} else {
+					logError("cannot open CK session: OOM, D-Bus system bus not available,\n"
+						"ConsoleKit not available or insufficient privileges.\n");
+				}
+				ck_connector_unref (connector);
+				sessionExit( EX_NORMAL );
+			}
+		} else {
+			debug ("OOM creating CkConnector\n");
+			sessionExit( EX_NORMAL );
+		}
+		ck_session_cookie = ck_connector_get_cookie (connector);
+	}
+	if (!startClient( &clientPid, ck_session_cookie )) {
+#else
 	if (!startClient( &clientPid )) {
+#endif
 		logError( "Client start failed\n" );
 		sessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */
 	}
@@ -649,6 +720,23 @@ manageSession( void )
 				catchTerm( SIGTERM );
 		}
 	}
+
+/* close consolekit session */
+#ifdef HAVE_CKCONNECTOR
+	if (ck_session_cookie != NULL) {
+		dbus_error_init (&error);
+		if (! ck_connector_close_session (connector, &error)) {
+			if (dbus_error_is_set (&error)) {
+				logError ("ConsoleKit close: %s\n", error.message);
+				 dbus_error_free (&error);
+			} else {
+				logError ("Cannot close CK session: OOM, D-Bus system bus not available,\n"
+				"ConsoleKit not available or insufficient privileges.\n");
+			}
+		}
+		ck_connector_unref (connector);
+	}
+#endif
 	/*
 	 * Sometimes the Xsession somehow manages to exit before
 	 * a server crash is noticed - so we sleep a bit and wait
diff -Nrup kdebase.broken/workspace/kdm/backend/xdmcp.c kdebase/workspace/kdm/backend/xdmcp.c
--- kdebase.broken/workspace/kdm/backend/xdmcp.c	2008-09-09 19:44:10.000000000 -0400
+++ kdebase/workspace/kdm/backend/xdmcp.c	2008-09-09 19:51:12.000000000 -0400
@@ -1016,6 +1016,8 @@ manage( struct sockaddr *from, int froml
 			d->clientAddr = clientAddress;
 			d->clientPort = clientPort;
 			d->connectionType = connectionType;
+			d->remoteHost = networkAddressToHostname (pdpy->connectionType,
+				&pdpy->connectionAddress);
 			if (pdpy->fileAuthorization) {
 				d->authorizations = (Xauth **)Malloc( sizeof(Xauth *) );
 				if (!d->authorizations) {
diff -Nrup kdebase.broken/workspace/kdm/CMakeLists.txt kdebase/workspace/kdm/CMakeLists.txt
--- kdebase.broken/workspace/kdm/CMakeLists.txt	2008-09-09 19:44:10.000000000 -0400
+++ kdebase/workspace/kdm/CMakeLists.txt	2008-09-09 19:51:12.000000000 -0400
@@ -4,6 +4,17 @@ include_directories( BEFORE ${CMAKE_CURR
 install_pam_service(KDM)
 
 include(ConfigureChecks.cmake)
+
+macro_optional_find_package(CkConnector)
+if(CKCONNECTOR_FOUND)
+  # when building with libck-connector, we also need the low-level D-Bus API
+  find_package(DBus REQUIRED)
+endif(CKCONNECTOR_FOUND)
+
+macro_log_feature(CKCONNECTOR_FOUND "ck-connector" "The ConsoleKit connector library" "http://freedesktop.org/wiki/Software/ConsoleKit" FALSE "" "Provides ConsoleKit integration in KDM")
+
+macro_bool_to_01(CKCONNECTOR_FOUND HAVE_CKCONNECTOR)
+
 configure_file(config-kdm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdm.h)
 
 install( FILES README DESTINATION ${DATA_INSTALL_DIR}/doc/kdm )
diff -Nrup kdebase.broken/workspace/kdm/config-kdm.h.cmake kdebase/workspace/kdm/config-kdm.h.cmake
--- kdebase.broken/workspace/kdm/config-kdm.h.cmake	2008-09-09 19:44:10.000000000 -0400
+++ kdebase/workspace/kdm/config-kdm.h.cmake	2008-09-09 19:51:12.000000000 -0400
@@ -123,6 +123,9 @@
 /* Define to 1 if you have the <termios.h> header file. */
 #cmakedefine HAVE_TERMIOS_H 1
 
+/* Define to 1 if the ck-connector library is found */
+#cmakedefine HAVE_CKCONNECTOR 1
+
 /* $PATH defaults set by KDM */
 #cmakedefine KDM_DEF_USER_PATH "${KDM_DEF_USER_PATH}"
 #cmakedefine KDM_DEF_SYSTEM_PATH "${KDM_DEF_SYSTEM_PATH}"

kdebase-workspace-4.1.72-plasma-konsole.patch:

--- NEW FILE kdebase-workspace-4.1.72-plasma-konsole.patch ---
diff -Naur kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.cpp kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.cpp	2008-11-04 18:12:35.000000000 +0100
+++ kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.cpp	2008-11-10 21:59:00.000000000 +0100
@@ -41,6 +41,7 @@
 #include <KRun>
 #include <KStandardDirs>
 #include <KWindowSystem>
+#include <KProcess>
 
 #include <Plasma/Corona>
 #include <Plasma/Animator>
@@ -63,6 +64,7 @@
       m_lockDesktopAction(0),
       m_appletBrowserAction(0),
       m_addPanelAction(0),
+      m_runKonsoleAction(0),
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
@@ -132,6 +134,13 @@
     krunner.display();
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KProcess proc;
+    proc << KStandardDirs::locate("exe", "konsole");
+    proc.execute();
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -161,6 +170,10 @@
         connect(m_addPanelAction, SIGNAL(triggered(bool)), this, SLOT(addPanel()));
         m_addPanelAction->setIcon(KIcon("list-add"));
 
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
         m_runCommandAction->setIcon(KIcon("system-run"));
@@ -186,6 +199,8 @@
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }
diff -Naur kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.h kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.1.72/plasma/containments/desktop/desktop.h	2008-11-04 18:12:35.000000000 +0100
+++ kdebase-workspace-4.1.72.plasma-konsole/plasma/containments/desktop/desktop.h	2008-11-10 21:59:00.000000000 +0100
@@ -70,6 +70,7 @@
     void dropEvent(QGraphicsSceneDragDropEvent *event);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
 
     void lockScreen();
@@ -88,6 +89,7 @@
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
     QAction *m_addPanelAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;

kdebase-workspace-4.1.72-redhat-startkde.patch:

--- NEW FILE kdebase-workspace-4.1.72-redhat-startkde.patch ---
diff -Naur kdebase-workspace-4.1.72/startkde.cmake kdebase-workspace-4.1.72.redhat-startkde/startkde.cmake
--- kdebase-workspace-4.1.72/startkde.cmake	2008-07-22 02:03:28.000000000 +0200
+++ kdebase-workspace-4.1.72.redhat-startkde/startkde.cmake	2008-11-10 21:54:47.000000000 +0100
@@ -19,37 +19,21 @@
         exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#103D77"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
 unset DYLD_FORCE_FLAT_NAMESPACE
 
 # Enable lightweight memory corruption checker
-MALLOC_CHECK_=2 
+MALLOC_CHECK_=2
 export MALLOC_CHECK_
 
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
-  qbindir=`$bindir/kde4-config --qt-binaries`
-  if [ -n "$qbindir" ]; then
-    case $PATH in
-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-      *) PATH=$qbindir:$PATH; export PATH;;
-    esac
-  fi
-  case $PATH in
-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-    *) PATH=$bindir:$PATH; export PATH;;
-  esac
-fi
-
 # Boot sequence:
 #
 # kdeinit is used to fork off processes which improves memory usage
@@ -87,6 +71,13 @@
 kcmfonts General forceFontDPI 0
 kdeglobals Locale Language '' # trigger requesting languages from KLocale
 EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+  then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+       if [ -n "$Theme" ]
+         then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+       fi
+fi
 kstartupconfig4
 if test $? -ne 0; then
     xmessage -geometry 500x100 "Could not start kstartupconfig4. Check your installation."
@@ -206,8 +197,9 @@
 # better use the Autostart folder.
 
 libpath=`kde4-config --path lib | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
   for file in "$prefix"*.sh; do
     test -r "$file" && . "$file"
   done
@@ -390,11 +382,11 @@
 # if KDEWM is not set, ksmserver will ensure kwin is started.
 # kwrapper4 is used to reduce startup time and memory usage
 # kwrapper4 does not return useful error codes such as the exit code of ksmserver.
-# We only check for 255 which means that the ksmserver process could not be 
-# started, any problems thereafter, e.g. ksmserver failing to initialize, 
+# We only check for 255 which means that the ksmserver process could not be
+# started, any problems thereafter, e.g. ksmserver failing to initialize,
 # will remain undetected.
 test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
-kwrapper4 ksmserver $KDEWM 
+kwrapper4 ksmserver $KDEWM
 if test $? -eq 255; then
   # Startup error
   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
@@ -420,7 +412,8 @@
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done

kdebase-workspace-4.1.80-session-button.patch:

--- NEW FILE kdebase-workspace-4.1.80-session-button.patch ---
diff -up kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp.orig kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp
--- kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp.orig	2008-11-19 23:44:43.000000000 +0100
+++ kdebase-workspace-4.1.80/kdm/kfrontend/kgreeter.cpp	2008-11-19 23:45:55.000000000 +0100
@@ -520,10 +520,12 @@ KGreeter::setPrevWM( QAction *wm )
 	if (curPrev != wm) {
 		if (curPrev)
 			curPrev->setText( sessionTypes[curPrev->data().toInt()].name );
-		if (wm)
+		if (wm) {
 			wm->setText( i18nc( "@item:inmenu session type",
 			                    "%1 (previous)",
 			                    sessionTypes[wm->data().toInt()].name ) );
+			wm->toggle();
+		}
 		curPrev = wm;
 	}
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	26 Sep 2008 19:40:20 -0000	1.20
+++ .cvsignore	19 Nov 2008 23:06:46 -0000	1.21
@@ -1 +1,2 @@
 kdebase-workspace-4.1.2.tar.bz2
+kdebase-workspace-4.1.80.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- kdebase-workspace.spec	2 Nov 2008 09:07:27 -0000	1.131
+++ kdebase-workspace.spec	19 Nov 2008 23:06:47 -0000	1.132
@@ -1,18 +1,17 @@
-%define _default_patch_fuzz 2
-
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.1.2
-Release: 10%{?dist}
+Version: 4.1.80
+
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdebase-workspace-4.1.2-redhat-startkde.patch
-Patch2: kdebase-workspace-4.0.98-consolekit-kdm.patch
-Patch3: kdebase-workspace-4.0.72-plasma-konsole.patch
+Patch1: kdebase-workspace-4.1.72-redhat-startkde.patch
+Patch2: kdebase-workspace-4.1.65-consolekit-kdm.patch
+Patch3: kdebase-workspace-4.1.72-plasma-konsole.patch
 Patch4: kdebase-workspace-4.1.1-show-systemsettings.patch
 Patch5: kdebase-workspace-4.0.72-ck-shutdown.patch
 #Â 434824: KDE4 System Settings - No Method To Enter Administrative Mode
@@ -20,53 +19,11 @@
 Patch7: kdebase-workspace-4.0.3-timedate-kcm.patch
 #Â 441062: packagekit tools do not show icons correctly on KDE
 Patch8: kdebase-workspace-4.0.3-krdb.patch
-# originally from plasma-4.0-openSUSE
-Patch9: kdebase-workspace-4.0.98-kickoff-suspend.patch
-Patch10: kdebase-workspace-4.0.72-klipper-url.patch
-# allows to define a default wallpaper via plasmarc:wallpaper
-Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch
-Patch12: kdebase-workspace-4.1.2-multihead.patch
-Patch13: kdebase-workspace-4.1.2-session-button.patch
+Patch9: kdebase-workspace-4.0.72-klipper-url.patch
+Patch10: kdebase-workspace-4.1.80-session-button.patch
+Patch11: kdebase-workspace-4.1.2-ldap.patch
 
 # upstream patches:
-# backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
-# This is a cumulative patch from the following revisions/pairs: 833271:833299,
-# 833386, 833479:833545, 833581, 833587:833620, 834652, 836698, 837733, 837827.
-# This is backwards BC wrt 4.1, but the API of the new classes is not finalized.
-Patch100: kdebase-workspace-4.1.0-plasma-tooltips.patch
-# http://bugs.kde.org/152914
-Patch101: kdebase-workspace-4.1.0-kde#152914.patch
-# reenable KWin taskbarthumbnail effect (already done upstream in 4.2, was
-# disabled in 4.1 due to no tooltip support - see also Patch100)
-Patch102: kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch
-Patch103: kdebase-workspace-4.1.2-klipper-crash.patch
-
-# backport of panel autohide from KDE 4.2
-# from plasma-4.1-openSUSE: http://websvn.kde.org/?view=rev&revision=864493
-# Fedora changes:
-# * removed theme changes
-# * removed hunks from plasmacontroller.cpp which rename theme elements
-# * removed unrelated panelappletoverlay.cpp changes from
-#   http://websvn.kde.org/?view=rev&revision=857606 which need library changes
-Patch104: kdebase-workspace-4.1.2-panel-autohide.patch
-# panel autohide bugfixes
-# (use sed -i -e 's!plasma/shells/desktop!plasma/plasma!g' to backport):
-# http://websvn.kde.org/?view=rev&revision=866710
-# http://websvn.kde.org/?view=rev&revision=866715
-Patch105: kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch
-# http://websvn.kde.org/?view=rev&revision=866998
-Patch106: kdebase-workspace-4.1.2-panel-autohide-866998.patch
-# http://websvn.kde.org/?view=rev&revision=868231
-Patch107: kdebase-workspace-4.1.2-panel-autohide-868231.patch
-# http://websvn.kde.org/?view=rev&revision=869277
-Patch108: kdebase-workspace-4.1.2-panel-autohide-869277.patch
-# http://websvn.kde.org/?view=rev&revision=869882
-# http://websvn.kde.org/?view=rev&revision=869925
-# http://websvn.kde.org/?view=rev&revision=870041
-Patch109: kdebase-workspace-4.1.2-panel-autohide-coords.patch
-# http://websvn.kde.org/?view=rev&revision=871058
-Patch110: kdebase-workspace-4.1.2-panel-autohide-871058.patch
-# end panel autohide bugfixes
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -84,7 +41,7 @@
 Obsoletes: kdmtheme < 1.3
 
 BuildRequires: bluez-libs-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2
 BuildRequires: ConsoleKit-devel
 BuildRequires: glib2-devel
 BuildRequires: kde-filesystem >= 4
@@ -98,6 +55,12 @@
 BuildRequires: pam-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
+BuildRequires: openldap-devel
+BuildRequires: python-devel
+BuildRequires: PyKDE4-devel
+BuildRequires: PyQt4-devel
+BuildRequires: google-gadgets-devel
+BuildRequires: libusb-devel
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: kde-settings-kdm
@@ -105,7 +68,7 @@
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-# would much rather these deps be elsewhere, 
+# would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
 Requires: oxygen-icon-theme
@@ -128,7 +91,7 @@
 %endif
 
 %description
-The KDE Workspace consists of what is the desktop of the 
+The KDE Workspace consists of what is the desktop of the
 KDE Desktop Environment.
 
 This package contains:
@@ -156,16 +119,15 @@
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: kdelibs4 >= %{version}
-# out of paranoia really, may or may not be 100% essential.  -- Rex
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
 
-%package wallpapers 
-Summary: KDE wallpapers 
+%package wallpapers
+Summary: KDE wallpapers
 Group: User Interface/Desktops
 Requires: kde-filesystem
-%description wallpapers 
+%description wallpapers
 %{summary}.
 
 %package -n ksysguardd
@@ -174,10 +136,10 @@
 %description -n ksysguardd
 %{summary}.
 
-%package -n oxygen-cursor-themes 
-Summary: Oxygen cursor themes 
+%package -n oxygen-cursor-themes
+Summary: Oxygen cursor themes
 Group: User Interface/Desktops
-%description -n oxygen-cursor-themes 
+%description -n oxygen-cursor-themes
 %{summary}.
 
 
@@ -189,7 +151,7 @@
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
 # ConsoleKit support for KDM (#228111, #430388, kde#147790)
-%patch2 -p1 -b .consolekit
+%patch2 -p2 -b .consolekit
 %patch3 -p1 -b .plasma-konsole
 %patch4 -p1 -b .show-systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
@@ -199,23 +161,11 @@
 popd
 %patch7 -p0 -b .timedate-kcm
 %patch8 -p0 -b .krdb
-%patch9 -p1 -b .kickoff-suspend
-%patch10 -p1 -b .klipper-url
-%patch11 -p1 -b .plasma-default-wallpaper
-%patch12 -p1 -b .multihead
-%patch13 -p1 -b .session-button
+%patch9 -p1 -b .klipper-url
+%patch10 -p1 -b .session-button
+%patch11 -p1 -b .ldap
 
 # upstream patches
-%patch100 -p1 -b .plasma-tooltips
-%patch102 -p0 -b .kwin-taskbarthumbnail
-%patch103 -p0 -b .klipper-crash
-%patch104 -p0 -b .panel-autohide
-%patch105 -p0 -b .panel-autohide2
-%patch106 -p0 -b .panel-autohide3
-%patch107 -p0 -b .panel-autohide4
-%patch108 -p0 -b .panel-autohide5
-%patch109 -p0 -b .panel-autohide6
-%patch110 -p0 -b .panel-autohide7
 
 
 %build
@@ -234,7 +184,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # xsession support
 mkdir -p %{buildroot}%{_datadir}/xsessions/
@@ -256,6 +206,8 @@
 for i in lib*.so
 do
   case "$i" in
+    libplasma_applet-system-monitor.so)
+      ;;
     libkdeinit*.so)
       ;;
     # leave libworkspace.so for kate
@@ -263,6 +215,7 @@
       linktarget=`readlink "$i"`
       ln -sf "../../$linktarget" "kde4/devel/$i"
       ;;
+    #
     *)
       linktarget=`readlink "$i"`
       rm -f "$i"
@@ -306,6 +259,7 @@
 %{_kde4_datadir}/autostart/*
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/xsessions/*
 %{_kde4_docdir}/HTML/en/*
@@ -327,6 +281,7 @@
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %exclude %{_kde4_libdir}/libkdeinit*.so
 
 %files wallpapers
@@ -353,6 +308,44 @@
 
 
 %changelog
+* Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+- drop kdebase-workspace-4.1.2-kdm-i18n.patch, it's included in upstream
+- drop kdebase-workspace-4.0.85-plasma-default-wallpaper.patch, it's included in upstream
+- add kdebase-workspace-4.1.80-session-button.patch
+- add kdebase-workspace-4.1.2-ldap.patch
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+- drop _default_patch_fuzz 2
+- rebase startkde patch
+- rebase plasma-konsole patch
+- rebase ck-shutdown patch
+- add PyKDE4-devel, python-devel and PyQt4-devel to build plasma's python
+  scripting interface
+- BR google-gadgets-devel for google gadgets scriptengine
+- BR libusb-devel for Logitech USB support in KControl
+
+* Thu Nov 13 2008 Than Ngo <than at redhat.com>Â 4.1.3-5
+- apply upstream patch to fix X crash when disabling compositing
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
+* Fri Nov 07 2008 Than Ngo <than at redhat.com> 4.1.2-14
+- only omit battery applet when guidance-power-manager is installed
+
+* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-13
+- omit battery applet from default panel
+
+* Wed Nov 05 2008 Than Ngo <than at redhat.com> 4.1.2-12
+- fix i18n issue in kdm
+
+* Tue Nov 04 2008 Than Ngo <than at redhat.com> 4.1.2-11
+- add workaround for ldap issue (#457638)
+
 * Sun Nov 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-10
 - never touch PATH in startkde, prepending $QTDIR/bin is unnecessary on Fedora
   and breaks locating Qt 3 Assistant and other Qt 3 stuff (startkde gets run
@@ -664,7 +657,7 @@
 - Obsoletes: kdmtheme
 
 * Mon Dec 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-3
-- Requires: coreutils dbus-x11 xorg-x11-apps xorg-x11-utils 
+- Requires: coreutils dbus-x11 xorg-x11-apps xorg-x11-utils
             xorg-x11-server-utils (used in startkde)
 - drop pam configs that were previously moved to kde-settings
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	26 Sep 2008 19:40:20 -0000	1.23
+++ sources	19 Nov 2008 23:06:47 -0000	1.24
@@ -1 +1 @@
-b1f72c7c4e597e993669d625b26b4470  kdebase-workspace-4.1.2.tar.bz2
+f888e534b13c37c393b01122499d41f9  kdebase-workspace-4.1.80.tar.bz2


--- kdebase-workspace-4.0.72-klipper-url.patch DELETED ---


--- kdebase-workspace-4.0.72-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.0.85-plasma-default-wallpaper.patch DELETED ---


--- kdebase-workspace-4.0.98-consolekit-kdm.patch DELETED ---


--- kdebase-workspace-4.0.98-kickoff-suspend.patch DELETED ---


--- kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch DELETED ---


--- kdebase-workspace-4.1.0-kde#152914.patch DELETED ---


--- kdebase-workspace-4.1.0-plasma-tooltips.patch DELETED ---


--- kdebase-workspace-4.1.2-multihead.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-866998.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-868231.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-869277.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-871058.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-coords.patch DELETED ---


--- kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch DELETED ---


--- kdebase-workspace-4.1.2-redhat-startkde.patch DELETED ---


--- kdebase-workspace-4.1.2-session-button.patch DELETED ---


