all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed

blob 2215cd8fa0f6b52ddf4fcc2524f412f4e6f423e0 959 bytes (raw)
name: gnu/packages/patches/qtbase-assert.patch 	 # note: path name is non-authoritative(*)

From 015845b3c320d02691f28373097d1e6dbbac79f7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:37:04 -0500
Subject: [PATCH 10/11] qtbase-assert

---
 src/testlib/qtestassert.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h
index 6498ea84ef..d821ced7fc 100644
--- a/src/testlib/qtestassert.h
+++ b/src/testlib/qtestassert.h
@@ -44,10 +44,13 @@
 
 QT_BEGIN_NAMESPACE
 
-
+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
+#define QTEST_ASSERT(cond) do { } while ((false) && (cond))
+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond))
+#else
 #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false)
-
 #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false)
+#endif
 
 QT_END_NAMESPACE
 
-- 
2.25.4

debug log:

solving 2215cd8fa0 ...
found 2215cd8fa0 in https://yhetil.org/guix/TmrudMQdNDsUlfVXXDlUYS6Cl32emete1oDiVMXaWPTmgzM9sbDSRMPQgBYONLze1lm4M6GS0ce2RsCrklKAcGrn11EQHJky0phqYeIepXo=@protonmail.com/

applying [1/1] https://yhetil.org/guix/TmrudMQdNDsUlfVXXDlUYS6Cl32emete1oDiVMXaWPTmgzM9sbDSRMPQgBYONLze1lm4M6GS0ce2RsCrklKAcGrn11EQHJky0phqYeIepXo=@protonmail.com/
diff --git a/gnu/packages/patches/qtbase-assert.patch b/gnu/packages/patches/qtbase-assert.patch
new file mode 100644
index 0000000000..2215cd8fa0

1:21: trailing whitespace.
 
1:23: trailing whitespace.
 
1:33: trailing whitespace.
 
1:35: trailing whitespace.
 
1:36: trailing whitespace.
-- 
Checking patch gnu/packages/patches/qtbase-assert.patch...
Applied patch gnu/packages/patches/qtbase-assert.patch cleanly.
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

index at:
100644 2215cd8fa0f6b52ddf4fcc2524f412f4e6f423e0	gnu/packages/patches/qtbase-assert.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.