Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a37ac63ef1f833a8229339d160f22de711b48758)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a37ac63ef1f833a8229339d160f22de711b48758)
  • Date: Sun, 20 Mar 2016 21:11:06 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

ChangeLog | 4 ++--
FUNCTIONS | 12 ++++++------
audio-libs/soundtouch/HISTORY | 4 ++--
audio-libs/soundtouch/UP_TRIGGERS | 2 +-
graphics/openexr/HISTORY | 4 ++--
graphics/openexr/UP_TRIGGERS | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit a37ac63ef1f833a8229339d160f22de711b48758
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

FUNCTIONS: Change name of dependency checker functions again. I'm told it
is dependent and dependee, not depender. Along goes the change for the
only two spells that use it (sorry, Vlad, but I don't expect you to
cherry-pick those separately).

diff --git a/ChangeLog b/ChangeLog
index bf1e6fd..7ecf0ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,8 @@
* utils/duc: new spell, a collection of tools for indexing,
inspecting and
visualizing disk usage

-2016-03-19 Thomas Orgis <sobukus AT sourcemage.org>
- * FUNCTIONS: fix function names (dependee -> depender)
+2016-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: fix function names (dependee -> dependent)

2016-03-18 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: remove qt5_build hack, it breaks qt-creator
diff --git a/FUNCTIONS b/FUNCTIONS
index 22db9b0..674fd13 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -841,7 +841,7 @@ function get_spell_provider_file(){
## an incompatible update is scheduled.
## @params $1 - spell at hand
#---
-function check_dependers()
+function check_dependents()
{
local spell=$1; shift
message "${MESSAGE_COLOR}This is a possibly incompatible update of
$spell." &&
@@ -862,10 +862,10 @@ function check_dependers()
## @params $3 - command to filter versions with
## @params $4 - and following: arguments to the filter command
##
-## Example: check_dependers_on_update $SPELL $VERSION cut -d . -f 1,2
+## Example: check_dependents_on_update $SPELL $VERSION cut -d . -f 1,2
## This will compare only x.y out of version x.y.z-betaY.
#---
-function check_dependers_on_update()
+function check_dependents_on_update()
{
local spell=$1; shift;
local version=$1; shift;
@@ -877,7 +877,7 @@ function check_dependers_on_update()
new_version=$(echo "$new_version" | "$@")
fi &&
if [[ "$new_version" != "$old_version" ]]; then
- check_dependers "$spell"
+ check_dependents "$spell"
fi
fi
}
@@ -891,7 +891,7 @@ function check_dependers_on_update()
## @params $2 - new version to be installed
## @params $3 - version of last ABI breakage
#---
-function check_dependers_versionjump()
+function check_dependents_versionjump()
{
local spell=$1; shift;
local version=$1; shift;
@@ -902,7 +902,7 @@ function check_dependers_versionjump()
# Now, if the versions differ, check if the breaking version is crossed.
for breaker in "$@"; do
if is_version_between "$old_version" "$breaker" "$version"; then
- check_dependers "$spell"
+ check_dependents "$spell"
return
fi
done
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index 59a9167..404c6a7 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,5 +1,5 @@
-2016-03-19 Thomas Orgis <sobukus AT sourcemage.org>
- * UP_TRIGGERS: fix function name (dependee -> depender)
+2016-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: fix function name (dependee -> dependent)

2016-01-17 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 1.9.2
diff --git a/audio-libs/soundtouch/UP_TRIGGERS
b/audio-libs/soundtouch/UP_TRIGGERS
index 776ac85..c13f2be 100755
--- a/audio-libs/soundtouch/UP_TRIGGERS
+++ b/audio-libs/soundtouch/UP_TRIGGERS
@@ -1,4 +1,4 @@
. "$GRIMOIRE/FUNCTIONS" &&
# See
http://www.surina.net/soundtouch/soundtouch-abi-tracker/timeline/soundtouch/index.html,
# soversion change with version 1.9.2 .
-check_dependers_versionjump $SPELL $VERSION 1.9.2
+check_dependents_versionjump $SPELL $VERSION 1.9.2
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index 4db7033..037c2cc 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,5 +1,5 @@
-2016-03-19 Thomas Orgis <sobukus AT sourcemage.org>
- * UP_TRIGGERS: fix function name (dependee -> depender)
+2016-03-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: fix function name (dependee -> dependent)

2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* UP_TRIGGERS: binary incompatible update, check dependees
diff --git a/graphics/openexr/UP_TRIGGERS b/graphics/openexr/UP_TRIGGERS
index 9907c10..630d387 100755
--- a/graphics/openexr/UP_TRIGGERS
+++ b/graphics/openexr/UP_TRIGGERS
@@ -1,4 +1,4 @@
. "$GRIMOIRE/FUNCTIONS" &&
# 2.1.x -> 2.2.0 changes ABI
# Be prepared for that on any non-bugfix change.
-check_dependers_on_update $SPELL $VERSION cut -d . -f 1,2
+check_dependents_on_update $SPELL $VERSION cut -d . -f 1,2



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (a37ac63ef1f833a8229339d160f22de711b48758), Thomas Orgis, 03/20/2016

Archive powered by MHonArc 2.6.24.

Top of Page