[arch-commits] Commit in diffoscope/repos/community-x86_64 (3 files)
Levente Polyak
anthraxx at archlinux.org
Sat Jul 30 23:08:01 UTC 2016
Date: Saturday, July 30, 2016 @ 23:08:01
Author: anthraxx
Revision: 184680
archrelease: copy trunk to community-x86_64
Added:
diffoscope/repos/community-x86_64/PKGBUILD
(from rev 184679, diffoscope/trunk/PKGBUILD)
Deleted:
diffoscope/repos/community-x86_64/PKGBUILD
diffoscope/repos/community-x86_64/sqlite-magic.patch
--------------------+
PKGBUILD | 140 +++++++++++++++++++++++++--------------------------
sqlite-magic.patch | 34 ------------
2 files changed, 69 insertions(+), 105 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-07-30 23:07:54 UTC (rev 184679)
+++ PKGBUILD 2016-07-30 23:08:01 UTC (rev 184680)
@@ -1,71 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-
-pkgname=diffoscope
-pkgver=54
-pkgrel=1
-pkgdesc='Tool for in-depth comparison of files, archives, and directories'
-url='https://diffoscope.org/'
-arch=('x86_64')
-license=('GPL3')
-depends=('python-magic' 'python-libarchive-c' 'python-setuptools')
-optdepends=(
- 'acl: access control list utilities support'
- 'binutils: binary utilities support'
- 'bzip2: bzip2 utilities support'
- 'cdrkit: ISO utilities support'
- 'colord: ICC profiles support'
- 'cpio: cpio archive support'
- 'diffutils: diff utilities support'
- 'e2fsprogs: Ext2/3/4 filesystem utilities support'
- 'enjarify: Android dex file support'
- 'fpc: Free Pascal utilities support'
- 'java-environment: java utilities support'
- #'libcaca: image compare support'
- 'fontforge: bitmap font utilities support'
- 'gettext: GNU internationalization utilities support'
- 'ghc: haskell utilities support'
- 'gnupg: GNU privacy guard support'
- 'mono-tools: mono utilities support'
- 'poppler: PDF utilities support'
- 'sqlite: SQLite support'
- 'squashfs-tools: squashfs filesystem support'
- #'python-guestfs: guestfs filesystem support'
- 'tlsh: fuzzy matching supprt'
- 'unzip: zip utilities support'
- 'gzip: gzip utilities support'
- 'tar: tar utilities support'
- 'vim: Vi IMproved (xxd) utilities support'
- 'xz: XZ and LZMA utilities support'
-)
-# TODO: readd fpc
-checkdepends=(
- 'python-pytest' 'acl' 'binutils' 'bzip2' 'cdrkit' 'colord' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify' 'java-environment>=8' 'fontforge' 'gettext' 'ghc' 'gnupg'
- 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools' 'tlsh' 'unzip' 'gzip' 'tar' 'vim' 'xz')
-source=(${pkgname}-${pkgver}.tar.xz::https://anonscm.debian.org/cgit/reproducible/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.xz
- sqlite-magic.patch)
-sha512sums=('8adbff01652243954aa47f404057f600567d46d0265cdc22f2d9c33740de1b64ff2cb238d147649598488c955637df0b9a1b57a2965686f86d9d2712b38c17eb'
- '3450c114f01a223c968fa75d230321fa188eae81146a2aad36b095a3ce96332167c638a46458c032343adaabc245555fd0f1fc7bd5e9ec26ff26c9cdd534ab23')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- sed '/python-magic/d' -i setup.py
- patch -p1 < "${srcdir}/sqlite-magic.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- python setup.py build
-}
-
-check() {
- cd ${pkgname}-${pkgver}
- PYTHONPATH=".:${PYTHONPATH}" py.test
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- python setup.py install --skip-build -O1 --root="${pkgdir}"
- install -Dm 644 README.rst "${pkgdir}/usr/share/doc/${pkgname}/README"
-}
-
-# vim: ts=2 sw=2 et:
Copied: diffoscope/repos/community-x86_64/PKGBUILD (from rev 184679, diffoscope/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-07-30 23:08:01 UTC (rev 184680)
@@ -0,0 +1,69 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+
+pkgname=diffoscope
+pkgver=56
+pkgrel=1
+pkgdesc='Tool for in-depth comparison of files, archives, and directories'
+url='https://diffoscope.org/'
+arch=('x86_64')
+license=('GPL3')
+depends=('python-magic' 'python-libarchive-c' 'python-setuptools')
+# TODO: python-argcomplete
+optdepends=(
+ 'acl: access control list utilities support'
+ 'binutils: binary utilities support'
+ 'bzip2: bzip2 utilities support'
+ 'cdrkit: ISO utilities support'
+ 'colord: ICC profiles support'
+ 'cpio: cpio archive support'
+ 'diffutils: diff utilities support'
+ 'e2fsprogs: Ext2/3/4 filesystem utilities support'
+ 'enjarify: Android dex file support'
+ 'fpc: Free Pascal utilities support'
+ 'java-environment: java utilities support'
+ #'libcaca: image compare support'
+ 'fontforge: bitmap font utilities support'
+ 'gettext: GNU internationalization utilities support'
+ 'ghc: haskell utilities support'
+ 'gnupg: GNU privacy guard support'
+ 'mono-tools: mono utilities support'
+ 'poppler: PDF utilities support'
+ 'sqlite: SQLite support'
+ 'squashfs-tools: squashfs filesystem support'
+ #'python-guestfs: guestfs filesystem support'
+ 'tlsh: fuzzy matching supprt'
+ 'unzip: zip utilities support'
+ 'gzip: gzip utilities support'
+ 'tar: tar utilities support'
+ 'vim: Vi IMproved (xxd) utilities support'
+ 'xz: XZ and LZMA utilities support'
+)
+# TODO: readd fpc
+checkdepends=(
+ 'python-pytest' 'acl' 'binutils' 'bzip2' 'cdrkit' 'colord' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify' 'java-environment>=8' 'fontforge' 'gettext' 'ghc' 'gnupg'
+ 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools' 'tlsh' 'unzip' 'gzip' 'tar' 'vim' 'xz')
+source=(${pkgname}-${pkgver}.tar.xz::https://anonscm.debian.org/cgit/reproducible/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.xz)
+sha512sums=('37de87a9a0ab0460ca1d21eabcdf4fb901f4f1c1151a4ca006043caf99a75b945224e4fbbdb073349e6a4938a653e72e3092342f772571e8e8eed06feaf3a9e8')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ sed '/python-magic/d' -i setup.py
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ python setup.py build
+}
+
+check() {
+ cd ${pkgname}-${pkgver}
+ PYTHONPATH=".:${PYTHONPATH}" py.test
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ python setup.py install --skip-build -O1 --root="${pkgdir}"
+ install -Dm 644 README.rst "${pkgdir}/usr/share/doc/${pkgname}/README"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: sqlite-magic.patch
===================================================================
--- sqlite-magic.patch 2016-07-30 23:07:54 UTC (rev 184679)
+++ sqlite-magic.patch 2016-07-30 23:08:01 UTC (rev 184680)
@@ -1,34 +0,0 @@
-From 9dd11793b1b1bf0c742ed8e73484e37d772a4aeb Mon Sep 17 00:00:00 2001
-From: anthraxx <levente at leventepolyak.net>
-Date: Mon, 6 Jun 2016 20:23:14 +0200
-Subject: [PATCH] fix sqlite3 magic recognition when using file >= 5.27
-
-this fixes the recognition problems of sqlite3 as newer
-file versions add additional information to the magic
-recognition.
-The new string is like:
- SQLite 3.x database, last written using SQLite version 3008011
-
-To be compatible with both, newer and older file versions we
-check if the magic_file_type has any value and starts with the expected
-recognition string.
----
- diffoscope/comparators/sqlite.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/diffoscope/comparators/sqlite.py b/diffoscope/comparators/sqlite.py
-index e361dea..16706d7 100644
---- a/diffoscope/comparators/sqlite.py
-+++ b/diffoscope/comparators/sqlite.py
-@@ -32,7 +32,7 @@ class Sqlite3Dump(Command):
- class Sqlite3Database(File):
- @staticmethod
- def recognizes(file):
-- return file.magic_file_type == 'SQLite 3.x database'
-+ return file.magic_file_type and file.magic_file_type.startswith('SQLite 3.x database')
-
- def compare_details(self, other, source=None):
- return [Difference.from_command(Sqlite3Dump, self.path, other.path)]
---
-2.8.3
-
More information about the arch-commits
mailing list