Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e91740b30634254365363b562d23e7b3ae99142a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e91740b30634254365363b562d23e7b3ae99142a)
  • Date: Sat, 27 Jul 2019 11:09:30 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

archive/zstd/DETAILS | 4
archive/zstd/HISTORY | 3
editors/vim/DETAILS | 4
editors/vim/HISTORY | 3
graphics-libs/babl/DEPENDS | 2
graphics-libs/babl/DETAILS | 6
graphics-libs/babl/HISTORY | 4
graphics-libs/babl/PRE_BUILD | 4
kernels/linux/HISTORY | 8
kernels/linux/info/patches/maintenance_patches_4/patch-4.19.60 | 5
kernels/linux/info/patches/maintenance_patches_4/patch-4.19.61 | 5
kernels/linux/latest.defaults | 2
libs/openscenegraph/DETAILS | 4
libs/openscenegraph/HISTORY | 3
libs/sdl2/DETAILS | 2
libs/sdl2/HISTORY | 3
python-pypi/cython/DETAILS | 4
python-pypi/cython/HISTORY | 3
python-pypi/numpy/DEPENDS | 4
python-pypi/numpy/DETAILS | 4
python-pypi/numpy/HISTORY | 4
python-pypi/pip/DETAILS | 4
python-pypi/pip/HISTORY | 3
python-pypi/scons/2e0de3c5.patch | 107
----------
python-pypi/scons/DETAILS | 4
python-pypi/scons/HISTORY | 4
python-pypi/scons/PRE_BUILD | 2
security/wireshark/DETAILS | 4
security/wireshark/HISTORY | 3
video-libs/libvpx/DETAILS | 4
video-libs/libvpx/HISTORY | 3
31 files changed, 85 insertions(+), 134 deletions(-)

New commits:
commit e91740b30634254365363b562d23e7b3ae99142a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/sdl2: version 2.0.10

commit 401b715e2fa32008aad167b726ce5dd7781db6d5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/babl: version 0.1.68

commit d4c9d06f8b3383728899039b2e459e33a215fb15
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/linux: version 4.19.61

commit 9adbdf731eabbba3e8d4d5f72b4dc811007fc54b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/cython: version 0.29.13

commit 7406aef4d4930c9f083d00680b4342d875db8661
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/openscenegraph: version 3.6.4

commit 3b0f5e37f45fc5a669ca8b8658e0c0674c9906f1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/numpy: version 1.17.0

commit 99fd7936217af8443a443abb67409203b1590647
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

editors/vim: version 8.1.1755

commit 68251d404fe8dfab7533ce4b6087ffd7723c0d8e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video-libs/libvpx: version 1.8.1

commit c716e3ad4846e77f45e8793d3b50eebd674c7a00
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/pip: version 19.2.1

commit e37b37368335e7b2b960e0bae2eb3b0c096b3aff
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

archive/zstd: version 1.4.2

commit 17ea69561c89fb306de990a7b04dcd02b445cacb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

security/wireshark: version 3.0.3

commit 421f304e8a9681d8b43efe71c3645b854c282765
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/linux: version 4.19.60

commit 132e8b90bdd9554c0c34ac1c9a03b87c0e1d1481
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/scons: version 3.0.4

diff --git a/archive/zstd/DETAILS b/archive/zstd/DETAILS
index 60e6a11..1b076f0 100755
--- a/archive/zstd/DETAILS
+++ b/archive/zstd/DETAILS
@@ -1,8 +1,8 @@
SPELL=zstd
- VERSION=1.4.1
+ VERSION=1.4.2
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/facebook/${SPELL}/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:5bfac959dbbcfaa16fc0b5d3d5028c606e0c56d385581644a7376d6c61f2efc081efa65e7cc3d3e7b4c107646e0b67b3a75f9b3ff392624025d3a0816c45a9f2
+
SOURCE_HASH=sha512:5473502093332401c83b02e4ac66b2e05f32f710121d371daf164d8b002be9c06c51578bf9fed0ffb70bb67a0c64457b0e7a02f0d1ba5d36b1f3b6dde93ff907
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOCS="PATENTS ${DOCS}"
WEB_SITE=https://www.zstd.net
diff --git a/archive/zstd/HISTORY b/archive/zstd/HISTORY
index b57327b..2448224 100644
--- a/archive/zstd/HISTORY
+++ b/archive/zstd/HISTORY
@@ -1,3 +1,6 @@
+2019-07-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.4.2
+
2019-07-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.1

diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 1ed6cca..e91afdf 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -9,8 +9,8 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
SOURCE_IGNORE="volatile"
FORCE_DOWNLOAD="on"
else
- VERSION=8.1.1749
-
SOURCE_HASH=sha512:38addb4f38416d9fb06a138ba81bd4a3b8e8bd8fb337bccbb390c159e20c0ae5143ab785a4b66d4036022fa54ee08f7e4610ce866415b063bfbb2d89244e4610
+ VERSION=8.1.1755
+
SOURCE_HASH=sha512:96f79b01fca931f736ae54200031de5b131fb3b2288dd2d1e6bb3ba7287d95659ed41362dde0e1ca27396037771a54ad6721900243aba50c3334f9027c2d301d
SECURITY_PATCH=5
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 7320dcc..432c7c4 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.1.1755
+
2019-07-25 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 8.1.1749

diff --git a/graphics-libs/babl/DEPENDS b/graphics-libs/babl/DEPENDS
index 66eea8e..bbd429b 100755
--- a/graphics-libs/babl/DEPENDS
+++ b/graphics-libs/babl/DEPENDS
@@ -1,4 +1,6 @@
depends autoconf &&
+depends automake &&
+depends libtool &&

optional_depends gobject-introspection \
"--enable-introspection=yes" \
diff --git a/graphics-libs/babl/DETAILS b/graphics-libs/babl/DETAILS
index faa57a7..3fed0dc 100755
--- a/graphics-libs/babl/DETAILS
+++ b/graphics-libs/babl/DETAILS
@@ -1,7 +1,7 @@
SPELL=babl
- VERSION=0.1.66
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
-
SOURCE_HASH=sha512:41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3
+ VERSION=0.1.68
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+
SOURCE_HASH=sha512:1eba9b76c9ff84cbb54530556f5aa1c3b367a7734770a7ebb7d850a70851722ab222f4af7cc0c92dc3175724671be4b093b7f4757333f5e4156b143d3e0a0e90

SOURCE_URL[0]=https://download.gimp.org/pub/${SPELL}/${VERSION%.*}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gegl.org/babl/";
diff --git a/graphics-libs/babl/HISTORY b/graphics-libs/babl/HISTORY
index 99c8ac1..af43100 100644
--- a/graphics-libs/babl/HISTORY
+++ b/graphics-libs/babl/HISTORY
@@ -1,3 +1,7 @@
+2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.1.68
+ * PRE_BUILD, DEPENDS: run autoreconf
+
2019-06-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.1.66

diff --git a/graphics-libs/babl/PRE_BUILD b/graphics-libs/babl/PRE_BUILD
new file mode 100755
index 0000000..39a6e35
--- /dev/null
+++ b/graphics-libs/babl/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+autoreconf -fiv
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 5baee81..7c99e79 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_4=patch-4.19.61
+ * info/patches/maintenance_patches_4/patch-4.19.61: added
+
2019-07-26 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: LATEST_maintenance_patches_5=patch-5.2.3
* info/patches/maintenance_patches_5/patch-5.2.3: added
@@ -8,6 +12,10 @@
* info/patches/maintenance_patches_5/patch-5.2.2: added
* info/patches/maintenance_patches_5/patch-5.1.19: added

+2019-07-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_4=patch-4.19.60
+ * info/patches/maintenance_patches_4/patch-4.19.60: added
+
2019-07-15 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: LATEST_maintenance_patches_5=patch-5.2.1
* info/patches/maintenance_patches_5/patch-5.2.1: added
diff --git a/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.60
b/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.60
new file mode 100755
index 0000000..9d29937
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.60
@@ -0,0 +1,5 @@
+appliedkernels="4.19"
+patchversion="${appliedkernels}.60"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source}"
+sha1sum="0e745e12eb59b3e835e854f9db8296ca68f5e588"
diff --git a/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.61
b/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.61
new file mode 100755
index 0000000..945c387
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.61
@@ -0,0 +1,5 @@
+appliedkernels="4.19"
+patchversion="${appliedkernels}.61"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source}"
+sha1sum="c1e2e8e96f67eb7e6ecb4ec12b0ae24e4eb384dc"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index e75dcf1..ea8eb46 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,5 +2,5 @@ LATEST_5=5.2
LATEST_4=4.19
LATEST_3=3.19
LATEST_maintenance_patches_3=patch-3.19.3
-LATEST_maintenance_patches_4=patch-4.19.59
+LATEST_maintenance_patches_4=patch-4.19.61
LATEST_maintenance_patches_5=patch-5.2.3
diff --git a/libs/openscenegraph/DETAILS b/libs/openscenegraph/DETAILS
index 7fbb0c7..b2b6210 100755
--- a/libs/openscenegraph/DETAILS
+++ b/libs/openscenegraph/DETAILS
@@ -1,9 +1,9 @@
SPELL=openscenegraph
- VERSION=3.6.3
+ VERSION=3.6.4
SOURCE=OpenSceneGraph-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenSceneGraph-OpenSceneGraph-${VERSION}

