Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Git update
@ 2021-08-17 11:42 sgn
  2021-08-17 12:59 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 1 reply; 3+ messages in thread
From: sgn @ 2021-08-17 11:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1567 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/32530

Git update
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32530.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-update-32530.patch --]
[-- Type: text/x-diff, Size: 4455 bytes --]

From 63178bd4981536041357a3002617aa8da3c089de 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, 17 Aug 2021 18:41:10 +0700
Subject: [PATCH 1/3] perl-CGI: depends on perl-HTML-Parser

Even Debian has this mandatory dependencies
---
 srcpkgs/perl-CGI/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-CGI/template b/srcpkgs/perl-CGI/template
index 5be4f7e271e4..74fb80e05bec 100644
--- a/srcpkgs/perl-CGI/template
+++ b/srcpkgs/perl-CGI/template
@@ -1,12 +1,12 @@
 # Template file for 'perl-CGI'
 pkgname=perl-CGI
 version=4.53
-revision=1
+revision=2
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="$hostmakedepends"
-depends="$hostmakedepends"
+depends="perl-HTML-Parser"
 checkdepends="perl-Test-Deep perl-HTML-Parser perl-Test-Warn"
 short_desc="Handle Common Gateway Interface requests and responses"
 maintainer="newbluemoon <blaumolch@mailbox.org>"

From 7fe3dbff84b025ba315c59ee457d5a0bc26276f5 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, 17 Aug 2021 18:41:11 +0700
Subject: [PATCH 2/3] git: update to 2.33.0.

---
 srcpkgs/git/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 9ddd445769f3..37bd50d1d30d 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,20 +1,20 @@
 # Template file for 'git'
 pkgname=git
-version=2.32.0
+version=2.33.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey"
+checkdepends="gnupg cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
+ perl-Term-ReadKey perl-CGI"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 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=68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From a8d9fcbd7d959fae9a16da9df6effc3780790471 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, 17 Aug 2021 18:41:13 +0700
Subject: [PATCH 3/3] chroot-git: update to 2.33.0.

---
 srcpkgs/chroot-git/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 7da8a60d903d..2bdb4d76bee0 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,20 +1,19 @@
 # Template file for 'chroot-git'
 pkgname=chroot-git
-version=2.31.1
+version=2.33.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
-make_check_target=test
 makedepends="zlib-devel"
 short_desc="GIT Tree History Storage Tool -- for xbps-src use"
 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=9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680
+checksum=bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
 
 if [ "$CHROOT_READY" ]; then
-	hostmakedepends="perl tar"
+	checkdepends="perl gnupg"
 else
 	configure_args+=" --with-zlib=${XBPS_MASTERDIR}/usr"
 fi
@@ -28,7 +27,7 @@ do_configure() {
 	CFLAGS = $CFLAGS
 	LDFLAGS = $LDFLAGS
 	CC_LD_DYNPATH=-L
-	NO_INSTALL_HARDLINKS=Yes
+	SKIP_DASHED_BUILT_INS = Yes
 	NO_GETTEXT=Yes
 	NO_OPENSSL = Yes
 	USE_LIBPCRE :=
@@ -38,6 +37,8 @@ do_configure() {
 	NO_PERL = Yes
 	NO_PYTHON = Yes
 	NO_TCLTK = Yes
+	DEFAULT_TEST_TARGET = prove
+	GIT_PROVE_OPTS = $makejobs
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -52,6 +53,10 @@ do_build() {
 	make ${makejobs} git
 }
 
+do_check() {
+	make test
+}
+
 do_install() {
 	vbin git chroot-git
 }

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: Git update
  2021-08-17 11:42 [PR PATCH] Git update sgn
@ 2021-08-17 12:59 ` sgn
  0 siblings, 0 replies; 3+ messages in thread
From: sgn @ 2021-08-17 12:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1421 bytes --]

There's a merged pull request on the void-packages repository

Git update
https://github.com/void-linux/void-packages/pull/32530

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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] 3+ messages in thread

* [PR PATCH] Git update
@ 2022-10-04  0:44 sgn
  0 siblings, 0 replies; 3+ messages in thread
From: sgn @ 2022-10-04  0:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1217 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/39687

Git update
<!-- 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/39687.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-update-39687.patch --]
[-- Type: text/x-diff, Size: 4624 bytes --]

From fd15e5fcaa2ef934921d4239a44f476044f62f70 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, 4 Oct 2022 07:43:18 +0700
Subject: [PATCH 1/2] chroot-git: update to 2.38.0.

---
 srcpkgs/chroot-git/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 308bd62f8056..854ec7c2a168 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.37.3
+version=2.38.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,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=814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a
+checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
@@ -66,9 +66,10 @@ do_check() {
 }
 
 do_install() {
-	vbin git chroot-git
+	vmkdir usr/bin
 	vmkdir usr/libexec/chroot-git
-	ln -s ../../bin/chroot-git $DESTDIR/usr/libexec/chroot-git/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 b939621de7ce7850af9ab6bb51c6c442dbac8939 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, 4 Oct 2022 07:43:04 +0700
Subject: [PATCH 2/2] git: update to 2.38.0.

---
 srcpkgs/git-scalar   |  1 +
 srcpkgs/git/template | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/git-scalar

diff --git a/srcpkgs/git-scalar b/srcpkgs/git-scalar
new file mode 120000
index 000000000000..0899c2993dab
--- /dev/null
+++ b/srcpkgs/git-scalar
@@ -0,0 +1 @@
+git
\ No newline at end of file
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 38259d411661..40e0c0bf10fd 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.37.3
+version=2.38.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,12 +14,13 @@ 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=814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a
+checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
 
-subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
+subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc
+ git-scalar"
 
 do_configure() {
 	cat <<-EOF >config.mak
@@ -38,6 +39,9 @@ do_configure() {
 	GIT_PROVE_OPTS = $makejobs
 	# firstword (uname -m)
 	HOST_CPU = ${XBPS_TARGET_MACHINE%-musl}
+	# this flag will skip shipping unneeded symlinks
+	# those symlinks were kept for scripts written before 2010
+	SKIP_DASHED_BUILT_INS = Yes
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -51,8 +55,7 @@ do_configure() {
 }
 
 do_build() {
-	make ${makejobs}
-	make ${makejobs} -C Documentation man
+	make ${makejobs} all man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
 	make ${makejobs} -C contrib/subtree all man
@@ -68,7 +71,7 @@ do_check() {
 }
 
 do_install() {
-	make DESTDIR=${DESTDIR} install install-doc
+	make DESTDIR=${DESTDIR} install install-man
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git
@@ -83,6 +86,16 @@ do_install() {
 	make -C contrib/credential/netrc DESTDIR=${DESTDIR} install
 }
 
+git-scalar_package() {
+	depends="git"
+	short_desc="Tool for managing large Git repositories"
+	pkg_install() {
+		vmove usr/bin/scalar
+		vmove usr/libexec/git-core/scalar
+		vmove usr/share/man/man1/scalar.1
+	}
+}
+
 git-cvs_package() {
 	depends="${sourcepkg}-${version}_${revision} cvs cvsps2 perl-DBD-SQLite"
 	short_desc+=" - CVS support"

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-10-04  0:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-17 11:42 [PR PATCH] Git update sgn
2021-08-17 12:59 ` [PR PATCH] [Merged]: " sgn
2022-10-04  0:44 [PR PATCH] " 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).