[SCM] KDE Base Workspace module packaging branch, kde4.11, updated. debian/4.10.5-3-9-g4c945e9
Maximiliano Curia
maxy at alioth.debian.org
Sat Sep 28 14:24:37 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=7d66349
The following commit has been merged in the kde4.11 branch:
commit 7d663497e350320dc352a3590c9c5a0d998e8890
Author: Maximiliano Curia <maxy at debian.org>
Date: Fri Sep 27 09:24:50 2013 +0000
Refresh patches, remove patches already applied.
---
debian/changelog | 1 +
debian/patches/enable_debianabimanager.diff | 12 ++-
debian/patches/enable_dlrestrcitions.diff | 8 +-
debian/patches/fix_target_link_libraries.diff | 16 +--
debian/patches/kdm_does_not_wreak_havoc.diff | 8 +-
debian/patches/kdm_vt_switching_on_kfreebsd.diff | 66 ++++++++-----
debian/patches/place_global_config_in_etc.diff | 70 ++++++++-----
debian/patches/plasma_netbook_fix_autostart.diff | 50 ++++++----
.../patches/qguiplatformplugin_kde_NULL_check.diff | 8 +-
debian/patches/series | 2 -
...leak-when-the-tray-icon-changes-e.g.-when.patch | 60 ------------
...ass-Check-for-NULL-return-from-crypt-3-an.patch | 103 --------------------
12 files changed, 145 insertions(+), 259 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1a3a35b..8631470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
kde-workspace (4:4.11.1-0r0) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh patches, remove patches already applied.
-- Maximiliano Curia <maxy at debian.org> Tue, 03 Sep 2013 20:14:59 +0200
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index 139611b..5416313 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -8,12 +8,14 @@ For more information about DebianABIManager, refer to
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -267,3 +267,6 @@ install(EXPORT kdeworkspaceLibraryTarget
- NAMESPACE ${KDE4WORKSPACE_TARGET_PREFIX}
+Index: kde-workspace/CMakeLists.txt
+===================================================================
+--- kde-workspace.orig/CMakeLists.txt 2013-09-27 09:22:39.945217631 +0000
++++ kde-workspace/CMakeLists.txt 2013-09-27 09:23:07.988119020 +0000
+@@ -357,4 +357,5 @@
DESTINATION ${_KDE4WorkspaceConfig_INSTALL_DIR}
FILE KDE4WorkspaceLibraryTargets.cmake )
-+
+
+-
+# Add support for DebianABIManager
+include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/enable_dlrestrcitions.diff b/debian/patches/enable_dlrestrcitions.diff
index 34f58f0..8902c64 100644
--- a/debian/patches/enable_dlrestrcitions.diff
+++ b/debian/patches/enable_dlrestrcitions.diff
@@ -7,9 +7,11 @@ Last-Update: 2011-08-11
Enable REJECT:OTHERSOVERSION for these libraries because their ABI is typically
not stable and structures frequently conflict.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -270,3 +270,10 @@ install(EXPORT kdeworkspaceLibraryTarget
+Index: kde-workspace/CMakeLists.txt
+===================================================================
+--- kde-workspace.orig/CMakeLists.txt 2013-09-27 09:23:21.955571821 +0000
++++ kde-workspace/CMakeLists.txt 2013-09-27 09:23:21.951571977 +0000
+@@ -359,3 +359,10 @@
# Add support for DebianABIManager
include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/fix_target_link_libraries.diff b/debian/patches/fix_target_link_libraries.diff
index ea288cb..303967d 100644
--- a/debian/patches/fix_target_link_libraries.diff
+++ b/debian/patches/fix_target_link_libraries.diff
@@ -2,9 +2,11 @@ From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Subject: Fix target link libraries
Forwarded: not-needed
Last-Update: 2012-01-30
---- a/libs/kworkspace/CMakeLists.txt
-+++ b/libs/kworkspace/CMakeLists.txt
-@@ -51,6 +51,7 @@ qt4_add_dbus_interface( kworkspace_LIB_S
+Index: kde-workspace/libs/kworkspace/CMakeLists.txt
+===================================================================
+--- kde-workspace.orig/libs/kworkspace/CMakeLists.txt 2013-09-27 09:22:10.182383595 +0000
++++ kde-workspace/libs/kworkspace/CMakeLists.txt 2013-09-27 09:22:10.174383908 +0000
+@@ -51,6 +51,7 @@
kde4_add_library(kworkspace SHARED ${kworkspace_LIB_SRCS})
target_link_libraries(kworkspace ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} )
@@ -12,9 +14,11 @@ Last-Update: 2012-01-30
set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} DEFINE_SYMBOL MAKE_KWORKSPACE_LIB)
install(TARGETS kworkspace EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
---- a/libs/taskmanager/CMakeLists.txt
-+++ b/libs/taskmanager/CMakeLists.txt
-@@ -50,6 +50,7 @@ if (NOT KDE_PLATFORM_FEATURE_BINARY_COMP
+Index: kde-workspace/libs/taskmanager/CMakeLists.txt
+===================================================================
+--- kde-workspace.orig/libs/taskmanager/CMakeLists.txt 2013-09-27 09:22:10.182383595 +0000
++++ kde-workspace/libs/taskmanager/CMakeLists.txt 2013-09-27 09:22:10.174383908 +0000
+@@ -51,6 +51,7 @@
target_link_libraries(taskmanager kephal)
endif (NOT KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
diff --git a/debian/patches/kdm_does_not_wreak_havoc.diff b/debian/patches/kdm_does_not_wreak_havoc.diff
index f6ccda5..8529f67 100644
--- a/debian/patches/kdm_does_not_wreak_havoc.diff
+++ b/debian/patches/kdm_does_not_wreak_havoc.diff
@@ -2,9 +2,11 @@ From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Subject: Comment out error message
Forwarded: not-needed
Last-Update: 2012-06-05
---- a/kdm/kfrontend/genkdmconf.c
-+++ b/kdm/kfrontend/genkdmconf.c
-@@ -3154,9 +3154,11 @@ int main(int argc, char **argv)
+Index: kde-workspace/kdm/kfrontend/genkdmconf.c
+===================================================================
+--- kde-workspace.orig/kdm/kfrontend/genkdmconf.c 2013-09-27 09:16:47.891007661 +0000
++++ kde-workspace/kdm/kfrontend/genkdmconf.c 2013-09-27 09:16:47.887007817 +0000
+@@ -3153,9 +3153,11 @@
memcmp(oldkde + olen - sizeof(SHR_CONF) + 1,
SHR_CONF, sizeof(SHR_CONF)))
{
diff --git a/debian/patches/kdm_vt_switching_on_kfreebsd.diff b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
index de2a130..869c23f 100644
--- a/debian/patches/kdm_vt_switching_on_kfreebsd.diff
+++ b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
@@ -10,9 +10,11 @@ vt2 on bootup and locking up keyboard/mouse input.
This revision of the patch is pretty hackish. What is more, it does not cover
FreeBSD (only kFreeBSD) while it could perfectly do so.
---- a/kdm/backend/dm.c
-+++ b/kdm/backend/dm.c
-@@ -47,7 +47,13 @@ from the copyright holder.
+Index: kde-workspace/kdm/backend/dm.c
+===================================================================
+--- kde-workspace.orig/kdm/backend/dm.c 2013-09-27 09:23:30.607232875 +0000
++++ kde-workspace/kdm/backend/dm.c 2013-09-27 09:23:30.595233345 +0000
+@@ -47,7 +47,13 @@
#ifdef HAVE_VTS
# include <sys/ioctl.h>
@@ -26,7 +28,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
#endif
static void sigHandler(int n);
-@@ -349,7 +355,12 @@ updateNow(void)
+@@ -349,7 +355,12 @@
int
TTYtoVT(const char *tty)
{
@@ -40,7 +42,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
}
int
-@@ -1051,9 +1062,15 @@ reapChildren(void)
+@@ -1051,9 +1062,15 @@
} else {
int con = open("/dev/console", O_RDONLY);
if (con >= 0) {
@@ -57,7 +59,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
int vt = 1;
struct display *di;
for (di = displays; di; di = di->next)
-@@ -1066,7 +1083,9 @@ reapChildren(void)
+@@ -1066,7 +1083,9 @@
vt = di->serverVT;
ioctl(con, VT_ACTIVATE, vt);
}
@@ -67,7 +69,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
close(con);
}
}
-@@ -1339,16 +1358,41 @@ static int activeVTs;
+@@ -1339,16 +1358,41 @@
static int
getBusyVTs(void)
{
@@ -112,9 +114,11 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
}
return activeVTs;
}
---- a/kdm/backend/greet.h
-+++ b/kdm/backend/greet.h
-@@ -53,7 +53,7 @@ from the copyright holder.
+Index: kde-workspace/kdm/backend/greet.h
+===================================================================
+--- kde-workspace.orig/kdm/backend/greet.h 2013-09-27 09:23:30.607232875 +0000
++++ kde-workspace/kdm/backend/greet.h 2013-09-27 09:23:30.595233345 +0000
+@@ -53,7 +53,7 @@
# define USE_SYSLOG
#endif
@@ -123,9 +127,11 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
/* This needs to be run-time configurable, additionally. */
# define HAVE_VTS
#endif
---- a/kdm/backend/client.c
-+++ b/kdm/backend/client.c
-@@ -1349,7 +1349,11 @@ startClient(volatile int *pid)
+Index: kde-workspace/kdm/backend/client.c
+===================================================================
+--- kde-workspace.orig/kdm/backend/client.c 2013-09-27 09:23:30.607232875 +0000
++++ kde-workspace/kdm/backend/client.c 2013-09-27 09:23:30.595233345 +0000
+@@ -1352,7 +1352,11 @@
# ifdef HAVE_VTS
if (td->serverVT > 0)
@@ -137,9 +143,11 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
# endif
isLocal = ((td->displayType & d_location) == dLocal);
# ifdef XDMCP
---- a/kdm/kfrontend/genkdmconf.c
-+++ b/kdm/kfrontend/genkdmconf.c
-@@ -1547,7 +1547,8 @@ static void
+Index: kde-workspace/kdm/kfrontend/genkdmconf.c
+===================================================================
+--- kde-workspace.orig/kdm/kfrontend/genkdmconf.c 2013-09-27 09:23:30.607232875 +0000
++++ kde-workspace/kdm/kfrontend/genkdmconf.c 2013-09-27 09:23:30.599233189 +0000
+@@ -1547,7 +1547,8 @@
upd_servervts(Entry *ce, Section *cs ATTR_UNUSED)
{
if (!ce->active) { /* there is only the Global one */
@@ -149,7 +157,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
getInitTab();
ASPrintf((char **)&ce->value, "-%d", maxTTY + 1);
ce->active = ce->written = True;
-@@ -1559,14 +1560,19 @@ static void
+@@ -1559,14 +1560,19 @@
upd_consolettys(Entry *ce, Section *cs ATTR_UNUSED)
{
if (!ce->active) { /* there is only the Global one */
@@ -170,7 +178,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
if (buf) {
ce->value = buf + 1;
ce->active = ce->written = True;
-@@ -3199,7 +3205,7 @@ int main(int argc, char **argv)
+@@ -3198,7 +3204,7 @@
}
}
}
@@ -179,9 +187,11 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
if (!stat("/etc/debian_version", &st)) { /* debian */
defminuid = "1000";
defmaxuid = "29999";
---- a/kdm/config.def
-+++ b/kdm/config.def
-@@ -873,7 +873,7 @@ Description:
+Index: kde-workspace/kdm/config.def
+===================================================================
+--- kde-workspace.orig/kdm/config.def 2013-09-27 09:23:30.607232875 +0000
++++ kde-workspace/kdm/config.def 2013-09-27 09:23:30.599233189 +0000
+@@ -873,7 +873,7 @@
This option is for operating systems (<acronym>OS</acronym>s) with support
for virtual terminals (<acronym>VT</acronym>s), by both &kdm; and the
<acronym>OS</acronym>s itself.
@@ -190,9 +200,11 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
</para><para>
When &kdm; switches to console mode, it starts monitoring all
<acronym>TTY</acronym> lines listed here (without the leading
---- a/kdm/backend/util.c
-+++ b/kdm/backend/util.c
-@@ -54,6 +54,15 @@ from the copyright holder.
+Index: kde-workspace/kdm/backend/util.c
+===================================================================
+--- kde-workspace.orig/kdm/backend/util.c 2013-09-27 09:23:30.607232875 +0000
++++ kde-workspace/kdm/backend/util.c 2013-09-27 09:23:30.599233189 +0000
+@@ -54,6 +54,15 @@
# include <sys/utsname.h>
#endif
@@ -208,7 +220,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
void *
Calloc(size_t nmemb, size_t size)
{
-@@ -663,6 +672,29 @@ hexToBinary(char *out, const char *in)
+@@ -663,6 +672,29 @@
#undef atox
@@ -238,7 +250,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
/* X -from ip6-addr does not work here, so i don't know whether this is needed.
#define IP6_MAGIC
*/
-@@ -682,6 +714,10 @@ listSessions(int flags, struct display *
+@@ -682,6 +714,10 @@
#else
STRUCTUTMP *ut;
#endif
@@ -249,7 +261,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
for (di = displays; di; di = di->next)
if (((flags & lstRemote) || (di->displayType & d_location) == dLocal) &&
-@@ -713,11 +749,19 @@ listSessions(int flags, struct display *
+@@ -713,11 +749,19 @@
if (!(flags & lstRemote))
continue;
} else {
diff --git a/debian/patches/place_global_config_in_etc.diff b/debian/patches/place_global_config_in_etc.diff
index 6f47456..d6db8a5 100644
--- a/debian/patches/place_global_config_in_etc.diff
+++ b/debian/patches/place_global_config_in_etc.diff
@@ -5,9 +5,11 @@ 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.
---- a/config-workspace.h.cmake
-+++ b/config-workspace.h.cmake
-@@ -126,7 +126,7 @@
+Index: kde-workspace/config-workspace.h.cmake
+===================================================================
+--- kde-workspace.orig/config-workspace.h.cmake 2013-09-27 09:17:50.844542047 +0000
++++ kde-workspace/config-workspace.h.cmake 2013-09-27 09:17:50.836542361 +0000
+@@ -129,7 +129,7 @@
#define KDE_BINDIR "${BIN_INSTALL_DIR}"
/* KDE's configuration directory */
@@ -16,9 +18,11 @@ least FTBFS, so that we have the chance to inspect.
/* KDE's static data directory */
#define KDE_DATADIR "${DATA_INSTALL_DIR}"
---- a/kdm/kcm/main.cpp
-+++ b/kdm/kcm/main.cpp
-@@ -282,7 +282,7 @@ KConfig *KDModule::createTempConfig()
+Index: kde-workspace/kdm/kcm/main.cpp
+===================================================================
+--- kde-workspace.orig/kdm/kcm/main.cpp 2013-09-27 09:17:50.844542047 +0000
++++ kde-workspace/kdm/kcm/main.cpp 2013-09-27 09:17:50.836542361 +0000
+@@ -282,7 +282,7 @@
QString tempConfigName = pTempConfigFile->fileName();
KConfig *pSystemKDMConfig = new KConfig(
@@ -27,7 +31,7 @@ least FTBFS, so that we have the chance to inspect.
KConfig *pTempConfig = pSystemKDMConfig->copyTo(tempConfigName);
pTempConfig->sync();
-@@ -301,7 +301,7 @@ KSharedConfigPtr KDModule::createBackgro
+@@ -301,7 +301,7 @@
QString systemBackgroundConfigName =
config->group("X-*-Greeter").readEntry(
@@ -36,8 +40,10 @@ least FTBFS, so that we have the chance to inspect.
KConfig systemBackgroundConfig(systemBackgroundConfigName);
KSharedConfigPtr pTempConfig = KSharedConfig::openConfig(tempBackgroundConfigName);
---- a/kdm/config.def
-+++ b/kdm/config.def
+Index: kde-workspace/kdm/config.def
+===================================================================
+--- kde-workspace.orig/kdm/config.def 2013-09-27 09:17:50.844542047 +0000
++++ kde-workspace/kdm/config.def 2013-09-27 09:17:50.836542361 +0000
@@ -29,7 +29,7 @@
#define RCVERMAJOR 2
#define RCVERMINOR 4
@@ -47,9 +53,11 @@ least FTBFS, so that we have the chance to inspect.
#define KDMDATA KDE_DATADIR "/kdm"
#include <sys/param.h> /* for #define BSD */
---- a/kdm/kfrontend/kdmctl.c
-+++ b/kdm/kfrontend/kdmctl.c
-@@ -148,7 +148,7 @@ main(int argc, char **argv)
+Index: kde-workspace/kdm/kfrontend/kdmctl.c
+===================================================================
+--- kde-workspace.orig/kdm/kfrontend/kdmctl.c 2013-09-27 09:17:50.844542047 +0000
++++ kde-workspace/kdm/kfrontend/kdmctl.c 2013-09-27 09:17:50.836542361 +0000
+@@ -148,7 +148,7 @@
{
char *dpy = getenv("DISPLAY");
const char *ctl = getenv("DM_CONTROL");
@@ -58,9 +66,11 @@ least FTBFS, so that we have the chance to inspect.
char *ptr;
int fd;
---- a/kdm/kfrontend/genkdmconf.c
-+++ b/kdm/kfrontend/genkdmconf.c
-@@ -2927,7 +2927,7 @@ fprintfLineWrap(FILE *f, const char *msg
+Index: kde-workspace/kdm/kfrontend/genkdmconf.c
+===================================================================
+--- kde-workspace.orig/kdm/kfrontend/genkdmconf.c 2013-09-27 09:17:50.844542047 +0000
++++ kde-workspace/kdm/kfrontend/genkdmconf.c 2013-09-27 09:17:50.840542203 +0000
+@@ -2926,7 +2926,7 @@
static const char * const oldkdes[] = {
@@ -69,7 +79,7 @@ least FTBFS, so that we have the chance to inspect.
"/opt/kde4/share/config",
"/usr/local/kde4/share/config",
-@@ -2935,6 +2935,7 @@ static const char * const oldkdes[] = {
+@@ -2934,6 +2934,7 @@
"/usr/local/kde/share/config",
"/usr/local/share/config",
"/usr/share/config",
@@ -77,7 +87,7 @@ least FTBFS, so that we have the chance to inspect.
"/opt/kde3/share/config",
"/usr/local/kde3/share/config",
-@@ -2978,7 +2979,7 @@ int main(int argc, char **argv)
+@@ -2977,7 +2978,7 @@
" Note that you possibly need to use --no-old-kde to make this take effect.
"
" --old-kde /path/to/old/kde-config-dir
"
" Where to look for the kdmrc of a previously installed kdm.
"
@@ -86,9 +96,11 @@ least FTBFS, so that we have the chance to inspect.
" {/usr,/usr/local,{/opt,/usr/local}/{kde4,kde,kde3}}/share/config.
"
" --no-old
"
" Do not look at older xdm/kdm configurations, just create default config.
"
---- a/kdm/kcm/helper.cpp
-+++ b/kdm/kcm/helper.cpp
-@@ -131,9 +131,9 @@ ActionReply Helper::save(const QVariantM
+Index: kde-workspace/kdm/kcm/helper.cpp
+===================================================================
+--- kde-workspace.orig/kdm/kcm/helper.cpp 2013-09-27 09:17:50.844542047 +0000
++++ kde-workspace/kdm/kcm/helper.cpp 2013-09-27 09:17:50.840542203 +0000
+@@ -131,9 +131,9 @@
QString tempConfigName = args.value("tempkdmrcfile").toString();
QString tempBackgroundConfigName = args.value("tempbackgroundrcfile").toString();
@@ -100,7 +112,7 @@ least FTBFS, so that we have the chance to inspect.
int code = 0;
-@@ -167,7 +167,7 @@ ActionReply Helper::managefaces(const QV
+@@ -167,7 +167,7 @@
{
int subaction = args.value("subaction").toInt();
QString facesDir =
@@ -109,9 +121,11 @@ least FTBFS, so that we have the chance to inspect.
.group("X-*-Greeter").readEntry("FaceDir",
QString(KStandardDirs::installPath("data") + "kdm/faces" + '/'));
---- a/kcontrol/dateandtime/helper.cpp
-+++ b/kcontrol/dateandtime/helper.cpp
-@@ -54,7 +54,7 @@ int ClockHelper::ntp( const QStringList&
+Index: kde-workspace/kcontrol/dateandtime/helper.cpp
+===================================================================
+--- kde-workspace.orig/kcontrol/dateandtime/helper.cpp 2013-09-27 09:17:50.844542047 +0000
++++ kde-workspace/kcontrol/dateandtime/helper.cpp 2013-09-27 09:17:50.840542203 +0000
+@@ -58,7 +58,7 @@
int ret = 0;
// write to the system config file
@@ -120,9 +134,11 @@ least FTBFS, so that we have the chance to inspect.
if(!config_file.exists()) {
config_file.open(QIODevice::WriteOnly);
config_file.close();
---- a/ksmserver/shutdowndlg.cpp
-+++ b/ksmserver/shutdowndlg.cpp
-@@ -203,7 +203,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
+Index: kde-workspace/ksmserver/shutdowndlg.cpp
+===================================================================
+--- kde-workspace.orig/ksmserver/shutdowndlg.cpp 2013-09-27 09:17:50.844542047 +0000
++++ kde-workspace/ksmserver/shutdowndlg.cpp 2013-09-27 09:17:50.840542203 +0000
+@@ -203,7 +203,7 @@
mapSpdMethods->insert("HibernateState", QVariant::fromValue(spdMethods.contains(Solid::PowerManagement::HibernateState)));
context->setContextProperty("spdMethods", mapSpdMethods);
diff --git a/debian/patches/plasma_netbook_fix_autostart.diff b/debian/patches/plasma_netbook_fix_autostart.diff
index ae0215c..f1abeb5 100644
--- a/debian/patches/plasma_netbook_fix_autostart.diff
+++ b/debian/patches/plasma_netbook_fix_autostart.diff
@@ -7,9 +7,11 @@ This patch should fully fix problems with startup of plasma-netbook when
plasma-desktop is NOT installed. We aim to support "plasma-desktop"-less
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
-@@ -92,7 +92,7 @@ void WorkspaceOptionsModule::save()
+Index: kde-workspace/kcontrol/workspaceoptions/workspaceoptions.cpp
+===================================================================
+--- kde-workspace.orig/kcontrol/workspaceoptions/workspaceoptions.cpp 2013-09-27 09:19:35.568440190 +0000
++++ kde-workspace/kcontrol/workspaceoptions/workspaceoptions.cpp 2013-09-27 09:19:35.560440504 +0000
+@@ -92,7 +92,7 @@
m_plasmaNetbookAutostart.setAutostarts(!isDesktop);
m_plasmaNetbookAutostart.setStartPhase(KAutostart::BaseDesktop);
@@ -18,9 +20,11 @@ showstopper for this goal.
m_plasmaNetbookAutostart.setAllowedEnvironments(QStringList()<<"KDE");
m_krunnerAutostart.setAutostarts(isDesktop);
---- a/plasma/netbook/shell/main.cpp
-+++ b/plasma/netbook/shell/main.cpp
-@@ -40,10 +40,16 @@ KDE_EXPORT int kdemain(int argc, char **
+Index: kde-workspace/plasma/netbook/shell/main.cpp
+===================================================================
+--- kde-workspace.orig/plasma/netbook/shell/main.cpp 2013-09-27 09:19:35.568440190 +0000
++++ kde-workspace/plasma/netbook/shell/main.cpp 2013-09-27 09:19:35.560440504 +0000
+@@ -40,10 +40,16 @@
bool customGraphicsSystem = false;
@@ -38,7 +42,7 @@ showstopper for this goal.
}
}
-@@ -58,9 +64,16 @@ KDE_EXPORT int kdemain(int argc, char **
+@@ -58,9 +64,16 @@
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");
@@ -55,8 +59,10 @@ showstopper for this goal.
QApplication::setWindowIcon(KIcon("plasma"));
app->disableSessionManagement(); // autostarted
int rc = app->exec();
---- a/plasma/netbook/shell/plasmaapp.cpp
-+++ b/plasma/netbook/shell/plasmaapp.cpp
+Index: kde-workspace/plasma/netbook/shell/plasmaapp.cpp
+===================================================================
+--- kde-workspace.orig/plasma/netbook/shell/plasmaapp.cpp 2013-09-27 09:19:35.568440190 +0000
++++ kde-workspace/plasma/netbook/shell/plasmaapp.cpp 2013-09-27 09:19:35.560440504 +0000
@@ -33,6 +33,7 @@
#include <KStandardAction>
#include <KWindowSystem>
@@ -65,7 +71,7 @@ showstopper for this goal.
#include <ksmserver_interface.h>
-@@ -320,7 +321,8 @@ PlasmaApp::PlasmaApp()
+@@ -320,7 +321,8 @@
m_autoHideControlBar(true),
m_unHideTimer(0),
m_shadowWindow(0),
@@ -75,7 +81,7 @@ showstopper for this goal.
{
PlasmaApp::suspendStartup(true);
KGlobal::locale()->insertCatalog("libplasma");
-@@ -328,6 +330,13 @@ PlasmaApp::PlasmaApp()
+@@ -328,6 +330,13 @@
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -89,7 +95,7 @@ showstopper for this goal.
bool isDesktop = args->isSet("desktop");
if (isDesktop) {
KCrash::setFlags(KCrash::AutoRestart);
-@@ -397,6 +406,38 @@ PlasmaApp::~PlasmaApp()
+@@ -397,6 +406,38 @@
{
}
@@ -128,9 +134,11 @@ showstopper for this goal.
void PlasmaApp::cleanup()
{
if (m_corona) {
---- a/plasma/netbook/shell/plasmaapp.h
-+++ b/plasma/netbook/shell/plasmaapp.h
-@@ -87,6 +87,12 @@ public:
+Index: kde-workspace/plasma/netbook/shell/plasmaapp.h
+===================================================================
+--- kde-workspace.orig/plasma/netbook/shell/plasmaapp.h 2013-09-27 09:19:35.568440190 +0000
++++ kde-workspace/plasma/netbook/shell/plasmaapp.h 2013-09-27 09:19:35.560440504 +0000
+@@ -87,6 +87,12 @@
*/
bool isDesktop() const;
@@ -143,7 +151,7 @@ showstopper for this goal.
void showWidgetExplorer(Plasma::Containment *containment);
public Q_SLOTS:
-@@ -105,6 +111,7 @@ private:
+@@ -105,6 +111,7 @@
void reserveStruts();
void createUnhideTrigger();
void destroyUnHideTrigger();
@@ -151,7 +159,7 @@ showstopper for this goal.
private Q_SLOTS:
void cleanup();
-@@ -152,6 +159,7 @@ private:
+@@ -152,6 +159,7 @@
QTimer *m_unHideTimer;
ShadowWindow *m_shadowWindow;
int m_startupSuspendWaitCount;
@@ -159,9 +167,11 @@ showstopper for this goal.
};
#endif // multiple inclusion guard
---- a/startkde.cmake
-+++ b/startkde.cmake
-@@ -278,6 +278,24 @@ else
+Index: kde-workspace/startkde.cmake
+===================================================================
+--- kde-workspace.orig/startkde.cmake 2013-09-27 09:19:35.568440190 +0000
++++ kde-workspace/startkde.cmake 2013-09-27 09:19:35.564440346 +0000
+@@ -282,6 +282,24 @@
exit 1
fi
diff --git a/debian/patches/qguiplatformplugin_kde_NULL_check.diff b/debian/patches/qguiplatformplugin_kde_NULL_check.diff
index 6b4f186..a56473f 100644
--- a/debian/patches/qguiplatformplugin_kde_NULL_check.diff
+++ b/debian/patches/qguiplatformplugin_kde_NULL_check.diff
@@ -4,9 +4,11 @@ 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
---- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
-+++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
-@@ -247,7 +247,9 @@ public: // File Dialog integration
+Index: kde-workspace/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+===================================================================
+--- kde-workspace.orig/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp 2013-09-27 09:22:01.826710926 +0000
++++ kde-workspace/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp 2013-09-27 09:22:01.818711239 +0000
+@@ -250,7 +250,9 @@
kdefd->setConfirmOverwrite(qfd->confirmOverwrite());
kdefd->setSelection(qfd->selectedFiles().value(0));
}
diff --git a/debian/patches/series b/debian/patches/series
index 13087ec..ff13579 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-upstream_kdm-kcheckpass-Check-for-NULL-return-from-crypt-3-an.patch
-upstream_Fix-pixmap-leak-when-the-tray-icon-changes-e.g.-when.patch
kdm_does_not_wreak_havoc.diff
kdmrc_defaults.diff
genkdmconf.diff
diff --git a/debian/patches/upstream_Fix-pixmap-leak-when-the-tray-icon-changes-e.g.-when.patch b/debian/patches/upstream_Fix-pixmap-leak-when-the-tray-icon-changes-e.g.-when.patch
deleted file mode 100644
index 926c138..0000000
--- a/debian/patches/upstream_Fix-pixmap-leak-when-the-tray-icon-changes-e.g.-when.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2c810db3e41d56ad7dd8ec3436f3cf3abcc31983 Mon Sep 17 00:00:00 2001
-From: Andreas Hartmetz <ahartmetz at gmail.com>
-Date: Tue, 2 Jul 2013 18:35:35 +0200
-Subject: [PATCH] Fix pixmap leak when the tray icon changes (e.g. when it's
- animated).
-
-This could easily leak 4KB/second of X pixmap memory.
-All the actual difference comes from the QPixmap::ExplicitlyShared
-argument, the rest is making some wonky-looking but working code look
-less wonky.
-
-BUG: 314919
-(cherry picked from commit ec8e405ca447ba5bc5a9f6a2a12e2fa90412a0d4)
----
- .../systemtray/protocols/fdo/x11embedcontainer.cpp | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp
-index 1826512..a5bc826 100644
---- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp
-+++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp
-@@ -194,8 +194,7 @@ void X11EmbedContainer::paintEvent(QPaintEvent *event)
-
- // Taking a detour via a QPixmap is unfortunately the only way we can get
- // the window contents into Qt's backing store.
-- QPixmap pixmap(size());
-- pixmap = toX11Pixmap(pixmap);
-+ QPixmap pixmap = toX11Pixmap(QPixmap(size()));
- pixmap.fill(Qt::transparent);
- XRenderComposite(x11Info().display(), PictOpSrc, d->picture, None, pixmap.x11PictureHandle(),
- 0, 0, 0, 0, 0, 0, width(), height());
-@@ -232,16 +231,18 @@ void X11EmbedContainer::setBackgroundPixmap(QPixmap background)
- // NOTE: The alpha-channel is not preserved if it exists, but for X pixmaps it generally should not be needed anyway.
- QPixmap X11EmbedContainer::toX11Pixmap(const QPixmap& pix)
- {
-- if(pix.handle() != 0) // X11 pixmap
-+ if (pix.handle() != 0) // X11 pixmap
- return pix;
-+ QPixmap ret;
- Pixmap xpix = XCreatePixmap(pix.x11Info().display(), RootWindow(pix.x11Info().display(), pix.x11Info().screen()),
- pix.width(), pix.height(), QX11Info::appDepth());
-- QPixmap wrk = QPixmap::fromX11Pixmap(xpix);
-- QPainter paint(&wrk);
-- paint.drawPixmap(0, 0, pix);
-- paint.end();
-- QPixmap ret = wrk.copy();
-- wrk = QPixmap(); // reset, so that xpix can be freed (QPixmap does not own it)
-+ {
-+ QPixmap wrk = QPixmap::fromX11Pixmap(xpix, QPixmap::ExplicitlyShared);
-+ QPainter paint(&wrk);
-+ paint.drawPixmap(0, 0, pix);
-+ paint.end();
-+ ret = wrk.copy();
-+ } // free resources so that xpix can be freed (QPixmap does not own it)
- XFreePixmap(pix.x11Info().display(), xpix);
- return ret;
- }
---
-1.7.10.4
-
diff --git a/debian/patches/upstream_kdm-kcheckpass-Check-for-NULL-return-from-crypt-3-an.patch b/debian/patches/upstream_kdm-kcheckpass-Check-for-NULL-return-from-crypt-3-an.patch
deleted file mode 100644
index f31f7db..0000000
--- a/debian/patches/upstream_kdm-kcheckpass-Check-for-NULL-return-from-crypt-3-an.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 45b7f137fbc0b942fd2c9b4e8d8c1f0293e64ba7 Mon Sep 17 00:00:00 2001
-From: Michael Pyne <mpyne at kde.org>
-Date: Sat, 29 Jun 2013 16:13:20 -0400
-Subject: [PATCH] kdm, kcheckpass: Check for NULL return from crypt(3) and
- friends.
-
-Potential issue noted and fixed by Mancha <mancha1 at hush.com>.
-
-Patch reviewed by myself and ossi. Backported to 4.10 by myself.
-
-REVIEW:111261
-FIXED-IN:4.10.5
----
- kcheckpass/checkpass_etcpasswd.c | 3 ++-
- kcheckpass/checkpass_osfc2passwd.c | 3 ++-
- kcheckpass/checkpass_shadow.c | 2 +-
- kdm/backend/client.c | 7 +++++--
- 4 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/kcheckpass/checkpass_etcpasswd.c b/kcheckpass/checkpass_etcpasswd.c
-index 1dbe06f..e261b7c 100644
---- a/kcheckpass/checkpass_etcpasswd.c
-+++ b/kcheckpass/checkpass_etcpasswd.c
-@@ -35,6 +35,7 @@ AuthReturn Authenticate(const char *method,
- {
- struct passwd *pw;
- char *passwd;
-+ char *crpt_passwd;
-
- if (strcmp(method, "classic"))
- return AuthError;
-@@ -49,7 +50,7 @@ AuthReturn Authenticate(const char *method,
- if (!(passwd = conv(ConvGetHidden, 0)))
- return AuthAbort;
-
-- if (!strcmp(pw->pw_passwd, crypt(passwd, pw->pw_passwd))) {
-+ if ((crpt_passwd = crypt(passwd, pw->pw_passwd)) && !strcmp(pw->pw_passwd, crpt_passwd)) {
- dispose(passwd);
- return AuthOk; /* Success */
- }
-diff --git a/kcheckpass/checkpass_osfc2passwd.c b/kcheckpass/checkpass_osfc2passwd.c
-index 9a074f9..d181233 100644
---- a/kcheckpass/checkpass_osfc2passwd.c
-+++ b/kcheckpass/checkpass_osfc2passwd.c
-@@ -38,6 +38,7 @@ AuthReturn Authenticate(const char *method,
- const char *login, char *(*conv) (ConvRequest, const char *))
- {
- char *passwd;
-+ char *crpt_passwd;
- char c2passwd[256];
-
- if (strcmp(method, "classic"))
-@@ -52,7 +53,7 @@ AuthReturn Authenticate(const char *method,
- if (!(passwd = conv(ConvGetHidden, 0)))
- return AuthAbort;
-
-- if (!strcmp(c2passwd, osf1c2crypt(passwd, c2passwd))) {
-+ if ((crpt_passwd = osf1c2crypt(passwd, c2passwd)) && !strcmp(c2passwd, crpt_passwd)) {
- dispose(passwd);
- return AuthOk; /* Success */
- }
-diff --git a/kcheckpass/checkpass_shadow.c b/kcheckpass/checkpass_shadow.c
-index ec3a4e0..c0f6913 100644
---- a/kcheckpass/checkpass_shadow.c
-+++ b/kcheckpass/checkpass_shadow.c
-@@ -69,7 +69,7 @@ AuthReturn Authenticate(const char *method,
- crpt_passwd = crypt(typed_in_password, password);
- #endif
-
-- if (!strcmp(password, crpt_passwd )) {
-+ if (crpt_passwd && !strcmp(password, crpt_passwd )) {
- dispose(typed_in_password);
- return AuthOk; /* Success */
- }
-diff --git a/kdm/backend/client.c b/kdm/backend/client.c
-index bdff6da..26bb0b4 100644
---- a/kdm/backend/client.c
-+++ b/kdm/backend/client.c
-@@ -540,6 +540,9 @@ verify(GConvFunc gconv, int rootok)
- # if defined(HAVE_STRUCT_PASSWD_PW_EXPIRE) || defined(USESHADOW)
- int tim, expir, warntime, quietlog;
- # endif
-+# if !defined(ultrix) && !defined(__ultrix__) && (defined(HAVE_PW_ENCRYPT) || defined(HAVE_CRYPT))
-+ char *crpt_passwd;
-+# endif
- #endif
-
- debug("verify ...
");
-@@ -752,9 +755,9 @@ verify(GConvFunc gconv, int rootok)
- # if defined(ultrix) || defined(__ultrix__)
- if (authenticate_user(p, curpass, 0) < 0)
- # elif defined(HAVE_PW_ENCRYPT)
-- if (strcmp(pw_encrypt(curpass, p->pw_passwd), p->pw_passwd))
-+ if (!(crpt_passwd = pw_encrypt(curpass, p->pw_passwd)) || strcmp(crpt_passwd, p->pw_passwd))
- # elif defined(HAVE_CRYPT)
-- if (strcmp(crypt(curpass, p->pw_passwd), p->pw_passwd))
-+ if (!(crpt_passwd = crypt(curpass, p->pw_passwd)) || strcmp(crpt_passwd, p->pw_passwd))
- # else
- if (strcmp(curpass, p->pw_passwd))
- # endif
---
-1.7.10.4
-
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list