Merge pull request #1584 from mariux64/rebuild-openssl1-for-correct-b…

…ee-package-creation Rebuild OpenSSL for correct bee package creation
mariux64 · Jan 13, 2020 · 2867c67 · 2867c67
2 parents 625385e + ffa0c57
commit 2867c67
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/qt5.be0 b/qt5.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION qt5-5.12.5-0
+# BEE_VERSION qt5-5.14.0-0
 
 SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz"
 
@@ -16,12 +16,6 @@ PREFIX=/usr/local/qt5
 #     start_cmd rm -rf ${S}/qtweb*
 # }
 
-# At the time of building the system libevent is a complete mess. But it also makes
-# sense to keep this in future builds.
-mee_configure_pre() {
-    start_cmd sed -e '/webengine-system-libevent/ s/=true\s*$/=false/' -i ${S}/qtwebengine/src/core/config/linux.pri
-}
-
 mee_configure() {
     start_cmd ${S}/configure \
         -prefix ${PREFIX} \

diff --git a/qtwebkit.be0 b/qtwebkit.be0
@@ -3,7 +3,7 @@
 # BEE_VERSION qtwebkit-5.212-1
 
 # mind the timestamp!                                         |  here  |
-SRCURL[0]="https://download.qt.io/snapshots/ci/qtwebkit/5.212/1563413169/src/submodules/qtwebkit-everywhere-src-5.212.tar.xz"
+SRCURL[0]="https://download.qt.io/snapshots/ci/qtwebkit/5.212/1568772611/src/submodules/qtwebkit-everywhere-src-5.212.tar.xz"
 
 # PATCHURL+=()
 

diff --git a/sqlite.be0 b/sqlite.be0
@@ -1,6 +1,6 @@
 #!/bin/env beesh
 
-# BEE_VERSION sqlite-3.28.00.00-0
+# BEE_VERSION sqlite-3.30.01.00-0
 
 SRCURL[0]="https://sqlite.org/2019/sqlite-autoconf-${PKGVERSION//./}.tar.gz"
 
@@ -10,9 +10,11 @@ mee_configure() {
         --enable-threadsafe \
         --enable-readline \
         --enable-dynamic-extensions \
-        CFLAGS="-g -O2 -DSQLITE_ENABLE_FTS3=1 \
+        --enable-fts5 \
+        CFLAGS="-g -O2 \
+            -DSQLITE_ENABLE_FTS3=1 \
             -DSQLITE_ENABLE_COLUMN_METADATA=1 \
             -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
-            -DSQLITE_SECURE_DELETE=1 \
-            -DSQLITE_ENABLE_DBSTAT_VTAB=1"
+            -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
+            -DSQLITE_SECURE_DELETE=1"
 }