Date: Tuesday, May 7, 2019 @ 11:34:43 Author: svenstaro Revision: 462007
archrelease: copy trunk to community-x86_64 Added: widelands/repos/community-x86_64/PKGBUILD (from rev 462006, widelands/trunk/PKGBUILD) widelands/repos/community-x86_64/widelands.desktop (from rev 462006, widelands/trunk/widelands.desktop) widelands/repos/community-x86_64/widelands.png (from rev 462006, widelands/trunk/widelands.png) Deleted: widelands/repos/community-x86_64/PKGBUILD widelands/repos/community-x86_64/widelands-gcc7.patch widelands/repos/community-x86_64/widelands.desktop widelands/repos/community-x86_64/widelands.png ----------------------+ PKGBUILD | 114 ++++++++++++++++++++++--------------------------- widelands-gcc7.patch | 15 ------ widelands.desktop | 16 +++--- 3 files changed, 61 insertions(+), 84 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-05-07 11:34:31 UTC (rev 462006) +++ PKGBUILD 2019-05-07 11:34:43 UTC (rev 462007) @@ -1,61 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <rabyte*gmail> - -pkgname=widelands -pkgver=19 -_realver=build${pkgver} -pkgrel=18 -pkgdesc="A realtime strategy game with emphasis on economy and transport" -arch=('x86_64') -url="http://widelands.org/" -license=('GPL') -depends=('sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'sdl2_gfx' 'lua' 'glew' 'python' 'boost-libs') -makedepends=('cmake' 'boost' 'mesa') -replaces=('widelands-data') -source=("https://launchpad.net/widelands/${_realver}/build${pkgver}/+download/$pkgname-$_realver-src.tar.bz2" - $pkgname.desktop - $pkgname.png - widelands-gcc7.patch) -sha512sums=('80d70542f30c47498c38c5066ecbfa094cfa16fa3c8c75a950420b334cc019766a90a9f715d326506ce425848da1d75fa6f87e33e3551019c0dd8a4ccf99d666' - 'ef7e54ffba11a2fe54d2cafc0a12fcbe5028e861b9b980f549317b159c8532ee62423af8724b05cfd344017097e022215fa750f4ca9afffa57703d434017d727' - 'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac' - 'a60c6f0309579b167664cf0c1022e6c293dad328c2698793d3bc63e880bc3933db8c708494502e898016443d4ec0deac7bd4f80d201dc681098d8197af98193d') - -prepare() { - # Fix build with GCC 7 - don't turn warnings to errors - patch -p0 -i widelands-gcc7.patch -} - -build() { - cd $srcdir/$pkgname-$_realver-src - - mkdir -p build/compile && cd build/compile - - # http://site.icu-project.org/download/61#TOC-Migration-Issues - CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1' - - cmake ../.. \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_BASEDIR=/usr \ - -DWL_INSTALL_DATADIR=/usr/share/widelands - make -} - -package() { - cd $srcdir/$pkgname-$_realver-src/build/compile - - make DESTDIR="$pkgdir" install - - mkdir -p $pkgdir/usr/bin - mv $pkgdir/usr/{widelands,wl_map_object_info,wl_render_richtext,wl_map_info} $pkgdir/usr/bin - mv $pkgdir/usr/{VERSION,ChangeLog,CREDITS} $pkgdir/usr/share/widelands - - mkdir -p $pkgdir/usr/share/licenses/$pkgname - mv $pkgdir/usr/COPYING $pkgdir/usr/share/licenses/$pkgname - - # Install bin, icon and desktop file - install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop -} Copied: widelands/repos/community-x86_64/PKGBUILD (from rev 462006, widelands/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-05-07 11:34:43 UTC (rev 462007) @@ -0,0 +1,53 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <rabyte*gmail> + +pkgname=widelands +pkgver=20 +_realver=build${pkgver} +pkgrel=1 +pkgdesc="A realtime strategy game with emphasis on economy and transport" +arch=('x86_64') +url="http://widelands.org/" +license=('GPL') +depends=('sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'sdl2_gfx' 'lua' 'glew' 'python' 'boost-libs') +makedepends=('cmake' 'boost' 'mesa' 'ninja') +replaces=('widelands-data') +source=("https://launchpad.net/widelands/${_realver}/build${pkgver}/+download/$pkgname-$_realver.tar.bz2" + $pkgname.desktop + $pkgname.png) +sha512sums=('25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5' + 'ef7e54ffba11a2fe54d2cafc0a12fcbe5028e861b9b980f549317b159c8532ee62423af8724b05cfd344017097e022215fa750f4ca9afffa57703d434017d727' + 'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac') + +build() { + cd $srcdir/$pkgname-$_realver + + sed -i "s/CMP0072 NEW/CMP0072 OLD/g" CMakeLists.txt + + mkdir -p build/compile && cd build/compile + + cmake -G Ninja ../.. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_BASEDIR=/usr \ + -DWL_INSTALL_DATADIR=/usr/share/widelands + ninja +} + +package() { + cd $srcdir/$pkgname-$_realver/build/compile + + DESTDIR="$pkgdir" ninja install + + mkdir -p $pkgdir/usr/bin + mv $pkgdir/usr/{widelands,wl_map_object_info,wl_map_info} $pkgdir/usr/bin + mv $pkgdir/usr/{VERSION,ChangeLog,CREDITS} $pkgdir/usr/share/widelands + + mkdir -p $pkgdir/usr/share/licenses/$pkgname + mv $pkgdir/usr/COPYING $pkgdir/usr/share/licenses/$pkgname + + # Install bin, icon and desktop file + install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} Deleted: widelands-gcc7.patch =================================================================== --- widelands-gcc7.patch 2019-05-07 11:34:31 UTC (rev 462006) +++ widelands-gcc7.patch 2019-05-07 11:34:43 UTC (rev 462007) @@ -1,15 +0,0 @@ ---- widelands-build19-src/CMakeLists.txt.orig 2017-05-21 16:53:12.517380329 +0000 -+++ widelands-build19-src/CMakeLists.txt 2017-05-21 16:53:23.590697586 +0000 -@@ -176,12 +176,6 @@ - wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wunused-macros") - endif() - --# 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") -- - IF (WIN32) - add_definitions(-DMINGW_HAS_SECURE_API) - if (CMAKE_SIZEOF_VOID_P EQUAL 4) Deleted: widelands.desktop =================================================================== --- widelands.desktop 2019-05-07 11:34:31 UTC (rev 462006) +++ widelands.desktop 2019-05-07 11:34:43 UTC (rev 462007) @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Widelands -GenericName=Widelands -Comment=Realtime strategy game -Icon=widelands -Exec=widelands -Type=Application -Categories=Game;StrategyGame; Copied: widelands/repos/community-x86_64/widelands.desktop (from rev 462006, widelands/trunk/widelands.desktop) =================================================================== --- widelands.desktop (rev 0) +++ widelands.desktop 2019-05-07 11:34:43 UTC (rev 462007) @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Widelands +GenericName=Widelands +Comment=Realtime strategy game +Icon=widelands +Exec=widelands +Type=Application +Categories=Game;StrategyGame; Deleted: widelands.png =================================================================== (Binary files differ) Copied: widelands/repos/community-x86_64/widelands.png (from rev 462006, widelands/trunk/widelands.png) =================================================================== (Binary files differ)