Github messages for voidlinux
 help / color / mirror / Atom feed
From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] freeciv: update to 3.0.3.
Date: Tue, 20 Sep 2022 20:20:14 +0200	[thread overview]
Message-ID: <20220920182014.VQ8FKg1SRuBUFbXjw-LhRfYCTYCUBCCO2J3ocpWQEfc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39365@inbox.vuxu.org>

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

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/freeciv
https://github.com/void-linux/void-packages/pull/39365

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

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

<!--
#### 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, (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/39365.patch is attached

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

From 51a455950925a5be397909725a1d21bddbca013a 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-xaw      |  1 -
 srcpkgs/freeciv/template | 29 ++++++++++++++---------------
 2 files changed, 14 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/freeciv-xaw

diff --git a/srcpkgs/freeciv-xaw b/srcpkgs/freeciv-xaw
deleted file mode 120000
index 5c9f356a808b..000000000000
--- a/srcpkgs/freeciv-xaw
+++ /dev/null
@@ -1 +0,0 @@
-freeciv
\ No newline at end of file
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}"
 }

  parent reply	other threads:[~2022-09-20 18:20 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-19 12:47 [PR PATCH] " TinfoilSubmarine
2022-09-19 23:17 ` [PR REVIEW] " paper42
2022-09-20 18:20 ` TinfoilSubmarine [this message]
2022-09-20 18:26 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-09-20 18:33 ` TinfoilSubmarine
2022-09-22  6:43 ` [PR PATCH] [Merged]: " classabbyamp

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=20220920182014.VQ8FKg1SRuBUFbXjw-LhRfYCTYCUBCCO2J3ocpWQEfc@z \
    --to=tinfoilsubmarine@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).