From eed1639a4b2fa86d3058c0df59ddb9723d104c7f Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 3 Aug 2016 08:23:16 +0100 Subject: [PATCH] warzone2100: update to 3.2.1 (for real this time) --- warzone2100/PKGBUILD | 10 ++++++++-- warzone2100/buildfix.patch | 13 ------------- warzone2100/warzone2100.appdata.xml | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 15 deletions(-) delete mode 100644 warzone2100/buildfix.patch create mode 100644 warzone2100/warzone2100.appdata.xml diff --git a/warzone2100/PKGBUILD b/warzone2100/PKGBUILD index d7b0e0e30..81470c3be 100644 --- a/warzone2100/PKGBUILD +++ b/warzone2100/PKGBUILD @@ -12,11 +12,17 @@ depends=('libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'qt5-x11extras' 'glew' 'sdl2') makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'libxrandr' 'asciidoc') conflicts=('warzone2100-dev') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha256sums=('0f66b76c50c598abcc895134bd49aab5dd46dcf8135645f2505e93077402a6d9') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz" + warzone2100.appdata.xml) +sha256sums=('0f66b76c50c598abcc895134bd49aab5dd46dcf8135645f2505e93077402a6d9' + 'd6fd6bf40bd72d57a2872b3e439bed04f4cd78e0a7b2993de580ed765b80cfc4') build() { cd ${pkgname}-${pkgver} + + # Add missing file from the tarball + cp ${srcdir}/warzone2100.appdata.xml icons/ + ./configure \ --prefix=/usr \ --with-backend=qt \ diff --git a/warzone2100/buildfix.patch b/warzone2100/buildfix.patch deleted file mode 100644 index 431baed79..000000000 --- a/warzone2100/buildfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/ivis_opengl/screen.cpp b/lib/ivis_opengl/screen.cpp -index d240a63..861265d 100644 ---- a/lib/ivis_opengl/screen.cpp -+++ b/lib/ivis_opengl/screen.cpp -@@ -261,7 +261,7 @@ void screen_EnableMissingFunctions() - __glewUseProgram = __glewUseProgramObjectARB; - __glewGetShaderiv = __glewGetObjectParameterivARB; - __glewLinkProgram = __glewLinkProgramARB; -- __glewShaderSource = __glewShaderSourceARB; -+ __glewShaderSource = (PFNGLSHADERSOURCEPROC) __glewShaderSourceARB; - __glewUniform1f = __glewUniform1fARB; - __glewUniform1i = __glewUniform1iARB; - __glewUniform4fv = __glewUniform4fvARB; diff --git a/warzone2100/warzone2100.appdata.xml b/warzone2100/warzone2100.appdata.xml new file mode 100644 index 000000000..b1842bb88 --- /dev/null +++ b/warzone2100/warzone2100.appdata.xml @@ -0,0 +1,23 @@ + + + warzone2100.desktop + CC0-1.0 + GPL-2.0+ + Real-Time-Strategy War Game + Warzone 2100 + +

+ In Warzone 2100, you command the forces of The Project in a battle to rebuild the world after mankind has almost been destroyed by nuclear missiles. +

+

+ The game offers campaign, multi-player, and single-player skirmish modes. An extensive tech tree with over 400 different technologies, combined with the unit design system, allows for a wide variety of possible units and tactics. +

+

+ Warzone 2100 was originally developed as a commercial game by Pumpkin Studios and published in 1999, and was released as open source by them in 2004, for the community to continue working on it. +

+
+ https://wz2100.net/ + + https://wz2100.net/static/img/wz2100-CAM_3A50.png + +