rev 13622 - in branches/kde4.2/packages/kdelibs/debian: . patches

[Armin Berres]

Author: trigger-guest
Date: 2009-01-27 23:17:24 +0000 (Tue, 27 Jan 2009)
New Revision: 13622

Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
   branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
Log:
+++ Changes by Armin Berres:
* Update patch 08_add_debian_build_type.diff to also set QT_NO_DEBUG and
sync 09_disable_debug_messages_if_not_explicitly_enabled.diff with
upstream revision 916186.

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-27 20:16:15 UTC (rev 13621)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-27 23:17:24 UTC (rev 13622)
@@ -1,3 +1,13 @@
+kde4libs (4:4.2.0-3) UNRELEASED; urgency=low
+
+  +++ Changes by Armin Berres:
+
+  * Update patch 08_add_debian_build_type.diff to also set QT_NO_DEBUG and
+    sync 09_disable_debug_messages_if_not_explicitly_enabled.diff with
+    upstream revision 916186.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Jan 2009 23:35:58 +0100
+
 kde4libs (4:4.2.0-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: branches/kde4.2/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2009-01-27 20:16:15 UTC (rev 13621)
+++ branches/kde4.2/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2009-01-27 23:17:24 UTC (rev 13622)
@@ -6,17 +6,17 @@
 Debug output is not completely disabled, because QT_NO_DEBUG is not set.
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -965,11 +965,13 @@
+@@ -965,11 +965,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
     set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
     set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-+   set(CMAKE_CXX_FLAGS_DEBIAN         "-DNDEBUG")
++   set(CMAKE_CXX_FLAGS_DEBIAN         "-DNDEBUG -DQT_NO_DEBUG")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
     set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
     set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
     set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
     set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-+   set(CMAKE_C_FLAGS_DEBIAN           "-DNDEBUG")
++   set(CMAKE_C_FLAGS_DEBIAN           "-DNDEBUG -DQT_NO_DEBUG")
  
     if (CMAKE_SYSTEM_NAME MATCHES Linux)
       set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")

Modified: branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff	2009-01-27 20:16:15 UTC (rev 13621)
+++ branches/kde4.2/packages/kdelibs/debian/patches/09_disable_debug_messages_if_not_explicitly_enabled.diff	2009-01-27 23:17:24 UTC (rev 13622)
@@ -2,27 +2,58 @@
 messages on the konsole. This patch disables these messages. Kdebugdialog
 can be used to enable them. 
 See also 04_disable_debug_by_default.diff in kdebase-runtime.
+
+In KDE 4.3 trunk this has been committed as r916186.
+--- a/kdecore/kdebugrc
++++ b/kdecore/kdebugrc
+@@ -82,7 +82,7 @@ InfoOutput=4
+ 
+ # KMail
+ [5006]
+-InfoOutput=2
++InfoOutput=4
+ 
+ # KitchenSync (Syncing Algorithm)
+ [5250]
 --- a/kdecore/io/kdebug.cpp
 +++ b/kdecore/io/kdebug.cpp
-@@ -313,7 +313,9 @@
+@@ -181,6 +181,11 @@ struct KDebugPrivate
+         QtOutput = 2,
+         SyslogOutput = 3,
+         NoOutput = 4,
++#ifdef QT_NO_DEBUG
++        DefaultOutput = NoOutput,
++#else
++        DefaultOutput = QtOutput,
++#endif
+         Unknown = 5
+     };
+ 
+@@ -313,7 +318,7 @@ struct KDebugPrivate
          }
  
          KConfigGroup cg(config, QString::number(area));
 -        int mode = cg.readEntry(key, 2);
-+	// disable debug output by default
-+	int defaultMode = type == QtDebugMsg ? 4 : 2;
-+        int mode = cg.readEntry(key, defaultMode);
++        int mode = cg.readEntry(key, int(DefaultOutput));
          return OutputMode(mode);
      }
  
---- a/kdecore/kdebugrc
-+++ b/kdecore/kdebugrc
-@@ -82,7 +82,7 @@
+--- a/kdecore/io/kdebug.h
++++ b/kdecore/io/kdebug.h
+@@ -31,12 +31,13 @@
+  *  @{
+  * KDE debug message streams let you and the user control just how many debug
+  * messages you see. Debug message printing is controlled by (un)defining
+- * QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then no debug
+- * messages are printed.
++ * QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then debug
++ * messages are not printed by default but can still be enabled by runtime
++ * configuration, e.g. via kdebugdialog or by editing kdebugrc.
+  */
  
- # KMail
- [5006]
--InfoOutput=2
-+InfoOutput=4
- 
- # KitchenSync (Syncing Algorithm)
- [5250]
+ #if !defined(KDE_NO_DEBUG_OUTPUT)
+-# if defined(QT_NO_DEBUG) || defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
++# if defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
+ #  define KDE_NO_DEBUG_OUTPUT
+ # endif
+ #endif