QtMir

Merge lp:~alan-griffiths/qtmir/fix-FTBFS-with-Mir-0.6 into lp:qtmir/devel-mir-next

  1. fix-FTBFS-with-Mir-0.6
  2. Merge into devel-mir-next
Proposed by Alan Griffiths
Status: Merged
Approved by: Cemil Azizoglu
Approved revision: 226
Merged at revision: 226
Proposed branch: lp:~alan-griffiths/qtmir/fix-FTBFS-with-Mir-0.6
Merge into: lp:qtmir/devel-mir-next
Diff against target: 24 lines (+2/-2)
2 files modified
src/modules/Unity/Application/Application.pro (+1/-1)
src/platforms/mirserver/mirserver.pro (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/qtmir/fix-FTBFS-with-Mir-0.6
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Approve
Review via email: mp+229586@code.launchpad.net

Commit message

Fix FTBFS with Mir-0.6 + package config fixes

Description of the change

Fix FTBFS with Mir-0.6 + package config fixes

There were some incorrect pkg-config references.

N.B There appear to be errors in the Mir-0.5 mirserver package config that don't work with this.

To post a comment you must log in.
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/Application.pro'
2--- src/modules/Unity/Application/Application.pro 2014-07-17 17:31:51 +0000
3+++ src/modules/Unity/Application/Application.pro 2014-08-05 10:03:24 +0000
4@@ -10,7 +10,7 @@
5 QMAKE_CXXFLAGS = -std=c++11 -Werror -Wall
6 QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
7
8-PKGCONFIG += mircommon mirclient mirserver glib-2.0 process-cpp ubuntu-app-launch-2
9+PKGCONFIG += mirserver glib-2.0 process-cpp ubuntu-app-launch-2
10
11 INCLUDEPATH += ../../../platforms/mirserver
12 LIBS += -L../../../platforms/mirserver -lqpa-mirserver
13
14=== modified file 'src/platforms/mirserver/mirserver.pro'
15--- src/platforms/mirserver/mirserver.pro 2014-07-11 17:15:47 +0000
16+++ src/platforms/mirserver/mirserver.pro 2014-08-05 10:03:24 +0000
17@@ -15,7 +15,7 @@
18 QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
19
20 CONFIG += link_pkgconfig
21-PKGCONFIG += mircommon mirserver mirclient egl xkbcommon url-dispatcher-1
22+PKGCONFIG += mirserver protobuf egl xkbcommon url-dispatcher-1
23
24 LIBS += -lboost_system
25

Subscribers

People subscribed via source and target branches