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

Levente Polyak anthraxx at archlinux.org
Sat May 23 19:22:09 UTC 2020


    Date: Saturday, May 23, 2020 @ 19:22:08
  Author: anthraxx
Revision: 632477

upgpkg: diffoscope 144-2: checkdepend on LTS 11 java

Modified:
  diffoscope/trunk/PKGBUILD
Deleted:
  diffoscope/trunk/0001-Update-llvm-diff-for-llvm-10.patch

-----------------------------------------+
 0001-Update-llvm-diff-for-llvm-10.patch |   71 ------------------------------
 PKGBUILD                                |   14 ++---
 2 files changed, 5 insertions(+), 80 deletions(-)

Deleted: 0001-Update-llvm-diff-for-llvm-10.patch
===================================================================
--- 0001-Update-llvm-diff-for-llvm-10.patch	2020-05-23 19:21:48 UTC (rev 632476)
+++ 0001-Update-llvm-diff-for-llvm-10.patch	2020-05-23 19:22:08 UTC (rev 632477)
@@ -1,71 +0,0 @@
-From c645b977740b8c42a4b1ee8fe3f6856cac7cee1e Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle at archlinux.org>
-Date: Mon, 27 Apr 2020 21:48:51 +0200
-Subject: [PATCH] Update llvm diff for llvm 10.
-
-Signed-off-by: Jelle van der Waa <jelle at archlinux.org>
----
- tests/comparators/test_rlib.py            |  3 ++
- tests/data/rlib_llvm_dis_expected_diff_10 | 36 +++++++++++++++++++++++
- 2 files changed, 39 insertions(+)
- create mode 100644 tests/data/rlib_llvm_dis_expected_diff_10
-
-diff --git a/tests/comparators/test_rlib.py b/tests/comparators/test_rlib.py
-index e47a0f4b..180d6b66 100644
---- a/tests/comparators/test_rlib.py
-+++ b/tests/comparators/test_rlib.py
-@@ -74,6 +74,9 @@ def rlib_dis_expected_diff():
-     if LooseVersion(str(actual_ver)) >= LooseVersion("7.0"):
-         diff_file = 'rlib_llvm_dis_expected_diff_7'
- 
-+    if LooseVersion(str(actual_ver)) >= LooseVersion("10.0"):
-+        diff_file = 'rlib_llvm_dis_expected_diff_10'
-+
-     return get_data(diff_file)
- 
- 
-diff --git a/tests/data/rlib_llvm_dis_expected_diff_10 b/tests/data/rlib_llvm_dis_expected_diff_10
-new file mode 100644
-index 00000000..46316a2f
---- /dev/null
-+++ b/tests/data/rlib_llvm_dis_expected_diff_10
-@@ -0,0 +1,36 @@
-+@@ -42,32 +42,32 @@
-+ entry-block:
-+   %out.i.i = alloca i8*, align 8
-+   %4 = icmp ult i64 %3, 17
-+   br i1 %4, label %then-block-195-.i, label %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i
-+ 
-+ then-block-195-.i:                                ; preds = %entry-block
-+   %5 = tail call i8* @realloc(i8* %0, i64 %2) #2
-+-  br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
-++  br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
-+ 
-+ _ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i: ; preds = %entry-block
-+   %6 = bitcast i8** %out.i.i to i8*
-+   call void @llvm.lifetime.start.p0i8(i64 8, i8* %6) #2
-+   store i8* null, i8** %out.i.i, align 8
-+   %7 = call i32 @posix_memalign(i8** nonnull %out.i.i, i64 %3, i64 %2) #2
-+   %8 = icmp eq i32 %7, 0
-+   %9 = load i8*, i8** %out.i.i, align 8
-+   %sret_slot.0.i.i = select i1 %8, i8* %9, i8* null
-+   call void @llvm.lifetime.end.p0i8(i64 8, i8* %6) #2
-+   %10 = icmp ule i64 %2, %1
-+   %11 = select i1 %10, i64 %2, i64 %1
-+   call void @llvm.memmove.p0i8.p0i8.i64(i8* align 1 %sret_slot.0.i.i, i8* align 1 %0, i64 %11, i1 false)
-+   call void @free(i8* %0) #2
-+-  br label %_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit
-++  br label %_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit
-+ 
-+-_ZN12alloc_system3imp10reallocate17h4a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
-++_ZN12alloc_system3imp10reallocate1l44a0811c9ec086854E.exit: ; preds = %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i, %then-block-195-.i
-+   %sret_slot.0.i = phi i8* [ %5, %then-block-195-.i ], [ %sret_slot.0.i.i, %_ZN12alloc_system3imp8allocate17h8ba7625cc4a820e8E.exit.i ]
-+   ret i8* %sret_slot.0.i
-+ }
-+ 
-+ ; Function Attrs: nounwind readnone uwtable
-+ define i64 @__rust_reallocate_inplace(i8* nocapture readnone %0, i64 %1, i64 %2, i64 %3) unnamed_addr #1 {
-+ entry-block:
--- 
-2.26.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-23 19:21:48 UTC (rev 632476)
+++ PKGBUILD	2020-05-23 19:22:08 UTC (rev 632477)
@@ -2,7 +2,7 @@
 
 pkgname=diffoscope
 pkgver=144
