diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-05-01 15:32:55 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-05-01 15:32:55 +0000 |
| commit | 1fa263ce8fcbab1bfa39d3d73dd2f7173c3623ba (patch) | |
| tree | 586e4dd9eda9a376f3525535febb21977102379a /x11-libs/motif | |
| parent | x11-themes/pidgin-smileys removal due to licensing issue wrt #452420 (diff) | |
| download | gentoo-2-1fa263ce8fcbab1bfa39d3d73dd2f7173c3623ba.tar.gz gentoo-2-1fa263ce8fcbab1bfa39d3d73dd2f7173c3623ba.tar.bz2 gentoo-2-1fa263ce8fcbab1bfa39d3d73dd2f7173c3623ba.zip | |
Fix build failure with automake 1.13, bug 467230.
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'x11-libs/motif')
| -rw-r--r-- | x11-libs/motif/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/motif/files/motif-2.3.4-automake-1.13.patch | 18 | ||||
| -rw-r--r-- | x11-libs/motif/motif-2.2.3-r12.ebuild | 5 | ||||
| -rw-r--r-- | x11-libs/motif/motif-2.3.4-r1.ebuild | 4 |
4 files changed, 27 insertions, 6 deletions
diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog index d59cbc8d7b66..3bb900707286 100644 --- a/x11-libs/motif/ChangeLog +++ b/x11-libs/motif/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/motif # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.27 2013/05/01 11:15:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.28 2013/05/01 15:32:55 ulm Exp $ + + 01 May 2013; Ulrich Müller <ulm@gentoo.org> motif-2.2.3-r12.ebuild, + motif-2.3.4-r1.ebuild, +files/motif-2.3.4-automake-1.13.patch: + Fix build failure with automake 1.13, bug 467230. 01 May 2013; Agostino Sarubbo <ago@gentoo.org> motif-2.3.4-r1.ebuild: Stable for sh, wrt bug #465788 diff --git a/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch b/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch new file mode 100644 index 000000000000..3375f6e951e1 --- /dev/null +++ b/x11-libs/motif/files/motif-2.3.4-automake-1.13.patch @@ -0,0 +1,18 @@ +http://bugs.motifzone.net/show_bug.cgi?id=1595 + +--- motif-2.3.4-orig/configure.ac ++++ motif-2.3.4/configure.ac +@@ -31,12 +31,11 @@ + dnl + dnl AC_DISABLE_STATIC + +-AM_CONFIG_HEADER(include/config.h lib/Xm/Xm.h) ++AC_CONFIG_HEADERS(include/config.h lib/Xm/Xm.h) + + dnl Checks for programs. + AC_PROG_CC + AC_PROG_CPP +-AM_PROG_CC_STDC + AM_PROG_LIBTOOL + + AC_EXEEXT diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild index 90c2e30133da..fef80402a63e 100644 --- a/x11-libs/motif/motif-2.2.3-r12.ebuild +++ b/x11-libs/motif/motif-2.2.3-r12.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v 1.4 2013/05/01 10:37:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v 1.5 2013/05/01 15:32:55 ulm Exp $ EAPI=5 -WANT_AUTOMAKE="1.12" inherit autotools eutils flag-o-matic multilib multilib-minimal @@ -11,7 +10,7 @@ MY_P=openMotif-${PV} DESCRIPTION="Legacy Open Motif libraries for old binaries" HOMEPAGE="http://motif.ics.com/" SRC_URI="ftp://ftp.ics.com/openmotif/2.2/${PV}/src/${MY_P}.tar.gz - mirror://gentoo/openmotif-${PV}-patches-4.tar.bz2" + mirror://gentoo/openmotif-${PV}-patches-5.tar.xz" LICENSE="MOTIF MIT" SLOT="2.2" diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild index f19da3cb29cb..6a901635489b 100644 --- a/x11-libs/motif/motif-2.3.4-r1.ebuild +++ b/x11-libs/motif/motif-2.3.4-r1.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.14 2013/05/01 11:15:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.15 2013/05/01 15:32:55 ulm Exp $ EAPI=5 -WANT_AUTOMAKE="1.12" inherit autotools eutils flag-o-matic multilib multilib-minimal @@ -45,6 +44,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-parallel-make.patch" epatch "${FILESDIR}/${P}-install-dirs.patch" epatch "${FILESDIR}/${P}-fc-config.patch" + epatch "${FILESDIR}/${P}-automake-1.13.patch" [[ ${CHOST} == *-solaris2.11 ]] \ && epatch "${FILESDIR}/${PN}-2.3.2-solaris-2.11.patch" |