diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-04-08 12:31:38 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-04-08 12:31:38 +0000 |
| commit | 505862475ac3c707d4de6d56789bfdbd6f6de5bc (patch) | |
| tree | f0c0432f80affe8e627258043bf2ab056cab5b21 /app-arch | |
| parent | Stable for amd64, wrt bug #545578 (diff) | |
| download | gentoo-2-505862475ac3c707d4de6d56789bfdbd6f6de5bc.tar.gz gentoo-2-505862475ac3c707d4de6d56789bfdbd6f6de5bc.tar.bz2 gentoo-2-505862475ac3c707d4de6d56789bfdbd6f6de5bc.zip | |
Fix compilation problems on x86, bug #545912
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/p7zip/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/p7zip/files/p7zip-9.38.1-osversion.patch | 28 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-9.38.1.ebuild | 9 |
3 files changed, 38 insertions, 5 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index 4864975e3540..4454321e7995 100644 --- a/app-arch/p7zip/ChangeLog +++ b/app-arch/p7zip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/p7zip # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.165 2015/04/07 14:05:48 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.166 2015/04/08 12:31:38 jlec Exp $ + + 08 Apr 2015; Justin Lecher <jlec@gentoo.org> + +files/p7zip-9.38.1-osversion.patch, p7zip-9.38.1.ebuild: + Fix compilation problems on x86, bug #545912 07 Apr 2015; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r4.ebuild, p7zip-9.20.1-r5.ebuild, p7zip-9.38.1.ebuild: diff --git a/app-arch/p7zip/files/p7zip-9.38.1-osversion.patch b/app-arch/p7zip/files/p7zip-9.38.1-osversion.patch new file mode 100644 index 000000000000..49e0653e43ef --- /dev/null +++ b/app-arch/p7zip/files/p7zip-9.38.1-osversion.patch @@ -0,0 +1,28 @@ +diff -Naur old/CPP/7zip/UI/FileManager/FM.cpp new/CPP/7zip/UI/FileManager/FM.cpp +--- old/CPP/7zip/UI/FileManager/FM.cpp 2015-01-18 08:59:09.000000000 -1000 ++++ new/CPP/7zip/UI/FileManager/FM.cpp 2015-02-09 11:39:55.575712452 -1000 +@@ -348,24 +348,7 @@ + + bool IsLargePageSupported() + { +- #ifdef _WIN64 + return true; +- #else +- OSVERSIONINFO versionInfo; +- versionInfo.dwOSVersionInfoSize = sizeof(versionInfo); +- if (!::GetVersionEx(&versionInfo)) +- return false; +- if (versionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || versionInfo.dwMajorVersion < 5) +- return false; +- if (versionInfo.dwMajorVersion > 5) +- return true; +- if (versionInfo.dwMinorVersion < 1) +- return false; +- if (versionInfo.dwMinorVersion > 1) +- return true; +- // return IsWow64(); +- return false; +- #endif + } + + #if 0 //#ifndef UNDER_CE diff --git a/app-arch/p7zip/p7zip-9.38.1.ebuild b/app-arch/p7zip/p7zip-9.38.1.ebuild index c3dfaa2ad039..897bb08c78ea 100644 --- a/app-arch/p7zip/p7zip-9.38.1.ebuild +++ b/app-arch/p7zip/p7zip-9.38.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.2 2015/04/07 10:10:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.3 2015/04/08 12:31:38 jlec Exp $ EAPI=5 @@ -30,6 +30,8 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}_${PV} src_prepare() { + epatch "${FILESDIR}"/${P}-osversion.patch + if ! use pch; then sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die fi @@ -125,9 +127,8 @@ src_install() { newins GUI/p7zip_16_ok.png p7zip.png if use kde; then - - rm GUI/kde4/p7zip_compress.desktop - insinto /usr/share/kde4/services/ServiceMenus + rm GUI/kde4/p7zip_compress.desktop || die + insinto /usr/share/kde4/services/ServiceMenus doins GUI/kde4/*.desktop fi fi |