Date: Wednesday, April 15, 2015 @ 23:18:25 Author: foutrelis Revision: 237196
upgpkg: p7zip 9.38.1-3 Drop the 7zFM graphical frontend; we don't want to have to depend on wxgtk and the interface itself is a bit unintuitive. Alternative GUI archive managers include: file-roller, engrampa, kdeutils-ark. Added: p7zip/trunk/p7zip.install Modified: p7zip/trunk/PKGBUILD Deleted: p7zip/trunk/7zFM.desktop p7zip/trunk/install p7zip/trunk/osversion.patch -----------------+ 7zFM.desktop | 10 ------ PKGBUILD | 81 +++++++++++++++++++++--------------------------------- install | 13 -------- osversion.patch | 28 ------------------ p7zip.install | 9 ++++++ 5 files changed, 41 insertions(+), 100 deletions(-) Deleted: 7zFM.desktop =================================================================== --- 7zFM.desktop 2015-04-15 21:03:35 UTC (rev 237195) +++ 7zFM.desktop 2015-04-15 21:18:25 UTC (rev 237196) @@ -1,10 +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 -MimeType=application/gzip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-lha;application/x-lhz;application/x-lzma;application/x-lzma-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-tar;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/zip;application/vnd.ms-cab-compressed; Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-04-15 21:03:35 UTC (rev 237195) +++ PKGBUILD 2015-04-15 21:18:25 UTC (rev 237196) @@ -1,71 +1,54 @@ # $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Gaetan Bisson <bis...@archlinux.org> # 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.1 -pkgrel=2 -pkgdesc='Command-line version of the 7zip compressed file archiver' -url='http://p7zip.sourceforge.net/' -license=('GPL' 'custom') +pkgrel=3 +pkgdesc="Command-line file archiver with high compression ratio" 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=('6b1eccf272d8b141a94758f80727ae633568ba69' - '8c086db1c7be0d52d2ac971f44adbdccf6dd82de' - '441e8d89457f165c22015dedd0c1ee88504f333c') +url="http://p7zip.sourceforge.net/" +license=('LGPL' 'custom:unRAR') +depends=('gcc-libs' 'sh') +makedepends_i686=('nasm') +makedepends_x86_64=('yasm') +install=$pkgname.install +source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_${pkgver}_src_all.tar.bz2) +sha256sums=('fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995') -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 + cd "$srcdir/${pkgname}_$pkgver" - patch -p1 -i ../osversion.patch - sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend - - rm GUI/kde4/p7zip_compress.desktop # FS#43766 + if [[ $CARCH = x86_64 ]]; then + cp makefile.linux_amd64_asm makefile.machine + else + cp makefile.linux_x86_asm_gcc_4.X makefile.machine + fi } build() { - cd "${srcdir}/${pkgname}_${pkgver}" - make all4 OPTFLAGS="${CXXFLAGS}" + cd "$srcdir/${pkgname}_$pkgver" + make all3 OPTFLAGS="$CFLAGS" } package() { - cd "${srcdir}/${pkgname}_${pkgver}" - make install \ - DEST_DIR="${pkgdir}" \ - DEST_HOME="/usr" \ - DEST_MAN="/usr/share/man" + cd "$srcdir/${pkgname}_$pkgver" - # 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 + make install \ + DEST_DIR="$pkgdir" \ + DEST_HOME=/usr \ + DEST_MAN=/usr/share/man - # 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 + install -d "${pkgdir}"/usr/share/licenses/p7zip + ln -s -t "$pkgdir/usr/share/licenses/p7zip/" \ + /usr/share/doc/p7zip/DOC/License.txt \ + /usr/share/doc/p7zip/DOC/unRarLicense.txt - 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" +} - chmod -R a+r,u+w,a+X "${pkgdir}/usr" -} +# vim:set ts=2 sw=2 et: Deleted: install =================================================================== --- install 2015-04-15 21:03:35 UTC (rev 237195) +++ install 2015-04-15 21:18:25 UTC (rev 237196) @@ -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 -} Deleted: osversion.patch =================================================================== --- osversion.patch 2015-04-15 21:03:35 UTC (rev 237195) +++ osversion.patch 2015-04-15 21:18:25 UTC (rev 237196) @@ -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 Added: p7zip.install =================================================================== --- p7zip.install (rev 0) +++ p7zip.install 2015-04-15 21:18:25 UTC (rev 237196) @@ -0,0 +1,9 @@ +post_upgrade() { + if (($(vercmp $2 9.38.1-3) < 0)); then + echo ':: The 7zFM graphical frontend is no longer included in this package.' + echo ' If you used it, consider installing one of the following packages:' + echo ' 1) file-roller, 2) engrampa, 3) kdeutils-ark.' + fi +} + +# vim:set ts=2 sw=2 et: