Bug#903146: libgit2-glib: compatibility with libgit2 0.27 in experimental

[Steve Langasek]

Package: libgit2-glib
Version: 0.26.2-1
Severity: serious
Tags: patch experimental
Justification: FTBFS
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear maintainers,

libgit2-glib fails to build against libgit2 0.27, which is currently in
experimental, due to an API change:

libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I.. -I. -pthread -I/usr/in
clude/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include -DGIT
_SSH=1 -Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -We
rror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werr
or=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=return-
type -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=
. -fstack-protector-strong -Wformat -Werror=format-security -c ggit-cred.c  -fPI
C -DPIC -o .libs/ggit-cred.o
ggit-config.c: In function ‘ggit_config_add_file’:
ggit-config.c:298:36: warning: passing argument 4 of ‘git_config_add_file_ondisk
’ makes pointer from integer without a cast [-Wint-conversion]
                                    force);
                                    ^~~~~
In file included from /usr/include/git2.h:22:0,
                 from ggit-config.h:26,
                 from ggit-config.c:21:
/usr/include/git2/config.h:208:17: note: expected ‘const git_repository * {aka c
onst struct git_repository *}’ but argument is of type ‘gboolean {aka int}’
 GIT_EXTERN(int) git_config_add_file_ondisk(
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
ggit-config.c:295:8: error: too few arguments to function ‘git_config_add_file_o
ndisk’
  ret = git_config_add_file_ondisk (_ggit_native_get (config),
        ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /usr/include/git2.h:22:0,
                 from ggit-config.h:26,
                 from ggit-config.c:21:
/usr/include/git2/config.h:208:17: note: declared here
 GIT_EXTERN(int) git_config_add_file_ondisk(
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
/bin/bash ../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I..  -I.. -I.. -I. -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include -DGIT_SSH=1 -Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=return-type   -Wdate-time -D_FORTIFY_SOURCE=2  -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -c -o ggit-cred-plaintext.lo ggit-cred-plaintext.c
Makefile:780: recipe for target 'ggit-config.lo' failed
make[4]: *** [ggit-config.lo] Error 1

  https://launchpad.net/ubuntu/+source/libgit2-glib/0.26.2-1build1/+build/15063247

Please find attached a one-line patch that fixes libgit2-glib for
compatibility with the new libgit2.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru libgit2-glib-0.26.2/debian/patches/libgit2-0.27-compat.patch libgit2-glib-0.26.2/debian/patches/libgit2-0.27-compat.patch
--- libgit2-glib-0.26.2/debian/patches/libgit2-0.27-compat.patch	1969-12-31 16:00:00.000000000 -0800
+++ libgit2-glib-0.26.2/debian/patches/libgit2-0.27-compat.patch	2018-07-06 17:24:47.000000000 -0700
@@ -0,0 +1,19 @@
+Description: Compatibility with libgit2 0.27
+ git_config_add_file_ondisk() now takes an additional (optional) 'repo'
+ argument.  Fix the build failure.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Forwarded: no
+Last-Update: 2018-07-07
+
+Index: libgit2-glib-0.26.2/libgit2-glib/ggit-config.c
+===================================================================
+--- libgit2-glib-0.26.2.orig/libgit2-glib/ggit-config.c
++++ libgit2-glib-0.26.2/libgit2-glib/ggit-config.c
+@@ -295,6 +295,7 @@
+ 	ret = git_config_add_file_ondisk (_ggit_native_get (config),
+ 	                                  path,
+ 	                                  (git_config_level_t)level,
++	                                  NULL,
+ 	                                  force);
+ 	g_free (path);
+ 
diff -Nru libgit2-glib-0.26.2/debian/patches/series libgit2-glib-0.26.2/debian/patches/series
--- libgit2-glib-0.26.2/debian/patches/series	1969-12-31 16:00:00.000000000 -0800
+++ libgit2-glib-0.26.2/debian/patches/series	2018-07-06 17:23:15.000000000 -0700
@@ -0,0 +1 @@
+libgit2-0.27-compat.patch