On Sat, Feb 23, 2013 at 11:22:17AM +0000, Matthias Klose wrote: > Package: src:xorg-server > Version: 2:1.12.4-4 > Severity: important > Tags: sid jessie > User: [email protected] > Usertags: ftbfs-gcc-4.8 > > The package fails to build in a test rebuild on at least amd64 with > gcc-4.8/g++-4.8, but succeeds to build with gcc-4.7/g++-4.7. The > severity of this report may be raised before the jessie release. > > ../../dix/window.c:887:5: error: implicit declaration of function > 'DeleteWindowFromAnySelections' [-Werror=implicit-function-declaration]
I've uploaded and NMU based on Gerardo's patch. debdiff is attached, plus patches which can be applied via git am. Regards, Michael
diff -u xorg-server-1.12.4/debian/changelog xorg-server-1.12.4/debian/changelog --- xorg-server-1.12.4/debian/changelog +++ xorg-server-1.12.4/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.12.4-6.1) unstable; urgency=low + + * Non-maintainer upload. + * 10_Include-missing-selection-h.diff: Fix FTBFS with GCC 4.8. Include + selection.h in dix/window.c for the missing DeleteWindowFromAnySelections + function prototype. Patch by Gerardo Malazdrewicz (closes: #701372) + + -- Michael Biebl <[email protected]> Thu, 25 Jul 2013 19:45:29 +0200 + xorg-server (2:1.12.4-6) unstable; urgency=low * Touch: Fix duplicate TouchBegin selection with virtual devices diff -u xorg-server-1.12.4/debian/patches/series xorg-server-1.12.4/debian/patches/series --- xorg-server-1.12.4/debian/patches/series +++ xorg-server-1.12.4/debian/patches/series @@ -12,0 +13 @@ +10_Include-missing-selection-h.diff only in patch2: unchanged: --- xorg-server-1.12.4.orig/debian/patches/10_Include-missing-selection-h.diff +++ xorg-server-1.12.4/debian/patches/10_Include-missing-selection-h.diff @@ -0,0 +1,20 @@ +Description: Fix build failure with GCC 4.8 + This patches fixes the following build failure: + + ../../dix/window.c:887:5: error: implicit declaration of function 'DeleteWindowFromAnySelections' [-Werror=implicit-function-declaration] + + by including "selection.h", where the function is prototyped. + +Author: Gerardo Malazdrewicz <[email protected]> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701372 +--- xorg-server-1.12.4/dix/window.c 2012-05-17 14:09:02.000000000 -0300 ++++ xorg-server-1.12.4.good/dix/window.c 2013-04-18 11:53:06.787521781 -0300 +@@ -131,6 +131,8 @@ + #include "xace.h" + #include "exevents.h" + ++#include "selection.h" ++ + #include <X11/Xatom.h> /* must come after server includes */ + + /******
>From ece1ad591b9e4022edd2766441adc35f845f3ac4 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Thu, 25 Jul 2013 19:44:21 +0200 Subject: [PATCH 1/2] Fix build failure with GCC 4.8 This patches fixes the following build failure: ../../dix/window.c:887:5: error: implicit declaration of function 'DeleteWindowFromAnySelections' [-Werror=implicit-function-declaration] by including "selection.h", where the function is prototyped. --- debian/patches/10_Include-missing-selection-h.diff | 20 ++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 21 insertions(+) create mode 100644 debian/patches/10_Include-missing-selection-h.diff diff --git a/debian/patches/10_Include-missing-selection-h.diff b/debian/patches/10_Include-missing-selection-h.diff new file mode 100644 index 0000000..873b14e --- /dev/null +++ b/debian/patches/10_Include-missing-selection-h.diff @@ -0,0 +1,20 @@ +Description: Fix build failure with GCC 4.8 + This patches fixes the following build failure: + + ../../dix/window.c:887:5: error: implicit declaration of function 'DeleteWindowFromAnySelections' [-Werror=implicit-function-declaration] + + by including "selection.h", where the function is prototyped. + +Author: Gerardo Malazdrewicz <[email protected]> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701372 +--- xorg-server-1.12.4/dix/window.c 2012-05-17 14:09:02.000000000 -0300 ++++ xorg-server-1.12.4.good/dix/window.c 2013-04-18 11:53:06.787521781 -0300 +@@ -131,6 +131,8 @@ + #include "xace.h" + #include "exevents.h" + ++#include "selection.h" ++ + #include <X11/Xatom.h> /* must come after server includes */ + + /****** diff --git a/debian/patches/series b/debian/patches/series index c89edaf..e05122f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ 07_Revert-kinput-allocate-enough-space-for-null-charact.diff 08_xfree86_fix_ia64_inx_outx.diff 09_EXA-Track-source-mask-pixmaps-more-explicitly-for-Co.diff +10_Include-missing-selection-h.diff -- 1.8.3.2
>From 7f78d952a19f48d8834944797fc6c9aa6a63c1a1 Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Thu, 25 Jul 2013 19:45:59 +0200 Subject: [PATCH 2/2] Update changelong and upload to unstable --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index a2ef947..faf29dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xorg-server (2:1.12.4-6.1) unstable; urgency=low + + * Non-maintainer upload. + * 10_Include-missing-selection-h.diff: Fix FTBFS with GCC 4.8. Include + selection.h in dix/window.c for the missing DeleteWindowFromAnySelections + function prototype. Patch by Gerardo Malazdrewicz (closes: #701372) + + -- Michael Biebl <[email protected]> Thu, 25 Jul 2013 19:45:29 +0200 + xorg-server (2:1.12.4-6) unstable; urgency=low * Touch: Fix duplicate TouchBegin selection with virtual devices -- 1.8.3.2
