| 1 |
yngwin 09/01/20 06:43:55 |
| 2 |
|
| 3 |
Added: qterm-0.5.2-as-needed.patch |
| 4 |
Log: |
| 5 |
Fix Qt dep for bug 248038 and in the process fix bug 225117 by applying |
| 6 |
suggested as-needed patch. |
| 7 |
(Portage version: 2.2_rc22/cvs/Linux 2.6.28-hh1 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/qterm/files/qterm-0.5.2-as-needed.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qterm-0.5.2-as-needed.patch |
| 16 |
=================================================================== |
| 17 |
diff -urN qterm-0.5.2.orig/cmake/FindOpenSSL.cmake qterm-0.5.2/cmake/FindOpenSSL.cmake |
| 18 |
--- qterm-0.5.2.orig/cmake/FindOpenSSL.cmake 2008-05-12 00:07:32.000000000 +0800 |
| 19 |
+++ qterm-0.5.2/cmake/FindOpenSSL.cmake 2008-06-06 21:56:41.000000000 +0800 |
| 20 |
@@ -5,38 +5,6 @@ |
| 21 |
# OPENSSL_INCLUDE_DIR - the OpenSSL include directory |
| 22 |
# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL |
| 23 |
|
| 24 |
-if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) |
| 25 |
+INCLUDE( FindPkgConfig ) |
| 26 |
+pkg_search_module(OPENSSL "openssl") |
| 27 |
|
| 28 |
- # in cache already |
| 29 |
- SET(OPENSSL_FOUND TRUE) |
| 30 |
- |
| 31 |
-else (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) |
| 32 |
- |
| 33 |
- FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h |
| 34 |
- /usr/include/ |
| 35 |
- /usr/local/include/ |
| 36 |
- ) |
| 37 |
- |
| 38 |
- FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 |
| 39 |
- PATHS |
| 40 |
- /usr/lib |
| 41 |
- /usr/local/lib |
| 42 |
- ) |
| 43 |
- |
| 44 |
- if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) |
| 45 |
- set(OPENSSL_FOUND TRUE) |
| 46 |
- endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) |
| 47 |
- |
| 48 |
- if (OPENSSL_FOUND) |
| 49 |
- if (NOT OpenSSL_FIND_QUIETLY) |
| 50 |
- message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}") |
| 51 |
- endif (NOT OpenSSL_FIND_QUIETLY) |
| 52 |
- else (OPENSSL_FOUND) |
| 53 |
- if (OpenSSL_FIND_REQUIRED) |
| 54 |
- message(FATAL_ERROR "Could NOT find OpenSSL") |
| 55 |
- endif (OpenSSL_FIND_REQUIRED) |
| 56 |
- endif (OPENSSL_FOUND) |
| 57 |
- |
| 58 |
- MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES) |
| 59 |
- |
| 60 |
-endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) |
Archives