Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (254f2d9778818ee4111e14244391bdcac81d4dc4)

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 devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (254f2d9778818ee4111e14244391bdcac81d4dc4)
  • Date: Tue, 2 Jun 2015 12:14:31 +0000

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 11 +
audio-libs/mp4v2/DETAILS | 5
audio-libs/mp4v2/HISTORY | 3
database/sqlite/DETAILS | 9 -
database/sqlite/HISTORY | 3
devel/smallerc/BUILD | 2
devel/smallerc/HISTORY | 3
devel/smallerc/INSTALL | 2
devel/smallerc/Makefile | 19 --
disk/eudev/DETAILS | 4
disk/eudev/HISTORY | 3
doc/evince/DETAILS | 4
doc/evince/HISTORY | 3
editors/nano/DETAILS | 2
editors/nano/HISTORY | 3
gnu/gcc/HISTORY | 4
gnu/gcc/UP_TRIGGERS | 21 ++
graphics-libs/freetype2/DEPENDS | 17 +-
graphics-libs/freetype2/HISTORY | 4
graphics-libs/harfbuzz/DEPENDS | 28 ++-
graphics-libs/harfbuzz/HISTORY | 5
graphics-libs/opencv/DEPENDS | 2
graphics-libs/opencv/DETAILS | 4
graphics-libs/opencv/HISTORY | 5
graphics-libs/opencv/PRE_BUILD | 5
graphics-libs/opencv/pkgconfig.patch | 35 ----
net/ntp/DETAILS | 6
net/ntp/HISTORY | 4
perl-cpan/perl-acme-damn/DEPENDS | 1
perl-cpan/perl-acme-damn/DETAILS | 15 +
perl-cpan/perl-acme-damn/HISTORY | 2
perl-cpan/perl-forks/DEPENDS | 1
perl-cpan/perl-forks/DETAILS | 15 +
perl-cpan/perl-forks/HISTORY | 2
perl-cpan/perl-sys-sigaction/DEPENDS | 1
perl-cpan/perl-sys-sigaction/DETAILS | 18 ++
perl-cpan/perl-sys-sigaction/HISTORY | 2
python-pypi/pillow/BUILD | 3
python-pypi/pillow/HISTORY | 3
python-pypi/python-markdown/DETAILS | 6
python-pypi/python-markdown/HISTORY | 3
python-pypi/rbtools/DETAILS | 4
python-pypi/rbtools/HISTORY | 3
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/qtjsbackend/BUILD | 1
qt5/qtjsbackend/CONFLICTS | 1
qt5/qtjsbackend/DETAILS | 8
qt5/qtjsbackend/DOWNLOAD | 1
qt5/qtjsbackend/HISTORY | 4
qt5/qtjsbackend/INSTALL | 1
qt5/qtjsbackend/PRE_BUILD | 1
qt5/qtjsbackend/UP_TRIGGERS | 1
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
shell-term-fm/bash/DETAILS | 3
shell-term-fm/bash/HISTORY | 4
shell-term-fm/bash/patches/bash43-031 | 112 +++++++++++++
shell-term-fm/bash/patches/bash43-032 | 51 ++++++
shell-term-fm/bash/patches/bash43-033 | 225 ++++++++++++++++++++++++++
shell-term-fm/bash/patches/bash43-034 | 90 ++++++++++
shell-term-fm/bash/patches/bash43-035 | 63 +++++++
shell-term-fm/bash/patches/bash43-036 | 57 ++++++
shell-term-fm/bash/patches/bash43-037 | 43 +++++
shell-term-fm/bash/patches/bash43-038 | 88 ++++++++++
shell-term-fm/bash/patches/bash43-039 | 57 ++++++
utils/syslinux/DETAILS | 8
utils/syslinux/HISTORY | 4
utils/whohas/DEPENDS | 6
utils/whohas/DETAILS | 4
utils/whohas/HISTORY | 8
utils/whohas/INSTALL | 2
video/mpv/DETAILS | 8
video/mpv/HISTORY | 3
xorg-lib/libinput/DETAILS | 4
xorg-lib/libinput/HISTORY | 3
120 files changed, 1120 insertions(+), 431 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

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

deprecate qt5/qtjsbackend

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

libinput: => 0.16.0

commit 224544f1b785130aec7f662e214955e4ac6c6ec2
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

syslinux 6.03

commit 7ffae34fd252d263ee08bf324d597cd63133d3b9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ntp 4.2.8p2, SECURITY_PATCH++

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

shell-term-fm/bash: added bash43-03[1-9] upstream patches

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

nano: => 2.4.1

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

rbtools: => 0.7.3

commit 87da0cb80f0fd5154cb3aec86e5e3ea6b18454ab
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pillow: fixed build with system zlib

commit 5cd7b58bd60bfa64937184925c7a84fe39efdcb8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

harfbuzz: fixed dependencies

commit d5b6aee657bc3bb8e696b6bc5ebed6db309c013f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

freetype2: fixed dependencies

commit b74e07afd904ee518942324f93adb9f906c8dba4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python-markdown: => 2.6.2

commit 44ea66963738db8d2ee8f3da88eefb84cc7699cf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

smallerc: Upstream added Makefile

commit d821782fe703810887f56a922f8e19ca78e2ba62
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

whohas: Updated deps: Acme::Damn, forks, Sys::SigAction and
List::Moreutils

commit a91414ded87f428b2c696e5b67371ab43cd7ef09
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

perl-acme-damn: new spell, 'Unbless' Perl objects

commit ccce819603d70349ae5f05958da23dcfe7725c08
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

perl-sys-sigaction: new spell, Perl extension for Consistent Signal
Handling

commit d71142fa43c1216ed1d1919a736490d1bbb61e3b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

perl-forks: new spell, drop-in replacement for Perl threads using fork()

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

eudev: => 3.1

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

mp4v2: => 2.0.0

commit 36f5e34ef2ac7c85ac9baee271439905c48a430d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

whohas 0.29.1

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

database/sqlite: version 3.8.10.2

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

video/mpv: version 0.9.2

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

opencv: => 2.4.11

commit fc8f5e989e3176b1266614f579de4ea74a4af5db
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gcc: find C++ spells based on ELF DT_NEEDED entries

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

doc/evince: version 3.16.1

diff --git a/ChangeLog b/ChangeLog
index 189fc40..e5e6b2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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
+ threads using fork()
+ * perl-cpan/perl-sys-sigaction: new spell, Perl extension for
+ Consistent Signal Handling
+ * perl-cpan/perl-acme-damn: new spell, 'Unbless' Perl objects
+
2015-05-26 Treeve Jelbert <treeve AT sourcemage.org>
* KDE4_FUNCTIONS: fix typo, remove ref to cmake_install

