Hello community,
here is the log from the commit of package kdebase3
checked in at Mon Oct 30 17:59:03 CET 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-10-29 07:49:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-30 16:28:24.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Oct 30 16:28:05 CET 2006 - coolo@suse.de
+
+- don't install your own xdm-xp (#192400)
+
+-------------------------------------------------------------------
+Mon Oct 30 11:05:35 CET 2006 - coolo@suse.de
+
+- update kdm patch to make it quilt ready
+- update kickoff.diff for suspend (#215065)
+- update 3.5 branch diff to fix
+ - "set as wallpaper" does not work (#215286)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.o9IGaj/_old 2006-10-30 17:58:31.000000000 +0100
+++ /var/tmp/diff_new_pack.o9IGaj/_new 2006-10-30 17:58:31.000000000 +0100
@@ -52,7 +52,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 27
+Release: 28
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -116,7 +116,7 @@
Patch72: kdm-all-users-nopass.diff
Patch73: kdm-session-names.diff
Patch74: kdm-sysconfig-values.diff
-# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@583746 $BASE/branches/work/coolos_kdm
+# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@599257 $BASE/branches/work/coolos_kdm | sed -e "s,^+++ ,+++ kdm/"
Patch75: kdm-make_it_cool.diff
Patch76: kdm-admin-mode.diff
Patch77: kdm-suspend-hal.diff
@@ -162,7 +162,7 @@
Patch157: kcmsamba_log.diff
Patch160: khelpcenter-localindices.patch
Patch161: applet-lock-logout.diff
-# svn branches/KDE/3.5/kdebase/kicker@594132 branches/work/suse_kickoff/kicker
+# svn diff $BASE/branches/KDE/3.5/kdebase/kicker@594132 $BASE/branches/work/suse_kickoff/kicker
Patch162: kickoff.diff
# svn diff branches/KDE/3.5/kdebase/kcontrol@599309 branches/work/suse_kickoff/kcontrol
# 599309
@@ -222,6 +222,7 @@
Provides: kdebase3:/opt/kde3/bin/kdm
Provides: kdebase:/opt/kde2/bin/kdm
Provides: kdebase3-kdm-SLD:/opt/kde3/bin/kdm
+Requires: xorg-x11
Group: System/GUI/KDE
PreReq: %fillup_prereq /bin/grep
@@ -367,7 +368,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 156
+Release: 157
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -420,9 +421,7 @@
%endif
%patch98
# all the kdm changes
-cd kdm
%patch75
-cd ..
%patch70
%patch71
%patch72
@@ -587,7 +586,6 @@
kde_post_install
install -m 0644 %SOURCE12 $RPM_BUILD_ROOT/opt/kde3/share/fonts/
%if %suse_version > 1010
-install -D -m 0644 %SOURCE14 $RPM_BUILD_ROOT/etc/pam.d/xdm-np
install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/etc/pam.d/kcheckpass
%else
install -D -m 0644 %SOURCE914 $RPM_BUILD_ROOT/etc/pam.d/xdm-np
@@ -1391,7 +1389,9 @@
/opt/kde3/%_lib/kde3/kgreet_classic.*
/opt/kde3/share/apps/kdm
%doc /opt/kde3/share/doc/kdm/README
+%if %suse_version < 1020
%config /etc/pam.d/xdm-np
+%endif
%config /etc/pam.d/kcheckpass
%dir /opt/kde3/share/config/kdm
%config /opt/kde3/share/config/kdm/kdmrc
@@ -1475,6 +1475,13 @@
%endif
%changelog -n kdebase3
+* Mon Oct 30 2006 - coolo@suse.de
+- don't install your own xdm-xp (#192400)
+* Mon Oct 30 2006 - coolo@suse.de
+- update kdm patch to make it quilt ready
+- update kickoff.diff for suspend (#215065)
+- update 3.5 branch diff to fix
+ - "set as wallpaper" does not work (#215286)
* Sun Oct 29 2006 - aj@suse.de
- Fix kdm-sysconfig-values.diff patch to fix build.
* Fri Oct 27 2006 - dmueller@suse.de
++++++ 3_5_BRANCH.diff ++++++
++++ 4422 lines (skipped)
++++ between KDE/kdebase3/3_5_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdebase3/3_5_BRANCH.diff
++++++ kdm-make_it_cool.diff ++++++
++++ 2086 lines (skipped)
++++ between KDE/kdebase3/kdm-make_it_cool.diff
++++ and /mounts/work_src_done/STABLE/kdebase3/kdm-make_it_cool.diff
++++++ kickoff.diff ++++++
--- /var/tmp/diff_new_pack.o9IGaj/_old 2006-10-30 17:58:37.000000000 +0100
+++ /var/tmp/diff_new_pack.o9IGaj/_new 2006-10-30 17:58:37.000000000 +0100
@@ -2549,7 +2549,7 @@
+}
--- kicker/ui/k_new_mnu.cpp
+++ kicker/ui/k_new_mnu.cpp
-@@ -0,0 +1,3877 @@
+@@ -0,0 +1,3990 @@
+/*****************************************************************
+
+ Copyright (c) 1996-2000 the kicker authors. See file AUTHORS.
@@ -3107,11 +3107,11 @@
+
+ if (e->type() == QEvent::FocusIn && receiver && raiseWidget) {
+ m_searchResultsWidget->setFocusPolicy(QWidget::StrongFocus);
-+ m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ?
++ m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ?
+ QWidget::StrongFocus : QWidget::NoFocus);
+ setTabOrder(raiseWidget, m_searchResultsWidget);
-+ if (raiseWidget != m_stacker->visibleWidget()
-+ && static_cast(receiver)->focusPolicy() == QWidget::NoFocus
++ if (raiseWidget != m_stacker->visibleWidget()
++ && static_cast(receiver)->focusPolicy() == QWidget::NoFocus
+ && m_stacker->id(raiseWidget) >= 0) {
+
+ raiseStackWidget(raiseWidget);
@@ -3487,7 +3487,7 @@
+ tab_bottom_right.width(),
+ tab->height() - tab_top_right.height() - tab_bottom_right.height() - bottom_margin,
+ tab_right_center );
-+
++
+ // top right corner
+ p.drawPixmap( tab->width() - tab_bottom_right.width(),
+ bottom_margin, tab_top_right );
@@ -4088,35 +4088,40 @@
+ i18n("Save current Session for next login"),
+ "kicker:/savesession", nId++, index++ );
+ }
-+ KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ),
-+ i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ );
-+ switchuser->setHasChildren(true);
++ if (DM().isSwitchable() && kapp->authorize("switch_user"))
++ {
++ KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ),
++ i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ );
++ switchuser->setHasChildren(true);
++ }
++
++ bool maysd = false;
++ if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
++ maysd = true;
+
-+ m_exitView->leftView()->insertSeparator( nId++, i18n("System"), index++ );
-+ m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ),
++ if ( maysd )
++ {
++ m_exitView->leftView()->insertSeparator( nId++, i18n("System"), index++ );
++ m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ),
+ i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ );
-+#ifdef KDELIBS_SUSE
-+#warning FIXME ask HAL if suspend is supported at all
-+ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to Disk" ),
-+ i18n( "Pause without logging out" ), "kicker:/suspend_disk", nId++, index++ );
+
-+ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to RAM" ),
-+ i18n( "Pause without logging out" ), "kicker:/suspend_ram", nId++, index++ );
-+#if 0
-+ i18n("Suspend Computer");
-+ m_exitView->leftView()->insertItem( "player_pause", i18n( "Standby" ),
-+ i18n( "Pause without logging out" ), "kicker:/standby", nId++, index++ );
-+#endif
-+#endif
-+ m_exitView->leftView()->insertItem( "reload", i18n( "Restart Computer" ),
-+ i18n( "Restart and boot this system" ),
-+// alternative: i18n("Restart and boot")
-+ "kicker:/restart", nId++, index++ );
-+
-+ KMenuItem *restart = m_exitView->leftView()->insertItem( "reload", i18n( "Start Operating System" ),
-+ i18n( "Restart and boot another operating system" ),
-+ "kicker:/restart/", nId++, index++ );
-+ restart->setHasChildren(true);
++ m_exitView->leftView()->insertItem( "reload", i18n( "Restart Computer" ),
++ i18n( "Restart and boot this system" ),
++ "kicker:/restart", nId++, index++ );
++
++ insertSuspendOption(nId, index);
++
++ int def, cur;
++ QStringList dummy_opts;
++ if ( DM().bootOptions( dummy_opts, def, cur ) )
++ {
++
++ KMenuItem *restart = m_exitView->leftView()->insertItem( "reload", i18n( "Start Operating System" ),
++ i18n( "Restart and boot another operating system" ),
++ "kicker:/restart/", nId++, index++ );
++ restart->setHasChildren(true);
++ }
++ }
+
+ index = 1;
+
@@ -4268,7 +4273,7 @@
+
+ addToHistory();
+
-+ if ( !logout && !lock )
++ if ( !logout && !lock )
+ {
+ // first try if we have any search action
+ if (m_searchResultsWidget->currentItem())
@@ -4910,7 +4915,7 @@
+ if (!bookmarkManager)
+ bookmarkManager = KBookmarkManager::userBookmarksManager();
+
-+ if (!m_search_plugin) {
++ if (!m_search_plugin) {
+ m_search_plugin_interface = new QObject( this, "m_search_plugin_interface" );
+ new MyKickoffSearchInterface( this, m_search_plugin_interface, "kickoffsearch interface" );
+ KTrader::OfferList offers = KTrader::self()->query("KickoffSearch/Plugin");
@@ -5189,7 +5194,7 @@
+
+ kdDebug () << "Done inserting ... " << endl;
+ }
-+ else if (m_overflowCategoryState==Filling && m_overflowCategory==item->category &&
++ else if (m_overflowCategoryState==Filling && m_overflowCategory==item->category &&
+ max_category_id [item->category] - base_category_id [item->category] < max_items(item->category) * 2)
+ m_overflowList.append(item);
+}
@@ -5300,6 +5305,12 @@
+
+void KMenu::slotStartURL(const QString& u)
+{
++ if ( u == "kicker:/goup/" ) {
++ // only m_exitView is connected to this slot, not m_browserView
++ slotGoExitMainMenu();
++ return;
++ }
++
+ if ( u == "kicker:/restart/" || u=="kicker:/switchuser/") {
+ slotGoExitSubMenu(u);
+ return;
@@ -5320,7 +5331,8 @@
+#else
+ DCOPRef mediamanager("ksmserver", "ksmserver");
+ DCOPReply reply = mediamanager.call( "logoutTimed", (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeDefault );
-+ if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"), i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo")))
++ if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"),
++ i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo")))
+ kapp->requestShutDown( KApplication::ShutdownConfirmNo,
+ KApplication::ShutdownTypeNone,
+ KApplication::ShutdownModeDefault );
@@ -5335,7 +5347,8 @@
+
+ kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,QString)", params);
+#else
-+ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"), i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit")))
++ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"),
++ i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit")))
+ kapp->requestShutDown( KApplication::ShutdownConfirmNo,
+ KApplication::ShutdownTypeHalt,
+ KApplication::ShutdownModeDefault );
@@ -5349,16 +5362,22 @@
+
+ kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,QString)", params);
+#else
-+ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"), i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload")))
++ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"),
++ i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload")))
+ kapp->requestShutDown( KApplication::ShutdownConfirmNo,
+ KApplication::ShutdownTypeReboot,
+ KApplication::ShutdownModeDefault );
+#endif
+ }
+#ifdef KDELIBS_SUSE
-+ else if ( u == "kicker:/suspend" ) {
-+ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to pause the computer without logging out?"), i18n("Suspend Confirmation"), KGuiItem(i18n("Suspend"),"player_pause")))
-+ KMessageBox::error( this, QString( "kicker:/suspend is not yet implemented " ) );
++ else if ( u == "kicker:/suspend_disk" ) {
++ slotSuspend( 1 );
++ }
++ else if ( u == "kicker:/suspend_ram" ) {
++ slotSuspend( 2 );
++ }
++ else if ( u == "kicker:/standby" ) {
++ slotSuspend( 3 );
+ }
+#endif
+ else if ( u == "kicker:/savesession" ) {
@@ -6426,6 +6445,100 @@
+ return 5;
+}
+
++#define DBUS_HAL_INTERFACE "org.freedesktop.Hal"
++#define DBUS_HAL_SYSTEM_POWER_INTERFACE "org.freedesktop.Hal.Device.SystemPowerManagement"
++#define HAL_UDI_COMPUTER "/org/freedesktop/Hal/devices/computer"
++
++#ifdef KDELIBS_SUSE
++#include
++#endif
++
++void KMenu::insertSuspendOption( int &nId, int &index )
++{
++#ifdef KDELIBS_SUSE
++ int supported = -1;
++ bool suspend_ram, suspend_disk, standby;
++
++ liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_suspend", &supported);
++ if (supported == 1)
++ suspend_ram = true;
++ else
++ suspend_ram = false;
++ liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_standby", &supported);
++ if (supported == 1)
++ standby = true;
++ else
++ standby = false;
++ liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_hibernate", &supported);
++ if (supported == 1)
++ suspend_disk = true;
++ else
++ suspend_disk = false;
++
++ if (liblazy_polkit_is_user_allowed_by_uid(getuid(), "hal-power-hibernate", NULL) != 1)
++ suspend_disk = false;
++ if (liblazy_polkit_is_user_allowed_by_uid(getuid(), "hal-power-suspend", NULL) != 1)
++ suspend_ram = false;
++ if (liblazy_polkit_is_user_allowed_by_uid(getuid(), "hal-power-standby", NULL) != 1)
++ standby = false;
++
++ if ( ! ( standby + suspend_ram + suspend_disk ) )
++ return;
++
++ i18n("Suspend Computer");
++
++ if ( suspend_disk )
++ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to Disk" ),
++ i18n( "Pause without logging out" ), "kicker:/suspend_disk", nId++, index++ );
++
++ if ( suspend_ram )
++ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to RAM" ),
++ i18n( "Pause without logging out" ), "kicker:/suspend_ram", nId++, index++ );
++
++ if ( standby )
++ m_exitView->leftView()->insertItem( "player_pause", i18n( "Standby" ),
++ i18n( "Pause without logging out" ), "kicker:/standby", nId++, index++ );
++#endif
++}
++
++void KMenu::slotSuspend(int id)
++{
++#ifdef KDELIBS_SUSE
++ int error = 0;
++ int wake = 0;
++ DBusMessage *reply;
++
++ if (id == 1) {
++ error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE,
++ HAL_UDI_COMPUTER,
++ DBUS_HAL_SYSTEM_POWER_INTERFACE,
++ "Hibernate",
++ &reply,
++ DBUS_TYPE_INVALID);
++ } else if (id == 2)
++ error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE,
++ HAL_UDI_COMPUTER,
++ DBUS_HAL_SYSTEM_POWER_INTERFACE,
++ "Suspend",
++ &reply,
++ DBUS_TYPE_INT32,
++ &wake,
++ DBUS_TYPE_INVALID);
++ else if (id == 3)
++ error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE,
++ HAL_UDI_COMPUTER,
++ DBUS_HAL_SYSTEM_POWER_INTERFACE,
++ "Standby",
++ &reply,
++ DBUS_TYPE_INVALID);
++ else
++ return;
++ if (error)
++#endif
++ KMessageBox::error(this, i18n("Suspend failed"));
++
++}
++
+// vim:cindent:sw=4:
--- kicker/ui/kmenuitembase.ui
+++ kicker/ui/kmenuitembase.ui
@@ -6759,7 +6872,7 @@
+#endif
--- kicker/ui/k_new_mnu.h
+++ kicker/ui/k_new_mnu.h
-@@ -0,0 +1,341 @@
+@@ -0,0 +1,343 @@
+/*****************************************************************
+
+ Copyright (c) 1996-2000 the kicker authors. See file AUTHORS.
@@ -6892,7 +7005,7 @@
+ void slotGoBack();
+ void slotGoExitMainMenu();
+ void slotGoExitSubMenu(const QString& url);
-+
++
+ void paletteChanged();
+ virtual void configChanged();
+ void updateRecent();
@@ -6922,6 +7035,7 @@
+
+ void updateMedia();
+ void slotFavDropped(QDropEvent * e, QListViewItem *after );
++ void slotSuspend(int id);
+
+signals:
+ void clickedBrowserButton();
@@ -6941,6 +7055,7 @@
+ void doNewSession(bool lock);
+ void createRecentMenuItems();
+ void insertStaticItems();
++ void insertSuspendOption( int &id, int &index );
+ virtual void clearSubmenus();
+ void raiseStackWidget( QWidget *view );
+
@@ -9097,7 +9212,14 @@
+#endif
--- kicker/ui/Makefile.am
+++ kicker/ui/Makefile.am
-@@ -7,32 +7,38 @@
+@@ -1,38 +1,44 @@
+ INCLUDES = -I$(srcdir)/../core -I../core -I$(srcdir)/../buttons \
+ -I../../libkicker -I$(srcdir)/../../libkicker \
+- -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes)
++ -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(DBUS_INCS) $(all_includes)
+
+ noinst_LTLIBRARIES = libkicker_ui.la
+
libkicker_ui_la_SOURCES = addbutton_mnu.cpp appletitem.ui appletview.ui addapplet.cpp \
addapplet_mnu.cpp appletop_mnu.cpp \
browser_mnu.cpp client_mnu.cpp dirdrop_mnu.cpp \
@@ -9117,7 +9239,7 @@
-libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kdmlib/libdmctl.la
+libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kdmlib/libdmctl.la \
-+ $(LIB_KABC) ../interfaces/libkickoffsearch_interfaces.la
++ $(LIB_KABC) ../interfaces/libkickoffsearch_interfaces.la -llazy
libkicker_ui_la_METASOURCES = AUTO
@@ -10992,11 +11114,11 @@
+++ data/kmenu_side/Makefile.am
@@ -1,6 +1,5 @@
-kicker_kmenuside_pics_data_DATA = kside.png kside_tile.png
--
--kicker_kmenuside_pics_datadir = $(kde_datadir)/kicker/pics/
+kicker_kmenuside_pics_data_DATA = kside.png kside_tile.png
+kicker_kmenuside_pics_datadir = $(kde_datadir)/kicker/pics
+-kicker_kmenuside_pics_datadir = $(kde_datadir)/kicker/pics/
+-
EXTRA_DIST = $(kicker_kmenuside_pics_data_DATA)
--- data/Makefile.am
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org