diff -Nru warzone2100-4.3.3/debian/changelog warzone2100-4.3.3/debian/changelog --- warzone2100-4.3.3/debian/changelog 2023-01-09 10:43:32.000000000 +0000 +++ warzone2100-4.3.3/debian/changelog 2023-01-12 17:28:45.000000000 +0000 @@ -1,3 +1,17 @@ +warzone2100 (4.3.3-3) unstable; urgency=medium + + * Team upload. + * debian/*.{substvars,stamp,debhelper}: Dropped, they shall not + exist in packaging dir. + * debian/control: Bump Standards-Version to 4.6.2. + + [ Adrian Bunk ] + * debian/rules: Update -latomic workaround for more architectures. + * debian/patches/0001: Add patch for Wcast-align build errors. + (Closes: #1028440) + + -- Boyuan Yang Thu, 12 Jan 2023 12:28:45 -0500 + warzone2100 (4.3.3-2) unstable; urgency=medium * Added build-depends on libopus-dev Closes: #1028249 diff -Nru warzone2100-4.3.3/debian/control warzone2100-4.3.3/debian/control --- warzone2100-4.3.3/debian/control 2023-01-09 10:43:32.000000000 +0000 +++ warzone2100-4.3.3/debian/control 2023-01-12 17:28:45.000000000 +0000 @@ -48,7 +48,7 @@ xsltproc, xvfb, zip -Standards-Version: 4.5.0 +Standards-Version: 4.6.2 Homepage: http://www.wz2100.net/ Vcs-Git: https://salsa.debian.org/games-team/warzone2100.git Vcs-Browser: https://salsa.debian.org/games-team/warzone2100 diff -Nru warzone2100-4.3.3/debian/debhelper-build-stamp warzone2100-4.3.3/debian/debhelper-build-stamp --- warzone2100-4.3.3/debian/debhelper-build-stamp 2023-01-09 10:43:32.000000000 +0000 +++ warzone2100-4.3.3/debian/debhelper-build-stamp 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -warzone2100 -warzone2100-data -warzone2100-music diff -Nru warzone2100-4.3.3/debian/patches/0001-vk_mem_alloc-Ignore-Wcast-align-on-GCC-on-all-archit.patch warzone2100-4.3.3/debian/patches/0001-vk_mem_alloc-Ignore-Wcast-align-on-GCC-on-all-archit.patch --- warzone2100-4.3.3/debian/patches/0001-vk_mem_alloc-Ignore-Wcast-align-on-GCC-on-all-archit.patch 1970-01-01 00:00:00.000000000 +0000 +++ warzone2100-4.3.3/debian/patches/0001-vk_mem_alloc-Ignore-Wcast-align-on-GCC-on-all-archit.patch 2023-01-12 17:28:25.000000000 +0000 @@ -0,0 +1,32 @@ +From ab1c0027a046bbdaca0818bdaa1cbf0ce08648c3 Mon Sep 17 00:00:00 2001 +From: Adrian Bunk +Date: Wed, 11 Jan 2023 03:02:52 +0200 +Subject: vk_mem_alloc: Ignore -Wcast-align on GCC on all architectures + +The warning is not only on ARM, in Debian it has also appeared +on mipsel/riscv64/sparc64. + +Bug-Debian: https://bugs.debian.org/1028440 +Forwarded: https://github.com/Warzone2100/warzone2100/pull/3084 +--- + lib/ivis_opengl/3rdparty/vk_mem_alloc.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/lib/ivis_opengl/3rdparty/vk_mem_alloc.cpp b/lib/ivis_opengl/3rdparty/vk_mem_alloc.cpp +index 2ec35af10..dad4a116e 100644 +--- a/lib/ivis_opengl/3rdparty/vk_mem_alloc.cpp ++++ b/lib/ivis_opengl/3rdparty/vk_mem_alloc.cpp +@@ -44,9 +44,7 @@ + # pragma GCC diagnostic ignored "-Wunused-variable" + # pragma GCC diagnostic ignored "-Wmissing-field-initializers" + # pragma GCC diagnostic ignored "-Wmissing-noreturn" +-# if (defined(__arm__) || defined(__thumb__)) && !defined(__aarch64__) +-# pragma GCC diagnostic ignored "-Wcast-align" +-# endif ++# pragma GCC diagnostic ignored "-Wcast-align" + #elif defined(_MSC_VER) + # pragma warning( push ) + # pragma warning( disable : 4189 ) // warning C4189: 'identifier' : local variable is initialized but not referenced +-- +2.30.2 + diff -Nru warzone2100-4.3.3/debian/patches/series warzone2100-4.3.3/debian/patches/series --- warzone2100-4.3.3/debian/patches/series 2023-01-08 06:32:00.000000000 +0000 +++ warzone2100-4.3.3/debian/patches/series 2023-01-12 17:27:37.000000000 +0000 @@ -5,3 +5,4 @@ wkhtmltopdf.patch datadir.patch backport-gcc-12/0008-cheat.cpp-Silence-GCC-12-warning.patch +0001-vk_mem_alloc-Ignore-Wcast-align-on-GCC-on-all-archit.patch diff -Nru warzone2100-4.3.3/debian/rules warzone2100-4.3.3/debian/rules --- warzone2100-4.3.3/debian/rules 2022-07-30 15:28:43.000000000 +0000 +++ warzone2100-4.3.3/debian/rules 2023-01-12 17:26:24.000000000 +0000 @@ -4,9 +4,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG -# riscv64 needs explicit -latomic -ifneq (,$(filter $(DEB_HOST_ARCH), riscv64)) - export DEB_LDFLAGS_MAINT_APPEND = -latomic +# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358 +ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mipsel powerpc riscv64 sh4)) + export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed endif %: diff -Nru warzone2100-4.3.3/debian/warzone2100-data.substvars warzone2100-4.3.3/debian/warzone2100-data.substvars --- warzone2100-4.3.3/debian/warzone2100-data.substvars 2023-01-09 10:43:32.000000000 +0000 +++ warzone2100-4.3.3/debian/warzone2100-data.substvars 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -misc:Depends= -misc:Pre-Depends= diff -Nru warzone2100-4.3.3/debian/warzone2100-music.substvars warzone2100-4.3.3/debian/warzone2100-music.substvars --- warzone2100-4.3.3/debian/warzone2100-music.substvars 2023-01-09 10:43:32.000000000 +0000 +++ warzone2100-4.3.3/debian/warzone2100-music.substvars 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -misc:Depends= -misc:Pre-Depends= diff -Nru warzone2100-4.3.3/debian/warzone2100.postinst.debhelper warzone2100-4.3.3/debian/warzone2100.postinst.debhelper --- warzone2100-4.3.3/debian/warzone2100.postinst.debhelper 2023-01-09 10:43:32.000000000 +0000 +++ warzone2100-4.3.3/debian/warzone2100.postinst.debhelper 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -# Automatically added by dh_icons/13.11.4 -if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then - if command -v update-icon-caches >/dev/null; then - update-icon-caches /usr/share/icons/net.wz2100.warzone2100.png - fi -fi -# End automatically added section diff -Nru warzone2100-4.3.3/debian/warzone2100.postrm.debhelper warzone2100-4.3.3/debian/warzone2100.postrm.debhelper --- warzone2100-4.3.3/debian/warzone2100.postrm.debhelper 2023-01-09 10:43:32.000000000 +0000 +++ warzone2100-4.3.3/debian/warzone2100.postrm.debhelper 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -# Automatically added by dh_icons/13.11.4 -if command -v update-icon-caches >/dev/null; then - update-icon-caches /usr/share/icons/net.wz2100.warzone2100.png -fi -# End automatically added section diff -Nru warzone2100-4.3.3/debian/warzone2100.substvars warzone2100-4.3.3/debian/warzone2100.substvars --- warzone2100-4.3.3/debian/warzone2100.substvars 2023-01-09 10:43:32.000000000 +0000 +++ warzone2100-4.3.3/debian/warzone2100.substvars 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -shlibs:Depends=libasound2 (>= 1.0.27), libc6 (>= 2.35), libcurl3-gnutls (>= 7.56.1), libdecor-0-0 (>= 0.1.0), libdrm2 (>= 2.4.47), libfreetype6 (>= 2.10.1), libfribidi0 (>= 1.0.0), libgbm1 (>= 8.1~0), libgcc-s1 (>= 4.0), libharfbuzz0b (>= 1.2.6), libminiupnpc17 (>= 1.9.20140610), libogg0 (>= 1.1.0), libopenal1 (>= 1.14), libopus0 (>= 1.1), libphysfs1 (>= 3.0.2), libpng16-16 (>= 1.6.2-1), libpulse0 (>= 0.99.1), libsamplerate0 (>= 0.1.7), libsodium23 (>= 1.0.14), libsqlite3-0 (>= 3.14.0), libstdc++6 (>= 11), libtheora0 (>= 1.0), libvorbis0a (>= 1.1.2), libvorbisfile3 (>= 1.1.2), libwayland-client0 (>= 1.20.0), libwayland-cursor0 (>= 1.0.2), libwayland-egl1 (>= 1.15.0), libx11-6 (>= 2:1.2.99.901), libxcursor1 (>> 1.1.2), libxext6, libxfixes3 (>= 1:5.0), libxi6 (>= 2:1.6.99.1), libxkbcommon0 (>= 0.5.0), libxrandr2 (>= 2:1.2.99.3), libxss1, zlib1g (>= 1:1.1.4) -misc:Depends= -misc:Pre-Depends=