Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sys-apps/util-linux/files: util-linux-2.18-slang.patch |
| Date: | Fri, 08 Oct 2010 18:02:55 |
| Message-Id: | 20101008172904.14F042003C@flycatcher.gentoo.org |
| 1 | vapier 10/10/08 17:29:04 |
| 2 | |
| 3 | Modified: util-linux-2.18-slang.patch |
| 4 | Log: |
| 5 | Remove unused Makefile.am hunk #340140 by Diego E. Pettenò. |
| 6 | |
| 7 | (Portage version: 2.2_rc86/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.2 sys-apps/util-linux/files/util-linux-2.18-slang.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-slang.patch?rev=1.2&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-slang.patch?rev=1.2&content-type=text/plain |
| 14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-slang.patch?r1=1.1&r2=1.2 |
| 15 | |
| 16 | Index: util-linux-2.18-slang.patch |
| 17 | =================================================================== |
| 18 | RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-slang.patch,v |
| 19 | retrieving revision 1.1 |
| 20 | retrieving revision 1.2 |
| 21 | diff -u -r1.1 -r1.2 |
| 22 | --- util-linux-2.18-slang.patch 1 Jul 2010 17:19:21 -0000 1.1 |
| 23 | +++ util-linux-2.18-slang.patch 8 Oct 2010 17:29:03 -0000 1.2 |
| 24 | @@ -7,7 +7,7 @@ |
| 25 | |
| 26 | Signed-off-by: Karel Zak <kzak@××××××.com> |
| 27 | --- |
| 28 | - fdisk/Makefile.am | 2 +- |
| 29 | + fdisk/Makefile.in | 2 +- |
| 30 | fdisk/cfdisk.c | 11 ++++++++++- |
| 31 | 2 files changed, 11 insertions(+), 2 deletions(-) |
| 32 | |
| 33 | @@ -32,19 +32,6 @@ |
| 34 | @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_CFLAGS = $(cflags_blkid) |
| 35 | @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@USE_SLANG_TRUE@cfdisk_CFLAGS = $(cflags_blkid) |
| 36 | @ARCH_M68K_FALSE@@ARCH_SPARC_FALSE@@HAVE_NCURSES_TRUE@@USE_SLANG_FALSE@cfdisk_LDADD = @NCURSES_LIBS@ $(ldadd_blkid) |
| 37 | -diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am |
| 38 | -index 9a9db0c..36871f3 100644 |
| 39 | ---- a/fdisk/Makefile.am |
| 40 | -+++ b/fdisk/Makefile.am |
| 41 | -@@ -54,7 +54,7 @@ endif |
| 42 | - if USE_SLANG |
| 43 | - sbin_PROGRAMS += cfdisk |
| 44 | - dist_man_MANS += cfdisk.8 |
| 45 | --cfdisk_SOURCES = cfdisk.c $(fdisk_common) $(top_srcdir)/lib/mbsalign.c |
| 46 | -+cfdisk_SOURCES = cfdisk.c $(fdisk_common) |
| 47 | - cfdisk_CFLAGS = $(cflags_blkid) |
| 48 | - cfdisk_LDADD = -lslang $(ldadd_blkid) |
| 49 | - else |
| 50 | diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c |
| 51 | index 30550c0..552858b 100644 |
| 52 | --- a/fdisk/cfdisk.c |