[arch-commits] Commit in widelands/trunk (2 files)

[Sven-Hendrik Haase]

    Date: Sunday, November 17, 2019 @ 07:16:43
  Author: svenstaro
Revision: 529977

upgpkg: widelands 20-5

Change sources to GitHub

Added:
  widelands/trunk/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch
Modified:
  widelands/trunk/PKGBUILD

------------------------------------------------+
 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch |   22 ++++++++
 PKGBUILD                                       |   61 ++++++++++++-----------
 2 files changed, 55 insertions(+), 28 deletions(-)

Added: 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch
===================================================================
--- 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch	                        (rev 0)
+++ 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch	2019-11-17 07:16:43 UTC (rev 529977)
@@ -0,0 +1,22 @@
+From 45249a2c7172fdc2d5cd856a1ee05670f21f0db7 Mon Sep 17 00:00:00 2001
+From: franku <somal at arcor.de>
+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	2019-11-17 06:02:36 UTC (rev 529976)
+++ PKGBUILD	2019-11-17 07:16:43 UTC (rev 529977)
@@ -1,4 +1,4 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
 
@@ -5,49 +5,54 @@
 pkgname=widelands
 pkgver=20
 _realver=build${pkgver}
-pkgrel=3
+pkgrel=5
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('x86_64')
-url="http://widelands.org/"
+url="https://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')
+makedepends=('cmake' 'boost' 'mesa' 'ninja' 'git')
 replaces=('widelands-data')
-source=("https://launchpad.net/widelands/${_realver}/build${pkgver}/+download/$pkgname-$_realver.tar.bz2"
+source=("git+https://github.com/widelands/widelands.git#commit=ce578db"
         $pkgname.desktop
-        $pkgname.png)
-sha512sums=('25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc414dab66e724945442985cbbba7a8a59a582291aca176e0bd8ae6c08760e5'
+        $pkgname.png
+        45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch)
+sha512sums=('SKIP'
             'ef7e54ffba11a2fe54d2cafc0a12fcbe5028e861b9b980f549317b159c8532ee62423af8724b05cfd344017097e022215fa750f4ca9afffa57703d434017d727'
-            'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac')
+            'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac'
+            '51b1fb6bed262cc62023403c5d1bd2663c7e37ed9e89afbe11eec54a39bde8c48e1413f80b4044df5b7e972287843e1fa8bf5a8c0af7c5afa146c9f087181b7c')
 
-build() {
-    cd $srcdir/$pkgname-$_realver
+prepare() {
+  cd $pkgname
 
-    sed -i "s/CMP0072 NEW/CMP0072 OLD/g" CMakeLists.txt
+  patch -Np1 -i "$srcdir"/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch
 
-    mkdir -p build/compile && cd build/compile
+  mkdir -p build && cd build
+}
 
-    cmake -G Ninja ../.. \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DWL_INSTALL_BASEDIR=/usr \
-        -DWL_INSTALL_DATADIR=/usr/share/widelands
-    ninja
+build() {
+  cd $pkgname/build
+
+  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
+  cd $pkgname/build
 
-    DESTDIR="$pkgdir" ninja install
+  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/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
+  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
+  install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
+  install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
 }