-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [harfbuzz] Fix build on Linux * [cairo] Fix build on Linux * [pango] Fix build on Linux * [wt] Fix build on Linux * [wt] Fix linking with -lcrypto
- Loading branch information
1 parent
411d133
commit ffbff8c
Showing
9 changed files
with
65 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: cairo | ||
Version: 1.15.8-3 | ||
Version: 1.15.8-4 | ||
Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB. | ||
Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: pango | ||
Version: 1.40.11-2 | ||
Version: 1.40.11-3 | ||
Description: Text and font handling library. | ||
Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!windows-static) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt | ||
index c5f7bbc8..6e2c2f4d 100644 | ||
--- a/cmake/WtFindSsl.txt | ||
+++ b/cmake/WtFindSsl.txt | ||
@@ -121,6 +121,16 @@ ELSEIF(APPLE) | ||
/usr/local/lib | ||
NO_DEFAULT_PATH | ||
) | ||
+ FIND_LIBRARY(CRYPTO_LIB | ||
+ NAMES | ||
+ crypto | ||
+ PATHS | ||
+ ${SSL_PREFIX}/lib | ||
+ ${SSL_PREFIX}/lib/VC | ||
+ /usr/lib | ||
+ /usr/local/lib | ||
+ NO_DEFAULT_PATH | ||
+ ) | ||
ELSE (WIN32) | ||
FIND_LIBRARY(SSL_LIB | ||
NAMES | ||
@@ -131,6 +141,15 @@ ELSE (WIN32) | ||
/usr/lib | ||
/usr/local/lib | ||
) | ||
+ FIND_LIBRARY(CRYPTO_LIB | ||
+ NAMES | ||
+ crypto | ||
+ PATHS | ||
+ ${SSL_PREFIX}/lib | ||
+ ${SSL_PREFIX}/lib/VC | ||
+ /usr/lib | ||
+ /usr/local/lib | ||
+ ) | ||
ENDIF (WIN32) | ||
|
||
IF(SSL_LIB | ||
@@ -144,7 +163,7 @@ IF(SSL_LIB | ||
ENDIF(SSL_TOO_LIB) | ||
ELSE(WIN32) | ||
SET(SSL_FOUND true) | ||
- SET(SSL_LIBRARIES ${SSL_LIB} -lcrypto) | ||
+ SET(SSL_LIBRARIES ${SSL_LIB} ${CRYPTO_LIB}) | ||
ENDIF(WIN32) | ||
ENDIF(SSL_LIB | ||
AND SSL_INCLUDE_DIRS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: wt | ||
Version: 4.0.4 | ||
Version: 4.0.4-2 | ||
Description: Wt is a C++ library for developing web applications | ||
Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters