[arch-commits] Commit in diffoscope/trunk (2 files)

[Eli Schwartz]

    Date: Friday, July 20, 2018 @ 04:26:04
  Author: eschwartz
Revision: 362515

upgpkg: diffoscope 99-1

upstream release

Modified:
  diffoscope/trunk/PKGBUILD
Deleted:
  diffoscope/trunk/fix-libarchive-2.8-compatibility.patch

----------------------------------------+
 PKGBUILD                               |   16 ++++------------
 fix-libarchive-2.8-compatibility.patch |   29 -----------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-20 03:39:23 UTC (rev 362514)
+++ PKGBUILD	2018-07-20 04:26:04 UTC (rev 362515)
@@ -1,8 +1,8 @@
 # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 
 pkgname=diffoscope
-pkgver=95
-pkgrel=2
+pkgver=99
+pkgrel=1
 pkgdesc='Tool for in-depth comparison of files, archives, and directories'
 url='https://diffoscope.org/'
 arch=('x86_64')
@@ -57,17 +57,9 @@
   'java-environment>=8' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools'
   'tlsh' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib'
   'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete')
-source=(${pkgname}-${pkgver}.tar.bz2::https://salsa.debian.org/reproducible-builds/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        fix-libarchive-2.8-compatibility.patch)
-sha512sums=('ad058e5691094ff06dcc71e1b715410b338e6973da59bd8d6076a9916d1afc29a868f5917752325189f9158d7cec910e8315d7a588b076014f83f67200a74441'
-            'c5fb2c6149b9e50c80e9fd4cdb94f2ef6e90021b44aa98e940c2ca95c441a9dd36a642cd3df6abd646a10c9d6dbc8a8d08284e5299772c735bd029351068d366')
+source=(${pkgname}-${pkgver}.tar.bz2::https://salsa.debian.org/reproducible-builds/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+sha512sums=('b270fa1e56927de7fc46457cdca46b559d39b32c1c401e39946e5206d53b2bd758ea0011e2311b77fb046e1953ab2eef54f7b53d958bd61e7122bda8610093d5')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  sed '/python-magic/d' -i setup.py
-  patch -p1 < ../fix-libarchive-2.8-compatibility.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   python setup.py build

Deleted: fix-libarchive-2.8-compatibility.patch
===================================================================
--- fix-libarchive-2.8-compatibility.patch	2018-07-20 03:39:23 UTC (rev 362514)
+++ fix-libarchive-2.8-compatibility.patch	2018-07-20 04:26:04 UTC (rev 362515)
@@ -1,29 +0,0 @@
-From 466be17181ba7b78006f982c5fa39a2397ffd748 Mon Sep 17 00:00:00 2001
-From: anthraxx <levente at leventepolyak.net>
-Date: Thu, 14 Jun 2018 22:22:03 +0200
-Subject: [PATCH] libarchive: add compatibility with python-libarchive >= 2.8
-
-Python librarchive 2.8 removed the mtime_nsec property from
-ArchiveEntry so lets wire the ffi function if available
----
- diffoscope/comparators/utils/libarchive.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/diffoscope/comparators/utils/libarchive.py b/diffoscope/comparators/utils/libarchive.py
-index f427ede..7bb20c0 100644
---- a/diffoscope/comparators/utils/libarchive.py
-+++ b/diffoscope/comparators/utils/libarchive.py
-@@ -64,6 +64,10 @@ if not hasattr(libarchive.ffi, 'entry_uname'):
- if not hasattr(libarchive.ffi, 'entry_gname'):
-     libarchive.ffi.ffi('entry_gname', [libarchive.ffi.c_archive_entry_p], ctypes.c_char_p)
-     libarchive.ArchiveEntry.gname = property(lambda self: libarchive.ffi.entry_gname(self._entry_p))
-+# Monkeypatch libarchive-c (<< 2.8)
-+if not hasattr(libarchive.ArchiveEntry, 'mtime_nsec') and hasattr(libarchive.ffi, 'entry_mtime_nsec'):
-+    libarchive.ArchiveEntry.mtime_nsec = property(
-+        lambda self: libarchive.ffi.entry_mtime_nsec(self._entry_p))
- 
- # Monkeypatch libarchive-c so we always get pathname as (Unicode) str
- # Otherwise, we'll get sometimes str and sometimes bytes and always pain.
--- 
-2.17.1
-