From: Vaelatern <Vaelatern@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Freeciv 3.22
Date: Mon, 16 Jan 2023 21:32:54 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41687@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
There is a new pull request by Vaelatern against master on the void-packages repository
https://github.com/Vaelatern/void-packages freeciv-3.22
https://github.com/void-linux/void-packages/pull/41687
Freeciv 3.22
Based on https://github.com/void-linux/void-packages/pull/41680#discussion_r1071515411
A patch file from https://github.com/void-linux/void-packages/pull/41687.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freeciv-3.22-41687.patch --]
[-- Type: text/x-diff, Size: 2637 bytes --]
From 76e2c604cb87877f43377f6ac31917426f488a73 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 16 Jan 2023 19:30:29 +0200
Subject: [PATCH 1/2] freeciv: Use proper URLs
- https instead of http
- Use canonical freeciv wiki URL
Also add a TODO -comment about the need to switch from mostly deprecated
gtk3-client to gtk3.22-client.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Closes: #41680 [via git-merge-pr]
---
srcpkgs/freeciv/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index aaafa7dab557..191177124dae 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -10,12 +10,14 @@ makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel
short_desc="Free and Open Source empire-building strategy game - server/data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://freeciv.org/"
-changelog="https://freeciv.fandom.com/wiki/NEWS-${version}"
+homepage="https://www.freeciv.org/"
+changelog="https://www.freeciv.org/wiki/NEWS-${version}"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=13215adc96be9f2894d5f3a12c78b8ebb9ae06ecdab25fe6bb1794f6e6d2b61b
nopie_files="/usr/bin/freeciv-ruledit"
+# TODO: gtk3 should be replaced by better supported gtk3.22 in any
+# distribution that has gtk+-3.22 or gtk+-3.24 available.
_clients="gtk3,sdl2"
subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
if [ -z "$CROSS_BUILD" ]; then
From 9a1e225bc4b2645f1e74d20af1ff5117039fe502 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Mon, 16 Jan 2023 15:15:24 -0500
Subject: [PATCH 2/2] freeciv: Use the new gtk+3 client
---
srcpkgs/freeciv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index 191177124dae..5daf14b20f1d 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,7 +1,7 @@
# Template file for 'freeciv'
pkgname=freeciv
version=3.0.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
hostmakedepends="pkg-config"
@@ -18,7 +18,7 @@ nopie_files="/usr/bin/freeciv-ruledit"
# TODO: gtk3 should be replaced by better supported gtk3.22 in any
# distribution that has gtk+-3.22 or gtk+-3.24 available.
-_clients="gtk3,sdl2"
+_clients="gtk3.22,sdl2"
subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
if [ -z "$CROSS_BUILD" ]; then
_clients+=",qt"
next reply other threads:[~2023-01-16 20:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-16 20:32 Vaelatern [this message]
2023-01-16 20:53 ` [PR PATCH] [Updated] " Vaelatern
2023-01-16 20:54 ` [PR PATCH] [Closed]: " Vaelatern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41687@inbox.vuxu.org \
--to=vaelatern@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).