[SCM] qtcreator packaging branch, master, updated. debian/2.8.1-2-2-gaa44e6a

Pino Toscano pino at alioth.debian.org
Wed Sep 4 14:46:40 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=aa44e6a

The following commit has been merged in the master branch:
commit aa44e6a009c6ad627a48db30d734e958c4897a23
Author: Pino Toscano <pino at debian.org>
Date:   Wed Sep 4 16:46:10 2013 +0200

    disable -Werror when building
    
    it could potentially break depending on compiler/architecture
---
 debian/changelog              |    3 +++
 debian/patches/no-Werror.diff |   18 ++++++++++++++++++
 debian/patches/series         |    1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1396484..de87ba4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtcreator (2.8.1-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Disable -Werror when building, as could potentially break depending on
+    compiler/architecture; patch no-Werror.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Sep 2013 16:36:45 +0200
 
diff --git a/debian/patches/no-Werror.diff b/debian/patches/no-Werror.diff
new file mode 100644
index 0000000..4222d2c
--- /dev/null
+++ b/debian/patches/no-Werror.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Disable -Werror in Debian builds.
+ Having -Werror in CXXFLAGS means that any warning becomes a fatal error;
+ considering new compiler versions may add new warnings and potentially make
+ valid code not compile anymore, just remove -Werror altogether.
+Last-Update: 2013-09-04
+Forwarded: not-needed
+
+--- a/src/shared/qbs/src/lib/lib.pro
++++ b/src/shared/qbs/src/lib/lib.pro
+@@ -23,7 +23,6 @@ contains(QT_CONFIG, reduce_exports):CONF
+ 
+ win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d
+ win32-msvc*|win32-icc:QMAKE_CXXFLAGS += /WX
+-else:*g++*|*clang*|*icc*:QMAKE_CXXFLAGS += -Werror
+ 
+ !disable_rpath {
+     macx:QMAKE_LFLAGS_SONAME = -Wl,-install_name, at rpath/
diff --git a/debian/patches/series b/debian/patches/series
index ec331ee..ed3bf8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ rpath_nonlinux.diff
 
 # Debian patches.
 botan_system_lib.diff
+no-Werror.diff

-- 
qtcreator packaging



More information about the pkg-kde-commits mailing list