Midori Web Browser

Merge lp:~midori/midori/x11-underlink into lp:midori

  1. x11-underlink
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6633
Merged at revision: 6633
Proposed branch: lp:~midori/midori/x11-underlink
Merge into: lp:midori
Diff against target: 11 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~midori/midori/x11-underlink
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+213370@code.launchpad.net

Commit message

Fix X11 lib underlink in midori-core

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Makes sense. Thanks!

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-03-11 20:04:46 +0000
3+++ CMakeLists.txt 2014-03-29 19:45:19 +0000
4@@ -77,7 +77,7 @@
5 find_library (XSS Xss /usr/lib/X11R6/lib)
6 if (SCRNSAVER AND XSS)
7 add_definitions("-DHAVE_X11_EXTENSIONS_SCRNSAVER_H")
8- set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS}")
9+ set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS};${X11}")
10 endif ()
11 endif ()
12

Subscribers

People subscribed via source and target branches

to all changes: