Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (07ab2f0da1ec6ac972b591e9ff307710261cd940)
  • Date: Tue, 7 Nov 2006 09:04:44 -0600

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

ChangeLog | 3 +++
http/firefox/DEPENDS | 3 ++-
http/firefox/HISTORY | 3 +++
libcompat | 19 +++++++++++++++----
4 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 07ab2f0da1ec6ac972b591e9ff307710261cd940
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

firefox: change suggest_depends to sub_depends_2 for #13244

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

added a no-op suggest_depends fallback for #13244

diff --git a/ChangeLog b/ChangeLog
index 0ffe597..5a42daa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-11-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcompat: added another suggest_depends fallback for #13244
+
2006-11-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* devel/bcpp: New spell, a C/C++ indenter

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 6b860a5..429983f 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -10,7 +10,8 @@ depends zip &
depends zlib '--with-system-zlib' &&
depends nss &&

-suggest_depends firefox-smglwiki '' '' 'to enable searching the SMGL Wiki
from the Search Bar' &&
+suggest_depends_2 firefox-smglwiki '' '' \
+ 'to enable searching the SMGL Wiki from the Search Bar' &&

if [ "$FIREFOX_GTK" == "2.x" ]; then
depends gtk+2 \
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index e1c8ffa..b45dc3d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2006-11-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: change suggest_depends to sub_depends_2 for #13244
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163

diff --git a/libcompat b/libcompat
index 515697f..f900c37 100755
--- a/libcompat
+++ b/libcompat
@@ -32,10 +32,21 @@ function show_up_depends() {
}

# fall back to optional_depends if suggest_depends isn't implemented
-declare -f suggest_depends &> /dev/null ||
-function suggest_depends() {
- optional_depends "$@"
-}
+# OR fall back to true - this is needed to avoid some circular dependencies
+# see #13244 for an example
+if declare -f suggest_depends &> /dev/null; then
+ function suggest_depends_2() {
+ suggest_depends "$@"
+ }
+else
+ function suggest_depends() {
+ optional_depends "$@"
+ }
+
+ function suggest_depends_2() {
+ true
+ }
+fi

# fall back to depends if runtime_depends isn't implemented
declare -f runtime_depends &> /dev/null ||



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (07ab2f0da1ec6ac972b591e9ff307710261cd940), Jaka Kranjc, 11/07/2006

Archive powered by MHonArc 2.6.24.

Top of Page