diff -Nru hedgewars-1.0.2/debian/changelog hedgewars-1.0.2/debian/changelog --- hedgewars-1.0.2/debian/changelog 2022-09-22 20:29:57.000000000 +0000 +++ hedgewars-1.0.2/debian/changelog 2022-09-23 19:18:53.000000000 +0000 @@ -1,8 +1,23 @@ -hedgewars (1.0.2-2build1) kinetic; urgency=medium +hedgewars (1.0.2-5) unstable; urgency=medium - * No-change rebuild against Qt 5.15.6. + * Use clang-14 on ppc64el due to + https://github.com/llvm/llvm-project/issues/57935 - -- Dmitry Shachnev Thu, 22 Sep 2022 23:29:57 +0300 + -- Gianfranco Costamagna Fri, 23 Sep 2022 21:18:53 +0200 + +hedgewars (1.0.2-4) unstable; urgency=medium + + * Export dwarf-4 CXXFLAG too needed for qt build. + * Add another patch to fix a build failure with clang-15 + + -- Gianfranco Costamagna Thu, 22 Sep 2022 14:51:50 +0200 + +hedgewars (1.0.2-3) unstable; urgency=medium + + * Do not override dwz, export dwarf-4 + binaries for now. + + -- Gianfranco Costamagna Wed, 21 Sep 2022 14:52:06 +0200 hedgewars (1.0.2-2) unstable; urgency=medium diff -Nru hedgewars-1.0.2/debian/control hedgewars-1.0.2/debian/control --- hedgewars-1.0.2/debian/control 2022-09-12 13:43:19.000000000 +0000 +++ hedgewars-1.0.2/debian/control 2022-09-23 19:18:53.000000000 +0000 @@ -6,7 +6,8 @@ Gianfranco Costamagna Standards-Version: 4.6.1 Build-Depends: cmake, - clang [armel armhf i386 mipsel ppc64el], + clang [armel armhf i386 mipsel], + clang-14 [ppc64el], debhelper-compat (= 13), fp-compiler [!armel !armhf !i386 !mipsel !ppc64el], fp-units-misc [!armel !armhf !i386 !mipsel !ppc64el], diff -Nru hedgewars-1.0.2/debian/patches/clang-10 hedgewars-1.0.2/debian/patches/clang-10 --- hedgewars-1.0.2/debian/patches/clang-10 2022-09-12 13:43:19.000000000 +0000 +++ hedgewars-1.0.2/debian/patches/clang-10 2022-09-23 19:18:53.000000000 +0000 @@ -1,6 +1,6 @@ -Description: Find clang-10 because clang-11 fails to build +Description: Find clangs Author: Gianfranco Costamagna -Last-Update: 2020-10-19 +Last-Update: 2022-10-03 --- hedgewars-1.0.0.orig/cmake_modules/FindClang.cmake +++ hedgewars-1.0.0/cmake_modules/FindClang.cmake @@ -9,7 +9,7 @@ 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 clang-6.0 clang-7 clang-8 clang-9 clang-10 clang-11 ++ 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 PATHS /opt/local/bin /usr/local/bin /usr/bin) if (CLANG_EXECUTABLE) diff -Nru hedgewars-1.0.2/debian/patches/clang-15.patch hedgewars-1.0.2/debian/patches/clang-15.patch --- hedgewars-1.0.2/debian/patches/clang-15.patch 1970-01-01 00:00:00.000000000 +0000 +++ hedgewars-1.0.2/debian/patches/clang-15.patch 2022-09-23 05:48:27.000000000 +0000 @@ -0,0 +1,13 @@ +diff --git a/project_files/hwc/rtl/sysutils.c b/project_files/hwc/rtl/sysutils.c +index bd1470f3..724c5c74 100644 +--- a/project_files/hwc/rtl/sysutils.c ++++ b/project_files/hwc/rtl/sysutils.c +@@ -83,7 +83,7 @@ TDateTime fpcrtl_now() + // Semi-dummy implementation of FormatDateTime + string255 fpcrtl_formatDateTime(string255 FormatStr, TDateTime DateTime) + { +- string255 buffer = STRINIT(FormatStr.str); ++ string255 buffer = FormatStr; + time_t rawtime; + struct tm* my_tm; + diff -Nru hedgewars-1.0.2/debian/patches/dwarf.patch hedgewars-1.0.2/debian/patches/dwarf.patch --- hedgewars-1.0.2/debian/patches/dwarf.patch 1970-01-01 00:00:00.000000000 +0000 +++ hedgewars-1.0.2/debian/patches/dwarf.patch 2022-09-23 19:18:53.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Workaround Debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1016936 + until dwz starts understanding dwarf-5 binaries. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8fc48b94..12d36ba9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,6 +190,8 @@ if(BUILD_ENGINE_C AND NOT BUILD_ENGINE_JS) + + set(CMAKE_C_COMPILER ${CLANG_EXECUTABLE}) + set(CMAKE_CXX_COMPILER ${CLANG_EXECUTABLE}) ++ add_flag_append(CMAKE_C_FLAGS "-gdwarf-4") ++ add_flag_append(CMAKE_CXX_FLAGS "-gdwarf-4") + endif() + + diff -Nru hedgewars-1.0.2/debian/patches/series hedgewars-1.0.2/debian/patches/series --- hedgewars-1.0.2/debian/patches/series 2022-09-21 09:59:34.000000000 +0000 +++ hedgewars-1.0.2/debian/patches/series 2022-09-23 19:18:53.000000000 +0000 @@ -1,4 +1,6 @@ -#clang-10 +clang-10 #aa011799cb63.patch 9cd8d7748199.patch c09063ea0267.patch +dwarf.patch +clang-15.patch diff -Nru hedgewars-1.0.2/debian/rules hedgewars-1.0.2/debian/rules --- hedgewars-1.0.2/debian/rules 2022-09-12 13:43:19.000000000 +0000 +++ hedgewars-1.0.2/debian/rules 2022-09-23 19:18:53.000000000 +0000 @@ -39,6 +39,3 @@ convert $$icon +set date:create +set date:modify -define png:exclude-chunk=time tmp-icon/$$dirname/apps/$$basename.png; \ done dh_auto_configure -- $(HEDGEWARS_OPTIONS) - -override_dh_dwz: - dh_dwz || true