diff options
Diffstat (limited to '0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch')
| -rw-r--r-- | 0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch b/0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch index 58ce63b9236e..e8786668ee5b 100644 --- a/0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch +++ b/0022-Bug-1611386-Reenable-support-for-enable-system-sqlit.patch @@ -24,10 +24,10 @@ Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com> 9 files changed, 70 insertions(+), 14 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 1e48dd12b43ed48085f22f6576f8c6696153775f..02e4a98563b72c421bbd79ea232a12b1792ff4b3 100644 +index b3213b8c4498b0467d7863d53c5fc4240e4609be..359fcd671f0ebeba46e2556c99ec11ce067fe23e 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -146,9 +146,11 @@ +@@ -145,9 +145,11 @@ @RESPATH@/update-settings.ini #endif @RESPATH@/platform.ini @@ -104,10 +104,10 @@ index b7198b1912fdc8d1182a445421aec3450474c23d..3ecc0bb997cf376e996bff2d9c184ecf // treat them as such. Release(); // Call is protected by us holding the mutex. diff --git a/storage/moz.build b/storage/moz.build -index 3509923c39b74218dfa11261ef67e9e40f89eea5..d5ef35b92fd6706e3f9879054bcda51b66d57e4b 100644 +index 38a855fce67ef30924be37f15359442b82dbbd82..0152aa5d39cd13abd36f4c0bf718e230c207dbdf 100644 --- a/storage/moz.build +++ b/storage/moz.build -@@ -105,6 +105,12 @@ DEFINES["SQLITE_MAX_LIKE_PATTERN_LENGTH"] = 50000 +@@ -101,6 +101,12 @@ if CONFIG["MOZ_THUNDERBIRD"] or CONFIG["MOZ_SUITE"]: if not CONFIG["MOZ_AVOID_DISK_REMNANT_ON_CLOSE"]: DEFINES["MOZ_SQLITE_PERSIST_AUXILIARY_FILES"] = 1 @@ -121,10 +121,10 @@ index 3509923c39b74218dfa11261ef67e9e40f89eea5..d5ef35b92fd6706e3f9879054bcda51b "/dom/base", "/third_party/sqlite3/src", diff --git a/storage/mozStorageConnection.cpp b/storage/mozStorageConnection.cpp -index 0398124f6ad233acef7625aac81c4f1162ff7d46..7a98488181763fdac3b3df0116a73592d8df6ea0 100644 +index 755f6d55a7bcaa7e192c4431469e2003d78a7937..b98ea355a8b0499cbe464f0a755e1735037076f3 100644 --- a/storage/mozStorageConnection.cpp +++ b/storage/mozStorageConnection.cpp -@@ -1041,6 +1041,10 @@ nsresult Connection::initializeInternal() { +@@ -1046,6 +1046,10 @@ nsresult Connection::initializeInternal() { return convertResultCode(srv); } @@ -136,18 +136,18 @@ index 0398124f6ad233acef7625aac81c4f1162ff7d46..7a98488181763fdac3b3df0116a73592 srv = registerFunctions(mDBConn); if (srv != SQLITE_OK) { diff --git a/storage/mozStorageService.cpp b/storage/mozStorageService.cpp -index 6427fef6529fa2959100c3b5b1c7b82ae0f6961e..6081bf0d89a538f8002e2a8f728d6cafff486ee3 100644 +index ac5a7b17888c48fc1afde78a3713994934763843..66beae8efe4b166b6f696a300139c9ae0d770a68 100644 --- a/storage/mozStorageService.cpp +++ b/storage/mozStorageService.cpp -@@ -18,6 +18,7 @@ - #include "mozStoragePrivateHelpers.h" - #include "nsIObserverService.h" +@@ -21,6 +21,7 @@ #include "nsIPropertyBag2.h" + #include "ObfuscatingVFS.h" + #include "QuotaVFS.h" +#include "nsIPromptService.h" #include "mozilla/Services.h" #include "mozilla/LateWriteChecks.h" #include "mozIStorageCompletionCallback.h" -@@ -167,6 +168,31 @@ already_AddRefed<Service> Service::getSingleton() { +@@ -170,6 +171,31 @@ already_AddRefed<Service> Service::getSingleton() { return do_AddRef(gService); } @@ -180,10 +180,10 @@ index 6427fef6529fa2959100c3b5b1c7b82ae0f6961e..6081bf0d89a538f8002e2a8f728d6caf // main thread. NS_ENSURE_TRUE(NS_IsMainThread(), nullptr); diff --git a/third_party/sqlite3/src/moz.build b/third_party/sqlite3/src/moz.build -index ff363c12935cd42ad40051627c287006f4c6be15..9242bb241e294745c45412c1db5f1cf293b26d0f 100644 +index 43bda4c89b651d8b959d5db67faccb914e4aa792..838e8851e5c1561755a4325ca3cd3f3f80da79d7 100644 --- a/third_party/sqlite3/src/moz.build +++ b/third_party/sqlite3/src/moz.build -@@ -81,6 +81,7 @@ DEFINES['SQLITE_OMIT_BUILTIN_TEST'] = True +@@ -79,6 +79,7 @@ DEFINES['SQLITE_OMIT_BUILTIN_TEST'] = True # Try to use a MEMORY temp store when possible. That allows for better # performance and doesn't suffer from a full separate tmp partition. # Exclude 32bit platforms due to address space fragmentation issues. @@ -191,7 +191,7 @@ index ff363c12935cd42ad40051627c287006f4c6be15..9242bb241e294745c45412c1db5f1cf2 if CONFIG['OS_TARGET'] == 'Android': # On Android there's no tmp partition, so always use a MEMORY temp store. DEFINES['SQLITE_TEMP_STORE'] = 3 -@@ -90,6 +91,7 @@ elif CONFIG['HAVE_64BIT_BUILD']: +@@ -88,6 +89,7 @@ elif CONFIG['HAVE_64BIT_BUILD']: # Change the default temp files prefix, to easily distinguish files we created # vs files created by other Sqlite instances in the system. @@ -214,7 +214,7 @@ index fc576f30bc6a47db5c8bfbaa77bb117f1bd68011..903d6b29f62528b6ecd762ef69fb5f20 sqlite3_complete16 sqlite3_config diff --git a/toolkit/moz.configure b/toolkit/moz.configure -index bbcbde85670803415bd804bc472f64fb592f490b..9fd9356c4016933f84f660c40116739f20ca15ee 100644 +index 74073e7e33f587ad8bf6a42f06fce156fcd33382..f599c82d749e5efda576a5122de7d4b88ea22831 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -380,6 +380,20 @@ sndio = pkg_check_modules("MOZ_SNDIO", "sndio", when="--enable-sndio") |