Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (e28d02152afec5668da4a369cd0d787140d6a803)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (e28d02152afec5668da4a369cd0d787140d6a803)
  • Date: Sun, 18 Nov 2012 02:20:56 -0600

GIT changes to master z-rejected grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 7 +++++++
z-kernels/nvidia_driver/DEPENDS | 8 +++++++-
z-kernels/nvidia_driver/HISTORY | 3 +++
4 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 65961ceda5a7a598bf84ecaad8e125fce7603658
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nvidia_driver: corrected dependency for different pango versions (e.g.
stable/test)

commit ea53b7d664a8c363d288993dd5726506d4d9a34b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

backported is_version_less() from test grimoire

diff --git a/ChangeLog b/ChangeLog
index 7bce8d8..685db74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * FUNCTIONS: backported is_version_less() from test grimoire
+
2012-11-05 Vlad Glagolev <stealth AT sourcemage.org>
* z-net/iwlwifi-2030-ucode: new spell, firmware for the Intel Centrino
Wireless-N 2230 Wi-Fi Adapters
diff --git a/FUNCTIONS b/FUNCTIONS
index d34d2ad..2caf622 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -634,4 +634,11 @@ function get_kernel_config()
fi
}

+#---
+## Compare if one version is less than another (uses sort from coreutils)
+#---
+function is_version_less() {
+ [ ! $(echo -e "$1\n$2" | sort --version-sort | head -1) = "$2" ]
+}
+
. $GRIMOIRE/glselect.function
diff --git a/z-kernels/nvidia_driver/DEPENDS b/z-kernels/nvidia_driver/DEPENDS
index 238f5c6..14e0ca4 100755
--- a/z-kernels/nvidia_driver/DEPENDS
+++ b/z-kernels/nvidia_driver/DEPENDS
@@ -1,5 +1,11 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends xorg-server &&
depends gtk+2 &&
depends libxvmc &&
depends which &&
-depends pangox-compat
+
+# PangoX was removed between 1.30.1 and 1.31.0
+if spell_ok pango && is_version_less 1.30.1 $(installed_version pango); then
+ depends pangox-compat
+fi
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index f6764cd..23716b3 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,6 @@
+2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: depend on pangox-compat only when pango >1.30.1 is
installed
+
2012-11-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 304.64




  • [SM-Commit] GIT changes to master z-rejected grimoire by Vlad Glagolev (e28d02152afec5668da4a369cd0d787140d6a803), Vlad Glagolev, 11/18/2012

Archive powered by MHonArc 2.6.24.

Top of Page