* [PR PATCH] [WIP] libgit2 1.8
@ 2024-06-20 8:11 tranzystorekk
2024-06-20 8:26 ` [PR PATCH] [Updated] " tranzystorekk
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: tranzystorekk @ 2024-06-20 8:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1420 bytes --]
There is a new pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages libgit2-1.8
https://github.com/void-linux/void-packages/pull/50901
[WIP] libgit2 1.8
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.
<!--
#### 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/50901.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.8-50901.patch --]
[-- Type: text/x-diff, Size: 7529 bytes --]
From 5a6d40ec77a7a7a0b1b961c33c1a38951f67ec11 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Jun 2024 13:32:44 +0200
Subject: [PATCH 1/2] llhttp: update to 9.2.1
---
common/shlibs | 2 +-
srcpkgs/llhttp/files/Makefile | 25 -------------------
.../patches/allow-build-type-none.patch | 17 +++++++++++++
srcpkgs/llhttp/template | 19 +++++---------
4 files changed, 24 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/llhttp/files/Makefile
create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch
diff --git a/common/shlibs b/common/shlibs
index 4ebfd6bb20f6ad..d76059edceecb0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3664,7 +3664,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.1 llhttp-1.0.1_1
+libllhttp.so.9 llhttp-9.2.1_1
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile
deleted file mode 100644
index 910e584e97f5db..00000000000000
--- a/srcpkgs/llhttp/files/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile template for shared library
-
-CC ?= gcc
-override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude
-override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1
-RM = rm -f
-TARGET_LIB = libllhttp.so.1.0
-
-SRCS = src/api.c src/http.c src/llhttp.c
-OBJS = $(SRCS:.c=.o)
-
-.PHONY: all
-all: ${TARGET_LIB}
-
-$(TARGET_LIB): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(SRCS:.c=.d):%.d:%.c
- $(CC) $(CFLAGS) -MM $< >$@
-
-include $(SRCS:.c=.d)
-
-.PHONY: clean
-clean:
- -${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d)
diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch
new file mode 100644
index 00000000000000..517f213d5a71eb
--- /dev/null
+++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87a6692..e48c81b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE)
+ else()
+ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+- if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+- endif()
++ # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
++ # message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
++ # endif()
+ endif()
+ endif()
+
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index b2fbc9dd79325c..b04e6f9606e1be 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,9 +4,9 @@
# or at least a revbump in the same pull request since they work in-sync.
pkgname=llhttp
-version=2.2.1
+version=9.2.1
revision=1
-build_style=gnu-makefile
+build_style=cmake
short_desc="Port of http_parser to llparse"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
@@ -14,18 +14,9 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
-post_extract() {
- # No need to pull in gyp for such a simple Makefile...
- cp ${FILESDIR}/Makefile ${wrksrc}
-}
-
-do_install() {
- vinstall libllhttp.so.1.0 755 /usr/lib
- ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1
- ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so
- vcopy include /usr
+post_install() {
vlicense LICENSE-MIT
}
@@ -34,6 +25,8 @@ llhttp-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}
From b08350997321dd82247aa3dedeb2806bdedda9ae Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 17 Apr 2024 10:05:10 +0200
Subject: [PATCH 2/2] libgit2: update to 1.8.1
---
common/shlibs | 4 ++--
.../disable-test-validate_current_user_ownership.patch | 10 +++++-----
srcpkgs/libgit2/template | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d76059edceecb0..31a74149cfef14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1331,7 +1331,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.7 libgit2-1.7.2_1
+libgit2.so.1.8 libgit2-1.8.0_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
@@ -3664,7 +3664,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.9 llhttp-9.2.1_1
+libllhttp.so.9.2 llhttp-9.2.1_1
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 3f316543f36b22..3cbe2c9b773f4e 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,8 +1,8 @@
-diff --git a/tests/util/path.c b/tests/util/path.c
-index 02ec42f..60f7d70 100644
---- a/tests/util/path.c
-+++ b/tests/util/path.c
-@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
+diff --git a/tests/util/path/core.c b/tests/util/path/core.c
+index d1935a8..bcbabf9 100644
+--- a/tests/util/path/core.c
++++ b/tests/util/path/core.c
+@@ -761,7 +761,7 @@ void test_path_core__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 5c4e1a48a75c7c..f7c1d6665c606a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,17 +1,17 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.7.2
+version=1.8.1
revision=1
build_style=cmake
-configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
hostmakedepends="python3 pkg-config"
-makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
short_desc="Git linkable library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
+checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
@ 2024-06-20 8:26 ` tranzystorekk
2024-07-08 6:13 ` icp1994
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-06-20 8:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1425 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages libgit2-1.8
https://github.com/void-linux/void-packages/pull/50901
[WIP] libgit2 1.8
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.
<!--
#### 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/50901.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.8-50901.patch --]
[-- Type: text/x-diff, Size: 7205 bytes --]
From 246d3e80588cdcca02a3ec927c890f562715cb9d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Jun 2024 13:32:44 +0200
Subject: [PATCH 1/2] llhttp: update to 9.2.1
---
common/shlibs | 2 +-
srcpkgs/llhttp/files/Makefile | 25 -------------------
.../patches/allow-build-type-none.patch | 17 +++++++++++++
srcpkgs/llhttp/template | 19 +++++---------
4 files changed, 24 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/llhttp/files/Makefile
create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch
diff --git a/common/shlibs b/common/shlibs
index 4ebfd6bb20f6ad..b53f3ea70100de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3664,7 +3664,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.1 llhttp-1.0.1_1
+libllhttp.so.9.2 llhttp-9.2.1_1
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile
deleted file mode 100644
index 910e584e97f5db..00000000000000
--- a/srcpkgs/llhttp/files/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile template for shared library
-
-CC ?= gcc
-override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude
-override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1
-RM = rm -f
-TARGET_LIB = libllhttp.so.1.0
-
-SRCS = src/api.c src/http.c src/llhttp.c
-OBJS = $(SRCS:.c=.o)
-
-.PHONY: all
-all: ${TARGET_LIB}
-
-$(TARGET_LIB): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(SRCS:.c=.d):%.d:%.c
- $(CC) $(CFLAGS) -MM $< >$@
-
-include $(SRCS:.c=.d)
-
-.PHONY: clean
-clean:
- -${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d)
diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch
new file mode 100644
index 00000000000000..517f213d5a71eb
--- /dev/null
+++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87a6692..e48c81b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE)
+ else()
+ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+- if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+- endif()
++ # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
++ # message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
++ # endif()
+ endif()
+ endif()
+
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index b2fbc9dd79325c..b04e6f9606e1be 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,9 +4,9 @@
# or at least a revbump in the same pull request since they work in-sync.
pkgname=llhttp
-version=2.2.1
+version=9.2.1
revision=1
-build_style=gnu-makefile
+build_style=cmake
short_desc="Port of http_parser to llparse"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
@@ -14,18 +14,9 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
-post_extract() {
- # No need to pull in gyp for such a simple Makefile...
- cp ${FILESDIR}/Makefile ${wrksrc}
-}
-
-do_install() {
- vinstall libllhttp.so.1.0 755 /usr/lib
- ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1
- ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so
- vcopy include /usr
+post_install() {
vlicense LICENSE-MIT
}
@@ -34,6 +25,8 @@ llhttp-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}
From 6dcf57ed09f91b8e52abeaa2f297923e4d7d2d9d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 20 Jun 2024 10:22:54 +0200
Subject: [PATCH 2/2] libgit2: update to 1.8.1
---
common/shlibs | 2 +-
.../disable-test-validate_current_user_ownership.patch | 10 +++++-----
srcpkgs/libgit2/template | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b53f3ea70100de..73d6d726d9daac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1331,7 +1331,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.7 libgit2-1.7.2_1
+libgit2.so.1.8 libgit2-1.8.1_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 3f316543f36b22..3cbe2c9b773f4e 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,8 +1,8 @@
-diff --git a/tests/util/path.c b/tests/util/path.c
-index 02ec42f..60f7d70 100644
---- a/tests/util/path.c
-+++ b/tests/util/path.c
-@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
+diff --git a/tests/util/path/core.c b/tests/util/path/core.c
+index d1935a8..bcbabf9 100644
+--- a/tests/util/path/core.c
++++ b/tests/util/path/core.c
+@@ -761,7 +761,7 @@ void test_path_core__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 5c4e1a48a75c7c..f7c1d6665c606a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,17 +1,17 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.7.2
+version=1.8.1
revision=1
build_style=cmake
-configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
hostmakedepends="python3 pkg-config"
-makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
short_desc="Git linkable library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
+checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
2024-06-20 8:26 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-07-08 6:13 ` icp1994
2024-07-08 7:33 ` tranzystorekk
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: icp1994 @ 2024-07-08 6:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/50901#issuecomment-2213107738
Comment:
`git-absorb` bump requires `libgit2 >= 1.8.1 libgit2 < 1.9.0`
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
2024-06-20 8:26 ` [PR PATCH] [Updated] " tranzystorekk
2024-07-08 6:13 ` icp1994
@ 2024-07-08 7:33 ` tranzystorekk
2024-07-31 22:41 ` SpidFightFR
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-07-08 7:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/50901#issuecomment-2213245022
Comment:
I'd stick to manually downgrading git2 back to 0.18 for now
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (2 preceding siblings ...)
2024-07-08 7:33 ` tranzystorekk
@ 2024-07-31 22:41 ` SpidFightFR
2024-08-03 16:56 ` [PR PATCH] [Updated] " tranzystorekk
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: SpidFightFR @ 2024-07-31 22:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by SpidFightFR on void-packages repository
https://github.com/void-linux/void-packages/pull/50901#issuecomment-2261577791
Comment:
Hey, any news on that front?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (3 preceding siblings ...)
2024-07-31 22:41 ` SpidFightFR
@ 2024-08-03 16:56 ` tranzystorekk
2024-08-03 17:28 ` tranzystorekk
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-08-03 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1425 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages libgit2-1.8
https://github.com/void-linux/void-packages/pull/50901
[WIP] libgit2 1.8
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.
<!--
#### 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/50901.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.8-50901.patch --]
[-- Type: text/x-diff, Size: 13489 bytes --]
From db940fac167faf95fbab383662aa3ff28ac83fd6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 14 Jun 2024 13:32:44 +0200
Subject: [PATCH 1/4] llhttp: update to 9.2.1
---
common/shlibs | 2 +-
srcpkgs/llhttp/files/Makefile | 25 -------------------
.../patches/allow-build-type-none.patch | 17 +++++++++++++
srcpkgs/llhttp/template | 19 +++++---------
4 files changed, 24 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/llhttp/files/Makefile
create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch
diff --git a/common/shlibs b/common/shlibs
index 677802f70a0add..359c123e947019 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3679,7 +3679,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.1 llhttp-1.0.1_1
+libllhttp.so.9.2 llhttp-9.2.1_1
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile
deleted file mode 100644
index 910e584e97f5db..00000000000000
--- a/srcpkgs/llhttp/files/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile template for shared library
-
-CC ?= gcc
-override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude
-override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1
-RM = rm -f
-TARGET_LIB = libllhttp.so.1.0
-
-SRCS = src/api.c src/http.c src/llhttp.c
-OBJS = $(SRCS:.c=.o)
-
-.PHONY: all
-all: ${TARGET_LIB}
-
-$(TARGET_LIB): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(SRCS:.c=.d):%.d:%.c
- $(CC) $(CFLAGS) -MM $< >$@
-
-include $(SRCS:.c=.d)
-
-.PHONY: clean
-clean:
- -${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d)
diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch
new file mode 100644
index 00000000000000..517f213d5a71eb
--- /dev/null
+++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87a6692..e48c81b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE)
+ else()
+ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+- if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+- endif()
++ # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
++ # message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
++ # endif()
+ endif()
+ endif()
+
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index b2fbc9dd79325c..b04e6f9606e1be 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,9 +4,9 @@
# or at least a revbump in the same pull request since they work in-sync.
pkgname=llhttp
-version=2.2.1
+version=9.2.1
revision=1
-build_style=gnu-makefile
+build_style=cmake
short_desc="Port of http_parser to llparse"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
@@ -14,18 +14,9 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
-post_extract() {
- # No need to pull in gyp for such a simple Makefile...
- cp ${FILESDIR}/Makefile ${wrksrc}
-}
-
-do_install() {
- vinstall libllhttp.so.1.0 755 /usr/lib
- ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1
- ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so
- vcopy include /usr
+post_install() {
vlicense LICENSE-MIT
}
@@ -34,6 +25,8 @@ llhttp-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}
From 6a645a7e4d63f0054b6fd4248b66dc7927455dbf Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 20 Jun 2024 10:22:54 +0200
Subject: [PATCH 2/4] libgit2: update to 1.8.1
---
common/shlibs | 2 +-
...isable-test-validate_current_user_ownership.patch | 10 +++++-----
srcpkgs/libgit2/template | 12 +++++-------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 359c123e947019..ce7d58e0c6535f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1341,7 +1341,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.7 libgit2-1.7.2_1
+libgit2.so.1.8 libgit2-1.8.1_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 3f316543f36b22..3cbe2c9b773f4e 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,8 +1,8 @@
-diff --git a/tests/util/path.c b/tests/util/path.c
-index 02ec42f..60f7d70 100644
---- a/tests/util/path.c
-+++ b/tests/util/path.c
-@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
+diff --git a/tests/util/path/core.c b/tests/util/path/core.c
+index d1935a8..bcbabf9 100644
+--- a/tests/util/path/core.c
++++ b/tests/util/path/core.c
+@@ -761,7 +761,7 @@ void test_path_core__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 5c4e1a48a75c7c..9eb96db43e553a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,21 +1,19 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.7.2
+version=1.8.1
revision=1
build_style=cmake
-configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
hostmakedepends="python3 pkg-config"
-makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
short_desc="Git linkable library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
+checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
-if [ "$XBPS_CHECK_PKGS" ]; then
- configure_args+=" -DBUILD_TESTS=ON"
-else
+if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=OFF"
fi
From af5a0175a55c1c7817825fb387b8062816fb7bd3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 20 Jun 2024 10:41:49 +0200
Subject: [PATCH 3/4] libgit2-glib: rebuild for libgit2-1.8
---
.../libgit2-glib/patches/libgit2-1.8.patch | 103 ++++++++++++++++++
srcpkgs/libgit2-glib/template | 2 +-
2 files changed, 104 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libgit2-glib/patches/libgit2-1.8.patch
diff --git a/srcpkgs/libgit2-glib/patches/libgit2-1.8.patch b/srcpkgs/libgit2-glib/patches/libgit2-1.8.patch
new file mode 100644
index 00000000000000..bb232cbf189079
--- /dev/null
+++ b/srcpkgs/libgit2-glib/patches/libgit2-1.8.patch
@@ -0,0 +1,103 @@
+From a76fdf96c3af9ce9d21a3985c4be8a1aa6eea661 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Fri, 5 Apr 2024 10:28:16 +0200
+Subject: [PATCH] build: Fix build against, and require, libgit2 1.8.0
+
+---
+ libgit2-glib/ggit-clone-options.c | 1 +
+ libgit2-glib/ggit-cred-ssh-interactive.c | 2 +-
+ libgit2-glib/ggit-remote-callbacks.h | 1 +
+ libgit2-glib/ggit-repository.c | 4 ++--
+ libgit2-glib/ggit-types.h | 3 ++-
+ meson.build | 2 +-
+ 6 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c
+index b47fdb1..30c7d86 100644
+--- a/libgit2-glib/ggit-clone-options.c
++++ b/libgit2-glib/ggit-clone-options.c
+@@ -19,6 +19,7 @@
+ */
+
+ #include <git2.h>
++#include <git2/sys/errors.h>
+ #include <gio/gio.h>
+
+ #include "ggit-clone-options.h"
+diff --git a/libgit2-glib/ggit-cred-ssh-interactive.c b/libgit2-glib/ggit-cred-ssh-interactive.c
+index 4f60f8b..0bdca95 100644
+--- a/libgit2-glib/ggit-cred-ssh-interactive.c
++++ b/libgit2-glib/ggit-cred-ssh-interactive.c
+@@ -191,7 +191,7 @@ callback_wrapper (const char *name,
+ {
+ gchar *text;
+
+- text = g_strndup (prompts[i].text, prompts[i].length);
++ text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length);
+
+ wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname,
+ winstruction,
+diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h
+index 3005ff4..2340712 100644
+--- a/libgit2-glib/ggit-remote-callbacks.h
++++ b/libgit2-glib/ggit-remote-callbacks.h
+@@ -24,6 +24,7 @@
+
+ #include <glib-object.h>
+ #include <git2.h>
++#include <git2/sys/errors.h>
+ #include <libgit2-glib/ggit-cred.h>
+
+ G_BEGIN_DECLS
+diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c
+index bf099f6..936c6fc 100644
+--- a/libgit2-glib/ggit-repository.c
++++ b/libgit2-glib/ggit-repository.c
+@@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository *repository,
+ message,
+ _ggit_native_get (tree),
+ parent_count,
+- (const git_commit **)parents_native);
++ (gpointer)parents_native);
+
+ g_free (parents_native);
+
+@@ -3323,7 +3323,7 @@ ggit_repository_create_commit_buffer(GgitRepository *repository,
+ message,
+ _ggit_tree_get_tree (tree),
+ parent_count,
+- (git_commit const **)parents_native);
++ (gpointer)parents_native);
+
+ g_free (parents_native);
+
+diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
+index 7e28975..2a2ed99 100644
+--- a/libgit2-glib/ggit-types.h
++++ b/libgit2-glib/ggit-types.h
+@@ -355,7 +355,8 @@ typedef enum
+ GGIT_CONFIG_LEVEL_XDG = 3,
+ GGIT_CONFIG_LEVEL_GLOBAL = 4,
+ GGIT_CONFIG_LEVEL_LOCAL = 5,
+- GGIT_CONFIG_LEVEL_APP = 6,
++ GGIT_CONFIG_LEVEL_WORKTREE = 6,
++ GGIT_CONFIG_LEVEL_APP = 7,
+ GGIT_CONFIG_LEVEL_HIGHEST = -1
+ } GgitConfigLevel;
+
+diff --git a/meson.build b/meson.build
+index e54a8b4..c21107d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req)
+ gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
+ gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
+
+-libgit2_dep = dependency('libgit2', version: '>= 0.25.0')
++libgit2_dep = dependency('libgit2', version: '>= 1.8.0')
+
+ # XXX: Not nice, but probably our best option
+ enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found()
+--
+GitLab
+
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 37a02337da3736..4203bf1ad73969 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2-glib'
pkgname=libgit2-glib
version=1.2.0
-revision=2
+revision=3
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From accc77a979e5b3eaebdf26b8ba374839eded49bf Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 20 Jun 2024 13:32:56 +0200
Subject: [PATCH 4/4] python3-pygit2: update to 1.15.0
---
srcpkgs/python3-pygit2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index 34d2aef6920200..4166243638d6f4 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.13.3
+version=1.15.0
revision=1
build_style=python3-pep517
hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
@@ -14,4 +14,4 @@ license="LGPL-2.0-only"
homepage="https://www.pygit2.org/"
changelog="https://github.com/libgit2/pygit2/blob/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pygit2/pygit2-${version}.tar.gz"
-checksum=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
+checksum=a635525ffc74128669de2f63460a94c9d5609634a4875c0aafce510fdeec17ac
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (4 preceding siblings ...)
2024-08-03 16:56 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-08-03 17:28 ` tranzystorekk
2024-08-03 17:36 ` tranzystorekk
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-08-03 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1425 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages libgit2-1.8
https://github.com/void-linux/void-packages/pull/50901
[WIP] libgit2 1.8
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.
<!--
#### 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/50901.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.8-50901.patch --]
[-- Type: text/x-diff, Size: 13497 bytes --]
From 7363f3c92cfd4880b6d88ab5817df7a284229c95 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sat, 3 Aug 2024 19:25:30 +0200
Subject: [PATCH 1/4] llhttp: update to 9.2.1
---
common/shlibs | 2 +-
srcpkgs/llhttp/files/Makefile | 25 -------------------
.../patches/allow-build-type-none.patch | 17 +++++++++++++
srcpkgs/llhttp/template | 19 +++++---------
4 files changed, 24 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/llhttp/files/Makefile
create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch
diff --git a/common/shlibs b/common/shlibs
index 677802f70a0add..359c123e947019 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3679,7 +3679,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.1 llhttp-1.0.1_1
+libllhttp.so.9.2 llhttp-9.2.1_1
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile
deleted file mode 100644
index 910e584e97f5db..00000000000000
--- a/srcpkgs/llhttp/files/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile template for shared library
-
-CC ?= gcc
-override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude
-override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1
-RM = rm -f
-TARGET_LIB = libllhttp.so.1.0
-
-SRCS = src/api.c src/http.c src/llhttp.c
-OBJS = $(SRCS:.c=.o)
-
-.PHONY: all
-all: ${TARGET_LIB}
-
-$(TARGET_LIB): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(SRCS:.c=.d):%.d:%.c
- $(CC) $(CFLAGS) -MM $< >$@
-
-include $(SRCS:.c=.d)
-
-.PHONY: clean
-clean:
- -${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d)
diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch
new file mode 100644
index 00000000000000..517f213d5a71eb
--- /dev/null
+++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87a6692..e48c81b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE)
+ else()
+ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+- if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+- endif()
++ # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
++ # message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
++ # endif()
+ endif()
+ endif()
+
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index b2fbc9dd79325c..b04e6f9606e1be 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,9 +4,9 @@
# or at least a revbump in the same pull request since they work in-sync.
pkgname=llhttp
-version=2.2.1
+version=9.2.1
revision=1
-build_style=gnu-makefile
+build_style=cmake
short_desc="Port of http_parser to llparse"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
@@ -14,18 +14,9 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
-post_extract() {
- # No need to pull in gyp for such a simple Makefile...
- cp ${FILESDIR}/Makefile ${wrksrc}
-}
-
-do_install() {
- vinstall libllhttp.so.1.0 755 /usr/lib
- ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1
- ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so
- vcopy include /usr
+post_install() {
vlicense LICENSE-MIT
}
@@ -34,6 +25,8 @@ llhttp-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}
From c8a4255ad2ac2e89ff965b743cb5c1823436295a Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sat, 3 Aug 2024 19:25:52 +0200
Subject: [PATCH 2/4] libgit2: update to 1.8.1
---
common/shlibs | 2 +-
...isable-test-validate_current_user_ownership.patch | 10 +++++-----
srcpkgs/libgit2/template | 12 +++++-------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 359c123e947019..ce7d58e0c6535f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1341,7 +1341,7 @@ libunwind-ppc64.so.8 libunwind-1.5.0_3
libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
libmicrodns.so.1 libmicrodns-0.2.0_1
-libgit2.so.1.7 libgit2-1.7.2_1
+libgit2.so.1.8 libgit2-1.8.1_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
index 3f316543f36b22..3cbe2c9b773f4e 100644
--- a/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
+++ b/srcpkgs/libgit2/patches/disable-test-validate_current_user_ownership.patch
@@ -1,8 +1,8 @@
-diff --git a/tests/util/path.c b/tests/util/path.c
-index 02ec42f..60f7d70 100644
---- a/tests/util/path.c
-+++ b/tests/util/path.c
-@@ -761,7 +761,7 @@ void test_path__validate_current_user_ownership(void)
+diff --git a/tests/util/path/core.c b/tests/util/path/core.c
+index d1935a8..bcbabf9 100644
+--- a/tests/util/path/core.c
++++ b/tests/util/path/core.c
+@@ -761,7 +761,7 @@ void test_path_core__validate_current_user_ownership(void)
cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
#else
cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 5c4e1a48a75c7c..9eb96db43e553a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,21 +1,19 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.7.2
+version=1.8.1
revision=1
build_style=cmake
-configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
hostmakedepends="python3 pkg-config"
-makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
short_desc="Git linkable library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
-checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
+checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
-if [ "$XBPS_CHECK_PKGS" ]; then
- configure_args+=" -DBUILD_TESTS=ON"
-else
+if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=OFF"
fi
From cd3c3a89d65b52acde72b50405c46387aa91ebe7 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sat, 3 Aug 2024 19:26:07 +0200
Subject: [PATCH 3/4] libgit2-glib: rebuild for libgit2-1.8
---
.../libgit2-glib/patches/libgit2-1.8.patch | 103 ++++++++++++++++++
srcpkgs/libgit2-glib/template | 2 +-
2 files changed, 104 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libgit2-glib/patches/libgit2-1.8.patch
diff --git a/srcpkgs/libgit2-glib/patches/libgit2-1.8.patch b/srcpkgs/libgit2-glib/patches/libgit2-1.8.patch
new file mode 100644
index 00000000000000..bb232cbf189079
--- /dev/null
+++ b/srcpkgs/libgit2-glib/patches/libgit2-1.8.patch
@@ -0,0 +1,103 @@
+From a76fdf96c3af9ce9d21a3985c4be8a1aa6eea661 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Fri, 5 Apr 2024 10:28:16 +0200
+Subject: [PATCH] build: Fix build against, and require, libgit2 1.8.0
+
+---
+ libgit2-glib/ggit-clone-options.c | 1 +
+ libgit2-glib/ggit-cred-ssh-interactive.c | 2 +-
+ libgit2-glib/ggit-remote-callbacks.h | 1 +
+ libgit2-glib/ggit-repository.c | 4 ++--
+ libgit2-glib/ggit-types.h | 3 ++-
+ meson.build | 2 +-
+ 6 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c
+index b47fdb1..30c7d86 100644
+--- a/libgit2-glib/ggit-clone-options.c
++++ b/libgit2-glib/ggit-clone-options.c
+@@ -19,6 +19,7 @@
+ */
+
+ #include <git2.h>
++#include <git2/sys/errors.h>
+ #include <gio/gio.h>
+
+ #include "ggit-clone-options.h"
+diff --git a/libgit2-glib/ggit-cred-ssh-interactive.c b/libgit2-glib/ggit-cred-ssh-interactive.c
+index 4f60f8b..0bdca95 100644
+--- a/libgit2-glib/ggit-cred-ssh-interactive.c
++++ b/libgit2-glib/ggit-cred-ssh-interactive.c
+@@ -191,7 +191,7 @@ callback_wrapper (const char *name,
+ {
+ gchar *text;
+
+- text = g_strndup (prompts[i].text, prompts[i].length);
++ text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length);
+
+ wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname,
+ winstruction,
+diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h
+index 3005ff4..2340712 100644
+--- a/libgit2-glib/ggit-remote-callbacks.h
++++ b/libgit2-glib/ggit-remote-callbacks.h
+@@ -24,6 +24,7 @@
+
+ #include <glib-object.h>
+ #include <git2.h>
++#include <git2/sys/errors.h>
+ #include <libgit2-glib/ggit-cred.h>
+
+ G_BEGIN_DECLS
+diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c
+index bf099f6..936c6fc 100644
+--- a/libgit2-glib/ggit-repository.c
++++ b/libgit2-glib/ggit-repository.c
+@@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository *repository,
+ message,
+ _ggit_native_get (tree),
+ parent_count,
+- (const git_commit **)parents_native);
++ (gpointer)parents_native);
+
+ g_free (parents_native);
+
+@@ -3323,7 +3323,7 @@ ggit_repository_create_commit_buffer(GgitRepository *repository,
+ message,
+ _ggit_tree_get_tree (tree),
+ parent_count,
+- (git_commit const **)parents_native);
++ (gpointer)parents_native);
+
+ g_free (parents_native);
+
+diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
+index 7e28975..2a2ed99 100644
+--- a/libgit2-glib/ggit-types.h
++++ b/libgit2-glib/ggit-types.h
+@@ -355,7 +355,8 @@ typedef enum
+ GGIT_CONFIG_LEVEL_XDG = 3,
+ GGIT_CONFIG_LEVEL_GLOBAL = 4,
+ GGIT_CONFIG_LEVEL_LOCAL = 5,
+- GGIT_CONFIG_LEVEL_APP = 6,
++ GGIT_CONFIG_LEVEL_WORKTREE = 6,
++ GGIT_CONFIG_LEVEL_APP = 7,
+ GGIT_CONFIG_LEVEL_HIGHEST = -1
+ } GgitConfigLevel;
+
+diff --git a/meson.build b/meson.build
+index e54a8b4..c21107d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req)
+ gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req)
+ gio_dep = dependency('gio-2.0', version: '>=' + glib_req)
+
+-libgit2_dep = dependency('libgit2', version: '>= 0.25.0')
++libgit2_dep = dependency('libgit2', version: '>= 1.8.0')
+
+ # XXX: Not nice, but probably our best option
+ enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found()
+--
+GitLab
+
diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template
index 37a02337da3736..4203bf1ad73969 100644
--- a/srcpkgs/libgit2-glib/template
+++ b/srcpkgs/libgit2-glib/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2-glib'
pkgname=libgit2-glib
version=1.2.0
-revision=2
+revision=3
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir true false)
From edfda15db2dd37395fcd6fa81d4942d776aec928 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sat, 3 Aug 2024 19:26:29 +0200
Subject: [PATCH 4/4] python3-pygit2: update to 1.15.0
---
srcpkgs/python3-pygit2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template
index 34d2aef6920200..4166243638d6f4 100644
--- a/srcpkgs/python3-pygit2/template
+++ b/srcpkgs/python3-pygit2/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pygit2'
pkgname=python3-pygit2
-version=1.13.3
+version=1.15.0
revision=1
build_style=python3-pep517
hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel"
@@ -14,4 +14,4 @@ license="LGPL-2.0-only"
homepage="https://www.pygit2.org/"
changelog="https://github.com/libgit2/pygit2/blob/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pygit2/pygit2-${version}.tar.gz"
-checksum=0257c626011e4afb99bdb20875443f706f84201d4c92637f02215b98eac13ded
+checksum=a635525ffc74128669de2f63460a94c9d5609634a4875c0aafce510fdeec17ac
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (5 preceding siblings ...)
2024-08-03 17:28 ` tranzystorekk
@ 2024-08-03 17:36 ` tranzystorekk
2024-08-04 11:18 ` [PR PATCH] [Updated] " tranzystorekk
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-08-03 17:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/50901#issuecomment-2267082198
Comment:
@SpidFightFR atm most our rust packages are linking to 1.7 by default, so this has some more time left to wait
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (6 preceding siblings ...)
2024-08-03 17:36 ` tranzystorekk
@ 2024-08-04 11:18 ` tranzystorekk
2024-08-04 11:20 ` tranzystorekk
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-08-04 11:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1425 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages libgit2-1.8
https://github.com/void-linux/void-packages/pull/50901
[WIP] libgit2 1.8
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.
<!--
#### 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/50901.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.8-50901.patch --]
[-- Type: text/x-diff, Size: 15841 bytes --]
From 252d16ebec7dd9631b002e7576e88da3b369061f Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sat, 3 Aug 2024 19:25:30 +0200
Subject: [PATCH 1/6] llhttp: update to 9.2.1
---
common/shlibs | 2 +-
srcpkgs/llhttp/files/Makefile | 25 -------------------
.../patches/allow-build-type-none.patch | 17 +++++++++++++
srcpkgs/llhttp/template | 19 +++++---------
4 files changed, 24 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/llhttp/files/Makefile
create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch
diff --git a/common/shlibs b/common/shlibs
index 5eb5ecd44724a3..446e4ae04992d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3679,7 +3679,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.1 llhttp-1.0.1_1
+libllhttp.so.9.2 llhttp-9.2.1_1
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile
deleted file mode 100644
index 910e584e97f5db..00000000000000
--- a/srcpkgs/llhttp/files/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile template for shared library
-
-CC ?= gcc
-override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude
-override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1
-RM = rm -f
-TARGET_LIB = libllhttp.so.1.0
-
-SRCS = src/api.c src/http.c src/llhttp.c
-OBJS = $(SRCS:.c=.o)
-
-.PHONY: all
-all: ${TARGET_LIB}
-
-$(TARGET_LIB): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(SRCS:.c=.d):%.d:%.c
- $(CC) $(CFLAGS) -MM $< >$@
-
-include $(SRCS:.c=.d)
-
-.PHONY: clean
-clean:
- -${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d)
diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch
new file mode 100644
index 00000000000000..517f213d5a71eb
--- /dev/null
+++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87a6692..e48c81b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE)
+ else()
+ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+- if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+- endif()
++ # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
++ # message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
++ # endif()
+ endif()
+ endif()
+
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index b2fbc9dd79325c..b04e6f9606e1be 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,9 +4,9 @@
# or at least a revbump in the same pull request since they work in-sync.
pkgname=llhttp
-version=2.2.1
+version=9.2.1
revision=1
-build_style=gnu-makefile
+build_style=cmake
short_desc="Port of http_parser to llparse"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
@@ -14,18 +14,9 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
-post_extract() {
- # No need to pull in gyp for such a simple Makefile...
- cp ${FILESDIR}/Makefile ${wrksrc}
-}
-
-do_install() {
- vinstall libllhttp.so.1.0 755 /usr/lib
- ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1
- ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so
- vcopy include /usr
+post_install() {
vlicense LICENSE-MIT
}
@@ -34,6 +25,8 @@ llhttp-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}
From a3286f6446c78f1db42e0cf21c9077dd1653335c Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 11:33:42 +0200
Subject: [PATCH 2/6] New package: libgit2-1.8-1.8.1
---
common/shlibs | 1 +
srcpkgs/libgit2-1.8-cli | 1 +
srcpkgs/libgit2-1.8-devel | 1 +
...test-validate_current_user_ownership.patch | 13 +++++
srcpkgs/libgit2-1.8/template | 52 +++++++++++++++++++
5 files changed, 68 insertions(+)
create mode 120000 srcpkgs/libgit2-1.8-cli
create mode 120000 srcpkgs/libgit2-1.8-devel
create mode 100644 srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
create mode 100644 srcpkgs/libgit2-1.8/template
diff --git a/common/shlibs b/common/shlibs
index 446e4ae04992d1..60e900856d2ade 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1342,6 +1342,7 @@ libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
libmicrodns.so.1 libmicrodns-0.2.0_1
libgit2.so.1.7 libgit2-1.7.2_1
+libgit2.so.1.8 libgit2-1.8-1.8.1_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2-1.8-cli b/srcpkgs/libgit2-1.8-cli
new file mode 120000
index 00000000000000..38cbde53b67fa4
--- /dev/null
+++ b/srcpkgs/libgit2-1.8-cli
@@ -0,0 +1 @@
+libgit2-1.8
\ No newline at end of file
diff --git a/srcpkgs/libgit2-1.8-devel b/srcpkgs/libgit2-1.8-devel
new file mode 120000
index 00000000000000..38cbde53b67fa4
--- /dev/null
+++ b/srcpkgs/libgit2-1.8-devel
@@ -0,0 +1 @@
+libgit2-1.8
\ No newline at end of file
diff --git a/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
new file mode 100644
index 00000000000000..3cbe2c9b773f4e
--- /dev/null
+++ b/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/util/path/core.c b/tests/util/path/core.c
+index d1935a8..bcbabf9 100644
+--- a/tests/util/path/core.c
++++ b/tests/util/path/core.c
+@@ -761,7 +761,7 @@ void test_path_core__validate_current_user_ownership(void)
+ cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
+ #else
+ cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
+
+ cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
+ #endif
diff --git a/srcpkgs/libgit2-1.8/template b/srcpkgs/libgit2-1.8/template
new file mode 100644
index 00000000000000..e1051bbd9facf6
--- /dev/null
+++ b/srcpkgs/libgit2-1.8/template
@@ -0,0 +1,52 @@
+# Template file for 'libgit2-1.8'
+pkgname=libgit2-1.8
+version=1.8.1
+revision=1
+build_style=cmake
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
+hostmakedepends="python3 pkg-config"
+makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
+short_desc="Git linkable library ${pkgname#libgit2-}"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
+homepage="https://libgit2.org"
+distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
+checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=OFF"
+fi
+
+CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
+
+post_patch() {
+ # no online tests
+ vsed \
+ -i tests/libgit2/CMakeLists.txt \
+ -e '/-sonline/s/^/#/'
+}
+
+post_install() {
+ vlicense COPYING
+}
+
+libgit2-1.8-cli_package() {
+ short_desc+=" - cli tools"
+ provides="virtual-libgit2-cli-${version}_${revision}"
+ conflicts="virtual-libgit2-cli"
+ pkg_install() {
+ vmove usr/bin
+ }
+}
+
+libgit2-1.8-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ provides="virtual-libgit2-devel-${version}_${revision}"
+ conflicts="virtual-libgit2-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 103be2dda96e254fc0c5a51b7d47bdec42b612df Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 11:55:19 +0200
Subject: [PATCH 3/6] libgit2: provide virtual packages for conflicts
---
srcpkgs/libgit2/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 5c4e1a48a75c7c..266d23f1cf1948 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2'
pkgname=libgit2
version=1.7.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
hostmakedepends="python3 pkg-config"
@@ -12,6 +12,8 @@ license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
+provides="virtual-libgit2-cli-${version}_${revision}"
+conflicts="virtual-libgit2-cli"
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
@@ -34,6 +36,8 @@ post_install() {
libgit2-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ provides="virtual-libgit2-devel-${version}_${revision}"
+ conflicts="virtual-libgit2-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From e695e215bb064fecfdec1ee50494e7ed71ec7c10 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:05:55 +0200
Subject: [PATCH 4/6] eza: rebuild for libgit2-1.8
---
srcpkgs/eza/patches/downgrade-git2.patch | 13 -------------
srcpkgs/eza/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/eza/patches/downgrade-git2.patch
diff --git a/srcpkgs/eza/patches/downgrade-git2.patch b/srcpkgs/eza/patches/downgrade-git2.patch
deleted file mode 100644
index 68d2c5b3bde760..00000000000000
--- a/srcpkgs/eza/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index b76d5c3..5cb3123 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -94,7 +94,7 @@ rayon = "1.10.0"
- ansi-width = "0.1.0"
-
- [dependencies.git2]
--version = "0.19"
-+version = "0.18"
- optional = true
- default-features = false
-
diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index affe77b802481b..eb9a6c37d09122 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,10 +1,10 @@
# Template file for 'eza'
pkgname=eza
version=0.18.24
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libgit2-devel"
+makedepends="libgit2-1.8-devel"
short_desc="Modern, maintained replacement for ls"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="MIT"
@@ -21,10 +21,6 @@ post_extract() {
vsrcextract -C manpages --strip-components=3 man-${version}.tar.gz
}
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From efbab9aa741dfda29c0df2b9c397193479c58545 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:13:58 +0200
Subject: [PATCH 5/6] git-cliff: rebuild for libgit2-1.8
---
srcpkgs/git-cliff/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-cliff/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/git-cliff/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-cliff/patches/downgrade-git2.patch b/srcpkgs/git-cliff/patches/downgrade-git2.patch
deleted file mode 100644
index 3751aa7fa9f3d6..00000000000000
--- a/srcpkgs/git-cliff/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/git-cliff-core/Cargo.toml b/git-cliff-core/Cargo.toml
-index 79cab62..fb21383 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -76,7 +76,7 @@ url = "2.5.2"
- dyn-clone = "1.0.17"
-
- [dependencies.git2]
--version = "0.19.0"
-+version = "0.18"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 85304bfc88b75b..e4722aa883dd6b 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.4.0
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -9,7 +9,7 @@ make_install_args="--path git-cliff"
# These tests fail without a git repo
make_check_args="-- --skip repo::"
hostmakedepends="pkg-config"
-makedepends="libgit2-devel libzstd-devel"
+makedepends="libgit2-1.8-devel libzstd-devel"
short_desc="Changelog generator based on conventional commits"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="Apache-2.0, MIT"
@@ -18,10 +18,6 @@ changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
checksum=d5791600e440d0842e42f3b0dbc8d503f4902920675054a23f046fbb1c252636
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vdoc README.md
From 9afa26676a60089eae11ce4bf21263936b9a196d Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:23:40 +0200
Subject: [PATCH 6/6] codeberg-cli: rebuild for libgit2-1.8
---
srcpkgs/codeberg-cli/patches/downgrade-git2.patch | 13 -------------
srcpkgs/codeberg-cli/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/codeberg-cli/patches/downgrade-git2.patch
diff --git a/srcpkgs/codeberg-cli/patches/downgrade-git2.patch b/srcpkgs/codeberg-cli/patches/downgrade-git2.patch
deleted file mode 100644
index 45bfb5ed1a59b6..00000000000000
--- a/srcpkgs/codeberg-cli/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index ea57a6d..16d7a4e 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -47,7 +47,7 @@ url = "2.5"
- webbrowser = "1.0"
-
- forgejo-api = "0.3"
--git2 = "0.19"
-+git2 = "0.18"
-
- [dev-dependencies]
- insta = "1.34"
diff --git a/srcpkgs/codeberg-cli/template b/srcpkgs/codeberg-cli/template
index 6a17fd7a1f4cf3..7897a9db5e55a7 100644
--- a/srcpkgs/codeberg-cli/template
+++ b/srcpkgs/codeberg-cli/template
@@ -1,11 +1,11 @@
# Template file for 'codeberg-cli'
pkgname=codeberg-cli
version=0.4.3
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
-makedepends="libgit2-devel openssl-devel"
+makedepends="libgit2-1.8-devel openssl-devel"
short_desc="CLI Tool for Codeberg similar to gh and glab"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="AGPL-3.0-or-later"
@@ -14,10 +14,6 @@ changelog="https://codeberg.org/Aviac/codeberg-cli/raw/branch/main/CHANGELOG.md"
distfiles="https://codeberg.org/Aviac/codeberg-cli/archive/v${version}.tar.gz"
checksum=cf439a53846c93adf51bc0911da7489e59828b5be6ad0e50cecd4312e36c52b4
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [WIP] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (7 preceding siblings ...)
2024-08-04 11:18 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-08-04 11:20 ` tranzystorekk
2024-08-04 11:47 ` [PR PATCH] [Updated] " tranzystorekk
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-08-04 11:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New comment by tranzystorekk on void-packages repository
https://github.com/void-linux/void-packages/pull/50901#issuecomment-2267505849
Comment:
Decided to split off the 1.8 package so that we don't have to wait around and the dependents changes can be more gradual
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (8 preceding siblings ...)
2024-08-04 11:20 ` tranzystorekk
@ 2024-08-04 11:47 ` tranzystorekk
2024-08-04 12:17 ` tranzystorekk
2024-08-04 15:36 ` [PR PATCH] [Merged]: " tranzystorekk
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-08-04 11:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1419 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages libgit2-1.8
https://github.com/void-linux/void-packages/pull/50901
libgit2 1.8
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.
<!--
#### 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/50901.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.8-50901.patch --]
[-- Type: text/x-diff, Size: 15856 bytes --]
From 5b2465176eec7998bc17a10c42a95a6be63957bf Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sat, 3 Aug 2024 19:25:30 +0200
Subject: [PATCH 1/6] llhttp: update to 9.2.1
---
common/shlibs | 2 +-
srcpkgs/llhttp/files/Makefile | 25 -------------------
.../patches/allow-build-type-none.patch | 17 +++++++++++++
srcpkgs/llhttp/template | 19 +++++---------
4 files changed, 24 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/llhttp/files/Makefile
create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch
diff --git a/common/shlibs b/common/shlibs
index 5eb5ecd44724a3..446e4ae04992d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3679,7 +3679,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.1 llhttp-1.0.1_1
+libllhttp.so.9.2 llhttp-9.2.1_1
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile
deleted file mode 100644
index 910e584e97f5db..00000000000000
--- a/srcpkgs/llhttp/files/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile template for shared library
-
-CC ?= gcc
-override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude
-override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1
-RM = rm -f
-TARGET_LIB = libllhttp.so.1.0
-
-SRCS = src/api.c src/http.c src/llhttp.c
-OBJS = $(SRCS:.c=.o)
-
-.PHONY: all
-all: ${TARGET_LIB}
-
-$(TARGET_LIB): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(SRCS:.c=.d):%.d:%.c
- $(CC) $(CFLAGS) -MM $< >$@
-
-include $(SRCS:.c=.d)
-
-.PHONY: clean
-clean:
- -${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d)
diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch
new file mode 100644
index 00000000000000..517f213d5a71eb
--- /dev/null
+++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87a6692..e48c81b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE)
+ else()
+ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+- if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+- endif()
++ # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
++ # message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
++ # endif()
+ endif()
+ endif()
+
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index b2fbc9dd79325c..b04e6f9606e1be 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,9 +4,9 @@
# or at least a revbump in the same pull request since they work in-sync.
pkgname=llhttp
-version=2.2.1
+version=9.2.1
revision=1
-build_style=gnu-makefile
+build_style=cmake
short_desc="Port of http_parser to llparse"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
@@ -14,18 +14,9 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
-post_extract() {
- # No need to pull in gyp for such a simple Makefile...
- cp ${FILESDIR}/Makefile ${wrksrc}
-}
-
-do_install() {
- vinstall libllhttp.so.1.0 755 /usr/lib
- ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1
- ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so
- vcopy include /usr
+post_install() {
vlicense LICENSE-MIT
}
@@ -34,6 +25,8 @@ llhttp-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}
From fec21dca48a57db222784e8fd270ed13a662df81 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 11:33:42 +0200
Subject: [PATCH 2/6] New package: libgit2-1.8-1.8.1
---
common/shlibs | 1 +
srcpkgs/libgit2-1.8-cli | 1 +
srcpkgs/libgit2-1.8-devel | 1 +
...test-validate_current_user_ownership.patch | 13 +++++
srcpkgs/libgit2-1.8/template | 52 +++++++++++++++++++
5 files changed, 68 insertions(+)
create mode 120000 srcpkgs/libgit2-1.8-cli
create mode 120000 srcpkgs/libgit2-1.8-devel
create mode 100644 srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
create mode 100644 srcpkgs/libgit2-1.8/template
diff --git a/common/shlibs b/common/shlibs
index 446e4ae04992d1..60e900856d2ade 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1342,6 +1342,7 @@ libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
libmicrodns.so.1 libmicrodns-0.2.0_1
libgit2.so.1.7 libgit2-1.7.2_1
+libgit2.so.1.8 libgit2-1.8-1.8.1_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2-1.8-cli b/srcpkgs/libgit2-1.8-cli
new file mode 120000
index 00000000000000..38cbde53b67fa4
--- /dev/null
+++ b/srcpkgs/libgit2-1.8-cli
@@ -0,0 +1 @@
+libgit2-1.8
\ No newline at end of file
diff --git a/srcpkgs/libgit2-1.8-devel b/srcpkgs/libgit2-1.8-devel
new file mode 120000
index 00000000000000..38cbde53b67fa4
--- /dev/null
+++ b/srcpkgs/libgit2-1.8-devel
@@ -0,0 +1 @@
+libgit2-1.8
\ No newline at end of file
diff --git a/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
new file mode 100644
index 00000000000000..3cbe2c9b773f4e
--- /dev/null
+++ b/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/util/path/core.c b/tests/util/path/core.c
+index d1935a8..bcbabf9 100644
+--- a/tests/util/path/core.c
++++ b/tests/util/path/core.c
+@@ -761,7 +761,7 @@ void test_path_core__validate_current_user_ownership(void)
+ cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
+ #else
+ cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
+
+ cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
+ #endif
diff --git a/srcpkgs/libgit2-1.8/template b/srcpkgs/libgit2-1.8/template
new file mode 100644
index 00000000000000..f3c868cfde405d
--- /dev/null
+++ b/srcpkgs/libgit2-1.8/template
@@ -0,0 +1,52 @@
+# Template file for 'libgit2-1.8'
+pkgname=libgit2-1.8
+version=1.8.1
+revision=1
+build_style=cmake
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
+hostmakedepends="python3 pkg-config"
+makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
+short_desc="Git linkable library ${pkgname#libgit2-}"
+maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
+license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
+homepage="https://libgit2.org"
+distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
+checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=OFF"
+fi
+
+CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
+
+post_patch() {
+ # no online tests
+ vsed \
+ -i tests/libgit2/CMakeLists.txt \
+ -e '/-sonline/s/^/#/'
+}
+
+post_install() {
+ vlicense COPYING
+}
+
+libgit2-1.8-cli_package() {
+ short_desc+=" - cli tools"
+ provides="virtual-libgit2-cli-${version}_${revision}"
+ conflicts="virtual-libgit2-cli"
+ pkg_install() {
+ vmove usr/bin
+ }
+}
+
+libgit2-1.8-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ provides="virtual-libgit2-devel-${version}_${revision}"
+ conflicts="virtual-libgit2-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From fdfaade218d9a6c65f57f9f989ce66d9a50b3e69 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 11:55:19 +0200
Subject: [PATCH 3/6] libgit2: provide virtual packages for conflicts
---
srcpkgs/libgit2/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 5c4e1a48a75c7c..266d23f1cf1948 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,7 +1,7 @@
# Template file for 'libgit2'
pkgname=libgit2
version=1.7.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
hostmakedepends="python3 pkg-config"
@@ -12,6 +12,8 @@ license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
checksum=de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f
+provides="virtual-libgit2-cli-${version}_${revision}"
+conflicts="virtual-libgit2-cli"
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
@@ -34,6 +36,8 @@ post_install() {
libgit2-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ provides="virtual-libgit2-devel-${version}_${revision}"
+ conflicts="virtual-libgit2-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 285d58a07089d6d9cf5bf6b775d58948d3e28209 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:05:55 +0200
Subject: [PATCH 4/6] eza: rebuild for libgit2-1.8
---
srcpkgs/eza/patches/downgrade-git2.patch | 13 -------------
srcpkgs/eza/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/eza/patches/downgrade-git2.patch
diff --git a/srcpkgs/eza/patches/downgrade-git2.patch b/srcpkgs/eza/patches/downgrade-git2.patch
deleted file mode 100644
index 68d2c5b3bde760..00000000000000
--- a/srcpkgs/eza/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index b76d5c3..5cb3123 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -94,7 +94,7 @@ rayon = "1.10.0"
- ansi-width = "0.1.0"
-
- [dependencies.git2]
--version = "0.19"
-+version = "0.18"
- optional = true
- default-features = false
-
diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index affe77b802481b..eb9a6c37d09122 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,10 +1,10 @@
# Template file for 'eza'
pkgname=eza
version=0.18.24
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libgit2-devel"
+makedepends="libgit2-1.8-devel"
short_desc="Modern, maintained replacement for ls"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="MIT"
@@ -21,10 +21,6 @@ post_extract() {
vsrcextract -C manpages --strip-components=3 man-${version}.tar.gz
}
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From 8a3e886467ccfb4da4b9767823fc5ae416f1f6a5 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:13:58 +0200
Subject: [PATCH 5/6] git-cliff: rebuild for libgit2-1.8
---
srcpkgs/git-cliff/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-cliff/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/git-cliff/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-cliff/patches/downgrade-git2.patch b/srcpkgs/git-cliff/patches/downgrade-git2.patch
deleted file mode 100644
index 3751aa7fa9f3d6..00000000000000
--- a/srcpkgs/git-cliff/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/git-cliff-core/Cargo.toml b/git-cliff-core/Cargo.toml
-index 79cab62..fb21383 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -76,7 +76,7 @@ url = "2.5.2"
- dyn-clone = "1.0.17"
-
- [dependencies.git2]
--version = "0.19.0"
-+version = "0.18"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 85304bfc88b75b..e4722aa883dd6b 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.4.0
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -9,7 +9,7 @@ make_install_args="--path git-cliff"
# These tests fail without a git repo
make_check_args="-- --skip repo::"
hostmakedepends="pkg-config"
-makedepends="libgit2-devel libzstd-devel"
+makedepends="libgit2-1.8-devel libzstd-devel"
short_desc="Changelog generator based on conventional commits"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="Apache-2.0, MIT"
@@ -18,10 +18,6 @@ changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
checksum=d5791600e440d0842e42f3b0dbc8d503f4902920675054a23f046fbb1c252636
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vdoc README.md
From 0307288913e6f045e27266cd427ca8f2652caf25 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:23:40 +0200
Subject: [PATCH 6/6] codeberg-cli: rebuild for libgit2-1.8
---
srcpkgs/codeberg-cli/patches/downgrade-git2.patch | 13 -------------
srcpkgs/codeberg-cli/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/codeberg-cli/patches/downgrade-git2.patch
diff --git a/srcpkgs/codeberg-cli/patches/downgrade-git2.patch b/srcpkgs/codeberg-cli/patches/downgrade-git2.patch
deleted file mode 100644
index 45bfb5ed1a59b6..00000000000000
--- a/srcpkgs/codeberg-cli/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index ea57a6d..16d7a4e 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -47,7 +47,7 @@ url = "2.5"
- webbrowser = "1.0"
-
- forgejo-api = "0.3"
--git2 = "0.19"
-+git2 = "0.18"
-
- [dev-dependencies]
- insta = "1.34"
diff --git a/srcpkgs/codeberg-cli/template b/srcpkgs/codeberg-cli/template
index 6a17fd7a1f4cf3..7897a9db5e55a7 100644
--- a/srcpkgs/codeberg-cli/template
+++ b/srcpkgs/codeberg-cli/template
@@ -1,11 +1,11 @@
# Template file for 'codeberg-cli'
pkgname=codeberg-cli
version=0.4.3
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
-makedepends="libgit2-devel openssl-devel"
+makedepends="libgit2-1.8-devel openssl-devel"
short_desc="CLI Tool for Codeberg similar to gh and glab"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="AGPL-3.0-or-later"
@@ -14,10 +14,6 @@ changelog="https://codeberg.org/Aviac/codeberg-cli/raw/branch/main/CHANGELOG.md"
distfiles="https://codeberg.org/Aviac/codeberg-cli/archive/v${version}.tar.gz"
checksum=cf439a53846c93adf51bc0911da7489e59828b5be6ad0e50cecd4312e36c52b4
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (9 preceding siblings ...)
2024-08-04 11:47 ` [PR PATCH] [Updated] " tranzystorekk
@ 2024-08-04 12:17 ` tranzystorekk
2024-08-04 15:36 ` [PR PATCH] [Merged]: " tranzystorekk
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-08-04 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1419 bytes --]
There is an updated pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages libgit2-1.8
https://github.com/void-linux/void-packages/pull/50901
libgit2 1.8
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.
<!--
#### 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/50901.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgit2-1.8-50901.patch --]
[-- Type: text/x-diff, Size: 15157 bytes --]
From 5b2465176eec7998bc17a10c42a95a6be63957bf Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sat, 3 Aug 2024 19:25:30 +0200
Subject: [PATCH 1/6] llhttp: update to 9.2.1
---
common/shlibs | 2 +-
srcpkgs/llhttp/files/Makefile | 25 -------------------
.../patches/allow-build-type-none.patch | 17 +++++++++++++
srcpkgs/llhttp/template | 19 +++++---------
4 files changed, 24 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/llhttp/files/Makefile
create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch
diff --git a/common/shlibs b/common/shlibs
index 5eb5ecd44724a3..446e4ae04992d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3679,7 +3679,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1
libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
-libllhttp.so.1 llhttp-1.0.1_1
+libllhttp.so.9.2 llhttp-9.2.1_1
libpinyin.so.15 libpinyin-2.8.1_1
libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.6.0 uhd-4.6.0.0_1
diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile
deleted file mode 100644
index 910e584e97f5db..00000000000000
--- a/srcpkgs/llhttp/files/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile template for shared library
-
-CC ?= gcc
-override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude
-override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1
-RM = rm -f
-TARGET_LIB = libllhttp.so.1.0
-
-SRCS = src/api.c src/http.c src/llhttp.c
-OBJS = $(SRCS:.c=.o)
-
-.PHONY: all
-all: ${TARGET_LIB}
-
-$(TARGET_LIB): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(SRCS:.c=.d):%.d:%.c
- $(CC) $(CFLAGS) -MM $< >$@
-
-include $(SRCS:.c=.d)
-
-.PHONY: clean
-clean:
- -${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d)
diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch
new file mode 100644
index 00000000000000..517f213d5a71eb
--- /dev/null
+++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 87a6692..e48c81b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE)
+ else()
+ string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+- if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+- endif()
++ # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
++ # message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
++ # endif()
+ endif()
+ endif()
+
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index b2fbc9dd79325c..b04e6f9606e1be 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -4,9 +4,9 @@
# or at least a revbump in the same pull request since they work in-sync.
pkgname=llhttp
-version=2.2.1
+version=9.2.1
revision=1
-build_style=gnu-makefile
+build_style=cmake
short_desc="Port of http_parser to llparse"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
@@ -14,18 +14,9 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469
+checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
-post_extract() {
- # No need to pull in gyp for such a simple Makefile...
- cp ${FILESDIR}/Makefile ${wrksrc}
-}
-
-do_install() {
- vinstall libllhttp.so.1.0 755 /usr/lib
- ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1
- ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so
- vcopy include /usr
+post_install() {
vlicense LICENSE-MIT
}
@@ -34,6 +25,8 @@ llhttp-devel_package() {
depends="${sourcepkg}-${version}_${revision}"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
}
}
From d6cf767990951fcd5e0b0321e279a6fdec070ff6 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 11:33:42 +0200
Subject: [PATCH 2/6] New package: libgit2-1.8-1.8.1
---
common/shlibs | 1 +
srcpkgs/libgit2-1.8-devel | 1 +
...test-validate_current_user_ownership.patch | 13 ++++++
srcpkgs/libgit2-1.8/template | 43 +++++++++++++++++++
4 files changed, 58 insertions(+)
create mode 120000 srcpkgs/libgit2-1.8-devel
create mode 100644 srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
create mode 100644 srcpkgs/libgit2-1.8/template
diff --git a/common/shlibs b/common/shlibs
index 446e4ae04992d1..60e900856d2ade 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1342,6 +1342,7 @@ libunwind-setjmp.so.0 libunwind-1.5.0_3
libmicrohttpd.so.12 libmicrohttpd-0.9.73_1
libmicrodns.so.1 libmicrodns-0.2.0_1
libgit2.so.1.7 libgit2-1.7.2_1
+libgit2.so.1.8 libgit2-1.8-1.8.1_1
libgit2-glib-1.0.so.0 libgit2-glib-1.2.0_1
libagg.so.2 agg-2.5_1
libzzip-0.so.13 zziplib-0.13.62_1
diff --git a/srcpkgs/libgit2-1.8-devel b/srcpkgs/libgit2-1.8-devel
new file mode 120000
index 00000000000000..38cbde53b67fa4
--- /dev/null
+++ b/srcpkgs/libgit2-1.8-devel
@@ -0,0 +1 @@
+libgit2-1.8
\ No newline at end of file
diff --git a/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch b/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
new file mode 100644
index 00000000000000..3cbe2c9b773f4e
--- /dev/null
+++ b/srcpkgs/libgit2-1.8/patches/disable-test-validate_current_user_ownership.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/util/path/core.c b/tests/util/path/core.c
+index d1935a8..bcbabf9 100644
+--- a/tests/util/path/core.c
++++ b/tests/util/path/core.c
+@@ -761,7 +761,7 @@ void test_path_core__validate_current_user_ownership(void)
+ cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "c:\\path\\does\\not\\exist"));
+ #else
+ cl_git_pass(git_fs_path_owner_is_current_user(&is_cur, "/"));
+- cl_assert_equal_i(is_cur, (geteuid() == 0));
++ //cl_assert_equal_i(is_cur, (geteuid() == 0)); // xbps-src chroot belongs to $USER, not root
+
+ cl_git_fail(git_fs_path_owner_is_current_user(&is_cur, "/path/does/not/exist"));
+ #endif
diff --git a/srcpkgs/libgit2-1.8/template b/srcpkgs/libgit2-1.8/template
new file mode 100644
index 00000000000000..3cabec38b05660
--- /dev/null
+++ b/srcpkgs/libgit2-1.8/template
@@ -0,0 +1,43 @@
+# Template file for 'libgit2-1.8'
+pkgname=libgit2-1.8
+version=1.8.1
+revision=1
+build_style=cmake
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DBUILD_CLI=OFF -DUSE_SSH=ON -DUSE_HTTP_PARSER=llhttp"
+hostmakedepends="python3 pkg-config"
+makedepends="zlib-devel openssl-devel llhttp-devel libssh2-devel"
+short_desc="Git linkable library ${pkgname#libgit2-}"
+maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
+license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
+homepage="https://libgit2.org"
+distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
+checksum=8c1eaf0cf07cba0e9021920bfba9502140220786ed5d8a8ec6c7ad9174522f8e
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=OFF"
+fi
+
+CFLAGS="-D_LARGE_FILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
+
+post_patch() {
+ # no online tests
+ vsed \
+ -i tests/libgit2/CMakeLists.txt \
+ -e '/-sonline/s/^/#/'
+}
+
+post_install() {
+ vlicense COPYING
+}
+
+libgit2-1.8-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ provides="virtual-libgit2-devel-${version}_${revision}"
+ conflicts="virtual-libgit2-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From b042fe8194e58cf76d124d5fdbbfed5c9959dd15 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 11:55:19 +0200
Subject: [PATCH 3/6] libgit2: provide virtual packages for conflicts, drop cli
---
srcpkgs/libgit2/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 5c4e1a48a75c7c..7b648d7a183a5a 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,9 +1,9 @@
# Template file for 'libgit2'
pkgname=libgit2
version=1.7.2
-revision=1
+revision=2
build_style=cmake
-configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
+configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DBUILD_CLI=OFF -DUSE_SSH=ON -DUSE_HTTP_PARSER=system"
hostmakedepends="python3 pkg-config"
makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
short_desc="Git linkable library"
@@ -34,6 +34,8 @@ post_install() {
libgit2-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ provides="virtual-libgit2-devel-${version}_${revision}"
+ conflicts="virtual-libgit2-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 80a3c7c5592807828a10f41319bd3d9c632e3f4e Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:05:55 +0200
Subject: [PATCH 4/6] eza: rebuild for libgit2-1.8
---
srcpkgs/eza/patches/downgrade-git2.patch | 13 -------------
srcpkgs/eza/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/eza/patches/downgrade-git2.patch
diff --git a/srcpkgs/eza/patches/downgrade-git2.patch b/srcpkgs/eza/patches/downgrade-git2.patch
deleted file mode 100644
index 68d2c5b3bde760..00000000000000
--- a/srcpkgs/eza/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index b76d5c3..5cb3123 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -94,7 +94,7 @@ rayon = "1.10.0"
- ansi-width = "0.1.0"
-
- [dependencies.git2]
--version = "0.19"
-+version = "0.18"
- optional = true
- default-features = false
-
diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index affe77b802481b..eb9a6c37d09122 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,10 +1,10 @@
# Template file for 'eza'
pkgname=eza
version=0.18.24
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libgit2-devel"
+makedepends="libgit2-1.8-devel"
short_desc="Modern, maintained replacement for ls"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="MIT"
@@ -21,10 +21,6 @@ post_extract() {
vsrcextract -C manpages --strip-components=3 man-${version}.tar.gz
}
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
From d6e31891bf3b750a4ca107149a8e9be55a2db6a9 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:13:58 +0200
Subject: [PATCH 5/6] git-cliff: rebuild for libgit2-1.8
---
srcpkgs/git-cliff/patches/downgrade-git2.patch | 13 -------------
srcpkgs/git-cliff/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/git-cliff/patches/downgrade-git2.patch
diff --git a/srcpkgs/git-cliff/patches/downgrade-git2.patch b/srcpkgs/git-cliff/patches/downgrade-git2.patch
deleted file mode 100644
index 3751aa7fa9f3d6..00000000000000
--- a/srcpkgs/git-cliff/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/git-cliff-core/Cargo.toml b/git-cliff-core/Cargo.toml
-index 79cab62..fb21383 100644
---- a/git-cliff-core/Cargo.toml
-+++ b/git-cliff-core/Cargo.toml
-@@ -76,7 +76,7 @@ url = "2.5.2"
- dyn-clone = "1.0.17"
-
- [dependencies.git2]
--version = "0.19.0"
-+version = "0.18"
- default-features = false
- optional = true
-
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 85304bfc88b75b..e4722aa883dd6b 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,7 +1,7 @@
# Template file for 'git-cliff'
pkgname=git-cliff
version=2.4.0
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
build_helper=qemu
@@ -9,7 +9,7 @@ make_install_args="--path git-cliff"
# These tests fail without a git repo
make_check_args="-- --skip repo::"
hostmakedepends="pkg-config"
-makedepends="libgit2-devel libzstd-devel"
+makedepends="libgit2-1.8-devel libzstd-devel"
short_desc="Changelog generator based on conventional commits"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="Apache-2.0, MIT"
@@ -18,10 +18,6 @@ changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
checksum=d5791600e440d0842e42f3b0dbc8d503f4902920675054a23f046fbb1c252636
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vdoc README.md
From 2121ed2b291e6eb5775d83ab3db24775c1b205ab Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Sun, 4 Aug 2024 12:23:40 +0200
Subject: [PATCH 6/6] codeberg-cli: rebuild for libgit2-1.8
---
srcpkgs/codeberg-cli/patches/downgrade-git2.patch | 13 -------------
srcpkgs/codeberg-cli/template | 8 ++------
2 files changed, 2 insertions(+), 19 deletions(-)
delete mode 100644 srcpkgs/codeberg-cli/patches/downgrade-git2.patch
diff --git a/srcpkgs/codeberg-cli/patches/downgrade-git2.patch b/srcpkgs/codeberg-cli/patches/downgrade-git2.patch
deleted file mode 100644
index 45bfb5ed1a59b6..00000000000000
--- a/srcpkgs/codeberg-cli/patches/downgrade-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index ea57a6d..16d7a4e 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -47,7 +47,7 @@ url = "2.5"
- webbrowser = "1.0"
-
- forgejo-api = "0.3"
--git2 = "0.19"
-+git2 = "0.18"
-
- [dev-dependencies]
- insta = "1.34"
diff --git a/srcpkgs/codeberg-cli/template b/srcpkgs/codeberg-cli/template
index 6a17fd7a1f4cf3..7897a9db5e55a7 100644
--- a/srcpkgs/codeberg-cli/template
+++ b/srcpkgs/codeberg-cli/template
@@ -1,11 +1,11 @@
# Template file for 'codeberg-cli'
pkgname=codeberg-cli
version=0.4.3
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
-makedepends="libgit2-devel openssl-devel"
+makedepends="libgit2-1.8-devel openssl-devel"
short_desc="CLI Tool for Codeberg similar to gh and glab"
maintainer="tranzystorekk <tranzystorek.io@protonmail.com>"
license="AGPL-3.0-or-later"
@@ -14,10 +14,6 @@ changelog="https://codeberg.org/Aviac/codeberg-cli/raw/branch/main/CHANGELOG.md"
distfiles="https://codeberg.org/Aviac/codeberg-cli/archive/v${version}.tar.gz"
checksum=cf439a53846c93adf51bc0911da7489e59828b5be6ad0e50cecd4312e36c52b4
-post_patch() {
- cargo update --package git2@0.19.0 --precise 0.18.3
-}
-
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: libgit2 1.8
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
` (10 preceding siblings ...)
2024-08-04 12:17 ` tranzystorekk
@ 2024-08-04 15:36 ` tranzystorekk
11 siblings, 0 replies; 13+ messages in thread
From: tranzystorekk @ 2024-08-04 15:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There's a merged pull request on the void-packages repository
libgit2 1.8
https://github.com/void-linux/void-packages/pull/50901
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
~~I'd like to wait until a larger portion of dependent rust packages bump to this version (git2 0.19+) to avoid maintaining a lot of version bump patches.~~
<!--
#### 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] 13+ messages in thread
end of thread, other threads:[~2024-08-04 15:36 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-20 8:11 [PR PATCH] [WIP] libgit2 1.8 tranzystorekk
2024-06-20 8:26 ` [PR PATCH] [Updated] " tranzystorekk
2024-07-08 6:13 ` icp1994
2024-07-08 7:33 ` tranzystorekk
2024-07-31 22:41 ` SpidFightFR
2024-08-03 16:56 ` [PR PATCH] [Updated] " tranzystorekk
2024-08-03 17:28 ` tranzystorekk
2024-08-03 17:36 ` tranzystorekk
2024-08-04 11:18 ` [PR PATCH] [Updated] " tranzystorekk
2024-08-04 11:20 ` tranzystorekk
2024-08-04 11:47 ` [PR PATCH] [Updated] " tranzystorekk
2024-08-04 12:17 ` tranzystorekk
2024-08-04 15:36 ` [PR PATCH] [Merged]: " tranzystorekk
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).