[kdebase-workspace: 1/2] 4.7.80 (beta 1)

Jaroslav Reznik jreznik at fedoraproject.org
Wed Nov 23 14:29:16 UTC 2011 

commit d02e7292a58a1a2c488bd86b27e9148e7982b6a7
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Nov 21 16:21:05 2011 +0100

    4.7.80 (beta 1)

 .gitignore                                         |    4 +-
 ...space-4.7.3-fix-wetab-power-button-freeze.patch |  140 ---
 kde-workspace-4.7.3-kdebug272495.patch             |  264 -----
 kde-workspace-4.7.3-kdebug277036.patch             |   17 -
 kde-workspace-4.7.3-ksplash-qml.patch              | 1012 --------------------
 kde-workspace-4.7.3-ksplashx.patch                 |   12 -
 kde-workspace-4.7.3-wac-html-widgets.patch         |  676 -------------
 ...h => kde-workspace-4.7.80-bz#732830-login.patch |  128 +--
 ...> kde-workspace-4.7.80-classicmenu-logout.patch |   32 +-
 kde-workspace-4.7.80-kde#171685.patch              |   12 +
 kde-workspace-4.7.80-no_HAL.patch                  |   24 +
 kdebase-workspace-4.5.85-no_HAL.patch              |   31 -
 kdebase-workspace-4.6.80-kde#171685.patch          |   12 -
 kdebase-workspace-4.7.4-batteryplasmoid.patch      |   79 --
 ... kdebase-workspace-4.7.80-redhat_startkde.patch |   31 +-
 kdebase-workspace-4.8.0-kwin-twinview.patch        |   70 --
 kdebase-workspace.spec                             |   46 +-
 nepomuksearch-566052f0.diff                        |  110 ---
 sources                                            |    2 +-
 19 files changed, 129 insertions(+), 2573 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4368f54..c77e570 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/kde-wallpapers-4.7.2.tar.bz2
-/kde-workspace-4.7.2.tar.bz2
-/kde-workspace-4.7.3.tar.bz2
+/kde-workspace-4.7.80.tar.bz2
diff --git a/kdebase-workspace-4.7.0-bz#732830-login.patch b/kde-workspace-4.7.80-bz#732830-login.patch
similarity index 76%
rename from kdebase-workspace-4.7.0-bz#732830-login.patch
rename to kde-workspace-4.7.80-bz#732830-login.patch
index aed3433..9677fbc 100644
--- a/kdebase-workspace-4.7.0-bz#732830-login.patch
+++ b/kde-workspace-4.7.80-bz#732830-login.patch
@@ -1,6 +1,7 @@
---- kdebase-workspace-4.7.0/kdm/CMakeLists.txt	2011-05-20 22:32:06.000000000 +0200
-+++ kdebase-workspace-4.7.0/kdm/CMakeLists.txt	2011-08-22 19:12:45.365000004 +0200
-@@ -33,6 +33,11 @@ 
+diff -up kde-workspace-4.7.80/kdm/CMakeLists.txt.bz#732830-login kde-workspace-4.7.80/kdm/CMakeLists.txt
+--- kde-workspace-4.7.80/kdm/CMakeLists.txt.bz#732830-login	2011-07-27 20:35:39.000000000 +0200
++++ kde-workspace-4.7.80/kdm/CMakeLists.txt	2011-11-21 15:21:33.213614317 +0100
+@@ -33,6 +33,11 @@ set(backgroundlib_SRCS
      ${CMAKE_CURRENT_SOURCE_DIR}/kcm/background/bgsettings.cpp
  )
  
@@ -12,9 +13,10 @@
  # after confci is defined
  add_subdirectory(backend)
  add_subdirectory(kfrontend)
---- kdebase-workspace-4.7.0/kdm/config.def	2011-05-20 22:32:06.000000000 +0200
-+++ kdebase-workspace-4.7.0/kdm/config.def	2011-08-22 18:40:31.706000005 +0200
-@@ -2287,9 +2287,13 @@ 
+diff -up kde-workspace-4.7.80/kdm/config.def.bz#732830-login kde-workspace-4.7.80/kdm/config.def
+--- kde-workspace-4.7.80/kdm/config.def.bz#732830-login	2011-07-27 20:35:39.000000000 +0200
++++ kde-workspace-4.7.80/kdm/config.def	2011-11-21 15:21:33.214614320 +0100
+@@ -2287,9 +2287,13 @@ Instance: #*/
  Update: upd_minshowuid
  Comment:
   Special case of HiddenUsers: users with a non-zero UID less than this number
