| 1 |
vapier 10/07/01 17:19:22 |
| 2 |
|
| 3 |
Added: util-linux-2.18-slang.patch |
| 4 |
Log: |
| 5 |
Add fix from upstream for building with slang #326373 by Mikael Magnusson. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1 sys-apps/util-linux/files/util-linux-2.18-slang.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-slang.patch?rev=1.1&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-slang.patch?rev=1.1&content-type=text/plain |
| 12 |
|
| 13 |
Index: util-linux-2.18-slang.patch |
| 14 |
=================================================================== |
| 15 |
http://bugs.gentoo.org/326373 |
| 16 |
|
| 17 |
From 541e6934e1fe6833b125c1c64f9a1108bc3d09fa Mon Sep 17 00:00:00 2001 |
| 18 |
From: Karel Zak <kzak@××××××.com> |
| 19 |
Date: Thu, 1 Jul 2010 10:56:41 +0200 |
| 20 |
Subject: [PATCH] cfdisk: fix --with-slang |
| 21 |
|
| 22 |
Signed-off-by: Karel Zak <kzak@××××××.com> |
| 23 |
--- |
| 24 |
fdisk/Makefile.am | 2 +- |
| 25 |
fdisk/cfdisk.c | 11 ++++++++++- |
| 26 |
2 files changed, 11 insertions(+), 2 deletions(-) |
| 27 |
|
| 28 |
--- a/fdisk/Makefile.in |
| 29 |
+++ b/fdisk/Makefile.in |
| 30 |
@@ -88,8 +88,7 @@ |
| 31 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@am_cfdisk_OBJECTS = cfdisk-cfdisk.$(OBJEXT) \ |
| 32 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@ $(am__objects_2) |
| 33 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@am_cfdisk_OBJECTS = cfdisk-cfdisk.$(OBJEXT) \ |
| 34 |
-@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@ $(am__objects_2) \ |
| 35 |
-@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@ cfdisk-mbsalign.$(OBJEXT) |
| 36 |
+@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@ $(am__objects_2) |
| 37 |
cfdisk_OBJECTS = $(am_cfdisk_OBJECTS) |
| 38 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_DEPENDENCIES = $(ldadd_blkid) |
| 39 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_DEPENDENCIES = $(ldadd_blkid) |
| 40 |
@@ -443,7 +444,7 @@ |
| 41 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_STATIC_SFDISK_TRUE@sfdisk_static_SOURCES = $(sfdisk_SOURCES) |
| 42 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_STATIC_SFDISK_TRUE@sfdisk_static_LDFLAGS = -all-static |
| 43 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_SOURCES = cfdisk.c $(fdisk_common) |
| 44 |
-@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c |
| 45 |
+@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_SOURCES = cfdisk.c $(fdisk_common) |
| 46 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_CFLAGS = $(cflags_blkid) |
| 47 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_CFLAGS = $(cflags_blkid) |
| 48 |
@ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_LDADD = @NCURSES_LIBS@ $(ldadd_blkid) |
| 49 |
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am |
| 50 |
index 9a9db0c..36871f3 100644 |
| 51 |
--- a/fdisk/Makefile.am |
| 52 |
+++ b/fdisk/Makefile.am |
| 53 |
@@ -54,7 +54,7 @@ endif |
| 54 |
if USE_SLANG |
| 55 |
sbin_PROGRAMS += cfdisk |
| 56 |
dist_man_MANS += cfdisk.8 |
| 57 |
-cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c |
| 58 |
+cfdisk_SOURCES = cfdisk.c $(fdisk_common) |
| 59 |
cfdisk_CFLAGS = $(cflags_blkid) |
| 60 |
cfdisk_LDADD = -lslang $(ldadd_blkid) |
| 61 |
else |
| 62 |
diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c |
| 63 |
index 30550c0..552858b 100644 |
| 64 |
--- a/fdisk/cfdisk.c |
| 65 |
+++ b/fdisk/cfdisk.c |
| 66 |
@@ -64,6 +64,13 @@ |
| 67 |
#include <errno.h> |
| 68 |
#include <getopt.h> |
| 69 |
#include <fcntl.h> |
| 70 |
+ |
| 71 |
+#ifdef HAVE_SLANG_H |
| 72 |
+#include <slang.h> |
| 73 |
+#elif defined(HAVE_SLANG_SLANG_H) |
| 74 |
+#include <slang/slang.h> |
| 75 |
+#endif |
| 76 |
+ |
| 77 |
#ifdef HAVE_SLCURSES_H |
| 78 |
#include <slcurses.h> |
| 79 |
#elif defined(HAVE_SLANG_SLCURSES_H) |
| 80 |
@@ -73,6 +80,7 @@ |
| 81 |
#elif defined(HAVE_NCURSES_NCURSES_H) |
| 82 |
#include <ncurses/ncurses.h> |
| 83 |
#endif |
| 84 |
+ |
| 85 |
#include <signal.h> |
| 86 |
#include <math.h> |
| 87 |
#include <string.h> |
| 88 |
@@ -431,7 +439,8 @@ get_string(char *str, int len, char *def) { |
| 89 |
|
| 90 |
refresh(); |
| 91 |
|
| 92 |
-#if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) |
| 93 |
+#if !defined(HAVE_SLCURSES_H) && !defined(HAVE_SLANG_SLCURSES_H) && \ |
| 94 |
+ defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) |
| 95 |
while ((key = get_wch(&c)) != ERR && |
| 96 |
c != '\r' && c != '\n' && c != KEY_ENTER) { |
| 97 |
#else |
| 98 |
-- |
| 99 |
1.7.1 |
Archives