From 970221475cfcbfeb531588d81a9e2a3ecdc72bbc Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Mon, 17 Nov 2008 19:59:17 +0000 Subject: Fix patch to apply. (Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64) --- app-i18n/zhcon/ChangeLog | 6 +++++- app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch | 4 ++-- app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'app-i18n/zhcon') diff --git a/app-i18n/zhcon/ChangeLog b/app-i18n/zhcon/ChangeLog index e24754aaf7cd..94d434a520ff 100644 --- a/app-i18n/zhcon/ChangeLog +++ b/app-i18n/zhcon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/zhcon # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/ChangeLog,v 1.13 2008/10/25 11:29:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/zhcon/ChangeLog,v 1.14 2008/11/17 19:59:17 flameeyes Exp $ + + 17 Nov 2008; Diego E. Pettenò + files/zhcon-0.2.6.configure.in.patch, files/zhcon-0.2.6.sysconfdir.patch: + Fix patch to apply. 25 Oct 2008; Diego Pettenò ChangeLog: Add patches by Zhang Le for fixing bug #240024 (fix curses/gpm search, fix diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch b/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch index fef2ae02d33d..0624a934e02c 100644 --- a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch +++ b/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch @@ -1,5 +1,5 @@ ---- configure.in 2006-06-22 13:02:59.197841560 +0800 -+++ /tmp/zhcon-0.2.5/configure.in 2006-06-22 12:48:59.000000000 +0800 +--- a/configure.in 2006-06-22 13:02:59.197841560 +0800 ++++ b/configure.in 2006-06-22 12:48:59.000000000 +0800 @@ -55,7 +55,7 @@ CFLAGS="$CFLAGS -funsigned-char -O2" diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch index b9434effadc4..bc1d8713cd22 100644 --- a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch +++ b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch @@ -1,6 +1,6 @@ diff -ruN zhcon-0.2.5/src/Makefile.am /tmp/zhcon-0.2.5/src/Makefile.am ---- zhcon-0.2.5/src/Makefile.am 2006-06-22 12:35:01.531885552 +0800 -+++ /tmp/zhcon-0.2.5/src/Makefile.am 2006-06-22 12:31:44.000000000 +0800 +--- a/zhcon-0.2.5/src/Makefile.am 2006-06-22 12:35:01.531885552 +0800 ++++ b/zhcon-0.2.5/src/Makefile.am 2006-06-22 12:31:44.000000000 +0800 @@ -5,6 +5,8 @@ zhcon_LDADD = display/libdisplay.a @@ -11,8 +11,8 @@ diff -ruN zhcon-0.2.5/src/Makefile.am /tmp/zhcon-0.2.5/src/Makefile.am install-exec-local: diff -ruN zhcon-0.2.5/src/zhcon.cpp /tmp/zhcon-0.2.5/src/zhcon.cpp ---- zhcon-0.2.5/src/zhcon.cpp 2006-06-22 12:35:01.398905768 +0800 -+++ /tmp/zhcon-0.2.5/src/zhcon.cpp 2006-06-22 12:32:41.000000000 +0800 +--- a/zhcon-0.2.5/src/zhcon.cpp 2006-06-22 12:35:01.398905768 +0800 ++++ b/zhcon-0.2.5/src/zhcon.cpp 2006-06-22 12:32:41.000000000 +0800 @@ -123,7 +123,7 @@ string cfgfile = getenv("HOME"); cfgfile += "/.zhconrc"; -- cgit v1.2.3-65-gdbad