1 |
bicatali 13/06/04 15:41:13 |
2 |
|
3 |
Modified: ChangeLog root-docs-5.34.07.ebuild |
4 |
Log: |
5 |
fixed sandbox violation on DRI systems |
6 |
|
7 |
(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
8 |
|
9 |
Revision Changes Path |
10 |
1.32 app-doc/root-docs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/ChangeLog?rev=1.32&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/ChangeLog?rev=1.32&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/ChangeLog?r1=1.31&r2=1.32 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v |
19 |
retrieving revision 1.31 |
20 |
retrieving revision 1.32 |
21 |
diff -u -r1.31 -r1.32 |
22 |
--- ChangeLog 23 May 2013 23:50:00 -0000 1.31 |
23 |
+++ ChangeLog 4 Jun 2013 15:41:13 -0000 1.32 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for app-doc/root-docs |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.31 2013/05/23 23:50:00 bicatali Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/ChangeLog,v 1.32 2013/06/04 15:41:13 bicatali Exp $ |
29 |
+ |
30 |
+ |
31 |
+ 28 May 2013; Andrew Savchenko <bircoph@×××××.com> +root-docs-5.34.07.ebuild: |
32 |
+ Fix sandbox violation on DRI systems: use addpredict instead of |
33 |
+ switching to Xong GL interface. |
34 |
|
35 |
*root-docs-5.34.07 (23 May 2013) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 app-doc/root-docs/root-docs-5.34.07.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/root-docs-5.34.07.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/root-docs-5.34.07.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/root-docs-5.34.07.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: root-docs-5.34.07.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.07.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- root-docs-5.34.07.ebuild 23 May 2013 23:50:00 -0000 1.1 |
53 |
+++ root-docs-5.34.07.ebuild 4 Jun 2013 15:41:13 -0000 1.2 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2013 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.07.ebuild,v 1.1 2013/05/23 23:50:00 bicatali Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.34.07.ebuild,v 1.2 2013/06/04 15:41:13 bicatali Exp $ |
59 |
|
60 |
EAPI=5 |
61 |
|
62 |
@@ -34,13 +34,6 @@ |
63 |
${_GIT_DEP}" |
64 |
RDEPEND="" |
65 |
|
66 |
-pkg_setup() { |
67 |
- # sandboxed user can't access video hardware, so xorg-x11 implementation |
68 |
- # should be used |
69 |
- GL_IMPLEM=$(eselect opengl show) |
70 |
- eselect opengl set xorg-x11 |
71 |
-} |
72 |
- |
73 |
src_prepare() { |
74 |
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-makehtml.patch |
75 |
} |
76 |
@@ -64,6 +57,10 @@ |
77 |
} |
78 |
|
79 |
src_compile() { |
80 |
+ # video drivers may want to access hardware devices |
81 |
+ cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g') |
82 |
+ [[ -n "${cards}" ]] && addpredict "${cards}" |
83 |
+ |
84 |
ROOTSYS="${S}" Xemake html |
85 |
# if root.exe crashes, return code will be 0 due to gdb attach, |
86 |
# so we need to check if last html file was generated; |
87 |
@@ -77,7 +74,3 @@ |
88 |
mv htmldoc/* "${ED}usr/share/doc/${PF}/" |
89 |
docompress -x "${EPREFIX}/usr/share/doc/${PF}/" |
90 |
} |
91 |
- |
92 |
-pkg_postinst() { |
93 |
- eselect opengl set ${GL_IMPLEM} |
94 |
-} |