diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-05-13 20:02:26 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-05-13 20:02:26 +0000 |
| commit | fe3baded9e49447013a1f06b2a0e83d007b034e0 (patch) | |
| tree | f88b22e352e8f05acced89637059a13d3f20353b /x11-libs | |
| parent | Mask kde-misc/ktouchpadenabler for removal. (diff) | |
| download | gentoo-2-fe3baded9e49447013a1f06b2a0e83d007b034e0.tar.gz gentoo-2-fe3baded9e49447013a1f06b2a0e83d007b034e0.tar.bz2 gentoo-2-fe3baded9e49447013a1f06b2a0e83d007b034e0.zip | |
Apply Solaris patch unconditionally, bug 465426.
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/motif/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/motif/files/motif-2.3.4-solaris-11.patch | 13 | ||||
| -rw-r--r-- | x11-libs/motif/motif-2.3.4-r1.ebuild | 9 |
3 files changed, 22 insertions, 6 deletions
diff --git a/x11-libs/motif/ChangeLog b/x11-libs/motif/ChangeLog index 387a7f2f794c..c608c54f902e 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.30 2013/05/07 13:56:30 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.31 2013/05/13 20:02:26 ulm Exp $ + + 13 May 2013; Ulrich Müller <ulm@gentoo.org> motif-2.3.4-r1.ebuild, + +files/motif-2.3.4-solaris-11.patch: + Apply Solaris patch unconditionally, bug 465426. 07 May 2013; Agostino Sarubbo <ago@gentoo.org> motif-2.3.4-r1.ebuild: Stable for sparc, wrt bug #465788 diff --git a/x11-libs/motif/files/motif-2.3.4-solaris-11.patch b/x11-libs/motif/files/motif-2.3.4-solaris-11.patch new file mode 100644 index 000000000000..4a6b23661e47 --- /dev/null +++ b/x11-libs/motif/files/motif-2.3.4-solaris-11.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/465426 + +--- motif-2.3.4-orig/lib/Xm/Xmos_r.h ++++ motif-2.3.4/lib/Xm/Xmos_r.h +@@ -602,7 +602,7 @@ + # endif + } _Xreaddirparams; + +-# if defined(AIXV3) || defined(AIXV4) || defined(_POSIX_THREAD_SAFE_FUNCTIONS) ++# if defined(AIXV3) || defined(AIXV4) || defined(HAVE_READDIR_R_3) || defined(_POSIX_THREAD_SAFE_FUNCTIONS) + /* AIX defines the draft POSIX symbol, but uses the final API. */ + /* POSIX final API, returns (int)0 on success. */ + # if defined(__osf__) diff --git a/x11-libs/motif/motif-2.3.4-r1.ebuild b/x11-libs/motif/motif-2.3.4-r1.ebuild index a9f95993ddc3..a8d5d29913cd 100644 --- a/x11-libs/motif/motif-2.3.4-r1.ebuild +++ b/x11-libs/motif/motif-2.3.4-r1.ebuild @@ -1,6 +1,6 @@ # 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.17 2013/05/07 13:56:30 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.18 2013/05/13 20:02:26 ulm Exp $ EAPI=5 @@ -45,9 +45,7 @@ src_prepare() { 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" - + epatch "${FILESDIR}/${P}-solaris-11.patch" epatch_user # disable compilation of demo binaries @@ -68,7 +66,8 @@ src_prepare() { append-flags -fno-strict-aliasing # For Solaris Xos_r.h :( - [[ ${CHOST} == *-solaris2.11 ]] && append-flags -DNEED_XOS_R_H=1 + [[ ${CHOST} == *-solaris2.11 ]] \ + && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3 if use !elibc_glibc && use !elibc_uclibc && use unicode; then # libiconv detection in configure script doesn't always work |