fix compile issue

Package-Manager: portage-2.1.4_rc14

4 files changed, 41 insertions, 20 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 4858b3655202..384925ee8443 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.255 2008/01/09 21:32:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.256 2008/01/10 18:24:47 compnerd Exp $
+
+  10 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gdm-2.20.3-logging.patch, gdm-2.20.3.ebuild:
+  Add compile fix for debug_log definition missing from upstream
 
 *gdm-2.20.3 (09 Jan 2008)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index b654c91cf416..475c36cc5325 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
 MD5 4fd1e85595162e54a954871024b2858f files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 files/gdm-2.13.0.1-selinux-remove-attr.patch 908
@@ -25,6 +22,10 @@ AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SH
 MD5 98150b89f870b7f16088016ac127d26c files/gdm-2.20.2-gksu.patch 544
 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac files/gdm-2.20.2-gksu.patch 544
 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d files/gdm-2.20.2-gksu.patch 544
+AUX gdm-2.20.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc SHA1 7c00f8c4501d13368f4a25cf34422108356f8761 SHA256 8266a532731609401915a605866e071ba8cbdf25e6425a0a2701427d15f532ce
+MD5 79415cc91874b6214e435c9bb9e432b5 files/gdm-2.20.3-logging.patch 646
+RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc files/gdm-2.20.3-logging.patch 646
+SHA256 8266a532731609401915a605866e071ba8cbdf25e6425a0a2701427d15f532ce files/gdm-2.20.3-logging.patch 646
 DIST gdm-2.16.4.tar.bz2 3139838 RMD160 afccb19cb0e56af9a464fa538de4f59191705142 SHA1 61c9c2f5a29c99aaa85d2b76164540b949b2656b SHA256 0aa32e3b145ce5c6c8d42c7a8bcaa09582737e89de252fa6bda0c55f3af10616
 DIST gdm-2.16.7.tar.bz2 3152229 RMD160 13f3fb2b2b99f9715c06ece437412516af865f56 SHA1 493ed37bfd7ee1619d814401bc1ec73c4be7a802 SHA256 720292a9954f0c95633fa464fd1838c822bd0b2f43f98a8ab37155d57ea4c881
 DIST gdm-2.18.4.tar.bz2 3459899 RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e SHA1 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8 SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
@@ -62,14 +63,14 @@ EBUILD gdm-2.20.2.ebuild 5456 RMD160 62e6da4ac846aaed6115ec931db939bb6045490c SH
 MD5 5834b0f5d2663690fd4cf50cd1e754fb gdm-2.20.2.ebuild 5456
 RMD160 62e6da4ac846aaed6115ec931db939bb6045490c gdm-2.20.2.ebuild 5456
 SHA256 7d5a84a231c13eebe178fb4667255efa034479171337898f1fcb7fa694e7732b gdm-2.20.2.ebuild 5456
