[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (1b9a1368d724d7de22c84caaae9ec1eef6ec4fdf)

Remko van der Vossen scm at sourcemage.org
Thu Oct 16 17:52:17 EDT 2008


GIT changes to master grimoire by Remko van der Vossen <wich at stack.nl>:

 http/dillo/CONFIGURE |   10 +++-------
 http/dillo/DEPENDS   |    9 ++++++++-
 http/dillo/HISTORY   |    3 +++
 3 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 1b9a1368d724d7de22c84caaae9ec1eef6ec4fdf
Author: Remko van der Vossen <wich at stack.nl>
Commit: Remko van der Vossen <wich at stack.nl>

    dillo: optional_depends libxft instead of query

diff --git a/http/dillo/CONFIGURE b/http/dillo/CONFIGURE
index 5f1a4ca..1d1fb6a 100755
--- a/http/dillo/CONFIGURE
+++ b/http/dillo/CONFIGURE
@@ -1,3 +1,4 @@
+list_remove DILLO_OPTS "--enable-anti-alias" "--disable-anti-alias" &&
 if [[ $DILLO_TABS ]] ||
    [[ $DILLO_AA ]] ||
    [[ $DILLO_IPV6 ]] ||
@@ -7,7 +8,7 @@ if [[ $DILLO_TABS ]] ||
    [[ $DILLO_NLS ]]
 then
    #Save old vars
-   DILLO_OPTS="$DILLO_TABS $DILLO_AA $DILLO_IPV6 $DILLO_RTFL       \
+   DILLO_OPTS="$DILLO_TABS $DILLO_IPV6 $DILLO_RTFL \
                $DILLO_COOKIES $DILLO_METAREF $DILLO_NLS"
    #remove old vars
    persistent_remove DILLO_TABS DILLO_AA DILLO_IPV6 DILLO_RTFL     \
@@ -24,12 +25,7 @@ then
                       "Tab support"                                \
                       y                                            \
                       "--enable-tabs"                              \
-                      "--disable-tabs"                             &&
-  config_query_option DILLO_OPTS                                   \
-                      "Anti-aliasing with xft"                     \
-                      y                                            \
-                      "--enable-anti-alias"                        \
-                      "--disable-anti-alias"                       
+                      "--disable-tabs"
 fi                                                                 &&
 config_query_option DILLO_OPTS                                     \
                     "IPV6 support"                                 \
diff --git a/http/dillo/DEPENDS b/http/dillo/DEPENDS
index 383ddf6..e5288bd 100755
--- a/http/dillo/DEPENDS
+++ b/http/dillo/DEPENDS
@@ -29,4 +29,11 @@ optional_depends  "jpeg"                    \
 optional_depends  "libpng"                  \
                   "--enable-png"            \
                   "--disable-png"           \
-                  "for png image support"
+                  "for png image support"   &&
+
+if [[ $I18NPATCH = y ]]; then
+  optional_depends  "libxft" \
+                    "--enable-anti-alias" \
+                    "--disable-anti-alias" \
+                    "for font anti-aliasing"
+fi
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index 1b5435b..8dfb543 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,6 @@
+2008-10-16 Remko van der Vossen <wich at sourcemage.org>
+	* CONFIGURE, DEPENDS: optional depends libxft instead of query
+
 2008-08-26 Arjan Bouter <abouter at sourcemage.org>
 	* CONFIGURE,PRE_BUILD: added experimental https support
 	* CONFLICTS: added



More information about the SM-Commit mailing list