From f0a672df5ad1dedb9d8f73bb5d4559a35c759425 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 19 Sep 2022 08:42:51 -0400
Subject: [PATCH] freeciv: update to 3.0.3.

---
 srcpkgs/freeciv/template | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index 2f6479b37d66..81fe96c1306b 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,22 +1,23 @@
 # Template file for 'freeciv'
 pkgname=freeciv
-version=2.6.5
+version=3.0.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
 hostmakedepends="pkg-config"
 makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel
- gtk+3-devel libXaw-devel libcurl-devel lua53-devel"
+ gtk+3-devel libcurl-devel lua53-devel"
 short_desc="Free and Open Source empire-building strategy game - server/data"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://freeciv.org/"
 changelog="https://freeciv.fandom.com/wiki/NEWS-${version}"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=2e64e1c74dae12acb17bbf5daa980efc7e9fd57820afed5135319ca95291ec59
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=13215adc96be9f2894d5f3a12c78b8ebb9ae06ecdab25fe6bb1794f6e6d2b61b
+nopie_files="/usr/bin/freeciv-ruledit"
 
-_clients="gtk3,sdl2,xaw"
-subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
+_clients="gtk3,sdl2"
+subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl"
 if [ -z "$CROSS_BUILD" ]; then
 	_clients+=",qt"
 	makedepends+=" qt5-devel"
@@ -38,7 +39,7 @@ freeciv-gtk3_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/bin/*gtk3*"
-		vmove "usr/share/appdata/*gtk3*"
+		vmove "usr/share/metainfo/*gtk3*"
 		vmove "usr/share/man/man6/*gtk3*"
 		vmove "usr/share/applications/*gtk3*"
 	}
@@ -46,9 +47,10 @@ freeciv-gtk3_package() {
 freeciv-qt5_package() {
 	short_desc="Free and Open Source empire-building strategy game - Qt5 client"
 	depends="${sourcepkg}>=${version}_${revision}"
+	nopie_files="/usr/bin/freeciv-mp-qt"
 	pkg_install() {
 		vmove "usr/bin/*qt*"
-		vmove "usr/share/appdata/*qt*"
+		vmove "usr/share/metainfo/*qt*"
 		vmove "usr/share/man/man6/*qt*"
 		vmove "usr/share/applications/*qt*"
 	}
@@ -58,16 +60,13 @@ freeciv-sdl_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/bin/*sdl*"
-		vmove "usr/share/appdata/*sdl*"
+		vmove "usr/share/metainfo/*sdl*"
 		vmove "usr/share/man/man6/*sdl*"
 		vmove "usr/share/applications/*sdl*"
 	}
 }
 freeciv-xaw_package() {
-	short_desc="Free and Open Source empire-building strategy game - X11 client"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove "usr/bin/*xaw*"
-		vmove "usr/share/man/man6/*xaw*"
-	}
+	build_style=meta
+	short_desc="Freeciv GTK+3 client (transitional dummy package)"
+	depends="freeciv-gtk3>=${version}_${revision}"
 }