Refresh other patches to make them apply without any offset.

4 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/add_debian_build_type.diff b/debian/patches/add_debian_build_type.diff
index 9e8d622..80ef94e 100644
--- a/debian/patches/add_debian_build_type.diff
+++ b/debian/patches/add_debian_build_type.diff
@@ -9,7 +9,7 @@ icons.
 
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1204,11 +1204,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1198,11 +1198,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")
@@ -21,5 +21,5 @@ icons.
     set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
 +   set(CMAKE_C_FLAGS_DEBIAN           "-DNDEBUG -DQT_NO_DEBUG")
  
-    if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-      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")
+    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")
+    # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff
index 78638ee..7b68acf 100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@ -5,7 +5,7 @@ Description: preliminary GNU/Hurd support
  Also disable the fatal warnings for the linker, as we might hit symbols
  which are not implemented and will always fail.
 Forwarded: no
-Last-Update: 2011-05-30
+Last-Update: 2012-10-01
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
 @@ -73,6 +73,10 @@
@@ -34,7 +34,7 @@ Last-Update: 2011-05-30
  int build_link(const char* tmp, const char *tmp_prefix, const char *kde_prefix);
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1221,8 +1221,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1220,8 +1220,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
     endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
  
     if (CMAKE_SYSTEM_NAME STREQUAL GNU)
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index 61276f2..c3e8c78 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -48,7 +48,7 @@ cmake.
  }
 --- a/kioslave/file/file.cpp
 +++ b/kioslave/file/file.cpp
-@@ -317,8 +317,10 @@ void FileProtocol::get( const KUrl& url
+@@ -310,8 +310,10 @@ void FileProtocol::get( const KUrl& url
      }
  
  #if HAVE_FADVISE
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index f07fbca..af5a39b 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -2,7 +2,7 @@ From: Modestas Vainius <modax@debian.org>
 Subject: Framework for making libkdeinit4_*.so "private"
 Forwarded: no
 Origin: vendor
-Last-Update: 2011-03-27
+Last-Update: 2012-10-01
 
 The patch adds LIBKDEINIT_INSTALL_DIR cmake flag which specifies where
 libkdeinit4_*.so are supposed to end up. Please note, however, that
@@ -47,7 +47,7 @@ libraries.
     _set_fancy(IMPORTS_INSTALL_DIR       "${PLUGIN_INSTALL_DIR}/imports"                "The subdirectory relative to the install prefix where imports will be installed")
     _set_fancy(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"         "The config file install dir")
     _set_fancy(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"           "The parent directory where applications can install their data")
-@@ -1332,6 +1333,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
+@@ -1331,6 +1332,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
  
  endif (CMAKE_C_COMPILER MATCHES "icc")