diff --git a/audio-libs/mp4v2/DETAILS b/audio-libs/mp4v2/DETAILS
index 269e628..842a44b 100755
--- a/audio-libs/mp4v2/DETAILS
+++ b/audio-libs/mp4v2/DETAILS
@@ -1,11 +1,12 @@
SPELL=mp4v2
if [ "$MP4V2_BRANCH" == "snapshot" ]; then
VERSION=trunk-r479
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
else
- VERSION=1.9.1
+ VERSION=2.0.0
+
SOURCE_HASH=sha512:15eb882f33d72d4209053b54c883b67715f539c33096705a0e7bc79015b93f6f3ac80ae29c65a0ffe9eab1bf0dedf07198bdee23fa6eafcd6ccb34f984484be0
fi &&
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://$SPELL.googlecode.com/files/$SOURCE
LICENSE[0]=MPL
diff --git a/audio-libs/mp4v2/HISTORY b/audio-libs/mp4v2/HISTORY
index aff78c1..0d40ef1 100644
--- a/audio-libs/mp4v2/HISTORY
+++ b/audio-libs/mp4v2/HISTORY
@@ -1,3 +1,6 @@
+2015-05-30 Treeve Jelbert <treeve AT sourcenage.org>
+ * DETAILS: version 2.0.0
+
2011-12-26 Robin Cook <rcook AT wyrms.net>
* PREPARE: added to select stable or snapshot.
* DETAILS: added to uses selected version
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 51d8903..83aee5d 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,8 +1,9 @@
SPELL=sqlite
- VERSION=3.8.10.1
- VERSIONX=autoconf-$(echo ${VERSION} |
-awk 'BEGIN { FS="."; OFS=""; ORS="" } { print $1; for (i=2; i<=NF; i++)
{printf ("%02d", ($i))} }')
-
SOURCE_HASH=sha512:8e206952b351ef8a9cf523558574cba9630c8c07ef7ae90fb0712d2b99fea91742a26d0af1b01816593ea769fad343101fdbbab9c1626a4d712bb1a18b2b6b30
+ VERSION=3.8.10.2
+ VERSIONX=autoconf-$(echo ${VERSION} | awk \
+'BEGIN { FS="."; OFS=""; ORS="" }
+{ print $1; for (i=2; i<=NF; i++) {printf ("%02d", ($i))} }')
+
SOURCE_HASH=sha512:afdf11d5482a645c37cc0c4c5c2b3f8c56f26c95ee94658c92bfa0ffeb68981f67834215a45a658f733333c68f28231448e87995f9614a56f9f1672cedd13a65
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://www.sqlite.org/$(date "+%Y")/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 3b3deb3..1bcb73a 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2015-05-30 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 3.8.10.2, minor "cosmetic" fixes
+
2015-05-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated spell to 3.8.10.1, using AWK now to compute
VERSIONX

diff --git a/devel/smallerc/BUILD b/devel/smallerc/BUILD
index ea8869e..e80274f 100755
--- a/devel/smallerc/BUILD
+++ b/devel/smallerc/BUILD
@@ -1 +1 @@
-make -f "$SPELL_DIRECTORY/Makefile"
+make prefix="$INSTALL_ROOT/usr"
diff --git a/devel/smallerc/HISTORY b/devel/smallerc/HISTORY
index 7d227bd..ba41d2f 100644
--- a/devel/smallerc/HISTORY
+++ b/devel/smallerc/HISTORY
@@ -1,2 +1,5 @@
+2015-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, INSTALL: Upstream added Makefile
+
2015-05-18 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DETAILS, INSTALL, PREPARE, Makefile: spell created
diff --git a/devel/smallerc/INSTALL b/devel/smallerc/INSTALL
index c44a3c4..04bdeaa 100755
--- a/devel/smallerc/INSTALL
+++ b/devel/smallerc/INSTALL
@@ -1 +1 @@
-make -f "$SPELL_DIRECTORY/Makefile" prefix="$INSTALL_ROOT/usr" install
+make prefix="$INSTALL_ROOT/usr" install
diff --git a/devel/smallerc/Makefile b/devel/smallerc/Makefile
deleted file mode 100644
index 51992a7..0000000
--- a/devel/smallerc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-prefix = /usr
-bindir = $(prefix)/bin
-
-VPATH = $(CURDIR)/v0100
-
-CC = gcc
-override CFLAGS += -DHOST_LINUX
-
-targets = smlrc smlrl smlrcc
-
-all: $(targets)
-
-install: all
- install -m755 -t $(bindir) $(targets)
-
-%: %.c
- $(CC) $(CFLAGS) -o $@ $<
-
-.PHONY: all install
diff --git a/disk/eudev/DETAILS b/disk/eudev/DETAILS
index fd33373..aabfafa 100755
--- a/disk/eudev/DETAILS
+++ b/disk/eudev/DETAILS
@@ -1,6 +1,6 @@
SPELL=eudev
- VERSION=3.0
-
SOURCE_HASH=sha512:a0cfbbd5b1e59dafaf0ba2e321756bb7bff3d1a92e09ab0fca674adc80911e55aec29ed0b74262846516443d344cf044a0cfffb9e1d1caeb2f145da8d1a5327f
+ VERSION=3.1
+
SOURCE_HASH=sha512:5331b286e926162ec06b00b9f69c3a80005fd2fef840906dcafa6426630bb16994993552fab240fc9c6974a39627f1c8624e1ee7a91ff3969437793535858a6f
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//v}"
URL=http://dev.gentoo.org/~blueness/eudev
diff --git a/disk/eudev/HISTORY b/disk/eudev/HISTORY
index b5ef5f3..cdfe67c 100644
--- a/disk/eudev/HISTORY
+++ b/disk/eudev/HISTORY
@@ -1,3 +1,6 @@
+2015-05-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1
+
2015-03-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0

diff --git a/doc/evince/DETAILS b/doc/evince/DETAILS
index 5a1426e..e0cbf20 100755
--- a/doc/evince/DETAILS
+++ b/doc/evince/DETAILS
@@ -1,11 +1,11 @@
SPELL=evince
- VERSION=3.16.0
+ VERSION=3.16.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.gnome.org/projects/evince
-
SOURCE_HASH=sha512:fc3c1469edf453cd62ca157ff54f40ee56b88f47ff537ade0f5ff8d659d794d2b87563109f5e116c46b1651e52dc6c00e7f0b9b13827f34e1a95747f7432ef27
+
SOURCE_HASH=sha512:bca890e2203e8c5d092a9a728f9e0545437e701eb2af790edc074b080d8529e639132e77caff2f77e8f1b8eb359b2c094af9252c08fb8518c98a6fb554c7dc6c
LICENSE[0]=GPL
ENTERED=20050502
KEYWORDS="doc"
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index 7beb527..aab6f97 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2015-05-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 3.16.1
+
2015-05-25 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: downgraded to stable 3.16.0

diff --git a/editors/nano/DETAILS b/editors/nano/DETAILS
index eb58adc..32310d3 100755
--- a/editors/nano/DETAILS
+++ b/editors/nano/DETAILS
@@ -1,5 +1,5 @@
SPELL=nano
- VERSION=2.4.0
+ VERSION=2.4.1
SECURITY_PATCH=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/editors/nano/HISTORY b/editors/nano/HISTORY
index aad5471..d3598b1 100644
--- a/editors/nano/HISTORY
+++ b/editors/nano/HISTORY
@@ -1,3 +1,6 @@
+2015-06-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.1
+
2015-03-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.4.0

diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 686d8be..57788d2 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2015-05-29 Remko van der Vossen <wich AT sourcemage.org>
+ * UP_TRIGGERS: find C++ ELF objects based on ELF DT_NEEDED entries
+ Probably more successful at finding all C++ ELF objects
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: There is no ecj-5.1, trying ecj-4.9.
I can compile a hello world example at least.
diff --git a/gnu/gcc/UP_TRIGGERS b/gnu/gcc/UP_TRIGGERS
index a3ef25a..9d126ee 100755
--- a/gnu/gcc/UP_TRIGGERS
+++ b/gnu/gcc/UP_TRIGGERS
@@ -1,3 +1,6 @@
+LC_ALL=C
+LC_CTYPE=C
+LANG=C
local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
@@ -10,10 +13,20 @@ if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
done &&

# for C++ ABI change in 5.1 and, probably, for each major version change
too
- if [[ ${OLD_SPELL_VERSION%%.*} != ${VERSION%%.*} ]]; then
- for each in $(grep "gcc:CXX" "$SUB_DEPENDS_STATUS" | cut -f1 -d:); do
- if spell_ok $each; then
- up_trigger $each cast_self
+ if list_find "$GCC_COMPILER" c++ \
+ && [[ ${OLD_SPELL_VERSION%%.*} != ${VERSION%%.*} ]]; then
+ message "This is an ABI incompatible update of g++..."
+ message "Determining which spells need to be recast, this may take a
while."
+
+ for other_spell in $(gaze installed | cut -d: -f1); do
+ [[ $SPELL != $other_spell ]] || continue
+ if gaze install $other_spell \
+ | xargs file -e apptype -e ascii -e compress -e tar \
+ | grep '\<ELF\>.*\<dynamically linked\>' \
+ | cut -d: -f1 \
+ | xargs readelf -d 2> /dev/null \
+ | grep -q 'NEEDED)[[:space:]]*Shared library: \[libstdc++'; then
+ up_trigger $other_spell cast_self
fi
done
fi
diff --git a/graphics-libs/freetype2/DEPENDS b/graphics-libs/freetype2/DEPENDS
index 7a36fa6..cc17202 100755
--- a/graphics-libs/freetype2/DEPENDS
+++ b/graphics-libs/freetype2/DEPENDS
@@ -1,13 +1,22 @@
-depends glib2 &&
-depends libpng &&
-depends pcre &&
+optional_depends libpng \
+ "--with-png=yes" \
+ "--with-png=no" \
+ "to support png compressed OpenType embedded bitmaps" &&

# freetype2 with harfbuzz requires harfbuzz built against freetype2 first
if spell_ok ${SPELL}; then
optional_depends -sub 'FT' 'harfbuzz' \
'--with-harfbuzz=yes' \
'--with-harfbuzz=no' \
- 'to improve auto-hinting of OpenType fonts'
+ 'to improve auto-hinting of OpenType fonts' &&
+
+ # LDFLAGS are taken from /usr/lib/libharfbuzz.la
+ if is_depends_enabled $SPELL harfbuzz; then
+ if is_depends_enabled harfbuzz glib2; then
+ depends glib2 &&
+ depends pcre
+ fi
+ fi
else
message "${PROBLEM_COLOR}harfbuzz optional dependency disabled until
${DEFAULT_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${PROBLEM_COLOR} is
cast.${DEFAULT_COLOR}"
fi
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 788ddd9..6d7d8dd 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,7 @@
+2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: made libpng optional; glib2 and pcre are required only if
+ it was built against harfbuzz with glib support
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index 219c4e0..733efae 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -1,12 +1,32 @@
-depends glib2 &&
-depends libpng &&
-depends pcre &&
depends ragel &&

+optional_depends glib2 \
+ "--with-glib=yes --with-gobject=yes" \
+ "--with-glib=no --with-gobject=no" \
+ "to use glib" &&
+
+persistent_add HARFBUZZ_OPTS &&
+
+if is_depends_enabled $SPELL glib2; then
+ depends pcre &&
+
+ optional_depends gobject-introspection \
+ "--enable-introspection=yes" \
+ "--enable-introspection=no" \
+ "to enable introspection for this build"
+else
+ list_add "HARFBUZZ_OPTS" "--enable-introspection=no"
+fi &&
+
if spell_ok cairo; then
optional_depends cairo "--with-cairo=yes" "--with-cairo=no" \
- "Enable tools used for command-line utilities?"
+ "Enable tools used for command-line utilities?" &&
+
+ if is_depends_enabled $SPELL cairo; then
+ depends libpng
+ fi
else
+ list_add "HARFBUZZ_OPTS" "--with-cairo=no" &&
message "${PROBLEM_COLOR}cyclic ${SPELL_COLOR}cairo${PROBLEM_COLOR}
optional dependency disabled until ${SPELL_COLOR}cairo${PROBLEM_COLOR} is
cast${DEFAULT_COLOR}"
fi &&

diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index d27a7ce..1a41a2c 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,8 @@
+2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: libpng is required only if it was built with cairo support;
+ glib2 is optional; added missing gobject-introspection dependency;
+ pcre is required only if it was built with glib2 support
+
2015-04-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.40

diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS
index 210108e..fb5a0f4 100755
--- a/graphics-libs/opencv/DEPENDS
+++ b/graphics-libs/opencv/DEPENDS
@@ -5,7 +5,7 @@ depends cmake &&
if [[ $FFM = ffmpeg ]];then
depends LIBAVCODEC
elif [[ $FFM = gstreamer ]]; then
- depends gstreamer
+ depends gstreamer-1.0
elif [[ $FFM = libquicktime ]];then
depends libquicktime
fi &&
diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index cb1132f..11201ef 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,6 +1,6 @@
SPELL=opencv
- VERSION=2.4.9
-
SOURCE_HASH=sha512:a24b4bc0f7e58246e55370cdacd161f54b282d71a4ffbd654dd4b158031c9f8f93b8cb5a171f8266d4a776375573eff6b6b88793a812df99b3f516176e7a55b1
+ VERSION=2.4.11
+
SOURCE_HASH=sha512:aba74b47f6009e2db60db2af5cfad323a487029ed8cbf4e42b89babc9006ad1fa4edb53210c1faf7e6e63156e5d75fd0ea3cb5f24fe8af650ed302c6fffef72d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=https://github.com/Itseez/opencv/archive/$VERSION.tar.gz
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 5a58d80..a715e51 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,8 @@
+2015-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.11
+ * DEPENDS: gstreamer-1.0
+ * PRE_BUILD, pkgconfig.patch: deleted
+
2014-12-26 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fix SOURCE to make it a proper tarball name

diff --git a/graphics-libs/opencv/PRE_BUILD b/graphics-libs/opencv/PRE_BUILD
deleted file mode 100755
index e5dd5dd..0000000
--- a/graphics-libs/opencv/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-patch -p1 < $SCRIPT_DIRECTORY/pkgconfig.patch
-
diff --git a/graphics-libs/opencv/pkgconfig.patch
b/graphics-libs/opencv/pkgconfig.patch
deleted file mode 100644
index 5626eb6..0000000
--- a/graphics-libs/opencv/pkgconfig.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake
opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
---- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12
20:31:27.253763202 +0000
-+++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12
20:41:48.936262732 +0000
-@@ -10,7 +10,7 @@
- #
-------------------------------------------------------------------------------------------
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
-+set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
- set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
-
- if(CMAKE_BUILD_TYPE MATCHES "Release")
-@@ -35,10 +35,11 @@
- ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
-
- #build the list of components
--set(OpenCV_LIB_COMPONENTS_ "")
-+set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
- foreach(CVLib ${OpenCV_LIB_COMPONENTS})
- get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
- get_filename_component(libname "${libpath}" NAME)
-+ get_filename_component(lname "${libpath}" NAME_WE)
-
- if(INSTALL_TO_MANGLED_PATHS)
- set(libname "${libname}.${OPENCV_VERSION}")
-@@ -51,7 +52,8 @@
- set(installDir "${OPENCV_LIB_INSTALL_PATH}")
- endif()
-
-- set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_}
\${exec_prefix}/${installDir}/${libname}")
-+ string(REPLACE "libopencv" "-lopencv" lname "${lname}")
-+ set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
- endforeach()
-
- # add extra dependencies required for OpenCV
diff --git a/net/ntp/DETAILS b/net/ntp/DETAILS
index 308e7ba..5bd2510 100755
--- a/net/ntp/DETAILS
+++ b/net/ntp/DETAILS
@@ -1,10 +1,10 @@
SPELL=ntp
- VERSION=4.2.8p1
- SECURITY_PATCH=2
+ VERSION=4.2.8p2
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$SOURCE
-
SOURCE_HASH="sha512:4075260dc8817c5b1ed04ec8a60316f938b2c188d95419eb1c3808a5b2854c91d40c62f36b8d3be30ea40cc92415e1b7326a9362a4c61c53c33abcca781b3f4f"
+
SOURCE_HASH=sha512:7b39e4d8a362afd37dc57a742841fadcd4634bb1d21d59d72d484b759a867d82b90d8c77e6e104c73ec8690489b80b0f9e2e86e4dfcfa34a49621cee3dee16d0
WEB_SITE=http://www.ntp.org/
ENTERED=20011004
LICENSE[0]=PD
diff --git a/net/ntp/HISTORY b/net/ntp/HISTORY
index 5f89502..ff54e0d 100644
--- a/net/ntp/HISTORY
+++ b/net/ntp/HISTORY
@@ -1,3 +1,7 @@
+2015-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.8p2
+ SECURITY_PATCH++
+
2015-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: remove dead SOURCE_URL

diff --git a/perl-cpan/perl-acme-damn/DEPENDS
b/perl-cpan/perl-acme-damn/DEPENDS
new file mode 100755
index 0000000..6826bc7
--- /dev/null
+++ b/perl-cpan/perl-acme-damn/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/perl-cpan/perl-acme-damn/DETAILS
b/perl-cpan/perl-acme-damn/DETAILS
new file mode 100755
index 0000000..ba7f313
--- /dev/null
+++ b/perl-cpan/perl-acme-damn/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=perl-acme-damn
+ VERSION=0.06
+ SOURCE="Acme-Damn-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/I/IB/IBB/$SOURCE
+
SOURCE_HASH=sha512:f225e5f835ce9b054087008d354278356704694147cf8e1027c0bd2c4a8c118ebbdeac2c97634e4c85cf45d29bf38a92861770c35b8423b6f12a1bc6319ff52d
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/Acme-Damn-$VERSION"
+ WEB_SITE="http://search.cpan.org/~ibb/Acme-Damn/";
+ LICENSE[0]="ART"
+ ENTERED=20150531
+ KEYWORDS=""
+ SHORT="'Unbless' Perl objects"
+cat << EOF
+Acme::Damn provides a single routine, damn(), which takes a blessed reference
+(a Perl object), and unblesses it, to return the original reference.
+EOF
diff --git a/perl-cpan/perl-acme-damn/HISTORY
b/perl-cpan/perl-acme-damn/HISTORY
new file mode 100644
index 0000000..4e3a971
--- /dev/null
+++ b/perl-cpan/perl-acme-damn/HISTORY
@@ -0,0 +1,2 @@
+2015-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/perl-cpan/perl-forks/DEPENDS b/perl-cpan/perl-forks/DEPENDS
new file mode 100755
index 0000000..6826bc7
--- /dev/null
+++ b/perl-cpan/perl-forks/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/perl-cpan/perl-forks/DETAILS b/perl-cpan/perl-forks/DETAILS
new file mode 100755
index 0000000..f4e5469
--- /dev/null
+++ b/perl-cpan/perl-forks/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=perl-forks
+ VERSION=0.36
+ SOURCE="forks-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/R/RY/RYBSKEJ/$SOURCE
+
SOURCE_HASH=sha512:d361d7fcfec925b03552bb5f8ae4eb2155b7945d0a57ff04c9ed45e7620a55fe6a1907b1aef8af3f80f8eabc158ab5886628ee1a987dc674e4c25e1042425469
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/forks-$VERSION"
+ WEB_SITE="http://search.cpan.org/~rybskej/forks/";
+ LICENSE[0]="ART"
+ ENTERED=20150531
+ KEYWORDS=""
+ SHORT="drop-in replacement for Perl threads using fork()"
+cat << EOF
+The "forks" pragma allows a developer to use threads without having to have
+a threaded perl, or to even run 5.8.0 or higher.
+EOF
diff --git a/perl-cpan/perl-forks/HISTORY b/perl-cpan/perl-forks/HISTORY
new file mode 100644
index 0000000..4e3a971
--- /dev/null
+++ b/perl-cpan/perl-forks/HISTORY
@@ -0,0 +1,2 @@
+2015-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/perl-cpan/perl-sys-sigaction/DEPENDS
b/perl-cpan/perl-sys-sigaction/DEPENDS
new file mode 100755
index 0000000..6826bc7
--- /dev/null
+++ b/perl-cpan/perl-sys-sigaction/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/perl-cpan/perl-sys-sigaction/DETAILS
b/perl-cpan/perl-sys-sigaction/DETAILS
new file mode 100755
index 0000000..2586f60
--- /dev/null
+++ b/perl-cpan/perl-sys-sigaction/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=perl-sys-sigaction
+ SPELLX=Sys-SigAction
+ VERSION=0.21
+ SOURCE="$SPELLX-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/L/LB/LBAXTER/$SOURCE
+
SOURCE_HASH=sha512:78b960b613800f0591ab52052001f0689d2c21138b1c16f336de85efc1ef7ed2dc3bd65f0e02c5b5009ffc9ff5506128ee10fbd41b302d4b2121bfb65294417f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE="http://search.cpan.org/~lbaxter/Sys-SigAction/";
+ LICENSE[0]="ART"
+ ENTERED=20150531
+ KEYWORDS=""
+ SHORT="Perl extension for Consistent Signal Handling"
+cat << EOF
+This module implements consistent signal handling across all Perl 5.x
versions.
+
+For this purpose it provides set_sig_handler(), and a few conveniece
functions,
+like timeout_call(), sig_name() and sig_number().
+EOF
diff --git a/perl-cpan/perl-sys-sigaction/HISTORY
b/perl-cpan/perl-sys-sigaction/HISTORY
new file mode 100644
index 0000000..4e3a971
--- /dev/null
+++ b/perl-cpan/perl-sys-sigaction/HISTORY
@@ -0,0 +1,2 @@
+2015-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/python-pypi/pillow/BUILD b/python-pypi/pillow/BUILD
index a46e6c4..2c5ec4c 100755
--- a/python-pypi/pillow/BUILD
+++ b/python-pypi/pillow/BUILD
@@ -1,3 +1,6 @@
+# fix build against system zlib
+LDFLAGS="-L$INSTALL_ROOT/lib $LDFLAGS" &&
+
local PYTHON="$(get_spell_provider_file $SPELL PYTHON
'/usr/bin/python[0-9\.]*$')" &&

