Nux

Merge lp:~3v1n0/nux/x11-conffile-on-unity-only into lp:nux

Proposed by Marco Trevisan (Treviño) on 2018-06-13
Status: Merged
Approved by: Iain Lane on 2018-06-13
Approved revision: 895
Merged at revision: 891
Proposed branch: lp:~3v1n0/nux/x11-conffile-on-unity-only
Merge into: lp:nux
Diff against target: 56 lines (+25/-4)
3 files modified
debian/50_check_unity_support (+14/-2)
debian/changelog (+9/-0)
m4/gtest.m4 (+2/-2)
To merge this branch: bzr merge lp:~3v1n0/nux/x11-conffile-on-unity-only
Reviewer Review Type Date Requested Status
Iain Lane 2018-06-13 Approve on 2018-06-13
Review via email: mp+347861@code.launchpad.net

Commit message

X11-check-unity-support: only run when called from an unity session

The content of $XDG_CURRENT_DESKTOP is checked inside a sub-shell
not to affect the value of IFS for all the scripts sourced by the X session.

If running in Unity we should call unity_support_test, not inside gnome
ubuntu X sessions.

XDG_CURRENT_DESKTOP values are currently the followings:
 - unity before 17.10: Unity
 - unity after 17.10: Unity:Unity7:ubuntu
 - gnome session: GNOME
 - ubuntu gnome session: ubuntu:GNOME

To post a comment you must log in.
894. By Marco Trevisan (Treviño) on 2018-06-13

gtest: update default google-test prefix to match distro

895. By Marco Trevisan (Treviño) on 2018-06-13

Revert: "debian: don't consider the Xsession.d script as a config file anymore"

It seems something there's not full agreement on it, so to avoid further discussions
I'm reverting this back. However I strongly believe that given the current tools we have
this is the way to go, as debian doesn't provide other tools to get this done.
Nor X11 can move files outside of /etc.

Iain Lane (laney) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/50_check_unity_support'
--- debian/50_check_unity_support 2013-08-12 11:20:24 +0000
+++ debian/50_check_unity_support 2018-06-13 12:16:43 +0000
@@ -2,6 +2,18 @@
2# If the hardware does not pass unity_support_test, fall back to LLVMpipe2# If the hardware does not pass unity_support_test, fall back to LLVMpipe
3# which does.3# which does.
44
5if [ "x$DESKTOP_SESSION" = "xubuntu" ]; then5if [ "x$DESKTOP_SESSION" = "xubuntu" ] && [ -x "/usr/lib/nux/unity_support_test" ]; then
6 /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=16 (
7 IFS=':'
8 for d in $XDG_CURRENT_DESKTOP; do
9 if [ "x$d" = "xUnity" ] || [ "x$d" = "xUnity7" ]; then
10 return 0
11 fi
12 done
13 return 1
14 )
15
16 if [ $? = 0 ]; then
17 /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
18 fi
7fi19fi
820
=== modified file 'debian/changelog'
--- debian/changelog 2017-09-22 13:12:54 +0000
+++ debian/changelog 2018-06-13 12:16:43 +0000
@@ -1,3 +1,12 @@
1nux (4.0.8+17.10.20170922-0ubuntu2) UNRELEASED; urgency=medium
2
3 * debian/50_check_unity_support:
4 - various changes to fix (LP: #1768610):
5 + export LIBGL_ALWAYS_SOFTWARE=1 only on command failure
6 + run only when called inside an unity session
7
8 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 13 Jun 2018 03:35:45 +0200
9
1nux (4.0.8+17.10.20170922-0ubuntu1) artful; urgency=medium10nux (4.0.8+17.10.20170922-0ubuntu1) artful; urgency=medium
211
3 * Nux: mark explicit fallthrough jumps (to please gcc7)12 * Nux: mark explicit fallthrough jumps (to please gcc7)
413
=== modified file 'm4/gtest.m4'
--- m4/gtest.m4 2013-08-15 01:17:55 +0000
+++ m4/gtest.m4 2018-06-13 12:16:43 +0000
@@ -35,8 +35,8 @@
35 AC_ARG_VAR([GMOCK_CPPFLAGS],35 AC_ARG_VAR([GMOCK_CPPFLAGS],
36 [C preprocessor flags for Google Mock.])36 [C preprocessor flags for Google Mock.])
3737
38 gmock_prefix=/usr/src/gmock38 gmock_prefix=/usr/src/googletest/googlemock
39 gmock_includes=$gmock_prefix/gtest/include39 gmock_includes=$gmock_prefix/include
40 AC_ARG_WITH([gmock-prefix],[40 AC_ARG_WITH([gmock-prefix],[
41 AS_HELP_STRING([--with-gmock-prefix],41 AS_HELP_STRING([--with-gmock-prefix],
42 [Prefix where Google Mock is installed (default $gmock_prefix)])42 [Prefix where Google Mock is installed (default $gmock_prefix)])

Subscribers

People subscribed via source and target branches