[SCM] KDE Development Platform Libraries module packaging branch, kde4.9, updated. debian/4.8.4-3-30-gf7ff1de

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.9 branch:
commit f7ff1de1f1d44fb869c1bffa84b67037c4cab27b
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Jan 10 00:21:31 2013 +0100

    Update various patches to avoid offsets.
---
 debian/patches/add_dlrestrictions_support.diff    |    4 ++--
 debian/patches/ktar_header_checksum_fix.diff      |    2 +-
 debian/patches/ktar_longlink_length_in_bytes.diff |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index ff27ac7..455d58d 100644
--- a/debian/patches/add_dlrestrictions_support.diff
+++ b/debian/patches/add_dlrestrictions_support.diff
@@ -22,7 +22,7 @@ on all (or some) the targets.
 
 --- a/cmake/modules/KDE4Macros.cmake
 +++ b/cmake/modules/KDE4Macros.cmake
-@@ -1035,10 +1035,14 @@ macro (KDE4_ADD_LIBRARY _target_NAME _li
+@@ -1041,10 +1041,14 @@ macro (KDE4_ADD_LIBRARY _target_NAME _li
     if (${_lib_TYPE} STREQUAL "SHARED")
        set(_first_SRC)
        set(_add_lib_param SHARED)
@@ -37,7 +37,7 @@ on all (or some) the targets.
     endif (${_lib_TYPE} STREQUAL "MODULE")
  
     set(_SRCS ${_first_SRC} ${ARGN})
-@@ -1326,6 +1330,13 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
+@@ -1351,6 +1355,13 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
  
  endfunction(KDE4_INSTALL_AUTH_ACTIONS)
  
diff --git a/debian/patches/ktar_header_checksum_fix.diff b/debian/patches/ktar_header_checksum_fix.diff
index 7084ec3..a4f1db4 100644
--- a/debian/patches/ktar_header_checksum_fix.diff
+++ b/debian/patches/ktar_header_checksum_fix.diff
@@ -76,7 +76,7 @@ matches, archive is accepted.
          return -1;
        }
      }/*end if*/
-@@ -652,10 +667,12 @@ void KTar::KTarPrivate::fillBuffer( char
+@@ -653,10 +668,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 4da1125..0f9b4a1 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
-@@ -744,7 +744,7 @@ bool KTar::doPrepareWriting(const QStrin
+@@ -745,7 +745,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
-@@ -797,7 +797,7 @@ bool KTar::doWriteDir(const QString &nam
+@@ -798,7 +798,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
-@@ -849,9 +849,9 @@ bool KTar::doWriteSymLink(const QString
+@@ -850,9 +850,9 @@ bool KTar::doWriteSymLink(const QString
      QByteArray gname = group.toLocal8Bit();
  
      // If more than 100 chars, we need to use the LongLink trick

-- 
KDE Development Platform Libraries module packaging