[SCM] qtbase packaging branch, experimental, updated. debian/5.10.0+dfsg-1-3-gf9fedb8

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Dec 7 14:17:53 UTC 2017


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

The following commit has been merged in the experimental branch:
commit f9fedb81937248c1e742fc141fdee69de2ee8f15
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Dec 7 17:16:42 2017 +0300

    Do not attempt to use arc4random_buf() on GNU/kFreeBSD.
    
    It is missing there.
---
 debian/changelog                      |  2 ++
 debian/patches/no_arc4random_buf.diff | 25 +++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5051d0c..f8822e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtbase-opensource-src (5.10.0+dfsg-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Bump qtbase-abi to 5-10-0, as in 5.10 there were removed symbols.
+  * Do not attempt to use arc4random_buf() on GNU/kFreeBSD, it is missing
+    there (no_arc4random_buf.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Dec 2017 16:42:20 +0300
 
diff --git a/debian/patches/no_arc4random_buf.diff b/debian/patches/no_arc4random_buf.diff
new file mode 100644
index 0000000..cf4834d
--- /dev/null
+++ b/debian/patches/no_arc4random_buf.diff
@@ -0,0 +1,25 @@
+Description: do not use arc4random_buf() on GNU/kFreeBSD
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-yet
+Last-Update: 2017-12-07
+
+--- a/src/corelib/global/qrandom.cpp
++++ b/src/corelib/global/qrandom.cpp
+@@ -50,7 +50,7 @@
+ 
+ #if QT_CONFIG(getentropy)
+ #  include <sys/random.h>
+-#elif !defined(Q_OS_BSD4) && !defined(Q_OS_WIN)
++#elif (!defined(Q_OS_BSD4) || defined(__GLIBC__)) && !defined(Q_OS_WIN)
+ #  include "qdeadlinetimer.h"
+ #  include "qhashfunctions.h"
+ 
+@@ -260,7 +260,7 @@
+     // no fallback necessary, getentropy cannot fail under normal circumstances
+     Q_UNREACHABLE();
+ }
+-#elif defined(Q_OS_BSD4)
++#elif defined(Q_OS_BSD4) && !defined(__GLIBC__)
+ static void fallback_update_seed(unsigned) {}
+ static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 9510925..76aa7ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ link_fbclient.diff
 gnukfreebsd_cloexec.diff
 armv4.diff
 nonlinux_utime.diff
+no_arc4random_buf.diff

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list