| 1 |
chithanh 15/02/08 18:26:50 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: xinit-1.3.4-r1.ebuild |
| 5 |
Log: |
| 6 |
conditionally revert upstream patch that broke startx on non-systemd systems, bug #526802. |
| 7 |
|
| 8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.258 x11-apps/xinit/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.258&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?rev=1.258&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/ChangeLog?r1=1.257&r2=1.258 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v |
| 20 |
retrieving revision 1.257 |
| 21 |
retrieving revision 1.258 |
| 22 |
diff -u -r1.257 -r1.258 |
| 23 |
--- ChangeLog 3 Jan 2015 14:49:32 -0000 1.257 |
| 24 |
+++ ChangeLog 8 Feb 2015 18:26:50 -0000 1.258 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for x11-apps/xinit |
| 27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.257 2015/01/03 14:49:32 heroxbd Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.258 2015/02/08 18:26:50 chithanh Exp $ |
| 30 |
+ |
| 31 |
+*xinit-1.3.4-r1 (08 Feb 2015) |
| 32 |
+ |
| 33 |
+ 08 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@g.o> |
| 34 |
+ +files/xinit-1.3.4-startx-current-vt.patch, +xinit-1.3.4-r1.ebuild: |
| 35 |
+ conditionally revert upstream patch that broke startx on non-systemd systems, |
| 36 |
+ bug #526802. |
| 37 |
|
| 38 |
03 Jan 2015; Benda Xu <heroxbd@g.o> xinit-1.3.3-r1.ebuild: |
| 39 |
xinitdir handling for Prefix. |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 x11-apps/xinit/xinit-1.3.4-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/xinit-1.3.4-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-apps/xinit/xinit-1.3.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: xinit-1.3.4-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2015 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.4-r1.ebuild,v 1.1 2015/02/08 18:26:50 chithanh Exp $ |
| 53 |
|
| 54 |
EAPI=5 |
| 55 |
|
| 56 |
inherit xorg-2 |
| 57 |
|
| 58 |
DESCRIPTION="X Window System initializer" |
| 59 |
|
| 60 |
LICENSE="${LICENSE} GPL-2" |
| 61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" |
| 62 |
IUSE="+minimal systemd" |
| 63 |
|
| 64 |
RDEPEND=" |
| 65 |
!<x11-base/xorg-server-1.8.0 |
| 66 |
x11-apps/xauth |
| 67 |
x11-libs/libX11 |
| 68 |
" |
| 69 |
DEPEND="${RDEPEND}" |
| 70 |
PDEPEND="x11-apps/xrdb |
| 71 |
!minimal? ( |
| 72 |
x11-apps/xclock |
| 73 |
x11-apps/xsm |
| 74 |
x11-terms/xterm |
| 75 |
x11-wm/twm |
| 76 |
) |
| 77 |
" |
| 78 |
|
| 79 |
PATCHES=( |
| 80 |
"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch" |
| 81 |
) |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
# this patch breaks startx on non-systemd systems, bug #526802 |
| 85 |
if use !systemd; then |
| 86 |
PATCHES+=( "${FILESDIR}"/${PN}-1.3.4-startx-current-vt.patch ) |
| 87 |
fi |
| 88 |
xorg-2_src_prepare |
| 89 |
} |
| 90 |
|
| 91 |
src_configure() { |
| 92 |
XORG_CONFIGURE_OPTIONS=( |
| 93 |
--with-xinitdir="${EPREFIX}"/etc/X11/xinit |
| 94 |
) |
| 95 |
xorg-2_src_configure |
| 96 |
} |
| 97 |
|
| 98 |
src_install() { |
| 99 |
xorg-2_src_install |
| 100 |
|
| 101 |
exeinto /etc/X11 |
| 102 |
doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh |
| 103 |
exeinto /etc/X11/Sessions |
| 104 |
doexe "${FILESDIR}"/Xsession |
| 105 |
exeinto /etc/X11/xinit |
| 106 |
newexe "${FILESDIR}"/xserverrc.1 xserverrc |
| 107 |
exeinto /etc/X11/xinit/xinitrc.d/ |
| 108 |
doexe "${FILESDIR}"/00-xhost |
| 109 |
|
| 110 |
insinto /usr/share/xsessions |
| 111 |
doins "${FILESDIR}"/Xsession.desktop |
| 112 |
} |
| 113 |
|
| 114 |
pkg_postinst() { |
| 115 |
xorg-2_pkg_postinst |
| 116 |
ewarn "If you use startx to start X instead of a login manager like gdm/kdm," |
| 117 |
ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or" |
| 118 |
ewarn "any executable. When you run startx, it will run this as the login session." |
| 119 |
ewarn "You can set this in a file in /etc/env.d/ for the entire system," |
| 120 |
ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)." |
| 121 |
ewarn "Here's an example of setting it for the whole system:" |
| 122 |
ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession" |
| 123 |
ewarn " env-update && source /etc/profile" |
| 124 |
} |
Archives