summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Jones <cretin@gentoo.org>2004-04-07 08:35:29 +0000
committerStefan Jones <cretin@gentoo.org>2004-04-07 08:35:29 +0000
commitf65be1bdbee74a3b0b4645b4d33a7b40465da12c (patch)
tree23279063098b2c61eaeaacbed919a5ce0b72ea50 /dev-util
parentFix bug #46273 and mark stable on x86. (Manifest recommit) (diff)
downloadgentoo-2-f65be1bdbee74a3b0b4645b4d33a7b40465da12c.tar.gz
gentoo-2-f65be1bdbee74a3b0b4645b4d33a7b40465da12c.tar.bz2
gentoo-2-f65be1bdbee74a3b0b4645b4d33a7b40465da12c.zip
Added patch to ocidl.h to fix bug #46886
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/xmingw-w32api/ChangeLog5
-rw-r--r--dev-util/xmingw-w32api/Manifest5
-rw-r--r--dev-util/xmingw-w32api/files/xmingw-w32api-2.5-ocidl.patch11
-rw-r--r--dev-util/xmingw-w32api/xmingw-w32api-2.5.ebuild5
4 files changed, 22 insertions, 4 deletions
diff --git a/dev-util/xmingw-w32api/ChangeLog b/dev-util/xmingw-w32api/ChangeLog
index 096f6cbcc45f..3e6cea4aad91 100644
--- a/dev-util/xmingw-w32api/ChangeLog
+++ b/dev-util/xmingw-w32api/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/xmingw-w32api
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-w32api/ChangeLog,v 1.4 2004/03/18 21:45:24 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-w32api/ChangeLog,v 1.5 2004/04/07 08:35:29 cretin Exp $
+
+ 07 Apr 2004; Stefan Jones <cretin@gentoo.org> :
+ Added patch to ocidl.h to fix bug #46886
*xmingw-w32api-2.5 (17 Oct 2004)
diff --git a/dev-util/xmingw-w32api/Manifest b/dev-util/xmingw-w32api/Manifest
index bd3b980e448e..edaf54f220b5 100644
--- a/dev-util/xmingw-w32api/Manifest
+++ b/dev-util/xmingw-w32api/Manifest
@@ -1,5 +1,6 @@
-MD5 3c845409a459e5443dbeb860892dfd5a xmingw-w32api-2.5.ebuild 1236
+MD5 686843aa8d1ed551d8679dfc82412745 xmingw-w32api-2.5.ebuild 1289
MD5 019469b5e350aef944e89552681c39f5 xmingw-w32api-2.4.ebuild 1239
-MD5 c287109987c66883d45ad31eb9defccd ChangeLog 596
+MD5 0e80d40d56af03e758213ddee3a97912 ChangeLog 690
MD5 3de99c6776ed74f7cec551053ffeeb51 files/digest-xmingw-w32api-2.4 139
MD5 70366dfb6bfcc5deef952bbc9b2c33d8 files/digest-xmingw-w32api-2.5 139
+MD5 37a902a230387e0ddb748136b41f3d88 files/xmingw-w32api-2.5-ocidl.patch 334
diff --git a/dev-util/xmingw-w32api/files/xmingw-w32api-2.5-ocidl.patch b/dev-util/xmingw-w32api/files/xmingw-w32api-2.5-ocidl.patch
new file mode 100644
index 000000000000..78b91c90cec8
--- /dev/null
+++ b/dev-util/xmingw-w32api/files/xmingw-w32api-2.5-ocidl.patch
@@ -0,0 +1,11 @@
+--- w32api-2.5/include/ocidl.h.jj 2004-04-07 09:29:55.166925344 +0100
++++ w32api-2.5/include/ocidl.h 2004-04-07 09:30:16.808635304 +0100
+@@ -59,7 +59,7 @@
+ LPOLESTR pstrName;
+ CLSID clsid;
+ } PROPBAG2;
+-enum tagQACONTAINERFLAGS
++typedef enum tagQACONTAINERFLAGS
+ {
+ QACONTAINER_SHOWHATCHING = 1,
+ QACONTAINER_SHOWGRABHANDLES = 2,
diff --git a/dev-util/xmingw-w32api/xmingw-w32api-2.5.ebuild b/dev-util/xmingw-w32api/xmingw-w32api-2.5.ebuild
index 2226bbde5946..10554ce4ef93 100644
--- a/dev-util/xmingw-w32api/xmingw-w32api-2.5.ebuild
+++ b/dev-util/xmingw-w32api/xmingw-w32api-2.5.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-w32api/xmingw-w32api-2.5.ebuild,v 1.1 2004/03/17 14:43:33 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xmingw-w32api/xmingw-w32api-2.5.ebuild,v 1.2 2004/04/07 08:35:29 cretin Exp $
+
+inherit eutils
MY_P=${P/xmingw-}
RUNTIME=mingw-runtime-3.2
@@ -24,6 +26,7 @@ src_unpack() {
unpack ${MY_P}-src.tar.gz
ln -s ${MY_P} w32api
ln -s ${RUNTIME} mingw
+ epatch ${FILESDIR}/${P}-ocidl.patch
}
src_compile() {