diff options
| author |   Peter Volkov <pva@gentoo.org> | 2008-09-10 05:19:41 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2008-09-10 05:19:41 +0000 |
| commit | b0d634523d713200bc9e087ced05bda4ac16e804 (patch) | |
| tree | 88dd1ef5c630e8f7392dd7b27e3cc3b6f34a571d /app-emulation/wine | |
| parent | Respect LDFLAGS, bug #236888, thank Olivier Huber for report and fix. (diff) | |
| download | gentoo-2-b0d634523d713200bc9e087ced05bda4ac16e804.tar.gz gentoo-2-b0d634523d713200bc9e087ced05bda4ac16e804.tar.bz2 gentoo-2-b0d634523d713200bc9e087ced05bda4ac16e804.zip | |
Patch from upstream to fix build issue, bug #237011, thank Martin von Gagern for work.
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686)
Diffstat (limited to 'app-emulation/wine')
| -rw-r--r-- | app-emulation/wine/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.1.4-install-fix.patch | 22 | ||||
| -rw-r--r-- | app-emulation/wine/wine-1.1.4.ebuild | 3 |
3 files changed, 30 insertions, 2 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 6870101472f1..229abeb484b1 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.226 2008/09/06 01:40:33 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.227 2008/09/10 05:19:40 pva Exp $ + + 10 Sep 2008; Peter Volkov <pva@gentoo.org> + +files/wine-1.1.4-install-fix.patch, wine-1.1.4.ebuild: + Patch from upstream to fix build issue, bug #237011, thank Martin von + Gagern for work. 06 Sep 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: add some info about the samba USE flag diff --git a/app-emulation/wine/files/wine-1.1.4-install-fix.patch b/app-emulation/wine/files/wine-1.1.4-install-fix.patch new file mode 100644 index 000000000000..7ff577162be7 --- /dev/null +++ b/app-emulation/wine/files/wine-1.1.4-install-fix.patch @@ -0,0 +1,22 @@ +From: Alexandre Julliard <julliard@winehq.org> +Date: Mon, 8 Sep 2008 10:37:56 +0000 (+0200) +Subject: makefile: Fix dependency for programs install. +X-Git-Url: http://source.winehq.org/git/wine.git/?a=commitdiff_plain;h=78c79ba349deea39 + +makefile: Fix dependency for programs install. +--- + +diff --git a/Makefile.in b/Makefile.in +index 0b2c6c0..1dd8ef1 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -96,7 +96,8 @@ include/__install__ include/__install-dev__: include libs tools + libs/__install__ libs/__install-lib__ libs/__install-dev__: libs + loader/__install__ loader/__install-lib__: libs tools + server/__install__ server/__install-lib__: libs tools +-programs/__install__ programs/__install-lib__: libs tools include dlls/__install-lib__ ++programs/__install__: libs tools include dlls/__install__ ++programs/__install-lib__: libs tools include dlls/__install-lib__ + tools/__install__ tools/__install-lib__ tools/__install-dev__: tools + + RECURSE_TARGETS = \ diff --git a/app-emulation/wine/wine-1.1.4.ebuild b/app-emulation/wine/wine-1.1.4.ebuild index 304556a37813..4058ac78de70 100644 --- a/app-emulation/wine/wine-1.1.4.ebuild +++ b/app-emulation/wine/wine-1.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.4.ebuild,v 1.1 2008/09/06 01:07:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.4.ebuild,v 1.2 2008/09/10 05:19:40 pva Exp $ EAPI="1" @@ -87,6 +87,7 @@ src_unpack() { sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002 sed -i '/^MimeType/d' tools/wine.desktop || die #117785 + epatch "${FILESDIR}"/${P}-install-fix.patch #237011 } config_cache() { |