[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-7+squeeze1-110-g4ad8b69

Modestas Vainius modax at alioth.debian.org
Mon Mar 28 22:12:00 UTC 2011


The following commit has been merged in the master branch:
commit b7c3a6608edd735dc17bd6c2b43a298c5c6ee4bd
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Mar 29 00:43:12 2011 +0300

    Refresh patches.
---
 .../be_better_at_honouring_user_kdm_theming.diff   |    2 +-
 debian/patches/fix_target_link_libraries.diff      |   16 ++---
 debian/patches/genkdm_make.diff                    |    8 +--
 debian/patches/genkdmconf.diff                     |   18 +++---
 debian/patches/kdm_X_path.diff                     |    4 +-
 debian/patches/kdm_does_not_wreak_havoc.diff       |    8 +--
 debian/patches/kdm_no_custom.diff                  |   10 +--
 debian/patches/kdm_xreset_hook_framework.diff      |    2 +-
 debian/patches/kdmrc_defaults.diff                 |   18 +++---
 debian/patches/place_global_config_in_etc.diff     |   60 ++++++++------------
 debian/patches/plasma_netbook_fix_autostart.diff   |   20 +++---
 .../patches/qguiplatformplugin_kde_NULL_check.diff |    8 +--
 debian/patches/use_dejavu_as_default_font.diff     |    2 +-
 13 files changed, 73 insertions(+), 103 deletions(-)

diff --git a/debian/patches/be_better_at_honouring_user_kdm_theming.diff b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
index e45c2a2..abced58 100644
--- a/debian/patches/be_better_at_honouring_user_kdm_theming.diff
+++ b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -2679,7 +2679,7 @@
+@@ -2679,7 +2679,7 @@ Key: Theme
  Type: string
  Default: ""
  User: greeter
diff --git a/debian/patches/fix_target_link_libraries.diff b/debian/patches/fix_target_link_libraries.diff
index 5141c30..08c13ac 100644
--- a/debian/patches/fix_target_link_libraries.diff
+++ b/debian/patches/fix_target_link_libraries.diff
@@ -1,8 +1,6 @@
-Index: kdebase-workspace/libs/kworkspace/CMakeLists.txt
-===================================================================
---- kdebase-workspace.orig/libs/kworkspace/CMakeLists.txt	2010-11-05 11:47:18.000000000 +0100
-+++ kdebase-workspace/libs/kworkspace/CMakeLists.txt	2010-12-18 22:36:55.306819074 +0100
-@@ -65,6 +65,7 @@
+--- a/libs/kworkspace/CMakeLists.txt
++++ b/libs/kworkspace/CMakeLists.txt
+@@ -65,6 +65,7 @@ endif(WIN32)
  kde4_add_library(kworkspace ${LIB_MODE} ${kworkspace_LIB_SRCS})
  
  target_link_libraries(kworkspace  ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} )
@@ -10,11 +8,9 @@ Index: kdebase-workspace/libs/kworkspace/CMakeLists.txt
  
  set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS kworkspace EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
-Index: kdebase-workspace/libs/taskmanager/CMakeLists.txt
-===================================================================
---- kdebase-workspace.orig/libs/taskmanager/CMakeLists.txt	2010-11-11 15:40:48.000000000 +0100
-+++ kdebase-workspace/libs/taskmanager/CMakeLists.txt	2010-12-18 22:36:55.306819074 +0100
-@@ -47,6 +47,7 @@
+--- a/libs/taskmanager/CMakeLists.txt
++++ b/libs/taskmanager/CMakeLists.txt
+@@ -47,6 +47,7 @@ endif (X11_Xcomposite_FOUND)
  target_link_libraries(taskmanager kephal)
  target_link_libraries(taskmanager kworkspace)
  
diff --git a/debian/patches/genkdm_make.diff b/debian/patches/genkdm_make.diff
index 8331088..cd711ea 100644
--- a/debian/patches/genkdm_make.diff
+++ b/debian/patches/genkdm_make.diff
@@ -2,11 +2,9 @@ As we use DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config
 and we want kdm configuration files in /etc/kde4/kdm,
 Let's hardcode it.
 
