From 862fe6c2feffc503c3b0d361e9a73065e02cf7ed Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Thu, 15 Dec 2011 19:45:32 +0000 Subject: [PATCH] Fix building with USE=-consolekit (bug #394845). Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- x11-misc/slim/ChangeLog | 5 ++++- x11-misc/slim/Manifest | 12 +++++------ x11-misc/slim/files/slim-1.3.2-ck.patch | 27 ++++++++++++------------- 3 files changed, 23 insertions(+), 21 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 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/Manifest b/x11-misc/slim/Manifest index 3ab7af01cb89..464757388e55 100644 --- a/x11-misc/slim/Manifest +++ b/x11-misc/slim/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX 14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch 754 RMD160 079984153eb6ca97dafc94b065aeff6c57cf19ee SHA1 25fc499e10133c5325823453202aefdf828c3c21 SHA256 72995a16600174994864b9af959659d321c1fc6aa093650ed0b95b6760d91a13 AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3 @@ -11,7 +11,7 @@ AUX Xsession 4215 RMD160 86ab057ea3f78a9604811a1bff7e5aad88c2f717 SHA1 46dc684b8 AUX Xsession-r2 4262 RMD160 4346445ae8c0fb6857d098988863e9d9a368e326 SHA1 5798765fb36d260492e5aa58c7e73bb31674018c SHA256 13904325f2c6f905227059c7eb7cf162b233bdb5721ec95ef5e3f35e679a43a3 AUX Xsession-r3 4045 RMD160 538a23b1f0812fe2243d678276bced4ea03256a3 SHA1 b4deabb6795738cedca66f171e2fc504dc0cc96d SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028bf0165ce089af AUX slim-1.3.2-bsd-install.patch 1315 RMD160 290a7c31b077bce33b120ab55b9bdd3c6262d2be SHA1 a50d2e3e2810af82ab9bef058a72286734afd338 SHA256 bfb5a506b3baec6d24e6f0cfba34f045768bbccccc652af11199f30a7c45d843 -AUX slim-1.3.2-ck.patch 5590 RMD160 2be2c533d9cd2f9296d9be8582dd52266fa0b9cd SHA1 d40e8ef9a9a1d739590deacfe030511c885b5043 SHA256 fdeb519eee002944e4a01795a29fe98baf95dd85bf9911d1217b591424ee7cf1 +AUX slim-1.3.2-ck.patch 5249 RMD160 f1da27e5c477f2903f637b4852d1b2ca5f61fe57 SHA1 c94eebc268d1891a7606e8d8f63d1c6d1ec87c78 SHA256 6da435343ebd114b3d38335ed149fe193138cbeabf0712d26534dddab95c42d6 AUX slim-1.3.2-libpng15.patch 247 RMD160 b28d9a376f4c01baa8b1aec0c5e0e76294997255 SHA1 3cd674e548f4e0aadbbd32a67b4efd1ed263afef SHA256 f84e3e4c069ec103a5f4ec2a60698bf9d035346b604dee59b6efc883c7f14042 AUX slim-1.3.2-r2-config.diff 2572 RMD160 217c3d64b77e0af496670cee82849a0500516d0d SHA1 7dbc1b0df45a49688b52bfc701acc3dc15019394 SHA256 7ea06809e15f40c5113d8c05df2b6ca4eb4ba9ebc1e9fc1747b080337997384d AUX slim-1.3.2-r3-config.diff 2736 RMD160 c570cf88acac9ac15bfb1caba025358564b4d13b SHA1 a79319663573c92b224d1d83b11747ca4d5a5a2f SHA256 cb5b95ae0102dc3625ec7b0f82103ababfd3ba97eeec107d9b034838a9ebc328 @@ -20,12 +20,12 @@ DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SH EBUILD slim-1.3.2-r3.ebuild 3845 RMD160 c05d3a83231ff745710f184913797e54fa65d847 SHA1 a215c9cb6e4f01b59bccad3096c2efd9a0d021f2 SHA256 52b09e2d2a8b78c35b82001d5c71eb177494e15652c6a6ce34eeafc111858bc0 EBUILD slim-1.3.2-r6.ebuild 4479 RMD160 fdaf41a2d458295877808e603db1bff0794d0d5c SHA1 d44a6564cbe64f98e35f9bed4e7bec80726b1e04 SHA256 a0abf6c0a074e835f6f83b2837524bef37a31efece55bba5534c8a528b70bbd5 EBUILD slim-1.3.2-r7.ebuild 4356 RMD160 73aec945ccc96022d9ff3868b7e98dc7c4bafc07 SHA1 c74ca4cfd441e02c0f0527c01e728cfa9f127183 SHA256 4eb7afde40cb681598bf2f2d5a73a2f62263f08d7565d88a638c2609af6c96fe -MISC ChangeLog 12105 RMD160 58e85c7e1af293e3c45f5ea74d764ec112d123f3 SHA1 1bd2e0555e7e5410a2950f1a06a45b92382ebb59 SHA256 14c6de238df6dfbf4f078170a6794fe214468f5af7e19f676e88b9ec02fd3518 +MISC ChangeLog 12231 RMD160 4a32ed07c386d9302edf4959d8263bf110292879 SHA1 ee636b5b5e3141215d850f2da625f08b185c1f0d SHA256 72e920ff0dc5fffed7d43ae8697b82fc54810525801aa4853438cd0c97a275f2 MISC metadata.xml 317 RMD160 fcfaa261187ff694f4a90b78c82250387f85b375 SHA1 fec8ad82b63348fcabfae1082a661ff051d1b51a SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk7pBb8ACgkQAJxUfCtlWe14bAD/V3/7xhDOZzBeYTTolucY7HNg -AnOaUMy0I4tJz0kwEkkA/2tp8BGzgu0FPi+owMEWjnteRG3F4N6i14QdwT/oiwuK -=BPyN +iEYEARECAAYFAk7qTmEACgkQVWmRsqeSphNoOACfQR9r7Q/9vXLqxv4N+Vduppjs +v3oAn339ORZf8huJlKs9ptCRKc1/C6Xx +=tOl8 -----END PGP SIGNATURE----- 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(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 -- 2.26.2