Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (6e93e061b049b322e68a8d102eaa93ee8fbf9917)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (6e93e061b049b322e68a8d102eaa93ee8fbf9917)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (6e93e061b049b322e68a8d102eaa93ee8fbf9917)
  • Date: Sat, 4 Apr 2020 18:32:48 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 7 +++++--
FUNCTIONS | 36 ++++++++++++++++++++++++------------
ftp/rtorrent/DEPENDS | 5 +++--
ftp/rtorrent/HISTORY | 3 +++
x11-toolkits/gtk+3/DEPENDS | 11 +++++------
x11-toolkits/gtk+3/DETAILS | 8 ++++----
x11-toolkits/gtk+3/HISTORY | 6 ++++++
7 files changed, 50 insertions(+), 26 deletions(-)

New commits:
commit 6e93e061b049b322e68a8d102eaa93ee8fbf9917
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rtorrent: Replace simple_version_check_force_depends

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

gtk+3: Replace simple_version_check_force_depends

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

FUNCTIONS: Add vdepends for version checking

It replaces simple_version_check_force_depends with a more powerful
mechanic that combines the call to depends with several checks.

It's designed to take all dependencies at once.

Usage example:
vdepends << !
gdk-pixbuf2 >= 2.30
atk >= 2.15
pango >= 1.41
!

Supports following operators:
* '>' (Greater than)
* '>=' (Greater than or equal to)
* '<' (Less than)
* '<=' (Less than or equal to)
* '=' (Equal to)
* '!=' (Not equal to)

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

gtk+3 3.24.17

diff --git a/ChangeLog b/ChangeLog
index 6d46b1d..1fc79d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
+2020-04-04 Ismael Luceno <ismael AT sourcemage.org>
+ * FUNCTIONS: Replaced simple_version_check_force_depends with vdepends
+
2020-03-16 Treeve Jelbert <treeve AT sourcemage.org>
- * FUNCTIONS FUNCTIONS: install qt5* to /usr
-
+ * FUNCTIONS: install qt5* to /usr
+
2020-03-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* graphics-libs/libspiro: new spell, a library for drawing beautiful
curves
diff --git a/FUNCTIONS b/FUNCTIONS
index 5b98f73..4eba101 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -934,19 +934,31 @@ function check_tmp_noexec() {
}

#---
-## Simple version check with force depends
-## @params $1 - the spell to check the version of
-## @params $2 - the simple version to check against
-## (if proper is 2.1.0 then this is 210)
-## @params $3 - how many digits to compare against from left to right
-## defaults to 99 digits
+## Versioned dependency list from stdin.
+## Takes one dependency per line. Format:
+## <dependency> <comparison operator> <version> <flags>
#---
-function simple_version_check_force_depends(){
-if spell_ok $1 &&
- [[ $(installed_version $1|sed -e 's:^0\.::' -e 's:\.::g' | cut
-c-${3:=99}) -lt $2 ]]
- then
- force_depends $1
-fi
+vdepends(){
+ while read dep op depver flags; do
+ case "$op" in
+ '>'|'>='|'<'|'<='|'='|'!=') ;;
+ *)
+ message "${PROBLEM_COLOR}Unsupported operator \"$op\".$DEFAULT_COLOR"
+ return 1
+ ;;
+ esac
+ depends "$dep" "$flags" || return
+ spell_ok "$dep" || continue
+ local iver="$(installed_version "$dep")"
+ case "$op" in
+ '>') ! is_version_less "$iver" "$depver" && [ "x$iver" != "x$depver"
] ;;
+ '>=') ! is_version_less "$iver" "$depver" ;;
+ '<') is_version_less "$iver" "$depver" ;;
+ '<=') is_version_less "$iver" "$depver" || [ "x$iver" = "x$depver" ] ;;
+ '=') [ "x$iver" = "x$depver" ] ;;
+ '!=') [ "x$iver" != "x$depver" ] ;;
+ esac || force_depends "$dep"
+ done
}

#---
diff --git a/ftp/rtorrent/DEPENDS b/ftp/rtorrent/DEPENDS
index ecaa1a2..888fe44 100755
--- a/ftp/rtorrent/DEPENDS
+++ b/ftp/rtorrent/DEPENDS
@@ -1,7 +1,8 @@
. $GRIMOIRE/FUNCTIONS

-depends libtorrent &&
-simple_version_check_force_depends libtorrent 129 3 &&
+vdepends << ! &&
+ libtorrent >= 0.12.9
+!
depends curl &&
depends ncurses &&

diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index 0d4e9b6..d3b95a7 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,3 +1,6 @@
+2020-04-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: replaced simple_version_check_force_depends with vdepends
+
2020-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.9.8

diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index 0b465e9..9575270 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -20,12 +20,11 @@ else
"to enable introspection support"
fi

-depends gdk-pixbuf2 &&
-simple_version_check_force_depends gdk-pixbuf2 226 3 &&
-depends atk &&
-simple_version_check_force_depends atk 253 3 &&
-depends pango &&
-simple_version_check_force_depends pango 130 3 &&
+vdepends << ! &&
+ gdk-pixbuf2 >= 2.30
+ atk >= 2.15
+ pango >= 1.41
+!

depends at-spi2-atk &&
depends libsm &&
diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
index bd4c1f8..6dcc6bb 100755
--- a/x11-toolkits/gtk+3/DETAILS
+++ b/x11-toolkits/gtk+3/DETAILS
@@ -1,11 +1,11 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=gtk+3
if [[ $GTK_VER == devel ]];then
- VERSION=3.24.16
-
SOURCE_HASH=sha256:0d5e1e1494101b8c0c63c0526180780559eee469f021ca0d714018b20fa3d8e8:UPSTREAM_HASH
+ VERSION=3.24.17
+
SOURCE_HASH=sha512:42a0f8c3d64f9354f3954a8ecd8955abcf23cac4b9f433daef153b77c2e3abfbdd16231432bf6907d86c57e33d0f22c771685cb83b299a0883dfd3245372df1e
else
- VERSION=3.24.16
-
SOURCE_HASH=sha256:0d5e1e1494101b8c0c63c0526180780559eee469f021ca0d714018b20fa3d8e8:UPSTREAM_HASH
+ VERSION=3.24.17
+
SOURCE_HASH=sha512:42a0f8c3d64f9354f3954a8ecd8955abcf23cac4b9f433daef153b77c2e3abfbdd16231432bf6907d86c57e33d0f22c771685cb83b299a0883dfd3245372df1e
fi
SOURCE=gtk+-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index b90f77a..4cb2bb1 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,9 @@
+2020-04-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: replaced simple_version_check_force_depends with vdepends
+
+2020-04-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.24.17
+
2020-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.24.16



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (6e93e061b049b322e68a8d102eaa93ee8fbf9917), Ismael Luceno, 04/04/2020

Archive powered by MHonArc 2.6.24.

Top of Page