Arch Linux

korimitsu

Member

Registered: 2016-08-14

Posts: 153

libgit2 breaks dependency required by li

Any help with this?

$ paru
:: Synchronizing package databases...
 core                                                                      132.0 KiB   382 KiB/s 00:00 [#####] 100%
 extra                                                                       8.3 MiB  5.89 MiB/s 00:01 [#####] 100%
 community is up to date
 multilib                                                                  143.0 KiB  2.22 MiB/s 00:00 [#####] 100%
:: Starting full system upgrade...
resolving dependencies...
looking for conflicting packages...
error: failed to prepare transaction (could not satisfy dependencies)
:: installing libgit2 (1:1.7.0-3) breaks dependency 'libgit2=1:1.6.4' required by lib32-libgit2

Scimmia

Fellow

Registered: 2012-09-01

Posts: 12,651

Re: libgit2 breaks dependency required by li

Remove the lib32 version, update, then build/install the updated version.

Or build the updated version in a clean chroot and add it to a local repo.

Assuming you even need the lib32 version. If not, just remove it.

Last edited by Scimmia (2023-07-25 13:14:06)

korimitsu

Member

Registered: 2016-08-14

Posts: 153

Re: libgit2 breaks dependency required by li

Deps broken: https://aur.archlinux.org/packages/lib32-libgit2

Scimmia

Fellow

Registered: 2012-09-01

Posts: 12,651

Re: libgit2 breaks dependency required by li

Which is why I said updated version, not just rebuild. If the maintainer hasn't done it, do it yourself.

loqs

Member

Registered: 2014-03-06

Posts: 18,425

Re: libgit2 breaks dependency required by li

diff --git a/PKGBUILD b/PKGBUILD
index 29d3068..9f56792 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=libgit2
 pkgname=lib32-libgit2
-pkgver=1.6.4
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="A linkable library for Git"
 arch=('x86_64')
@@ -26,9 +26,23 @@ makedepends=(
   'python'
 )
 provides=('libgit2.so')
-source=("$url/archive/refs/tags/v${pkgver}.tar.gz")
-sha512sums=('fd73df91710f19b0d6c3765c37c7f529233196da91cf4d58028a8d3840244f11df44abafabd74a8ed1cbe4826d1afd6ff9f01316d183ace0924c65e7cf0eb8d5')
-b2sums=('103af9ea9ed1310b1066a48859bbefc162647d787519bb3df83d7ea1957cda5934537271970d3d180f91daa6edc3bbc05387d6293812f0d849dda966419d29ba')
+source=("$url/archive/refs/tags/v${pkgver}.tar.gz"
+         $_pkgname-1.7.0-git_oidarray_include.patch
+         $_pkgname-1.7.0-cleanup_grafts.patch::https://github.com/libgit2/libgit2/commit/9d4c550564ee254dda9e2620c4c1e32ebb529728.patch
+)
+sha512sums=('68c8ed289de7daccaec17ea2ac49f4610325595cf90cddef763a31546a0a1c6bd400bf6180b68e2d3a8bdc3d031328efbbbaf3b61467dfc1b944e8cf3efcfd69'
+            'c39992e337da29038784976ebcc37ee246870042c0342a4baa06ad0542df8bc20fcd8ad45ab4c45ab8074ce5905ae9d963d51a16f870afb59e8f6b71a357d4a5'
+            '0ec0580e08df3f08d8609b35f91eba9b665fdf2ad1eb6ca68b0745fbf7b86c344bef370b325211892ac6f5040e147241808994edbc10ff3822363c800857eb93')
+b2sums=('3382efb1f82e5598eae9f72b145fc8cc19876d925ae94513e42e5e8bedfbb923387d3c5d4c80f1333fe6b07e5d96866d4d0776b2190a50f6929862f943815d8f'
+        '6b2cc62400816851c0e0b7b491aa78bb73fa8f15d37a31e816745a53c2a1a3d96fc724b5c9b050d2c4af7f31fc4856aa31c26c7b7a63525d008bb0a6d1bfdabf'
+        'eb204485404ce55c0881a41b946c58b70e1814ee17e8accea786e802d4c8c3a069d63886615433f278277a8b4c67d9a3a6125fea78dafda4cbad3b5204f29245')
+
+prepare() {
+  # add missing include needed when registering custom transports: https://github.com/libgit2/libgit2/issues/6607
+  patch -Np1 -d $_pkgname-$pkgver -i ../$_pkgname-1.7.0-git_oidarray_include.patch
+  # make reuse of grafts "safe"
+  patch -Np1 -d $_pkgname-$pkgver -i ../$_pkgname-1.7.0-cleanup_grafts.patch
+}
 
 build() {
 
diff --git a/libgit2-1.7.0-git_oidarray_include.patch b/libgit2-1.7.0-git_oidarray_include.patch
new file mode 100644
index 0000000..70a4dfa
--- /dev/null
+++ b/libgit2-1.7.0-git_oidarray_include.patch
@@ -0,0 +1,12 @@
+diff --git i/include/git2/sys/transport.h w/include/git2/sys/transport.h
+index 96a35d08c..370ca45d5 100644
+--- i/include/git2/sys/transport.h
++++ w/include/git2/sys/transport.h
+@@ -9,6 +9,7 @@
+ #define INCLUDE_sys_git_transport_h
+ 
+ #include "git2/net.h"
++#include "git2/oidarray.h"
+ #include "git2/proxy.h"
+ #include "git2/remote.h"
+ #include "git2/strarray.h"