tags 667147 + patch
thanks
uploaded to delayed/5, on top of the existing NMU.
diff -u cwidget-0.5.16/debian/rules cwidget-0.5.16/debian/rules
--- cwidget-0.5.16/debian/rules
+++ cwidget-0.5.16/debian/rules
@@ -5,14 +5,14 @@
# it.
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- export CXXFLAGS=-g -O0 -fno-inline -fno-strict-aliasing
+ DEB_CXXFLAGS_MAINT_APPEND=-fno-inline -fno-strict-aliasing
else
- export CXXFLAGS=-g -O2 -fno-strict-aliasing
+ DEB_CXXFLAGS_MAINT_APPEND=-fno-strict-aliasing
endif
configure: configure-stamp
configure-stamp:
- ./configure --prefix=/usr
+ ./configure --prefix=/usr $(shell dpkg-buildflags --export=configure)
touch configure-stamp
diff -u cwidget-0.5.16/debian/changelog cwidget-0.5.16/debian/changelog
--- cwidget-0.5.16/debian/changelog
+++ cwidget-0.5.16/debian/changelog
@@ -1,3 +1,11 @@
+cwidget (0.5.16-3.2) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Build using hardened build flags. Closes: #656024.
+ * Fix build failure with GCC-4.7. Closes: #667147.
+
+ -- Matthias Klose <[email protected]> Mon, 16 Apr 2012 19:40:07 +0200
+
cwidget (0.5.16-3.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- cwidget-0.5.16.orig/src/cwidget/toplevel.cc
+++ cwidget-0.5.16/src/cwidget/toplevel.cc
@@ -49,6 +49,7 @@
#include <limits.h>
#include <signal.h>
+#include <unistd.h>
#include <cwidget/generic/util/eassert.h>
#include <sys/time.h>
