Date: Sunday, February 22, 2015 @ 17:43:32 Author: bisson Revision: 231803
archrelease: copy trunk to extra-i686, extra-x86_64 Added: p7zip/repos/extra-i686/7zFM.desktop (from rev 231802, p7zip/trunk/7zFM.desktop) p7zip/repos/extra-i686/PKGBUILD (from rev 231802, p7zip/trunk/PKGBUILD) p7zip/repos/extra-i686/install (from rev 231802, p7zip/trunk/install) p7zip/repos/extra-i686/osversion.patch (from rev 231802, p7zip/trunk/osversion.patch) p7zip/repos/extra-x86_64/7zFM.desktop (from rev 231802, p7zip/trunk/7zFM.desktop) p7zip/repos/extra-x86_64/PKGBUILD (from rev 231802, p7zip/trunk/PKGBUILD) p7zip/repos/extra-x86_64/install (from rev 231802, p7zip/trunk/install) p7zip/repos/extra-x86_64/osversion.patch (from rev 231802, p7zip/trunk/osversion.patch) Deleted: p7zip/repos/extra-i686/7zFM.desktop p7zip/repos/extra-i686/PKGBUILD p7zip/repos/extra-i686/install p7zip/repos/extra-i686/osversion.patch p7zip/repos/extra-x86_64/7zFM.desktop p7zip/repos/extra-x86_64/PKGBUILD p7zip/repos/extra-x86_64/install p7zip/repos/extra-x86_64/osversion.patch ------------------------------+ /7zFM.desktop | 18 +++++ /PKGBUILD | 142 +++++++++++++++++++++++++++++++++++++++++ /install | 26 +++++++ /osversion.patch | 56 ++++++++++++++++ extra-i686/7zFM.desktop | 9 -- extra-i686/PKGBUILD | 71 -------------------- extra-i686/install | 13 --- extra-i686/osversion.patch | 28 -------- extra-x86_64/7zFM.desktop | 9 -- extra-x86_64/PKGBUILD | 71 -------------------- extra-x86_64/install | 13 --- extra-x86_64/osversion.patch | 28 -------- 12 files changed, 242 insertions(+), 242 deletions(-) Deleted: extra-i686/7zFM.desktop =================================================================== --- extra-i686/7zFM.desktop 2015-02-22 16:42:46 UTC (rev 231802) +++ extra-i686/7zFM.desktop 2015-02-22 16:43:32 UTC (rev 231803) @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=7-Zip FM -GenericName=7-Zip File Manager -Type=Application -Categories=GTK;Utility;Archiving;Compression; -Terminal=false -Icon=p7zip -Exec=7zFM Copied: p7zip/repos/extra-i686/7zFM.desktop (from rev 231802, p7zip/trunk/7zFM.desktop) =================================================================== --- extra-i686/7zFM.desktop (rev 0) +++ extra-i686/7zFM.desktop 2015-02-22 16:43:32 UTC (rev 231803) @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=7-Zip FM +GenericName=7-Zip File Manager +Type=Application +Categories=GTK;Utility;Archiving;Compression; +Terminal=false +Icon=p7zip +Exec=7zFM Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-02-22 16:42:46 UTC (rev 231802) +++ extra-i686/PKGBUILD 2015-02-22 16:43:32 UTC (rev 231803) @@ -1,71 +0,0 @@ -# $Id$ -# Contributor: Thayer Williams <tha...@archlinux.org> -# Contributor: Hugo Doria <h...@archlinux.org> -# Contributor: TuxSpirit<tuxspi...@archlinux.fr> 2007/11/17 21:22:36 UTC -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=p7zip -pkgver=9.38 -pkgrel=2 -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=('wxgtk: GUI' - 'desktop-file-utils: desktop entries') -makedepends=('yasm' 'nasm' 'wxgtk') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2" - 'osversion.patch' - '7zFM.desktop') -sha1sums=('693bc2a1426df7a12762b4542a8327add23f0dc3' - '8c086db1c7be0d52d2ac971f44adbdccf6dd82de' - 'f2c370d6f1b286b7ce9a2804e22541b755616a40') - -options=('!makeflags') -install=install - -prepare() { - cd "${srcdir}/${pkgname}_${pkgver}" - [[ $CARCH = x86_64 ]] && - cp makefile.linux_amd64_asm makefile.machine || - cp makefile.linux_x86_asm_gcc_4.X makefile.machine - - patch -p1 -i ../osversion.patch - sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend - - rm GUI/kde4/p7zip_compress.desktop # FS#43766 -} - -build() { - cd "${srcdir}/${pkgname}_${pkgver}" - make all4 OPTFLAGS="${CXXFLAGS}" -} - -package() { - cd "${srcdir}/${pkgname}_${pkgver}" - make install \ - DEST_DIR="${pkgdir}" \ - DEST_HOME="/usr" \ - DEST_MAN="/usr/share/man" - - # 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/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 - install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} - cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ - cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ - ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx - - find GUI/help -type d -exec chmod 755 {} \; - cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ - - chmod -R u+w,o+r "${pkgdir}/usr" -} Copied: p7zip/repos/extra-i686/PKGBUILD (from rev 231802, p7zip/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-02-22 16:43:32 UTC (rev 231803) @@ -0,0 +1,71 @@ +# $Id$ +# Contributor: Thayer Williams <tha...@archlinux.org> +# Contributor: Hugo Doria <h...@archlinux.org> +# Contributor: TuxSpirit<tuxspi...@archlinux.fr> 2007/11/17 21:22:36 UTC +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=p7zip +pkgver=9.38 +pkgrel=3 +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=('wxgtk: GUI' + 'desktop-file-utils: desktop entries') +makedepends=('yasm' 'nasm' 'wxgtk') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2" + 'osversion.patch' + '7zFM.desktop') +sha1sums=('ae7f483799ca463aa5f0a856491a3410907348ed' + '8c086db1c7be0d52d2ac971f44adbdccf6dd82de' + 'f2c370d6f1b286b7ce9a2804e22541b755616a40') + +options=('!makeflags') +install=install + +prepare() { + cd "${srcdir}/${pkgname}_${pkgver}" + [[ $CARCH = x86_64 ]] && + cp makefile.linux_amd64_asm makefile.machine || + cp makefile.linux_x86_asm_gcc_4.X makefile.machine + + patch -p1 -i ../osversion.patch + sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend + + rm GUI/kde4/p7zip_compress.desktop # FS#43766 +} + +build() { + cd "${srcdir}/${pkgname}_${pkgver}" + make all4 OPTFLAGS="${CXXFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}_${pkgver}" + make install \ + DEST_DIR="${pkgdir}" \ + DEST_HOME="/usr" \ + DEST_MAN="/usr/share/man" + + # 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/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 + install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} + cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ + cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ + ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx + + find GUI/help -type d -exec chmod 755 {} \; + cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ + + chmod -R a+r,u+w,a+X "${pkgdir}/usr" +} Deleted: extra-i686/install =================================================================== --- extra-i686/install 2015-02-22 16:42:46 UTC (rev 231802) +++ extra-i686/install 2015-02-22 16:43:32 UTC (rev 231803) @@ -1,13 +0,0 @@ -post_install() { - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true - [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true -} - -post_upgrade() { - post_install -} - - -post_remove() { - post_install -} Copied: p7zip/repos/extra-i686/install (from rev 231802, p7zip/trunk/install) =================================================================== --- extra-i686/install (rev 0) +++ extra-i686/install 2015-02-22 16:43:32 UTC (rev 231803) @@ -0,0 +1,13 @@ +post_install() { + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true + [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} Deleted: extra-i686/osversion.patch =================================================================== --- extra-i686/osversion.patch 2015-02-22 16:42:46 UTC (rev 231802) +++ extra-i686/osversion.patch 2015-02-22 16:43:32 UTC (rev 231803) @@ -1,28 +0,0 @@ -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 Copied: p7zip/repos/extra-i686/osversion.patch (from rev 231802, p7zip/trunk/osversion.patch) =================================================================== --- extra-i686/osversion.patch (rev 0) +++ extra-i686/osversion.patch 2015-02-22 16:43:32 UTC (rev 231803) @@ -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 Deleted: extra-x86_64/7zFM.desktop =================================================================== --- extra-x86_64/7zFM.desktop 2015-02-22 16:42:46 UTC (rev 231802) +++ extra-x86_64/7zFM.desktop 2015-02-22 16:43:32 UTC (rev 231803) @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=7-Zip FM -GenericName=7-Zip File Manager -Type=Application -Categories=GTK;Utility;Archiving;Compression; -Terminal=false -Icon=p7zip -Exec=7zFM Copied: p7zip/repos/extra-x86_64/7zFM.desktop (from rev 231802, p7zip/trunk/7zFM.desktop) =================================================================== --- extra-x86_64/7zFM.desktop (rev 0) +++ extra-x86_64/7zFM.desktop 2015-02-22 16:43:32 UTC (rev 231803) @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=7-Zip FM +GenericName=7-Zip File Manager +Type=Application +Categories=GTK;Utility;Archiving;Compression; +Terminal=false +Icon=p7zip +Exec=7zFM Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-02-22 16:42:46 UTC (rev 231802) +++ extra-x86_64/PKGBUILD 2015-02-22 16:43:32 UTC (rev 231803) @@ -1,71 +0,0 @@ -# $Id$ -# Contributor: Thayer Williams <tha...@archlinux.org> -# Contributor: Hugo Doria <h...@archlinux.org> -# Contributor: TuxSpirit<tuxspi...@archlinux.fr> 2007/11/17 21:22:36 UTC -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=p7zip -pkgver=9.38 -pkgrel=2 -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=('wxgtk: GUI' - 'desktop-file-utils: desktop entries') -makedepends=('yasm' 'nasm' 'wxgtk') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2" - 'osversion.patch' - '7zFM.desktop') -sha1sums=('693bc2a1426df7a12762b4542a8327add23f0dc3' - '8c086db1c7be0d52d2ac971f44adbdccf6dd82de' - 'f2c370d6f1b286b7ce9a2804e22541b755616a40') - -options=('!makeflags') -install=install - -prepare() { - cd "${srcdir}/${pkgname}_${pkgver}" - [[ $CARCH = x86_64 ]] && - cp makefile.linux_amd64_asm makefile.machine || - cp makefile.linux_x86_asm_gcc_4.X makefile.machine - - patch -p1 -i ../osversion.patch - sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend - - rm GUI/kde4/p7zip_compress.desktop # FS#43766 -} - -build() { - cd "${srcdir}/${pkgname}_${pkgver}" - make all4 OPTFLAGS="${CXXFLAGS}" -} - -package() { - cd "${srcdir}/${pkgname}_${pkgver}" - make install \ - DEST_DIR="${pkgdir}" \ - DEST_HOME="/usr" \ - DEST_MAN="/usr/share/man" - - # 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/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 - install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} - cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ - cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ - ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx - - find GUI/help -type d -exec chmod 755 {} \; - cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ - - chmod -R u+w,o+r "${pkgdir}/usr" -} Copied: p7zip/repos/extra-x86_64/PKGBUILD (from rev 231802, p7zip/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-02-22 16:43:32 UTC (rev 231803) @@ -0,0 +1,71 @@ +# $Id$ +# Contributor: Thayer Williams <tha...@archlinux.org> +# Contributor: Hugo Doria <h...@archlinux.org> +# Contributor: TuxSpirit<tuxspi...@archlinux.fr> 2007/11/17 21:22:36 UTC +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=p7zip +pkgver=9.38 +pkgrel=3 +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=('wxgtk: GUI' + 'desktop-file-utils: desktop entries') +makedepends=('yasm' 'nasm' 'wxgtk') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2" + 'osversion.patch' + '7zFM.desktop') +sha1sums=('ae7f483799ca463aa5f0a856491a3410907348ed' + '8c086db1c7be0d52d2ac971f44adbdccf6dd82de' + 'f2c370d6f1b286b7ce9a2804e22541b755616a40') + +options=('!makeflags') +install=install + +prepare() { + cd "${srcdir}/${pkgname}_${pkgver}" + [[ $CARCH = x86_64 ]] && + cp makefile.linux_amd64_asm makefile.machine || + cp makefile.linux_x86_asm_gcc_4.X makefile.machine + + patch -p1 -i ../osversion.patch + sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend + + rm GUI/kde4/p7zip_compress.desktop # FS#43766 +} + +build() { + cd "${srcdir}/${pkgname}_${pkgver}" + make all4 OPTFLAGS="${CXXFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}_${pkgver}" + make install \ + DEST_DIR="${pkgdir}" \ + DEST_HOME="/usr" \ + DEST_MAN="/usr/share/man" + + # 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/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 + install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus} + cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/ + cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/ + ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx + + find GUI/help -type d -exec chmod 755 {} \; + cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/ + + chmod -R a+r,u+w,a+X "${pkgdir}/usr" +} Deleted: extra-x86_64/install =================================================================== --- extra-x86_64/install 2015-02-22 16:42:46 UTC (rev 231802) +++ extra-x86_64/install 2015-02-22 16:43:32 UTC (rev 231803) @@ -1,13 +0,0 @@ -post_install() { - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true - [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true -} - -post_upgrade() { - post_install -} - - -post_remove() { - post_install -} Copied: p7zip/repos/extra-x86_64/install (from rev 231802, p7zip/trunk/install) =================================================================== --- extra-x86_64/install (rev 0) +++ extra-x86_64/install 2015-02-22 16:43:32 UTC (rev 231803) @@ -0,0 +1,13 @@ +post_install() { + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true + [[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} Deleted: extra-x86_64/osversion.patch =================================================================== --- extra-x86_64/osversion.patch 2015-02-22 16:42:46 UTC (rev 231802) +++ extra-x86_64/osversion.patch 2015-02-22 16:43:32 UTC (rev 231803) @@ -1,28 +0,0 @@ -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 Copied: p7zip/repos/extra-x86_64/osversion.patch (from rev 231802, p7zip/trunk/osversion.patch) =================================================================== --- extra-x86_64/osversion.patch (rev 0) +++ extra-x86_64/osversion.patch 2015-02-22 16:43:32 UTC (rev 231803) @@ -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