[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.13.3-1-12-g49ab15a

Maximiliano Curia maxy at moszumanska.debian.org
Wed Aug 20 12:40:23 UTC 2014


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

The following commit has been merged in the master branch:
commit 42686a746fa692ec7e5459e926aa147d9cbb2535
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Aug 19 22:39:02 2014 +0200

    Refresh patches and remove upstream patches
---
 debian/changelog                                   |  2 +
 debian/patches/add_debian_build_type.diff          |  8 ++--
 debian/patches/hurd_support.diff                   | 14 +++----
 debian/patches/kfreebsd_support.diff               | 30 +++++++-------
 debian/patches/make_libkdeinit4_private.diff       | 48 +++++++++++-----------
 debian/patches/series                              |  2 -
 ...make_include_style_be_the_same_for_QtCore.patch | 22 ----------
 ...m_use-dbus-system-bus-name-instead-of-pid.patch | 48 ----------------------
 8 files changed, 53 insertions(+), 121 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28998fa..40a51c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kde4libs (4:4.14.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update symbols files with the 4:4.13.3 build logs.
+  * Remove upstream patches.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Aug 2014 18:31:30 +0200
 
diff --git a/debian/patches/add_debian_build_type.diff b/debian/patches/add_debian_build_type.diff
index 80ef94e..2ce430d 100644
--- a/debian/patches/add_debian_build_type.diff
+++ b/debian/patches/add_debian_build_type.diff
@@ -7,9 +7,11 @@ icons.
  cmake/modules/FindKDE4Internal.cmake |    2 ++
  1 file changed, 2 insertions(+)
 
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1198,11 +1198,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
+===================================================================
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:34:22.234287856 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:34:22.230288019 +0200
+@@ -1203,11 +1203,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")
diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff
index 7e5d389..f5bb10a 100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@ -8,8 +8,8 @@ Forwarded: no
 Last-Update: 2012-10-01
 Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp	2014-02-05 14:55:06.328827225 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp	2014-02-05 14:55:06.328827225 +0100
+--- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp	2014-08-19 22:35:04.472532370 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs.cpp	2014-08-19 22:35:04.448533368 +0200
 @@ -79,6 +79,10 @@
  static Qt::CaseSensitivity cs = Qt::CaseSensitive;
  #endif
@@ -23,8 +23,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
  public:
 Index: kde4libs/kinit/lnusertemp.c
 ===================================================================
---- kde4libs.orig/kinit/lnusertemp.c	2014-02-05 14:55:06.328827225 +0100
-+++ kde4libs/kinit/lnusertemp.c	2014-02-05 14:55:06.328827225 +0100
+--- kde4libs.orig/kinit/lnusertemp.c	2014-08-19 22:35:04.472532370 +0200
++++ kde4libs/kinit/lnusertemp.c	2014-08-19 22:35:04.468532537 +0200
 @@ -36,6 +36,10 @@
  #include <limits.h>
  #endif
@@ -38,9 +38,9 @@ Index: kde4libs/kinit/lnusertemp.c
  int build_link(const char* tmp, const char *tmp_prefix, const char *kde_prefix);
 Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-02-05 14:55:06.328827225 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-02-05 14:55:06.328827225 +0100
-@@ -1220,8 +1220,8 @@
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:35:04.472532370 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:35:04.468532537 +0200
+@@ -1225,8 +1225,8 @@
     endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
  
     if (CMAKE_SYSTEM_NAME STREQUAL GNU)
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index e33324d..a2656a2 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -5,8 +5,8 @@ cmake.
 
 Index: kde4libs/ConfigureChecks.cmake
 ===================================================================
---- kde4libs.orig/ConfigureChecks.cmake	2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/ConfigureChecks.cmake	2014-02-05 14:54:38.160165041 +0100
+--- kde4libs.orig/ConfigureChecks.cmake	2014-08-19 22:34:36.773683562 +0200
++++ kde4libs/ConfigureChecks.cmake	2014-08-19 22:34:36.741684892 +0200
 @@ -138,11 +138,11 @@
          set(UTIL_LIBRARY util)
        endif (login_in_libutil)
@@ -24,8 +24,8 @@ Index: kde4libs/ConfigureChecks.cmake
        if (login_in_libutil)
 Index: kde4libs/kio/kfile/kpropertiesdialog.cpp
 ===================================================================
---- kde4libs.orig/kio/kfile/kpropertiesdialog.cpp	2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/kio/kfile/kpropertiesdialog.cpp	2014-02-05 14:54:38.160165041 +0100
+--- kde4libs.orig/kio/kfile/kpropertiesdialog.cpp	2014-08-19 22:34:36.773683562 +0200
++++ kde4libs/kio/kfile/kpropertiesdialog.cpp	2014-08-19 22:34:36.757684227 +0200
 @@ -1894,7 +1894,15 @@
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
@@ -45,8 +45,8 @@ Index: kde4libs/kio/kfile/kpropertiesdialog.cpp
  }
 Index: kde4libs/kioslave/file/file.cpp
 ===================================================================
---- kde4libs.orig/kioslave/file/file.cpp	2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/kioslave/file/file.cpp	2014-02-05 14:54:38.160165041 +0100
+--- kde4libs.orig/kioslave/file/file.cpp	2014-08-19 22:34:36.773683562 +0200
++++ kde4libs/kioslave/file/file.cpp	2014-08-19 22:34:36.765683895 +0200
 @@ -310,8 +310,10 @@
      }
  
@@ -60,8 +60,8 @@ Index: kde4libs/kioslave/file/file.cpp
      // This is mandatory in all slaves (for KRun/BrowserRun to work)
 Index: kde4libs/kioslave/file/file_unix.cpp
 ===================================================================
---- kde4libs.orig/kioslave/file/file_unix.cpp	2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/kioslave/file/file_unix.cpp	2014-02-05 14:54:38.160165041 +0100
+--- kde4libs.orig/kioslave/file/file_unix.cpp	2014-08-19 22:34:36.773683562 +0200
++++ kde4libs/kioslave/file/file_unix.cpp	2014-08-19 22:34:36.769683728 +0200
 @@ -145,8 +145,10 @@
      }
  
@@ -86,8 +86,8 @@ Index: kde4libs/kioslave/file/file_unix.cpp
      acl = acl_get_fd(src_fd);
 Index: kde4libs/kpty/kpty.cpp
 ===================================================================
---- kde4libs.orig/kpty/kpty.cpp	2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/kpty/kpty.cpp	2014-02-05 14:54:38.164165135 +0100
+--- kde4libs.orig/kpty/kpty.cpp	2014-08-19 22:34:36.773683562 +0200
++++ kde4libs/kpty/kpty.cpp	2014-08-19 22:34:36.769683728 +0200
 @@ -109,24 +109,24 @@
  # define _NEW_TTY_CTRL
  #endif
@@ -127,9 +127,9 @@ Index: kde4libs/kpty/kpty.cpp
  #include <kdebug.h>
 Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-02-05 14:54:38.164165135 +0100
-@@ -1093,7 +1093,7 @@
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:34:36.773683562 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:34:36.769683728 +0200
+@@ -1098,7 +1098,7 @@
  endif (APPLE)
  
  
@@ -138,7 +138,7 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
     if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
        set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
        set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-@@ -1114,7 +1114,7 @@
+@@ -1119,7 +1119,7 @@
        set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
        set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
     endif (CMAKE_C_COMPILER MATCHES "icc")
@@ -147,7 +147,7 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
  
  if (UNIX)
     set ( _KDE4_PLATFORM_DEFINITIONS "${_KDE4_PLATFORM_DEFINITIONS} -D_LARGEFILE64_SOURCE")
-@@ -1211,13 +1211,13 @@
+@@ -1216,13 +1216,13 @@
     # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
  
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index 74436c7..30d4a7d 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -21,8 +21,8 @@ The patch also adds support for "kdeinit" resource type to KDE Platform
 libraries.
 Index: kde4libs/CreateKDELibsDependenciesFile.cmake
 ===================================================================
---- kde4libs.orig/CreateKDELibsDependenciesFile.cmake	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/CreateKDELibsDependenciesFile.cmake	2014-07-03 17:21:13.313634690 +0200
+--- kde4libs.orig/CreateKDELibsDependenciesFile.cmake	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/CreateKDELibsDependenciesFile.cmake	2014-08-19 22:36:20.877357278 +0200
 @@ -32,6 +32,7 @@
  make_install_path_absolute(KDE4_LIB_INSTALL_DIR     ${LIB_INSTALL_DIR})
  make_install_path_absolute(KDE4_IMPORTS_INSTALL_DIR     ${IMPORTS_INSTALL_DIR})
