Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (7b82525288c4c884e62316e441caeadbdf43cc39)

Chronological Thread  
    < 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 (7b82525288c4c884e62316e441caeadbdf43cc39)
  • Date: Sat, 8 Sep 2018 10:17:14 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

gnome3-libs/pygobject3/BUILD | 4 ++--
gnome3-libs/pygobject3/DEPENDS | 6 ++++--
gnome3-libs/pygobject3/DETAILS | 5 +++--
gnome3-libs/pygobject3/HISTORY | 5 +++++
gnome3-libs/pygobject3/INSTALL | 1 -
graphics/imagemagick/DETAILS | 4 ++--
graphics/imagemagick/HISTORY | 3 +++
net/wpa_supplicant/BUILD | 9 +++------
net/wpa_supplicant/DEPENDS | 5 ++++-
net/wpa_supplicant/HISTORY | 4 ++++
net/wpa_supplicant/INSTALL | 2 +-
security/wireshark/DETAILS | 4 ++--
security/wireshark/HISTORY | 3 +++
utils/youtube-dl/DETAILS | 2 +-
utils/youtube-dl/HISTORY | 3 +++
15 files changed, 40 insertions(+), 20 deletions(-)

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

gnome3-libs/pygobject3: version 3.30.0

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

security/wireshark: version 2.6.3

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

graphics/imagemagick: version 7.0.8-11

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

utils/youtube-dl: version 2018.09.08

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

net/wpa_supplicant: use qt5 for the GUI instead of qt4

diff --git a/gnome3-libs/pygobject3/BUILD b/gnome3-libs/pygobject3/BUILD
index e16484f..45b2462 100755
--- a/gnome3-libs/pygobject3/BUILD
+++ b/gnome3-libs/pygobject3/BUILD
@@ -1,2 +1,2 @@
-OPTS="$OPTS --enable-thread" &&
-PYTHON=python2 default_build
+OPTS="$OPTS python=python3"
+default_build
diff --git a/gnome3-libs/pygobject3/DEPENDS b/gnome3-libs/pygobject3/DEPENDS
index 4ce1b64..c4e65ef 100755
--- a/gnome3-libs/pygobject3/DEPENDS
+++ b/gnome3-libs/pygobject3/DEPENDS
@@ -1,4 +1,6 @@
depends python &&
-depends pycairo &&
+depends meson &&
depends glib2 &&
-depends gobject-introspection
+depends gobject-introspection &&
+
+optional_depends pycairo "pycairo=true" "pycairo=false" "for pycairo
integration"
diff --git a/gnome3-libs/pygobject3/DETAILS b/gnome3-libs/pygobject3/DETAILS
index 4a081b0..9a542ca 100755
--- a/gnome3-libs/pygobject3/DETAILS
+++ b/gnome3-libs/pygobject3/DETAILS
@@ -1,10 +1,11 @@
+source $GRIMOIRE/MESON_FUNCTIONS
SPELL=pygobject3
if [[ $PYGOBJECT3_BRANCH == devel ]]; then
VERSION=3.21.0

SOURCE_HASH=sha512:68ce77da051fbc71696bbf271f3693679912e0ba352f1e107b508c0b3eb347498be52745dbf962ed424e133540f77f0f2420948c0fe65d1462fd5797b70650d8
else
- VERSION=3.28.3
-
SOURCE_HASH=sha512:0abda393dd774f9cea04f883eab53f5ebde81d2439ed18cfe08ef39a1996054ab34bf4e770f70116a4485fb4f9970464b9a950ffa4af76cfa21ecc8d4dff968d
+ VERSION=3.30.0
+
SOURCE_HASH=sha512:532d0552b792f402d5fc235299c2b5b08ee07ba4d5cbfc3b472659d7543f8ab26d2979c328de60135cd424d2dfa3fc3e3c24c1e6289c54a76a6334fd33c4f2f1
fi
SOURCE=pygobject-$VERSION.tar.xz
SOURCE_URL[0]=$GNOME_URL/sources/pygobject/${VERSION%.*}/$SOURCE
diff --git a/gnome3-libs/pygobject3/HISTORY b/gnome3-libs/pygobject3/HISTORY
index ac7f548..72df950 100644
--- a/gnome3-libs/pygobject3/HISTORY
+++ b/gnome3-libs/pygobject3/HISTORY
@@ -1,3 +1,8 @@
+2018-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 3.30.0
+ * BUILD, DEPENDS, DETAILS: use meson
+ * INSTALL: removed
+
2018-06-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: stable version 3.28.3

