| 1 |
commit: 8250d73c56637b466ba32c1f26894877532846ce |
| 2 |
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 16 22:04:59 2011 +0000 |
| 4 |
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de> |
| 5 |
CommitDate: Wed Nov 16 22:04:59 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8250d73c |
| 7 |
|
| 8 |
x11-base/xorg-server: Import fixes for bugs #383155, #390609 and #390697 from portage. |
| 9 |
|
| 10 |
--- |
| 11 |
.../xorg-server/files/{xdm.initd-3 => xdm.initd-4} | 2 ++ |
| 12 |
x11-base/xorg-server/xorg-server-9999.ebuild | 5 +++-- |
| 13 |
2 files changed, 5 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-4 |
| 16 |
similarity index 98% |
| 17 |
rename from x11-base/xorg-server/files/xdm.initd-3 |
| 18 |
rename to x11-base/xorg-server/files/xdm.initd-4 |
| 19 |
index 993af2f..695e03c 100755 |
| 20 |
--- a/x11-base/xorg-server/files/xdm.initd-3 |
| 21 |
+++ b/x11-base/xorg-server/files/xdm.initd-4 |
| 22 |
@@ -45,9 +45,11 @@ depend() { |
| 23 |
# (#145219 #180163) Could use lirc mouse as input device |
| 24 |
# (#70689 comment #92) Start after consolefont to avoid display corruption |
| 25 |
# (#291269) Start after quota, since some dm need readable home |
| 26 |
+ # (#390609) gdm-3 will fail when dbus is not running |
| 27 |
after bootmisc consolefont modules netmount |
| 28 |
after readahead-list ypbind autofs openvpn gpm lircmd |
| 29 |
after quota |
| 30 |
+ after dbus |
| 31 |
before alsasound |
| 32 |
|
| 33 |
# Start before X |
| 34 |
|
| 35 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 36 |
index 3947705..bb14d9e 100644 |
| 37 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 38 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 39 |
@@ -39,6 +39,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 |
| 40 |
>=x11-libs/libXfixes-5.0 |
| 41 |
>=x11-libs/libXi-1.2.99.1 |
| 42 |
>=x11-libs/libXmu-1.0.3 |
| 43 |
+ x11-libs/libXrender |
| 44 |
>=x11-libs/libXres-1.0.3 |
| 45 |
>=x11-libs/libXtst-1.0.99.2 |
| 46 |
) |
| 47 |
@@ -113,7 +114,7 @@ PATCHES=( |
| 48 |
|
| 49 |
pkg_pretend() { |
| 50 |
# older gcc is not supported |
| 51 |
- [[ $(gcc-major-version) -lt 4 ]] && \ |
| 52 |
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
| 53 |
die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." |
| 54 |
} |
| 55 |
|
| 56 |
@@ -183,7 +184,7 @@ src_install() { |
| 57 |
fi |
| 58 |
|
| 59 |
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 60 |
- newinitd "${FILESDIR}"/xdm.initd-3 xdm |
| 61 |
+ newinitd "${FILESDIR}"/xdm.initd-4 xdm |
| 62 |
newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 63 |
|
| 64 |
# install the @x11-module-rebuild set for Portage |
Archives