[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.8.3-1-15-g5af3b20

Mon Jun 4 22:06:51 UTC 2012

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=42df26f

The following commit has been merged in the kde4.8 branch:
commit 42df26f8db18fbed8abb0e376cb5ac345aebd688
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Jun 4 22:42:51 2012 +0200

    Refresh some patches to make them apply without any offset.
---
 debian/changelog                                   |    1 +
 debian/patches/add_debian_build_type.diff          |    2 +-
 debian/patches/add_dlrestrictions_support.diff     |    2 +-
 .../patches/hack_in_etc_kde4_in_kstandarddirs.diff |    2 +-
 debian/patches/hurd_support.diff                   |    2 +-
 debian/patches/kfreebsd_support.diff               |    2 +-
 debian/patches/ktar_header_checksum_fix.diff       |    4 ++--
 debian/patches/ktar_longlink_length_in_bytes.diff  |    6 +++---
 debian/patches/make_libkdeinit4_private.diff       |    2 +-
 debian/patches/use_dejavu_as_default_font.diff     |    4 ++--
 10 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2c91e2..0bba9af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kde4libs (4:4.8.4-0r0) UNRELEASED; urgency=low
   * Add watch file.
   * Update patches:
     - refresh python3-support-bytecode.patch
+    - refresh various patches to make them apply without any offset.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 27 May 2012 12:10:37 +0200
 
diff --git a/debian/patches/add_debian_build_type.diff b/debian/patches/add_debian_build_type.diff
index f24dbf0..9e8d622 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
-@@ -1202,11 +1202,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1204,11 +1204,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")
diff --git a/debian/patches/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index 3a2dffa..68c9686 100644
--- a/debian/patches/add_dlrestrictions_support.diff
+++ b/debian/patches/add_dlrestrictions_support.diff
@@ -53,7 +53,7 @@ on all (or some) the targets.
     message(FATAL_ERROR "_KDE4_EXPORT_LIBRARY_DEPENDENCIES() was an internal macro and has been removed again. Just remove the code which calls it, there is no substitute.")
 --- a/kdecore/CMakeLists.txt
 +++ b/kdecore/CMakeLists.txt
-@@ -397,6 +397,14 @@ kde4_add_library(kdecore ${LIBRARY_TYPE}
+@@ -399,6 +399,14 @@ kde4_add_library(kdecore ${LIBRARY_TYPE}
  
  target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
  
diff --git a/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff b/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
index 92528df..acfabb9 100644
--- a/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
+++ b/debian/patches/hack_in_etc_kde4_in_kstandarddirs.diff
@@ -12,7 +12,7 @@ overridden by adding new files to /etc/kde4 by the sysadm.
 
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1174,6 +1174,10 @@ QStringList KStandardDirs::KStandardDirs
+@@ -1176,6 +1176,10 @@ QStringList KStandardDirs::KStandardDirs
                          if ((local || testdir.exists()) && !candidates.contains(path))
                              candidates.append(path);
                      }
diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff
index 0d11680..78638ee 100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@ -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
-@@ -1219,8 +1219,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1221,8 +1221,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 f543ac1..61276f2 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -29,7 +29,7 @@ cmake.
        if (login_in_libutil)
 --- a/kio/kfile/kpropertiesdialog.cpp
 +++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1901,7 +1901,15 @@ static bool fileSystemSupportsACL( const
+@@ -1903,7 +1903,15 @@ static bool fileSystemSupportsACL( const
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
      fileSystemSupportsACLs =
diff --git a/debian/patches/ktar_header_checksum_fix.diff b/debian/patches/ktar_header_checksum_fix.diff
index a20c190..7084ec3 100644
--- a/debian/patches/ktar_header_checksum_fix.diff
+++ b/debian/patches/ktar_header_checksum_fix.diff
@@ -18,7 +18,7 @@ matches, archive is accepted.
 
 --- a/kdecore/io/ktar.cpp
 +++ b/kdecore/io/ktar.cpp
-@@ -182,26 +182,41 @@ qint64 KTar::KTarPrivate::readRawHeader(
+@@ -184,26 +184,41 @@ qint64 KTar::KTarPrivate::readRawHeader(
      if (strncmp(buffer + 257, "ustar", 5)) {
        // The magic isn't there (broken/old tars), but maybe a correct checksum?
  
@@ -76,7 +76,7 @@ matches, archive is accepted.
          return -1;
        }
      }/*end if*/
-@@ -637,10 +652,12 @@ void KTar::KTarPrivate::fillBuffer( char
+@@ -652,10 +667,12 @@ void KTar::KTarPrivate::fillBuffer( char
    // group
    strcpy( buffer + 0x129, gname );
  
diff --git a/debian/patches/ktar_longlink_length_in_bytes.diff b/debian/patches/ktar_longlink_length_in_bytes.diff
index c2cd0c0..4da1125 100644
--- a/debian/patches/ktar_longlink_length_in_bytes.diff
+++ b/debian/patches/ktar_longlink_length_in_bytes.diff
@@ -18,7 +18,7 @@ unreadable.
 
 --- a/kdecore/io/ktar.cpp
 +++ b/kdecore/io/ktar.cpp
-@@ -729,7 +729,7 @@ bool KTar::doPrepareWriting(const QStrin
+@@ -744,7 +744,7 @@ bool KTar::doPrepareWriting(const QStrin
      const QByteArray gname = group.toLocal8Bit();
  
      // If more than 100 chars, we need to use the LongLink trick
@@ -27,7 +27,7 @@ unreadable.
          d->writeLonglink(buffer,encodedFileName,'L',uname,gname);
  
      // Write (potentially truncated) name
-@@ -782,7 +782,7 @@ bool KTar::doWriteDir(const QString &nam
+@@ -797,7 +797,7 @@ bool KTar::doWriteDir(const QString &nam
      QByteArray gname = group.toLocal8Bit();
  
      // If more than 100 chars, we need to use the LongLink trick
@@ -36,7 +36,7 @@ unreadable.
          d->writeLonglink(buffer,encodedDirname,'L',uname,gname);
  
      // Write (potentially truncated) name
-@@ -834,9 +834,9 @@ bool KTar::doWriteSymLink(const QString
+@@ -849,9 +849,9 @@ bool KTar::doWriteSymLink(const QString
      QByteArray gname = group.toLocal8Bit();
  
      // If more than 100 chars, we need to use the LongLink trick
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index fa0ecd1..c196dc0 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -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")
-@@ -1329,6 +1330,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
+@@ -1332,6 +1333,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
  
  endif (CMAKE_C_COMPILER MATCHES "icc")
  
diff --git a/debian/patches/use_dejavu_as_default_font.diff b/debian/patches/use_dejavu_as_default_font.diff
index 60ed6c8..7f83194 100644
--- a/debian/patches/use_dejavu_as_default_font.diff
+++ b/debian/patches/use_dejavu_as_default_font.diff
@@ -6,7 +6,7 @@ needed).
 
 --- a/kdeui/kernel/kglobalsettings.cpp
 +++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -398,7 +398,7 @@ struct KFontData
+@@ -396,7 +396,7 @@ struct KFontData
  
  // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
  static const char GeneralId[] =      "General";
@@ -15,7 +15,7 @@ needed).
  #ifdef Q_WS_MAC
  static const char DefaultMacFont[] = "Lucida Grande";
  #endif
-@@ -417,7 +417,7 @@ static const KFontData DefaultFontData[K
+@@ -415,7 +415,7 @@ static const KFontData DefaultFontData[K
      { GeneralId, "menuFont",    DefaultFont, 16, -1, QFont::SansSerif },
  #else
      { GeneralId, "font",        DefaultFont, 9, -1, QFont::SansSerif },

-- 
KDE Development Platform Libraries module packaging

