graphics/fritzing: build against newer version of libgit2
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
396f765041
commit
d2d275f135
|
@ -65,6 +65,7 @@ rm -rf $PKG
|
|||
mkdir -p $TMP $PKG $OUTPUT
|
||||
cd $TMP
|
||||
rm -rf $PRGNAM-app-master
|
||||
rm -rf $PRGNAM-parts-master
|
||||
unzip $CWD/$PRGNAM-app-master.zip
|
||||
unzip $CWD/$PRGNAM-parts-master.zip
|
||||
|
||||
|
@ -75,6 +76,10 @@ find -L . \
|
|||
-o -perm 511 \) -exec chmod 755 {} \; -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
# Patch for libgti2 vesion >= 1.0.
|
||||
patch -p1 < $CWD/libgit2-version.patch
|
||||
|
||||
qmake-qt5
|
||||
make
|
||||
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
From 472951243d70eeb40a53b1f7e16e6eab0588d079 Mon Sep 17 00:00:00 2001
|
||||
From: PsikoBlock <rramsch@googlemail.com>
|
||||
Date: Fri, 10 Apr 2020 21:41:52 +0200
|
||||
Subject: [PATCH] Fix libgit2 version check to allow building with versions >=
|
||||
1.0
|
||||
|
||||
---
|
||||
src/version/partschecker.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/version/partschecker.cpp b/src/version/partschecker.cpp
|
||||
index 65daf76e5..36300fe09 100644
|
||||
--- a/src/version/partschecker.cpp
|
||||
+++ b/src/version/partschecker.cpp
|
||||
@@ -121,7 +121,7 @@
|
||||
/**
|
||||
* Connect to the remote.
|
||||
*/
|
||||
-#if LIBGIT2_VER_MINOR > 24
|
||||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR > 24)
|
||||
error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
|
||||
#elif LIBGIT2_VER_MINOR == 24
|
||||
error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL);
|
Loading…
Reference in New Issue