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

Proposed by Jorge Niedbalski on 2015-03-19
Status: Work in progress
Proposed branch: lp:~niedbalski/ubuntu/vivid/lightdm/disable-nocpp
Merge into: lp:ubuntu/vivid/lightdm
Diff against target: 32 lines (+11/-2)
2 files modified
debian/changelog (+9/-0)
debian/lightdm-session (+2/-2)
To merge this branch: bzr merge lp:~niedbalski/ubuntu/vivid/lightdm/disable-nocpp
Reviewer Review Type Date Requested Status
Robert Ancell 2015-04-03 Pending
Ubuntu branches 2015-03-19 Pending
Review via email: mp+253455@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

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

Daniel Holbach (dholbach) wrote :

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

Robert Ancell (robert-ancell) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-03-10 14:54:29 +0000
3+++ debian/changelog 2015-03-19 02:38:39 +0000
4@@ -1,3 +1,12 @@
5+lightdm (1.13.2-0ubuntu2) vivid; urgency=medium
6+
7+ * debian/lightdm.session:
8+ - Fixes bug (LP: #1244578) and (LP: #1084885)
9+ by removing the '-nocpp' option from xrdb on user defined
10+ .Xresources.
11+
12+ -- Jorge Niedbalski <jorge.niedbalski@canonical.com> Wed, 18 Mar 2015 22:57:32 -0300
13+
14 lightdm (1.13.2-0ubuntu1) vivid; urgency=medium
15
16 * New upstream release:
17
18=== modified file 'debian/lightdm-session'
19--- debian/lightdm-session 2014-11-25 11:28:11 +0000
20+++ debian/lightdm-session 2015-03-19 02:38:39 +0000
21@@ -53,9 +53,9 @@
22 xresourcefile="$HOME/.Xresources"
23 if [ -f "$xresourcefile" ]; then
24 echo "Loading resource: $xresourcefile"
25- xrdb -nocpp -merge "$xresourcefile"
26+ xrdb -merge "$xresourcefile"
27 fi
28-fi
29+fi
30
31 # Load keymaps
32 if type setxkbmap >/dev/null 2>&1; then

Subscribers

People subscribed via source and target branches