sessreg: fix FTBFS with gcc 5 (closes: #778176)

Thanks to Matthias Klose, Daniel Schepler and Aurélien Jarno.
This commit is contained in:
Julien Cristau 2015-09-12 12:17:08 +02:00
parent fd46fd38d1
commit e92cedc010
3 changed files with 38 additions and 0 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
x11-xserver-utils (7.7+5) unstable; urgency=high
* High urgency upload for RC bug fix.
* sessreg: fix FTBFS with gcc 5 (closes: #778176). Thanks to Matthias
Klose, Daniel Schepler and Aurélien Jarno.
-- Julien Cristau <jcristau@debian.org> Sat, 12 Sep 2015 12:16:27 +0200
x11-xserver-utils (7.7+4) unstable; urgency=medium
* Let uscan verify tarball signatures.

View File

@ -0,0 +1,29 @@
From a5103b826dbd601c9245ceff43a006d65da21199 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Wed, 9 Sep 2015 23:44:06 +0200
Subject: [PATCH sessreg] Pass -P to the preprocessor when generating filenames for the
manpage.
Fixes build with GCC 5. Patch by Richard Biener <rguenther@suse.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
---
sessreg/man/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sessreg/man/Makefile.am b/sessreg/man/Makefile.am
index 665ace5..2e5f146 100644
--- a/sessreg/man/Makefile.am
+++ b/sessreg/man/Makefile.am
@@ -9,7 +9,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
filenames.sed: filenames.sed.c
- $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
$(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@
--
2.5.1

View File

@ -1,2 +1,3 @@
01_sessreg_implement_hostname_hashing.diff
02_xmodmap-include-config.h-before-system-headers.diff
03_sessreg_Pass-P-to-the-preprocessor-when-generating-filenames.diff