-pkgrel=1
+pkgrel=2
 pkgdesc='Tool for in-depth comparison of files, archives, and directories'
 url='https://diffoscope.org/'
 arch=('x86_64')
@@ -59,16 +59,14 @@
 makedepends=('help2man' 'python-docutils' 'git')
 checkdepends=(
   'python-pytest' 'python-jsbeautifier' 'python-h5py' 'acl' 'binutils' 'bzip2' 'cdrtools' 'cpio' 'diffutils' 'e2fsprogs' 'enjarify'
-  'hdf5' 'imagemagick' 'java-environment=10' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools'
+  'hdf5' 'imagemagick' 'java-environment=11' 'fontforge' 'gettext' 'ghc' 'gnupg' 'mono' 'mono-tools' 'poppler' 'sqlite' 'squashfs-tools'
   'lz4' 'unzip' 'gzip' 'tar' 'tcpdump' 'vim' 'xz' 'llvm' 'colord' 'fpc' 'openssh' 'openssl' 'odt2txt' 'docx2txt' 'r' 'dtc' 'giflib'
   'gnumeric' 'python-progressbar' 'binwalk' 'python-argcomplete' 'zstd')
-source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc} 0001-Update-llvm-diff-for-llvm-10.patch)
+source=(https://diffoscope.org/archive/diffoscope-${pkgver}.tar.bz2{,.asc})
 sha512sums=('7d79a7298f27990ac519b39261fb1c815523a9acb7adc29097d3ff4a690ca172e3ce7ef56d5d4e89231579ce09865aa66effa157d87651027923ec8a7f10babb'
-            'SKIP'
-            '56b3ed348b58da1ab58ee2f01fb2a325a41608f65b3d869d0e2a7e269ddee7428080a059ebe4eb93397b65514243c5d96b95ef075122d05463e2dcd7074762d6')
+            'SKIP')
 b2sums=('be1525096f05324d594f901ddc10776200805eade365f424630a415bb0046a4214239358fc15105e8c05aae87023b68298b1cfe04048ff3b3ff6f4365dc8bcf4'
-        'SKIP'
-        'ec0e74f3201fe4b2a4514ec4628eaa28bc9d2cb7d24d2f3d8469f27a6eea1863173cbb508c8e86d0c75e1bdecd236d1377dd950e9dc4279ea4a146c8b4abad62')
+        'SKIP')
 validpgpkeys=("C2FE4BD271C139B86C533E461E953E27D4311E58") # "Chris Lamb <chris at chris-lamb.co.uk>"
 
 
@@ -75,8 +73,6 @@
 prepare() {
   cd ${pkgname}-${pkgver}
   sed '/python-magic/d' -i setup.py
-
-  #patch -Np1 -i ${srcdir}/0001-Update-llvm-diff-for-llvm-10.patch
 }
 
 build() {


More information about the arch-commits mailing list