$PYTHON setup.py build_py build_scripts &&
diff --git a/python-pypi/pillow/HISTORY b/python-pypi/pillow/HISTORY
index d61982d..8e0600b 100644
--- a/python-pypi/pillow/HISTORY
+++ b/python-pypi/pillow/HISTORY
@@ -1,3 +1,6 @@
+2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed build with system zlib
+
2015-04-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.8.1; use SPELLX
* DEPENDS: rewritten -- added missing required dependency (unzip);
fixed
diff --git a/python-pypi/python-markdown/DETAILS
b/python-pypi/python-markdown/DETAILS
index 02b88c6..9167ad7 100755
--- a/python-pypi/python-markdown/DETAILS
+++ b/python-pypi/python-markdown/DETAILS
@@ -1,14 +1,14 @@
SPELL=python-markdown
SPELLX=Markdown
- VERSION=2.5.2
+ VERSION=2.6.2
SOURCE=${SPELLX}-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/M/${SPELLX}/${SOURCE}
-
SOURCE_HASH=sha512:603853586fa61dec7665a4e5ef21549adb0aa4309b0f67aea804bf749ba76ea94b09b17c24a37e25d409575ee149d3baaaf77c3dd4dcf74793c8106830fae28d
+
SOURCE_HASH=sha512:a69dabf65187f54d200f59191a149bfe2109f94ffc5d003e15c2e6333c0b5fdeebfc4136842d7be5a15bc903b7a22120a4ccba2722858194c43fd09cd8fbea16
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="https://pypi.python.org/pypi/Markdown";
LICENSE[0]=BSD
ENTERED=20070910
- SHORT="a Python implementation of John Gruber's Markdown"
+ SHORT="Python implementation of John Gruber's Markdown"
cat << EOF
This is a Python implementation of John Gruber's Markdown. It is almost
completely compliant with the reference implementation, though there are
diff --git a/python-pypi/python-markdown/HISTORY
b/python-pypi/python-markdown/HISTORY
index 37200e3..1b62d92 100644
--- a/python-pypi/python-markdown/HISTORY
+++ b/python-pypi/python-markdown/HISTORY
@@ -1,3 +1,6 @@
+2015-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.2; corrected short desc
+
2014-12-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.5.2

