From: Peter Michael Green Date: Thu, 10 Nov 2022 08:50:38 +0000 (+0000) Subject: Manual merge of version 1.0.2-4+rpi1 and 1.0.2-6 to produce 1.0.2-6+rpi1 X-Git-Tag: archive/raspbian/1.0.2-6+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=351b605ad3ff62fff08819741f1c87065484ac5c;p=hedgewars.git Manual merge of version 1.0.2-4+rpi1 and 1.0.2-6 to produce 1.0.2-6+rpi1 --- 351b605ad3ff62fff08819741f1c87065484ac5c diff --cc debian/changelog index 32b162f,133ec2b..ebc4ffd --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,15 +1,25 @@@ - hedgewars (1.0.2-4+rpi1) bookworm-staging; urgency=medium ++hedgewars (1.0.2-6+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1.0.0-4+rpi1 by Peter Michael Green at Sun, 24 Nov 2019 13:14:55 +0000] + * Force use of C.UTF-8 locale, the build fails under some locales (e.g. POSIX). + + [changes introduced in 1.0.0-16+rpi1 by Peter Michael Green] + * Forve build with clang 11, newer versions cause armv7 contamination. + - -- Raspbian forward porter Thu, 29 Sep 2022 21:03:42 +0000 ++ -- Peter Micheal Green Thu, 10 Nov 2022 08:50:03 +0000 ++ + hedgewars (1.0.2-6) unstable; urgency=medium + + * Use again clang-15 everywhere, powerpc issue is fixed. + + -- Gianfranco Costamagna Wed, 19 Oct 2022 11:40:18 +0200 + + hedgewars (1.0.2-5) unstable; urgency=medium + + * Use clang-14 on ppc64el due to + https://github.com/llvm/llvm-project/issues/57935 + + -- Gianfranco Costamagna Fri, 23 Sep 2022 21:18:53 +0200 hedgewars (1.0.2-4) unstable; urgency=medium diff --cc debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch index d312871,0000000..1cf8e21 mode 100644,000000..100644 --- a/debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch +++ b/debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch @@@ -1,19 -1,0 +1,17 @@@ +From: Peter Michael Green +Date: Sun, 26 Jun 2022 21:56:04 +0000 - X-Dgit-Generated: 1.0.0-16+rpi1 9d314ffa1cf878c01cd334d1258e52b89ad53d6e +Subject: Build with clang 11 to avoid armv7 contamination. + - - --- - - --- hedgewars-1.0.0.orig/cmake_modules/FindClang.cmake - +++ hedgewars-1.0.0/cmake_modules/FindClang.cmake ++diff --git a/cmake_modules/FindClang.cmake b/cmake_modules/FindClang.cmake ++index 73f55a9..de9b04f 100644 ++--- a/cmake_modules/FindClang.cmake +++++ b/cmake_modules/FindClang.cmake +@@ -11,7 +11,7 @@ + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + find_program(CLANG_EXECUTABLE - - NAMES clang-mp-3.3 clang-mp-3.2 clang-mp-3.1 clang-mp-3.0 clang ++- NAMES clang-mp-3.3 clang-mp-3.2 clang-mp-3.1 clang-mp-3.0 clang-14 clang-13 clang-12 clang-11 clang-10 clang-9 clang-8 clang-7 clang-6.0 clang ++ NAMES clang-11 + PATHS /opt/local/bin /usr/local/bin /usr/bin) + + if (CLANG_EXECUTABLE)