[patch] Patch against /usr/portage/gnome-base/gdm

gdm-portage.patch (text/plain), 4.24 KB, created by Christopher Cowart on 2005-08-10 22:49:02 UTC

diff -ru /usr/portage/gnome-base/gdm/Manifest /usr/local/rc-overlay/gnome-base/gdm/Manifest
--- /usr/portage/gnome-base/gdm/Manifest	2005-08-10 04:35:40.000000000 -0700
+++ /usr/local/rc-overlay/gnome-base/gdm/Manifest	2005-08-10 22:37:50.000000000 -0700
@@ -1,30 +1,31 @@
 MD5 cee87a94de3026146deb13d9fc3201a7 ChangeLog 14159
 MD5 c4d34959dd6c05056e5852277f76d250 gdm-2.2.5.4-r5.ebuild 4413
-MD5 37330f87e87c8fceb266a57f66bfdb81 gdm-2.6.0.9-r2.ebuild 3561
-MD5 e28ebd429f155eb350068c674962b980 gdm-2.6.0.9-r3.ebuild 3319
 MD5 dc176d15d4147fc47f76ed34c97db7d2 gdm-2.6.0.7.ebuild 3271
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 37330f87e87c8fceb266a57f66bfdb81 gdm-2.6.0.9-r2.ebuild 3561
+MD5 c06b8a5b826092ac1d5e1bc113defb0e gdm-2.6.0.9-r3.ebuild 3709
 MD5 a01020f6434821e8d2c7e119b6f4304d gdm-2.8.0.1-r1.ebuild 3721
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
-MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r2 137
-MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r3 137
 MD5 5b650e1d4d90f356434d217d78a02714 files/digest-gdm-2.8.0.1-r1 211
 MD5 c343d16819b3e271f74187954492a212 files/digest-gdm-2.6.0.7 137
 MD5 7dc28411b445f8459abba359b03f36b8 files/gdm-2.4.4-selinux_remove_attr.patch 826
 MD5 222144a2577237cab4e4cd9b929a1654 files/gdm-2.6.0.9-ipv6_config.patch 649
+MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r2 137
+MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r3 137
+MD5 49c07f67d99ee0958166a3307da2e749 files/flexi-servers-dialog.patch 3645
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
-MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.6.0/Xsession 6198
 MD5 a3f4b5a7ab813f106578125638e3b2f0 files/2.6.0/custom.desktop 301
-MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.6.0-openpam/Xsession 6198
+MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.6.0/Xsession 6198
 MD5 a3f4b5a7ab813f106578125638e3b2f0 files/2.6.0-openpam/custom.desktop 301
-MD5 d0cb338160e3be8790524af8071cc4df files/2.2.5/pam.d/gdm 380
+MD5 0107e56a45d8ef4413c1779e809f1c03 files/2.6.0-openpam/Xsession 6198
 MD5 89cc8ab9525284af6babcb9c86122443 files/2.2.5/pam.d/gdmconfig 288
+MD5 d0cb338160e3be8790524af8071cc4df files/2.2.5/pam.d/gdm 380
+MD5 89cc8ab9525284af6babcb9c86122443 files/2.6.0/pam.d/gdmconfig 288
 MD5 2edddb54af0c3c979b9ef73ba52deb4a files/2.6.0/pam.d/gdm 425
 MD5 6c45b586e2cf16cf89ab544197b12bae files/2.6.0/pam.d/gdm-autologin 406
-MD5 89cc8ab9525284af6babcb9c86122443 files/2.6.0/pam.d/gdmconfig 288
+MD5 b5443ee5f9012cd5ee4eed831b6c7e9a files/2.6.0-openpam/pam.d/gdmconfig 193
 MD5 b2405ff4fa9986e422dc852758b861f6 files/2.6.0-openpam/pam.d/gdm 206
 MD5 e04c0ff690eadb92a48cf14718bf9df4 files/2.6.0-openpam/pam.d/gdm-autologin 209
-MD5 b5443ee5f9012cd5ee4eed831b6c7e9a files/2.6.0-openpam/pam.d/gdmconfig 193
 MD5 114395565e31f41b44d31d731f1478b0 files/2.2.5/security/console.apps/gdmconfig 66
 MD5 114395565e31f41b44d31d731f1478b0 files/2.6.0/security/console.apps/gdmconfig 66
 MD5 114395565e31f41b44d31d731f1478b0 files/2.6.0-openpam/security/console.apps/gdmconfig 66
Only in /usr/local/rc-overlay/gnome-base/gdm/files: flexi-servers-dialog.patch
diff -ru /usr/portage/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild /usr/local/rc-overlay/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild
--- /usr/portage/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild	2005-08-09 00:35:38.000000000 -0700
+++ /usr/local/rc-overlay/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild	2005-08-10 22:32:30.000000000 -0700
@@ -10,7 +10,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
-IUSE="tcpd xinerama selinux ipv6 pam"
+IUSE="tcpd xinerama selinux ipv6 pam new-login"
 
 SRC_URI="${SRC_URI}
 	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2"
@@ -57,6 +57,12 @@
 	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
 	# fix ipv6 config
 	epatch ${FILESDIR}/${P}-ipv6_config.patch
+	# If we're using newlogin for xscreensaver, we have to obliterate
+	# the Open Displays dialog from gdmflexiservers. I'm requesting
+	# upstream a command-line option to prevent the dialog from being
+	# displayed. For now, in order for xscreensaver compatibility, this
+	# patch completely removes that functionality.
+	use new-login && epatch ${FILESDIR}/flexi-servers-dialog.patch
 
 	autoconf || die