Skip to Content.
Sympa Menu

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

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 (37c966a5c73b9fda14faf30f79e174be7e98caf5)
  • Date: Thu, 4 Jun 2009 06:04:25 -0500

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

xorg-app/bdftopcf/DEPENDS |
2
xorg-app/bdftopcf/HISTORY |
4 +
xorg-lib/libxfont/CONFIGURE |
26 ----------
xorg-lib/libxfont/DEPENDS |
5 -
xorg-lib/libxfont/HISTORY |
8 +++
xorg-lib/libxfont/PRE_SUB_DEPENDS |
13 ++++-
xorg-lib/libxfont/REPAIR^4d0c876f0168ba63683ab81990cdb8ab^PRE_SUB_DEPENDS |
14 +++++
xorg-lib/libxfont/SUB_DEPENDS |
10 +++
8 files changed, 47 insertions(+), 35 deletions(-)

New commits:
commit 37c966a5c73b9fda14faf30f79e174be7e98caf5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

bdftopcf: added BUILTIN_FONTS subdepend of libxfont, resolves #14778
patch by chp (end of trials :))

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

libxfont: added BUILTIN_FONTS subdependency, resolves #14778
patch by chp

diff --git a/xorg-app/bdftopcf/DEPENDS b/xorg-app/bdftopcf/DEPENDS
index 1deaad8..f1e3646 100755
--- a/xorg-app/bdftopcf/DEPENDS
+++ b/xorg-app/bdftopcf/DEPENDS
@@ -3,4 +3,4 @@ depends pkgconfig &&
depends util-macros &&
depends fontsproto &&
depends xproto &&
-depends libxfont
+depends -sub BUILTIN_FONTS libxfont
diff --git a/xorg-app/bdftopcf/HISTORY b/xorg-app/bdftopcf/HISTORY
index 19eaed4..20561b8 100644
--- a/xorg-app/bdftopcf/HISTORY
+++ b/xorg-app/bdftopcf/HISTORY
@@ -1,3 +1,7 @@
+2009-05-26 Peng Chang (Charles) <chp516 AT gmail.com>
+ * DEPENDS: added BUILTIN_FONTS subdepend of libxfont, resolved
+ bug 14778
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-lib/libxfont/CONFIGURE b/xorg-lib/libxfont/CONFIGURE
index 3f0459e..2b025ea 100755
--- a/xorg-lib/libxfont/CONFIGURE
+++ b/xorg-lib/libxfont/CONFIGURE
@@ -1,21 +1,3 @@
-config_query_option LIBXFONT_OPTS \
- 'Enable Type1 fonts' \
- n \
- '--enable-type1' \
- '--disable-type1' &&
-
-config_query_option LIBXFONT_OPTS \
- 'Enable cid fonts' \
- y \
- '--enable-cid' \
- '--disable-cid' &&
-
-config_query_option LIBXFONT_OPTS \
- 'Enable speedo fonts' \
- y \
- '--enable-speedo' \
- '--disable-speedo' &&
-
config_query_option LIBXFONT_OPTS \
'Enable builtin fonts' \
y \
@@ -56,10 +38,4 @@ config_query_option LIBXFONT_OPTS \
'Enable TCP socket transport?' \
y \
'--enable-tcp-transport' \
- '--disable-tcp-transport' &&
-
-config_query_option LIBXFONT_OPTS \
- 'Enable IPv6 transport?' \
- y \
- '--enable-IPv6' \
- '--disable-IPv6'
+ '--disable-tcp-transport'
diff --git a/xorg-lib/libxfont/DEPENDS b/xorg-lib/libxfont/DEPENDS
index 1053f38..45244f5 100755
--- a/xorg-lib/libxfont/DEPENDS
+++ b/xorg-lib/libxfont/DEPENDS
@@ -8,11 +8,6 @@ depends fontsproto &&
depends xtrans &&
depends libfontenc &&

