From: Emru1 <Emru1@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: OpenXcomEx
Date: Fri, 22 Oct 2021 21:56:23 +0200 [thread overview]
Message-ID: <20211022195623.5HgRb_TFs2WWTfTF8HJyFeQuWVacKrpfMhjP1FABag8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31909@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]
There is an updated pull request by Emru1 against master on the void-packages repository
https://github.com/Emru1/void-packages OpenXcomEx
https://github.com/void-linux/void-packages/pull/31909
New package: OpenXcomEx
<!-- Mark items with [x] where applicable -->
#### General
- [x] 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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/31909.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-OpenXcomEx-31909.patch --]
[-- Type: text/x-diff, Size: 3121 bytes --]
From 6fa683d47e949bdc5301fde10687542e4944e279 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Thu, 2 Sep 2021 13:02:02 +0200
Subject: [PATCH 1/2] New package: OpenXcomEx-7.0.14
---
srcpkgs/OpenXcomEx/patches/man_dest_dir.patch | 5 +++++
srcpkgs/OpenXcomEx/template | 22 +++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 srcpkgs/OpenXcomEx/patches/man_dest_dir.patch
create mode 100644 srcpkgs/OpenXcomEx/template
diff --git a/srcpkgs/OpenXcomEx/patches/man_dest_dir.patch b/srcpkgs/OpenXcomEx/patches/man_dest_dir.patch
new file mode 100644
index 000000000000..decacaa004ea
--- /dev/null
+++ b/srcpkgs/OpenXcomEx/patches/man_dest_dir.patch
@@ -0,0 +1,5 @@
+--- a/docs/CMakeLists.txt 2021-07-10 23:45:05.420320987 +0200
++++ b/docs/CMakeLists.txt2 2021-07-11 00:18:27.852316574 +0200
+@@ -41 +41 @@ if ( UNIX AND NOT APPLE )
+- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6)
++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
diff --git a/srcpkgs/OpenXcomEx/template b/srcpkgs/OpenXcomEx/template
new file mode 100644
index 000000000000..52489cfe70c2
--- /dev/null
+++ b/srcpkgs/OpenXcomEx/template
@@ -0,0 +1,22 @@
+# Template file for 'OpenXcomEx'
+pkgname=OpenXcomEx
+version=7.0.14
+revision=1
+build_style=cmake
+conflicts="OpenXcom"
+hostmakedepends="automake xmlto git cmake pkg-config ninja"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DDEV_BUILD=OFF -DBUILD_PACKAGE=OFF"
+makedepends="SDL_gfx-devel SDL_image-devel SDL_mixer-devel zlib-devel
+ glu-devel boost-devel yaml-cpp-devel"
+short_desc="Reimplementation of the original X-Com game with extended functionality"
+maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
+license="GPL-3.0-or-later"
+homepage="https://openxcom.org/forum/index.php/topic,6586.0.html"
+giturl="git://github.com/meridianoxc/openxcom"
+gitcommit="f5efc8736ff404e59f51d4b2df24cd0fa721a1b3"
+
+do_fetch() {
+ git clone ${giturl} ${wrksrc}
+ cd ${wrksrc}
+ git checkout ${gitcommit}
+}
From 2003bfac214327a2d1a6aa1d70a0f0b1eccfbe22 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Fri, 22 Oct 2021 21:56:06 +0200
Subject: [PATCH 2/2] OpenXcomEx: update to 7.1.3
---
srcpkgs/OpenXcomEx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/OpenXcomEx/template b/srcpkgs/OpenXcomEx/template
index 52489cfe70c2..5412e9bc283f 100644
--- a/srcpkgs/OpenXcomEx/template
+++ b/srcpkgs/OpenXcomEx/template
@@ -1,6 +1,6 @@
# Template file for 'OpenXcomEx'
pkgname=OpenXcomEx
-version=7.0.14
+version=7.1.3
revision=1
build_style=cmake
conflicts="OpenXcom"
@@ -13,7 +13,7 @@ maintainer="Emil Tomczyk <emil.tomczyk@skni.umcs.pl>"
license="GPL-3.0-or-later"
homepage="https://openxcom.org/forum/index.php/topic,6586.0.html"
giturl="git://github.com/meridianoxc/openxcom"
-gitcommit="f5efc8736ff404e59f51d4b2df24cd0fa721a1b3"
+gitcommit="aa7368954ff036852b5df4369c949430992fae4e5"
do_fetch() {
git clone ${giturl} ${wrksrc}
next prev parent reply other threads:[~2021-10-22 19:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-11 15:08 [PR PATCH] Added OpenXcomEx Emru1
2021-07-17 13:14 ` [PR PATCH] [Updated] New package: OpenXcomEx Emru1
2021-08-11 14:19 ` Emru1
2021-09-02 11:02 ` Emru1
2021-09-02 20:25 ` Chocimier
2021-10-22 19:56 ` Emru1 [this message]
2021-10-22 20:11 ` [PR PATCH] [Updated] " Emru1
2021-10-22 20:33 ` Emru1
2022-05-25 2:15 ` github-actions
2022-06-09 2:11 ` [PR PATCH] [Closed]: " github-actions
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=20211022195623.5HgRb_TFs2WWTfTF8HJyFeQuWVacKrpfMhjP1FABag8@z \
--to=emru1@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).