Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to stable-0.47 grimoire by George Sherwood (feb5ab1dcae7623763a126d5f211fad02c12264e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <ladislav.hagara AT unob.cz>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to stable-0.47 grimoire by George Sherwood (feb5ab1dcae7623763a126d5f211fad02c12264e)
  • Date: Sat, 11 Sep 2010 23:56:12 +0200


> GIT changes to stable-0.47 grimoire by George Sherwood
> <gsherwood AT sourcemage.org>:
>
> libs/ncurses/HISTORY | 3 +++
> libs/ncurses/PRE_SUB_DEPENDS | 4 ++++
> libs/ncurses/REPAIR^none^PRE_SUB_DEPENDS | 4 ++++
> libs/ncurses/SUB_DEPENDS | 7 +++++++
> utils/util-linux/DEPENDS | 13 +++++++++++--
> utils/util-linux/HISTORY | 4 ++++
> 6 files changed, 33 insertions(+), 2 deletions(-)
>
> New commits:
> commit feb5ab1dcae7623763a126d5f211fad02c12264e
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: George Sherwood <gsherwood AT sourcemage.org>
>
> ncurses: Allow forcing UTF8 fonts (Bug #15760)
> (cherry picked from commit 706f24f397eea4071760d9a63168c4dd4fab42f3)
>
> commit e50fa7d1af0a3d195fc4c7d0ce82bd327e9fb3a9
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: George Sherwood <gsherwood AT sourcemage.org>
>
> util-linux: May use ncurses (for cfdisk), but requires UTF8 support if
> so
> Fixes Bug #15760
> (cherry picked from commit 3e6471652f742cb481cadcb1473c36845509d3b6)
>
> diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
> index 1d5ccf4..cdbe2cc 100644
> --- a/libs/ncurses/HISTORY
> +++ b/libs/ncurses/HISTORY
> @@ -1,3 +1,6 @@
> +2010-09-08 Eric Sandall <sandalle AT sourcemage.org>
> + * *SUB_DEPENDS: Allow forcing UTF8 fonts (Bug #15760)
> +
> 2009-01-14 George Sherwood <gsherwood AT 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 0000000..382d57f
> --- /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 0000000..382d57f
> --- /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 0000000..57b993f
> --- /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



In ncurses's SUB_DEPENDS you use UL_VERSION, it is from utils-linux.
IMHO, this is useless because both util-linux contains cfdisk.

--
Ladislav Hagara




Archive powered by MHonArc 2.6.24.

Top of Page