diff --git a/mingw-w64-python-pygit2/PKGBUILD b/mingw-w64-python-pygit2/PKGBUILD index d44640b93ba89..709d1f0a39666 100644 --- a/mingw-w64-python-pygit2/PKGBUILD +++ b/mingw-w64-python-pygit2/PKGBUILD @@ -3,13 +3,13 @@ _realname=pygit2 pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=1.12.2 -pkgrel=2 +pkgver=1.13.0 +pkgrel=1 pkgdesc='Python bindings for libgit2 (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') url='https://github.com/libgit2/pygit2' -license=('GPL2') +license=('spdx:GPL-2.0-only') depends=("${MINGW_PACKAGE_PREFIX}-libgit2" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-cffi") @@ -18,21 +18,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-wheel" "${MINGW_PACKAGE_PREFIX}-cc") -source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz" - "libgit2-1.7.patch") -sha256sums=('56e85d0e66de957d599d1efb2409d39afeefd8f01009bfda0796b42a4b678358' - 'fb1023efd7cbdc804502e5d1dc62ecac15bcce85d44c6cb3b5a847ac3737d73f') +source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz") +sha256sums=('6dde37436fab14264ad3d6cbc5aae3fd555eb9a9680a7bfdd6e564cd77b5e2b8') prepare() { cd "${srcdir}" rm -rf "python-build-${MSYSTEM}" | true cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" - - cd "${srcdir}/python-build-${MSYSTEM}" - - # https://github.com/libgit2/pygit2/issues/1231 - # https://gitlab.archlinux.org/archlinux/packaging/packages/python-pygit2/-/blob/main/libgit2-1.7.patch - patch -p1 -i "${srcdir}/libgit2-1.7.patch" } build() { diff --git a/mingw-w64-python-pygit2/libgit2-1.7.patch b/mingw-w64-python-pygit2/libgit2-1.7.patch deleted file mode 100644 index c79ee98b470f2..0000000000000 --- a/mingw-w64-python-pygit2/libgit2-1.7.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/pygit2/decl/diff.h b/pygit2/decl/diff.h -index ded873f68..31a32d520 100644 ---- a/pygit2/decl/diff.h -+++ b/pygit2/decl/diff.h -@@ -54,6 +54,7 @@ typedef struct { - void *payload; - uint32_t context_lines; - uint32_t interhunk_lines; -+ git_oid_t oid_type; - uint16_t id_abbrev; - git_off_t max_size; - const char *old_prefix; -diff --git a/pygit2/decl/oid.h b/pygit2/decl/oid.h -index db420f7c5..0890dfdde 100644 ---- a/pygit2/decl/oid.h -+++ b/pygit2/decl/oid.h -@@ -1,3 +1,7 @@ -+typedef enum { -+ GIT_OID_SHA1 = 1, /**< SHA1 */ -+} git_oid_t; -+ - typedef struct git_oid { - unsigned char id[20]; - } git_oid; -diff --git a/pygit2/decl/remote.h b/pygit2/decl/remote.h -index d889356cb..5fedf6d37 100644 ---- a/pygit2/decl/remote.h -+++ b/pygit2/decl/remote.h -@@ -83,6 +83,7 @@ typedef struct { - int update_fetchhead; - git_remote_autotag_option_t download_tags; - git_proxy_options proxy_opts; -+ int depth; - git_remote_redirect_t follow_redirects; - git_strarray custom_headers; - } git_fetch_options; -diff --git a/src/types.h b/src/types.h -index 0c4aad69f..2c87621a4 100644 ---- a/src/types.h -+++ b/src/types.h -@@ -32,8 +32,8 @@ - #include - #include - --#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 6) --#error You need a compatible libgit2 version (1.6.x) -+#if !(LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 7) -+#error You need a compatible libgit2 version (1.7.x) - #endif - - /*