diff options
author | Nick Hadaway <raker@gentoo.org> | 2002-08-16 21:56:32 +0000 |
---|---|---|
committer | Nick Hadaway <raker@gentoo.org> | 2002-08-16 21:56:32 +0000 |
commit | 062fabcb13efa30ae9368b5a73e4cd782e554a64 (patch) | |
tree | 0dda41d25335fd15d438dd96c8962c2fc08ddd7d /x11-libs | |
parent | made tk dependency optional (on X) (diff) | |
download | gentoo-2-062fabcb13efa30ae9368b5a73e4cd782e554a64.tar.gz gentoo-2-062fabcb13efa30ae9368b5a73e4cd782e554a64.tar.bz2 gentoo-2-062fabcb13efa30ae9368b5a73e4cd782e554a64.zip |
Added a patch to change the include order of tools/wml/Makefile.in to
fix compile problems.
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/openmotif/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/openmotif/files/include-order.diff | 12 | ||||
-rw-r--r-- | x11-libs/openmotif/openmotif-2.2.2.ebuild | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog index c0e6903f490a..9f131b9d0bf3 100644 --- a/x11-libs/openmotif/ChangeLog +++ b/x11-libs/openmotif/ChangeLog @@ -1,9 +1,14 @@ # ChangeLog for x11-libs/openmotif # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.3 2002/08/14 20:49:01 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.4 2002/08/16 21:56:32 raker Exp $ *openmotif-2.2.2 (14 Aug 2002) + 16 Aug 2002; Nick Hadaway <raker@gentoo.org> + openmotif-2.2.2.ebuild, files/include-order.diff : + Added a fix for tools/wml/Makefile.in to place the X include directory + as the end of includes instead of the beginning. See bug #6536. + 14 Aug 2002; Nick Hadaway <raker@gentoo.org> openmotif-2.2.2.ebuild, files/digest-openmotif-2.2.2 : BIG version bump. diff --git a/x11-libs/openmotif/files/include-order.diff b/x11-libs/openmotif/files/include-order.diff new file mode 100644 index 000000000000..f3ca0a362c83 --- /dev/null +++ b/x11-libs/openmotif/files/include-order.diff @@ -0,0 +1,12 @@ +diff -urN openMotif-2.2.2/tools/wml/Makefile.in openMotif-2.2.2-modified/tools/wml/Makefile.in +--- openMotif-2.2.2/tools/wml/Makefile.in Thu Feb 14 08:15:49 2002 ++++ openMotif-2.2.2-modified/tools/wml/Makefile.in Fri Aug 16 16:49:20 2002 +@@ -121,7 +121,7 @@ + + wmldbcreate_LDADD = ../../lib/Xm/libXm.la + +-INCLUDES = ${X_CFLAGS} -I$(srcdir)/../../lib -I$(srcdir)/../../include ++INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../include ${X_CFLAGS} + + noinst_LIBRARIES = libwml.a + libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c diff --git a/x11-libs/openmotif/openmotif-2.2.2.ebuild b/x11-libs/openmotif/openmotif-2.2.2.ebuild index 285cc1c2893f..66447b6b2915 100644 --- a/x11-libs/openmotif/openmotif-2.2.2.ebuild +++ b/x11-libs/openmotif/openmotif-2.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.2.ebuild,v 1.1 2002/08/14 20:49:01 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.2.ebuild,v 1.2 2002/08/16 21:56:32 raker Exp $ S=${WORKDIR}/openMotif-2.2.2 BUILD=${WORKDIR}/motif-build @@ -18,7 +18,7 @@ src_unpack() { unpack ${A} cd ${S} patch -p1 < ${FILESDIR}/animate-demo.diff || die "patch failed" - + patch -p1 < ${FILESDIR}/include-order.diff || die "patch failed" } src_compile() { |