From 81bd5766d154d09881e1e43efb3dd35bf5e77928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 25 Jan 2022 18:08:15 +0700 Subject: [PATCH 1/2] git: update to 2.35.0. --- ...001-Makefile-fix-parallel-build-race.patch | 33 ------------------- srcpkgs/git/template | 4 +-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/git/patches/0001-Makefile-fix-parallel-build-race.patch diff --git a/srcpkgs/git/patches/0001-Makefile-fix-parallel-build-race.patch b/srcpkgs/git/patches/0001-Makefile-fix-parallel-build-race.patch deleted file mode 100644 index 9c75f813c304..000000000000 --- a/srcpkgs/git/patches/0001-Makefile-fix-parallel-build-race.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7d82342089a80b19e54ac8997d5765a33951499f Mon Sep 17 00:00:00 2001 -Message-Id: <7d82342089a80b19e54ac8997d5765a33951499f.1637112066.git.congdanhqx@gmail.com> -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Wed, 17 Nov 2021 08:19:22 +0700 -Subject: [PATCH] Makefile: fix parallel build race -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* builtin/bugreport.c includes hook-list.h, hence generated files from -it must depend on hook-list.h - -Signed-off-by: Đoàn Trần Công Danh ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile b/Makefile -index 241dc322c0..413503b488 100644 ---- a/Makefile -+++ b/Makefile -@@ -2222,6 +2222,7 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) - - help.sp help.s help.o: command-list.h - hook.sp hook.s hook.o: hook-list.h -+builtin/bugreport.sp builtin/bugreport.s builtin/bugreport.o: hook-list.h - - builtin/help.sp builtin/help.s builtin/help.o: config-list.h hook-list.h GIT-PREFIX - builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \ --- -2.34.0.rc1 - diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 578474266412..afd03f4de559 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,6 +1,6 @@ # Template file for 'git' pkgname=git -version=2.34.1 +version=2.35.0 revision=1 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto" makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel" @@ -14,7 +14,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=3a0755dd1cfab71a24dd96df3498c29cd0acd13b04f3d08bf933e81286db802c +checksum=47e677b475226857ceece569fb6ded8b85838ede97ae1e01bd365ac32a468fc8 replaces="git-perl>=0" register_shell=/usr/bin/git-shell python_version=3 From badd06ce37315eea05e5887e14641a221fef2042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 25 Jan 2022 18:08:15 +0700 Subject: [PATCH 2/2] chroot-git: update to 2.35.0. --- srcpkgs/chroot-git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index 35de5f4f9416..71b54871c7cb 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -1,6 +1,6 @@ # Template file for 'chroot-git' pkgname=chroot-git -version=2.34.1 +version=2.35.0 revision=1 bootstrap=yes wrksrc="git-${version}" @@ -10,7 +10,7 @@ maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://git-scm.com/" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=3a0755dd1cfab71a24dd96df3498c29cd0acd13b04f3d08bf933e81286db802c +checksum=47e677b475226857ceece569fb6ded8b85838ede97ae1e01bd365ac32a468fc8 if [ "$CHROOT_READY" ]; then checkdepends="perl gnupg"