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

[Armin Berres]

Author: trigger-guest
Date: 2008-01-06 21:51:02 +0000 (Sun, 06 Jan 2008)
New Revision: 8801

Added:
   branches/kde4/packages/kdelibs/debian/patches/08_add_empty_build_type.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
The "You should update kdelibs5-dev before you do anything else" commit. Wait -- the one before this one was it to be exactly.

* Add patch to build no special debug code, but release code, and remove
  all hardcoded optimization and debug compiler flags. Use $(CXXFLAGS) and
  $(CFLAGS) instead.


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-06 21:47:07 UTC (rev 8800)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-06 21:51:02 UTC (rev 8801)
@@ -1,18 +1,21 @@
 kde4libs (4:4.0.0-1) UNRELEASED; urgency=low
- 
-  * New upstream release. KDE 4.0.0 yay! 
 
+  * New upstream release. KDE 4.0.0 yay!
+
   +++ Changes by Armin Berres:
 
   * Add patch to disable debug information by default. They can be enabled
     with kdebugdialog.
+  * Add patch to build no special debug code, but release code, and remove
+    all hardcoded optimization and debug compiler flags. Use $(CXXFLAGS) and
+    $(CFLAGS) instead.
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 
   * Update patch 15_kfreebsd_support to build in kfreebsd after latest changes
     in ConfigureChecks.cmake.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 04 Jan 2008 16:44:56 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Jan 2008 16:53:56 +0100
 
 kde4libs (4:3.98.0~svn755919-1) experimental; urgency=low
 

Added: branches/kde4/packages/kdelibs/debian/patches/08_add_empty_build_type.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/08_add_empty_build_type.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_empty_build_type.diff	2008-01-06 21:51:02 UTC (rev 8801)
@@ -0,0 +1,22 @@
+We get the flags from $(CXXFLAGS) and $(CFLAGS), if we don't remove them we add
+them two times.
+Define NDEBUG, otherwise we get pure debug code. Kfind will start in one instead
+of twenty seconds with this define e.g. because of enabled caching of unknown
+icons.
+Debug output is not completely disabled, because QT_NO_DEBUG is not set.
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -833,11 +833,13 @@
+    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_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")
+ 
+    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/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-01-06 21:47:07 UTC (rev 8800)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-01-06 21:51:02 UTC (rev 8801)
@@ -1,3 +1,4 @@
+08_add_empty_build_type.diff
 09_disable_debug_messages_if_not_explicitly_enabled.diff
 10_kdehome_kde4.diff
 11_kde4_applications_menu.diff