[PR PATCH] freeciv: update to 3.1.3.

[PR PATCH] freeciv: update to 3.1.3.

[1is7ac3]

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

There is a new pull request by 1is7ac3 against master on the void-packages repository

https://github.com/1is7ac3/void-packages freeciv-3.1.3
https://github.com/void-linux/void-packages/pull/52632

freeciv: update to 3.1.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86-64-GLIBC)
<!--- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/52632.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freeciv-3.1.3-52632.patch --]
[-- Type: text/x-diff, Size: 3184 bytes --]

From 01a3384bba1b13fe00f81b9e48dc8bd48c7ce2c8 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Mon, 14 Oct 2024 03:52:47 -0300
Subject: [PATCH] freeciv: update to 3.1.3.

---
 srcpkgs/freeciv-qt6      |  1 +
 srcpkgs/freeciv/template | 36 +++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)
 create mode 120000 srcpkgs/freeciv-qt6

diff --git a/srcpkgs/freeciv-qt6 b/srcpkgs/freeciv-qt6
new file mode 120000
index 00000000000000..5c9f356a808b3b
--- /dev/null
+++ b/srcpkgs/freeciv-qt6
@@ -0,0 +1 @@
+freeciv
\ No newline at end of file
diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index 827b30f5e11c3e..833b45f44b3c12 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,10 +1,10 @@
 # Template file for 'freeciv'
 pkgname=freeciv
-version=3.0.7
-revision=2
+version=3.1.3
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
 makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel
  gtk+3-devel libcurl-devel lua53-devel"
 short_desc="Free and Open Source empire-building strategy game - server/data"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.freeciv.org/"
 changelog="https://www.freeciv.org/wiki/NEWS"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f6e606f17ed03d971272883f1a4879f5c1c2c247f64b8edefa6a25c8a2a8dac4
+checksum=741086fa94574374c7c27480f77ee68e5b538bfb2eff85004fa8c87b312c7f2f
 nopie_files="/usr/bin/freeciv-ruledit"
 
 # gtk3.22 is a client supporting gtk+>=3.22
@@ -21,8 +21,8 @@ _clients="gtk3.22,sdl2"
 subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
 if [ -z "$CROSS_BUILD" ]; then
 	_clients+=",qt"
-	makedepends+=" qt5-devel"
-	subpackages+=" freeciv-qt5"
+	makedepends+=" qt6-base-devel"
+	subpackages+=" freeciv-qt5 freeciv-qt6"
 fi
 configure_args+=" --enable-client=${_clients}"
 
@@ -46,15 +46,9 @@ 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/metainfo/*qt*"
-		vmove "usr/share/man/man6/*qt*"
-		vmove "usr/share/applications/*qt*"
-	}
+	build_style=meta
+	short_desc="Freeciv - Qt5 client (transitional dummy package)"
+	depends="freeciv-qt6>=${version}_${revision}"
 }
 freeciv-sdl_package() {
 	short_desc="Free and Open Source empire-building strategy game - SDL2 client"
@@ -71,3 +65,15 @@ freeciv-xaw_package() {
 	short_desc="Freeciv GTK+3 client (transitional dummy package)"
 	depends="freeciv-gtk3>=${version}_${revision}"
 }
+
+freeciv-qt6_package() {
+	short_desc="Free and Open Source empire-building strategy game - Qt6 client"
+	depends="${sourcepkg}>=${version}_${revision}"
+	nopie_files="/usr/bin/freeciv-mp-qt"
+	pkg_install() {
+		vmove "usr/bin/*qt*"
+		vmove "usr/share/metainfo/*qt*"
+		vmove "usr/share/man/man6/*qt*"
+		vmove "usr/share/applications/*qt*"
+	}
+}

Re: [PR PATCH] [Merged]: freeciv: update to 3.1.3.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]

There's a merged pull request on the void-packages repository

freeciv: update to 3.1.3.
https://github.com/void-linux/void-packages/pull/52632

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86-64-GLIBC)
<!--- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->