Commit Graph

22 Commits

Author SHA1 Message Date
Andrea Cavalli
1ccc7c6c65 Merge commit '3282a873cb24b0c975b6929aeb71a00fc6a18b7c'
Conflicts:
	sqlite/sqlite/sqlite3.c
	sqlite/sqlite/sqlite3.h
	sqlite/sqlite/sqlite3ext.h
	sqlite/sqlite/sqlite3session.h
	tddb/td/db/SqliteDb.cpp
2020-08-18 13:55:47 +02:00
levlam
f266aa3912 Minor fixes.
GitOrigin-RevId: a4aacfa1ecab2718475d32bcbd99f9671ba7e982
2020-08-14 22:51:10 +03:00
levlam
e43f419a6f Patch SQLite ftruncate call only on Android.
GitOrigin-RevId: 930b58281ba5eab7d4f560e56b129d8b043fa455
2020-08-13 22:40:49 +03:00
Arseny Smirnov
d4f0162ee9 Sqlite: fix DB corruption on some Samsung devices
GitOrigin-RevId: bc3e631f6873c0a4a53b8aea2159727fa0d1e956
2020-08-12 22:54:34 +03:00
Arseny Smirnov
0ef5577209 Sqlite: repeat fixes from previous commits
GitOrigin-RevId: 1dce19984342f573aaf106180f3e72a399114b26
2020-08-12 22:49:17 +03:00
Arseny Smirnov
c66a72fe90 Sqlcipher: update version to 4.4.0 (without fixes)
GitOrigin-RevId: ad3039010f1fd047d500df9fd9e388165c38a4ba
2020-08-12 21:09:31 +03:00
cc087aeacd Merge commit 'ab5d35371b1fdcfb30dfa981ede54ec83db214a9'
Conflicts:
	sqlite/CMakeLists.txt
	td/telegram/ContactsManager.cpp
	td/telegram/Photo.cpp
	td/telegram/Td.cpp
	td/telegram/WebPagesManager.cpp
	td/telegram/files/FileManager.h
2020-07-29 16:39:33 +02:00
levlam
ab5d35371b Ensure that OpenSSL is linked against needed Windows libraries.
GitOrigin-RevId: d2928c94ebe6565e155f81db8ccc24c4c5d69a54
2020-07-28 01:34:35 +03:00
e3bf0f63f0 Patches 2020-05-23 21:27:24 +02:00
levlam
f8a550124c Silence SQLite compiler warnings.
GitOrigin-RevId: 4883d29102526dcd426fedf12db330b532dbea70
2020-05-17 04:57:46 +03:00
levlam
0198711920 Allow to change CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_INCLUDEDIR.
GitOrigin-RevId: 5704095d127c7fcf2450133745ab2ac546a1177f
2020-01-24 03:03:18 +03:00
levlam
0152d8ea2a Fix CMAKE_INSTALL_LIBDIR usages.
GitOrigin-RevId: 2bca91c97e868aa15ee8a65650938eda857429df
2020-01-24 02:01:07 +03:00
levlam
a33a620fd1 Fix SQLCipher amalgamation building in Cygwin.
GitOrigin-RevId: 82d0f8e58e60c4e099d9330b473caf6c9c1ed22d
2019-04-29 05:22:17 +03:00
levlam
e785ac6bba Better CMake variable expansion usage in if.
GitOrigin-RevId: 28a5d6bbab13a9eacf9b1b8f0ac8eeff1be21556
2019-04-04 22:23:06 +03:00
Arseny Smirnov
bc75542960 minor cmake fix
GitOrigin-RevId: 539498b3ade92f5faca4d63c8ecf3c80783caad7
2018-03-06 16:28:43 +03:00
levlam
7988048597 Better warnings suppression for SQLite.
GitOrigin-RevId: dc7d0c93b2e9a5f0511d31fb4f25c2ec3b9c2870
2018-02-28 03:03:03 +03:00
levlam
6eadf472fe Rename TdWindows to TdDotNet.
GitOrigin-RevId: 0bfff62c224dcbd316534649b119917280b3b398
2018-02-28 02:09:23 +03:00
levlam
33225f66ae Fix linking zlib to OpenSSL.
GitOrigin-RevId: c7dcc89d4a88a6c665007bfe7b48106829455c2f
2018-02-18 00:24:34 +03:00
levlam
83a5e3ae07 Fix linking to dl.
GitOrigin-RevId: ff7c6e330ecb07aee8b4f614e86bd5a3f54edce8
2018-02-17 23:52:35 +03:00
levlam
ea46851d7e Remove unused sqlite dependency on libdl.
GitOrigin-RevId: 30d56bf3b2cb3cf826f0417c81c23ec9ed037cce
2018-01-27 22:44:31 +03:00
levlam
86cb681064 Omit some unused sqlite parts.
GitOrigin-RevId: 1ec7b317466aa4f363e73de3fee04509a2fcf054
2018-01-21 16:44:17 +03:00
Arseny Smirnov
71d03f39c3 Project import generated by Copybara.
GitOrigin-RevId: 318483224ad6164d9966f731d60cde37039bb2d4
2017-12-31 23:08:40 +03:00