[SCM] KDE Base Workspace module packaging branch, squeeze, updated. debian/4.4.5-4-14-g0ce6a4c

Modestas Vainius modax at alioth.debian.org
Sun Nov 28 11:52:43 UTC 2010


The following commit has been merged in the squeeze branch:
commit 08f52004d2ad04431de525df7953f87f3b90f3f6
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Nov 28 03:50:33 2010 +0200

    Unbreak build on Linux (fix kdm kfsbd patch).
    
    * use ANSI C complaint comment syntax in the kdm kFreeBSD patch;
    * add missing sys/ioctl.h include to genkdmconf.c.
---
 .../patches/31_kdm_vt_switching_on_kfreebsd.diff   |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff b/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff
index 41dfa7c..d509362 100644
--- a/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff
+++ b/debian/patches/31_kdm_vt_switching_on_kfreebsd.diff
@@ -31,9 +31,9 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
  TTYtoVT( const char *tty )
  {
 -	return memcmp( tty, "tty", 3 ) ? 0 : atoi( tty + 3 );
-+	if (!memcmp( tty, "ttyv", 4 )) // FreeBSD, tty no is in hex
++	if (!memcmp( tty, "ttyv", 4 )) /* FreeBSD, tty no is in hex */
 +		return (int) strtoul( tty+4, NULL, 16 );
-+	else if (!memcmp( tty, "tty", 3 )) // Linux
++	else if (!memcmp( tty, "tty", 3 )) /* Linux */
 +		return atoi( tty + 3 );
 +	else
 +		return 0;
@@ -92,9 +92,9 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
 +
 +		activeVTs = 0;
 +		firstvt = ~0;
-+		// We need rdev of the first tty
++		/* We need rdev of the first tty */
 +		if (stat("/dev/ttyv0", &st))
-+			firstvt = 0; // If stat fails, 0 should be safe default
++			firstvt = 0; /* If stat fails, 0 should be safe default */
 +
 +		if (!sysctlbyname("kern.ttys", NULL, &s, NULL, 0)) {
 +			ttys = (struct xtty *) malloc(s);
@@ -192,11 +192,12 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
   <acronym>TTY</acronym> lines listed here (without the leading
 --- a/kdm/backend/util.c
 +++ b/kdm/backend/util.c
-@@ -53,6 +53,14 @@ from the copyright holder.
+@@ -53,6 +53,15 @@ from the copyright holder.
  # include <sys/utsname.h>
  #endif
  
 +#ifdef HAVE_VTS
++#  include <sys/ioctl.h>
 +#  if defined(__linux__)
 +#    include <linux/vt.h>
 +#  elif defined(__FreeBSD_kernel__)
@@ -207,7 +208,7 @@ FreeBSD (only kFreeBSD) while it could perfectly do so.
  void *
  Calloc( size_t nmemb, size_t size )
  {
-@@ -621,6 +629,29 @@ hexToBinary( char *out, const char *in )
+@@ -621,6 +630,29 @@ hexToBinary( char *out, const char *in )
  
  #undef atox
  
@@ -237,7 +238,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
  */
-@@ -640,6 +671,10 @@ listSessions( int flags, struct display
+@@ -640,6 +672,10 @@ listSessions( int flags, struct display
  #else
  	STRUCTUTMP *ut;
  #endif
@@ -248,7 +249,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) &&
-@@ -671,12 +706,20 @@ listSessions( int flags, struct display
+@@ -671,12 +707,20 @@ listSessions( int flags, struct display
  				if (!(flags & lstRemote))
  					continue;
  			} else {

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list