Gentoo Archives: gentoo-commits

From: "Dror Levin (spatz)" <spatz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-misc/basket/files: basket-1.80-crypt.patch
Date: Thu, 22 Apr 2010 17:38:24
Message-Id: 20100422173812.7B2AB295BA@corvid.gentoo.org
1 spatz 10/04/22 17:38:12
2
3 Added: basket-1.80-crypt.patch
4 Log:
5 Import from kde overlay, bug 310827. Thanks to Scott Stubbs, Maciej Grela and Andreas K. Huettel.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 kde-misc/basket/files/basket-1.80-crypt.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/basket/files/basket-1.80-crypt.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/basket/files/basket-1.80-crypt.patch?rev=1.1&content-type=text/plain
13
14 Index: basket-1.80-crypt.patch
15 ===================================================================
16 diff -r -u basket-1.80-vanilla/CMakeLists.txt basket-1.80/CMakeLists.txt
17 --- basket-1.80-vanilla/CMakeLists.txt 2010-03-20 21:20:57.000000000 +0100
18 +++ basket-1.80/CMakeLists.txt 2010-03-28 22:04:43.000000000 +0200
19 @@ -1,5 +1,7 @@
20 cmake_minimum_required(VERSION 2.4)
21
22 +OPTION(ENABLE_CRYPT "build encryption support" ON)
23 +
24 find_package(KDE4 REQUIRED)
25 find_package(QImageBlitz REQUIRED)
26 find_package(Gpgme)
27 @@ -15,13 +17,14 @@
28
29 include(MacroLibrary)
30
31 -IF(GPGME_FOUND)
32 +IF(GPGME_FOUND AND ENABLE_CRYPT)
33 SET(HAVE_LIBGPGME 1)
34 SET(LARGEFILE_SOURCE_1)
35 ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
36 -ELSE(GPGME_FOUND)
37 - MESSAGE("GPG not found, configuring without")
38 -ENDIF(GPGME_FOUND)
39 + MESSAGE("Configuring with GPG support")
40 +ELSE(GPGME_FOUND AND ENABLE_CRYPT)
41 + MESSAGE("Configuring without GPG support")
42 +ENDIF(GPGME_FOUND AND ENABLE_CRYPT)
43
44 #TODO: find meinproc