diff options
| author | Larry Hajali <larryhaja@gmail.com> | 2020-05-02 10:24:22 -0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2020-05-03 08:48:38 +0700 |
| commit | d2d275f135328b9815c12957cb063c217b3c4191 (patch) | |
| tree | 4f9fdc9fdad2b8f70b2e2e1c7d5c1faebd402a12 | |
| parent | 396f765041f2d52d129253150d561916f8c50955 (diff) | |
| download | slackbuilds-d2d275f135328b9815c12957cb063c217b3c4191.tar.gz | |
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>
| -rw-r--r-- | graphics/fritzing/fritzing.SlackBuild | 5 | ||||
| -rw-r--r-- | graphics/fritzing/libgit2-version.patch | 23 |
2 files changed, 28 insertions, 0 deletions
diff --git a/graphics/fritzing/fritzing.SlackBuild b/graphics/fritzing/fritzing.SlackBuild index 496ce634bd..5f8d2436a8 100644 --- a/graphics/fritzing/fritzing.SlackBuild +++ b/graphics/fritzing/fritzing.SlackBuild @@ -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 diff --git a/graphics/fritzing/libgit2-version.patch b/graphics/fritzing/libgit2-version.patch new file mode 100644 index 0000000000..878ee5a348 --- /dev/null +++ b/graphics/fritzing/libgit2-version.patch @@ -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); |