Hello community,
here is the log from the commit of package watchman for openSUSE:Factory
checked in at 2020-06-02 14:42:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/watchman (Old)
and /work/SRC/openSUSE:Factory/.watchman.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "watchman"
Tue Jun 2 14:42:37 2020 rev:5 rq:810772 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/watchman/watchman.changes 2020-01-24
13:11:47.121448066 +0100
+++ /work/SRC/openSUSE:Factory/.watchman.new.3606/watchman.changes
2020-06-02 14:43:34.388457203 +0200
@@ -1,0 +2,7 @@
+Tue Jun 2 09:50:49 UTC 2020 - Matthias Gerstner <matthias.gerst...@suse.com>
+
+- add libart-gcc10.patch: this fixes the build using gcc-10. There's not
+ readily available upstream release with fixes yet (there are releases but
+ the look automatic and don't contain generated autotools files).
+
+-------------------------------------------------------------------
New:
----
libart-gcc10.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ watchman.spec ++++++
--- /var/tmp/diff_new_pack.wDftc2/_old 2020-06-02 14:43:35.720461414 +0200
+++ /var/tmp/diff_new_pack.wDftc2/_new 2020-06-02 14:43:35.724461426 +0200
@@ -1,7 +1,7 @@
#
# spec file for package watchman
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@
Patch0: %{name}_4.7.0_makefile-am.diff
Patch1: 0001-Replaced-memset-calls-with-appopriate-C-11-init-or-a.patch
Patch2: 0002-Re-worked-replacement-of-memset-with-proper-init-to-.patch
+Patch3: libart-gcc10.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -101,6 +102,7 @@
%patch0
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# There is some basic support for watchman to run under systemd:
#
++++++ libart-gcc10.patch ++++++
Index: watchman-4.9.0/thirdparty/libart/src/art-inl.h
===================================================================
--- watchman-4.9.0.orig/thirdparty/libart/src/art-inl.h
+++ watchman-4.9.0/thirdparty/libart/src/art-inl.h
@@ -58,7 +58,7 @@ inline unsigned char art_tree<ValueType,
#if !ART_SANITIZE_ADDRESS
// If we were built with -fsanitize=address, let ASAN catch this,
// otherwise, make sure we blow up if the input depth is out of bounds.
- w_assert(idx >= 0 && idx <= key_len,
+ w_assert(idx <= key_len,
"key_at: key is %d %.*s and idx is %d, which is out of bounds",
key_len, key_len, key, idx);
#endif
