Merge lp:~dandrader/compiz/lp1084162 into lp:compiz/0.9.9

Proposed by Daniel d'Andrada on 2012-11-28
Status: Merged
Approved by: Daniel van Vugt on 2012-11-29
Approved revision: 3487
Merged at revision: 3487
Proposed branch: lp:~dandrader/compiz/lp1084162
Merge into: lp:compiz/0.9.9
Diff against target: 10 lines (+1/-1)
1 file modified
compiz.pc.in (+1/-1)
To merge this branch: bzr merge lp:~dandrader/compiz/lp1084162
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-11-28 Approve on 2012-11-29
PS Jenkins bot (community) continuous-integration Approve on 2012-11-28
Sam Spilsbury 2012-11-28 Approve on 2012-11-28
Review via email: mp+136735@code.launchpad.net

Commit message

Point to compiz library dir in compiz.pc Libs section
Otherwise linkers won't be able to find, let say, -lcompiz_core if compiz is
installed outside /usr. (LP: #1084162)

Description of the change

To post a comment you must log in.
Sam Spilsbury (smspillaz) wrote :

This seems fine to me but r2993 states that:

  Revert the compiz.pc part of the fix for LP: #928044 because it caused some
  packages like libcompizconfig to link to compiz_core when they shouldn't.
  (LP: #929443)

Can you check with ldd whether or not this is happening?

Daniel d'Andrada (dandrader) wrote :

> This seems fine to me but r2993 states that:
>
> Revert the compiz.pc part of the fix for LP: #928044 because it caused some
> packages like libcompizconfig to link to compiz_core when they shouldn't.
> (LP: #929443)
>
> Can you check with ldd whether or not this is happening?

I just added the -L... part -lcompiz_core remain absent, which I think is the part necessary to cause the problem described.

Sam Spilsbury (smspillaz) wrote :

Ak ok, sounds good then

On Thu, Nov 29, 2012 at 2:08 AM, Daniel d'Andrada
<email address hidden> wrote:
>> This seems fine to me but r2993 states that:
>>
>> Revert the compiz.pc part of the fix for LP: #928044 because it caused some
>> packages like libcompizconfig to link to compiz_core when they shouldn't.
>> (LP: #929443)
>>
>> Can you check with ldd whether or not this is happening?
>
> I just added the -L... part -lcompiz_core remain absent, which I think is the part necessary to cause the problem described.
> --
> https://code.launchpad.net/~dandrader/compiz/lp1084162/+merge/136735
> Your team Compiz Maintainers is requested to review the proposed merge of lp:~dandrader/compiz/lp1084162 into lp:compiz.

--
Sam Spilsbury

Sam Spilsbury (smspillaz) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Daniel van Vugt (vanvugt) wrote :

I remember adding that comment in r2993. But it's only an issue for the separate projects compiz-core/compiz-*plugins of 0.9.7.* for precise.

So if the change works with lp:compiz and lp:unity then it's fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compiz.pc.in'
2--- compiz.pc.in 2012-05-16 17:40:13 +0000
3+++ compiz.pc.in 2012-11-28 17:55:35 +0000
4@@ -8,5 +8,5 @@
5 Version: @VERSION@
6
7 Requires: @COMPIZ_REQUIRES@
8-Libs:
9+Libs: -L${libdir}
10 Cflags: @COMPIZ_CFLAGS@ -I${includedir}/compiz

Subscribers

People subscribed via source and target branches