@@ -30,7 +32,7 @@
  
  Key: MaxShowUID
  Type: int
-@@ -2300,9 +2304,11 @@ 
+@@ -2300,9 +2304,11 @@ Instance: #*/
  Update: upd_maxshowuid
  Comment:
   Complement to MinShowUID: users with a UID greater than this number will
@@ -44,9 +46,10 @@
  
  Key: SortUsers
  Type: bool
---- kdebase-workspace-4.7.0/kdm/kcm/CMakeLists.txt	2011-05-20 22:32:06.000000000 +0200
-+++ kdebase-workspace-4.7.0/kdm/kcm/CMakeLists.txt	2011-08-22 19:13:23.857000013 +0200
-@@ -15,6 +15,7 @@ 
+diff -up kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt.bz#732830-login kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt
+--- kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt.bz#732830-login	2011-07-27 20:35:39.000000000 +0200
++++ kde-workspace-4.7.80/kdm/kcm/CMakeLists.txt	2011-11-21 15:21:33.226614347 +0100
+@@ -15,6 +15,7 @@ kde4_add_ui_files(kcmbackgroundlib_SRCS
      background/bgadvanced_ui.ui)
  
  set(kcm_kdm_PART_SRCS ${kcmbackgroundlib_SRCS} ${backgroundlib_SRCS}
@@ -54,9 +57,10 @@
     background.cpp
     kdm-gen.cpp
     kdm-dlg.cpp
---- kdebase-workspace-4.7.0/kdm/kcm/kdm-users.cpp	2011-06-22 16:29:18.000000000 +0200
-+++ kdebase-workspace-4.7.0/kdm/kcm/kdm-users.cpp	2011-08-23 17:41:46.453999890 +0200
-@@ -58,6 +58,9 @@ 
+diff -up kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp.bz#732830-login kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp
+--- kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp.bz#732830-login	2011-08-22 15:29:50.000000000 +0200
++++ kde-workspace-4.7.80/kdm/kcm/kdm-users.cpp	2011-11-21 15:21:33.248614403 +0100
+@@ -58,6 +58,9 @@
  #include <unistd.h>
  #include <pwd.h>
  
@@ -66,7 +70,7 @@
  extern KConfig *config;
  
  extern int handleActionReply(QWidget *parent, const KAuth::ActionReply &reply);
-@@ -80,28 +83,11 @@ 
+@@ -80,28 +83,11 @@ static int executeFaceAction(QWidget *pa
  KDMUsersWidget::KDMUsersWidget(QWidget *parent)
      : QWidget(parent)
  {
@@ -100,39 +104,10 @@
  
      m_userPixDir = config->group("X-*-Greeter").readEntry("FaceDir",
              QString(KStandardDirs::installPath("data") + "kdm/faces" + '/'));
-@@ -119,21 +105,25 @@ 
-         "Users with a UID (numerical user identification) outside this range "
-         "will not be listed by KDM and this setup dialog. "
-         "Note that users with the UID 0 (typically root) are not affected by "
--        "this and must be explicitly excluded in \"Inverse selection\" mode."));
-+        "this and must be explicitly excluded in \"Inverse selection\" mode. "
-+	"Setting the minimum to -1 means that the minimum should be determined "
-+	"in a platform-specific way (by reading /etc/login.defs or using a "
-+	"compiled-in default.)"));
-     QSizePolicy sp_ign_fix(QSizePolicy::Ignored, QSizePolicy::Fixed);
--    QValidator *valid = new QIntValidator(0, INT_MAX, minGroup);
-+    QValidator *minvalid = new QIntValidator(-1, INT_MAX, minGroup);
-     QLabel *minlab = new QLabel(i18nc("UIDs", "Below:"), minGroup);
-     leminuid = new KLineEdit(minGroup);
-     minlab->setBuddy(leminuid);
-     leminuid->setSizePolicy(sp_ign_fix);
--    leminuid->setValidator(valid);
-+    leminuid->setValidator(minvalid);
-     connect(leminuid, SIGNAL(textChanged(const QString &)), SIGNAL(changed()));
-     connect(leminuid, SIGNAL(textChanged(const QString &)), SLOT(slotMinMaxChanged()));
-+    QValidator *maxvalid = new QIntValidator(0, INT_MAX, minGroup);
-     QLabel *maxlab = new QLabel(i18nc("UIDs", "Above:"), minGroup);
-     lemaxuid = new KLineEdit(minGroup);
-     maxlab->setBuddy(lemaxuid);
-     lemaxuid->setSizePolicy(sp_ign_fix);
--    lemaxuid->setValidator(valid);
-+    lemaxuid->setValidator(maxvalid);
-     connect(lemaxuid, SIGNAL(textChanged(const QString &)), SIGNAL(changed()));
-     connect(lemaxuid, SIGNAL(textChanged(const QString &)), SLOT(slotMinMaxChanged()));
-     QGridLayout *grid = new QGridLayout(minGroup);
---- kdebase-workspace-4.7.0/kdm/kcm/main.cpp	2011-05-20 22:32:07.000000000 +0200
-+++ kdebase-workspace-4.7.0/kdm/kcm/main.cpp	2011-08-23 19:23:10.750998887 +0200
-@@ -59,6 +59,7 @@ 
+diff -up kde-workspace-4.7.80/kdm/kcm/main.cpp.bz#732830-login kde-workspace-4.7.80/kdm/kcm/main.cpp
+--- kde-workspace-4.7.80/kdm/kcm/main.cpp.bz#732830-login	2011-08-22 15:29:50.000000000 +0200
++++ kde-workspace-4.7.80/kdm/kcm/main.cpp	2011-11-21 15:21:33.249614402 +0100
+@@ -59,6 +59,7 @@
  #include <pwd.h>
  #include <grp.h>
  
