Fix building with USE=-consolekit (bug #394845).

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

2 files changed, 17 insertions, 15 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 92a9748f1082..9e26b0534763 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.74 2011/12/14 20:23:55 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.75 2011/12/15 19:45:32 jer Exp $
+
+  15 Dec 2011; Jeroen Roovers <jer@gentoo.org> files/slim-1.3.2-ck.patch:
+  Fix building with USE=-consolekit (bug #394845).
 
 *slim-1.3.2-r7 (14 Dec 2011)
 
diff --git a/x11-misc/slim/files/slim-1.3.2-ck.patch b/x11-misc/slim/files/slim-1.3.2-ck.patch
index b5f4aa517ff2..e46538f8ca2a 100644
--- a/x11-misc/slim/files/slim-1.3.2-ck.patch
+++ b/x11-misc/slim/files/slim-1.3.2-ck.patch
@@ -1,6 +1,5 @@
-diff -Naur slim-1.3.2/app.cpp slim-1.3.2.new/app.cpp
---- slim-1.3.2/app.cpp	2011-12-14 14:33:45.000000000 -0500
-+++ slim-1.3.2.new/app.cpp	2011-12-14 13:25:19.000000000 -0500
+--- a/slim-1.3.2/app.cpp
++++ b/slim-1.3.2/app.cpp
 @@ -536,6 +536,60 @@
      string xauthority = pw->pw_dir;
      xauthority.append("/.Xauthority");
@@ -62,16 +61,18 @@ diff -Naur slim-1.3.2/app.cpp slim-1.3.2.new/app.cpp
  #ifdef USE_PAM
      // Setup the PAM environment
      try{
-@@ -548,6 +602,8 @@
+@@ -548,6 +602,10 @@
          pam.setenv("DISPLAY", DisplayName);
          pam.setenv("MAIL", maildir.c_str());
          pam.setenv("XAUTHORITY", xauthority.c_str());
++#ifdef USE_CONSOLEKIT
 +        pam.setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(ckconnector));
 +    cerr << APPNAME << ": ck_connector has XDG_SESSION_COOKIE of " << ck_connector_get_cookie(ckconnector) << endl;
++#endif
      }
      catch(PAM::Exception& e){
          cerr << APPNAME << ": " << e << endl;
-@@ -564,7 +620,11 @@
+@@ -564,7 +622,11 @@
          char** child_env = pam.getenvlist();
          pam.end();
  #else
@@ -83,7 +84,7 @@ diff -Naur slim-1.3.2/app.cpp slim-1.3.2.new/app.cpp
          char** child_env = static_cast<char**>(malloc(sizeof(char*)*Num_Of_Variables));
          int n = 0;
          if(term) child_env[n++]=StrConcat("TERM=", term);
-@@ -576,6 +636,10 @@
+@@ -576,6 +638,10 @@
          child_env[n++]=StrConcat("DISPLAY=", DisplayName);
          child_env[n++]=StrConcat("MAIL=", maildir.c_str());
          child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
@@ -94,7 +95,7 @@ diff -Naur slim-1.3.2/app.cpp slim-1.3.2.new/app.cpp
          child_env[n++]=0;
  #endif
  
-@@ -617,6 +681,28 @@
+@@ -617,6 +683,28 @@
          }
      }
  
@@ -123,7 +124,7 @@ diff -Naur slim-1.3.2/app.cpp slim-1.3.2.new/app.cpp
  #ifdef USE_PAM
      try{
          pam.close_session();
-@@ -881,12 +967,18 @@
+@@ -881,12 +969,18 @@
              bool ok = false;
              Cfg::string2int(server[i]+2, &ok);
              if (ok) {
@@ -142,9 +143,8 @@ diff -Naur slim-1.3.2/app.cpp slim-1.3.2.new/app.cpp
          server[argc++] = (char*)"vt07";
      }
      server[argc] = NULL;
-diff -Naur slim-1.3.2/app.h slim-1.3.2.new/app.h
---- slim-1.3.2/app.h	2011-12-14 14:33:45.000000000 -0500
-+++ slim-1.3.2.new/app.h	2011-12-14 11:51:39.000000000 -0500
+--- a/slim-1.3.2/app.h
++++ b/slim-1.3.2/app.h
 @@ -27,6 +27,10 @@
  #ifdef USE_PAM
  #include "PAM.h"
@@ -169,9 +169,8 @@ diff -Naur slim-1.3.2/app.h slim-1.3.2.new/app.h
  
      // Options
      char* DispName;
-diff -Naur slim-1.3.2/Makefile slim-1.3.2.new/Makefile
---- slim-1.3.2/Makefile	2011-12-14 14:33:45.000000000 -0500
-+++ slim-1.3.2.new/Makefile	2011-12-14 11:43:02.000000000 -0500
+--- a/slim-1.3.2/Makefile
++++ b/slim-1.3.2/Makefile
 @@ -13,6 +13,11 @@
  LDFLAGS+= -lpam
  CUSTOM+= -DUSE_PAM