sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (aa7549fbd3fa4cc2a3f98b5c02de0933c0b553a9)
- 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 (aa7549fbd3fa4cc2a3f98b5c02de0933c0b553a9)
- Date: Sun, 27 Oct 2019 10:09:38 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
crypto/keepassxc/DETAILS | 4 ++--
crypto/keepassxc/HISTORY | 3 +++
gnome2-libs/glib-networking/CONFIGURE | 1 +
gnome2-libs/glib-networking/DEPENDS | 24 ++++++++++++++++++------
gnome2-libs/glib-networking/DETAILS | 5 +++--
gnome2-libs/glib-networking/HISTORY | 5 +++++
gnome2-libs/glib-networking/PRE_SUB_DEPENDS | 1 +
gnome2-libs/glib-networking/SUB_DEPENDS | 4 +++-
8 files changed, 36 insertions(+), 11 deletions(-)
New commits:
commit aa7549fbd3fa4cc2a3f98b5c02de0933c0b553a9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
gnome2-libs/glib-networking: version 2.62.1
commit 916b84e6bb27bfe90af52238f0d8f994ea1b72ca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
crypto/keepassxc: version 2.5.0
diff --git a/crypto/keepassxc/DETAILS b/crypto/keepassxc/DETAILS
index d0eb19f..c4cf6dc 100755
--- a/crypto/keepassxc/DETAILS
+++ b/crypto/keepassxc/DETAILS
@@ -1,9 +1,9 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=keepassxc
- VERSION=2.4.3
+ VERSION=2.5.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://github.com/keepassxreboot/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:2525a25603fc089df224dca9edd4a5779646ffe83e9f9f7f361b3518a6348051c44f0776a92eaddaad3a09430a1531aeeaa3f6575c6ac53a2465c12ed7872dec
+
SOURCE_HASH=sha512:874cc3dd9245a37f6aca4500cad737b26d0b6dae40204bb63df0919cc29d66776be8f459cbe9f4975586775d9e28cd0e1d0402cc9d06eaaf5e4ea641a226b1eb
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://keepassxc.org/";
LICENSE[0]=GPL
diff --git a/crypto/keepassxc/HISTORY b/crypto/keepassxc/HISTORY
index a1b3aba..0aecaa5 100644
--- a/crypto/keepassxc/HISTORY
+++ b/crypto/keepassxc/HISTORY
@@ -1,3 +1,6 @@
+2019-10-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.5.0
+
2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
diff --git a/gnome2-libs/glib-networking/CONFIGURE
b/gnome2-libs/glib-networking/CONFIGURE
new file mode 100755
index 0000000..d0bac55
--- /dev/null
+++ b/gnome2-libs/glib-networking/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/MESON_CONFIGURE
diff --git a/gnome2-libs/glib-networking/DEPENDS
b/gnome2-libs/glib-networking/DEPENDS
index 3b4bc48..a358fa1 100755
--- a/gnome2-libs/glib-networking/DEPENDS
+++ b/gnome2-libs/glib-networking/DEPENDS
@@ -1,5 +1,7 @@
. "$GRIMOIRE/FUNCTIONS" &&
+depends meson &&
+
depends glib2 &&
if spell_ok glib2 && is_version_less $(installed_version glib2) 2.32; then
@@ -9,17 +11,27 @@ fi &&
depends libgcrypt &&
optional_depends gnutls \
- "--with-gnutls" \
- "--without-gnutls" \
- "for GNUTLS' SSL support" &&
+ "gnutls=enabled" \
+ "gnutls=disabled" \
+ "for GNUTLS SSL support" &&
+
+optional_depends openssl \
+ "openssl=enabled" \
+ "openssl=disabled" \
+ "for OpenSSL SSL support" &&
-optional_depends ca-certificates \
+suggest_depends ca-certificates \
+ "" \
"" \
- "--without-ca-file" \
"for SSL root certificates" &&
+
+optional_depends libproxy \
+ "libproxy=enabled" \
+ "libproxy=disabled" \
+ "for libproxy proxy configuration support" &&
+
depends libffi &&
depends libgpg-error &&
-depends libproxy &&
depends libtasn1 &&
depends pcre &&
depends zlib
diff --git a/gnome2-libs/glib-networking/DETAILS
b/gnome2-libs/glib-networking/DETAILS
index 7967eff..db23f9c 100755
--- a/gnome2-libs/glib-networking/DETAILS
+++ b/gnome2-libs/glib-networking/DETAILS
@@ -1,10 +1,11 @@
+source $GRIMOIRE/MESON_FUNCTIONS
SPELL=glib-networking
- VERSION=2.42.1
+ VERSION=2.62.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
-
SOURCE_HASH[0]=sha256:c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0
+
SOURCE_HASH[0]=sha256:3c55ae6771ad7a79fa606a834f4686ed555c2774ed6e9ece6f3c0f6a3dab7110
LICENSE[0]=LGPL
WEB_SITE=http://live.gnome.org/
ENTERED=20110213
diff --git a/gnome2-libs/glib-networking/HISTORY
b/gnome2-libs/glib-networking/HISTORY
index 30da19f..612cf2b 100644
--- a/gnome2-libs/glib-networking/HISTORY
+++ b/gnome2-libs/glib-networking/HISTORY
@@ -1,3 +1,8 @@
+2019-10-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.62.1
+ * CONFIGURE, DETAILS, DEPENDS, SUB_DEPENDS, PRE_SUB_DEPENDS: switch to
+ meson
+
2015-03-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.42.1
diff --git a/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
b/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
index 0285932..ae77628 100755
--- a/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
+++ b/gnome2-libs/glib-networking/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
TLS) is_depends_enabled $SPELL gnutls;;
+ SSL) is_depends_enabled $SPELL openssl;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/gnome2-libs/glib-networking/SUB_DEPENDS
b/gnome2-libs/glib-networking/SUB_DEPENDS
index 6d80b74..cb23dde 100755
--- a/gnome2-libs/glib-networking/SUB_DEPENDS
+++ b/gnome2-libs/glib-networking/SUB_DEPENDS
@@ -1,6 +1,8 @@
case $THIS_SUB_DEPENDS in
TLS) message "TLS support requested, forcing gnutls dependency" &&
- depends gnutls "--with-gnutls";;
+ depends gnutls "gnutls=enabled";;
+ SSL) message "SSL support requested, forcing gnutls dependency" &&
+ depends openssl "openssl=enabled";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (aa7549fbd3fa4cc2a3f98b5c02de0933c0b553a9), Florian Franzmann, 10/27/2019
Archive powered by MHonArc 2.6.24.