Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/util-linux/patches/util-linux-2.18-slang.patch

    Annotation of /trunk/util-linux/patches/util-linux-2.18-slang.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1078 - (hide annotations) (download)
    Tue Aug 17 15:39:36 2010 UTC (13 years, 10 months ago) by niro
    File size: 3412 byte(s) 
    patches for 2.18
    1 niro 1078 http://bugs.gentoo.org/326373
    2    
    3     From 541e6934e1fe6833b125c1c64f9a1108bc3d09fa Mon Sep 17 00:00:00 2001
    4     From: Karel Zak <kzak@redhat.com>
    5     Date: Thu, 1 Jul 2010 10:56:41 +0200
    6     Subject: [PATCH] cfdisk: fix --with-slang
    7    
    8     Signed-off-by: Karel Zak <kzak@redhat.com>
    9     ---
    10     fdisk/Makefile.am | 2 +-
    11     fdisk/cfdisk.c | 11 ++++++++++-
    12     2 files changed, 11 insertions(+), 2 deletions(-)
    13    
    14     --- a/fdisk/Makefile.in
    15     +++ b/fdisk/Makefile.in
    16     @@ -88,8 +88,7 @@
    17     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@am_cfdisk_OBJECTS = cfdisk-cfdisk.$(OBJEXT) \
    18     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@ $(am__objects_2)
    19     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@am_cfdisk_OBJECTS = cfdisk-cfdisk.$(OBJEXT) \
    20     -@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@ $(am__objects_2) \
    21     -@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@ cfdisk-mbsalign.$(OBJEXT)
    22     +@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@ $(am__objects_2)
    23     cfdisk_OBJECTS = $(am_cfdisk_OBJECTS)
    24     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_DEPENDENCIES = $(ldadd_blkid)
    25     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_DEPENDENCIES = $(ldadd_blkid)
    26     @@ -443,7 +444,7 @@
    27     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_STATIC_SFDISK_TRUE@sfdisk_static_SOURCES = $(sfdisk_SOURCES)
    28     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_STATIC_SFDISK_TRUE@sfdisk_static_LDFLAGS = -all-static
    29     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_SOURCES = cfdisk.c $(fdisk_common)
    30     -@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c
    31     +@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c $(fdisk_common)
    32     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_CFLAGS = $(cflags_blkid)
    33     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_CFLAGS = $(cflags_blkid)
    34     @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_LDADD = @NCURSES_LIBS@ $(ldadd_blkid)
    35     diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am
    36     index 9a9db0c..36871f3 100644
    37     --- a/fdisk/Makefile.am
    38     +++ b/fdisk/Makefile.am
    39     @@ -54,7 +54,7 @@ endif
    40     if USE_SLANG
    41     sbin_PROGRAMS += cfdisk
    42     dist_man_MANS += cfdisk.8
    43     -cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c
    44     +cfdisk_SOURCES = cfdisk.c $(fdisk_common)
    45     cfdisk_CFLAGS = $(cflags_blkid)
    46     cfdisk_LDADD = -lslang $(ldadd_blkid)
    47     else
    48     diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
    49     index 30550c0..552858b 100644
    50     --- a/fdisk/cfdisk.c
    51     +++ b/fdisk/cfdisk.c
    52     @@ -64,6 +64,13 @@
    53     #include <errno.h>
    54     #include <getopt.h>
    55     #include <fcntl.h>
    56     +
    57     +#ifdef HAVE_SLANG_H
    58     +#include <slang.h>
    59     +#elif defined(HAVE_SLANG_SLANG_H)
    60     +#include <slang/slang.h>
    61     +#endif
    62     +
    63     #ifdef HAVE_SLCURSES_H
    64     #include <slcurses.h>
    65     #elif defined(HAVE_SLANG_SLCURSES_H)
    66     @@ -73,6 +80,7 @@
    67     #elif defined(HAVE_NCURSES_NCURSES_H)
    68     #include <ncurses/ncurses.h>
    69     #endif
    70     +
    71     #include <signal.h>
    72     #include <math.h>
    73     #include <string.h>
    74     @@ -431,7 +439,8 @@ get_string(char *str, int len, char *def) {
    75    
    76     refresh();
    77    
    78     -#if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
    79     +#if !defined(HAVE_SLCURSES_H) && !defined(HAVE_SLANG_SLCURSES_H) && \
    80     + defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
    81     while ((key = get_wch(&c)) != ERR &&
    82     c != '\r' && c != '\n' && c != KEY_ENTER) {
    83     #else
    84     --
    85     1.7.1
    86