Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9848f04a9748ba1c30937efabc6e63af1402bad1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9848f04a9748ba1c30937efabc6e63af1402bad1)
  • Date: Wed, 26 Nov 2008 15:55:08 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

FUNCTIONS | 27 ---------------------------
crypto/openssh/DEPENDS | 8 ++------
crypto/openssh/HISTORY | 3 +++
display/qingy/DEPENDS | 4 +---
display/qingy/HISTORY | 3 +++
gnu/gcj/DEPENDS | 5 +----
gnu/gcj/HISTORY | 3 +++
wm-addons/skippy-xd/DEPENDS | 15 ++++++---------
wm-addons/skippy-xd/HISTORY | 3 +++
9 files changed, 22 insertions(+), 49 deletions(-)

New commits:
commit 9848f04a9748ba1c30937efabc6e63af1402bad1
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

FUNCTIONS: removed check_if_xorg_modular* #14708

commit b5d63465fb82d482a08d5ef033f53a4d6f65f514
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

qingy: removed check_if_xorg_modular* reference #14708

commit 4000640ad2bd4d8fca1a4efd35c00d2482b795b2
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

skippy-xd: removed check_if_xorg_modular* reference #14708

commit cf2684089f97b099093093dfcc903d50f48030d7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gcj: removed check_if_xorg_modular* reference #14708

commit 7e4250772b9b1aaab63c7b63d262ea822a414371
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openssh: removed check_if_xorg_modular* reference #14708

diff --git a/FUNCTIONS b/FUNCTIONS
index fddef66..6d3ec0a 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -463,33 +463,6 @@ disable_pic() {
fi
}

-#
-## Function to check if we're using xorg-modular libs or not
-#
-
-function check_if_xorg_modular_libs()
-{
- if [[ "$(get_spell_provider ${1:-$SPELL} X11-LIBS)" == "xorg-server"
]] ||
- [[ "$(get_spell_provider ${1:-$SPELL} X11-LIBS)" == "xorg-libs"
]]
- then
- return 0
- fi
- return 1
-}
-
-#
-## Function to check if we're using xorg-modular server or not
-#
-
-function check_if_xorg_modular_server()
-{
- if [[ "$(get_spell_provider ${1:-$SPELL} X11-SERVER)" ==
"xorg-server" ]]
- then
- return 0
- fi
- return 1
-}
-
# FUnction to tag config files that cannot be tagged by the normal
install_config_file method
# do NOT call check_if_modified or mark_file_modified ANYWHERE ELSE!!!
# # THIS function will go away when it migrates down from devel sorcery
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index 6f8d43d..0b084ba 100755
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -3,6 +3,7 @@ depends gnupg &&
depends openssl &&
depends smgl-fhs &&
depends zlib &&
+depends xauth --with-xauth="${INSTALL_ROOT}/usr/bin/xauth"

optional_depends "tcp_wrappers" \
"--with-tcp-wrappers" \
@@ -22,9 +23,4 @@ optional_depends "krb5" \
optional_depends "X11-SERVER" \
"" \
"" \
- "X server auth (needed by X11Forwarding)" &&
-
-. $GRIMOIRE/FUNCTIONS &&
-if check_if_xorg_modular_server; then
- depends xauth --with-xauth="${INSTALL_ROOT}/usr/bin/xauth"
-fi
+ "X server auth (needed by X11Forwarding)"
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 270586e..286bd88 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: remove check_if_xorg_modular* reference #14708
+
2008-07-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.1p1

diff --git a/display/qingy/DEPENDS b/display/qingy/DEPENDS
index 29ef0bb..17ff326 100755
--- a/display/qingy/DEPENDS
+++ b/display/qingy/DEPENDS
@@ -17,9 +17,7 @@ optional_depends xorg-server \
'' \
'For X sessions' &&

-
-source $GRIMOIRE/FUNCTIONS &&
-if check_if_xorg_modular_server
+if is_depends_enabled $SPELL xorg-server
then
depends libxscrnsaver
fi &&
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index 979b4dc..0974833 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: remove check_if_xorg_modular* reference #14708
+
2008-08-21 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: fix for xorg-modular, add option to disable x support at
all

diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index d1211a1..a501506 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -4,10 +4,7 @@ depends gcc &&
if [[ $GCJ_AWT == y ]]; then
depends gtk+2 '--enable-java-awt=gtk' &&
depends libart_lgpl &&
- . $GRIMOIRE/FUNCTIONS &&
- if check_if_xorg_modular_libs gtk+2; then
- depends libxtst
- fi
+ depends libxtst
fi &&

if [[ $VERSION != $(installed_version gcc) ]]; then
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 78a2690..603339d 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: remove check_if_xorg_modular* reference #14708
+
2008-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: only use --host for cross compiles, --build otherwise,
fixes bug #14624
diff --git a/wm-addons/skippy-xd/DEPENDS b/wm-addons/skippy-xd/DEPENDS
index 8681526..62e7636 100755
--- a/wm-addons/skippy-xd/DEPENDS
+++ b/wm-addons/skippy-xd/DEPENDS
@@ -1,10 +1,7 @@
-depends X11-SERVER &&
depends freetype2 &&
-. $GRIMOIRE/FUNCTIONS
-if check_if_xorg_modular_server ; then
- depends libxrender &&
- depends libxdamage &&
- depends libxcomposite &&
- depends libxfixes &&
- depends libxft
-fi
+depends xorg-server &&
+depends libxrender &&
+depends libxdamage &&
+depends libxcomposite &&
+depends libxfixes &&
+depends libxft
diff --git a/wm-addons/skippy-xd/HISTORY b/wm-addons/skippy-xd/HISTORY
index 6804324..e151818 100644
--- a/wm-addons/skippy-xd/HISTORY
+++ b/wm-addons/skippy-xd/HISTORY
@@ -1,3 +1,6 @@
+2008-11-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: remove check_if_xorg_modular* reference #14708
+
2008-04-15 Arjan Bouter <abouter AT sourcemage.org>
* BUILD, DETAILS, DEPENDS, HISTORY, INSTALL:
created spell



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9848f04a9748ba1c30937efabc6e63af1402bad1), Jaka Kranjc, 11/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page