-Index: kdebase-workspace/kdm/kfrontend/CMakeLists.txt
-===================================================================
---- kdebase-workspace.orig/kdm/kfrontend/CMakeLists.txt	2010-10-27 21:55:03.000000000 +0200
-+++ kdebase-workspace/kdm/kfrontend/CMakeLists.txt	2010-12-18 21:00:13.950319340 +0100
-@@ -112,5 +112,5 @@
+--- a/kdm/kfrontend/CMakeLists.txt
++++ b/kdm/kfrontend/CMakeLists.txt
+@@ -112,5 +112,5 @@ install(TARGETS kdmctl ${INSTALL_TARGETS
  
  # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h)
  install(CODE "
diff --git a/debian/patches/genkdmconf.diff b/debian/patches/genkdmconf.diff
index 5ad8545..2c2925b 100644
--- a/debian/patches/genkdmconf.diff
+++ b/debian/patches/genkdmconf.diff
@@ -1,8 +1,6 @@
-Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
-===================================================================
---- kdebase-workspace.orig/kdm/kfrontend/genkdmconf.c	2010-12-18 20:44:27.000000000 +0100
-+++ kdebase-workspace/kdm/kfrontend/genkdmconf.c	2010-12-18 20:56:31.274321200 +0100
-@@ -613,7 +613,7 @@
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
+@@ -613,7 +613,7 @@ static const char def_xaccess[] =
  "# right hand sides can match.\n"
  "#\n"
  "\n"
@@ -11,7 +9,7 @@ Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
  "\n"
  "#\n"
  "# To hardwire a specific terminal to a specific host, you can\n"
-@@ -631,7 +631,7 @@
+@@ -631,7 +631,7 @@ static const char def_xaccess[] =
  "# so this may not work in all environments.\n"
  "#\n"
  "\n"
@@ -20,7 +18,7 @@ Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
  "\n"
  "#\n"
  "# If you would prefer to configure the set of hosts each terminal sees,\n"
-@@ -667,16 +667,18 @@
+@@ -667,16 +667,18 @@ static const char def_startup[] =
  "#! /bin/sh\n"
  "# Xstartup - run as root before session starts\n"
  "\n"
@@ -48,7 +46,7 @@ Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
  "\n"
  "# NOTE: The session is aborted if the last command returns non-zero.\n";
  
-@@ -722,6 +724,7 @@
+@@ -722,6 +724,7 @@ static const char def_session1[] =
  "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
  "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
  "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
@@ -56,7 +54,7 @@ Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
  "    ;;\n"
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
-@@ -739,32 +742,8 @@
+@@ -739,32 +742,8 @@ static const char def_session2[] =
  "    ;;\n"
  "esac\n"
  "\n"
@@ -91,7 +89,7 @@ Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
  
  static const char def_background[] =
  "[Desktop0]\n"
-@@ -1115,29 +1094,6 @@
+@@ -1115,29 +1094,6 @@ getInitTab(void)
  
      if (maxTTY)
          return;
diff --git a/debian/patches/kdm_X_path.diff b/debian/patches/kdm_X_path.diff
index d9d2125..dde74d2 100644
--- a/debian/patches/kdm_X_path.diff
+++ b/debian/patches/kdm_X_path.diff
@@ -1,6 +1,6 @@
 --- a/kdm/backend/dm.c
 +++ b/kdm/backend/dm.c
-@@ -608,7 +608,13 @@
+@@ -608,7 +608,13 @@ startRemoteLogin(struct display *d)
              exit(1);
          debug("exec %\"[s\n", argv);
          (void)execv(argv[0], argv);
@@ -17,7 +17,7 @@
          logError("Forking X server for remote login failed: %m");
 --- a/kdm/backend/server.c
 +++ b/kdm/backend/server.c
-@@ -97,6 +97,12 @@
+@@ -97,6 +97,12 @@ startServerOnce(void)
           */
          (void)Signal(SIGUSR1, SIG_IGN);
          (void)execv(argv[0], argv);
diff --git a/debian/patches/kdm_does_not_wreak_havoc.diff b/debian/patches/kdm_does_not_wreak_havoc.diff
index 797c066..0caa199 100644
--- a/debian/patches/kdm_does_not_wreak_havoc.diff
+++ b/debian/patches/kdm_does_not_wreak_havoc.diff
@@ -1,8 +1,6 @@
-Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
-===================================================================
---- kdebase-workspace.orig/kdm/kfrontend/genkdmconf.c	2010-12-18 20:44:22.682071103 +0100
-+++ kdebase-workspace/kdm/kfrontend/genkdmconf.c	2010-12-18 20:44:27.662318969 +0100
-@@ -3141,9 +3141,11 @@
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
+@@ -3141,9 +3141,11 @@ int main(int argc, char **argv)
                  memcmp(oldkde + olen - sizeof(SHR_CONF) + 1,
                         SHR_CONF, sizeof(SHR_CONF)))
              {
diff --git a/debian/patches/kdm_no_custom.diff b/debian/patches/kdm_no_custom.diff
index 52e2165..f6ffbc5 100644
--- a/debian/patches/kdm_no_custom.diff
+++ b/debian/patches/kdm_no_custom.diff
@@ -1,8 +1,6 @@
-Index: kdebase-workspace/kdm/kfrontend/kgreeter.cpp
-===================================================================
---- kdebase-workspace.orig/kdm/kfrontend/kgreeter.cpp	2010-08-05 18:55:46.000000000 +0200
-+++ kdebase-workspace/kdm/kfrontend/kgreeter.cpp	2010-12-18 21:00:27.122127452 +0100
-@@ -451,7 +451,6 @@
+--- a/kdm/kfrontend/kgreeter.cpp
++++ b/kdm/kfrontend/kgreeter.cpp
+@@ -451,7 +451,6 @@ void
  KGreeter::putSession(const QString &type, const QString &name, bool hid, const char *exe)
  {
      int prio = exe ? (!strcmp(exe, "default") ? 0 :
@@ -10,7 +8,7 @@ Index: kdebase-workspace/kdm/kfrontend/kgreeter.cpp
                        !strcmp(exe, "failsafe") ? 3 : 2) : 2;
      for (int i = 0; i < sessionTypes.size(); i++)
          if (sessionTypes[i].type == type) {
-@@ -480,7 +479,6 @@
+@@ -480,7 +479,6 @@ KGreeter::insertSessions()
                              dsk.readEntry("Exec").toLatin1());
              }
      putSession("default", i18nc("@item:inlistbox session type", "Default"), false, "default");
diff --git a/debian/patches/kdm_xreset_hook_framework.diff b/debian/patches/kdm_xreset_hook_framework.diff
index 9b1d0ab..c172e6e 100644
--- a/debian/patches/kdm_xreset_hook_framework.diff
+++ b/debian/patches/kdm_xreset_hook_framework.diff
@@ -5,7 +5,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
-@@ -692,7 +692,12 @@
+@@ -692,7 +692,12 @@ static const char def_reset[] =
  "#chown root /dev/console\n"
  "#chmod 622 /dev/console\n"
  "\n"
diff --git a/debian/patches/kdmrc_defaults.diff b/debian/patches/kdmrc_defaults.diff
index bca0f37..c67e878 100644
--- a/debian/patches/kdmrc_defaults.diff
+++ b/debian/patches/kdmrc_defaults.diff
@@ -1,7 +1,5 @@
-Index: kdebase-workspace/kdm/config.def
-===================================================================
---- kdebase-workspace.orig/kdm/config.def	2010-12-18 20:44:08.786127265 +0100
-+++ kdebase-workspace/kdm/config.def	2010-12-18 20:45:45.790819514 +0100
+--- a/kdm/config.def
++++ b/kdm/config.def
 @@ -49,11 +49,11 @@
  #endif
  
@@ -18,7 +16,7 @@ Index: kdebase-workspace/kdm/config.def
  #endif
  
  #if 0 /*def HASXDMAUTH*/
-@@ -1369,13 +1369,13 @@
+@@ -1369,13 +1369,13 @@ Description:
   This string is subject to word splitting.
   </para><para>
   The default is something reasonable for the system on which &kdm; was built,
@@ -34,7 +32,7 @@ Index: kdebase-workspace/kdm/config.def
  Comment: &
  Description:
   Additional arguments for the &X-Server;s for local sessions.
-@@ -1929,10 +1929,10 @@
+@@ -1929,10 +1929,10 @@ Description:
  
  Key: SessionsDirs
  Type: list
@@ -47,7 +45,7 @@ Index: kdebase-workspace/kdm/config.def
  Update: upd_sessionsdirs
  Comment:
   The directories containing session type definitions in .desktop format,
-@@ -2001,7 +2001,7 @@
+@@ -2001,7 +2001,7 @@ Description:
  
  Key: UseSessReg
  Type: bool
@@ -56,7 +54,7 @@ Index: kdebase-workspace/kdm/config.def
  User: core
  Instance: #*/!
  Comment:
-@@ -2092,9 +2092,9 @@
+@@ -2092,9 +2092,9 @@ Description:
  
  Key: GreetString
  Type: string
@@ -68,7 +66,7 @@ Index: kdebase-workspace/kdm/config.def
  Comment:
   The headline in the greeter. The following character pairs are replaced:
   - %d -> current display
-@@ -2553,7 +2553,6 @@
+@@ -2553,7 +2553,6 @@ Type: int
  Default: 0
  User: greeter
  Instance: #*/
@@ -76,7 +74,7 @@ Index: kdebase-workspace/kdm/config.def
  Comment:
   Random seed for forging saved session types, etc. of unknown users.
   This value should be random but constant across the login domain.
-@@ -2650,7 +2649,7 @@
+@@ -2650,7 +2649,7 @@ Key: AllowClose
  Type: bool
  Default: true
  User: greeter
diff --git a/debian/patches/place_global_config_in_etc.diff b/debian/patches/place_global_config_in_etc.diff
index 5a48c78..ac8724e 100644
--- a/debian/patches/place_global_config_in_etc.diff
+++ b/debian/patches/place_global_config_in_etc.diff
@@ -5,10 +5,8 @@ we can detect possible new uses of KDE_CONFDIR in upstream code that might
 have trouble if we apply this patch. With the renamed define, it will at
 least FTBFS, so that we have the chance to inspect.
 
-Index: kdebase-workspace/config-workspace.h.cmake
-===================================================================
---- kdebase-workspace.orig/config-workspace.h.cmake	2009-03-27 15:46:42.000000000 +0100
-+++ kdebase-workspace/config-workspace.h.cmake	2010-12-18 22:10:20.366072714 +0100
+--- a/config-workspace.h.cmake
++++ b/config-workspace.h.cmake
 @@ -121,7 +121,7 @@
  #define KDE_BINDIR "${BIN_INSTALL_DIR}"
  
@@ -18,11 +16,9 @@ Index: kdebase-workspace/config-workspace.h.cmake
  
  /* KDE's static data directory */
  #define KDE_DATADIR "${DATA_INSTALL_DIR}"
-Index: kdebase-workspace/kdm/kcm/main.cpp
-===================================================================
---- kdebase-workspace.orig/kdm/kcm/main.cpp	2010-10-27 21:55:02.000000000 +0200
-+++ kdebase-workspace/kdm/kcm/main.cpp	2010-12-18 22:10:20.366072714 +0100
-@@ -282,7 +282,7 @@
+--- a/kdm/kcm/main.cpp
++++ b/kdm/kcm/main.cpp
+@@ -282,7 +282,7 @@ KConfig *KDModule::createTempConfig()
      QString tempConfigName = pTempConfigFile->fileName();
  
      KConfig *pSystemKDMConfig = new KConfig(
@@ -31,7 +27,7 @@ Index: kdebase-workspace/kdm/kcm/main.cpp
  
      KConfig *pTempConfig = pSystemKDMConfig->copyTo(tempConfigName);
      pTempConfig->sync();
-@@ -301,7 +301,7 @@
+@@ -301,7 +301,7 @@ KSharedConfigPtr KDModule::createBackgro
  
      QString systemBackgroundConfigName =
          config->group("X-*-Greeter").readEntry(
@@ -40,10 +36,8 @@ Index: kdebase-workspace/kdm/kcm/main.cpp
  
      KConfig systemBackgroundConfig(systemBackgroundConfigName);
      KSharedConfigPtr pTempConfig = KSharedConfig::openConfig(tempBackgroundConfigName);
-Index: kdebase-workspace/kdm/config.def
-===================================================================
---- kdebase-workspace.orig/kdm/config.def	2010-12-18 22:10:16.866820187 +0100
-+++ kdebase-workspace/kdm/config.def	2010-12-18 22:10:20.370070760 +0100
+--- a/kdm/config.def
++++ b/kdm/config.def
 @@ -29,7 +29,7 @@
  #define RCVERMAJOR 2
  #define RCVERMINOR 4
@@ -53,11 +47,9 @@ Index: kdebase-workspace/kdm/config.def
  #define KDMDATA KDE_DATADIR "/kdm"
  
  #include <sys/param.h> /* for #define BSD */
-Index: kdebase-workspace/kdm/kfrontend/kdmctl.c
-===================================================================
---- kdebase-workspace.orig/kdm/kfrontend/kdmctl.c	2010-11-19 11:51:19.000000000 +0100
-+++ kdebase-workspace/kdm/kfrontend/kdmctl.c	2010-12-18 22:10:20.370070760 +0100
-@@ -148,7 +148,7 @@
+--- a/kdm/kfrontend/kdmctl.c
++++ b/kdm/kfrontend/kdmctl.c
+@@ -148,7 +148,7 @@ main(int argc, char **argv)
  {
      char *dpy = getenv("DISPLAY");
      const char *ctl = getenv("DM_CONTROL");
@@ -66,11 +58,9 @@ Index: kdebase-workspace/kdm/kfrontend/kdmctl.c
      char *ptr;
      int fd;
  
-Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
-===================================================================
---- kdebase-workspace.orig/kdm/kfrontend/genkdmconf.c	2010-12-18 22:10:12.634569938 +0100
-+++ kdebase-workspace/kdm/kfrontend/genkdmconf.c	2010-12-18 22:10:20.370070760 +0100
-@@ -2918,7 +2918,7 @@
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
+@@ -2918,7 +2918,7 @@ fprintfLineWrap(FILE *f, const char *msg
  
  
  static const char * const oldkdes[] = {
@@ -79,7 +69,7 @@ Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
      "/opt/kde4/share/config",
      "/usr/local/kde4/share/config",
  
-@@ -2926,6 +2926,7 @@
+@@ -2926,6 +2926,7 @@ static const char * const oldkdes[] = {
      "/usr/local/kde/share/config",
      "/usr/local/share/config",
      "/usr/share/config",
@@ -87,7 +77,7 @@ Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
  
      "/opt/kde3/share/config",
      "/usr/local/kde3/share/config",
-@@ -2969,7 +2970,7 @@
+@@ -2969,7 +2970,7 @@ int main(int argc, char **argv)
  "    Note that you possibly need to use --no-old-kde to make this take effect.\n"
  "  --old-kde /path/to/old/kde-config-dir\n"
  "    Where to look for the kdmrc of a previously installed kdm.\n"
@@ -96,11 +86,9 @@ Index: kdebase-workspace/kdm/kfrontend/genkdmconf.c
  "    {/usr,/usr/local,{/opt,/usr/local}/{kde4,kde,kde3}}/share/config.\n"
  "  --no-old\n"
  "    Do not look at older xdm/kdm configurations, just create default config.\n"
-Index: kdebase-workspace/kdm/kcm/helper.cpp
-===================================================================
---- kdebase-workspace.orig/kdm/kcm/helper.cpp	2010-10-27 21:55:02.000000000 +0200
-+++ kdebase-workspace/kdm/kcm/helper.cpp	2010-12-18 22:10:20.370070760 +0100
-@@ -131,9 +131,9 @@
+--- a/kdm/kcm/helper.cpp
++++ b/kdm/kcm/helper.cpp
+@@ -131,9 +131,9 @@ ActionReply Helper::save(const QVariantM
      QString tempConfigName = args.value("tempkdmrcfile").toString();
      QString tempBackgroundConfigName = args.value("tempbackgroundrcfile").toString();
  
@@ -112,7 +100,7 @@ Index: kdebase-workspace/kdm/kcm/helper.cpp
  
      int code = 0;
  
-@@ -167,7 +167,7 @@
+@@ -167,7 +167,7 @@ ActionReply Helper::managefaces(const QV
  {
      int subaction = args.value("subaction").toInt();
      QString facesDir =
@@ -121,11 +109,9 @@ Index: kdebase-workspace/kdm/kcm/helper.cpp
              .group("X-*-Greeter").readEntry("FaceDir",
                  KStandardDirs::installPath("data") + "kdm/faces") + '/';
  
-Index: kdebase-workspace/kcontrol/dateandtime/helper.cpp
-===================================================================
---- kdebase-workspace.orig/kcontrol/dateandtime/helper.cpp	2010-09-01 15:36:50.000000000 +0200
-+++ kdebase-workspace/kcontrol/dateandtime/helper.cpp	2010-12-18 22:10:20.370070760 +0100
-@@ -54,7 +54,7 @@
+--- a/kcontrol/dateandtime/helper.cpp
++++ b/kcontrol/dateandtime/helper.cpp
+@@ -54,7 +54,7 @@ int ClockHelper::ntp( const QStringList&
    int ret = 0;
  
    // write to the system config file
diff --git a/debian/patches/plasma_netbook_fix_autostart.diff b/debian/patches/plasma_netbook_fix_autostart.diff
index e4b0143..046dc3a 100644
--- a/debian/patches/plasma_netbook_fix_autostart.diff
+++ b/debian/patches/plasma_netbook_fix_autostart.diff
@@ -9,7 +9,7 @@ installation via kde-plasma-netbook metapackage hence this bug was a
 showstopper for this goal.
 --- a/kcontrol/workspaceoptions/workspaceoptions.cpp
 +++ b/kcontrol/workspaceoptions/workspaceoptions.cpp
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ void WorkspaceOptionsModule::save()
  
      m_plasmaNetbookAutostart.setAutostarts(!isDesktop);
      m_plasmaNetbookAutostart.setStartPhase(KAutostart::BaseDesktop);
@@ -20,7 +20,7 @@ showstopper for this goal.
      m_krunnerAutostart.setAutostarts(isDesktop);
 --- a/plasma/netbook/shell/main.cpp
 +++ b/plasma/netbook/shell/main.cpp
-@@ -40,10 +40,16 @@
+@@ -40,10 +40,16 @@ KDE_EXPORT int kdemain(int argc, char **
  
  
      bool customGraphicsSystem = false;
@@ -38,7 +38,7 @@ showstopper for this goal.
          }
      }
  
-@@ -58,9 +64,16 @@
+@@ -58,9 +64,16 @@ KDE_EXPORT int kdemain(int argc, char **
      options.add("nodesktop", ki18n("Starts as a normal application instead of as the primary user interface"));
      options.add("opengl", ki18n("Use OpenGL to draw the main screen"));
      options.add("screen <geometry>", ki18n("The geometry of the screen"), "800x480");
@@ -65,7 +65,7 @@ showstopper for this goal.
  
  #include <ksmserver_interface.h>
  
-@@ -320,7 +321,8 @@
+@@ -320,7 +321,8 @@ PlasmaApp::PlasmaApp()
        m_autoHideControlBar(true),
        m_unHideTimer(0),
        m_shadowWindow(0),
@@ -75,7 +75,7 @@ showstopper for this goal.
  {
      PlasmaApp::suspendStartup(true);
      KGlobal::locale()->insertCatalog("libplasma");
-@@ -328,6 +330,13 @@
+@@ -328,6 +330,13 @@ PlasmaApp::PlasmaApp()
  
  
      KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -89,7 +89,7 @@ showstopper for this goal.
      bool isDesktop = args->isSet("desktop");
      if (isDesktop) {
          KCrash::setFlags(KCrash::AutoRestart);
-@@ -397,6 +406,38 @@
+@@ -397,6 +406,38 @@ PlasmaApp::~PlasmaApp()
  {
  }
  
@@ -130,7 +130,7 @@ showstopper for this goal.
      if (m_corona) {
 --- a/plasma/netbook/shell/plasmaapp.h
 +++ b/plasma/netbook/shell/plasmaapp.h
-@@ -87,6 +87,12 @@
+@@ -87,6 +87,12 @@ public:
       */
      bool isDesktop() const;
  
@@ -143,7 +143,7 @@ showstopper for this goal.
      void showWidgetExplorer(Plasma::Containment *containment);
  
  public Q_SLOTS:
-@@ -105,6 +111,7 @@
+@@ -105,6 +111,7 @@ private:
      void reserveStruts();
      void createUnhideTrigger();
      void destroyUnHideTrigger();
@@ -151,7 +151,7 @@ showstopper for this goal.
  
  private Q_SLOTS:
      void cleanup();
-@@ -152,6 +159,7 @@
+@@ -152,6 +159,7 @@ private:
      QTimer *m_unHideTimer;
      ShadowWindow *m_shadowWindow;
      int m_startupSuspendWaitCount;
@@ -161,7 +161,7 @@ showstopper for this goal.
  #endif // multiple inclusion guard
 --- a/startkde.cmake
 +++ b/startkde.cmake
-@@ -301,6 +301,24 @@
+@@ -291,6 +291,24 @@ else
      exit 1
  fi
  
diff --git a/debian/patches/qguiplatformplugin_kde_NULL_check.diff b/debian/patches/qguiplatformplugin_kde_NULL_check.diff
index fbf46f3..6b4f186 100644
--- a/debian/patches/qguiplatformplugin_kde_NULL_check.diff
+++ b/debian/patches/qguiplatformplugin_kde_NULL_check.diff
@@ -4,11 +4,9 @@ Author: "Dr. David Alan Gilbert" <debian at treblig.org>
 Signed-By: Didier Raboud <didier at raboud.com>
 Bugs-Debian: #603480
 Last-Update: 2010-11-28
-Index: kdebase-workspace/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
-===================================================================
---- kdebase-workspace.orig/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp	2010-06-01 20:10:52.000000000 +0200
-+++ kdebase-workspace/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp	2010-12-18 22:31:42.726096651 +0100
-@@ -247,7 +247,9 @@
+--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
++++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+@@ -247,7 +247,9 @@ public: // File Dialog integration
              kdefd->setConfirmOverwrite(qfd->confirmOverwrite());
              kdefd->setSelection(qfd->selectedFiles().value(0));
          }
diff --git a/debian/patches/use_dejavu_as_default_font.diff b/debian/patches/use_dejavu_as_default_font.diff
index 2dbd349..e47d9b8 100644
--- a/debian/patches/use_dejavu_as_default_font.diff
+++ b/debian/patches/use_dejavu_as_default_font.diff
@@ -1,6 +1,6 @@
 --- a/kcontrol/fonts/fonts.cpp
 +++ b/kcontrol/fonts/fonts.cpp
-@@ -514,12 +514,12 @@
+@@ -514,12 +514,12 @@ KFonts::KFonts(QWidget *parent, const QV
  
    // NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp
  

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list