[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.2-1-10-gd885ae5

Maximiliano Curia maxy at moszumanska.debian.org
Mon Jul 4 13:09:51 UTC 2016 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-runtime.git;a=commitdiff;h=39eecf7

The following commit has been merged in the master branch:
commit 39eecf7b8be616da371cef05f52a21863b6bcfec
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Jun 18 16:24:32 2016 +0200

    Refresh patches
---
 debian/patches/add_glib_for_nm                           | 12 +++++++++++-
 debian/patches/disable_flacky_tests                      | 10 ++++++++++
 debian/patches/disable_kwalletd_autotests                | 10 ++++++++++
 debian/patches/disable_usr_lib_install_rpath.diff        |  6 ++++++
 debian/patches/hurd.diff                                 |  8 +++++++-
 debian/patches/kubuntu_disable-gpg-backend.diff          | 16 ++++++++++------
 .../patches/kubuntu_drkonqi_whoopsie_integration.patch   | 10 ++++++++--
 debian/patches/kubuntu_nodisplay_knetattach.diff         | 10 ++++++++++
 debian/patches/kubuntu_shutup_shutup_shutup.diff         | 14 ++++++++++++--
 ...ake-fix-add_definitions-according-to-new-policy.patch |  6 +-----
 ...make_min_req-to-match-kdelibs-policy-and-enable.patch |  8 ++------
 debian/patches/use_always_present_path_to_test.patch     | 12 +++++++++++-
 debian/patches/use_the_correct_locale.patch              | 12 +++++++++++-
 13 files changed, 109 insertions(+), 25 deletions(-)

diff --git a/debian/patches/add_glib_for_nm b/debian/patches/add_glib_for_nm
index f0b06c2..e554be7 100644
--- a/debian/patches/add_glib_for_nm
+++ b/debian/patches/add_glib_for_nm
@@ -1,6 +1,16 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sat, 18 Jun 2016 16:24:29 +0200
+Subject: add_glib_for_nm
+
+---
+ solid-networkstatus/kded/CMakeLists.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt
+index 633c7f1..5dfcbf4 100644
 --- a/solid-networkstatus/kded/CMakeLists.txt
 +++ b/solid-networkstatus/kded/CMakeLists.txt
-@@ -16,6 +16,12 @@ set_package_properties(NetworkManager PR
+@@ -16,6 +16,12 @@ set_package_properties(NetworkManager PROPERTIES DESCRIPTION "The NetworkManager
                        )
  
  if(NETWORKMANAGER_FOUND)
diff --git a/debian/patches/disable_flacky_tests b/debian/patches/disable_flacky_tests
index 6edc8ea..50279e1 100644
--- a/debian/patches/disable_flacky_tests
+++ b/debian/patches/disable_flacky_tests
@@ -1,3 +1,13 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sat, 18 Jun 2016 16:24:29 +0200
+Subject: disable_flacky_tests
+
+---
+ kurifilter-plugins/tests/kurifiltertest.cpp | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/kurifilter-plugins/tests/kurifiltertest.cpp b/kurifilter-plugins/tests/kurifiltertest.cpp
+index 32f968c..13c8e36 100644
 --- a/kurifilter-plugins/tests/kurifiltertest.cpp
 +++ b/kurifilter-plugins/tests/kurifiltertest.cpp
 @@ -256,7 +256,7 @@ void KUriFilterTest::shortUris()
diff --git a/debian/patches/disable_kwalletd_autotests b/debian/patches/disable_kwalletd_autotests
index 30adbda..ddb5b16 100644
--- a/debian/patches/disable_kwalletd_autotests
+++ b/debian/patches/disable_kwalletd_autotests
@@ -1,3 +1,13 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sat, 18 Jun 2016 16:24:29 +0200
+Subject: disable_kwalletd_autotests
+
+---
+ kwalletd/autotests/CMakeLists.txt | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/kwalletd/autotests/CMakeLists.txt b/kwalletd/autotests/CMakeLists.txt
+index c9af385..cd5f59e 100644
 --- a/kwalletd/autotests/CMakeLists.txt
 +++ b/kwalletd/autotests/CMakeLists.txt
 @@ -1,11 +1,11 @@
diff --git a/debian/patches/disable_usr_lib_install_rpath.diff b/debian/patches/disable_usr_lib_install_rpath.diff
index 7d5df39..e532218 100644
--- a/debian/patches/disable_usr_lib_install_rpath.diff
+++ b/debian/patches/disable_usr_lib_install_rpath.diff
@@ -1,12 +1,18 @@
 From: George Kiagiadakis <gkiagiad at csd.uoc.gr>
 Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: disable_usr_lib_install_rpath
 
 Author: George Kiagiadakis <gkiagiad at csd.uoc.gr>
 Subject: Do not set install RPATH to /usr/lib by default
  /usr/lib RPATH is disallowed on Debian systems and is a bad practise in
  general
 Forwarded: not-needed
+---
+ phonon/platform_kde/CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
 
+diff --git a/phonon/platform_kde/CMakeLists.txt b/phonon/platform_kde/CMakeLists.txt
+index f41a4dc..3d3df10 100644
 --- a/phonon/platform_kde/CMakeLists.txt
 +++ b/phonon/platform_kde/CMakeLists.txt
 @@ -19,10 +19,8 @@ endif(ALSA_FOUND)
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index 7d571d7..c9e898d 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -1,5 +1,6 @@
 From: Pino Toscano <pino at debian.org>
-Date: Sat Jun 18 11:49:17 2016 +0200
+Date: Sat, 18 Jun 2016 11:49:17 +0200
+Subject: hurd
 
 Author: Pino Toscano <pino at debian.org>
 Description: nfs: provide a fallback PATH_MAX definition
@@ -7,7 +8,12 @@ Description: nfs: provide a fallback PATH_MAX definition
  again on Hurd.
 Forwarded: not-needed
 Last-Update: 2016-06-18
+---
+ kioslave/nfs/nfsv3.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
 
+diff --git a/kioslave/nfs/nfsv3.cpp b/kioslave/nfs/nfsv3.cpp
+index 0640212..2240e7e 100644
 --- a/kioslave/nfs/nfsv3.cpp
 +++ b/kioslave/nfs/nfsv3.cpp
 @@ -59,6 +59,9 @@
diff --git a/debian/patches/kubuntu_disable-gpg-backend.diff b/debian/patches/kubuntu_disable-gpg-backend.diff
index eab782d..f6318d4 100644
--- a/debian/patches/kubuntu_disable-gpg-backend.diff
+++ b/debian/patches/kubuntu_disable-gpg-backend.diff
@@ -6,7 +6,12 @@ Description: disable kwallet gpg backend as it is not working perfectly
 Forwarded: no
 Author: Alex Fiestas <afiestas at kde.org>
 Reviewed-by: Harald Sitter <apachelogger at kubuntu.org>
+---
+ kwalletd/CMakeLists.txt | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
 
+diff --git a/kwalletd/CMakeLists.txt b/kwalletd/CMakeLists.txt
+index 73aec82..4d73d5c 100644
 --- a/kwalletd/CMakeLists.txt
 +++ b/kwalletd/CMakeLists.txt
 @@ -1,15 +1,15 @@
@@ -16,16 +21,15 @@ Reviewed-by: Harald Sitter <apachelogger at kubuntu.org>
 -find_package(Gpgme)  # Called by FindQGpgme, but since we call some gpgme
 -                     # functions ourselves we need to link against it directly.
 -find_package(QGpgme) # provided by kdepimlibs
--
++# find_package(Gpgme)  # Called by FindQGpgme, but since we call some gpgme
++#                      # functions ourselves we need to link against it directly.
++# find_package(QGpgme) # provided by kdepimlibs
+ 
 -if (GPGME_FOUND AND QGPGME_FOUND)
 -    add_definitions(-DHAVE_QGPGME)
 -    include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
 -    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 -endif(GPGME_FOUND AND QGPGME_FOUND)
-+# find_package(Gpgme)  # Called by FindQGpgme, but since we call some gpgme
-+#                      # functions ourselves we need to link against it directly.
-+# find_package(QGpgme) # provided by kdepimlibs
-+
 +# if (GPGME_FOUND AND QGPGME_FOUND)
 +#     add_definitions(-DHAVE_QGPGME)
 +#     include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
@@ -65,7 +69,7 @@ Reviewed-by: Harald Sitter <apachelogger at kubuntu.org>
  
  find_file(kwallet_xml org.kde.KWallet.xml HINTS ${KDE4_DBUS_INTERFACES_DIR} )
  
-@@ -57,9 +57,9 @@ qt4_add_dbus_adaptor( kwalletd_KDEINIT_S
+@@ -57,9 +57,9 @@ qt4_add_dbus_adaptor( kwalletd_KDEINIT_SRCS ${kwallet_xml} kwalletd.h KWalletD )
  kde4_add_kdeinit_executable( kwalletd NOGUI ${kwalletd_KDEINIT_SRCS} )
  
  target_link_libraries(kdeinit_kwalletd ${KDE4_KDEUI_LIBS} kwalletbackend )
diff --git a/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch b/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
index 0ae8b1b..e0d52f0 100644
--- a/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
+++ b/debian/patches/kubuntu_drkonqi_whoopsie_integration.patch
@@ -1,5 +1,6 @@
 From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: kubuntu_drkonqi_whoopsie_integration
 
 Description: automatic crash report integration
  integraes drkonqi with whoopsie/kubuntu-notification-helper/apport to allow
@@ -8,10 +9,15 @@ Description: automatic crash report integration
  if the user wishes to automatically submit the crash report to us.
 Origin: vendor
 Forwarded: no
+---
+ drkonqi/drkonqidialog.cpp | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
 
+diff --git a/drkonqi/drkonqidialog.cpp b/drkonqi/drkonqidialog.cpp
+index 0ea3931..17dedb8 100644
 --- a/drkonqi/drkonqidialog.cpp
 +++ b/drkonqi/drkonqidialog.cpp
-@@ -41,6 +41,8 @@ static const char ABOUT_BUG_REPORTING_UR
+@@ -41,6 +41,8 @@ static const char ABOUT_BUG_REPORTING_URL[] = "#aboutbugreporting";
  static const char DRKONQI_REPORT_BUG_URL[] =
      KDE_BUGZILLA_URL "enter_bug.cgi?product=drkonqi&format=guided";
  
@@ -20,7 +26,7 @@ Forwarded: no
  DrKonqiDialog::DrKonqiDialog(QWidget * parent) :
          KDialog(parent),
          m_aboutBugReportingDialog(0),
-@@ -75,6 +77,25 @@ DrKonqiDialog::DrKonqiDialog(QWidget * p
+@@ -75,6 +77,25 @@ DrKonqiDialog::DrKonqiDialog(QWidget * parent) :
  
  DrKonqiDialog::~DrKonqiDialog()
  {
diff --git a/debian/patches/kubuntu_nodisplay_knetattach.diff b/debian/patches/kubuntu_nodisplay_knetattach.diff
index 6860a81..eace41d 100644
--- a/debian/patches/kubuntu_nodisplay_knetattach.diff
+++ b/debian/patches/kubuntu_nodisplay_knetattach.diff
@@ -1,3 +1,13 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sat, 18 Jun 2016 16:24:29 +0200
+Subject: kubuntu_nodisplay_knetattach
+
+---
+ knetattach/knetattach.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
+index 88b5585..f61827f 100755
 --- a/knetattach/knetattach.desktop
 +++ b/knetattach/knetattach.desktop
 @@ -186,3 +186,4 @@ X-KDE-StartupNotify=true
diff --git a/debian/patches/kubuntu_shutup_shutup_shutup.diff b/debian/patches/kubuntu_shutup_shutup_shutup.diff
index 6438716..c9d22d8 100644
--- a/debian/patches/kubuntu_shutup_shutup_shutup.diff
+++ b/debian/patches/kubuntu_shutup_shutup_shutup.diff
@@ -1,6 +1,16 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sat, 18 Jun 2016 16:24:29 +0200
+Subject: kubuntu_shutup_shutup_shutup
+
+---
+ attica/kdeplugin/kdeplatformdependent.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/attica/kdeplugin/kdeplatformdependent.cpp b/attica/kdeplugin/kdeplatformdependent.cpp
+index d0041b8..fde029c 100644
 --- a/attica/kdeplugin/kdeplatformdependent.cpp
 +++ b/attica/kdeplugin/kdeplatformdependent.cpp
-@@ -221,7 +221,7 @@ QList<QUrl> KdePlatformDependent::getDef
+@@ -221,7 +221,7 @@ QList<QUrl> KdePlatformDependent::getDefaultProviderFiles() const
      foreach (const QString& pathString, pathStrings) {
          paths.append(QUrl(pathString));
      }
@@ -9,7 +19,7 @@
      return paths;
  }
  
-@@ -234,7 +234,7 @@ void KdePlatformDependent::addDefaultPro
+@@ -234,7 +234,7 @@ void KdePlatformDependent::addDefaultProviderFile(const QUrl& url)
          pathStrings.append(urlString);
          group.writeEntry("providerFiles", pathStrings);
          group.sync();
diff --git a/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch b/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
index 75a64d0..ba78402 100644
--- a/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
+++ b/debian/patches/upstream_cmake-fix-add_definitions-according-to-new-policy.patch
@@ -1,7 +1,6 @@
-From 823d2fbd9cbc146e007510a41b4820fb8b9e81b8 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <pino at kde.org>
 Date: Sat, 18 Jun 2016 10:25:22 +0200
-Subject: [PATCH] cmake: fix add_definitions according to new policy
+Subject: cmake: fix add_definitions according to new policy
 
 ---
  kioslave/nfs/CMakeLists.txt       | 2 +-
@@ -38,6 +37,3 @@ index 5ffbba4..c9af385 100644
 -target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
 \ No newline at end of file
 +target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
--- 
-2.8.1
-
diff --git a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
index f733be6..0187e87 100644
--- a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
+++ b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
@@ -1,8 +1,7 @@
-From 5a1d89e006ca69c6bf5351a796f7da57a6f96582 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <pino at kde.org>
 Date: Sat, 18 Jun 2016 09:46:45 +0200
-Subject: [PATCH] set cmake_min_req to match kdelibs policy and enable newer
- cmake policies
+Subject: set cmake_min_req to match kdelibs policy and enable newer cmake
+ policies
 
 ---
  CMakeLists.txt | 2 ++
@@ -20,6 +19,3 @@ index 1db0cd2..8b4d0f2 100644
  # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
  set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
  
--- 
-2.8.1
-
diff --git a/debian/patches/use_always_present_path_to_test.patch b/debian/patches/use_always_present_path_to_test.patch
index d024c88..bd18543 100644
--- a/debian/patches/use_always_present_path_to_test.patch
+++ b/debian/patches/use_always_present_path_to_test.patch
@@ -1,5 +1,10 @@
-From: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+From: =?utf-8?q?Lisandro_Dami=C3=A1n_Nicanor_P=C3=A9rez_Meyer?=
+ <lisandro at debian.org>
 Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: use_always_present_path_to_test
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 
 Description: use a path that's always there
  Or at least in Debian ;)
@@ -10,7 +15,12 @@ Description: use a path that's always there
 Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Forwarded: https://bugs.kde.org/show_bug.cgi?id=330107
 Last-Update: 2014-01-17
+---
+ kioslave/trash/tests/testtrash.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp
+index f99f0f0..bb4e87f 100644
 --- a/kioslave/trash/tests/testtrash.cpp
 +++ b/kioslave/trash/tests/testtrash.cpp
 @@ -894,8 +894,8 @@ void TestTrash::moveDirectoryFromTrash()
diff --git a/debian/patches/use_the_correct_locale.patch b/debian/patches/use_the_correct_locale.patch
index 71ca382..4f31520 100644
--- a/debian/patches/use_the_correct_locale.patch
+++ b/debian/patches/use_the_correct_locale.patch
@@ -1,5 +1,10 @@
-From: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+From: =?utf-8?q?Lisandro_Dami=C3=A1n_Nicanor_P=C3=A9rez_Meyer?=
+ <lisandro at debian.org>
 Date: Wed, 13 Apr 2016 13:53:28 +0200
+Subject: use_the_correct_locale
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 
 Description: Use the correct locale.
  The test was expecting a specific locale. Everything seems to indicate
@@ -8,7 +13,12 @@ Description: Use the correct locale.
 Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Forwarded: https://bugs.kde.org/show_bug.cgi?id=329983
 Last-Update: 2014-01-14
+---
+ kioslave/trash/tests/testtrash.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/kioslave/trash/tests/testtrash.cpp b/kioslave/trash/tests/testtrash.cpp
+index bccb0e5..f99f0f0 100644
 --- a/kioslave/trash/tests/testtrash.cpp
 +++ b/kioslave/trash/tests/testtrash.cpp
 @@ -58,7 +58,7 @@ int initLocale()

-- 
KDE Base Runtime module packaging

More information about the pkg-kde-commits mailing list