Merge lp:~niedbalski/ubuntu/vivid/lightdm/disable-nocpp into lp:ubuntu/vivid/lightdm

[Jorge Niedbalski]

Most user doesn't have a .Xresources file on the system, the few who have one, by enabling the cpp pre-processor will ended up with a _very_ minimal performance impact on startup (.00000 magnitude order) and that simple change fixes (LP: #1244578) and (LP: #1084885).

[Sebastien Bacher (seb128)]

Thanks, could you propose the change against lp:lightdm which is the upstream vcs?

[Daniel Holbach (dholbach)]

Marked as WIP, Robert: can you maybe coordinate with Jorge?

[Robert Ancell (robert-ancell)]

This is currently merged into trunk via https://code.launchpad.net/~cqql/lightdm/cpp/+merge/257486. So I think this is obsolete?

Unmerged revisions

163. By Jorge Niedbalski on 2015-03-19

debian/lightdm.session: Removed the '-nocpp' option on user defined .Xresources.

- There is no an efficient way for checking if cpp macros already exists.
- The 'nocpp' option break backcompatibility and doesn't affects default
ubuntu installations.

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-10 14:54:29 +0000
+++ debian/changelog	2015-03-19 02:38:39 +0000
@@ -1,3 +1,12 @@
+lightdm (1.13.2-0ubuntu2) vivid; urgency=medium
+
+  * debian/lightdm.session: 
+	- Fixes bug (LP: #1244578) and (LP: #1084885)
+	  by removing the '-nocpp' option from xrdb on user defined 
+	  .Xresources.
+
+ -- Jorge Niedbalski <[e-mail]>  Wed, 18 Mar 2015 22:57:32 -0300
+
 lightdm (1.13.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release:
 
=== modified file 'debian/lightdm-session'
--- debian/lightdm-session	2014-11-25 11:28:11 +0000
+++ debian/lightdm-session	2015-03-19 02:38:39 +0000
@@ -53,9 +53,9 @@
     xresourcefile="$HOME/.Xresources"
     if [ -f "$xresourcefile" ]; then
         echo "Loading resource: $xresourcefile"
-        xrdb -nocpp -merge "$xresourcefile"
+        xrdb -merge "$xresourcefile"
     fi
-fi    
+fi
 
 # Load keymaps
 if type setxkbmap >/dev/null 2>&1; then