-EBUILD gdm-2.20.3.ebuild 5455 RMD160 2c294b287b485e7230bed56bc4e5a7ce053047e5 SHA1 5b7f29220c5834976ebc5ea759a5753d20963029 SHA256 f9fc933eb43ce5d94c5ed35a01fc02a2103431a28ec0674a9e7131e4f0b3bc9c
-MD5 9c1ba49e4fb7c5b4e0a26a45c15408c5 gdm-2.20.3.ebuild 5455
-RMD160 2c294b287b485e7230bed56bc4e5a7ce053047e5 gdm-2.20.3.ebuild 5455
-SHA256 f9fc933eb43ce5d94c5ed35a01fc02a2103431a28ec0674a9e7131e4f0b3bc9c gdm-2.20.3.ebuild 5455
-MISC ChangeLog 34362 RMD160 666f8eb09ab3c02cef7ab8bd8dd11d9570d330ef SHA1 c3d7d1c52c44f6eebf954459d2630ec875c4e39e SHA256 9caf9df9945448922f37a03d072163aa2de04f62ec1cb7aced81ada79e88a60c
-MD5 583e51d3a431c57790648e926cd7ac84 ChangeLog 34362
-RMD160 666f8eb09ab3c02cef7ab8bd8dd11d9570d330ef ChangeLog 34362
-SHA256 9caf9df9945448922f37a03d072163aa2de04f62ec1cb7aced81ada79e88a60c ChangeLog 34362
+EBUILD gdm-2.20.3.ebuild 5532 RMD160 cd8e3b6ec8507e2c0ff9246798713e25d16408f5 SHA1 84e652f49b580006e6091e1243eda4a9cc52c257 SHA256 535ed18df5a2294165331b7ef44886d5434e53608bb8d5a255022f740609f21a
+MD5 2d6585f8502a0cf59c53e7ff4762af6c gdm-2.20.3.ebuild 5532
+RMD160 cd8e3b6ec8507e2c0ff9246798713e25d16408f5 gdm-2.20.3.ebuild 5532
+SHA256 535ed18df5a2294165331b7ef44886d5434e53608bb8d5a255022f740609f21a gdm-2.20.3.ebuild 5532
+MISC ChangeLog 34543 RMD160 bcc6bc4165511ed2df88b95555046f7a08b54a75 SHA1 637283748d684bfe79569814790e74b4a67579ab SHA256 784714aa8eb94ee6fea50b4dcc79411749169f52c4d212f3916cc9f4bc828f13
+MD5 18ed1cfb60409c8e565e0a93ed90017e ChangeLog 34543
+RMD160 bcc6bc4165511ed2df88b95555046f7a08b54a75 ChangeLog 34543
+SHA256 784714aa8eb94ee6fea50b4dcc79411749169f52c4d212f3916cc9f4bc828f13 ChangeLog 34543
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -98,10 +99,3 @@ SHA256 4a6090528bea40c09ef78ffda027acf5694a21094933b85a1761ab52d66fa281 files/di
 MD5 bcd70297e08764e4de7ade30fd862c25 files/digest-gdm-2.20.3 768
 RMD160 fe74d72ff954e290b8ffb23ab681bdea7b8429a8 files/digest-gdm-2.20.3 768
 SHA256 0017dbe224cca1f0496e2d86d4ea0edd76edd8ddb738da694eebd4386f8a4e01 files/digest-gdm-2.20.3 768
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkeFPYQACgkQ1fmVwcYIWAZSvwCcDkgYr+oCPyDFjZpTomfFAIIH
-u2kAni1HhNQl6whItFH4HpbmANbSPliB
-=slDi
------END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-2.20.3-logging.patch b/gnome-base/gdm/files/gdm-2.20.3-logging.patch
new file mode 100644
index 000000000000..b1f5d8715262
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.20.3-logging.patch
@@ -0,0 +1,20 @@
+--- gdm-2.20.3/daemon/verify-crypt.c.orig	2008-01-07 19:39:37.000000000 +0000
++++ gdm-2.20.3/daemon/verify-crypt.c	2008-01-09 13:39:50.000000000 +0000
+@@ -43,6 +43,7 @@
+ #include "gdm-common.h"
+ #include "gdm-daemon-config.h"
+ #include "gdm-socket-protocol.h"
++#include "gdm-log.h"
+ 
+ static char *selected_user = NULL;
+ 
+--- gdm-2.20.3/daemon/verify-shadow.c.orig	2008-01-07 19:39:37.000000000 +0000
++++ gdm-2.20.3/daemon/verify-shadow.c	2008-01-09 13:39:43.000000000 +0000
+@@ -44,6 +44,7 @@
+ #include "gdm-common.h"
+ #include "gdm-daemon-config.h"
+ #include "gdm-socket-protocol.h"
++#include "gdm-log.h"
+ 
+ static char *selected_user = NULL;
+ 
diff --git a/gnome-base/gdm/gdm-2.20.3.ebuild b/gnome-base/gdm/gdm-2.20.3.ebuild
index 2e5a5e04a686..658e60d6f26a 100644
--- a/gnome-base/gdm/gdm-2.20.3.ebuild
+++ b/gnome-base/gdm/gdm-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild,v 1.1 2008/01/09 21:32:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.3.ebuild,v 1.2 2008/01/10 18:24:47 compnerd Exp $
 
 inherit autotools eutils pam gnome2
 
@@ -101,6 +101,9 @@ src_unpack() {
 
 	# Add gksu to gdmsetup menu entry
 	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
+
+	# Fix compile errors
+	epatch "${FILESDIR}/${PN}-2.20.3-logging.patch"
 }
 
 src_install() {