Skip to Content.
Sympa Menu

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

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 (841f62b1cfabfa41de7ac987402e115c91e205d3)
  • Date: Sat, 19 Mar 2016 17:32:37 +0000

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

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

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

FUNCTIONS, soundtouch, openexr: change names of depender checking
functions as long as only two spells use them, in one go

diff --git a/ChangeLog b/ChangeLog
index 02a104d..d914c42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-03-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: fix function names (dependee -> depender)
+
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 97c8898..22db9b0 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_dependees()
+function check_dependers()
{
local spell=$1; shift
message "${MESSAGE_COLOR}This is a possibly incompatible update of
$spell." &&
@@ -862,10 +862,10 @@ function check_dependees()
## @params $3 - command to filter versions with
## @params $4 - and following: arguments to the filter command
##
-## Example: check_dependees_on_update $SPELL $VERSION cut -d . -f 1,2
+## Example: check_dependers_on_update $SPELL $VERSION cut -d . -f 1,2
## This will compare only x.y out of version x.y.z-betaY.
#---
-function check_dependees_on_update()
+function check_dependers_on_update()
{
local spell=$1; shift;
local version=$1; shift;
@@ -877,7 +877,7 @@ function check_dependees_on_update()
new_version=$(echo "$new_version" | "$@")
fi &&
if [[ "$new_version" != "$old_version" ]]; then
- check_dependees "$spell"
+ check_dependers "$spell"
fi
fi
}
@@ -886,12 +886,12 @@ function check_dependees_on_update()
## Trigger check_self on a certain version jump (known ABI breakage).
## You know that a spell changed ABI most recently in version x, so you
## provide this version and the function checks if updating the spell
-## crosses version x and hence dependees shall be triggered.
+## crosses version x and hence dependers shall be triggered.
## @params $1 - spell at hand
## @params $2 - new version to be installed
## @params $3 - version of last ABI breakage
#---
-function check_dependees_versionjump()
+function check_dependers_versionjump()
{
local spell=$1; shift;
local version=$1; shift;
@@ -902,7 +902,7 @@ function check_dependees_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_dependees "$spell"
+ check_dependers "$spell"
return
fi
done
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index 68a6513..59a9167 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,3 +1,6 @@
+2016-03-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: fix function name (dependee -> depender)
+
2016-01-17 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 1.9.2
* PRE_BUILD: pkgdocdir definition is already present
diff --git a/audio-libs/soundtouch/UP_TRIGGERS
b/audio-libs/soundtouch/UP_TRIGGERS
index 8588508..776ac85 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_dependees_versionjump $SPELL $VERSION 1.9.2
+check_dependers_versionjump $SPELL $VERSION 1.9.2
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index 84129b5..4db7033 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,6 @@
+2016-03-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: fix function name (dependee -> depender)
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* UP_TRIGGERS: binary incompatible update, check dependees
* CONFLICTS: 2.2 build fails if 2.1 installed, so add this
diff --git a/graphics/openexr/UP_TRIGGERS b/graphics/openexr/UP_TRIGGERS
index a977652..9907c10 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_dependees_on_update $SPELL $VERSION cut -d . -f 1,2
+check_dependers_on_update $SPELL $VERSION cut -d . -f 1,2



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

Archive powered by MHonArc 2.6.24.

Top of Page