-optional_depends fontcacheproto \
- "--enable-fontcache" \
- "--disable-fontcache" \
- "Enable fontcache?" &&
-
optional_depends freetype2 \
"--enable-freetype" \
"--disable-freetype" \
diff --git a/xorg-lib/libxfont/HISTORY b/xorg-lib/libxfont/HISTORY
index f445fbb..db3ebbc 100644
--- a/xorg-lib/libxfont/HISTORY
+++ b/xorg-lib/libxfont/HISTORY
@@ -1,3 +1,11 @@
+2009-05-26 Peng Chang (Charles) <chp516 AT gmail.com>
+ * CONFIGURE: removed no longer recognized options
+ * DEPENDS: removed unrecognized optional_depends
+ * PRE_SUB_DEPENDS: added BUILTIN_FONTS subdependency, resolved
+ bug #14778
+ * SUB_DEPENDS: resolved bug #14778
+ * REPAIR^{md5}^PRE_SUB_DEPENDS: resolved bug #14778
+
2009-02-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.0

diff --git a/xorg-lib/libxfont/PRE_SUB_DEPENDS
b/xorg-lib/libxfont/PRE_SUB_DEPENDS
index dcfe516..90aaada 100755
--- a/xorg-lib/libxfont/PRE_SUB_DEPENDS
+++ b/xorg-lib/libxfont/PRE_SUB_DEPENDS
@@ -1,5 +1,14 @@
case $THIS_SUB_DEPENDS in
- FC) list_find "$LIBXFONT_OPTS" "--enable-fc" ;;
+ FC) list_find "$LIBXFONT_OPTS" "--enable-fc" && return 0;;
+ BUILTIN_FONTS)
+ if list_find "$LIBXFONT_OPTS" "--enable-builtins" \
+ "--enable-pcfformat" "--enable-bdfformat" \
+ "--enable-snfformat"
+ then
+ return 0;
+ fi
+ ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
-esac
+esac &&
+return 1
diff --git
a/xorg-lib/libxfont/REPAIR^4d0c876f0168ba63683ab81990cdb8ab^PRE_SUB_DEPENDS
b/xorg-lib/libxfont/REPAIR^4d0c876f0168ba63683ab81990cdb8ab^PRE_SUB_DEPENDS
new file mode 100644
index 0000000..90aaada
--- /dev/null
+++
b/xorg-lib/libxfont/REPAIR^4d0c876f0168ba63683ab81990cdb8ab^PRE_SUB_DEPENDS
@@ -0,0 +1,14 @@
+case $THIS_SUB_DEPENDS in
+ FC) list_find "$LIBXFONT_OPTS" "--enable-fc" && return 0;;
+ BUILTIN_FONTS)
+ if list_find "$LIBXFONT_OPTS" "--enable-builtins" \
+ "--enable-pcfformat" "--enable-bdfformat" \
+ "--enable-snfformat"
+ then
+ return 0;
+ fi
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac &&
+return 1
diff --git a/xorg-lib/libxfont/SUB_DEPENDS b/xorg-lib/libxfont/SUB_DEPENDS
index a36b1c8..69d7d7f 100755
--- a/xorg-lib/libxfont/SUB_DEPENDS
+++ b/xorg-lib/libxfont/SUB_DEPENDS
@@ -2,6 +2,12 @@ persistent_add LIBXFONT_OPTS_OVERRIDE

case "$THIS_SUB_DEPENDS" in
FC) list_add LIBXFONT_OPTS_OVERRIDE '--enable-fc' ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
+ BUILTIN_FONTS)
+ if list_find "$LIBXFONT_OPTS" '--disable-builtins'; then
+ list_remove LIBXFONT_OPTS '--disable-builtins'
+ fi &&
+ list_add LIBXFONT_OPTS_OVERRIDE '--enable-builtins'
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (37c966a5c73b9fda14faf30f79e174be7e98caf5), Jaka Kranjc, 06/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page