From 43e2c668ed4b4be421fca16fc840262de075c076 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Thu, 19 Apr 2007 05:56:14 +0000 Subject: [PATCH] Upstream patch for proper including of Xaw3d headers; #174453. Package-Manager: portage-2.1.2.4 --- app-editors/emacs-cvs/ChangeLog | 8 +- app-editors/emacs-cvs/Manifest | 42 +++++----- .../emacs-cvs/emacs-cvs-22.0.98.ebuild | 8 +- .../emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild | 8 +- .../emacs-cvs/emacs-cvs-23.0.0-r6.ebuild | 11 ++- .../files/emacs-cvs-Xaw3d-headers.patch | 76 +++++++++++++++++++ 6 files changed, 119 insertions(+), 34 deletions(-) create mode 100644 app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index b0433eef42f4..a4772c3b43e7 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.108 2007/04/18 16:13:08 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.109 2007/04/19 05:56:14 ulm Exp $ + + 19 Apr 2007; Ulrich Mueller + +files/emacs-cvs-Xaw3d-headers.patch, emacs-cvs-22.0.98.ebuild, + emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-23.0.0-r6.ebuild: + Upstream patch for proper including of Xaw3d headers; removed build-time + dependency on x11-libs/libXaw; bug #174453. 18 Apr 2007; Ulrich Mueller emacs-cvs-22.0.98.ebuild, emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-23.0.0-r6.ebuild: diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 82242ff2f8aa..564572977094 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX emacs-cvs-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c +MD5 2f28d7e33295c25205c50466d3deac65 files/emacs-cvs-Xaw3d-headers.patch 2045 +RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 files/emacs-cvs-Xaw3d-headers.patch 2045 +SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c files/emacs-cvs-Xaw3d-headers.patch 2045 AUX emacs-cvs-disable_alsa_detection.patch 1606 RMD160 9efec483c24d7a5e9e9514e4eb3df3ee1d0742e1 SHA1 420a2bf2414fb19e0ca98982f2be0aaf511350af SHA256 72192c7d87fa312c676baf99f9564b60c3961fd08b4124ae342a5616d4c52a4a MD5 c74e12e93c45c2276b6cf685f49f66aa files/emacs-cvs-disable_alsa_detection.patch 1606 RMD160 9efec483c24d7a5e9e9514e4eb3df3ee1d0742e1 files/emacs-cvs-disable_alsa_detection.patch 1606 @@ -27,14 +31,14 @@ EBUILD emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092c MD5 992f42942a9163e96939d9832756f0ea emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092cd3cb emacs-cvs-22.0.97.ebuild 6643 SHA256 5606e1ab0e975cc7162c93a65247718266617e1ca52a50c3e8c930d919ed95e7 emacs-cvs-22.0.97.ebuild 6643 -EBUILD emacs-cvs-22.0.98.ebuild 7478 RMD160 9b2061fc3d930853058f10a1ba8ed3eefbbb5b7b SHA1 ee4f71eb5433926c4f9042ba1612276b5476709c SHA256 b321c6c41132d9b14131aa6fb597286780a28d2b99e0b1fcd28d6860690aaa91 -MD5 cad3ac77a071c18b829817d0e865363f emacs-cvs-22.0.98.ebuild 7478 -RMD160 9b2061fc3d930853058f10a1ba8ed3eefbbb5b7b emacs-cvs-22.0.98.ebuild 7478 -SHA256 b321c6c41132d9b14131aa6fb597286780a28d2b99e0b1fcd28d6860690aaa91 emacs-cvs-22.0.98.ebuild 7478 -EBUILD emacs-cvs-22.0.9999-r10.ebuild 7639 RMD160 23db4b802baa6768978706d41db70122b48212a9 SHA1 f8c92780bb03ba65bc8142409fb492d4689898ef SHA256 85b6179afba1f0622339e3aca98239a9f7b7b552d834e6cf6d58e4fd88a81525 -MD5 4e836dcd139acacba3b3e35ef9907f09 emacs-cvs-22.0.9999-r10.ebuild 7639 -RMD160 23db4b802baa6768978706d41db70122b48212a9 emacs-cvs-22.0.9999-r10.ebuild 7639 -SHA256 85b6179afba1f0622339e3aca98239a9f7b7b552d834e6cf6d58e4fd88a81525 emacs-cvs-22.0.9999-r10.ebuild 7639 +EBUILD emacs-cvs-22.0.98.ebuild 7481 RMD160 1eb029ef00f271db90d4febed986369f69a343da SHA1 4356c1010ad89bd64183fe4f65d0141d9a84e075 SHA256 53e092c48476ae5325ab632290e6203f5d146aab17e7befa34c3c17588687bf3 +MD5 b0e153a300e9d9e150b626a4f9d61a56 emacs-cvs-22.0.98.ebuild 7481 +RMD160 1eb029ef00f271db90d4febed986369f69a343da emacs-cvs-22.0.98.ebuild 7481 +SHA256 53e092c48476ae5325ab632290e6203f5d146aab17e7befa34c3c17588687bf3 emacs-cvs-22.0.98.ebuild 7481 +EBUILD emacs-cvs-22.0.9999-r10.ebuild 7642 RMD160 a425617358a03e8a958ffaa6374b8af59ae0992b SHA1 12da347a522257729b1356a03142364e0a22a30c SHA256 89d920389e1b938921c5f410d04817e37bacea03c32be6dc2f0dc1dbee97ca7e +MD5 9833fbbc5e8863a8a4d45ae04516126d emacs-cvs-22.0.9999-r10.ebuild 7642 +RMD160 a425617358a03e8a958ffaa6374b8af59ae0992b emacs-cvs-22.0.9999-r10.ebuild 7642 +SHA256 89d920389e1b938921c5f410d04817e37bacea03c32be6dc2f0dc1dbee97ca7e emacs-cvs-22.0.9999-r10.ebuild 7642 EBUILD emacs-cvs-22.0.9999-r7.ebuild 6703 RMD160 c2b8e50a2bbaec24da57c657828a300ca7f89a02 SHA1 6a424818c1f6916e9537c714395c85fc1822d8ae SHA256 16c3c5158661e34dfe1272c69866870746ed485ae6380e3fce15eb89e15852cc MD5 23bc6272300e02899268cfcc339e27b8 emacs-cvs-22.0.9999-r7.ebuild 6703 RMD160 c2b8e50a2bbaec24da57c657828a300ca7f89a02 emacs-cvs-22.0.9999-r7.ebuild 6703 @@ -43,14 +47,14 @@ EBUILD emacs-cvs-23.0.0-r1.ebuild 5772 RMD160 1db592d913958bf735dc481392a8521ffa MD5 eb38b95a554cbae3617e204bbb52ea1d emacs-cvs-23.0.0-r1.ebuild 5772 RMD160 1db592d913958bf735dc481392a8521ffa4a98de emacs-cvs-23.0.0-r1.ebuild 5772 SHA256 932b97d355c334bf4f5f27c16b6dc5b1dc041ddaf92a9aa8e8effe7aa4be40f3 emacs-cvs-23.0.0-r1.ebuild 5772 -EBUILD emacs-cvs-23.0.0-r6.ebuild 7888 RMD160 f3ff216d3574a869c803533209c68b125b0b3cc1 SHA1 6a9bab95137b32badf1fbf2a3b98ccde68482b78 SHA256 212683bb5e96cf8b38fd60bd0cadc281ef7250922098baf4378716da75c92e43 -MD5 932d9daadd54aa8e756f0d1b8173b4f6 emacs-cvs-23.0.0-r6.ebuild 7888 -RMD160 f3ff216d3574a869c803533209c68b125b0b3cc1 emacs-cvs-23.0.0-r6.ebuild 7888 -SHA256 212683bb5e96cf8b38fd60bd0cadc281ef7250922098baf4378716da75c92e43 emacs-cvs-23.0.0-r6.ebuild 7888 -MISC ChangeLog 21282 RMD160 391cc29d67cce23a80275ac7515835853a2e376a SHA1 5b9d68f0354f5a82a288411d7e78e740f54be99b SHA256 90029bd48e259ade59d62e23927eacb72a648c6ac74aeb4bff8f9d3de933b254 -MD5 f684187a2e311ad79c94517123e0621c ChangeLog 21282 -RMD160 391cc29d67cce23a80275ac7515835853a2e376a ChangeLog 21282 -SHA256 90029bd48e259ade59d62e23927eacb72a648c6ac74aeb4bff8f9d3de933b254 ChangeLog 21282 +EBUILD emacs-cvs-23.0.0-r6.ebuild 7875 RMD160 850b21e25947737f45d271db170460a7db4f5a88 SHA1 37ed47bb975e851c5050dbd27466de18d103fcfe SHA256 e4a2b1b53c3267095f88020b2f1778d29d127782e0094b735f4133b4d0eb97d0 +MD5 bc6966219e860052f7c2dd37f7094df8 emacs-cvs-23.0.0-r6.ebuild 7875 +RMD160 850b21e25947737f45d271db170460a7db4f5a88 emacs-cvs-23.0.0-r6.ebuild 7875 +SHA256 e4a2b1b53c3267095f88020b2f1778d29d127782e0094b735f4133b4d0eb97d0 emacs-cvs-23.0.0-r6.ebuild 7875 +MISC ChangeLog 21579 RMD160 3e3dcaf9a49ee7a9b50e8d14a62a9365f7995682 SHA1 e62d80686859739d5c765a5f65b22ad52b2b5fe0 SHA256 15975732da1aa5d6a44d7a57cb3667e1194ffd6efe240beebd8af674217469f9 +MD5 048942841244299a35a7cde8fffe530e ChangeLog 21579 +RMD160 3e3dcaf9a49ee7a9b50e8d14a62a9365f7995682 ChangeLog 21579 +SHA256 15975732da1aa5d6a44d7a57cb3667e1194ffd6efe240beebd8af674217469f9 ChangeLog 21579 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -76,7 +80,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGJkQbOeoy/oIi7uwRAoiXAKClo07HCA2YjW2Q5nUGnYW6JPE2wQCfSzsi -cujhJV9lNFmRIbfT86BtjOw= -=6a00 +iD8DBQFGJwUFOeoy/oIi7uwRAv9mAKCrGiy3yYnUVVGN/nB4DCSQZbR9LwCfedbf +z7p63i5piBwSuttS8Mvp7eg= +=t0Wm -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild index fb9952de82fd..fbd6aa5c74c2 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild,v 1.5 2007/04/18 16:13:08 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild,v 1.6 2007/04/19 05:56:14 ulm Exp $ WANT_AUTOCONF="2.61" WANT_AUTOMAKE="latest" @@ -35,7 +35,6 @@ RDEPEND="sys-libs/ncurses !motif? ( lesstif? ( x11-libs/lesstif ) ) )" DEPEND="${RDEPEND} - X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) ) gzip-el? ( app-arch/gzip )" PROVIDE="virtual/emacs virtual/editor" @@ -61,9 +60,10 @@ src_unpack() { sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in" fi + epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch" epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" - # ALSA is detected and used even if not requested by the USE=alsa flag. So remove the - # automagic check + # ALSA is detected and used even if not requested by the USE=alsa flag. + # So remove the automagic check use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch" eautoreconf diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild index 67782a16087a..84fbfc879a83 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.5 2007/04/18 16:13:08 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.6 2007/04/19 05:56:14 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -41,7 +41,6 @@ RDEPEND="sys-libs/ncurses !motif? ( lesstif? ( x11-libs/lesstif ) ) )" DEPEND="${RDEPEND} - X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) ) gzip-el? ( app-arch/gzip )" PROVIDE="virtual/emacs virtual/editor" @@ -73,9 +72,10 @@ src_unpack() { sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in" fi + epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch" epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" - # ALSA is detected and used even if not requested by the USE=alsa flag. So remove the - # automagic check + # ALSA is detected and used even if not requested by the USE=alsa flag. + # So remove the automagic check use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch" eautoreconf diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild index 2aed89b560af..19141a61b8c9 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.4 2007/04/18 16:13:08 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.5 2007/04/19 05:56:14 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -42,7 +42,6 @@ RDEPEND="sys-libs/ncurses !motif? ( lesstif? ( x11-libs/lesstif ) ) )" DEPEND="${RDEPEND} - X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) ) gzip-el? ( app-arch/gzip )" PROVIDE="virtual/emacs virtual/editor" @@ -74,9 +73,10 @@ src_unpack() { sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in" fi + epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch" epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" - # ALSA is detected and used even if not requested by the USE=alsa flag. So remove the - # automagic check + # ALSA is detected and used even if not requested by the USE=alsa flag. + # So remove the automagic check use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch" eautoreconf @@ -191,8 +191,7 @@ EOF elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el fi - dodoc AUTHORS BUGS CONTRIBUTE MAINTAINERS README README.unicode \ - || die "dodoc failed" + dodoc AUTHORS BUGS CONTRIBUTE README README.unicode || die "dodoc failed" } emacs-infodir-rebuild() { diff --git a/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch b/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch new file mode 100644 index 000000000000..0e6be8910334 --- /dev/null +++ b/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch @@ -0,0 +1,76 @@ +*** emacs/src/xfns.c.~1.681.~ 2007-03-24 11:49:48.000000000 -0400 +--- emacs/src/xfns.c 2007-04-18 01:18:52.000000000 -0400 +*************** +*** 72,79 **** +--- 72,84 ---- + #include + + #ifndef USE_MOTIF ++ #ifdef HAVE_XAW3D ++ #include ++ #include ++ #else /* !HAVE_XAW3D */ + #include + #include ++ #endif /* HAVE_XAW3D */ + #endif /* USE_MOTIF */ + + #ifdef USG +*** emacs/src/xmenu.c.~1.317.~ 2007-01-20 23:18:14.000000000 -0500 +--- emacs/src/xmenu.c 2007-04-18 01:15:43.000000000 -0400 +*************** +*** 82,88 **** +--- 82,92 ---- + #include + #include + #ifdef USE_LUCID ++ #ifdef HAVE_XAW3D ++ #include ++ #else /* !HAVE_XAW3D */ + #include ++ #endif /* HAVE_XAW3D */ + #endif /* USE_LUCID */ + #include "../lwlib/lwlib.h" + #else /* not USE_X_TOOLKIT */ +*** emacs/lwlib/lwlib.c.~1.55.~ 2007-02-27 23:25:05.000000000 -0500 +--- emacs/lwlib/lwlib.c 2007-04-18 01:21:44.000000000 -0400 +*************** +*** 48,54 **** +--- 48,58 ---- + #endif /* not USE_MOTIF && USE_LUCID */ + #endif + #if defined (USE_XAW) ++ #ifdef HAVE_XAW3D ++ #include ++ #else /* !HAVE_XAW3D */ + #include ++ #endif /* HAVE_XAW3D */ + #include "lwlib-Xaw.h" + #endif + +*** emacs/lwlib/lwlib-Xaw.c.~1.25.~ 2007-02-26 22:07:08.000000000 -0500 +--- emacs/lwlib/lwlib-Xaw.c 2007-04-18 01:22:33.000000000 -0400 +*************** +*** 35,46 **** +--- 35,55 ---- + #include + #include + ++ #ifdef HAVE_XAW3D ++ #include ++ #include ++ #include ++ #include ++ #include ++ #include ++ #else /* !HAVE_XAW3D */ + #include + #include + #include + #include + #include + #include ++ #endif /* HAVE_XAW3D */ + + #include + -- 2.26.2