From: 4ricci <4ricci@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] flightgear: update to 2020.3.11
Date: Mon, 27 Sep 2021 09:48:50 +0200 [thread overview]
Message-ID: <20210927074850.D1MesiyJVlTC9Latim_L0sLEIT1tYqYTJnir2TJPk10@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33117@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1641 bytes --]
There is an updated pull request by 4ricci against master on the void-packages repository
https://github.com/4ricci/void-packages flightgear
https://github.com/void-linux/void-packages/pull/33117
flightgear: update to 2020.3.11
- simgear: update to 2020.3.11.
- flightgear: update to 2020.3.11.
<!-- 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/33117.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-flightgear-33117.patch --]
[-- Type: text/x-diff, Size: 4780 bytes --]
From f2977242689ea05059fafcc495a4872af55af60e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 26 Jul 2021 14:40:53 +0200
Subject: [PATCH 1/2] simgear: update to 2020.3.11.
---
srcpkgs/simgear/patches/musl-strerror_r.patch | 4 ++--
srcpkgs/simgear/template | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/simgear/patches/musl-strerror_r.patch b/srcpkgs/simgear/patches/musl-strerror_r.patch
index 9c2208ac1004..b88fa29600fe 100644
--- a/srcpkgs/simgear/patches/musl-strerror_r.patch
+++ b/srcpkgs/simgear/patches/musl-strerror_r.patch
@@ -1,6 +1,6 @@
--- a/simgear/misc/strutils.cxx 2020-06-26 00:07:33.000000000 +0200
+++ b/simgear/misc/strutils.cxx 2020-08-22 19:50:07.043076612 +0200
-@@ -1137,7 +1137,13 @@
+@@ -1169,7 +1175,13 @@
// Always makes the string in 'buf' null-terminated
retcode = strerror_s(buf, sizeof(buf), errnum);
#elif defined(_GNU_SOURCE)
@@ -14,7 +14,7 @@
#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__) || defined(__OpenBSD__)
int retcode;
// POSIX.1-2001 and POSIX.1-2008
-@@ -1146,7 +1152,7 @@
+@@ -1178,7 +1184,7 @@
#error "Could not find a thread-safe alternative to strerror()."
#endif
diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template
index 4a15e27896ef..7f510909dbac 100644
--- a/srcpkgs/simgear/template
+++ b/srcpkgs/simgear/template
@@ -1,19 +1,20 @@
# Template file for 'simgear'
pkgname=simgear
-version=2020.1.3
+version=2020.3.11
revision=1
# XXX: always keep in sync with flightgear version!
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -Wdev"
hostmakedepends="pkg-config"
makedepends="boost-devel freetype-devel libjpeg-turbo-devel giflib-devel
- libcurl-devel libfreeglut-devel libopenal-devel osg-devel plib-devel"
+ libcurl-devel libfreeglut-devel libopenal-devel osg-devel plib-devel
+ liblzma-devel"
short_desc="Simulation engine for FlightGear - static libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.flightgear.org/"
distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=66da2c4f68058f6854206f2dd9c03c9223851ade24a50216e88b4e50598c13d1
+checksum=bb8dfcbc2a3b0143d1ffcf01d1a961e566ef21dd33d9cc768d6d9aa5871d4f3c
# Suppress warnings regarding auto_ptr
CXXFLAGS="-Wno-deprecated-declarations"
From e26ea526ef2632a5cf0e355fd98e58183462428e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 26 Jul 2021 14:41:02 +0200
Subject: [PATCH 2/2] flightgear: update to 2020.3.11.
---
srcpkgs/flightgear/patches/musl-include-fcntl.patch | 10 ++++++++++
srcpkgs/flightgear/template | 12 ++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/flightgear/patches/musl-include-fcntl.patch
diff --git a/srcpkgs/flightgear/patches/musl-include-fcntl.patch b/srcpkgs/flightgear/patches/musl-include-fcntl.patch
new file mode 100644
index 000000000000..1f3e0f8234f5
--- /dev/null
+++ b/srcpkgs/flightgear/patches/musl-include-fcntl.patch
@@ -0,0 +1,10 @@
+--- a/src/Navaids/NavDataCache.cxx
++++ b/src/Navaids/NavDataCache.cxx
+@@ -31,6 +31,7 @@
+ #include <stdint.h> // for int64_t
+ #include <sstream> // for std::ostringstream
+ #include <mutex>
++#include <fcntl.h>
+
+ #ifdef SYSTEM_SQLITE
+ // the standard sqlite3.h doesn't give a way to set SQLITE_UINT64_TYPE,
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index e5528205b9e0..16f2dd21a021 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -1,7 +1,7 @@
# Template file for 'flightgear'
pkgname=flightgear
-version=2020.1.3
-revision=2
+version=2020.3.11
+revision=1
build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
@@ -17,11 +17,11 @@ license="GPL-2.0-or-later"
homepage="http://www.flightgear.org/"
distfiles="
$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2
- $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2"
-checksum="
- 1f07e8ef2c558dae3b9738e313b57e711d38e569f85d49fc2c5ae647e3949a17
- 2196f4ffcdeaae3a8b0a2b6ebf62a456bfd0198abb6c0619f763204d89804a03"
+ $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.txz"
+checksum="fe2706c7707ea73abc5114773de45f29861ab0f8f535656af0428ed049ca4a97
+ 123f151b2c0f4220f0dd55e875ca57a4ec38a94f71f8c04c58caeac077e2b558"
python_version=2
+make_check=no
nocross=https://build.voidlinux.org/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio
next prev parent reply other threads:[~2021-09-27 7:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-25 13:31 [PR PATCH] " 4ricci
2021-09-26 16:49 ` [PR PATCH] [Updated] " 4ricci
2021-09-26 19:57 ` 4ricci
2021-09-27 7:48 ` 4ricci [this message]
2021-10-01 8:43 ` [PR PATCH] [Merged]: " ericonr
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=20210927074850.D1MesiyJVlTC9Latim_L0sLEIT1tYqYTJnir2TJPk10@z \
--to=4ricci@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).