diff --git a/gnome3-libs/pygobject3/INSTALL b/gnome3-libs/pygobject3/INSTALL
deleted file mode 100755
index dadeed3..0000000
--- a/gnome3-libs/pygobject3/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH=/usr/lib/python2.7/site-packages default_install
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index c581147..e2bc510 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,11 +1,11 @@
SPELL=imagemagick
SPELLX=ImageMagick
- VERSION=7.0.8-10
+ VERSION=7.0.8-11
SECURITY_PATCH=6
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"

SOURCE_URL[0]=https://github.com/ImageMagick/ImageMagick/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:a52842ef78ff4c352a952b764cbe69fddabc547f3ef271af829a42e23872eca3a6be1036e12aecd69d01a0f4e4720cdcc2429fa5fc2cca2e792c15e66197b8ec
+
SOURCE_HASH=sha512:2685533409a20b9f75780e4811352bf8b636788d1784d003bcff7bf00539c8c672868bb027e7f1abd7c7d2a10a4d8190177e2e8fcf743a919a96b6cf19102ce0
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index bdbd83a..a09466b 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2018-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.0.8-11
+
2018-08-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.0.8-10

diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index 94b7e96..3111f9e 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -30,11 +30,8 @@ echo "CFLAGS += $CFLAGS" >> .config

make BINDIR=/sbin &&

-if is_depends_enabled $SPELL qt4; then
- PATH=$QT4DIR/bin:$PATH make wpa_gui-qt4
-fi &&
-
-if is_depends_enabled $SPELL qt-x11; then
- make wpa_gui
+if is_depends_enabled $SPELL qtbase; then
+ cd "$SOURCE_DIRECTORY/wpa_supplicant/wpa_gui-qt4" &&
+ qt5_build
fi

diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index ef602be..db25d6f 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -31,7 +31,10 @@ if [[ $CONFIG_CTRL_IFACE != n ]]; then
"" \
"for Readline support in CLI frontend" &&

- optional_depends qt4 "" "" "to build wpa_gui, a Qt4-based GUI frontend"
+ optional_depends qtbase "" "" "to build wpa_gui, a Qt5-based GUI frontend"
&&
+ if is_depends_enabled $SPELL qtbase; then
+ depends qtsvg
+ fi
fi &&

optional_depends dbus \
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 091673b..bae9fd9 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2018-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, BUILD, INSTALL: use qt5 for the GUI, our qt4 spell hasn't
+ compiled in ages
+
2018-09-06 Ismael Luceno <ismael AT iodev.co.uk>
* libressl.patch: updated patch for libressl 2.7

diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 7332c25..4f98d04 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -8,7 +8,7 @@ install -vm 644 doc/docbook/*.5
"$INSTALL_ROOT/usr/share/man/man5" &&
install -vm 755 -d "$INSTALL_ROOT/usr/share/doc/wpa_supplicant" &&
install -vm 644 wpa_supplicant.conf
"$INSTALL_ROOT/usr/share/doc/wpa_supplicant" &&

-if is_depends_enabled $SPELL qt4; then
+if is_depends_enabled $SPELL qtbase; then
install -vm 755 wpa_gui-qt4/wpa_gui "$INSTALL_ROOT/usr/sbin"
fi &&

diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index c8fff78..51b548e 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,5 +1,5 @@
SPELL=wireshark
- VERSION=2.6.2
+ VERSION=2.6.3
SECURITY_PATCH=59
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:e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
+
SOURCE_HASH=sha512:87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
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 2f0bab0..778fde3 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2018-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.3
+
2018-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.6.2

diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index fe9fe8c..242523b 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,5 +1,5 @@
SPELL=youtube-dl
- VERSION=2018.09.01
+ VERSION=2018.09.08
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index 754e75a..eceb11e 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2018-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2018.09.08
+
2018-09-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2018.09.02



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7b82525288c4c884e62316e441caeadbdf43cc39), Florian Franzmann, 09/08/2018

Archive powered by MHonArc 2.6.24.

Top of Page