Date: Sunday, November 17, 2019 @ 07:16:52
Author: svenstaro
Revision: 529978
archrelease: copy trunk to community-x86_64
Added:
widelands/repos/community-x86_64/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch
(from rev 529977,
widelands/trunk/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch)
widelands/repos/community-x86_64/PKGBUILD
(from rev 529977, widelands/trunk/PKGBUILD)
widelands/repos/community-x86_64/widelands.desktop
(from rev 529977, widelands/trunk/widelands.desktop)
widelands/repos/community-x86_64/widelands.png
(from rev 529977, widelands/trunk/widelands.png)
Deleted:
widelands/repos/community-x86_64/PKGBUILD
widelands/repos/community-x86_64/widelands.desktop
widelands/repos/community-x86_64/widelands.png
------------------------------------------------+
45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch | 22 ++++
PKGBUILD | 111 ++++++++++++-----------
widelands.desktop | 16 +--
3 files changed, 88 insertions(+), 61 deletions(-)
Copied:
widelands/repos/community-x86_64/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch
(from rev 529977,
widelands/trunk/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch)
===================================================================
--- 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch
(rev 0)
+++ 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch 2019-11-17 07:16:52 UTC
(rev 529978)
@@ -0,0 +1,22 @@
+From 45249a2c7172fdc2d5cd856a1ee05670f21f0db7 Mon Sep 17 00:00:00 2001
+From: franku <so...@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()
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-17 07:16:43 UTC (rev 529977)
+++ PKGBUILD 2019-11-17 07:16:52 UTC (rev 529978)
@@ -1,53 +0,0 @@
-# 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=3
-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
-}
Copied: widelands/repos/community-x86_64/PKGBUILD (from rev 529977,
widelands/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-17 07:16:52 UTC (rev 529978)
@@ -0,0 +1,58 @@
+# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <rabyte*gmail>
+
+pkgname=widelands
+pkgver=20
+_realver=build${pkgver}
+pkgrel=5
+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')
+makedepends=('cmake' 'boost' 'mesa' 'ninja' 'git')
+replaces=('widelands-data')
+source=("git+https://github.com/widelands/widelands.git#commit=ce578db";
+ $pkgname.desktop
+ $pkgname.png
+ 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch)
+sha512sums=('SKIP'
+
'ef7e54ffba11a2fe54d2cafc0a12fcbe5028e861b9b980f549317b159c8532ee62423af8724b05cfd344017097e022215fa750f4ca9afffa57703d434017d727'
+
'f7db9d7584ec8431f2f1857baddeb32cd3ae182343e7f0369e61fb444514bd9c2e6a3931ae34f24cc994840dffbbe4451f33845798f3d582f41b31f451b261ac'
+
'51b1fb6bed262cc62023403c5d1bd2663c7e37ed9e89afbe11eec54a39bde8c48e1413f80b4044df5b7e972287843e1fa8bf5a8c0af7c5afa146c9f087181b7c')
+
+prepare() {
+ cd $pkgname
+
+ patch -Np1 -i "$srcdir"/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch
+
+ mkdir -p build && cd build
+}
+
+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 $pkgname/build
+
+ 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 -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
+ install -Dm644 $srcdir/$pkgname.desktop
$pkgdir/usr/share/applications/$pkgname.desktop
+}
Deleted: widelands.desktop
===================================================================
--- widelands.desktop 2019-11-17 07:16:43 UTC (rev 529977)
+++ widelands.desktop 2019-11-17 07:16:52 UTC (rev 529978)
@@ -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 529977,
widelands/trunk/widelands.desktop)
===================================================================
--- widelands.desktop (rev 0)
+++ widelands.desktop 2019-11-17 07:16:52 UTC (rev 529978)
@@ -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 529977,
widelands/trunk/widelands.png)
===================================================================
(Binary files differ)
