summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-09-02 11:20:06 -0700
committerGeorge Sherwood2010-09-10 14:57:45 -0500
commitab533e3d9e9165ec59eeefc762644dedc05e9548 (patch)
treeceaa534ac115ca20af651eaf0c60ffb23ea041f5
parent8fa867bb73514698b966b513972a66faa5ca6703 (diff)
ncurses: Allow forcing UTF8 fonts (Bug #15760)
(cherry picked from commit 706f24f397eea4071760d9a63168c4dd4fab42f3)
-rw-r--r--libs/ncurses/HISTORY3
-rwxr-xr-xlibs/ncurses/PRE_SUB_DEPENDS4
-rwxr-xr-xlibs/ncurses/REPAIR^none^PRE_SUB_DEPENDS4
-rwxr-xr-xlibs/ncurses/SUB_DEPENDS7
4 files changed, 18 insertions, 0 deletions
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 1d5ccf4398..cdbe2cc075 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,6 @@
+2010-09-08 Eric Sandall <sandalle@sourcemage.org>
+ * *SUB_DEPENDS: Allow forcing UTF8 fonts (Bug #15760)
+
2009-01-14 George Sherwood <gsherwood@sourcemage.org>
* CONFIGURE: Change default for UTF-8 to yes
diff --git a/libs/ncurses/PRE_SUB_DEPENDS b/libs/ncurses/PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..382d57f29a
--- /dev/null
+++ b/libs/ncurses/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ UTF8) [[ $UTF8 == y ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/libs/ncurses/REPAIR^none^PRE_SUB_DEPENDS b/libs/ncurses/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..382d57f29a
--- /dev/null
+++ b/libs/ncurses/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ UTF8) [[ $UTF8 == y ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/libs/ncurses/SUB_DEPENDS b/libs/ncurses/SUB_DEPENDS
new file mode 100755
index 0000000000..57b993f7ad
--- /dev/null
+++ b/libs/ncurses/SUB_DEPENDS
@@ -0,0 +1,7 @@
+case $THIS_SUB_DEPENDS in
+ UTF8) if [[ $UL_VERSION != aes ]]; then
+ message "Requested UTF8 fonts of $SPELL, forcing option UTF8=y" &&
+ UTF8=y
+ fi ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac