Date: Tuesday, April 4, 2023 @ 23:05:25
Author: grawlinson
Revision: 1435265
upgpkg: freeorion 0.5-1; new upstream release
Modified:
freeorion/trunk/PKGBUILD
freeorion/trunk/fix-version-string.patch
--------------------------+
PKGBUILD | 10 +++++-----
fix-version-string.patch | 25 +++++++++++++++++--------
2 files changed, 22 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-04 22:40:33 UTC (rev 1435264)
+++ PKGBUILD 2023-04-04 23:05:25 UTC (rev 1435265)
@@ -3,8 +3,8 @@
# Contributor: Christian Krause ("wookietreiber")
<[email protected]>
pkgname=freeorion
-pkgver=0.4.10.2
-pkgrel=6
+pkgver=0.5
+pkgrel=1
pkgdesc='A turn-based space empire and galactic conquest game'
url='https://www.freeorion.org'
arch=('x86_64')
@@ -24,15 +24,15 @@
'cmake'
'boost'
)
-_commit='f663dad6379658b539bd28c95229218eb4333ef2'
+_commit='50eff8b4177d9aa4f500f7e8d58df7b5aaf24849'
source=(
"$pkgname::git+https://github.com/freeorion/freeorion.git#commit=$_commit";
'fix-version-string.patch'
)
sha512sums=('SKIP'
-
'e3287063a3128f5589d44ed780ba7e3cdfb4a60bcb0aa833f9a48e51405e3f06ba11eb89b9d59313e629deaf35f78704574bf7620607b96c161037b54a63a71f')
+
'ab939c24e73f2a2907875d732dbd481914658e2ebf80d682a39cb5904c78591e1ce9b95dff50d1799c177017f525a90cfb2f0b7c77824954ee3b4197ca2381c4')
b2sums=('SKIP'
-
'38828f5cfd0ad3cba854c3457599a851b5d0af72ec00f742f5d828fffc1ef1a6163c771f69ce42f4c39ba2cff3b82330e16fdb89b63570d0b7f71810a257eade')
+
'c87e0eefd36041a72340a7d31eb91c02e595fa875e032854d80cd6db079f8fcd208a655dfb2bc92376d654f862eafa1e9367045e81fee469398ac41356d4fedf')
pkgver() {
cd "$pkgname"
Modified: fix-version-string.patch
===================================================================
--- fix-version-string.patch 2023-04-04 22:40:33 UTC (rev 1435264)
+++ fix-version-string.patch 2023-04-04 23:05:25 UTC (rev 1435265)
@@ -6,16 +6,25 @@
--- a/cmake/make_versioncpp.py
+++ b/cmake/make_versioncpp.py
-@@ -133,11 +133,6 @@ branch = ""
- build_no = INVALID_BUILD_NO
-
+@@ -137,11 +137,7 @@ build_no = INVALID_BUILD_NO
+ version_file_name = version
+
try:
-- branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
universal_newlines=True).strip()
-- if (branch == "master") or (branch[:7] == "release"):
+- branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"],
text=True).strip()
+- if (branch == "master") or (branch == "weekly-test-builds") or
(branch[:7] == "release"):
- branch = ""
- else:
- branch += " "
- commit = check_output(["git", "show", "--no-show-signature", "-s",
"--format=%h", "--abbrev=7", "HEAD"], universal_newlines=True).strip()
- timestamp = float(check_output(["git", "show", "--no-show-signature",
"-s", "--format=%ct", "HEAD"], universal_newlines=True).strip())
++ branch = "release"
+ commit = check_output(
+ ["git", "show", "--no-show-signature", "-s", "--format=%h",
"--abbrev=7", "HEAD"], text=True
+ ).strip()
+@@ -149,7 +145,7 @@ try:
+ check_output(["git", "show", "--no-show-signature", "-s",
"--format=%ct", "HEAD"], text=True).strip()
+ )
build_no =
".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
-
+- if branch[:7] == "release":
++ if branch == "release":
+ version_file_name = "v" + version
+ else:
+ version_file_name = build_no + "_Test"
