[SCM] kdesu packaging branch, master, updated. debian/5.14.0-1-7-ga0205c5

Maximiliano Curia maxy at moszumanska.debian.org
Mon Oct 12 12:33:31 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdesu.git;a=commitdiff;h=0812d94

The following commit has been merged in the master branch:
commit 0812d9465c47d4fb977db7f4b8c91a815d54b704
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Sep 19 10:52:37 2015 +0200

    Add upstream patch: upstream_kwarning_to_qwarning.diff
---
 debian/changelog                                  |  2 +-
 debian/patches/series                             |  1 +
 debian/patches/upstream_kwarning_to_qwarning.diff | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 773d48d..bb4f70f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 kdesu (5.14.0-2~) UNRELEASED; urgency=medium
 
-  * 
+  * Add upstream patch: upstream_kwarning_to_qwarning.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 10:51:18 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1406bbd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_kwarning_to_qwarning.diff
diff --git a/debian/patches/upstream_kwarning_to_qwarning.diff b/debian/patches/upstream_kwarning_to_qwarning.diff
new file mode 100644
index 0000000..1990d3d
--- /dev/null
+++ b/debian/patches/upstream_kwarning_to_qwarning.diff
@@ -0,0 +1,23 @@
+commit 3d252cc2aa3fa3530483154a93a377bbd4372196
+Author: Pino Toscano <pino at kde.org>
+Date:   Fri Sep 18 23:25:48 2015 +0200
+
+    kWarning -> qWarning
+    
+    fix build when using the stub implementation of SocketSecurity
+
+diff --git a/src/kdesud/secure.cpp b/src/kdesud/secure.cpp
+index 22326a4..a36c051 100644
+--- a/src/kdesud/secure.cpp
++++ b/src/kdesud/secure.cpp
+@@ -87,8 +87,8 @@ SocketSecurity::SocketSecurity(int sockfd) : pid(-1), gid(-1), uid(-1)
+     static bool warned_him = false;
+ 
+     if (!warned_him) {
+-        kWarning() << "Using void socket security. Please add support for your" ;
+-        kWarning() << "platform to src/kdesud/secure.cpp" ;
++        qWarning() << "Using void socket security. Please add support for your" ;
++        qWarning() << "platform to src/kdesud/secure.cpp" ;
+         warned_him = true;
+     }
+ 

-- 
kdesu packaging



More information about the pkg-kde-commits mailing list