diff --git a/python-pypi/rbtools/DETAILS b/python-pypi/rbtools/DETAILS
index 7db0809..ea7de5c 100755
--- a/python-pypi/rbtools/DETAILS
+++ b/python-pypi/rbtools/DETAILS
@@ -1,7 +1,7 @@
SPELL=rbtools
SPELLX=RBTools
- VERSION=0.7
-
SOURCE_HASH=sha512:538eeb0f8b6bd0ec3fbcad96efa295ca203c2eb159675c439c9ad5dd864a44479b2bfedebe1b21630353d914056c7b7f2ff59bdf7e56a6c93bb290a046a2235f
+ VERSION=0.7.3
+
SOURCE_HASH=sha512:e9e130abf66d57d8956926e88a475c5d89b8cdc09ba4bc41785defd1301cdd129f9246a667cd9c02a5f6311bf023b614e34b1fd15b029bcaacfff98dbacf6ae3
VX=`echo ${VERSION} | cut -d. -f-2`
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL=http://downloads.reviewboard.org/releases/$SPELLX/$VX/$SOURCE
diff --git a/python-pypi/rbtools/HISTORY b/python-pypi/rbtools/HISTORY
index 6c435fb..c7736a6 100644
--- a/python-pypi/rbtools/HISTORY
+++ b/python-pypi/rbtools/HISTORY
@@ -1,3 +1,6 @@
+2015-06-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.3
+
2015-02-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7

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 6b644f7..597dfdf 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-05-26 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: depend on -sub CXX gcc

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/qtjsbackend/BUILD b/qt5/qtjsbackend/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/qt5/qtjsbackend/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/qt5/qtjsbackend/CONFLICTS b/qt5/qtjsbackend/CONFLICTS
deleted file mode 100755
index 8df0c46..0000000
--- a/qt5/qtjsbackend/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtjsbackend y
diff --git a/qt5/qtjsbackend/DETAILS b/qt5/qtjsbackend/DETAILS
deleted file mode 100755
index dff428c..0000000
--- a/qt5/qtjsbackend/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
- SPELL=qtjsbackend
- VERSION=0
- PATCHLEVEL=9999
- SHORT="deprecated"
-cat << EOF
-deprecated spell
-EOF
-
diff --git a/qt5/qtjsbackend/DOWNLOAD b/qt5/qtjsbackend/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/qt5/qtjsbackend/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/qt5/qtjsbackend/HISTORY b/qt5/qtjsbackend/HISTORY
deleted file mode 100644
index 34db858..0000000
--- a/qt5/qtjsbackend/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2013-11-17 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0
- PATCHLEVEL=9999
- spell deprecated
diff --git a/qt5/qtjsbackend/INSTALL b/qt5/qtjsbackend/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/qt5/qtjsbackend/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/qt5/qtjsbackend/PRE_BUILD b/qt5/qtjsbackend/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/qt5/qtjsbackend/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/qt5/qtjsbackend/UP_TRIGGERS b/qt5/qtjsbackend/UP_TRIGGERS
deleted file mode 100755
index 59646fb..0000000
--- a/qt5/qtjsbackend/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger qtjsbackend dispel_self
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

diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index a8d0c7a..20530d8 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -1,7 +1,8 @@
SPELL=bash
VERSION=4.3
SECURITY_PATCH=8
- BASH_PATCHLEVEL=030
+ PATCHLEVEL=1
+ BASH_PATCHLEVEL=039
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE3=$SPELL-doc-3.2.tar.gz
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 0f50fb4..5b9c04a 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,7 @@
+2015-06-01 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * patches/bash43-03[1-9]: added official patches
+
2014-10-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.3.30, SECURITY_PATCH=8
* patches/bash43-026, patches/bash43-028: official patches updated
diff --git a/shell-term-fm/bash/patches/bash43-031
b/shell-term-fm/bash/patches/bash43-031
new file mode 100644
index 0000000..a651956
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-031
@@ -0,0 +1,112 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-031
+
+Bug-Reported-by: lolilolicon <lolilolicon AT gmail.com>
+Bug-Reference-ID:
<CAMtVo_Nz=32Oq=zWTb6=+8gUNXOo2rRvud1W4oPnA-cgVk_ZqQ AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00139.html
+
+Bug-Description:
+
+The new nameref assignment functionality introduced in bash-4.3 did not
perform
+enough validation on the variable value and would create variables with
+invalid names.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500
+--- subst.h 2014-09-01 12:16:56.000000000 -0400
+***************
+*** 48,51 ****
+--- 48,52 ----
+ #define ASS_MKGLOBAL 0x0008 /* force global assignment */
+ #define ASS_NAMEREF 0x0010 /* assigning to nameref variable */
++ #define ASS_FROMREF 0x0020 /* assigning from value of nameref variable */
+
+ /* Flags for the string extraction functions. */
+*** ../bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400
+--- variables.c 2014-09-01 14:37:44.000000000 -0400
+***************
+*** 2504,2511 ****
+ int hflags, aflags;
+ {
+! char *newval;
+ SHELL_VAR *entry;
+
+ entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name,
table);
+ /* Follow the nameref chain here if this is the global variables table */
+ if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table ==
global_variables->table)
+--- 2566,2590 ----
+ int hflags, aflags;
+ {
+! char *newname, *newval;
+ SHELL_VAR *entry;
++ #if defined (ARRAY_VARS)
++ arrayind_t ind;
++ char *subp;
++ int sublen;
++ #endif
+
++ newname = 0;
++ #if defined (ARRAY_VARS)
++ if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 &&
valid_array_reference (name))
++ {
++ newname = array_variable_name (name, &subp, &sublen);
++ if (newname == 0)
++ return (SHELL_VAR *)NULL; /* XXX */
++ entry = hash_lookup (newname, table);
++ }
++ else
++ #endif
+ entry = (hflags & HASH_NOSRCH) ? (SHELL_VAR *)NULL : hash_lookup (name,
table);
++
+ /* Follow the nameref chain here if this is the global variables table */
+ if (entry && nameref_p (entry) && (invisible_p (entry) == 0) && table ==
global_variables->table)
+***************
+*** 2538,2541 ****
+--- 2617,2630 ----
+ }
+ }
++ #if defined (ARRAY_VARS)
++ else if (entry == 0 && newname)
++ {
++ entry = make_new_array_variable (newname); /* indexed array by
default */
++ if (entry == 0)
++ return entry;
++ ind = array_expand_index (name, subp, sublen);
++ bind_array_element (entry, ind, value, aflags);
++ }
++ #endif
+ else if (entry == 0)
+ {
+***************
+*** 2658,2662 ****
+ if (nameref_cell (nv) == 0)
+ return (bind_variable_internal (nv->name, value,
nvc->table, 0, flags));
+! return (bind_variable_internal (nameref_cell (nv),
value, nvc->table, 0, flags));
+ }
+ else
+--- 2747,2752 ----
+ if (nameref_cell (nv) == 0)
+ return (bind_variable_internal (nv->name, value,
nvc->table, 0, flags));
+! /* XXX - bug here with ref=array[index] */
+! return (bind_variable_internal (nameref_cell (nv),
value, nvc->table, 0, flags|ASS_FROMREF));
+ }
+ else
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 30
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 31
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-032
b/shell-term-fm/bash/patches/bash43-032
new file mode 100644
index 0000000..0843719
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-032
@@ -0,0 +1,51 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-032
+
+Bug-Reported-by: crispusfairbairn AT gmail.com
+Bug-Reference-ID:
<b5e499f7-3b98-408d-9f94-c0387580e73a AT googlegroups.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00013.html
+
+Bug-Description:
+
+When bash is running in Posix mode, it allows signals -- including SIGCHLD --
+to interrupt the `wait' builtin, as Posix requires. However, the interrupt
+causes bash to not run a SIGCHLD trap for all exited children. This patch
+fixes the issue and restores the documented behavior in Posix mode.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/jobs.c 2014-05-14 09:20:15.000000000 -0400
+--- jobs.c 2014-09-09 11:50:38.000000000 -0400
+***************
+*** 3340,3344 ****
+ {
+ interrupt_immediately = 0;
+! trap_handler (SIGCHLD); /* set pending_traps[SIGCHLD] */
+ wait_signal_received = SIGCHLD;
+ /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
+--- 3346,3352 ----
+ {
+ interrupt_immediately = 0;
+! /* This was trap_handler (SIGCHLD) but that can lose traps if
+! children_exited > 1 */
+! queue_sigchld_trap (children_exited);
+ wait_signal_received = SIGCHLD;
+ /* If we're in a signal handler, let CHECK_WAIT_INTR pick it up;
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 31
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 32
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-033
b/shell-term-fm/bash/patches/bash43-033
new file mode 100644
index 0000000..5f5147f
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-033
@@ -0,0 +1,225 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-033
+
+Bug-Reported-by: mickael9 AT gmail.com, Jan Rome <jan.rome AT gmail.com>
+Bug-Reference-ID:
<20140907224046.382ED3610CC AT mickael-laptop.localdomain>,
+ <540D661D.50908 AT gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00029.html
+
http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00030.html
+
+Bug-Description:
+
+Bash does not clean up the terminal state in all cases where bash or
+readline modifies it and bash is subsequently terminated by a fatal signal.
+This happens when the `read' builtin modifies the terminal settings, both
+when readline is active and when it is not. It occurs most often when a
script
+installs a trap that exits on a signal without re-sending the signal to
itself.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/shell.c 2014-01-14 08:04:32.000000000 -0500
+--- shell.c 2014-12-22 10:27:50.000000000 -0500
+***************
+*** 74,77 ****
+--- 74,78 ----
+
+ #if defined (READLINE)
++ # include <readline/readline.h>
+ # include "bashline.h"
+ #endif
+***************
+*** 910,913 ****
+--- 912,923 ----
+ fflush (stderr);
+
++ /* Clean up the terminal if we are in a state where it's been modified.
*/
++ #if defined (READLINE)
++ if (RL_ISSTATE (RL_STATE_TERMPREPPED) && rl_deprep_term_function)
++ (*rl_deprep_term_function) ();
++ #endif
++ if (read_tty_modified ())
++ read_tty_cleanup ();
++
+ /* Do trap[0] if defined. Allow it to override the exit status
+ passed to us. */
+*** ../bash-4.3-patched/builtins/read.def 2014-10-01 12:57:38.000000000
-0400
+--- builtins/read.def 2014-12-22 10:48:54.000000000 -0500
+***************
+*** 141,148 ****
+ int sigalrm_seen;
+
+! static int reading;
+ static SigHandler *old_alrm;
+ static unsigned char delim;
+
+ /* In all cases, SIGALRM just sets a flag that we check periodically. This
+ avoids problems with the semi-tricky stuff we do with the xfree of
+--- 141,150 ----
+ int sigalrm_seen;
+
+! static int reading, tty_modified;
+ static SigHandler *old_alrm;
+ static unsigned char delim;
+
++ static struct ttsave termsave;
++
+ /* In all cases, SIGALRM just sets a flag that we check periodically. This
+ avoids problems with the semi-tricky stuff we do with the xfree of
+***************
+*** 189,193 ****
+ SHELL_VAR *var;
+ TTYSTRUCT ttattrs, ttset;
+- struct ttsave termsave;
+ #if defined (ARRAY_VARS)
+ WORD_LIST *alist;
+--- 191,194 ----
+***************
+*** 222,226 ****
+ USE_VAR(lastsig);
+
+! sigalrm_seen = reading = 0;
+
+ i = 0; /* Index into the string that we are reading. */
+--- 223,227 ----
+ USE_VAR(lastsig);
+
+! sigalrm_seen = reading = tty_modified = 0;
+
+ i = 0; /* Index into the string that we are reading. */
+***************
+*** 439,442 ****
+--- 440,445 ----
+ goto assign_vars;
+ }
++ if (interactive_shell == 0)
++ initialize_terminating_signals ();
+ old_alrm = set_signal_handler (SIGALRM, sigalrm);
+ add_unwind_protect (reset_alarm, (char *)NULL);
+***************
+*** 483,487 ****
+--- 486,493 ----
+ if (i < 0)
+ sh_ttyerror (1);
++ tty_modified = 1;
+ add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
++ if (interactive_shell == 0)
++ initialize_terminating_signals ();
+ }
+ }
+***************
+*** 498,502 ****
+--- 504,511 ----
+ sh_ttyerror (1);
+
++ tty_modified = 1;
+ add_unwind_protect ((Function *)ttyrestore, (char *)&termsave);
++ if (interactive_shell == 0)
++ initialize_terminating_signals ();
+ }
+
+***************
+*** 589,592 ****
+--- 598,603 ----
+ else
+ lastsig = 0;
++ if (terminating_signal && tty_modified)
++ ttyrestore (&termsave); /* fix terminal before exiting */
+ CHECK_TERMSIG;
+ eof = 1;
+***************
+*** 979,982 ****
+--- 990,1007 ----
+ {
+ ttsetattr (ttp->fd, ttp->attrs);
++ tty_modified = 0;
++ }
++
++ void
++ read_tty_cleanup ()
++ {
++ if (tty_modified)
++ ttyrestore (&termsave);
++ }
++
++ int
++ read_tty_modified ()
++ {
++ return (tty_modified);
+ }
+
+*** ../bash-4.3-patched/builtins/common.h 2014-10-01 12:57:47.000000000
-0400
+--- builtins/common.h 2014-12-22 10:10:14.000000000 -0500
+***************
+*** 123,126 ****
+--- 141,148 ----
+ extern void getopts_reset __P((int));
+
++ /* Functions from read.def */
++ extern void read_tty_cleanup __P((void));
++ extern int read_tty_modified __P((void));
++
+ /* Functions from set.def */
+ extern int minus_o_option_value __P((char *));
+*** ../bash-4.3-patched/bashline.c 2014-05-14 09:22:39.000000000 -0400
+--- bashline.c 2014-09-08 11:28:56.000000000 -0400
+***************
+*** 203,206 ****
+--- 203,207 ----
+ extern int array_needs_making;
+ extern int posixly_correct, no_symbolic_links;
++ extern int sigalrm_seen;
+ extern char *current_prompt_string, *ps1_prompt;
+ extern STRING_INT_ALIST word_token_alist[];
+***************
+*** 4209,4214 ****
+ /* If we're going to longjmp to top_level, make sure we clean up
readline.
+ check_signals will call QUIT, which will eventually longjmp to
top_level,
+! calling run_interrupt_trap along the way. */
+! if (interrupt_state)
+ rl_cleanup_after_signal ();
+ bashline_reset_event_hook ();
+--- 4262,4268 ----
+ /* If we're going to longjmp to top_level, make sure we clean up
readline.
+ check_signals will call QUIT, which will eventually longjmp to
top_level,
+! calling run_interrupt_trap along the way. The check for sigalrm_seen
is
+! to clean up the read builtin's state. */
+! if (terminating_signal || interrupt_state || sigalrm_seen)
+ rl_cleanup_after_signal ();
+ bashline_reset_event_hook ();
+*** ../bash-4.3-patched/sig.c 2014-01-10 15:06:06.000000000 -0500
+--- sig.c 2014-09-08 11:26:33.000000000 -0400
+***************
+*** 533,538 ****
+ /* Set the event hook so readline will call it after the signal handlers
+ finish executing, so if this interrupted character input we can get
+! quick response. */
+! if (interactive_shell && interactive && no_line_editing == 0)
+ bashline_set_event_hook ();
+ #endif
+--- 533,540 ----
+ /* Set the event hook so readline will call it after the signal handlers
+ finish executing, so if this interrupted character input we can get
+! quick response. If readline is active or has modified the terminal we
+! need to set this no matter what the signal is, though the check for
+! RL_STATE_TERMPREPPED is possibly redundant. */
+! if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE
(RL_STATE_TERMPREPPED))
+ bashline_set_event_hook ();
+ #endif
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 32
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 33
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-034
b/shell-term-fm/bash/patches/bash43-034
new file mode 100644
index 0000000..17372aa
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-034
@@ -0,0 +1,90 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-034
+
+Bug-Reported-by: Dreamcat4 <dreamcat4 AT gmail.com>
+Bug-Reference-ID:
<CAN39uTpAEs2GFu4ebC_SfSVMRTh-DJ9YanrY4BZZ3OO+CCHjng AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2015-05/msg00001.html
+
+Bug-Description:
+
+If neither the -f nor -v options is supplied to unset, and a name argument is
+found to be a function and unset, subsequent name arguments are not treated
as
+variables before attempting to unset a function by that name.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/builtins/set.def 2013-04-19 07:20:34.000000000
-0400
+--- builtins/set.def 2015-05-05 13:25:36.000000000 -0400
+***************
+*** 752,758 ****
+--- 797,805 ----
+ {
+ int unset_function, unset_variable, unset_array, opt, nameref,
any_failed;
++ int global_unset_func, global_unset_var;
+ char *name;
+
+ unset_function = unset_variable = unset_array = nameref = any_failed = 0;
++ global_unset_func = global_unset_var = 0;
+
+ reset_internal_getopt ();
+***************
+*** 762,769 ****
+ {
+ case 'f':
+! unset_function = 1;
+ break;
+ case 'v':
+! unset_variable = 1;
+ break;
+ case 'n':
+--- 809,816 ----
+ {
+ case 'f':
+! global_unset_func = 1;
+ break;
+ case 'v':
+! global_unset_var = 1;
+ break;
+ case 'n':
+***************
+*** 778,782 ****
+ list = loptend;
+
+! if (unset_function && unset_variable)
+ {
+ builtin_error (_("cannot simultaneously unset a function and a
variable"));
+--- 825,829 ----
+ list = loptend;
+
+! if (global_unset_func && global_unset_var)
+ {
+ builtin_error (_("cannot simultaneously unset a function and a
variable"));
+***************
+*** 796,799 ****
+--- 843,849 ----
+ name = list->word->word;
+
++ unset_function = global_unset_func;
++ unset_variable = global_unset_var;
++
+ #if defined (ARRAY_VARS)
+ unset_array = 0;
+
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 33
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 34
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-035
b/shell-term-fm/bash/patches/bash43-035
new file mode 100644
index 0000000..f18bc60
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-035
@@ -0,0 +1,63 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-035
+
+Bug-Reported-by: <romerox.adrian AT gmail.com>
+Bug-Reference-ID:
<CABV5r3zhPXmSKUe9uedeGc5YFBM2njJ1iVmY2h5neWdQpDBQug AT mail.gmail.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-08/msg00045.html
+
+Bug-Description:
+
+A locale with a long name can trigger a buffer overflow and core dump. This
+applies on systems that do not have locale_charset in libc, are not using
+GNU libiconv, and are not using the libintl that ships with bash in lib/intl.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/lib/sh/unicode.c 2014-01-30 16:47:19.000000000
-0500
+--- lib/sh/unicode.c 2015-05-01 08:58:30.000000000 -0400
+***************
+*** 79,83 ****
+ if (s)
+ {
+! strcpy (charsetbuf, s+1);
+ t = strchr (charsetbuf, '@');
+ if (t)
+--- 79,84 ----
+ if (s)
+ {
+! strncpy (charsetbuf, s+1, sizeof (charsetbuf) - 1);
+! charsetbuf[sizeof (charsetbuf) - 1] = '\0';
+ t = strchr (charsetbuf, '@');
+ if (t)
+***************
+*** 85,89 ****
+ return charsetbuf;
+ }
+! strcpy (charsetbuf, locale);
+ return charsetbuf;
+ }
+--- 86,91 ----
+ return charsetbuf;
+ }
+! strncpy (charsetbuf, locale, sizeof (charsetbuf) - 1);
+! charsetbuf[sizeof (charsetbuf) - 1] = '\0';
+ return charsetbuf;
+ }
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 34
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 35
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-036
b/shell-term-fm/bash/patches/bash43-036
new file mode 100644
index 0000000..5b42c24
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-036
@@ -0,0 +1,57 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-036
+
+Bug-Reported-by: emanuelczirai AT cryptolab.net
+Bug-Reference-ID: <f962e4f556da5ebfadaf7afe9c78a8cb AT cryptolab.net>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00071.html
+
+Bug-Description:
+
+When evaluating and setting integer variables, and the assignment fails to
+create a variable (for example, when performing an operation on an array
+variable with an invalid subscript), bash attempts to dereference a null
+pointer, causing a segmentation violation.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20150206/variables.c 2015-01-23 20:39:27.000000000 -0500
+--- variables.c 2015-02-19 13:56:12.000000000 -0500
+***************
+*** 2834,2841 ****
+ v = bind_variable (lhs, rhs, 0);
+
+! if (v && isint)
+! VSETATTR (v, att_integer);
+!
+! VUNSETATTR (v, att_invisible);
+
+ return (v);
+--- 2834,2843 ----
+ v = bind_variable (lhs, rhs, 0);
+
+! if (v)
+! {
+! if (isint)
+! VSETATTR (v, att_integer);
+! VUNSETATTR (v, att_invisible);
+! }
+
+ return (v);
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 35
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 36
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-037
b/shell-term-fm/bash/patches/bash43-037
new file mode 100644
index 0000000..f04012b
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-037
@@ -0,0 +1,43 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-037
+
+Bug-Reported-by: Greg Wooledge <wooledg AT eeg.ccf.org>
+Bug-Reference-ID: <20150204144240.GN13956 AT eeg.ccf.org>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00007.html
+
+Bug-Description:
+
+If an associative array uses `@' or `*' as a subscript, `declare -p' produces
+output that cannot be reused as input.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/assoc.c 2011-11-05 16:39:05.000000000 -0400
+--- assoc.c 2015-02-04 15:28:25.000000000 -0500
+***************
+*** 437,440 ****
+--- 440,445 ----
+ if (sh_contains_shell_metas (tlist->key))
+ istr = sh_double_quote (tlist->key);
++ else if (ALL_ELEMENT_SUB (tlist->key[0]) && tlist->key[1] == '\0')
++ istr = sh_double_quote (tlist->key);
+ else
+ istr = tlist->key;
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 36
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 37
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-038
b/shell-term-fm/bash/patches/bash43-038
new file mode 100644
index 0000000..e0de74e
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-038
@@ -0,0 +1,88 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-038
+
+Bug-Reported-by: worley AT alum.mit.edu (Dale R. Worley)
+Bug-Reference-ID: <201406100051.s5A0pCeB014978 AT hobgoblin.ariadne.com>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00028.html
+
+Bug-Description:
+
+There are a number of instances where `time' is not recognized as a reserved
+word when the shell grammar says it should be.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400
+--- parse.y 2014-06-11 10:25:53.000000000 -0400
+***************
+*** 2819,2827 ****
+ case OR_OR:
+ case '&':
+ case DO:
+ case THEN:
+ case ELSE:
+ case '{': /* } */
+! case '(': /* ) */
+ case BANG: /* ! time pipeline */
+ case TIME: /* time time pipeline */
+--- 2819,2832 ----
+ case OR_OR:
+ case '&':
++ case WHILE:
+ case DO:
++ case UNTIL:
++ case IF:
+ case THEN:
++ case ELIF:
+ case ELSE:
+ case '{': /* } */
+! case '(': /* )( */
+! case ')': /* only valid in case statement */
+ case BANG: /* ! time pipeline */
+ case TIME: /* time time pipeline */
+*** ../bash-4.3-patched/y.tab.c 2014-10-05 13:52:50.000000000 -0400
+--- y.tab.c 2015-05-19 15:08:43.000000000 -0400
+***************
+*** 5131,5139 ****
+ case OR_OR:
+ case '&':
+ case DO:
+ case THEN:
+ case ELSE:
+ case '{': /* } */
+! case '(': /* ) */
+ case BANG: /* ! time pipeline */
+ case TIME: /* time time pipeline */
+--- 5131,5144 ----
+ case OR_OR:
+ case '&':
++ case WHILE:
+ case DO:
++ case UNTIL:
++ case IF:
+ case THEN:
++ case ELIF:
+ case ELSE:
+ case '{': /* } */
+! case '(': /* )( */
+! case ')': /* only valid in case statement */
+ case BANG: /* ! time pipeline */
+ case TIME: /* time time pipeline */
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 37
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 38
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash43-039
b/shell-term-fm/bash/patches/bash43-039
new file mode 100644
index 0000000..e5e3887
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash43-039
@@ -0,0 +1,57 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 4.3
+Patch-ID: bash43-039
+
+Bug-Reported-by: SN <poczta-sn AT gazeta.pl>
+Bug-Reference-ID: <54E2554C.205 AT gazeta.pl>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2015-02/msg00060.html
+
+Bug-Description:
+
+Using the output of `declare -p' when run in a function can result in
variables
+that are invisible to `declare -p'. This problem occurs when an assignment
+builtin such as `declare' receives a quoted compound array assignment as one
of
+its arguments.
+
+Patch (apply with `patch -p0'):
+
+*** /usr/src/local/bash/bash-4.3-patched/arrayfunc.c 2014-10-01
13:08:48.000000000 -0400
+--- arrayfunc.c 2015-02-19 14:33:05.000000000 -0500
+***************
+*** 405,408 ****
+--- 405,411 ----
+ else
+ array_insert (a, i, l->word->word);
++
++ VUNSETATTR (var, att_invisible); /* no longer invisible */
++
+ return var;
+ }
+***************
+*** 635,638 ****
+--- 638,645 ----
+ if (nlist)
+ dispose_words (nlist);
++
++ if (var)
++ VUNSETATTR (var, att_invisible); /* no longer invisible */
++
+ return (var);
+ }
+*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
+--- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 38
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 39
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/utils/syslinux/DETAILS b/utils/syslinux/DETAILS
index 08c0174..693df73 100755
--- a/utils/syslinux/DETAILS
+++ b/utils/syslinux/DETAILS
@@ -1,10 +1,10 @@
SPELL=syslinux
- VERSION=5.01
-
SOURCE_HASH=sha512:ad447d2469c3308393ea65060f09c31fda1ad56d253155e7cf6475690c89f95b449786afeef47068d9edbc4fe605f75799738173d4ed16ef4cfb1d46dcb93117
+ VERSION=6.03
+
SOURCE_HASH=sha512:dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/boot/$SPELL/5.xx/$SOURCE
-
SOURCE_URL[1]=ftp://ftp.kernel.org/pub/linux/utils/boot/$SPELL/5.xx/$SOURCE
+
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/boot/$SPELL/${VERSION%.*}.xx/$SOURCE
+
SOURCE_URL[1]=ftp://ftp.kernel.org/pub/linux/utils/boot/$SPELL/${VERSION%.*}.xx/$SOURCE
WEB_SITE=http://www.syslinux.org

# SOURCE_GPG="kernel.gpg:$SOURCE.sign:VERIFIED_UPSTREAM_KEY"
diff --git a/utils/syslinux/HISTORY b/utils/syslinux/HISTORY
index b59ae0f..bf567fe 100644
--- a/utils/syslinux/HISTORY
+++ b/utils/syslinux/HISTORY
@@ -1,3 +1,7 @@
+2015-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 6.03
+
2013-01-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.01
new WEB_SITE and description
diff --git a/utils/whohas/DEPENDS b/utils/whohas/DEPENDS
index bb463ae..a4f7f12 100755
--- a/utils/whohas/DEPENDS
+++ b/utils/whohas/DEPENDS
@@ -1,3 +1,7 @@
-depends -sub THREADS perl &&
+depends perl &&
+depneds perl-acme-damn &&
+depends perl-forks &&
+depends perl-sys-sigaction &&
+depends list-moreutils &&
depends lwp &&
depends coreutils
diff --git a/utils/whohas/DETAILS b/utils/whohas/DETAILS
index 48ecd59..295255c 100755
--- a/utils/whohas/DETAILS
+++ b/utils/whohas/DETAILS
@@ -1,8 +1,8 @@
SPELL=whohas
- VERSION=0.29
+ VERSION=0.29.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://www.philippwesche.org/200811/whohas/$SOURCE
-
SOURCE_HASH=sha512:c078cc252c57e0f7d91769194f1d8e88ffc4481540ab4d573faa64d73ffa86128acba68fd43fcfb45e79b5f57f4232de9799fbf2bad1fbc0f4c85921a34d84b9
+
SOURCE_HASH=sha512:15ece8eeef4cbdf790efeb809cefa59d826e6f784b2f5375009d6eff30077617bc64d05596437b8281a472bf5877b15fd87df78c5367a8e0ee0c97f695906486
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://www.philippwesche.org/200811/whohas/intro.html
ENTERED=20050725
diff --git a/utils/whohas/HISTORY b/utils/whohas/HISTORY
index 5489c1c..5676957 100644
--- a/utils/whohas/HISTORY
+++ b/utils/whohas/HISTORY
@@ -1,3 +1,11 @@
+2015-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Depends on perl-acme-damn, perl-forks, perl-sys-sigaction,
+ and list-moreutils.
+
+2015-05-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.29.1
+ * INSTALL: Use make
+
2015-01-09 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.29

diff --git a/utils/whohas/INSTALL b/utils/whohas/INSTALL
index 7b2dfdd..f1b6bc6 100755
--- a/utils/whohas/INSTALL
+++ b/utils/whohas/INSTALL
@@ -1 +1 @@
-bash ./install.sh
+make install PREFIX="$INSTALL_ROOT/usr"
diff --git a/video/mpv/DETAILS b/video/mpv/DETAILS
index 0067e4a..b516e36 100755
--- a/video/mpv/DETAILS
+++ b/video/mpv/DETAILS
@@ -1,13 +1,13 @@
SPELL=mpv
- VERSION=0.9.0
+ VERSION=0.9.2
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/${SPELL}-player/${SPELL}/archive/v${VERSION}.tar.gz
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha512:e053371bca45136830ee4f285e56ea3a5973a9d1f6ed261d3a03af7f01a691fedaaac7d098fa549384ee6c17e8315458d69be472a5f41243ed0ec977c956d95f
- WAF_VERSION=1.8.9
+
SOURCE_HASH=sha512:4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967
+ WAF_VERSION=1.8.10
SOURCE2=waf-$WAF_VERSION
SOURCE2_URL[0]=http://ftp.waf.io/pub/release/$SOURCE2
-
SOURCE2_HASH=sha512:88ba5d0c299502f17c5e407e6b75cda75153d792e24cc36b31b6b6f578a803d345a7447e643b35b744af5f6497b479c5df66b402d96dbd72303ebf993d2bceed
+
SOURCE2_HASH=sha512:12e86071aa6b25c835aa01bbe980cc61ad7f0a3919d3a3d7e8c2fe2ea2cf02681e1c915398c4184926988efc5a0cef09c2f23ba7edf20554cdb238a30bbe1f7c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
DOCS="Copyright DOCS/tech-overview.txt DOCS/OUTDATED-tech/*
$DOCS"
WEB_SITE=http://mpv.io/
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 7848fe5..ad998eb 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,3 +1,6 @@
+2015-05-30 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.2, waf 1.8.10
+
2015-05-05 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: definitely depend on smgl-gl_select

diff --git a/xorg-lib/libinput/DETAILS b/xorg-lib/libinput/DETAILS
index 69ad839..a7c2fe9 100755
--- a/xorg-lib/libinput/DETAILS
+++ b/xorg-lib/libinput/DETAILS
@@ -1,6 +1,6 @@
SPELL=libinput
- VERSION=0.15.0
-
SOURCE_HASH=sha512:849748d3a86130eaeedf61ca1607f92c6bf8864db5baa15d9fe5a9e99fb998c6959bab7aa3d73e795cb51166e3c2e01370f4277a3a9a150729405839cf931d45
+ VERSION=0.16.0
+
SOURCE_HASH=sha512:6209281a8a5d50fd1040ff012427f66f8d7efadb7508714ffb1dc1105f195d5ffff6f12d9b60b167ce9b1e00614fc11a3fdfe4b27cf7b1ea390345a864b9283a
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=http://www.freedesktop.org/software/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/xorg-lib/libinput/HISTORY b/xorg-lib/libinput/HISTORY
index f097bb6..4e68063 100644
--- a/xorg-lib/libinput/HISTORY
+++ b/xorg-lib/libinput/HISTORY
@@ -1,3 +1,6 @@
+2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.16.0
+
2015-05-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.15.0




  • [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (254f2d9778818ee4111e14244391bdcac81d4dc4), Treeve Jelbert, 06/02/2015

Archive powered by MHonArc 2.6.24.

Top of Page