From 32b219f842e07738b6853cb5222ccc1abd883b43 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 1 Aug 2020 07:48:37 +0200 Subject: [PATCH] - added Werror patch (disable stringop-truncation warning on valid use of strncpy); release 3 (boost 1.73) --- hwsd-Werror.patch | 18 ++++++++++++++++++ hwsd.spec | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 hwsd-Werror.patch diff --git a/hwsd-Werror.patch b/hwsd-Werror.patch new file mode 100644 index 0000000..c2281ec --- /dev/null +++ b/hwsd-Werror.patch @@ -0,0 +1,18 @@ +--- hwsd-2.0.1/hwsd/gpuInfo.cpp.orig 2020-08-01 07:38:16.290443380 +0200 ++++ hwsd-2.0.1/hwsd/gpuInfo.cpp 2020-08-01 07:38:20.360657269 +0200 +@@ -37,7 +37,15 @@ + , unused(0) + { + invalidatePVP(); ++#if __GNUC__ >= 8 ++ /* ignore "specified bound 4 equals destination size" */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wstringop-truncation" ++#endif + strncpy(reinterpret_cast(&type), name.c_str(), 4); ++#if __GNUC__ >= 8 ++#pragma GCC diagnostic push ++#endif + } + + void GPUInfo::invalidatePVP() diff --git a/hwsd.spec b/hwsd.spec index 5e8ca74..1ee1fd0 100644 --- a/hwsd.spec +++ b/hwsd.spec @@ -6,13 +6,14 @@ Summary: Local and remote ZeroConf service discovery for hardware resources Summary(pl.UTF-8): Lokalne i zdalne wykrywanie usług ZeroConf dla zasobów sprzętowych Name: hwsd Version: 2.0.1 -Release: 2 +Release: 3 License: LGPL v2.1 (library), GPL v3+ (applications) Group: Libraries #Source0Download: https://github.com/Eyescale/hwsd/releases Source0: https://github.com/Eyescale/hwsd/archive/%{version}/%{name}-%{version}.tar.gz # Source0-md5: d2285a1d878a12905fe9a062bc158aae Patch0: servus.patch +Patch1: %{name}-Werror.patch URL: https://github.com/Eyescale/hwsd/ BuildRequires: Eyescale-CMake BuildRequires: Lunchbox-devel >= 1.10 @@ -62,7 +63,7 @@ Pliki nagłówkowe biblioteki HW-SD. Summary: HW-SD API documentation Summary(pl.UTF-8): Dokumentacja API biblioteki HW-SD Group: Documentation -%if "%{_rpmversion}" >= "5" +%if "%{_rpmversion}" >= "4.6" BuildArch: noarch %endif @@ -75,6 +76,7 @@ Dokumentacja API biblioteki HW-SD. %prep %setup -q %patch0 -p1 +%patch1 -p1 rmdir CMake/common ln -s %{_datadir}/Eyescale-CMake CMake/common -- 2.43.0