community/freeciv: upgrade to 3.0.3

community/freeciv/0001-fcmp-Fix-vulnerability-with-crafted-modpack-URLs.patch

-From f962a7f87eff2e1c139ab11b9534b59a0edef217 Mon Sep 17 00:00:00 2001
-From: Marko Lindqvist <cazfi74@gmail.com>
-Date: Fri, 5 Aug 2022 00:22:56 +0300
-Subject: [PATCH] fcmp: Fix vulnerability with crafted modpack URLs
-
-See osdn #45299
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
----
- tools/download.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/tools/download.c b/tools/download.c
-index d555bb5e0d..2fbf561f88 100644
---- a/tools/download.c
-+++ b/tools/download.c
-@@ -116,6 +116,10 @@ static const char *download_modpack_recursive(const char *URL,
-     /* Nothing */
-   }
- 
-+  if (start_idx <= 0) {
-+    return _("This does not look like modpack URL");
-+  }
-+
-   log_normal(_("Installing modpack %s from %s"), URL + start_idx, URL);
- 
-   if (fcmp->inst_prefix == NULL) {
-@@ -417,6 +421,10 @@ const char *download_modpack_list(const struct fcmp_params *fcmp,
-     /* Nothing */
-   }
- 
-+  if (start_idx <= 0) {
-+    return _("Invalid modpack list URL");
-+  }
-+
-   list_capstr = secfile_lookup_str(list_file, "info.options");
-   if (list_capstr == NULL) {
-     secfile_destroy(list_file);
--- 
-2.35.1
-

community/freeciv/APKBUILD

@@ -2,8 +2,8 @@
 # Contributor: Maxim Karasev <begs@disroot.org>
 # Maintainer: Thomas Kienlen <kommander@laposte.net>
 pkgname=freeciv
-pkgver=3.0.1
-pkgrel=1
+pkgver=3.0.3
+pkgrel=0
 pkgdesc="Free and Open Source empire-building strategy game (meta package)"
 url="http://www.freeciv.org"
 arch="all"
@@ -22,7 +22,7 @@ _common_makedepends="
 _gtk3_client_makedepends="
 	pkgconf
 	glib-dev
-	atk-dev
+	at-spi2-core-dev
 	pango-dev
 	gdk-pixbuf-dev
 	gtk+3.0-dev
@@ -48,9 +48,7 @@ makedepends="
 	$_sdl2_client_makedepends
 	$_server_makedepends
 	"
-source="https://downloads.sourceforge.net/sourceforge/freeciv/freeciv-$pkgver.tar.xz
-	0001-fcmp-Fix-vulnerability-with-crafted-modpack-URLs.patch
-	"
+source="https://downloads.sourceforge.net/sourceforge/freeciv/freeciv-$pkgver.tar.xz"
 subpackages="
 	$pkgname-doc
 	$pkgname-lang
@@ -162,8 +160,8 @@ client_gtk3() {
 		usr/bin/freeciv-mp-gtk3
 		usr/share/applications/org.freeciv.gtk322.desktop
 		usr/share/applications/org.freeciv.mp.gtk3.desktop
-		usr/share/metainfo/freeciv-gtk3.22.appdata.xml
-		usr/share/metainfo/freeciv-mp-gtk3.appdata.xml
+		usr/share/metainfo/org.freeciv.gtk322.appdata.xml
+		usr/share/metainfo/org.freeciv.mp.gtk3.appdata.xml
 		"
 
 	for _file in $_files
@@ -189,9 +187,9 @@ client_qt() {
 		usr/share/applications/org.freeciv.mp.qt.desktop
 		usr/share/applications/org.freeciv.qt.desktop
 		usr/share/applications/org.freeciv.ruledit.desktop
-		usr/share/metainfo/freeciv-mp-qt.appdata.xml
-		usr/share/metainfo/freeciv-qt.appdata.xml
-		usr/share/metainfo/freeciv-ruledit.appdata.xml
+		usr/share/metainfo/org.freeciv.mp.qt.appdata.xml
+		usr/share/metainfo/org.freeciv.qt.appdata.xml
+		usr/share/metainfo/org.freeciv.ruledit.appdata.xml
 		usr/share/pixmaps/freeciv-modpack.png
 		usr/share/pixmaps/freeciv-ruledit.png
 		usr/share/icons/hicolor/128x128/apps/freeciv-ruledit.png
@@ -219,7 +217,7 @@ client_sdl2() {
 	_files="
 		usr/bin/freeciv-sdl2
 		usr/share/applications/org.freeciv.sdl2.desktop
-		usr/share/metainfo/freeciv-sdl2.appdata.xml
+		usr/share/metainfo/org.freeciv.sdl2.appdata.xml
 		"
 
 	for _file in $_files
@@ -243,7 +241,7 @@ server() {
 		usr/bin/freeciv-server
 		usr/bin/freeciv-mp-cli
 		usr/share/applications/org.freeciv.server.desktop
-		usr/share/metainfo/freeciv-server.appdata.xml
+		usr/share/metainfo/org.freeciv.server.appdata.xml
 		usr/share/icons/hicolor/128x128/apps/freeciv-server.png
 		usr/share/icons/hicolor/16x16/apps/freeciv-server.png
 		usr/share/icons/hicolor/32x32/apps/freeciv-server.png
@@ -261,6 +259,5 @@ server() {
 }
 
 sha512sums="
-0f28aa7eb6adc2c4fe2af31265965ec30b4ea4f12121c4240ca896070f4ea574db58f02240e74822b9d498e112bcdb7036bb69f3d0b33cea5fec724e9e47da34  freeciv-3.0.1.tar.xz
-a933f4ea9894227897fbf3c35998fbfe4e7830657448c9347c4c2a3f800e73b98a7399d04a5c4ae5436326d4479b84614943621d8bd68b1bb9db193d2b24ec63  0001-fcmp-Fix-vulnerability-with-crafted-modpack-URLs.patch
+8fcd6181c311beb24b2cc5a782fbf3459d9ce58cd0c0d7e73a9668fc4e498a3ef7bba6d44cff15511dabdbf6ea6cef0002d339b1aa054881d8d1c04007643c85  freeciv-3.0.3.tar.xz
 "