Skip to Content.
Sympa Menu

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

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 (bb4ef076e68b25cd0a162f4f4d6f49106ba3e361)
  • Date: Tue, 2 Jun 2015 12:08:51 +0000

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

ChangeLog | 1
qt5/qtbase/CONFLICTS | 1
qt5/qtbase/DETAILS | 4
qt5/qtbase/HISTORY | 3
qt5/qtdeclarative/CONFLICTS | 1
qt5/qtdeclarative/DETAILS | 4
qt5/qtdeclarative/HISTORY | 3
qt5/qtgraphicaleffects/DETAILS | 4
qt5/qtgraphicaleffects/HISTORY | 3
qt5/qtimageformats/CONFLICTS | 1
qt5/qtimageformats/DETAILS | 4
qt5/qtimageformats/HISTORY | 3
qt5/qtlocation/CONFLICTS | 1
qt5/qtlocation/DETAILS | 4
qt5/qtlocation/HISTORY | 3
qt5/qtmultimedia/CONFLICTS | 1
qt5/qtmultimedia/DETAILS | 4
qt5/qtmultimedia/HISTORY | 3
qt5/qtquick1/CONFLICTS | 1
qt5/qtquick1/DETAILS | 4
qt5/qtquick1/HISTORY | 3
qt5/qtquickcontrols/DETAILS | 4
qt5/qtquickcontrols/HISTORY | 3
qt5/qtscript/CONFLICTS | 1
qt5/qtscript/DETAILS | 4
qt5/qtscript/HISTORY | 3
qt5/qtserialport/CONFLICTS | 1
qt5/qtserialport/DETAILS | 4
qt5/qtserialport/HISTORY | 3
qt5/qtsvg/DETAILS | 4
qt5/qtsvg/HISTORY | 3
qt5/qttools/CONFLICTS | 1
qt5/qttools/DETAILS | 4
qt5/qttools/HISTORY | 3
qt5/qtwayland/CONFLICTS | 1
qt5/qtwayland/DETAILS | 4
qt5/qtwayland/HISTORY | 3
qt5/qtwebengine/DETAILS | 5
qt5/qtwebengine/HISTORY | 6
qt5/qtwebkit/DETAILS | 4
qt5/qtwebkit/HISTORY | 5
qt5/qtwebkit/PRE_BUILD | 4
qt5/qtwebkit/icu.patch | 17 --
qt5/qtwebkit/qtwebkit-glibmutexlocker.patch | 238
----------------------------
qt5/qtx11extras/DETAILS | 4
qt5/qtx11extras/HISTORY | 3
qt5/qtxmlpatterns/CONFLICTS | 1
qt5/qtxmlpatterns/DETAILS | 4
qt5/qtxmlpatterns/HISTORY | 3
49 files changed, 93 insertions(+), 303 deletions(-)

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

qtwebkit - remove patches

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

qtwebengine$ - SECURITY FIX

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

qt5/* - remove redundant CONFLICTS

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

qtxmlpatterns: => 5.4.2

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

qtx11extras: => 5.4.2

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

qtwebkit: => 5.4.2

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

qtwebengine: => 5.4.2

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

qtwayland: => 5.4.2

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

qttools: => 5.4.2

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

qtsvg: => 5.4.2

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

qtserialport: => 5.4.2

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

qtscript: => 5.4.2

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

qtquickcontrols: => 5.4.2

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

qtquick1: => 5.4.2

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

qtmultimedia: => 5.4.2

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

qtlocation: => 5.4.2

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

qtimageformats: => 5.4.2

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

qtgraphicaleffects: => 5.4.2

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

qtdeclarative: => 5.4.2

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

qtbase: => 5.4.2

diff --git a/ChangeLog b/ChangeLog
index cd9dd6b..6bb8e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
* qt5/qtjsbackend: spell deprecated
+ * qt5/*/CONFLICTS: delete no longer needed files

