r47889 - in /packages/experimental/gnome-builder/debian: changelog patches/fix-missing-git-check.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Apr 12 11:38:43 2016
New Revision: 47889

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47889
Log:
Add debian/patches/fix-missing-git-check.patch

Added:
    packages/experimental/gnome-builder/debian/patches/fix-missing-git-check.patch
Modified:
    packages/experimental/gnome-builder/debian/changelog
    packages/experimental/gnome-builder/debian/patches/series

Modified: packages/experimental/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/changelog?rev=47889&op=diff
==============================================================================
--- packages/experimental/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/experimental/gnome-builder/debian/changelog	[utf-8] Tue Apr 12 11:38:43 2016
@@ -33,13 +33,14 @@
     - devhelp plugin: libdevhelp-dev to >= 3.20.0
     - git plugin: libgit2-glib-1.0-dev to >= 0.24.0
     Note: added/new plugins not taken into consideration here (yet).
+  * Add debian/patches/fix-missing-git-check.patch
 
   [ Michael Biebl ]
   * Drop uploaders.mk from debian/rules as this breaks the clean target with
     dh. Instead use the gnome dh addon which updates debian/control via
     dh_gnome_clean.
 
- -- Andreas Henriksson <andreas at fatal.se>  Sat, 02 Apr 2016 14:39:35 +0200
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 12 Apr 2016 13:25:45 +0200
 
 gnome-builder (3.18.1-2) unstable; urgency=medium
 

Added: packages/experimental/gnome-builder/debian/patches/fix-missing-git-check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/patches/fix-missing-git-check.patch?rev=47889&op=file
==============================================================================
--- packages/experimental/gnome-builder/debian/patches/fix-missing-git-check.patch	(added)
+++ packages/experimental/gnome-builder/debian/patches/fix-missing-git-check.patch	[utf-8] Tue Apr 12 11:38:43 2016
@@ -0,0 +1,33 @@
+From 93eaf306d786f9a17b4cba54c98c9bd888abd87b Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Tue, 12 Apr 2016 13:20:01 +0200
+Subject: [PATCH] build: fix test usage with logic condition in git plugin
+
+Before having a new enough libgit2-glib I ran into the warning
+about my libgit2-glib not being built properly with threads.
+After having a new enough libgit2-glib when buildin I ran into
+an infinite loop of "= no" lines being outputted...
+
+This change should hopefully fix both.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764522
+---
+ plugins/git/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/git/configure.ac b/plugins/git/configure.ac
+index 4c2bce5..cd4474b 100644
+--- a/plugins/git/configure.ac
++++ b/plugins/git/configure.ac
+@@ -13,7 +13,7 @@ AS_IF([test "$enable_git_plugin" != no],[
+ 	                  [have_git=yes],
+ 	                  [have_git=no])
+ 
+-	AS_IF([test "$enable_git_plugin" = "yes" && "$have_git" = "no"],[
++	AS_IF([test "$enable_git_plugin" = "yes" && test "$have_git" = "no"],[
+ 	       AC_MSG_ERROR([--enable-git-plugin requires libgit2-glib-1.0 >= ggit_required_version])
+ 	])
+ 
+-- 
+2.8.0.rc3
+

Modified: packages/experimental/gnome-builder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-builder/debian/patches/series?rev=47889&op=diff
==============================================================================
--- packages/experimental/gnome-builder/debian/patches/series	[utf-8] (original)
+++ packages/experimental/gnome-builder/debian/patches/series	[utf-8] Tue Apr 12 11:38:43 2016
@@ -1 +1,2 @@
 fix-terminal-plugin-ldflags.patch
+fix-missing-git-check.patch