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

[Marco Trevisan (Treviño)]

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

Also, at debian level, don't consider the Xsession.d script as a config file anymore

This is just a script to be loaded, and not something the user is supposed to change,
so it should be removed on simple package removal.
To achieve this, as per maintainer-guide 5.3, using sym-links is the standard way.

Backport to Bionic

[lp:~3v1n0/nux/x11-conffile-on-unity-only]

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

gtest: update default google-test prefix to match distro

[Iain Lane (laney)]

Thanks for the changes.

No sorry, I can't ack the symlink change. I don't think this complies with the Debian recommendations. It talks about whether *every* user has to modify the file, which isn't the case here. I don't see why this file is different to any of the other ones. Can we please just not rename it?

The rest of it looks good. I tested the subshell bit using /bin/sh here and it seems to work fine, thanks for doing it like that.

review: Needs Fixing

[lp:~3v1n0/nux/x11-conffile-on-unity-only]

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)]

thanks for the update

Please update the bug description before publishing the SRU. I also suggest you explain the gtest.m4 bit as this might be confusing for the reviewer.

review: Approve

Unmerged revisions

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.

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

gtest: update default google-test prefix to match distro

=== 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:41 +0000
@@ -2,6 +2,18 @@
 # If the hardware does not pass unity_support_test, fall back to LLVMpipe
 # which does.
 
-if [ "x$DESKTOP_SESSION" = "xubuntu" ]; then
-    /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
+if [ "x$DESKTOP_SESSION" = "xubuntu" ] && [ -x "/usr/lib/nux/unity_support_test" ]; then
+    (
+        IFS=':'
+        for d in $XDG_CURRENT_DESKTOP; do
+            if [ "x$d" = "xUnity" ] || [ "x$d" = "xUnity7" ]; then
+                return 0
+            fi
+        done
+        return 1
+    )
+
+    if [ $? = 0 ]; then
+        /usr/lib/nux/unity_support_test || export LIBGL_ALWAYS_SOFTWARE=1
+    fi
 fi
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-09-22 13:12:54 +0000
+++ debian/changelog	2018-06-13 12:16:41 +0000
@@ -1,3 +1,12 @@
+nux (4.0.8+17.10.20170922-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/50_check_unity_support:
+    - various changes to fix (LP: #1768610):
+      + export LIBGL_ALWAYS_SOFTWARE=1 only on command failure
+      + run only when called inside an unity session
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 13 Jun 2018 03:35:45 +0200
+
 nux (4.0.8+17.10.20170922-0ubuntu1) artful; urgency=medium
 
   * Nux: mark explicit fallthrough jumps (to please gcc7)
 
=== modified file 'm4/gtest.m4'
--- m4/gtest.m4	2013-08-15 01:17:55 +0000
+++ m4/gtest.m4	2018-06-13 12:16:41 +0000
@@ -35,8 +35,8 @@
   AC_ARG_VAR([GMOCK_CPPFLAGS],
              [C preprocessor flags for Google Mock.])
 
-  gmock_prefix=/usr/src/gmock
-  gmock_includes=$gmock_prefix/gtest/include
+  gmock_prefix=/usr/src/googletest/googlemock
+  gmock_includes=$gmock_prefix/include
   AC_ARG_WITH([gmock-prefix],[
     AS_HELP_STRING([--with-gmock-prefix],
                    [Prefix where Google Mock is installed (default $gmock_prefix)])