Date: Saturday, July 18, 2020 @ 20:25:41 Author: svenstaro Revision: 664467
upgpkg: widelands 21-1 Modified: widelands/trunk/PKGBUILD Deleted: widelands/trunk/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch ------------------------------------------------+ 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch | 22 -------------- PKGBUILD | 34 ++++++++--------------- 2 files changed, 13 insertions(+), 43 deletions(-) Deleted: 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch =================================================================== --- 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch 2020-07-18 20:17:03 UTC (rev 664466) +++ 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch 2020-07-18 20:25:41 UTC (rev 664467) @@ -1,22 +0,0 @@ -From 45249a2c7172fdc2d5cd856a1ee05670f21f0db7 Mon Sep 17 00:00:00 2001 -From: franku <[email protected]> -Date: Thu, 18 Jul 2019 19:30:34 +0200 -Subject: [PATCH] use link_libraries instead of set(CMAKE_EXE_LINKER_FLAGS... - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b59171f112..acb5f2c1d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -182,7 +182,7 @@ endif(OPTION_ASAN) - - # This is set to avoid linker errors when using GLVND-libs on Linux - if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND") -- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL") -+ link_libraries("GL") - add_compile_definitions(WL_USE_GLVND) - message(STATUS "Adding linker flags for GLVND.") - endif() Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-07-18 20:17:03 UTC (rev 664466) +++ PKGBUILD 2020-07-18 20:25:41 UTC (rev 664467) @@ -3,48 +3,40 @@ # Contributor: Christoph Zeiler <rabyte*gmail> pkgname=widelands -pkgver=20 +pkgver=21 _realver=build${pkgver} -pkgrel=9 +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' 'boost-libs') +depends=('sdl2_mixer' 'sdl2_image' 'sdl2_net' 'sdl2_ttf' 'sdl2_gfx' 'lua' 'glew' 'python' 'boost-libs' 'dbus') makedepends=('cmake' 'boost' 'mesa' 'ninja' 'git') replaces=('widelands-data') -source=("git+https://github.com/widelands/widelands.git#commit=ce578db"; +source=("git+https://github.com/widelands/widelands.git#tag=build$pkgver"; $pkgname.desktop - $pkgname.png - 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch) + $pkgname.png) sha512sums=('SKIP' 'ef7e54ffba11a2fe54d2cafc0a12fcbe5028e861b9b980f549317b159c8532ee62423af8724b05cfd344017097e022215fa750f4ca9afffa57703d434017d727' - 'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac' - '51b1fb6bed262cc62023403c5d1bd2663c7e37ed9e89afbe11eec54a39bde8c48e1413f80b4044df5b7e972287843e1fa8bf5a8c0af7c5afa146c9f087181b7c') + 'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac') -prepare() { +build() { cd $pkgname - patch -Np1 -i "$srcdir"/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch - - mkdir -p build && cd build -} - -build() { - cd $pkgname/build - - cmake -G Ninja .. \ + cmake . \ + -G Ninja . \ + -Bbuild \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWL_INSTALL_BASEDIR=/usr \ -DWL_INSTALL_DATADIR=/usr/share/widelands - ninja + ninja -C build } package() { - cd $pkgname/build + cd $pkgname - DESTDIR="$pkgdir" ninja install + DESTDIR="$pkgdir" ninja -C build install mkdir -p "$pkgdir"/usr/bin mv "$pkgdir"/usr/{widelands,wl_map_object_info,wl_map_info} "$pkgdir"/usr/bin
