diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-03-07 09:23:42 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-03-07 09:23:42 -0800 |
| commit | 3b1624ec69ff8cc7332d080e89e71e7e9462c76e (patch) | |
| tree | 8faa22aee886d467095f23cc41409914c94a3ea7 | |
| parent | 00c97e710f0090b3a2a8d5fe5b92e5ac0207a4b9 (diff) | |
| download | subsurface-3b1624ec69ff8cc7332d080e89e71e7e9462c76e.tar.gz | |
Add a workaround for using post 0.20 git versions of libgit2
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>
| -rw-r--r-- | save-git.c | 4 | ||||
| -rw-r--r-- | subsurface-configure.pri | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/save-git.c b/save-git.c index 5ffd06885..619e08630 100644 --- a/save-git.c +++ b/save-git.c @@ -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. */ -#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) \ git_branch_create(out,repo,branch_name,target,force) #define git_reference_set_target(out,ref,target,signature,log_message) \ diff --git a/subsurface-configure.pri b/subsurface-configure.pri index a211113b2..712b2272a 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -5,7 +5,7 @@ # - calling implicit functions # - casting from integers to pointers or vice-versa without an explicit cast # 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 # 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 else: LIBS += -lmarblewidget +libgit21-api { + DEFINES += USE_LIBGIT21_API +} # # Platform-specific changes # |