| 1 |
commit: 110e670822259aacc20f6c50ad99193db56226a3 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 3 20:15:09 2018 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 3 20:15:09 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=110e6708 |
| 7 |
|
| 8 |
thunderbird: sync 60.3.2-r1 from gentoo repo |
| 9 |
|
| 10 |
Signed-off-by: Ian Stakenvicius <axs <AT> gentoo.org> |
| 11 |
|
| 12 |
...zer.patch => thunderbird-60-sqlite3-fts3-tokenizer.patch} | 12 ++++++++++++ |
| 13 |
...hunderbird-60.3.2.ebuild => thunderbird-60.3.2-r1.ebuild} | 9 +-------- |
| 14 |
2 files changed, 13 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch |
| 17 |
similarity index 89% |
| 18 |
rename from mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch |
| 19 |
rename to mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch |
| 20 |
index 4e45b13..48ebbf1 100644 |
| 21 |
--- a/mail-client/thunderbird/files/sqlite3-fts3-tokenizer.patch |
| 22 |
+++ b/mail-client/thunderbird/files/thunderbird-60-sqlite3-fts3-tokenizer.patch |
| 23 |
@@ -11,6 +11,8 @@ tokenizers enabled by default. This allows to use system SQLite in |
| 24 |
distributions which provide SQLite configured in this way (which is SQLite |
| 25 |
upstream's default configuration due to security concerns). |
| 26 |
|
| 27 |
+Requires exposing the sqlite3_db_config symbol in bundled SQLite. |
| 28 |
+ |
| 29 |
Disable no longer needed setting of SQLITE_ENABLE_FTS3_TOKENIZER macro in |
| 30 |
bundled SQLite build. |
| 31 |
|
| 32 |
@@ -27,6 +29,16 @@ bundled SQLite build. |
| 33 |
# Turn on SQLite's assertions in debug builds. |
| 34 |
if CONFIG['MOZ_DEBUG']: |
| 35 |
DEFINES['SQLITE_DEBUG'] = 1 |
| 36 |
+--- a/db/sqlite3/src/sqlite.symbols Thu Nov 29 19:08:28 2018 +0000 |
| 37 |
++++ b/db/sqlite3/src/sqlite.symbols Thu Nov 29 23:02:10 2018 +0000 |
| 38 |
+@@ -45,6 +45,7 @@ |
| 39 |
+ sqlite3_create_function16 |
| 40 |
+ sqlite3_create_module |
| 41 |
+ sqlite3_data_count |
| 42 |
++sqlite3_db_config |
| 43 |
+ sqlite3_db_filename |
| 44 |
+ sqlite3_db_handle |
| 45 |
+ sqlite3_db_mutex |
| 46 |
--- a/storage/mozStorageConnection.cpp Thu Nov 29 19:08:28 2018 +0000 |
| 47 |
+++ b/storage/mozStorageConnection.cpp Thu Nov 29 23:02:10 2018 +0000 |
| 48 |
@@ -679,6 +679,10 @@ |
| 49 |
|
| 50 |
diff --git a/mail-client/thunderbird/thunderbird-60.3.2.ebuild b/mail-client/thunderbird/thunderbird-60.3.2-r1.ebuild |
| 51 |
similarity index 97% |
| 52 |
rename from mail-client/thunderbird/thunderbird-60.3.2.ebuild |
| 53 |
rename to mail-client/thunderbird/thunderbird-60.3.2-r1.ebuild |
| 54 |
index 315316c..b50bc92 100644 |
| 55 |
--- a/mail-client/thunderbird/thunderbird-60.3.2.ebuild |
| 56 |
+++ b/mail-client/thunderbird/thunderbird-60.3.2-r1.ebuild |
| 57 |
@@ -199,7 +199,7 @@ src_prepare() { |
| 58 |
|| die |
| 59 |
eapply "${WORKDIR}/firefox" |
| 60 |
|
| 61 |
- eapply "${FILESDIR}"/sqlite3-fts3-tokenizer.patch |
| 62 |
+ eapply "${FILESDIR}"/thunderbird-60-sqlite3-fts3-tokenizer.patch |
| 63 |
|
| 64 |
# Ensure that are plugins dir is enabled as default |
| 65 |
sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ |
| 66 |
@@ -474,13 +474,6 @@ src_install() { |
| 67 |
>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die |
| 68 |
fi |
| 69 |
|
| 70 |
- # dev-db/sqlite does not have FTS3_TOKENIZER support. |
| 71 |
- # gloda needs it to function, and bad crashes happen when its enabled and doesn't work |
| 72 |
- #if use system-sqlite ; then |
| 73 |
- # echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \ |
| 74 |
- # >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die |
| 75 |
- #fi |
| 76 |
- |
| 77 |
cd "${S}" || die |
| 78 |
MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \ |
| 79 |
DESTDIR="${D}" ./mach install || die |
Archives