Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (66dd5ca9f37219a75452ba0d1295a8bf1c364812)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (66dd5ca9f37219a75452ba0d1295a8bf1c364812)
  • Date: Wed, 19 Sep 2018 11:45:31 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

database/sqlite/BUILD | 4 ++++
database/sqlite/CONFIGURE | 2 ++
database/sqlite/HISTORY | 3 +++
database/sqlite/PRE_SUB_DEPENDS | 1 +
database/sqlite/REPAIR^all^PRE_SUB_DEPENDS | 2 ++
database/sqlite/SUB_DEPENDS | 2 ++
http/firefox/DEPENDS | 3 ++-
http/firefox/HISTORY | 5 +++++
http/firefox/patches/rust-fuchsia-targets.patch | 12 ++++++++++++
9 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 66dd5ca9f37219a75452ba0d1295a8bf1c364812
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: sqlite with SQLITE_ENABLE_FTS3 option is required

commit db03eb81509f3f44d1a20de2803c066721d5fe48
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

database/sqlite: added SQLITE_ENABLE_FTS3 option

commit d9785a0f2acda94e1353bc7780758be4797d2470
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: fixed rust targets parsing

diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index 19355e7..352bacb 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -17,6 +17,10 @@ if [[ $SQLITE_ENABLE_DBSTAT_VTAB == y ]]; then
CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB $CFLAGS"
fi &&

+if [[ "${SQLITE_ENABLE_FTS3}" == "y" ]];then
+ CFLAGS="-DSQLITE_ENABLE_FTS3 ${CFLAGS}"
+fi &&
+
LDFLAGS="-ldl $LDFLAGS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&
OPTS="--enable-dynamic-extensions $SQLITE_TSAFE $OPTS" &&
diff --git a/database/sqlite/CONFIGURE b/database/sqlite/CONFIGURE
index b514857..4ff00cb 100755
--- a/database/sqlite/CONFIGURE
+++ b/database/sqlite/CONFIGURE
@@ -7,6 +7,8 @@ config_query SQLITE_ENABLE_UNLOCK "Compile with
SQLITE_ENABLE_UNLOCK_NOTIFY" n &

config_query SQLITE_ENABLE_DBSTAT_VTAB "Compile with
SQLITE_ENABLE_DBSTAT_VTAB" n &&

+config_query SQLITE_ENABLE_FTS3 "enable FTS3 support" n &&
+
config_query_option SQLITE_TSAFE "Build thread-safe SQLite?" y \
"--enable-threadsafe" \
"--disable-threadsafe"
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index a4dbe17..adc7f0d 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2018-09-19 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, *_DEPENDS: added SQLITE_ENABLE_FTS3 option
+
018-09-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.25.0

diff --git a/database/sqlite/PRE_SUB_DEPENDS b/database/sqlite/PRE_SUB_DEPENDS
index c8a00dd..26e5f40 100755
--- a/database/sqlite/PRE_SUB_DEPENDS
+++ b/database/sqlite/PRE_SUB_DEPENDS
@@ -5,6 +5,7 @@ SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then
return 1; fi ;;
ENABLE_UNLOCK_NOTIFY) if [[ $SQLITE_ENABLE_UNLOCK != "y" ]]; then return 1;
fi ;;
ENABLE_DBSTAT_VTAB) if [[ $SQLITE_ENABLE_DBSTAT_VTAB != "y" ]]; then return
1; fi ;;
SQLITE_ENABLE_JSON1) if [[ $SQLITE_ENABLE_JSON1 != "y" ]]; then return 1; fi
;;
+SQLITE_ENABLE_FTS3) if [[ "${SQLITE_ENABLE_FTS3}" != "y" ]]; then return 1;
fi ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
index d2c20ca..a55d0d6 100755
--- a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
+++ b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
@@ -13,6 +13,8 @@ ENABLE_DBSTAT_VTAB) message "ENABLE DBSTAT VTAB requested,
forcing it" &&
SQLITE_ENABLE_DBSTAT_VTAB=y ;;
SQLITE_ENABLE_JSON1) message "SQLITE_ENABLE_JSON1 requested, forcing it" &&
SQLITE_ENABLE_JSON1=y ;;
+SQLITE_ENABLE_FTS3) message "SQLITE_ENABLE_FTS3 requested, forcing it" &&
+ SQLITE_ENABLE_FTS3=y ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/database/sqlite/SUB_DEPENDS b/database/sqlite/SUB_DEPENDS
index d2c20ca..8c62a5b 100755
--- a/database/sqlite/SUB_DEPENDS
+++ b/database/sqlite/SUB_DEPENDS
@@ -13,6 +13,8 @@ ENABLE_DBSTAT_VTAB) message "ENABLE DBSTAT VTAB requested,
forcing it" &&
SQLITE_ENABLE_DBSTAT_VTAB=y ;;
SQLITE_ENABLE_JSON1) message "SQLITE_ENABLE_JSON1 requested, forcing it" &&
SQLITE_ENABLE_JSON1=y ;;
+SQLITE_ENABLE_FTS3) message "SQLITE_ENABLE_FTS3 requested, forcing it" &&
+ SQLITE_ENABLE_FTS3=y ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index fa3b7a3..66da54d 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -35,7 +35,8 @@ else
depends nss "--with-system-nss"
fi &&

-depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB"
sqlite "--enable-system-sqlite" &&
+depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB
+SQLITE_ENABLE_FTS3" sqlite "--enable-system-sqlite" &&

depends libidl &&

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 7e71cf5..367e157 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2018-09-18 Pavel Vinogradov <public AT sourcemage.org>
+ * patches/rust-fuchsia-targets.patch: added to fix parsing rust
+ targets
+ * DEPENDS: needs sqlite with SQLITE_ENABLE_FTS3 option
+
2018-09-05 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 62.0, SECURITY_PATCH++,
(CVE-2018-12377, CVE-2018-12378, CVE-2018-12379, CVE-2017-16541,
diff --git a/http/firefox/patches/rust-fuchsia-targets.patch
b/http/firefox/patches/rust-fuchsia-targets.patch
new file mode 100644
index 0000000..55c1e16
--- /dev/null
+++ b/http/firefox/patches/rust-fuchsia-targets.patch
@@ -0,0 +1,12 @@
+diff --git a/build/moz.configure/rust.configure
b/build/moz.configure/rust.configure
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -119,6 +119,8 @@
+ ambiguous = set()
+ per_raw_os = {}
+ for t in out:
++ if t.endswith("fuchsia"):
++ t = t + "-fuchsia"
+ t = split_triplet(t, allow_unknown=True)
+ key = (t.cpu, t.endianness, t.os)
+ if key in per_os:



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (66dd5ca9f37219a75452ba0d1295a8bf1c364812), Pavel Vinogradov, 09/19/2018

Archive powered by MHonArc 2.6.24.

Top of Page