[PR PATCH] freeciv: update to 2.6.4.

[PR PATCH] freeciv: update to 2.6.4.

[mobinmob]

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

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

https://github.com/mobinmob/void-packages freeciv
https://github.com/void-linux/void-packages/pull/30461

freeciv: update to 2.6.4.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] 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/30461.patch is attached

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

From 3f69ff4ea790f2ad75444b8a2eb08ed479cfa980 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 24 Apr 2021 00:25:24 +0300
Subject: [PATCH] freeciv: update to 2.6.4.

---
 srcpkgs/freeciv/patches/QPainterPath.patch | 20 --------------------
 srcpkgs/freeciv/template                   |  6 +++---
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/freeciv/patches/QPainterPath.patch

diff --git a/srcpkgs/freeciv/patches/QPainterPath.patch b/srcpkgs/freeciv/patches/QPainterPath.patch
deleted file mode 100644
index 9c6bdb0480bb..000000000000
--- a/srcpkgs/freeciv/patches/QPainterPath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- client/gui-qt/canvas.cpp	2020-02-15 16:49:02.000000000 +0100
-+++ client/gui-qt/canvas.cpp	2020-09-01 19:25:35.075928695 +0200
-@@ -18,6 +18,7 @@
- // Qt
- #include <QFontMetrics>
- #include <QPainter>
-+#include <QPainterPath>
- 
- // qt-client
- #include "canvas.h"
---- client/gui-qt/dialogs.cpp	2020-02-15 16:49:02.000000000 +0100
-+++ client/gui-qt/dialogs.cpp	2020-09-01 19:25:42.242929065 +0200
-@@ -24,6 +24,7 @@
- #include <QMessageBox>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadioButton>
- #include <QRect>
- #include <QSignalMapper>
diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index cb6434529441..061defcc8940 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,6 +1,6 @@
 # Template file for 'freeciv'
 pkgname=freeciv
-version=2.6.2
+version=2.6.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all
@@ -12,8 +12,9 @@ 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=6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e176c8f
+checksum=40db957766acbd49c5af15afd1711da996b6681be7abee3352c5f2539c10c1ce
 
 subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
 if [ -z "$CROSS_BUILD" ]; then
@@ -44,7 +45,6 @@ freeciv-gtk3_package() {
 		vmove "usr/share/appdata/*gtk3*"
 		vmove "usr/share/man/man6/*gtk3*"
 		vmove "usr/share/applications/*gtk3*"
-		vmove "usr/share/applications/freeciv.desktop"
 	}
 }
 freeciv-qt5_package() {

Re: freeciv: update to 2.6.4.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30461#issuecomment-826232723

Comment:
Please stop building the `gtk2` subpackage, I see no reason to keep it around. Then either add it to `removed-packages` (simpler but less user friendly) or make it a `dummy transition package` around the `gtk3` subpackage (more user friendly).

Re: [PR PATCH] [Closed]: freeciv: update to 2.6.4.

[mobinmob]

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

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

freeciv: update to 2.6.4.
https://github.com/void-linux/void-packages/pull/30461

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->