From: iamacatnotaperson <iamacatnotaperson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Update Freeciv to 3.0.1
Date: Wed, 20 Apr 2022 17:57:09 +0200 [thread overview]
Message-ID: <20220420155709.6eia1J4rYYsea5mSTdnuwTiprVm5kpIe0O9byUX_21I@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36774@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
There is an updated pull request by iamacatnotaperson against master on the void-packages repository
https://github.com/iamacatnotaperson/void-packages iamacatnotaperson-patch-1
https://github.com/void-linux/void-packages/pull/36774
Update Freeciv to 3.0.1
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36774.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iamacatnotaperson-patch-1-36774.patch --]
[-- Type: text/x-diff, Size: 6748 bytes --]
From b1ca90c6384ae3ab55889576bb740db5b76c5ded Mon Sep 17 00:00:00 2001
From: iamacatnotaperson <45576816+iamacatnotaperson@users.noreply.github.com>
Date: Wed, 20 Apr 2022 00:10:59 -0500
Subject: [PATCH 1/3] Add files via upload
---
template | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
create mode 100644 template
diff --git a/template b/template
new file mode 100644
index 000000000000..e6364e85a556
--- /dev/null
+++ b/template
@@ -0,0 +1,65 @@
+# Template file for 'freeciv'
+pkgname=freeciv
+version=3.0.1
+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 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.xz"
+checksum=beda7adaebb3462797c8f090ec604c2974f15a1559fff2fb4cfff2607cb0180f
+
+_clients="gtk3,sdl2"
+subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl"
+if [ -z "$CROSS_BUILD" ]; then
+ _clients+=",qt"
+ makedepends+=" qt5-devel"
+ subpackages+=" freeciv-qt5"
+fi
+configure_args+=" --enable-client=${_clients}"
+
+post_install() {
+ rm ${DESTDIR}/usr/lib/*.a
+}
+
+freeciv-gtk2_package() {
+ build_style=meta
+ short_desc="Freeciv GTK+3 client (transitional dummy package)"
+ depends="freeciv-gtk3>=${version}_${revision}"
+}
+freeciv-gtk3_package() {
+ short_desc="Free and Open Source empire-building strategy game - GTK+3 client"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/bin/*gtk3*"
+ vmove "usr/share/metainfo/*gtk3*"
+ vmove "usr/share/man/man6/*gtk3*"
+ vmove "usr/share/applications/*gtk3*"
+ }
+}
+freeciv-qt5_package() {
+ short_desc="Free and Open Source empire-building strategy game - Qt5 client"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/bin/*qt*"
+ vmove "usr/share/metainfo/*qt*"
+ vmove "usr/share/man/man6/*qt*"
+ vmove "usr/share/applications/*qt*"
+ }
+}
+freeciv-sdl_package() {
+ short_desc="Free and Open Source empire-building strategy game - SDL2 client"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/bin/*sdl*"
+ vmove "usr/share/metainfo/*sdl*"
+ vmove "usr/share/man/man6/*sdl*"
+ vmove "usr/share/applications/*sdl*"
+ }
+}
From 21832e33dbceb4b3b20bef2f6c36d268c698a2c3 Mon Sep 17 00:00:00 2001
From: iamacatnotaperson <45576816+iamacatnotaperson@users.noreply.github.com>
Date: Wed, 20 Apr 2022 00:48:16 -0500
Subject: [PATCH 2/3] Delete template
---
template | 65 --------------------------------------------------------
1 file changed, 65 deletions(-)
delete mode 100644 template
diff --git a/template b/template
deleted file mode 100644
index e6364e85a556..000000000000
--- a/template
+++ /dev/null
@@ -1,65 +0,0 @@
-# Template file for 'freeciv'
-pkgname=freeciv
-version=3.0.1
-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 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.xz"
-checksum=beda7adaebb3462797c8f090ec604c2974f15a1559fff2fb4cfff2607cb0180f
-
-_clients="gtk3,sdl2"
-subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl"
-if [ -z "$CROSS_BUILD" ]; then
- _clients+=",qt"
- makedepends+=" qt5-devel"
- subpackages+=" freeciv-qt5"
-fi
-configure_args+=" --enable-client=${_clients}"
-
-post_install() {
- rm ${DESTDIR}/usr/lib/*.a
-}
-
-freeciv-gtk2_package() {
- build_style=meta
- short_desc="Freeciv GTK+3 client (transitional dummy package)"
- depends="freeciv-gtk3>=${version}_${revision}"
-}
-freeciv-gtk3_package() {
- short_desc="Free and Open Source empire-building strategy game - GTK+3 client"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove "usr/bin/*gtk3*"
- vmove "usr/share/metainfo/*gtk3*"
- vmove "usr/share/man/man6/*gtk3*"
- vmove "usr/share/applications/*gtk3*"
- }
-}
-freeciv-qt5_package() {
- short_desc="Free and Open Source empire-building strategy game - Qt5 client"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove "usr/bin/*qt*"
- vmove "usr/share/metainfo/*qt*"
- vmove "usr/share/man/man6/*qt*"
- vmove "usr/share/applications/*qt*"
- }
-}
-freeciv-sdl_package() {
- short_desc="Free and Open Source empire-building strategy game - SDL2 client"
- depends="${sourcepkg}>=${version}_${revision}"
- pkg_install() {
- vmove "usr/bin/*sdl*"
- vmove "usr/share/metainfo/*sdl*"
- vmove "usr/share/man/man6/*sdl*"
- vmove "usr/share/applications/*sdl*"
- }
-}
From 9433b7b7941d7369bead4927c3269473cb618ee0 Mon Sep 17 00:00:00 2001
From: iamacatnotaperson <45576816+iamacatnotaperson@users.noreply.github.com>
Date: Wed, 20 Apr 2022 10:21:30 -0500
Subject: [PATCH 3/3] Update template
---
srcpkgs/opentyrian/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index 2f70a3b2a0a2..1dd101d9a190 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -1,20 +1,20 @@
# Template file for 'opentyrian'
pkgname=opentyrian
-version=2.1.20130907
-revision=3
+version=2.1.20220318
+revision=1
_dataver=21
create_wrksrc=yes
build_wrksrc=$pkgname-$version
build_style=gnu-makefile
hostmakedepends="pkg-config unzip"
-makedepends="SDL_net-devel"
+makedepends="SDL2_net-devel"
short_desc="OSS port of the DOS shoot-em-up Tyrian"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/opentyrian/opentyrian"
-distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
+distfiles="https://github.com/opentyrian/opentyrian/archive/refs/tags/v${version}.tar.gz
http://camanis.net/tyrian/tyrian${_dataver}.zip"
-checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f
+checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd
7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
replaces="opentyrian-data>=0"
next prev parent reply other threads:[~2022-04-20 15:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 5:23 [PR PATCH] " iamacatnotaperson
2022-04-20 5:26 ` abenson
2022-04-20 5:48 ` [PR PATCH] [Updated] " iamacatnotaperson
2022-04-20 15:08 ` iamacatnotaperson
2022-04-20 15:13 ` paper42
2022-04-20 15:57 ` iamacatnotaperson [this message]
2022-04-20 15:58 ` [PR PATCH] [Closed]: " iamacatnotaperson
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=20220420155709.6eia1J4rYYsea5mSTdnuwTiprVm5kpIe0O9byUX_21I@z \
--to=iamacatnotaperson@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).