Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (316a5c8ecb50a58d29a8a1939d1aa0c0be2f825c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (316a5c8ecb50a58d29a8a1939d1aa0c0be2f825c)
  • Date: Sun, 8 Oct 2017 20:21:39 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5/qtwebengine/BUILD | 3 ++-
qt5/qtwebengine/DEPENDS | 6 ++++--
qt5/qtwebengine/HISTORY | 4 ++++
qt5/qtwebengine/PRE_BUILD | 4 +++-
4 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 316a5c8ecb50a58d29a8a1939d1aa0c0be2f825c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtwebengine - build improvements

diff --git a/qt5/qtwebengine/BUILD b/qt5/qtwebengine/BUILD
index 6edf46a..d9a1e41 100755
--- a/qt5/qtwebengine/BUILD
+++ b/qt5/qtwebengine/BUILD
@@ -1,4 +1,5 @@
#CXXFLAGS+=" -fno-delete-null-pointer-checks" &&
CFLAGS="${CFLAGS/-ffast-math}" &&
-OPTS+=" CONFIG+=shared"
+OPTS+=" QMAKE_CONFIG+=shared" &&
+message "QMAKE_CONFIG= $QMAKE_CONFIG" &&
default_build
diff --git a/qt5/qtwebengine/DEPENDS b/qt5/qtwebengine/DEPENDS
index 36f952a..5cf96d4 100755
--- a/qt5/qtwebengine/DEPENDS
+++ b/qt5/qtwebengine/DEPENDS
@@ -44,16 +44,18 @@ depends libpng &&
depends libsrtp &&
depends libusb &&
depends libxml2 &&
+depends nss &&
depends protobuf &&
depends snappy &&
depends sqlite &&
-depends zlib &&
+depends zlib ' QMAKE_CONFIG+=system-zlib' &&

# force use of system libraries
-depends icu ' QMAKE_CONFIG+=system-webengine-icu' &&
+depends icu ' QMAKE_CONFIG+=system-icu' &&
depends LIBAVCODEC ' QMAKE_CONFIG+=system-ffmpeg' &&
depends libvpx ' QMAKE_CONFIG+=system-vpx' &&
depends libwebp ' QMAKE_CONFIG+=system-webp' &&
depends ninja-build-system ' QMAKE_CONFIG+=system-ninja' &&
depends opus ' QMAKE_CONFIG+=system-opus' &&
depends re2 ' QMAKE_CONFIG+=system-re2'
+
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index 18ee2c8..085f1c5 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,3 +1,7 @@
+2017-10-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix re2 detection
+ * BUILD DEPENDS: tweak flags
+
2017-10-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.9.2
* DEPENDS: force use of more system libraries
diff --git a/qt5/qtwebengine/PRE_BUILD b/qt5/qtwebengine/PRE_BUILD
index f4216ce..428e2e3 100755
--- a/qt5/qtwebengine/PRE_BUILD
+++ b/qt5/qtwebengine/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY/src/3rdparty/chromium/ui/gfx/codec &&
patch -p0 < $SPELL_DIRECTORY/jpeg.diff &&
-cd $SOURCE_DIRECTORY
+cd $SOURCE_DIRECTORY &&
+#re2 needs pthread
+sed -i '/LIBS/s/re2/re2 -lpthread/' config.tests/re2/re2.pro



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (316a5c8ecb50a58d29a8a1939d1aa0c0be2f825c), Treeve Jelbert, 10/08/2017

Archive powered by MHonArc 2.6.24.

Top of Page