diff options
author | Christian Heim <phreak@gentoo.org> | 2007-02-20 16:21:05 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2007-02-20 16:21:05 +0000 |
commit | 0768a9c49449f8c58d0ddd0116357909bc53f9a6 (patch) | |
tree | ac5f02bd47974cbd5d0b413ced2f06fab4ed6476 | |
parent | force lame gd downgrade only in DEPEND, not RDEPEND (diff) | |
download | gentoo-2-0768a9c49449f8c58d0ddd0116357909bc53f9a6.tar.gz gentoo-2-0768a9c49449f8c58d0ddd0116357909bc53f9a6.tar.bz2 gentoo-2-0768a9c49449f8c58d0ddd0116357909bc53f9a6.zip |
I used the wrong order to create the patch, the as-needed one is applied before the Makefile.am one, so changes stuff in Makefile.am before the Makefile patch is applied and breaks the latter one.
(Portage version: 2.1.2-r9)
-rw-r--r-- | x11-libs/xforms/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-libs/xforms/ChangeLog b/x11-libs/xforms/ChangeLog index d8d8a5f2a862..e36c785403ed 100644 --- a/x11-libs/xforms/ChangeLog +++ b/x11-libs/xforms/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/xforms # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/ChangeLog,v 1.38 2007/02/18 16:29:06 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/ChangeLog,v 1.39 2007/02/20 16:21:05 phreak Exp $ + + 20 Feb 2007; Christian Heim <phreak@gentoo.org> + files/xforms-1.0.90-Makefile.am.patch: + I used the wrong order to create the patch, the as-needed one is applied + before the Makefile.am one, so changes stuff in Makefile.am before the + Makefile patch is applied and breaks the latter one. 18 Feb 2007; Fabian Groffen <grobian@gentoo.org> xforms-1.0.90-r1.ebuild: Dropped ppc-macos keyword, see you in prefix diff --git a/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch b/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch index 06de35ac6642..629c0c408526 100644 --- a/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch +++ b/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch @@ -2,7 +2,7 @@ Index: xforms-1.0.90/fdesign/Makefile.am =================================================================== --- xforms-1.0.90.orig/fdesign/Makefile.am +++ xforms-1.0.90/fdesign/Makefile.am -@@ -54,7 +54,3 @@ fdesign_SOURCES = \ +@@ -54,7 +54,3 @@ sp_twheel.c \ sp_xyplot.c \ xpm.h @@ -14,10 +14,10 @@ Index: xforms-1.0.90/lib/Makefile.am =================================================================== --- xforms-1.0.90.orig/lib/Makefile.am +++ xforms-1.0.90/lib/Makefile.am -@@ -118,6 +118,3 @@ libforms_la_SOURCES = \ +@@ -119,6 +119,3 @@ xsupport.c \ xtext.c \ xyplot.c - -# dirent_vms.h \ --# vms_readdir.c \
\ No newline at end of file +-# vms_readdir.c \ |