diff options
-rwxr-xr-x | gnome2-libs/glib-networking/CONFIGURE | 1 | ||||
-rwxr-xr-x | gnome2-libs/glib-networking/DEPENDS | 24 | ||||
-rwxr-xr-x | gnome2-libs/glib-networking/DETAILS | 5 | ||||
-rw-r--r-- | gnome2-libs/glib-networking/HISTORY | 5 | ||||
-rwxr-xr-x | gnome2-libs/glib-networking/PRE_SUB_DEPENDS | 1 | ||||
-rwxr-xr-x | gnome2-libs/glib-networking/SUB_DEPENDS | 4 |
6 files changed, 31 insertions, 9 deletions
diff --git a/gnome2-libs/glib-networking/CONFIGURE b/gnome2-libs/glib-networking/CONFIGURE new file mode 100755 index 0000000000..d0bac55395 --- /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 3b4bc487bb..a358fa164c 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 7967eff795..db23f9c170 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 30da19f685..612cf2b76c 100644 --- a/gnome2-libs/glib-networking/HISTORY +++ b/gnome2-libs/glib-networking/HISTORY @@ -1,3 +1,8 @@ +2019-10-27 Florian Franzmann <siflfran@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@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 028593265a..ae776280db 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 6d80b7419b..cb23dde293 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 |