2015-05-31 Ismael Luceno <ismael AT sourcemage.org>
* perl-cpan/perl-forks: new spell, drop-in replacement for Perl
diff --git a/qt5/qtbase/CONFLICTS b/qt5/qtbase/CONFLICTS
deleted file mode 100755
index 5556dab..0000000
--- a/qt5/qtbase/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtbase y
diff --git a/qt5/qtbase/DETAILS b/qt5/qtbase/DETAILS
index 1cd7f86..ec3ded8 100755
--- a/qt5/qtbase/DETAILS
+++ b/qt5/qtbase/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtbase
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 6b47c1c..f7a529d 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
* CONFLICTS: added, conflicts with itself during build

diff --git a/qt5/qtdeclarative/CONFLICTS b/qt5/qtdeclarative/CONFLICTS
deleted file mode 100755
index eb943aa..0000000
--- a/qt5/qtdeclarative/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtdeclarative y
diff --git a/qt5/qtdeclarative/DETAILS b/qt5/qtdeclarative/DETAILS
index eb010c6..c69f5e6 100755
--- a/qt5/qtdeclarative/DETAILS
+++ b/qt5/qtdeclarative/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtdeclarative
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:58a688eb5b6ad1d9e56ca75c8b62708df773674425d9f86b8fb8cbce46f88d3c84b62936ad96fb8634ea20969eb8abaa3947e06b8e23d2a12ce340b78d4fc548
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:be8b28dfafc20364e0056739f94432750493372b423f2351715d1ec0942cee71b36f6a86db5d6f450c291b147a07632dd1573b76601c0d5eb4c2fdaed717bb93
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY
index c04d331..588dd90 100644
--- a/qt5/qtdeclarative/HISTORY
+++ b/qt5/qtdeclarative/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qtgraphicaleffects/DETAILS b/qt5/qtgraphicaleffects/DETAILS
index 0964051..2034871 100755
--- a/qt5/qtgraphicaleffects/DETAILS
+++ b/qt5/qtgraphicaleffects/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtgraphicaleffects
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:0f2b0c42692a89e68f98718e259c732f72837f510a7e3eb95d81c6271c852d7a0e8de1bb17ba181be48b0159c4381995a230ad6f9d4ec45311b59c315207c9c5
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:205896a2551a2be99b015c4254ec5195f97ff99d266e377caaffe02033d5c0aa9d7509b781f5316074ebe5e2d8e768b90db81d19a2233f98c887c57a25046c38
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtgraphicaleffects/HISTORY b/qt5/qtgraphicaleffects/HISTORY
index 308107a..cb5effd 100644
--- a/qt5/qtgraphicaleffects/HISTORY
+++ b/qt5/qtgraphicaleffects/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qtimageformats/CONFLICTS b/qt5/qtimageformats/CONFLICTS
deleted file mode 100644
index 423e12e..0000000
--- a/qt5/qtimageformats/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtimageformats y
diff --git a/qt5/qtimageformats/DETAILS b/qt5/qtimageformats/DETAILS
index a3e751e..48d4fd4 100755
--- a/qt5/qtimageformats/DETAILS
+++ b/qt5/qtimageformats/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtimageformats
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:5feef279c6c9683a55fe401e7221f1fc91557028751b603c2051f08757f758a48f3f8294847e473d20599bf9bcdad355eecbd9fa7a2bb7fd5cdf79f4fee49120
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:8c0531cc981dc36c88cc420ae5ea9e069ffc217fd3ea3745e6956cf547e17ec8fb244ce2df1735b8b6b750da1f70925956dbded457f8c7f820db53837efbaff0
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtimageformats/HISTORY b/qt5/qtimageformats/HISTORY
index 0db1880..aa67e5c 100644
--- a/qt5/qtimageformats/HISTORY
+++ b/qt5/qtimageformats/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qtlocation/CONFLICTS b/qt5/qtlocation/CONFLICTS
deleted file mode 100755
index 884231b..0000000
--- a/qt5/qtlocation/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtlocation y
diff --git a/qt5/qtlocation/DETAILS b/qt5/qtlocation/DETAILS
index 547e6ce..7f2f8f9 100755
--- a/qt5/qtlocation/DETAILS
+++ b/qt5/qtlocation/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtlocation
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:9a88d62af7bdbd10b06baab388a7f2a9730f077e46e95c230c070652b4e79a3a040504559da5f8eb7645f7b13234bb79d7be06bd03cb7e885e71f656784b4a1e
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:89b9983a8dca4948602f62a6fa1447479a84c140b56d452599c77c641107bf495a3ef52b3a80fcf37839e918f90cac0381d4f5dfbb57d97b7a5a08033d57cf85
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtlocation/HISTORY b/qt5/qtlocation/HISTORY
index 1ce8332..dd2d93d 100644
--- a/qt5/qtlocation/HISTORY
+++ b/qt5/qtlocation/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qtmultimedia/CONFLICTS b/qt5/qtmultimedia/CONFLICTS
deleted file mode 100755
index 7884972..0000000
--- a/qt5/qtmultimedia/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtmultimedia y
diff --git a/qt5/qtmultimedia/DETAILS b/qt5/qtmultimedia/DETAILS
index e87c040..23deb88 100755
--- a/qt5/qtmultimedia/DETAILS
+++ b/qt5/qtmultimedia/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtmultimedia
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:b4a71c86c6a4978509c04bd733fb7c911f3bf309765b726462f9d00ca7a6e3304e80c53b3beb4ffe4c53f53691121e092408142618cac80e1abd6b0106552d28
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:8d8757ff9d9d736618cc57e0872722668b6f2455ec194a700dc03a352a9bfbe90135f06fe05f3aeed2981d837b6c9cc338a8d6cc25f5f253016499244ca873d2
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtmultimedia/HISTORY b/qt5/qtmultimedia/HISTORY
index f435e4c..5d2cefb 100644
--- a/qt5/qtmultimedia/HISTORY
+++ b/qt5/qtmultimedia/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qtquick1/CONFLICTS b/qt5/qtquick1/CONFLICTS
deleted file mode 100755
index 5b16318..0000000
--- a/qt5/qtquick1/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtquick1 y
diff --git a/qt5/qtquick1/DETAILS b/qt5/qtquick1/DETAILS
index f633116..1c5b4d3 100755
--- a/qt5/qtquick1/DETAILS
+++ b/qt5/qtquick1/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtquick1
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:365a57c0b3e4df090471cccdd025224212781730fe791ad258697334df540407cf53efe86ca26d40d8ff6c807860dfb2eacc4e4f7d3745048ed409498d428028
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:9e2ba69506f948f222a5049a0b8ec4d4f2d48aade7ed2fe27d22cde63e0b40fc286f358b5e81a3d1ce20f8fdb3b14e903442adf6f73283cf2c81cff10c293a4f
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtquick1/HISTORY b/qt5/qtquick1/HISTORY
index 7357047..cd0cad7 100644
--- a/qt5/qtquick1/HISTORY
+++ b/qt5/qtquick1/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qtquickcontrols/DETAILS b/qt5/qtquickcontrols/DETAILS
index fcca95d..2ff11ce 100755
--- a/qt5/qtquickcontrols/DETAILS
+++ b/qt5/qtquickcontrols/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtquickcontrols
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:906efc43614bb5117d65b361e1a1b9eeef40f430fbc96220ac6e161cc65e3996e6d942ea675bf2a4fc25eff8a064bd45c4e23bec36915c8c3b5b49a312a30eba
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:0fdcdee97552f4eec0b2d103794984a3c03393eb3f824c7717265f3e74cee5f4d6c4172dc91462f34ba51daec5efd9ffaf31721b693a33bd3c1048d36abe28de
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtquickcontrols/HISTORY b/qt5/qtquickcontrols/HISTORY
index e25bb3f..d5a5fd5 100644
--- a/qt5/qtquickcontrols/HISTORY
+++ b/qt5/qtquickcontrols/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/qt5/qtscript/CONFLICTS b/qt5/qtscript/CONFLICTS
deleted file mode 100755
index 3563d99..0000000
--- a/qt5/qtscript/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtscript y
diff --git a/qt5/qtscript/DETAILS b/qt5/qtscript/DETAILS
index ac71c8e..0e86a5b 100755
--- a/qt5/qtscript/DETAILS
+++ b/qt5/qtscript/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtscript
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:e52e27fca2e094fb0367fb7684da194ae185e748b3e8083b123353ca2c0d18442f1028fca3246f3e9532bf6224f2034ccd2f6db15041f2d1887c614ef932f41b
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:b04afc3f55291925d9239cd5cf4ea9a3e0b47709f77c757efed13c32530b324be294930c58dd610d4a477e5fe757e325c4daf5890512e63a4c7eaa13912ba1f4
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtscript/HISTORY b/qt5/qtscript/HISTORY
index 3e69ca7..be121af 100644
--- a/qt5/qtscript/HISTORY
+++ b/qt5/qtscript/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qtserialport/CONFLICTS b/qt5/qtserialport/CONFLICTS
deleted file mode 100644
index 4afa6da..0000000
--- a/qt5/qtserialport/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtserialport y
diff --git a/qt5/qtserialport/DETAILS b/qt5/qtserialport/DETAILS
index 6815d4e..f4283a0 100755
--- a/qt5/qtserialport/DETAILS
+++ b/qt5/qtserialport/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtserialport
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:18badeec1a412a692cab4b07da49892597dcdac855c5ef0760f27eb509a4889c69eec1b534778300c1b741a387df3afcb6875c8ab9e371f7c5c69c652dea29dc
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:e52c0d10f51af7546a77372276c20c008c647d1d43c4a267f13e484d88d0cbbb565fd1b93a9526b721357f6c6caaedb458d888c87d6826346d417eafdf5c4166
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtserialport/HISTORY b/qt5/qtserialport/HISTORY
index 8815712..050129c 100644
--- a/qt5/qtserialport/HISTORY
+++ b/qt5/qtserialport/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/qt5/qtsvg/DETAILS b/qt5/qtsvg/DETAILS
index e7a8abb..5a390ba 100755
--- a/qt5/qtsvg/DETAILS
+++ b/qt5/qtsvg/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtsvg
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:c3fe482f774c1b8d1dafadf22fd731d4d0c8b6c06bd4479e08219cb9333236ea70558e59448657bc2f960d7084dc88a83b09184647de6981f702f4d42157660b
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:78d389a02b8f713b34b34b464f4b7886545baa01c6eeb99dc03a7c467cb1ec72a16dc1eeb03e1b1b622354eeb873aa6a4aba2f2c9b603c2910ba84949a5311f7
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtsvg/HISTORY b/qt5/qtsvg/HISTORY
index 3e69ca7..be121af 100644
--- a/qt5/qtsvg/HISTORY
+++ b/qt5/qtsvg/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qttools/CONFLICTS b/qt5/qttools/CONFLICTS
deleted file mode 100755
index 38af5ea..0000000
--- a/qt5/qttools/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qttools y
diff --git a/qt5/qttools/DETAILS b/qt5/qttools/DETAILS
index 9e599ed..84a7c92 100755
--- a/qt5/qttools/DETAILS
+++ b/qt5/qttools/DETAILS
@@ -1,9 +1,9 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qttools
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
+ VERSION=5.4.2
PATCHLEVEL=1
-
SOURCE_HASH=sha512:1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8
+
SOURCE_HASH=sha512:55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY
index f606956..af4cfc6 100644
--- a/qt5/qttools/HISTORY
+++ b/qt5/qttools/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2014-04-25 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD, INSTALL: make it install assistant tools, as those are
referenced in installed cmake stuff and their absence breaks
diff --git a/qt5/qtwayland/CONFLICTS b/qt5/qtwayland/CONFLICTS
deleted file mode 100755
index 05c8e86..0000000
--- a/qt5/qtwayland/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwayland y
diff --git a/qt5/qtwayland/DETAILS b/qt5/qtwayland/DETAILS
index 71a89ac..33af514 100755
--- a/qt5/qtwayland/DETAILS
+++ b/qt5/qtwayland/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtwayland
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:c9802a3eaa4a8a7beaa0da3c3356b8f94b4daec5d35462f3b3575a7988b065d3a9265651595e557903779e93d4fc70f4e15665f80e482d1ef26687e648cc1263
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:45f41a3d02c26bb26136303e1b6155397e65eb0e2a630aa68e53fe4d772a7f4e5c96f4d567a62fd84f681becd64e462fbc128d72b9f6403a505455656e5db9f6
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtwayland/HISTORY b/qt5/qtwayland/HISTORY
index 13ece74..b5e1d18 100644
--- a/qt5/qtwayland/HISTORY
+++ b/qt5/qtwayland/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1

