kalev pushed to gthumb (master). "Fix hardened build fallout"

[notifications at fedoraproject.org]

>From b6f79815c7362e25e406756aab8beca17a88acbe Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Thu, 16 Apr 2015 13:28:22 +0200
Subject: Fix hardened build fallout


diff --git a/0001-configure-Clear-out-ldflags-before-ac_check_lib-call.patch b/0001-configure-Clear-out-ldflags-before-ac_check_lib-call.patch
new file mode 100644
index 0000000..1ca3b74
--- /dev/null
+++ b/0001-configure-Clear-out-ldflags-before-ac_check_lib-call.patch
@@ -0,0 +1,77 @@
+From c70d92bb721b680f2009e33412a2b8d169a7edcf Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Thu, 16 Apr 2015 13:00:55 +0200
+Subject: [PATCH] configure: Clear out ldflags before ac_check_lib() calls
+
+This fixes the Fedora 23 build where the cflags and ldflags have to
+match. Otherwise, if ac_check_lib checks throw away cflags but use
+ldflags, the checks fail with linker errors.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=747982
+---
+ configure.ac | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 7890d61..db67766 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -177,11 +177,15 @@ AC_SUBST(GTHUMB_CFLAGS)
+ dnl ===========================================================================
+ 
+ SAVE_CFLAGS="$CFLAGS"
++SAVE_LDFLAGS="$LDFLAGS"
+ CFLAGS=""
++LDFLAGS=""
+ AC_CHECK_LIB(m, floor,, AC_MSG_ERROR([math library not found]))
+ M_LIBS="-lm"
+ CFLAGS="$SAVE_CFLAGS"
++LDFLAGS="$SAVE_LDFLAGS"
+ unset SAVE_CFLAGS
++unset SAVE_LDFLAGS
+ AC_SUBST(M_LIBS)
+ 
+ dnl ===========================================================================
+@@ -378,7 +382,9 @@ AC_ARG_ENABLE([jpeg],
+ 	      [enable_jpeg=yes])
+ if test "x$enable_jpeg" = "xyes"; then
+ 	SAVE_CFLAGS="$CFLAGS"
++	SAVE_LDFLAGS="$LDFLAGS"
+ 	CFLAGS=""
++	LDFLAGS=""
+ 	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+         	     [enable_jpeg=yes],
+ 	     	     [enable_jpeg=no])
+@@ -387,7 +393,9 @@ if test "x$enable_jpeg" = "xyes"; then
+ 		JPEG_LIBS='-ljpeg -lm -lz'
+ 	fi
+ 	CFLAGS="$SAVE_CFLAGS"
++	LDFLAGS="$SAVE_LDFLAGS"
+ 	unset SAVE_CFLAGS
++	unset SAVE_LDFLAGS
+ fi
+ AC_SUBST(JPEG_LIBS)
+ AM_CONDITIONAL(ENABLE_JPEG_TOOLS, test "x$enable_jpeg" = xyes)
+@@ -422,7 +430,9 @@ AC_ARG_ENABLE([tiff],
+ 	      [enable_tiff=yes])
+ if test x$enable_tiff = xyes ; then
+ 	SAVE_CFLAGS="$CFLAGS"
++	SAVE_LDFLAGS="$LDFLAGS"
+ 	CFLAGS=""
++	LDFLAGS=""
+ 	AC_CHECK_LIB(tiff, TIFFWriteScanline,
+ 		     [AC_CHECK_HEADER(tiffio.h,
+ 				      [enable_tiff=yes],
+@@ -433,7 +443,9 @@ if test x$enable_tiff = xyes ; then
+ 		TIFF_LIBS='-ltiff -lm -lz'
+ 	fi
+ 	CFLAGS="$SAVE_CFLAGS"
++	LDFLAGS="$SAVE_LDFLAGS"
+ 	unset SAVE_CFLAGS
++	unset SAVE_LDFLAGS
+ fi
+ AC_SUBST(TIFF_LIBS)
+ AM_CONDITIONAL(ENABLE_TIFF, test "x$enable_tiff" = xyes)
+-- 
+2.3.5
+
diff --git a/gthumb.spec b/gthumb.spec
index 81dcd2e..dbd0c2e 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -5,6 +5,8 @@ Release: 2%{?dist}
 Epoch: 1
 URL: https://wiki.gnome.org/Apps/gthumb
 Source0: http://download.gnome.org/sources/gthumb/3.4/%{name}-%{version}.tar.xz
+# https://bugzilla.gnome.org/show_bug.cgi?id=747982
+Patch0: 0001-configure-Clear-out-ldflags-before-ac_check_lib-call.patch
 License: GPLv2+
 Group: User Interface/X
 
@@ -48,6 +50,8 @@ package.
 
 %prep
 %setup -q
+%patch0 -p1
+autoreconf -fi
 
 %build
 %configure --disable-static
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gthumb.git/commit/?h=master&id=b6f79815c7362e25e406756aab8beca17a88acbe