* [PR PATCH] Git update to 2.39.0
@ 2022-12-12 16:15 sgn
2022-12-12 17:13 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2022-12-12 16:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages git-update
https://github.com/void-linux/void-packages/pull/41042
Git update to 2.39.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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/41042.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-update-41042.patch --]
[-- Type: text/x-diff, Size: 3161 bytes --]
From ff7bcaea217d87ce4df9d36e106fd8e2e0b75da8 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: Mon, 12 Dec 2022 23:13:31 +0700
Subject: [PATCH 1/2] chroot-git: update to 2.39.0.
---
srcpkgs/chroot-git/template | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 03d590fcabdd..7bbebc45ca39 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.38.1
+version=2.39.0
revision=1
bootstrap=yes
makedepends="zlib-devel"
@@ -9,7 +9,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
homepage="https://git-scm.com/"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=97ddf8ea58a2b9e0fbc2508e245028ca75911bd38d1551616b148c1aa5740ad9
+checksum=ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b
if [ "$CHROOT_READY" ]; then
checkdepends="perl gnupg"
@@ -61,14 +61,17 @@ do_build() {
}
do_check() {
- make test
+ if [ "$CHROOT_READY" ] && [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
+ export IKNOWWHATIAMDOING=YES
+ fi
+ make test ${makejobs}
}
do_install() {
vmkdir usr/bin
vmkdir usr/libexec/chroot-git
+ vbin git chroot-git
vinstall git 755 usr/libexec/chroot-git
- ln -s ../libexec/chroot-git/git $DESTDIR/usr/bin/chroot-git
ln -s git $DESTDIR/usr/libexec/chroot-git/git-upload-pack
ln -s git $DESTDIR/usr/libexec/chroot-git/git-receive-pack
if [ "$CHROOT_READY" ]; then
From 28421710e0a1453dc79fc1441c2f1176dd810c5a 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: Mon, 12 Dec 2022 23:13:43 +0700
Subject: [PATCH 2/2] git: update to 2.39.0.
---
srcpkgs/git/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 887cc3500eab..fb481715f090 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
# Template file for 'git'
pkgname=git
-version=2.38.2
+version=2.39.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=115a1f8245cc67d4b1ac867047878b3130aa03d6acf22380b029239ed7170664
+checksum=ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b
replaces="git-perl>=0"
register_shell=/usr/bin/git-shell
python_version=3
@@ -64,7 +64,11 @@ do_build() {
}
do_check() {
- make test
+ if [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
+ IKNOWWHATIAMDOING=YES make test ${makejobs}
+ else
+ make test ${makejobs}
+ fi
make -C contrib/diff-highlight test
make -C contrib/subtree test
make -C contrib/credential/netrc test
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: Git update to 2.39.0
2022-12-12 16:15 [PR PATCH] Git update to 2.39.0 sgn
@ 2022-12-12 17:13 ` sgn
0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2022-12-12 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
There's a merged pull request on the void-packages repository
Git update to 2.39.0
https://github.com/void-linux/void-packages/pull/41042
Description:
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-12 17:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-12 16:15 [PR PATCH] Git update to 2.39.0 sgn
2022-12-12 17:13 ` [PR PATCH] [Merged]: " sgn
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).