p7zip-9.38.1-3.parabola1: updating revision from Arch

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.

5 files changed, 51 insertions, 111 deletions

diff --git a/libre/p7zip/7zFM.desktop b/libre/p7zip/7zFM.desktop
deleted file mode 100644
index 854c0dd46..000000000
--- a/libre/p7zip/7zFM.desktop
+++ /dev/null
@@ -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;
diff --git a/libre/p7zip/PKGBUILD b/libre/p7zip/PKGBUILD
index 5c9feddfd..36b595824 100644
--- a/libre/p7zip/PKGBUILD
+++ b/libre/p7zip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 235997 2015-04-09 21:04:58Z bisson $
+# $Id: PKGBUILD 237196 2015-04-15 21:18:25Z foutrelis $
 # Contributor (Arch): Thayer Williams <thayer@archlinux.org>
 # Contributor (Arch): Hugo Doria <hugo@archlinux.org>
 # Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
@@ -9,87 +9,69 @@
 _pkgname=p7zip-libre
 pkgname=p7zip
 pkgver=9.38.1
-pkgrel=2.parabola1
-pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives'
-url='http://p7zip.sourceforge.net/'
-license=('GPL')
+pkgrel=3.parabola1
+pkgdesc="Command-line file archiver with high compression ratio"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://p7zip.sourceforge.net/"
+license=('LGPL')
 conflicts=('p7zip-libre')
 replaces=('p7zip-libre')
-depends=('gcc-libs' 'bash')
-optdepends=('wxgtk: GUI'
-            'desktop-file-utils: desktop entries')
-makedepends=('yasm' 'nasm' 'wxgtk')
+depends=('gcc-libs' 'sh')
+makedepends_i686=('nasm')
+makedepends_x86_64=('yasm')
+install=$pkgname.install
 mksource=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2")
 source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2"
-        'osversion.patch'
-        '7zFM.desktop'
         'libre.patch')
-mksha1sums=('6b1eccf272d8b141a94758f80727ae633568ba69')
-sha1sums=('8c4dbbcd4d9c80d48c549318bf6ab71819904acc'
-          '8c086db1c7be0d52d2ac971f44adbdccf6dd82de'
-          '441e8d89457f165c22015dedd0c1ee88504f333c'
-          '33821327ea734f218ed284ff03e8a0d0ac945070')
-
-options=('!makeflags')
-install=install
+mksha256sums=('fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995')
+sha256sums=('ef4011f2d2387d8e11d504aaf603b1a4d92984c281784fe7663b74ba952f8d7e'
+            '1a1f779471532d30a8722f563f3189932f955b57bb1a94a32b7aa3a31dcd34ed')
 
 mksource() {
-	cd "${srcdir}/${pkgname}_${pkgver}"
+  cd "${srcdir}/${pkgname}_${pkgver}"
 
-	# Remove nonfree unRAR utility files from the source
-	rm -rv CPP/7zip/{Archive,Compress}/Rar
-	rm -v CPP/7zip/Compress/{Rar{1,2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp}
-	rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h}
-	rm -v Utils/file_Codecs_Rar29_so.py
-	rm -v DOC/unRarLicense.txt
+  # Remove nonfree unRAR utility files from the source
+  rm -rv CPP/7zip/{Archive,Compress}/Rar
+  rm -v CPP/7zip/Compress/{Rar{1,2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp}
+  rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h}
+  rm -v Utils/file_Codecs_Rar29_so.py
+  rm -v DOC/unRarLicense.txt
 
-	# Remove nonfree parent folder icon
-	rm CPP/7zip/UI/FileManager/res/ParentFolder.h
+  # Remove nonfree parent folder icon
+  rm CPP/7zip/UI/FileManager/res/ParentFolder.h
 }
 
 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
+  cd "$srcdir/${pkgname}_$pkgver"
 
-	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
 
-	# remove rar and parent folder icon references
-	patch -Np1 -i ../libre.patch
+  # remove rar and parent folder icon references
+  patch -Np1 -i ../libre.patch
 }
 
 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
+  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
 
-	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:
diff --git a/libre/p7zip/install b/libre/p7zip/install
deleted file mode 100644
index 7f3cc4358..000000000
--- a/libre/p7zip/install
+++ /dev/null
@@ -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
-}
diff --git a/libre/p7zip/osversion.patch b/libre/p7zip/osversion.patch
deleted file mode 100644
index 49e0653e4..000000000
--- a/libre/p7zip/osversion.patch
+++ /dev/null
@@ -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
diff --git a/libre/p7zip/p7zip.install b/libre/p7zip/p7zip.install
new file mode 100644
index 000000000..4c3bb82ac
--- /dev/null
+++ b/libre/p7zip/p7zip.install
@@ -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: