[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.8-1-7-gd862760
Maximiliano Curia
maxy at moszumanska.debian.org
Thu May 8 10:07:35 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=fc548a0
The following commit has been merged in the master branch:
commit fc548a0ab285bcb21c3e0bf1e6c8d18930418a61
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed May 7 20:24:13 2014 +0200
Refresh patches
---
...010-Fix-crash-when-DesktopNames-isn-t-set.patch | 13 ++++-----
debian/patches/kdm_vt_switching_on_kfreebsd.diff | 32 +++++++++++-----------
2 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/debian/patches/0010-Fix-crash-when-DesktopNames-isn-t-set.patch b/debian/patches/0010-Fix-crash-when-DesktopNames-isn-t-set.patch
index 22281c3..b3ecdea 100644
--- a/debian/patches/0010-Fix-crash-when-DesktopNames-isn-t-set.patch
+++ b/debian/patches/0010-Fix-crash-when-DesktopNames-isn-t-set.patch
@@ -9,11 +9,11 @@ FIXED-IN: 4.11.10
kdm/backend/client.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
-diff --git a/kdm/backend/client.c b/kdm/backend/client.c
-index 335cc3e..a2d06c2 100644
---- a/kdm/backend/client.c
-+++ b/kdm/backend/client.c
-@@ -1810,12 +1810,14 @@ startClient(volatile int *pid)
+Index: kde-workspace/kdm/backend/client.c
+===================================================================
+--- kde-workspace.orig/kdm/backend/client.c 2014-05-07 20:23:40.079982880 +0200
++++ kde-workspace/kdm/backend/client.c 2014-05-07 20:23:40.075983044 +0200
+@@ -1814,12 +1814,14 @@
!(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
sessargs = "";
buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
@@ -33,6 +33,3 @@ index 335cc3e..a2d06c2 100644
free(str);
free(fname);
goto gotit;
---
-2.0.0.rc2
-
diff --git a/debian/patches/kdm_vt_switching_on_kfreebsd.diff b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
index 869c23f..7b9b240 100644
--- a/debian/patches/kdm_vt_switching_on_kfreebsd.diff
+++ b/debian/patches/kdm_vt_switching_on_kfreebsd.diff
@@ -12,8 +12,8 @@ This revision of the patch is pretty hackish. What is more, it does not cover
FreeBSD (only kFreeBSD) while it could perfectly do so.
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
+--- kde-workspace.orig/kdm/backend/dm.c 2014-05-07 20:21:11.614072291 +0200
++++ kde-workspace/kdm/backend/dm.c 2014-05-07 20:21:11.610072455 +0200
@@ -47,7 +47,13 @@
#ifdef HAVE_VTS
@@ -28,7 +28,7 @@ Index: kde-workspace/kdm/backend/dm.c
#endif
static void sigHandler(int n);
-@@ -349,7 +355,12 @@
+@@ -357,7 +363,12 @@
int
TTYtoVT(const char *tty)
{
@@ -42,7 +42,7 @@ Index: kde-workspace/kdm/backend/dm.c
}
int
-@@ -1051,9 +1062,15 @@
+@@ -1062,9 +1073,15 @@
} else {
int con = open("/dev/console", O_RDONLY);
if (con >= 0) {
@@ -59,7 +59,7 @@ Index: kde-workspace/kdm/backend/dm.c
int vt = 1;
struct display *di;
for (di = displays; di; di = di->next)
-@@ -1066,7 +1083,9 @@
+@@ -1077,7 +1094,9 @@
vt = di->serverVT;
ioctl(con, VT_ACTIVATE, vt);
}
@@ -69,7 +69,7 @@ Index: kde-workspace/kdm/backend/dm.c
close(con);
}
}
-@@ -1339,16 +1358,41 @@
+@@ -1350,16 +1369,41 @@
static int
getBusyVTs(void)
{
@@ -116,8 +116,8 @@ Index: kde-workspace/kdm/backend/dm.c
}
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
+--- kde-workspace.orig/kdm/backend/greet.h 2014-05-07 20:21:11.614072291 +0200
++++ kde-workspace/kdm/backend/greet.h 2014-05-07 20:21:11.610072455 +0200
@@ -53,7 +53,7 @@
# define USE_SYSLOG
#endif
@@ -129,8 +129,8 @@ Index: kde-workspace/kdm/backend/greet.h
#endif
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
+--- kde-workspace.orig/kdm/backend/client.c 2014-05-07 20:21:11.614072291 +0200
++++ kde-workspace/kdm/backend/client.c 2014-05-07 20:21:11.610072455 +0200
@@ -1352,7 +1352,11 @@
# ifdef HAVE_VTS
@@ -145,8 +145,8 @@ Index: kde-workspace/kdm/backend/client.c
# ifdef XDMCP
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
+--- kde-workspace.orig/kdm/kfrontend/genkdmconf.c 2014-05-07 20:21:11.614072291 +0200
++++ kde-workspace/kdm/kfrontend/genkdmconf.c 2014-05-07 20:21:11.610072455 +0200
@@ -1547,7 +1547,8 @@
upd_servervts(Entry *ce, Section *cs ATTR_UNUSED)
{
@@ -189,8 +189,8 @@ Index: kde-workspace/kdm/kfrontend/genkdmconf.c
defmaxuid = "29999";
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
+--- kde-workspace.orig/kdm/config.def 2014-05-07 20:21:11.614072291 +0200
++++ kde-workspace/kdm/config.def 2014-05-07 20:21:11.610072455 +0200
@@ -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
@@ -202,8 +202,8 @@ Index: kde-workspace/kdm/config.def
<acronym>TTY</acronym> lines listed here (without the leading
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
+--- kde-workspace.orig/kdm/backend/util.c 2014-05-07 20:21:11.614072291 +0200
++++ kde-workspace/kdm/backend/util.c 2014-05-07 20:21:11.614072291 +0200
@@ -54,6 +54,15 @@
# include <sys/utsname.h>
#endif
--
KDE Base Workspace module packaging
More information about the pkg-kde-commits
mailing list