From 3bd3247825910e5936441dd1f4111a2fbb00f9be Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 17 Feb 2007 00:19:46 +0000 Subject: [PATCH] Add fix from upstream #166933 by Dennis Schridde. Package-Manager: portage-2.1.2-r9 --- dev-util/mingw-runtime/ChangeLog | 7 ++++- dev-util/mingw-runtime/Manifest | 26 +++++++++------- .../files/mingw-runtime-3.11-include.patch | 30 +++++++++++++++++++ .../mingw-runtime-3.11_p20061202.ebuild | 3 +- 4 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 dev-util/mingw-runtime/files/mingw-runtime-3.11-include.patch diff --git a/dev-util/mingw-runtime/ChangeLog b/dev-util/mingw-runtime/ChangeLog index f1454d97fd4b..7ed5d75a4ace 100644 --- a/dev-util/mingw-runtime/ChangeLog +++ b/dev-util/mingw-runtime/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/mingw-runtime # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.4 2007/02/14 23:25:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.5 2007/02/17 00:19:46 vapier Exp $ + + 17 Feb 2007; Mike Frysinger + +files/mingw-runtime-3.11-include.patch, + mingw-runtime-3.11_p20061202.ebuild: + Add fix from upstream #166933 by Dennis Schridde. *mingw-runtime-3.11_p20061202 (14 Feb 2007) diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest index d748cd2f9b8b..1d5636db9dbc 100644 --- a/dev-util/mingw-runtime/Manifest +++ b/dev-util/mingw-runtime/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX mingw-runtime-3.11-include.patch 1276 RMD160 9f209a7718b4d1ae6fa39dd762b1e7187b074879 SHA1 06f8c4caabcc34077f9cac29c7b49e0f2a83661c SHA256 c927c8c703c2d1a20409bea5ad30d7726d1f6143ca8552f9d40576bd0610be08 +MD5 b721e309fffb8e384f0d912c84b5553a files/mingw-runtime-3.11-include.patch 1276 +RMD160 9f209a7718b4d1ae6fa39dd762b1e7187b074879 files/mingw-runtime-3.11-include.patch 1276 +SHA256 c927c8c703c2d1a20409bea5ad30d7726d1f6143ca8552f9d40576bd0610be08 files/mingw-runtime-3.11-include.patch 1276 AUX mingw-runtime-3.9-DESTDIR.patch 1004 RMD160 35dbaf28bccb18d6472e2af73ccc8925091751dc SHA1 ba5a6d82aed1c72cf8ce0a0a2b216405a697d20f SHA256 0bb79aaff724272a3642ae83a1c42da95226e63f502f6de9a629d9330a06cd48 MD5 d9c9d95f6e4735b1210b17a59ffc453d files/mingw-runtime-3.9-DESTDIR.patch 1004 RMD160 35dbaf28bccb18d6472e2af73ccc8925091751dc files/mingw-runtime-3.9-DESTDIR.patch 1004 @@ -17,18 +21,18 @@ EBUILD mingw-runtime-3.11.ebuild 2066 RMD160 eca525e359223361273d00186e0595273bf MD5 b962f1ac5da469b3aa69c1a5b1f736e6 mingw-runtime-3.11.ebuild 2066 RMD160 eca525e359223361273d00186e0595273bf8ba02 mingw-runtime-3.11.ebuild 2066 SHA256 5afc8faf7c446a3f629afe67f01fc9d108124a305c2260b8f1824e8a1c55fd44 mingw-runtime-3.11.ebuild 2066 -EBUILD mingw-runtime-3.11_p20061202.ebuild 2120 RMD160 64580ae2098ddd0d9a0b3337114e651fddf2f611 SHA1 ad4deb3d61df979715f041b45e58761c3d9ffaba SHA256 74cdf38220156c497d8ab8a16684a0fbb0186383a11cbc8855e4d035003a7f9c -MD5 64dbd032d8296981915fcc9625a72784 mingw-runtime-3.11_p20061202.ebuild 2120 -RMD160 64580ae2098ddd0d9a0b3337114e651fddf2f611 mingw-runtime-3.11_p20061202.ebuild 2120 -SHA256 74cdf38220156c497d8ab8a16684a0fbb0186383a11cbc8855e4d035003a7f9c mingw-runtime-3.11_p20061202.ebuild 2120 +EBUILD mingw-runtime-3.11_p20061202.ebuild 2175 RMD160 0a07fa309fe0865db25a9a45311606afa23e244b SHA1 d26508b69f1857ffaf97da5495169916021b4072 SHA256 b1ac2771cf57fe076c5bb3ccc429efb41c77cc5f73f89f09a60df0cf9e8c0469 +MD5 602ad5992adce162843af691adb33492 mingw-runtime-3.11_p20061202.ebuild 2175 +RMD160 0a07fa309fe0865db25a9a45311606afa23e244b mingw-runtime-3.11_p20061202.ebuild 2175 +SHA256 b1ac2771cf57fe076c5bb3ccc429efb41c77cc5f73f89f09a60df0cf9e8c0469 mingw-runtime-3.11_p20061202.ebuild 2175 EBUILD mingw-runtime-3.9.ebuild 1815 RMD160 63bf1926510613b6701338af30575b201bc86860 SHA1 590f2d3e7ec9932bb2bb1f45c87c06eb736ffcb9 SHA256 a92ed6b2f8532f7f17f4d3368f385ee42670dc575116a6820b86cf7ae2cb6359 MD5 f438a9dab025119c5c81b137fae29da2 mingw-runtime-3.9.ebuild 1815 RMD160 63bf1926510613b6701338af30575b201bc86860 mingw-runtime-3.9.ebuild 1815 SHA256 a92ed6b2f8532f7f17f4d3368f385ee42670dc575116a6820b86cf7ae2cb6359 mingw-runtime-3.9.ebuild 1815 -MISC ChangeLog 847 RMD160 7d1b80c576005796a37d1b69c7cc32965ee5587c SHA1 8e23007ff9d67ab23ae60c185778f03bd186db04 SHA256 f36938abd417eb20986155a44ffb4180a8940e682be6e38e557caf5593944939 -MD5 85f90a0cd8fd2d4e97839e837030ab5b ChangeLog 847 -RMD160 7d1b80c576005796a37d1b69c7cc32965ee5587c ChangeLog 847 -SHA256 f36938abd417eb20986155a44ffb4180a8940e682be6e38e557caf5593944939 ChangeLog 847 +MISC ChangeLog 1032 RMD160 d68be630c37ab913d327d72cfda99572dd3d9352 SHA1 2f16857779f2313365813c70c1dc0b02e54d47f7 SHA256 2a30d11d824ed6a860a096faf50fa9be79e2d0f87c19687a81074c77265fd063 +MD5 8ff8cf92b805cf97c39304effe2fa83f ChangeLog 1032 +RMD160 d68be630c37ab913d327d72cfda99572dd3d9352 ChangeLog 1032 +SHA256 2a30d11d824ed6a860a096faf50fa9be79e2d0f87c19687a81074c77265fd063 ChangeLog 1032 MISC metadata.xml 223 RMD160 36e6a5940590832029aac6ed270f60d5fa1baae2 SHA1 0508f80e0b5a4b8e1ee231a8598b77408790c6c9 SHA256 b2f3120f8e01640fb311c3e50a5c37b69ff39fc4cb9fc4524456231143d9b46a MD5 5cb5b78617763221de65594c062356bb metadata.xml 223 RMD160 36e6a5940590832029aac6ed270f60d5fa1baae2 metadata.xml 223 @@ -48,7 +52,7 @@ SHA256 cfd69ae054434425d59eed64b731441c2c4aeea16d8a5eca4b3b26bc1717afcc files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF05qT8bi6rjpTunYRAn4cAKCctmN2eJTN+FhoWiuYlt1v6w8uywCgimcH -sDbrhJ0MbJun9VxsdaFdSj4= -=tRwa +iD8DBQFF1kpO8bi6rjpTunYRAu+mAJ4/mMTrjrZ6/GPcuz1aEorA+/0zgQCgruJb +TQnphRP0xdP4tbz4BLVqDb8= +=s2kN -----END PGP SIGNATURE----- diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.11-include.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.11-include.patch new file mode 100644 index 000000000000..082a3567f417 --- /dev/null +++ b/dev-util/mingw-runtime/files/mingw-runtime-3.11-include.patch @@ -0,0 +1,30 @@ +Fix from upstream + +http://bugs.gentoo.org/166933 + +Index: Makefile.in +=================================================================== +RCS file: /cvs/src/src/winsup/mingw/Makefile.in,v +retrieving revision 1.69 +diff -r1.69 Makefile.in +112c112 +< INCLUDES+= -I$(srcdir)/include \ +--- +> INCLUDES = -I$(srcdir)/include \ +116,117c116,117 +< ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN) +< ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN) +--- +> ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN) +> ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN) +Index: mingwex/Makefile.in +=================================================================== +RCS file: /cvs/src/src/winsup/mingw/mingwex/Makefile.in,v +retrieving revision 1.35 +diff -r1.35 Makefile.in +111,112c111,112 +< ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN) +< ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN) +--- +> ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN) +> ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN) diff --git a/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild index 7a3eca3e19a8..163c37b1b0cb 100644 --- a/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild +++ b/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.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/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild,v 1.1 2007/02/14 23:25:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.11_p20061202.ebuild,v 1.2 2007/02/17 00:19:46 vapier Exp $ # This version does not work as the configure script expects the installed # cross-compiler to be able to link binaries ... except we haven't provided @@ -51,6 +51,7 @@ src_unpack() { sed -i \ -e "/W32API_INCLUDE/s:=.*:='-I /usr/${CTARGET}/usr/include':" \ $(find -name configure) || die + epatch "${FILESDIR}"/${PN}-3.11-include.patch #166933 epatch "${FILESDIR}"/${PN}-3.9-DESTDIR.patch } -- 2.26.2