Date: Tuesday, October 25, 2022 @ 06:22:10
Author: svenstaro
Revision: 1334682
upgpkg: widelands 1:1.1-1
Modified:
widelands/trunk/PKGBUILD
Deleted:
widelands/trunk/widelands-1.0-gcc12-werror.patch
----------------------------------+
PKGBUILD | 24 ++++++------------------
widelands-1.0-gcc12-werror.patch | 29 -----------------------------
2 files changed, 6 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-25 06:19:31 UTC (rev 1334681)
+++ PKGBUILD 2022-10-25 06:22:10 UTC (rev 1334682)
@@ -3,29 +3,19 @@
# Contributor: Christoph Zeiler <rabyte*gmail>
pkgname=widelands
-pkgver=1.0
+pkgver=1.1
epoch=1
-pkgrel=6
+pkgrel=1
pkgdesc="A realtime strategy game with emphasis on economy and transport"
arch=('x86_64')
url="https://widelands.org/";
license=('GPL')
-depends=('sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'sdl2_gfx' 'lua'
'glew' 'python' 'dbus')
+depends=('sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'sdl2_gfx' 'lua'
'glew' 'python' 'dbus' 'asio')
makedepends=('cmake' 'boost' 'mesa' 'ninja' 'git')
replaces=('widelands-data')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/widelands/widelands/archive/refs/tags/v${pkgver}.tar.gz";
- widelands-1.0-gcc12-werror.patch
-
https://github.com/widelands/widelands/commit/316eaea209754368a57f445ea4dd016ecf8eded6.patch)
-sha512sums=('1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e'
-
'a303972d15f2ad2fb895992358759f7a3006c81c875afbbbac4cf4ec76ca93d3ad93754b26eea2315bd9c82f2967912019759117c7004843d659d2d767c2f7ee'
-
'1b236bf06173aeadd07a3b0074b5ec3e6577923e4c6595587504f73d2c729586f03cc5a8fd256a0cb98ed7f586deb09df534fc8300f15d3a259e64435838e317')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/widelands/widelands/archive/refs/tags/v${pkgver}.tar.gz";)
+sha512sums=('29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d')
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i "$srcdir"/widelands-1.0-gcc12-werror.patch # patch from Gentoo
- patch -Np1 -i "$srcdir"/316eaea209754368a57f445ea4dd016ecf8eded6.patch
-}
-
build() {
cd $pkgname-$pkgver
@@ -34,6 +24,7 @@
-Bbuild \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DWL_INSTALL_BINDIR=bin \
-DWL_INSTALL_BASEDIR=/usr \
-DWL_INSTALL_DATADIR=/usr/share/widelands
ninja -C build
@@ -46,10 +37,7 @@
# Fix wrong locations of some installed files (upstream bug)
# See also FS#72240
- mkdir -p "$pkgdir"/usr/bin
- mv
"$pkgdir"/usr/{widelands,wl_map_object_info,wl_map_info,wl_create_spritesheet}
"$pkgdir"/usr/bin
mv "$pkgdir"/usr/{VERSION,ChangeLog,CREDITS} "$pkgdir"/usr/share/widelands
- mv "$pkgdir"/share/* "$pkgdir"/usr/share/
mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
mv "$pkgdir"/usr/COPYING "$pkgdir"/usr/share/licenses/$pkgname
Deleted: widelands-1.0-gcc12-werror.patch
===================================================================
--- widelands-1.0-gcc12-werror.patch 2022-10-25 06:19:31 UTC (rev 1334681)
+++ widelands-1.0-gcc12-werror.patch 2022-10-25 06:22:10 UTC (rev 1334682)
@@ -1,29 +0,0 @@
-Drop -Werror= (uninitialized cause issues from gcc-12) and also backport
-fix for the offending variable.
-
-Note: upstream changed how -Werror is handled next release, currently pass
-a hard non-specific -Werror and disables it for gcc-12 (review on bump, see
-commit/PR below).
-
-https://bugs.gentoo.org/859277
-https://github.com/widelands/widelands/pull/5415
-https://github.com/widelands/widelands/commit/e4da6d624
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,8 +312,2 @@
- if(NOT MSVC)
-- # Turn some warnings into errors.
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
-- wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
--
- wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
---- a/src/editor/editorinteractive.h
-+++ b/src/editor/editorinteractive.h
-@@ -87,4 +87,4 @@
- EditorIncreaseResourcesTool increase_resources;
-- EditorSetPortSpaceTool set_port_space;
- EditorUnsetPortSpaceTool unset_port_space;
-+ EditorSetPortSpaceTool set_port_space;
- EditorSetOriginTool set_origin;
