Skip to Content.
Sympa Menu

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

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 (bf35ee1b789da331d1b702ad463d95a6af76e384)
  • Date: Fri, 1 Feb 2019 13:27:07 +0000

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

qt5/qttools/HISTORY | 1
qt5/qttools/PRE_BUILD | 6
qt5/qttools/patches/0001-remove-some-nomaketools-stuff.patch | 82
-----------
qt5/qtwebengine/DETAILS | 2
qt5/qtwebengine/HISTORY | 7
5 files changed, 9 insertions(+), 89 deletions(-)

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

qtwebengine - mark as SECURITY FIX

commit cc94afb309e878c76f5ce52501d04ad42ea25b52
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qttools - do not patch

diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY
index a1a419b..8b21b9f 100644
--- a/qt5/qttools/HISTORY
+++ b/qt5/qttools/HISTORY
@@ -1,5 +1,6 @@
2019-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.12.1
+ * PRE_BUILD patches/*: deleted

2019-01-22 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: tweak
diff --git a/qt5/qttools/PRE_BUILD b/qt5/qttools/PRE_BUILD
deleted file mode 100755
index 397f255..0000000
--- a/qt5/qttools/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-if ! is_depends_enabled $SPELL llvm; then
- sed -i '/clang/D' qttools.pro
-fi &&
-apply_patch_dir patches
diff --git a/qt5/qttools/patches/0001-remove-some-nomaketools-stuff.patch
b/qt5/qttools/patches/0001-remove-some-nomaketools-stuff.patch
deleted file mode 100644
index 52d82df..0000000
--- a/qt5/qttools/patches/0001-remove-some-nomaketools-stuff.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 81090aeb20d853c67cb6525e1cbb9dd71bda7bdb Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Tue, 11 Dec 2018 15:03:38 +0100
-Subject: [PATCH] remove some nomaketools stuff. it only seems to affect
- tarball build, not from git tree
-
----
- examples/designer/designer.pro | 4 ----
- src/assistant/assistant.pro | 4 ----
- src/designer/src/src.pro | 2 --
- src/linguist/linguist.pro | 4 ----
- src/src.pro | 4 ----
- 5 files changed, 18 deletions(-)
-
-diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
-index 2248d3ec..0e1cbc52 100644
---- a/examples/designer/designer.pro
-+++ b/examples/designer/designer.pro
-@@ -12,7 +12,3 @@ SUBDIRS = calculatorform
- solaris-cc*:SUBDIRS -= calculatorbuilder \
- worldtimeclockbuilder
-
--qtNomakeTools( \
-- containerextension \
-- taskmenuextension \
--)
-diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
-index 2d3ca569..1cfecff0 100644
---- a/src/assistant/assistant.pro
-+++ b/src/assistant/assistant.pro
-@@ -9,7 +9,3 @@ SUBDIRS += \
- assistant.depends = help
- qhelpgenerator.depends = help
-
--qtNomakeTools( \
-- assistant \
-- qhelpgenerator \
--)
-diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
-index 79e9e64e..4850e89b 100644
---- a/src/designer/src/src.pro
-+++ b/src/designer/src/src.pro
-@@ -23,6 +23,4 @@ uitools.depends = uiplugin
- qtNomakeTools( \
- lib \
- components \
-- designer \
-- plugins \
- )
-diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
-index 3f54c396..957d76f3 100644
---- a/src/linguist/linguist.pro
-+++ b/src/linguist/linguist.pro
-@@ -10,10 +10,6 @@ SUBDIRS = \
- }
- }
-
--qtNomakeTools( \
-- linguist \
--)
--
- equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe"
-
- load(cmake_functions)
-diff --git a/src/src.pro b/src/src.pro
-index 7a1af007..91c58e9d 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -37,10 +37,6 @@ win32|winrt:SUBDIRS += windeployqt
- winrt:SUBDIRS += winrtrunner
- qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
--qtNomakeTools( \
-- distancefieldgenerator \
-- pixeltool \
--)
-
- # This is necessary to avoid a race condition between toolchain.prf
- # invocations in a module-by-module cross-build.
---
-2.20.0
-
diff --git a/qt5/qtwebengine/DETAILS b/qt5/qtwebengine/DETAILS
index b41f8e1..a52076f 100755
--- a/qt5/qtwebengine/DETAILS
+++ b/qt5/qtwebengine/DETAILS
@@ -4,7 +4,7 @@ QT_URL=https://download.qt.io/official_releases
VERSION=5.12.1
VX=${VERSION%-*}

SOURCE_HASH=sha512:91ecd3fb474d53af06a66bf3e04d066d09b3ab9f867ef44c1d54690691ba00f5cf851c0d923d3465b8551baa0458e09122dd3a1e71d3a493d74ba020665a226c
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
SOURCE=$SPELLX-${VERSION}.tar.xz
SOURCE_URL=$QT_URL/qt/${VX%.?}/${VERSION}/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index 2e410c4..b5b5b22 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,5 +1,12 @@
2019-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.12.1
+ SECURITY_PATCH++
+ multiple security fixes from Chromium
+ CVE-2018-17480 CVE-2018-17481 CVE-2018-18335 CVE-2018-18336
CVE-2018-18337
+ CVE-2018-18338 CVE-2018-18339 CVE-2018-18340 CVE-2018-18341
CVE-2018-18342
+ CVE-2018-18343 CVE-2018-18345 CVE-2018-18347 CVE-2018-18349
CVE-2018-18350
+ CVE-2018-18355 CVE-2018-18356 CVE-2018-18357 CVE-2018-18358
CVE-2018-18359
+ Security Bugs: 839250 851821 869067 877843 879965 880665 882270
892643 895885 900910

2018-12-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.12.0



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (bf35ee1b789da331d1b702ad463d95a6af76e384), Treeve Jelbert, 02/01/2019

Archive powered by MHonArc 2.6.24.

Top of Page