diff --git a/qt5/qtwebengine/DETAILS b/qt5/qtwebengine/DETAILS
index f7f1cf5..1643f9f 100755
--- a/qt5/qtwebengine/DETAILS
+++ b/qt5/qtwebengine/DETAILS
@@ -1,8 +1,9 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtwebengine
SPELLX=${SPELL}-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:62ed52f5bd0ae7c0c81ee1f7fd4b44e0e4270a66c754f00a36cdee5ffba9d070bfbda0aa8ed4d952d2660b47a38ec0a2dfc921d861487c77168512c92973bcec
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:fbb2d4180076341296582aea0d15ffb5c768a81627a97640942c4cef88656ed69cb4740f8b6e07e811c16aab593a02c945b6f8f57c3bfe7cfa7a271a1ed2a5dd
+ SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index 53059ae..41ba776 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,3 +1,9 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+ SECURITY_PATCH=1
+ fixes CVE-2015-4000 CVE-2015-0295 CVE-2015-1858 CVE-2015-1859
+ CVE-2015-1860
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/qt5/qtwebkit/DETAILS b/qt5/qtwebkit/DETAILS
index 37bb272..0026c39 100755
--- a/qt5/qtwebkit/DETAILS
+++ b/qt5/qtwebkit/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtwebkit
SPELLX=${SPELL}-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:592a3ebccb4578eb0183d1ecd5aae69c7f03482aa09594fc06f58e2c2b82b5e916e1e951012fc1c8e0cea803c4d3e6db64fad41bbca70eb18b8d9d3ff2eab828
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtwebkit/HISTORY b/qt5/qtwebkit/HISTORY
index 336572f..79671c8 100644
--- a/qt5/qtwebkit/HISTORY
+++ b/qt5/qtwebkit/HISTORY
@@ -1,3 +1,8 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+ * PRE_BUILD: disable patches
+ * *.patch: deleted
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/qt5/qtwebkit/PRE_BUILD b/qt5/qtwebkit/PRE_BUILD
index a95bc6a..b668c26 100755
--- a/qt5/qtwebkit/PRE_BUILD
+++ b/qt5/qtwebkit/PRE_BUILD
@@ -5,6 +5,4 @@ default_pre_build &&
fi
if is_depends_enabled $SPELL python3;then
ln -s /usr/bin/python3 python
- fi &&
-patch -p1 < $SCRIPT_DIRECTORY/icu.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/qtwebkit-glibmutexlocker.patch
+ fi
diff --git a/qt5/qtwebkit/icu.patch b/qt5/qtwebkit/icu.patch
deleted file mode 100644
index a580e81..0000000
--- a/qt5/qtwebkit/icu.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
b/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
-index 4867f65..6409a6d 100644
---- a/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
-+++ b/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
-@@ -31,6 +31,11 @@
- #include <unicode/ustring.h>
- #include <unicode/utf16.h>
-
-+#include <unicode/uvernum.h>
-+#if U_ICU_VERSION_MAJOR_NUM>=51
-+#include <unicode/utf_old.h>
-+#endif
-+
- namespace WTF {
-
- namespace Unicode {
-
diff --git a/qt5/qtwebkit/qtwebkit-glibmutexlocker.patch
b/qt5/qtwebkit/qtwebkit-glibmutexlocker.patch
deleted file mode 100644
index 1203470..0000000
--- a/qt5/qtwebkit/qtwebkit-glibmutexlocker.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From ef94c178a7ba0bd43a677ec90fde334ce2c90810 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen AT theqtcompany.com>
-Date: Fri, 27 Feb 2015 14:14:44 +0100
-Subject: [PATCH 3/3] Fix building with glib 2.43+
-
-The newest version of glib have introduced their own GMutexLocker
-conflicting with the one defined in WebCore.
-
-Task-number: QTBUG-44714
-Change-Id: Ibdd1646e129eaed84c65dc0d96bebe80f2a61f4b
-Reviewed-by: Andras Becsi <andras.becsi AT theqtcompany.com>
----
- .../gstreamer/WebKitWebSourceGStreamer.cpp | 48
+++++++++++-----------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git
a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-index 5625873..a6d961f 100644
---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
-@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object,
guint propID, const GValue*
-
- switch (propID) {
- case PROP_IRADIO_MODE: {
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- priv->iradioMode = g_value_get_boolean(value);
- break;
- }
-@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object,
guint propID, GValue* value
- WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
- WebKitWebSrcPrivate* priv = src->priv;
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- switch (propID) {
- case PROP_IRADIO_MODE:
- g_value_set_boolean(value, priv->iradioMode);
-@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src)
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- bool seeking = priv->seekID;
-
-@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src)
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- priv->startID = 0;
-
-@@ -584,7 +584,7 @@ static GstStateChangeReturn
webKitWebSrcChangeState(GstElement* element, GstStat
- return ret;
- }
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- switch (transition) {
- case GST_STATE_CHANGE_READY_TO_PAUSED:
- GST_DEBUG_OBJECT(src, "READY->PAUSED");
-@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad,
GstObject* parent, GstQ
- gst_query_parse_duration(query, &format, NULL);
-
- GST_DEBUG_OBJECT(src, "duration query in format %s",
gst_format_get_name(format));
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
- gst_query_set_duration(query, format, src->priv->size);
- result = TRUE;
-@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad,
GstObject* parent, GstQ
- break;
- }
- case GST_QUERY_URI: {
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- gst_query_set_uri(query, src->priv->uri);
- result = TRUE;
- break;
-@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler)
- WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
- gchar* ret;
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- ret = g_strdup(src->priv->uri);
- return ret;
- }
-@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler*
handler, const gchar* uri, GEr
- return FALSE;
- }
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- g_free(priv->uri);
- priv->uri = 0;
-@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler*
handler)
- WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
- gchar* ret;
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- ret = g_strdup(src->priv->uri);
- return ret;
- }
-@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler*
handler, const gchar* uri)
- return FALSE;
- }
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- g_free(priv->uri);
- priv->uri = 0;
-@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc*
src)
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- // already stopped
- if (!priv->needDataID)
- return FALSE;
-@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint
length, gpointer userData)
-
- GST_DEBUG_OBJECT(src, "Need more data: %u", length);
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (priv->needDataID || !priv->paused) {
- return;
- }
-@@ -807,7 +807,7 @@ static gboolean
webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- // already stopped
- if (!priv->enoughDataID)
- return FALSE;
-@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*,
gpointer userData)
-
- GST_DEBUG_OBJECT(src, "Have enough data");
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (priv->enoughDataID || priv->paused) {
- return;
- }
-@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src)
-
- ASSERT(isMainThread());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- // already stopped
- if (!priv->seekID)
- return FALSE;
-@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*,
guint64 offset, gpointer user
- WebKitWebSrcPrivate* priv = src->priv;
-
- GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (offset == priv->offset && priv->requestedOffset == priv->offset)
- return TRUE;
-
-@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*,
guint64 offset, gpointer user
- void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer*
player)
- {
- ASSERT(player);
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- src->priv->player = player;
- s_cachedResourceLoader = player->cachedResourceLoader();
- }
-@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t
requestedSize, size_t& actualSize
- mapGstBuffer(buffer);
- #endif
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- priv->buffer = adoptGRef(buffer);
- locker.unlock();
-
-@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const
ResourceResponse& response)
-
- GST_DEBUG_OBJECT(src, "Received response: %d",
response.httpStatusCode());
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- // If we seeked we need 206 == PARTIAL_CONTENT
- if (priv->requestedOffset && response.httpStatusCode() != 206) {
-@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char*
data, int length)
- WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
- WebKitWebSrcPrivate* priv = src->priv;
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-
- GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ?
getGstBufferSize(priv->buffer.get()) : length);
-
-@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished()
-
- GST_DEBUG_OBJECT(src, "Have EOS");
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- if (!priv->seekID) {
- locker.unlock();
- gst_app_src_end_of_stream(priv->appsrc);
-@@ -1210,7 +1210,7 @@ void
ResourceHandleStreamingClient::wasBlocked(ResourceHandle*)
-
- GST_ERROR_OBJECT(src, "Request was blocked");
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- uri.set(g_strdup(src->priv->uri));
- locker.unlock();
-
-@@ -1224,7 +1224,7 @@ void
ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)
-
- GST_ERROR_OBJECT(src, "Cannot show URL");
-
-- GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
-+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
- uri.set(g_strdup(src->priv->uri));
- locker.unlock();
-
---
-2.3.5
-
diff --git a/qt5/qtx11extras/DETAILS b/qt5/qtx11extras/DETAILS
index de70a4f..96047fb 100755
--- a/qt5/qtx11extras/DETAILS
+++ b/qt5/qtx11extras/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases
SPELL=qtx11extras
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:7133c5ddbc6403c4d88ce162a840d8d8ee022efcd9b06a0bf495ab1554449c3194258a588d8f3b6aa3ca83ec42835ec9cac6056ab7a8c3d1d59e7222962b83e2
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:c309d6d2c5a3a802656b2414b676ba3d105f4f0e2ceba1d7e9a5e0d2f64e2e50306252b132e38b6801a6db597f33e27a1682f6db24a4167b127d17afa7ad4d4c
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtx11extras/HISTORY b/qt5/qtx11extras/HISTORY
index c160d0f..a82c78d 100644
--- a/qt5/qtx11extras/HISTORY
+++ b/qt5/qtx11extras/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/qt5/qtxmlpatterns/CONFLICTS b/qt5/qtxmlpatterns/CONFLICTS
deleted file mode 100755
index 2b1cd4f..0000000
--- a/qt5/qtxmlpatterns/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtxmlpatterns y
diff --git a/qt5/qtxmlpatterns/DETAILS b/qt5/qtxmlpatterns/DETAILS
index 3cca0aa..37cd225 100755
--- a/qt5/qtxmlpatterns/DETAILS
+++ b/qt5/qtxmlpatterns/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt.io/official_releases/
SPELL=qtxmlpatterns
SPELLX=$SPELL-opensource-src
- VERSION=5.4.1
-
SOURCE_HASH=sha512:c6728cd780ce583c7fbf6be32b7c2359ae82d3f81b948863442cde94368488e2650c97e8580327d6980f7f7858e61408b0eaddf5a35262a64688627b4a6d1f9a
+ VERSION=5.4.2
+
SOURCE_HASH=sha512:7909c395807395e6635e857d99ecbc39d8b0d253b93947398a72899a2434ecd4fa99e229aba404c94667690a0407b76eb651723b0a1dc0b1fb4a47707b44707e
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtxmlpatterns/HISTORY b/qt5/qtxmlpatterns/HISTORY
index df29cff..8bababb 100644
--- a/qt5/qtxmlpatterns/HISTORY
+++ b/qt5/qtxmlpatterns/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.4.2
+
2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (bb4ef076e68b25cd0a162f4f4d6f49106ba3e361), Treeve Jelbert, 06/02/2015

Archive powered by MHonArc 2.6.24.

Top of Page