SOURCE_URL[0]=https://github.com/openscenegraph/OpenSceneGraph/archive/${SOURCE}
-
SOURCE_HASH=sha512:5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322
+
SOURCE_HASH=sha512:7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://www.openscenegraph.org/
ENTERED=20021102
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index a7b8902..7dde682 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.6.4
+
2018-12-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.6.3

diff --git a/libs/sdl2/DETAILS b/libs/sdl2/DETAILS
index 3b9ab4a..9a95cdc 100755
--- a/libs/sdl2/DETAILS
+++ b/libs/sdl2/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-2.0-hg
SOURCE_URL[0]=hg_http://hg.libsdl.org/SDL:$SPELL-2.0-hg
SOURCE_IGNORE=volatile
else
- VERSION=2.0.9
+ VERSION=2.0.10
SOURCE=SDL2-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/libs/sdl2/HISTORY b/libs/sdl2/HISTORY
index d7f431c..2033bfb 100644
--- a/libs/sdl2/HISTORY
+++ b/libs/sdl2/HISTORY
@@ -1,3 +1,6 @@
+2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.10
+
2018-10-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.9

diff --git a/python-pypi/cython/DETAILS b/python-pypi/cython/DETAILS
index 42fdc40..7651cb2 100755
--- a/python-pypi/cython/DETAILS
+++ b/python-pypi/cython/DETAILS
@@ -1,9 +1,9 @@
SPELL=cython
SPELLX=Cython
- VERSION=0.29.12
+ VERSION=0.29.13
SOURCE=${SPELLX}-${VERSION}.tar.gz
SOURCE_URL[0]=https://pypi.org/packages/source/C/${SPELLX}/${SOURCE}
-
SOURCE_HASH=sha512:502756331d8c3618a75a881fc1a20b7e871cd3412904070f3080d5bd0918440230fdae96f096c255fec6b32b81ffcf838f22953b8da23b8845527810f457be60
+
SOURCE_HASH=sha512:61ce4cab938163c14c7ece750fde2b26ce8476c3a6fed0c6768022ef7e9b652591db9646a2814c7f17457581c9b4b7c38bb703e697fee9322a480b020a43d8fc
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE=http://www.cython.org/
ENTERED=20100106
diff --git a/python-pypi/cython/HISTORY b/python-pypi/cython/HISTORY
index 756c3e4..b646213 100644
--- a/python-pypi/cython/HISTORY
+++ b/python-pypi/cython/HISTORY
@@ -1,3 +1,6 @@
+2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.29.13
+
2019-07-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.29.12

diff --git a/python-pypi/numpy/DEPENDS b/python-pypi/numpy/DEPENDS
index 2906775..181d695 100755
--- a/python-pypi/numpy/DEPENDS
+++ b/python-pypi/numpy/DEPENDS
@@ -1,5 +1,5 @@
-. $SECTION_DIRECTORY/PY_DEPENDS &&
-depends cython &&
+depends python3 &&
+depends cython &&

optional_depends atlas \
"" "" "use the atlas numerics library"
diff --git a/python-pypi/numpy/DETAILS b/python-pypi/numpy/DETAILS
index d0d09cc..966e408 100755
--- a/python-pypi/numpy/DETAILS
+++ b/python-pypi/numpy/DETAILS
@@ -1,7 +1,7 @@
SPELL=numpy
- VERSION=1.16.4
+ VERSION=1.17.0
SECURITY_PATCH=2
-
SOURCE_HASH=sha512:c8437e01a8c6c37787a8bf52f26d1adb273a6bb8f709f3cd92b427c63a1f772f9b2285b46321f2bd1a60a572797223d801aaed0fc2782bcdc7cbe39cd8c34c69
+
SOURCE_HASH=sha512:b13ddbf43c4e5c3f0a2af18b1e5496f070d005c943c4923a28e69dc262052831a79c5206e707db9870434fd7bef328b979257d09544d7bfdc33a0eacf52c552a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://github.com/numpy/numpy/archive/v${VERSION}.tar.gz
diff --git a/python-pypi/numpy/HISTORY b/python-pypi/numpy/HISTORY
index 6543540..c3221ad 100644
--- a/python-pypi/numpy/HISTORY
+++ b/python-pypi/numpy/HISTORY
@@ -1,3 +1,7 @@
+2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: verison 1.17.0
+ * DEPENDS: depend on python3
+
2019-06-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: fix WEB_SITE

