kalev pushed to gitg (master). "Fix the build"

[notifications at fedoraproject.org]

>From 3c1101f82033752fcc668ede96eae0c4b376323e Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Wed, 15 Apr 2015 00:15:00 +0200
Subject: Fix the build


diff --git a/0001-configure-Include-passed-in-cflags-for-threading-sup.patch b/0001-configure-Include-passed-in-cflags-for-threading-sup.patch
new file mode 100644
index 0000000..63abd88
--- /dev/null
+++ b/0001-configure-Include-passed-in-cflags-for-threading-sup.patch
@@ -0,0 +1,33 @@
+From 1e0da0c37fe847fd7494f10bbba6ed1842d19efa Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Wed, 15 Apr 2015 00:11:40 +0200
+Subject: [PATCH] configure: Include passed in cflags for threading support
+ check
+
+This fixes the Fedora 23 build where the cflags and ldflags have to
+match. Otherwise, if the configure check throws away cflags but uses
+ldflags, the check fails with a linker error.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=747874
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 990b01c..5026655 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,8 +123,8 @@ AC_MSG_CHECKING([for libgit2-glib threading support])
+ cflags_save="${CFLAGS}"
+ libs_save="${LIBS}"
+ 
+-CFLAGS="${LIBGITG_CFLAGS}"
+-LIBS="${LIBGITG_LIBS}"
++CFLAGS="${CFLAGS} ${LIBGITG_CFLAGS}"
++LIBS="${LIBS} ${LIBGITG_LIBS}"
+ 
+ AC_TRY_RUN([
+ 	#include <libgit2-glib/ggit.h>
+-- 
+2.3.5
+
diff --git a/gitg.spec b/gitg.spec
index b10c293..b39765f 100644
--- a/gitg.spec
+++ b/gitg.spec
@@ -6,6 +6,8 @@ Summary:        GTK+ graphical interface for the git revision control system
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Apps/Gitg/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.16/%{name}-%{version}.tar.xz
+# https://bugzilla.gnome.org/show_bug.cgi?id=747874
+Patch0:         0001-configure-Include-passed-in-cflags-for-threading-sup.patch
 
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
@@ -54,6 +56,8 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
 # Use webkitgtk4
 sed -i -e '/name="WebKit2"/ s/3\.0/4.0/' Gitg-1.0.gir
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gitg.git/commit/?h=master&id=3c1101f82033752fcc668ede96eae0c4b376323e