Gentoo Archives: gentoo-commits

From: "Sergey Popov (pinkbyte)" <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-p2p/retroshare/files: retroshare-0.6.0-force-sqlcipher.patch
Date: Tue, 28 Apr 2015 14:48:38
Message-Id: 20150427095151.2974D99C@oystercatcher.gentoo.org
1 pinkbyte 15/04/27 09:51:51
2
3 Added: retroshare-0.6.0-force-sqlcipher.patch
4 Log:
5 Version bump, take maintainership
6
7 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)
8
9 Revision Changes Path
10 1.1 net-p2p/retroshare/files/retroshare-0.6.0-force-sqlcipher.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/retroshare/files/retroshare-0.6.0-force-sqlcipher.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/retroshare/files/retroshare-0.6.0-force-sqlcipher.patch?rev=1.1&content-type=text/plain
14
15 Index: retroshare-0.6.0-force-sqlcipher.patch
16 ===================================================================
17 --- retroshare-gui/src/retroshare-gui.pro.orig 2015-04-16 12:35:21.878472205 +0300
18 +++ retroshare-gui/src/retroshare-gui.pro 2015-04-16 12:35:46.330471776 +0300
19 @@ -84,21 +84,7 @@
20
21 SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)
22 isEmpty(SQLCIPHER_OK) {
23 -# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
24 -
25 - exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {
26 -
27 - LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
28 - DEPENDPATH += ../../../lib/sqlcipher/src/
29 - INCLUDEPATH += ../../../lib/sqlcipher/src/
30 - DEPENDPATH += ../../../lib/sqlcipher/tsrc/
31 - INCLUDEPATH += ../../../lib/sqlcipher/tsrc/
32 - } else {
33 - message(libsqlcipher.a not found. Compilation will not use SQLCIPHER. Database will be unencrypted.)
34 - DEFINES *= NO_SQLCIPHER
35 - LIBS *= -lsqlite3
36 - }
37 -
38 + error(libsqlcipher.a not found)
39 } else {
40 LIBS += -lsqlcipher
41 }
42 --- retroshare-nogui/src/retroshare-nogui.pro.orig 2015-04-16 12:36:00.940471520 +0300
43 +++ retroshare-nogui/src/retroshare-nogui.pro 2015-04-16 12:36:32.459470968 +0300
44 @@ -36,19 +36,7 @@
45 gxs {
46 SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)
47 isEmpty(SQLCIPHER_OK) {
48 -# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
49 -
50 - exists(../../../lib/sqlcipher/.libs/libsqlcipher.a) {
51 -
52 - LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
53 - DEPENDPATH += ../../../lib/sqlcipher/src/
54 - INCLUDEPATH += ../../../lib/sqlcipher/src/
55 - } else {
56 - message(libsqlcipher.a not found. Compilation will not use SQLCIPHER. Database will be unencrypted.)
57 - DEFINES *= NO_SQLCIPHER
58 - LIBS *= -lsqlite3
59 - }
60 -
61 + error(libsqlcipher.a not found)
62 } else {
63 LIBS *= -lsqlcipher
64 }