From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Git 2.35.0
Date: Wed, 26 Jan 2022 03:11:43 +0100 [thread overview]
Message-ID: <20220126021143.AXCwm8UgMYNBGBCxZyhLNcJqgAlhIzsItEnEQAChP3E@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35227@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1200 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages git-mutt-update
https://github.com/void-linux/void-packages/pull/35227
Git 2.35.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35227.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-mutt-update-35227.patch --]
[-- Type: text/x-diff, Size: 5641 bytes --]
From c0ea33fe0e4e34e8283c77a0272a12584fd5b179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
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?=
- <congdanhqx@gmail.com>
-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 <congdanhqx@gmail.com>
----
- 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 fb880e77a44932747fef9097f473b015f8b2f2a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 25 Jan 2022 18:08:15 +0700
Subject: [PATCH 2/2] chroot-git: update to 2.35.0.
---
...001-Makefile-fix-parallel-build-race.patch | 33 -------------------
srcpkgs/chroot-git/template | 4 +--
2 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/chroot-git/patches/0001-Makefile-fix-parallel-build-race.patch
diff --git a/srcpkgs/chroot-git/patches/0001-Makefile-fix-parallel-build-race.patch b/srcpkgs/chroot-git/patches/0001-Makefile-fix-parallel-build-race.patch
deleted file mode 100644
index 9c75f813c304..000000000000
--- a/srcpkgs/chroot-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?=
- <congdanhqx@gmail.com>
-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 <congdanhqx@gmail.com>
----
- 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/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 <gottox@voidlinux.org>"
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"
next prev parent reply other threads:[~2022-01-26 2:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 11:10 [PR PATCH] " sgn
2022-01-25 11:43 ` clyhtsuriva
2022-01-25 11:47 ` clyhtsuriva
2022-01-25 11:51 ` clyhtsuriva
2022-01-25 12:11 ` clyhtsuriva
2022-01-26 2:11 ` sgn [this message]
2022-01-26 16:22 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220126021143.AXCwm8UgMYNBGBCxZyhLNcJqgAlhIzsItEnEQAChP3E@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).