@@ -140,7 +115,7 @@
  
  K_PLUGIN_FACTORY(KDMFactory, registerPlugin<KDModule>();)
  K_EXPORT_PLUGIN(KDMFactory("kdmconfig"))
-@@ -393,13 +394,14 @@ 
+@@ -393,13 +394,14 @@ void KDModule::propagateUsers()
  {
      groupmap.clear();
      emit clearUsers();
@@ -156,7 +131,7 @@
              lusers[it.key()] = uid;
              for (jt = it.value().second.begin(); jt != it.value().second.end(); ++jt)
                  if ((gmapi = groupmap.find(*jt)) == groupmap.end()) {
-@@ -415,6 +417,8 @@ 
+@@ -415,6 +417,8 @@ void KDModule::propagateUsers()
  
  void KDModule::slotMinMaxUID(int min, int max)
  {
@@ -165,7 +140,7 @@
      if (updateOK) {
          QMap<QString, int> alusers, dlusers;
          QMap<QString, QPair<int, QStringList> >::const_iterator it;
-@@ -424,8 +428,8 @@ 
+@@ -424,8 +428,8 @@ void KDModule::slotMinMaxUID(int min, in
              int uid = it.value().first;
              if (!uid)
                  continue;
@@ -176,7 +151,7 @@
                  dlusers[it.key()] = uid;
                  for (jt = it.value().second.begin();
                          jt != it.value().second.end(); ++jt) {
-@@ -435,8 +439,8 @@ 
+@@ -435,8 +439,8 @@ void KDModule::slotMinMaxUID(int min, in
                          dlusers['@' + *jt] = -uid;
                      }
                  }
@@ -187,9 +162,10 @@
                  alusers[it.key()] = uid;
                  for (jt = it.value().second.begin();
                          jt != it.value().second.end(); ++jt)
---- kdebase-workspace-4.7.0/kdm/kdm-minmaxuid.c	1970-01-01 01:00:00.000000000 +0100
-+++ kdebase-workspace-4.7.0/kdm/kdm-minmaxuid.c	2011-08-23 18:35:05.011997103 +0200
-@@ -0,0 +1,152 @@ 
+diff -up kde-workspace-4.7.80/kdm/kdm-minmaxuid.c.bz#732830-login kde-workspace-4.7.80/kdm/kdm-minmaxuid.c
+--- kde-workspace-4.7.80/kdm/kdm-minmaxuid.c.bz#732830-login	2011-11-21 15:21:33.249614402 +0100
++++ kde-workspace-4.7.80/kdm/kdm-minmaxuid.c	2011-11-21 15:21:33.249614402 +0100
+@@ -0,0 +1,152 @@
 +/*
 + * Utilities for handling the UID range allocated for non-system user
 + */
@@ -342,9 +318,10 @@
 +    return 0;
 +}
 +#endif
---- kdebase-workspace-4.7.0/kdm/kdm-minmaxuid.h	1970-01-01 01:00:00.000000000 +0100
-+++ kdebase-workspace-4.7.0/kdm/kdm-minmaxuid.h	2011-08-23 18:37:22.494007452 +0200
-@@ -0,0 +1,25 @@ 
+diff -up kde-workspace-4.7.80/kdm/kdm-minmaxuid.h.bz#732830-login kde-workspace-4.7.80/kdm/kdm-minmaxuid.h
+--- kde-workspace-4.7.80/kdm/kdm-minmaxuid.h.bz#732830-login	2011-11-21 15:21:33.249614402 +0100
++++ kde-workspace-4.7.80/kdm/kdm-minmaxuid.h	2011-11-21 15:21:33.249614402 +0100
+@@ -0,0 +1,25 @@
 +/*
 + * Utilities for handling the UID range allocated for non-system user
 + */
@@ -370,9 +347,10 @@
 +
 +
 +#endif
---- kdebase-workspace-4.7.0/kdm/kfrontend/CMakeLists.txt	2011-05-20 22:32:07.000000000 +0200
-+++ kdebase-workspace-4.7.0/kdm/kfrontend/CMakeLists.txt	2011-08-23 18:54:46.308000002 +0200
-@@ -52,6 +52,7 @@ 
+diff -up kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt.bz#732830-login kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt
+--- kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt.bz#732830-login	2011-07-27 20:35:39.000000000 +0200
++++ kde-workspace-4.7.80/kdm/kfrontend/CMakeLists.txt	2011-11-21 15:21:33.250614402 +0100
+@@ -52,6 +52,7 @@ set(kdm_greet_SRCS
  	utils.cpp
  	utils.h
  	${kdmthemer_SRCS}
@@ -380,7 +358,7 @@
  )
  
  if (XDMCP)
-@@ -93,7 +94,7 @@ 
+@@ -93,7 +94,7 @@ kde4_add_executable(krootimage ${krootim
  target_link_libraries(krootimage ${KDE4_KDEUI_LIBS} ${X11_X11_LIB} ${QIMAGEBLITZ_LIBRARIES})
  install(TARGETS krootimage DESTINATION ${LIBEXEC_INSTALL_DIR})
  
@@ -389,9 +367,10 @@
  macro_add_file_dependencies(genkdmconf.c ${confci})
  kde4_add_executable(genkdmconf NOGUI ${genkdmconf_SRCS})
  macro_add_compile_flags(genkdmconf -U_REENTRANT)
---- kdebase-workspace-4.7.0/kdm/kfrontend/genkdmconf.c	2011-05-20 22:32:07.000000000 +0200
-+++ kdebase-workspace-4.7.0/kdm/kfrontend/genkdmconf.c	2011-08-23 18:35:44.653000001 +0200
-@@ -48,6 +48,7 @@ 
+diff -up kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c
+--- kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c.bz#732830-login	2011-07-27 20:35:39.000000000 +0200
++++ kde-workspace-4.7.80/kdm/kfrontend/genkdmconf.c	2011-11-21 15:21:33.251614401 +0100
+@@ -48,6 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fi
  #ifdef BSD
  # include <utmp.h>
  #endif
@@ -399,7 +378,7 @@
  
  #define WANT_CONF_GEN
  #include <config.ci>
-@@ -1999,7 +2000,7 @@ 
+@@ -1999,7 +2000,7 @@ upd_showusers(Entry *ce, Section *cs)
      }
  }
  
@@ -408,7 +387,7 @@
  
  static void
  upd_minshowuid(Entry *ce, Section *cs ATTR_UNUSED)
-@@ -2025,16 +2026,18 @@ 
+@@ -2025,16 +2026,18 @@ upd_hiddenusers(Entry *ce, Section *cs)
      char *nv;
      const char *msu, *pt, *et;
      struct passwd *pw;
@@ -430,7 +409,7 @@
  
      nv = 0;
      pt = ce->value;
-@@ -2048,7 +2051,7 @@ 
+@@ -2048,7 +2051,7 @@ upd_hiddenusers(Entry *ce, Section *cs)
          }
          if ((pw = getpwnam(nbuf))) {
              if (!pw->pw_uid ||
@@ -439,7 +418,7 @@
              {
                  if (nv)
                      strCat(&nv, ",%s", nbuf);
-@@ -2991,7 +2994,7 @@ 
+@@ -2991,7 +2994,7 @@ int main(int argc, char **argv)
      StrList *fp;
      Section *cs;
      Entry *ce, **cep;
@@ -448,7 +427,7 @@
      int no_old_xdm = 0, no_old_kde = 0;
      struct stat st;
  
-@@ -3230,27 +3233,9 @@ 
+@@ -3230,27 +3233,9 @@ int main(int argc, char **argv)
              }
          }
      }
@@ -479,9 +458,10 @@
      for (i = 0; i <= CONF_MAX_PRIO; i++)
          for (cs = config; cs; cs = cs->next)
              for (ce = cs->ents; ce; ce = ce->next)
---- kdebase-workspace-4.7.0/kdm/kfrontend/kgreeter.cpp	2011-05-20 22:32:07.000000000 +0200
-+++ kdebase-workspace-4.7.0/kdm/kfrontend/kgreeter.cpp	2011-08-23 18:55:40.350999999 +0200
-@@ -66,6 +66,8 @@ 
+diff -up kde-workspace-4.7.80/kdm/kfrontend/kgreeter.cpp.bz#732830-login kde-workspace-4.7.80/kdm/kfrontend/kgreeter.cpp
+--- kde-workspace-4.7.80/kdm/kfrontend/kgreeter.cpp.bz#732830-login	2011-08-22 15:29:51.000000000 +0200
++++ kde-workspace-4.7.80/kdm/kfrontend/kgreeter.cpp	2011-11-21 15:21:33.252614402 +0100
+@@ -66,6 +66,8 @@ Foundation, Inc., 51 Franklin Street, Fi
  #include <X11/Xlib.h>
  #include <fixx11h.h>
  
@@ -490,7 +470,7 @@
  class UserListView : public QListWidget {
    public:
      UserListView(QWidget *parent = 0)
-@@ -389,12 +391,13 @@ 
+@@ -389,12 +391,13 @@ KGreeter::insertUsers()
              default_pix.fill(0);
          }
      }
@@ -505,7 +485,7 @@
                   (!ps->pw_uid && _showRoot)) &&
                  ps->pw_uid <= (unsigned)_highUserId &&
                  !noUsers.hasUser(ps->pw_name) &&
-@@ -413,7 +416,7 @@ 
+@@ -413,7 +416,7 @@ KGreeter::insertUsers()
              QSet<QString> dupes;
              for (setpwent(); (ps = getpwent()) != 0;) {
                  if (*ps->pw_dir && *ps->pw_shell &&
diff --git a/kdebase-workspace-4.5.80-classicmenu-logout.patch b/kde-workspace-4.7.80-classicmenu-logout.patch
similarity index 59%
rename from kdebase-workspace-4.5.80-classicmenu-logout.patch
rename to kde-workspace-4.7.80-classicmenu-logout.patch
index a7d701e..120e695 100644
--- a/kdebase-workspace-4.5.80-classicmenu-logout.patch
+++ b/kde-workspace-4.7.80-classicmenu-logout.patch
@@ -1,7 +1,7 @@
-diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp
---- kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp	2010-01-06 18:00:18.000000000 +0100
-+++ kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp	2010-11-20 20:31:20.000000000 +0100
-@@ -110,7 +110,8 @@
+diff -up kde-workspace-4.7.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp.classicmenu-logout kde-workspace-4.7.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp
+--- kde-workspace-4.7.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp.classicmenu-logout	2011-10-11 16:42:11.000000000 +0200
++++ kde-workspace-4.7.80/plasma/desktop/applets/kickoff/core/itemhandlers.cpp	2011-11-21 14:56:36.108858679 +0100
+@@ -105,7 +105,8 @@ bool LeaveItemHandler::openUrl(const KUr
          QTimer::singleShot(0, this, SLOT(switchUser()));
          return true;
      } else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
@@ -11,7 +11,7 @@ diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/core/itemhandle
          // decouple dbus call, otherwise we'll run into a dead-lock
          QTimer::singleShot(0, this, SLOT(logout()));
          return true;
-@@ -163,6 +164,10 @@
+@@ -158,6 +159,10 @@ void LeaveItemHandler::logout()
          type = KWorkSpace::ShutdownTypeReboot;
      } else if (m_logoutAction == "shutdown") {
          type = KWorkSpace::ShutdownTypeHalt;
@@ -21,11 +21,11 @@ diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/core/itemhandle
 +        type = KWorkSpace::ShutdownTypeDefault;
      }
  
- //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
-diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
---- kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp	2010-11-19 11:51:20.000000000 +0100
-+++ kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp	2010-11-20 20:31:20.000000000 +0100
-@@ -209,6 +209,7 @@
+     KWorkSpace::requestShutDown(confirm, type);
+diff -up kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.classicmenu-logout kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
+--- kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.classicmenu-logout	2011-11-04 15:33:12.000000000 +0100
++++ kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp	2011-11-21 14:48:59.281609964 +0100
+@@ -209,6 +209,7 @@ public:
              case Shutdown:                 return i18n("Shut down");
              case Logout:                   return i18n("Log out");
              case Leave:                    return i18n("Leave");
@@ -33,7 +33,7 @@ diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/si
          }
          return QString();
      }
