Compiz

Merge lp:~charlesbos1/compiz/fix-libdecoration-pc-file into lp:compiz/0.9.12

  1. fix-libdecoration-pc-file
  2. Merge into 0.9.12
Proposed by Charles Bos
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 3920
Merged at revision: 3921
Proposed branch: lp:~charlesbos1/compiz/fix-libdecoration-pc-file
Merge into: lp:compiz/0.9.12
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~charlesbos1/compiz/fix-libdecoration-pc-file
Reviewer Review Type Date Requested Status
Stephen M. Webb Approve
Review via email: mp+247963@code.launchpad.net

Commit message

libdecoration.pc: fix formatting

Description of the change

Add spaces between xrender and the version so that the libdecoration.pc reads:

Requires: xrender >= 0.9.3

and not

Requires: xrender>=0.9.3

otherwise pkg-config will treat the version as part of the name. This messes up emerald builds as emerald requires libdecoration so the .pc needs to be correct.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-12-10 19:50:56 +0000
3+++ CMakeLists.txt 2015-01-29 11:11:56 +0000
4@@ -115,7 +115,7 @@
5 "libstartup-notification-1.0 >= 0.7"
6 )
7
8-set (DECORATION_REQUIRES xrender>=0.9.3)
9+set (DECORATION_REQUIRES "xrender >= 0.9.3")
10
11 compiz_pkg_check_modules (COMPIZ REQUIRED ${COMPIZ_REQUIRES})
12 compiz_pkg_check_modules (LIBDECORATION REQUIRED ${DECORATION_REQUIRES})

Subscribers

People subscribed via source and target branches