mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a workaround for using post 0.20 git versions of libgit2

Browse source 
Add the following to your qmake command line and things should compile
again:

qmake ... CONFIG+=libgit21-api

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-03-07 09:23:42 -08:00
parent 00c97e710f
commit 3b1624ec69
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
save-git.c
View file

@ -527,10 +527,10 @@ static int create_git_tree(git_repository *repo, struct dir *tree, bool select_o
} }
/* /*
* libgit2 revision 0.19 and earlier do not have the signature and * libgit2 revision 0.20 and earlier do not have the signature and
* message log arguments. * message log arguments.
*/ */
#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR <= 20 #if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR <= 20 && !defined(USE_LIBGIT21_API)
#define git_branch_create(out,repo,branch_name,target,force,sig,msg) \ #define git_branch_create(out,repo,branch_name,target,force,sig,msg) \
git_branch_create(out,repo,branch_name,target,force) git_branch_create(out,repo,branch_name,target,force)
#define git_reference_set_target(out,ref,target,signature,log_message) \ #define git_reference_set_target(out,ref,target,signature,log_message) \

5
subsurface-configure.pri
View file

@ -5,7 +5,7 @@
# - calling implicit functions # - calling implicit functions
# - casting from integers to pointers or vice-versa without an explicit cast # - casting from integers to pointers or vice-versa without an explicit cast
# Also turn on C99 mode with GNU extensions # Also turn on C99 mode with GNU extensions
*-g++*: QMAKE_CFLAGS += -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -Werror=implicit-int *-g++*: QMAKE_CFLAGS += -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -Werror=implicit-int
# these warnings are in general just wrong and annoying - but should be # these warnings are in general just wrong and annoying - but should be
# turned on every once in a while in case they do show the occasional # turned on every once in a while in case they do show the occasional
@ -140,6 +140,9 @@ link_pkgconfig: packagesExist(libiconv): PKGCONFIG += libiconv
win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd win32: CONFIG(debug, debug|release): LIBS += -lmarblewidgetd
else: LIBS += -lmarblewidget else: LIBS += -lmarblewidget
libgit21-api {
DEFINES += USE_LIBGIT21_API
}
# #
# Platform-specific changes # Platform-specific changes
# #