diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2009-01-20 06:43:55 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2009-01-20 06:43:55 +0000 |
| commit | c88b6512ff52d403959da9b6b923cea973891de1 (patch) | |
| tree | 6f1b20703a13b8810cd3735954ceadfdc693ac53 /x11-misc/qterm/files | |
| parent | Use gtk by default (diff) | |
| download | gentoo-2-c88b6512ff52d403959da9b6b923cea973891de1.tar.gz gentoo-2-c88b6512ff52d403959da9b6b923cea973891de1.tar.bz2 gentoo-2-c88b6512ff52d403959da9b6b923cea973891de1.zip | |
Fix Qt dep for bug 248038 and in the process fix bug 225117 by applying
suggested as-needed patch.
(Portage version: 2.2_rc22/cvs/Linux 2.6.28-hh1 i686)
Diffstat (limited to 'x11-misc/qterm/files')
| -rw-r--r-- | x11-misc/qterm/files/qterm-0.5.2-as-needed.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch b/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch new file mode 100644 index 000000000000..8bc5bbe5d298 --- /dev/null +++ b/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch @@ -0,0 +1,44 @@ +diff -urN qterm-0.5.2.orig/cmake/FindOpenSSL.cmake qterm-0.5.2/cmake/FindOpenSSL.cmake +--- qterm-0.5.2.orig/cmake/FindOpenSSL.cmake 2008-05-12 00:07:32.000000000 +0800 ++++ qterm-0.5.2/cmake/FindOpenSSL.cmake 2008-06-06 21:56:41.000000000 +0800 +@@ -5,38 +5,6 @@ + # OPENSSL_INCLUDE_DIR - the OpenSSL include directory + # OPENSSL_LIBRARIES - The libraries needed to use OpenSSL + +-if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) ++INCLUDE( FindPkgConfig ) ++pkg_search_module(OPENSSL "openssl") + +- # in cache already +- SET(OPENSSL_FOUND TRUE) +- +-else (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) +- +- FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h +- /usr/include/ +- /usr/local/include/ +- ) +- +- FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 +- PATHS +- /usr/lib +- /usr/local/lib +- ) +- +- if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) +- set(OPENSSL_FOUND TRUE) +- endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) +- +- if (OPENSSL_FOUND) +- if (NOT OpenSSL_FIND_QUIETLY) +- message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}") +- endif (NOT OpenSSL_FIND_QUIETLY) +- else (OPENSSL_FOUND) +- if (OpenSSL_FIND_REQUIRED) +- message(FATAL_ERROR "Could NOT find OpenSSL") +- endif (OpenSSL_FIND_REQUIRED) +- endif (OPENSSL_FOUND) +- +- MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES) +- +-endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) |