Date: Tuesday, February 10, 2015 @ 00:18:55 Author: bisson Revision: 231209
upstream update Added: p7zip/trunk/osversion.patch Modified: p7zip/trunk/PKGBUILD -----------------+ PKGBUILD | 32 +++++++++++++++++--------------- osversion.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-09 23:13:59 UTC (rev 231208) +++ PKGBUILD 2015-02-09 23:18:55 UTC (rev 231209) @@ -6,19 +6,21 @@ # Maintainer: Gaetan Bisson <[email protected]> pkgname=p7zip -pkgver=9.20.1 -pkgrel=9 +pkgver=9.38 +pkgrel=1 pkgdesc='Command-line version of the 7zip compressed file archiver' url='http://p7zip.sourceforge.net/' license=('GPL' 'custom') arch=('i686' 'x86_64') depends=('gcc-libs' 'bash') -optdepends=('wxgtk2.8: GUI' +optdepends=('wxgtk: GUI' 'desktop-file-utils: desktop entries') -makedepends=('yasm' 'nasm' 'wxgtk2.8') +makedepends=('yasm' 'nasm' 'wxgtk') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2"; + 'osversion.patch' '7zFM.desktop') -sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' +sha1sums=('693bc2a1426df7a12762b4542a8327add23f0dc3' + '8c086db1c7be0d52d2ac971f44adbdccf6dd82de' 'f2c370d6f1b286b7ce9a2804e22541b755616a40') options=('!makeflags') @@ -26,13 +28,12 @@ prepare() { cd "${srcdir}/${pkgname}_${pkgver}" - rm GUI/kde4/p7zip_compress.desktop - [[ $CARCH = x86_64 ]] \ - && cp makefile.linux_amd64_asm makefile.machine \ - || cp makefile.linux_x86_asm_gcc_4.X makefile.machine + [[ $CARCH = x86_64 ]] && + cp makefile.linux_amd64_asm makefile.machine || + cp makefile.linux_x86_asm_gcc_4.X makefile.machine - sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \ - CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile + patch -p1 -i ../osversion.patch + sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend } build() { @@ -47,11 +48,12 @@ DEST_HOME="/usr" \ DEST_MAN="/usr/share/man" - # Licenses + # Doc and licenses + cp -a DOC/* "${pkgdir}"/usr/share/doc/p7zip install -d "${pkgdir}"/usr/share/licenses/p7zip ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \ - /usr/share/doc/p7zip/DOCS/License.txt \ - /usr/share/doc/p7zip/DOCS/unRarLicense.txt + /usr/share/doc/p7zip/License.txt \ + /usr/share/doc/p7zip/unRarLicense.txt # Integration with stuff... install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png @@ -63,5 +65,5 @@ find GUI/help -type d -exec chmod 755 {} \; cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ - chmod -R u+w "${pkgdir}/usr" + chmod -R u+w,o+r "${pkgdir}/usr" } Added: osversion.patch =================================================================== --- osversion.patch (rev 0) +++ osversion.patch 2015-02-09 23:18:55 UTC (rev 231209) @@ -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