-@@ -234,6 +235,7 @@
+@@ -234,6 +235,7 @@ public:
              case Shutdown:                 return "system-shutdown";
              case Logout:                   return "system-log-out";
              case Leave:                    return "system-shutdown";
@@ -41,7 +41,7 @@ diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/si
          }
          return QString();
      }
-@@ -725,6 +727,8 @@
+@@ -741,6 +743,8 @@ void MenuLauncherApplet::showMenu(bool p
                  menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
              } else if(vtname == "Logout") {
                  menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
@@ -50,10 +50,10 @@ diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/si
              } else if(vtname == "Leave") {
                  Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(menuview);
                  leavemodel->updateModel();
-diff -ur kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h
---- kdebase-workspace-4.5.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h	2010-06-06 22:35:40.000000000 +0200
-+++ kdebase-workspace-4.5.80-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h	2010-11-20 20:31:20.000000000 +0100
-@@ -59,7 +59,8 @@
+diff -up kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h.classicmenu-logout kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h
+--- kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h.classicmenu-logout	2011-07-27 20:35:42.000000000 +0200
++++ kde-workspace-4.7.80/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h	2011-11-21 14:48:59.282609967 +0100
+@@ -59,7 +59,8 @@ public:
          Restart, ///< Restart Action
          Shutdown, ///< Shutdown Action
          Logout, ///< Logout Action
diff --git a/kde-workspace-4.7.80-kde#171685.patch b/kde-workspace-4.7.80-kde#171685.patch
new file mode 100644
index 0000000..51954a4
--- /dev/null
+++ b/kde-workspace-4.7.80-kde#171685.patch
@@ -0,0 +1,12 @@
+diff -up kde-workspace-4.7.80/kwin/workspace.h.kde#171685 kde-workspace-4.7.80/kwin/workspace.h
+--- kde-workspace-4.7.80/kwin/workspace.h.kde#171685	2011-11-17 21:55:50.000000000 +0100
++++ kde-workspace-4.7.80/kwin/workspace.h	2011-11-21 15:00:14.772410822 +0100
+@@ -155,7 +155,7 @@ public:
+     void setShouldGetFocus(Client*);
+     bool activateNextClient(Client* c);
+     bool focusChangeEnabled() {
+-        return block_focus == 0;
++        return block_focus < 1;
+     }
+ 
+     void updateColormap();
diff --git a/kde-workspace-4.7.80-no_HAL.patch b/kde-workspace-4.7.80-no_HAL.patch
new file mode 100644
index 0000000..2149aa2
--- /dev/null
+++ b/kde-workspace-4.7.80-no_HAL.patch
@@ -0,0 +1,24 @@
+diff -up kde-workspace-4.7.80/powerdevil/daemon/BackendConfig.cmake.no_HAL kde-workspace-4.7.80/powerdevil/daemon/BackendConfig.cmake
+--- kde-workspace-4.7.80/powerdevil/daemon/BackendConfig.cmake.no_HAL	2011-10-20 22:52:49.000000000 +0200
++++ kde-workspace-4.7.80/powerdevil/daemon/BackendConfig.cmake	2011-11-21 15:59:36.707272566 +0100
+@@ -39,18 +39,7 @@ install(TARGETS backlighthelper DESTINAT
+ kde4_install_auth_helper_files(backlighthelper org.kde.powerdevil.backlighthelper root)
+ kde4_install_auth_actions(org.kde.powerdevil.backlighthelper ${CMAKE_CURRENT_SOURCE_DIR}/backends/upower/backlight_helper_actions.actions)
+ 
+-########################## HAL Backend #####################################
+-
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backends/hal)
+-
+-set(powerdevilhalbackend_SRCS
+-    backends/hal/halsuspendjob.cpp
+-    backends/hal/powerdevilhalbackend.cpp
+-)
+-
+-set(powerdevilhalbackend_LIBS ${KDE4_SOLID_LIBS})
+-
+ ########################## Daemon variables ################################
+ 
+-set(POWERDEVIL_BACKEND_SRCS ${powerdevilupowerbackend_SRCS} ${powerdevilhalbackend_SRCS})
+-set(POWERDEVIL_BACKEND_LIBS ${powerdevilupowerbackend_LIBS} ${powerdevilhalbackend_LIBS})
++set(POWERDEVIL_BACKEND_SRCS ${powerdevilupowerbackend_SRCS})
++set(POWERDEVIL_BACKEND_LIBS ${powerdevilupowerbackend_LIBS})
diff --git a/kde-workspace-4.7.80-wac-html-widgets.patch b/kde-workspace-4.7.80-wac-html-widgets.patch
new file mode 100644
index 0000000..e69de29
diff --git a/kdebase-workspace-4.6.95-redhat_startkde.patch b/kdebase-workspace-4.7.80-redhat_startkde.patch
similarity index 75%
rename from kdebase-workspace-4.6.95-redhat_startkde.patch
rename to kdebase-workspace-4.7.80-redhat_startkde.patch
index a35f20c..d1c377f 100644
--- a/kdebase-workspace-4.6.95-redhat_startkde.patch
+++ b/kdebase-workspace-4.7.80-redhat_startkde.patch
@@ -1,23 +1,10 @@
-diff -up kdebase-workspace-4.6.95/startkde.cmake.redhat_startkde kdebase-workspace-4.6.95/startkde.cmake
---- kdebase-workspace-4.6.95/startkde.cmake.redhat_startkde	2011-07-07 09:03:11.000000000 -0500
-+++ kdebase-workspace-4.6.95/startkde.cmake	2011-07-12 07:46:27.961497331 -0500
-@@ -25,33 +25,17 @@ elif test $kcheckrunning_result -eq 2 ; 
-         exit 1
+diff -up kde-workspace-4.7.80/startkde.cmake.redhat_startkde kde-workspace-4.7.80/startkde.cmake
+--- kde-workspace-4.7.80/startkde.cmake.redhat_startkde	2011-11-17 21:55:51.000000000 +0100
++++ kde-workspace-4.7.80/startkde.cmake	2011-11-21 14:47:09.947290754 +0100
+@@ -40,22 +40,6 @@ if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /
+     export MALLOC_CHECK_
  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
- 
 -# 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
@@ -37,7 +24,7 @@ diff -up kdebase-workspace-4.6.95/startkde.cmake.redhat_startkde kdebase-workspa
  # Boot sequence:
  #
  # kdeinit is used to fork off processes which improves memory usage
-@@ -72,6 +56,37 @@ fi
+@@ -76,6 +60,37 @@ fi
  kdehome=$HOME/@KDE_DEFAULT_HOME@
  test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
  
@@ -75,7 +62,7 @@ diff -up kdebase-workspace-4.6.95/startkde.cmake.redhat_startkde kdebase-workspa
  # see kstartupconfig source for usage
  mkdir -m 700 -p $kdehome
  mkdir -m 700 -p $kdehome/share
-@@ -89,7 +104,15 @@ krandrrc [Screen2]
+@@ -93,7 +108,15 @@ krandrrc [Screen2]
  krandrrc [Screen3]
  kcmfonts General forceFontDPI 0
  kdeglobals Locale Language '' # trigger requesting languages from KLocale
@@ -91,7 +78,7 @@ diff -up kdebase-workspace-4.6.95/startkde.cmake.redhat_startkde kdebase-workspa
  kstartupconfig4
  returncode=$?
  if test $returncode -ne 0; then
-@@ -168,8 +191,9 @@ fi
+@@ -171,8 +194,9 @@ fi
  # better use the Autostart folder.
  
  libpath=`kde4-config --path lib | tr : '\n'`
@@ -102,7 +89,7 @@ diff -up kdebase-workspace-4.6.95/startkde.cmake.redhat_startkde kdebase-workspa
    for file in "$prefix"*.sh; do
      test -r "$file" && . "$file"
    done
-@@ -378,7 +402,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
+@@ -381,7 +405,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
  echo 'startkde: Running shutdown scripts...'  1>&2
  
  # Run scripts found in $KDEDIRS/shutdown
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index d4b8351..e250c85 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,8 +8,8 @@
 
 Summary: KDE Workspace
 Name:    kdebase-workspace
-Version: 4.7.3
-Release: 13%{?dist}
+Version: 4.7.80
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -18,7 +18,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # RH/Fedora-specific startkde changes
-Patch1: kdebase-workspace-4.6.95-redhat_startkde.patch
+Patch1: kdebase-workspace-4.7.80-redhat_startkde.patch
 
 # add konsole menuitem
 Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
@@ -50,7 +50,7 @@ Patch16: kdebase-workspace-4.5.80-battery-plasmoid-showremainingtime.patch
 # allow adding a "Leave..." button which brings up the complete shutdown dialog
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
-Patch17: kdebase-workspace-4.5.80-classicmenu-logout.patch
+Patch17: kde-workspace-4.7.80-classicmenu-logout.patch
 
 # kubuntu kudos! bulletproof-X bits ripped out
 Patch19: kdebase-workspace-4.4.92-kdm_plymouth081.patch
@@ -73,41 +73,24 @@ Patch25: kdebase-workspace-4.7.2-bz#747982-launchers.patch
 
 ## upstreamable patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
-Patch50: kdebase-workspace-4.6.80-kde#171685.patch
+Patch50: kde-workspace-4.7.80-kde#171685.patch
 
 # use /etc/login.defs to define a 'system' account instead of hard-coding 500 
-Patch52: kdebase-workspace-4.7.0-bz#732830-login.patch
+Patch52: kde-workspace-4.7.80-bz#732830-login.patch
 
 ## upstream patches
-# battery plasmoid fixes (#753429)
-Patch100: kdebase-workspace-4.7.4-batteryplasmoid.patch
-# Crash in TaskManager::TaskItem::task (kde#272495)
-Patch101: kde-workspace-4.7.3-kdebug272495.patch
-# Crashes When Adding Weather Widgets (Geolocation) [gps_read, Gpsd::run] (kde#277036)
-Patch102: kde-workspace-4.7.3-kdebug277036.patch
 
 ## plasma active patches
-# adapted version of fix-wetab-power-button-freeze.patch
-Patch150: kde-workspace-4.7.3-fix-wetab-power-button-freeze.patch
-Patch151: nepomuksearch-566052f0.diff
-# adapted/fixed version of ksplash-qml.diff
-Patch152: kde-workspace-4.7.3-ksplash-qml.patch 
 # adapted version of wac-html-widgets.patch
-Patch153: kde-workspace-4.7.3-wac-html-widgets.patch
+Patch153: kde-workspace-4.7.80-wac-html-widgets.patch
 Patch154: kwin-check-opengl.diff
 
 ## Fedora specific patches
 ## HAL-ectomy
-Patch200: kdebase-workspace-4.5.85-no_HAL.patch
+Patch200: kde-workspace-4.7.80-no_HAL.patch
 Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
 
 ## trunk patches
-# Fix possible uninitialized variable use in ksplashx multi-screen code
-Patch300: kde-workspace-4.7.3-ksplashx.patch
-# There are a bug in Kwin when using nVidia + TwinView + 2 monitors with
-# differents resolutions, see https://bugs.kde.org/show_bug.cgi?id=286146 and
-# https://bugs.kde.org/show_bug.cgi?id=285967
-Patch301: kdebase-workspace-4.8.0-kwin-twinview.patch
 
 # multilib fixed in 4.6.3-5, see https://bugzilla.redhat.com/704840
 Obsoletes: kdebase-workspace < 4.6.3-5 
@@ -390,24 +373,16 @@ Requires: akonadi
 %patch52 -p1 -b .bz#732830-login
 
 # upstream patches
-%patch100 -p1 -b .battery
-%patch101 -p1 -b .kdebug272495
-%patch102 -p1 -b .kdebug277036
 
 # plasma-active
-%patch150 -p1 -b .fix-wetab-power-button-freeze
-%patch151 -p1 -b .nepomuksearch-566052f0
-%patch152 -p1 -b .ksplash-qml
 %patch153 -p1 -b .wac-html-widgets
 %patch154 -p1 -b .kwin-check-opengl
 
 # Fedora patches
-%patch200 -p0 -b .no_HAL
+%patch200 -p1 -b .no_HAL
 %patch210 -p1 -b .no_HAL2
 
 # trunk patches
-%patch300 -p1 -b .ksplashx
-%patch301 -p1 -b .twinview
 
 %build
 
@@ -872,6 +847,9 @@ fi
 
 
 %changelog
+* Fri Nov 18 2011 Jaroslav Reznik <jreznik at redhat.com> 4.7.80-1
+- 4.7.80 (beta 1)
+
 * Thu Nov 17 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-13
 - add plasma-active patches
 
diff --git a/sources b/sources
index 57bbaf4..60e5f8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f65eafd8d1a48a16be272d5383b3e22a  kde-workspace-4.7.3.tar.bz2
+490748c0b3fa4c0ee418e1b1bfcf3e9f  kde-workspace-4.7.80.tar.bz2

More information about the scm-commits mailing list