[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.0+dfsg-4-61-gfdfaff5

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=d8cea7b

The following commit has been merged in the ubuntu branch:
commit d8cea7bdfd67889a13fefe20a005f4beffa1b60f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Oct 15 10:51:55 2015 +0000

    Remove gnukfreebsd_processNameByPid.diff, looks like fixed upstream.
---
 debian/patches/gnukfreebsd_processNameByPid.diff | 49 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 50 deletions(-)

diff --git a/debian/patches/gnukfreebsd_processNameByPid.diff b/debian/patches/gnukfreebsd_processNameByPid.diff
deleted file mode 100644
index 5021958..0000000
--- a/debian/patches/gnukfreebsd_processNameByPid.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: add processNameByPid implementation for GNU/kFreeBSD
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: no
-Last-Update: 2015-07-31
-
---- a/src/corelib/io/qlockfile_unix.cpp
-+++ b/src/corelib/io/qlockfile_unix.cpp
-@@ -56,6 +56,13 @@
- #   include <cstdio>
- #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
- #   include <sys/user.h>
-+# ifdef __GLIBC__
-+#   include <sys/cdefs.h>
-+#   include <sys/param.h>
-+#   include <sys/sysctl.h>
-+#   include <cstdlib>
-+#   include <cstring>
-+# endif
- #endif
- 
- QT_BEGIN_NAMESPACE
-@@ -232,9 +239,27 @@
-     }
-     return QFileInfo(QString::fromUtf8(buf)).fileName();
- #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
-+#ifdef __GLIBC__
-+    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, pid};
-+    size_t len = 0;
-+    if (sysctl(mib, 4, NULL, &len, NULL, 0) < 0)
-+        return QString();
-+    kinfo_proc *proc = static_cast<kinfo_proc *>(malloc(len));
-+#else
-     kinfo_proc *proc = kinfo_getproc(pid);
-+#endif /* __GLIBC__ */
-     if (!proc)
-         return QString();
-+#ifdef __GLIBC__
-+    if (sysctl(mib, 4, proc, &len, NULL, 0) < 0) {
-+        free(proc);
-+        return QString();
-+    }
-+    if (proc->ki_pid != pid) {
-+        free(proc);
-+        return QString();
-+    }
-+#endif /* __GLIBC__ */
-     QString name = QString::fromUtf8(proc->ki_comm);
-     free(proc);
-     return name;
diff --git a/debian/patches/series b/debian/patches/series
index 84e73a3..6c03043 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ gnukfreebsd.diff
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 hurd-forkfd.diff
-gnukfreebsd_processNameByPid.diff
 link_fbclient.diff
 
 # Ubuntu specific.

-- 
qtbase packaging