diff --git a/python-pypi/pip/DETAILS b/python-pypi/pip/DETAILS
index 19baedb..6a69493 100755
--- a/python-pypi/pip/DETAILS
+++ b/python-pypi/pip/DETAILS
@@ -1,6 +1,6 @@
SPELL=pip
- VERSION=19.1.1
-
SOURCE_HASH=sha512:91cd07118d2f7a39b0ecc5f26ae18de3778ebdde90a40f5fa8cf543dfc8e006647ee2f0f6574db1e102e421962db0d725b0ce7ac75f2bb9591cf4754604c9b1a
+ VERSION=19.2.1
+
SOURCE_HASH=sha512:5d0280dca5a8215be5c0d9c5782a041538d179fc4010504a8ab597f02a41f8af9fd4d96257e75fc11629a2ae4ff57d88522ce847006177e4c4f078d6f77977d7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL=https://github.com/pypa/pip/archive/$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/pip/HISTORY b/python-pypi/pip/HISTORY
index 2015115..fab5e83 100644
--- a/python-pypi/pip/HISTORY
+++ b/python-pypi/pip/HISTORY
@@ -1,3 +1,6 @@
+2019-07-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 19.2.1
+
2019-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 19.1.1

diff --git a/python-pypi/scons/2e0de3c5.patch
b/python-pypi/scons/2e0de3c5.patch
deleted file mode 100644
index 3d1bdab..0000000
--- a/python-pypi/scons/2e0de3c5.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 2e0de3c55f22b3eaa7767b69740b898f3d2f46bf Mon Sep 17 00:00:00 2001
-From: Thomas Berg <merlin66b AT gmail.com>
-Date: Wed, 20 Sep 2017 13:24:22 +0200
-Subject: [PATCH] Support python 2 print statements in SConscripts
-
-This fixes a regression introduced in scons-3.0.0, where
-SConscripts containing python 2 print statements would cause
-syntax errors even when executing scons with python 2.7.
-
-This ensures backward compatibility, allowing users to build
-legacy code with scons-3.0.0 without having to patch it.
----
- src/CHANGES.txt | 3 ++
- src/engine/SCons/Script/SConscript.py | 2 --
- test/print_statement.py | 56
+++++++++++++++++++++++++++++++++++
- 3 files changed, 59 insertions(+), 2 deletions(-)
- create mode 100644 test/print_statement.py
-
-diff --git a/src/CHANGES.txt b/src/CHANGES.txt
-index 4b492e6a..0e742ec5 100644
---- a/src/CHANGES.txt
-+++ b/src/CHANGES.txt
-@@ -11,6 +11,9 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
-
- - Whatever John Doe did.
-
-+ From Thomas Berg:
-+ - Fixed a regression in scons-3.0.0 where "from __future__ import
print_function" was imposed
-+ on the scope where SConstruct is executed, breaking existing builds
using PY 2.7.
-
- RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
-
-diff --git a/src/engine/SCons/Script/SConscript.py
b/src/engine/SCons/Script/SConscript.py
-index 558e28f9..8fea9c4d 100644
---- a/src/engine/SCons/Script/SConscript.py
-+++ b/src/engine/SCons/Script/SConscript.py
-@@ -5,8 +5,6 @@
-
- """
-
--from __future__ import print_function
--
- #
- # __COPYRIGHT__
- #
-diff --git a/test/print_statement.py b/test/print_statement.py
-new file mode 100644
-index 00000000..22050593
---- /dev/null
-+++ b/test/print_statement.py
-@@ -0,0 +1,56 @@
-+#!/usr/bin/env python
-+#
-+# __COPYRIGHT__
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining
-+# a copy of this software and associated documentation files (the
-+# "Software"), to deal in the Software without restriction, including
-+# without limitation the rights to use, copy, modify, merge, publish,
-+# distribute, sublicense, and/or sell copies of the Software, and to
-+# permit persons to whom the Software is furnished to do so, subject to
-+# the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included
-+# in all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+
-+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-+
-+import sys
-+import TestSCons
-+
-+test = TestSCons.TestSCons()
-+
-+
-+test.write('SConstruct', """\
-+print('python 3 style statement')
-+Exit(0)
-+""")
-+
-+test.run()
-+
-+test.write('SConstruct', """\
-+print 'python 2 style statement'
-+Exit(0)
-+""")
-+
-+if sys.version_info >= (3,0):
-+ test.skip_test('Python 2 print statement test, skipping on Python 3.\n')
-+else:
-+ test.run()
-+
-+test.pass_test()
-+
-+# Local Variables:
-+# tab-width:4
-+# indent-tabs-mode:nil
-+# End:
-+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/python-pypi/scons/DETAILS b/python-pypi/scons/DETAILS
index b200dfd..fe0f162 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,7 +1,7 @@
SPELL=scons
- VERSION=3.0.0
+ VERSION=3.0.4
PATCHLEVEL=1
-
SOURCE_HASH=sha512:e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d
+
SOURCE_HASH=sha512:064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
diff --git a/python-pypi/scons/HISTORY b/python-pypi/scons/HISTORY
index e6658b1..ffff34a 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,7 @@
+2019-07-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.0.4
+ * PRE_BUILD, 2e0de3c5.patch: remove obsolete patch
+
2017-09-29 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, 2e0de3c5.patch: Fix python2-stype print
statements in scons input files. This un-breaks a number of spells.
diff --git a/python-pypi/scons/PRE_BUILD b/python-pypi/scons/PRE_BUILD
index f27a97f..f2ec29c 100755
--- a/python-pypi/scons/PRE_BUILD
+++ b/python-pypi/scons/PRE_BUILD
@@ -4,7 +4,5 @@ cd "$SOURCE_DIRECTORY" &&
# Watch out: scons-3 is supposed to be able to work with python3.
# We might want to switch, too!
sed -i '1s/python$/&2/' script/scons &&
-# This patch fixes scons input that uses python2 print syntax:
-patch -Np2 < "$SCRIPT_DIRECTORY/2e0de3c5.patch" &&
# fix man page install location
sed -i "s/\('man', 'man1'\)/'share', \1/" setup.py
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 6a08ffe..41633d0 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,5 +1,5 @@
SPELL=wireshark
- VERSION=3.0.2
+ VERSION=3.0.3
SECURITY_PATCH=60
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=https://www.wireshark.org/download/src/$SOURCE
@@ -8,7 +8,7 @@
SOURCE_URL[3]=https://2.na.dl.wireshark.org/src/all-versions/$SOURCE
SOURCE_URL[4]=https://1.eu.dl.wireshark.org/src/all-versions/$SOURCE
SOURCE_URL[5]=https://1.as.dl.wireshark.org/src/all-versions/$SOURCE
-
SOURCE_HASH=sha512:0dab01b614534c9ddea517d045598029c15f24ab54d59110e6819d43d2479afe9eebe04554d25f3b0806cf8c78ed241b0fb261c2024234297eeb25d032fbb982
+
SOURCE_HASH=sha512:78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 26c54eb..039bcb4 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2019-07-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.0.3
+
2019-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.0.2

diff --git a/video-libs/libvpx/DETAILS b/video-libs/libvpx/DETAILS
index 0610cfe..1f02649 100755
--- a/video-libs/libvpx/DETAILS
+++ b/video-libs/libvpx/DETAILS
@@ -1,6 +1,6 @@
SPELL=libvpx
- VERSION=1.8.0
-
SOURCE_HASH=sha512:77477ec7059de1d90f048c10783b4adce463a84c9c828f125686e533f5bc8c9eeab8a1747df5c928e0869ccf855a9af5608199c8c376a75d35659f719ee870ef
+ VERSION=1.8.1
+
SOURCE_HASH=sha512:615476a929e46befdd4782a39345ce55cd30176ecb2fcd8a875c31694ae2334b395dcab9c5ba58d53ceb572ed0c022d2a3748ca4bbd36092e22b01cf3c9b2e8e
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/webmproject/libvpx/archive/v$VERSION.tar.gz
diff --git a/video-libs/libvpx/HISTORY b/video-libs/libvpx/HISTORY
index 3199b12..0901557 100644
--- a/video-libs/libvpx/HISTORY
+++ b/video-libs/libvpx/HISTORY
@@ -1,3 +1,6 @@
+2018-07-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.1
+
2019-02-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.8.0




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e91740b30634254365363b562d23e7b3ae99142a), Florian Franzmann, 07/27/2019

Archive powered by MHonArc 2.6.24.

Top of Page