Date: Tue, 15 May 2018 12:21:41 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470014 - in head/devel: libgit2 libgit2-glib libgit2-glib/files Message-ID: <201805151221.w4FCLfBw029278@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue May 15 12:21:41 2018 New Revision: 470014 URL: https://svnweb.freebsd.org/changeset/ports/470014 Log: devel/libgit2-glib: Unbreak with libgit2 0.27. The fix is two-fold: * Adjust the path for the sed call in devel/libgit2 so that we leave out openssl from libgit2.pc's Requires.private line, otherwise libgit2-glib will look for openssl.pc, which does not exist when OpenSSL from base is used. * Reset libgit2-glib back to 0.26, and import a patch both Arch Linux and openSUSE have been carrying to fix the build with libgit2 0.27. PORTEPOCH was not set because there is no libgit2-glib 0.27 and no package could have possibly been built after r469930. Approved by: mfechner, gnome (kwm) Differential Revision: https://reviews.freebsd.org/D15437 Added: head/devel/libgit2-glib/files/ head/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c (contents, props changed) Modified: head/devel/libgit2-glib/Makefile head/devel/libgit2/Makefile Modified: head/devel/libgit2-glib/Makefile ============================================================================== --- head/devel/libgit2-glib/Makefile Tue May 15 11:58:42 2018 (r470013) +++ head/devel/libgit2-glib/Makefile Tue May 15 12:21:41 2018 (r470014) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgit2-glib -PORTVERSION= 0.27.0 +PORTVERSION= 0.26.0 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -12,8 +12,6 @@ COMMENT= Glib wrapper library around the libgit2 git a LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN= upstream does not support libgit 0.27.0 BUILD_DEPENDS= vapigen:lang/vala LIB_DEPENDS= libgit2.so:devel/libgit2 Added: head/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c Tue May 15 12:21:41 2018 (r470014) @@ -0,0 +1,13 @@ +Fix the build with libgit2 0.27. + +Obtained from: https://git.archlinux.org/svntogit/packages.git/commit/trunk/libgit2-0.27.0.diff?h=packages/libgit2-glib&id=5c8af6b8236ed9a108ad980899477cb50ffeb324 +--- libgit2-glib/ggit-config.c.orig 2015-08-10 06:33:13 UTC ++++ libgit2-glib/ggit-config.c +@@ -295,6 +295,7 @@ ggit_config_add_file (GgitConfig *config, + ret = git_config_add_file_ondisk (_ggit_native_get (config), + path, + (git_config_level_t)level, ++ NULL, + force); + g_free (path); + Modified: head/devel/libgit2/Makefile ============================================================================== --- head/devel/libgit2/Makefile Tue May 15 11:58:42 2018 (r470013) +++ head/devel/libgit2/Makefile Tue May 15 12:21:41 2018 (r470014) @@ -2,6 +2,7 @@ PORTNAME= libgit2 PORTVERSION= 0.27.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -38,7 +39,7 @@ post-patch: @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt .if ${SSL_DEFAULT} == base @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \ - ${WRKSRC}/CMakeLists.txt + ${WRKSRC}/src/CMakeLists.txt .endif .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805151221.w4FCLfBw029278>