Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/task/files: task-2.3.0-gnutls-automagic.patch
Date: Fri, 28 Nov 2014 18:00:51
Message-Id: 20141128180046.86228B1A0@oystercatcher.gentoo.org
1 radhermit 14/11/28 18:00:46
2
3 Added: task-2.3.0-gnutls-automagic.patch
4 Log:
5 Fix automagic gnutls support (bug #522230).
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.1 app-misc/task/files/task-2.3.0-gnutls-automagic.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/task/files/task-2.3.0-gnutls-automagic.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/task/files/task-2.3.0-gnutls-automagic.patch?rev=1.1&content-type=text/plain
14
15 Index: task-2.3.0-gnutls-automagic.patch
16 ===================================================================
17 --- task-2.3.0/CMakeLists.txt
18 +++ task-2.3.0/CMakeLists.txt
19 @@ -9,6 +9,8 @@
20 project (task)
21 set (PROJECT_VERSION "2.3.0")
22
23 +OPTION(USE_GNUTLS "Build gnutls support." ON)
24 +
25 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
26 set (LINUX true)
27 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
28 @@ -59,13 +61,15 @@
29 set (PACKAGE_VERSION "${VERSION}")
30 set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
31
32 -message ("-- Looking for GnuTLS")
33 -find_package (GnuTLS)
34 -if (GNUTLS_FOUND)
35 - set (HAVE_LIBGNUTLS true)
36 - set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
37 - set (TASK_LIBRARIES ${TASK_LIBRARIES} ${GNUTLS_LIBRARIES})
38 -endif (GNUTLS_FOUND)
39 +if (USE_GNUTLS)
40 + message ("-- Looking for GnuTLS")
41 + find_package (GnuTLS)
42 + if (GNUTLS_FOUND)
43 + set (HAVE_LIBGNUTLS true)
44 + set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
45 + set (TASK_LIBRARIES ${TASK_LIBRARIES} ${GNUTLS_LIBRARIES})
46 + endif (GNUTLS_FOUND)
47 +endif (USE_GNUTLS)
48
49 #message ("-- Looking for pthread")
50 #find_path (PTHREAD_INCLUDE_DIR pthread.h)