@@ -41,9 +41,9 @@ Index: kde4libs/CreateKDELibsDependenciesFile.cmake
  set(KDE4_SBIN_INSTALL_DIR    \"${KDE4_SBIN_INSTALL_DIR}\")
 Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-07-03 17:21:13.313634690 +0200
-@@ -871,6 +871,7 @@
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:36:20.877357278 +0200
+@@ -876,6 +876,7 @@
     _set_fancy(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/include"         "The subdirectory to the header prefix")
  
     _set_fancy(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde4"                "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
@@ -51,7 +51,7 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
     _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")
-@@ -1406,6 +1407,10 @@
+@@ -1411,6 +1412,10 @@
  
  endif (CMAKE_C_COMPILER MATCHES "icc")
  
@@ -64,8 +64,8 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
  
 Index: kde4libs/cmake/modules/KDE4Macros.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/KDE4Macros.cmake	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/cmake/modules/KDE4Macros.cmake	2014-07-03 17:21:13.313634690 +0200
+--- kde4libs.orig/cmake/modules/KDE4Macros.cmake	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/cmake/modules/KDE4Macros.cmake	2014-08-19 22:36:20.877357278 +0200
 @@ -834,6 +834,17 @@
  	      endif(NOT _icon_position EQUAL -1)
        endif (Q_WS_MAC)
@@ -86,8 +86,8 @@ Index: kde4libs/cmake/modules/KDE4Macros.cmake
  
 Index: kde4libs/kinit/CMakeLists.txt
 ===================================================================
---- kde4libs.orig/kinit/CMakeLists.txt	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/kinit/CMakeLists.txt	2014-07-03 17:21:13.313634690 +0200
+--- kde4libs.orig/kinit/CMakeLists.txt	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/kinit/CMakeLists.txt	2014-08-19 22:36:20.877357278 +0200
 @@ -58,6 +58,17 @@
  
  install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -108,8 +108,8 @@ Index: kde4libs/kinit/CMakeLists.txt
    set(kwrapper_SRCS kwrapper_win.cpp  )
 Index: kde4libs/config-prefix.h.cmake
 ===================================================================
---- kde4libs.orig/config-prefix.h.cmake	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/config-prefix.h.cmake	2014-07-03 17:21:13.313634690 +0200
+--- kde4libs.orig/config-prefix.h.cmake	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/config-prefix.h.cmake	2014-08-19 22:36:20.877357278 +0200
 @@ -12,6 +12,7 @@
  #define __KDE_EXECPREFIX "NONE"
  
@@ -120,8 +120,8 @@ Index: kde4libs/config-prefix.h.cmake
  #define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
 Index: kde4libs/kdecore/kde-config.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kde-config.cpp	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/kdecore/kde-config.cpp	2014-07-03 17:21:13.317634530 +0200
+--- kde4libs.orig/kdecore/kde-config.cpp	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/kdecore/kde-config.cpp	2014-08-19 22:36:20.877357278 +0200
 @@ -144,6 +144,7 @@
              "html", I18N_NOOP("HTML documentation"),
              "icon", I18N_NOOP("Icons"),
@@ -132,8 +132,8 @@ Index: kde4libs/kdecore/kde-config.cpp
              "locale", I18N_NOOP("Translation files for KLocale"),
 Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp	2014-07-03 17:21:13.317634530 +0200
+--- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs.cpp	2014-08-19 22:36:20.877357278 +0200
 @@ -171,6 +171,8 @@
  menus
  xdgconf-autostart
@@ -163,8 +163,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
  static void tokenize(QStringList& token, const QString& str,
 Index: kde4libs/kdecore/kernel/kstandarddirs_unix.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs_unix.cpp	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/kdecore/kernel/kstandarddirs_unix.cpp	2014-07-03 17:21:13.317634530 +0200
+--- kde4libs.orig/kdecore/kernel/kstandarddirs_unix.cpp	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs_unix.cpp	2014-08-19 22:36:20.877357278 +0200
 @@ -40,6 +40,8 @@
                  return QFile::decodeName(KCFG_INSTALL_DIR "/");
              if (strcmp("kdedir", type) == 0)
@@ -176,8 +176,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs_unix.cpp
              if (strcmp("data", type) == 0)
 Index: kde4libs/kdecore/kernel/kstandarddirs_win.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs_win.cpp	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/kdecore/kernel/kstandarddirs_win.cpp	2014-07-03 17:21:13.317634530 +0200
+--- kde4libs.orig/kdecore/kernel/kstandarddirs_win.cpp	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs_win.cpp	2014-08-19 22:36:20.877357278 +0200
 @@ -47,6 +47,8 @@
                  return share() + QLatin1String("config.kcfg/");
              if (strcmp("kdedir", type) == 0)
@@ -189,8 +189,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs_win.cpp
              if (strcmp("data", type) == 0)
 Index: kde4libs/kdecore/util/kpluginloader.cpp
 ===================================================================
---- kde4libs.orig/kdecore/util/kpluginloader.cpp	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/kdecore/util/kpluginloader.cpp	2014-07-03 17:21:13.317634530 +0200
+--- kde4libs.orig/kdecore/util/kpluginloader.cpp	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/kdecore/util/kpluginloader.cpp	2014-08-19 22:36:20.877357278 +0200
 @@ -113,6 +113,13 @@
          libname = fileinfo.path() + QLatin1String("/lib") + fileinfo.fileName();
  #endif
@@ -207,8 +207,8 @@ Index: kde4libs/kdecore/util/kpluginloader.cpp
          if (!kdeinit) {
 Index: kde4libs/kinit/kinit.cpp
 ===================================================================
---- kde4libs.orig/kinit/kinit.cpp	2014-07-03 17:21:13.321634371 +0200
-+++ kde4libs/kinit/kinit.cpp	2014-07-03 17:21:13.317634530 +0200
+--- kde4libs.orig/kinit/kinit.cpp	2014-08-19 22:36:20.881357112 +0200
++++ kde4libs/kinit/kinit.cpp	2014-08-19 22:36:20.877357278 +0200
 @@ -498,11 +498,23 @@
              // try to match an absolute path to an executable binary (either in bin/ or in libexec/)
              // to a kdeinit module in the same prefix
diff --git a/debian/patches/series b/debian/patches/series
index 194dae9..672b157 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,6 +27,4 @@ kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
 debian_standardsdirtest.diff
 disable_bogus_test.diff
 disable_bogus_tests
-upstream-make_include_style_be_the_same_for_QtCore.patch
 fix_solidlex_destroy_signature.patch
-upstream_use-dbus-system-bus-name-instead-of-pid.patch
diff --git a/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch b/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch
deleted file mode 100644
index c290624..0000000
--- a/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 96250267bd7c22b47ca93084112c97e722b18c54
-Author: Sune Vuorela <sune at vuorela.dk>
-Date:   Fri May 16 18:26:06 2014 +0200
-
-    Make include style be the same for QtCore includes
-    
-    As a side effect, it also fixes a build for some pieces of software
-    that built in the past, but doesn't build now.
-
-diff --git a/kio/kio/global.h b/kio/kio/global.h
-index 8a46ae6..7613722 100644
---- a/kio/kio/global.h
-+++ b/kio/kio/global.h
-@@ -26,7 +26,7 @@
- #include <QtCore/QMap>
- #include <QtCore/QList>
- #include <QtCore/QVariant>
--#include <QFile>  // for QFile::Permissions
-+#include <QtCore/QFile>  // for QFile::Permissions
- 
- #include <kiconloader.h>
- #include <QtGui/QPixmap> // for pixmapForUrl
diff --git a/debian/patches/upstream_use-dbus-system-bus-name-instead-of-pid.patch b/debian/patches/upstream_use-dbus-system-bus-name-instead-of-pid.patch
deleted file mode 100644
index b75033d..0000000
--- a/debian/patches/upstream_use-dbus-system-bus-name-instead-of-pid.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit c36bf4f314e6ee1203898697abe294ed0c8dcb32
-Author: Martin T. H. Sandsmark <martin.sandsmark at kde.org>
-Date:   Mon Jul 21 22:52:40 2014 +0200
-
-    Use dbus system bus name instead of PID for authentication.
-    
-    Using the PID for authentication is prone to a PID reuse
-    race condition, and a security issue.
-    
-    REVIEW: 119323
-
-diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-index cd7f6f3..732d2cb 100644
---- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-@@ -144,7 +144,7 @@ void Polkit1Backend::setupAction(const QString &action)
- 
- Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
- {
--    PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
-+    PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
-     PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
-                                                                                               PolkitQt1::Authority::None);
-     switch (r) {
-@@ -160,21 +160,12 @@ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
- 
- QByteArray Polkit1Backend::callerID() const
- {
--    QByteArray a;
--    QDataStream s(&a, QIODevice::WriteOnly);
--    s << QCoreApplication::applicationPid();
--
--    return a;
-+    return QDBusConnection::systemBus().baseService().toUtf8();
- }
- 
- bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
- {
--    QDataStream s(&callerID, QIODevice::ReadOnly);
--    qint64 pid;
--
--    s >> pid;
--
--    PolkitQt1::UnixProcessSubject subject(pid);
-+    PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
-     PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
- 
-     PolkitResultEventLoop e;

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list