Date: Tuesday, April 4, 2023 @ 23:06:19
Author: grawlinson
Revision: 1435266
archrelease: copy trunk to community-x86_64
Added:
freeorion/repos/community-x86_64/PKGBUILD
(from rev 1435265, freeorion/trunk/PKGBUILD)
freeorion/repos/community-x86_64/fix-version-string.patch
(from rev 1435265, freeorion/trunk/fix-version-string.patch)
Deleted:
freeorion/repos/community-x86_64/PKGBUILD
freeorion/repos/community-x86_64/fix-version-string.patch
--------------------------+
PKGBUILD | 122 ++++++++++++++++++++++-----------------------
fix-version-string.patch | 51 +++++++++++-------
2 files changed, 91 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-04 23:05:25 UTC (rev 1435265)
+++ PKGBUILD 2023-04-04 23:06:19 UTC (rev 1435266)
@@ -1,61 +0,0 @@
-# Maintainer: George Rawlinson <[email protected]>
-# Contributor: Dimitris Kiziridis <ragouel at outlook dot com>
-# Contributor: Christian Krause ("wookietreiber")
<[email protected]>
-
-pkgname=freeorion
-pkgver=0.4.10.2
-pkgrel=6
-pkgdesc='A turn-based space empire and galactic conquest game'
-url='https://www.freeorion.org'
-arch=('x86_64')
-license=('GPL2')
-depends=(
- 'boost-libs'
- 'python'
- 'sdl2'
- 'libvorbis'
- 'glew'
- 'openal'
- 'hicolor-icon-theme'
- 'freetype2'
-)
-makedepends=(
- 'git'
- 'cmake'
- 'boost'
-)
-_commit='f663dad6379658b539bd28c95229218eb4333ef2'
-source=(
- "$pkgname::git+https://github.com/freeorion/freeorion.git#commit=$_commit";
- 'fix-version-string.patch'
-)
-sha512sums=('SKIP'
-
'e3287063a3128f5589d44ed780ba7e3cdfb4a60bcb0aa833f9a48e51405e3f06ba11eb89b9d59313e629deaf35f78704574bf7620607b96c161037b54a63a71f')
-b2sums=('SKIP'
-
'38828f5cfd0ad3cba854c3457599a851b5d0af72ec00f742f5d828fffc1ef1a6163c771f69ce42f4c39ba2cff3b82330e16fdb89b63570d0b7f71810a257eade')
-
-pkgver() {
- cd "$pkgname"
- git describe --tags | sed 's/^v//'
-}
-
-prepare() {
- patch \
- --directory "$pkgname" \
- --strip=1 \
- --input=../fix-version-string.patch
-}
-
-build() {
- cmake \
- -B build \
- -S "$pkgname" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
-
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: freeorion/repos/community-x86_64/PKGBUILD (from rev 1435265,
freeorion/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-04 23:06:19 UTC (rev 1435266)
@@ -0,0 +1,61 @@
+# Maintainer: George Rawlinson <[email protected]>
+# Contributor: Dimitris Kiziridis <ragouel at outlook dot com>
+# Contributor: Christian Krause ("wookietreiber")
<[email protected]>
+
+pkgname=freeorion
+pkgver=0.5
+pkgrel=1
+pkgdesc='A turn-based space empire and galactic conquest game'
+url='https://www.freeorion.org'
+arch=('x86_64')
+license=('GPL2')
+depends=(
+ 'boost-libs'
+ 'python'
+ 'sdl2'
+ 'libvorbis'
+ 'glew'
+ 'openal'
+ 'hicolor-icon-theme'
+ 'freetype2'
+)
+makedepends=(
+ 'git'
+ 'cmake'
+ 'boost'
+)
+_commit='50eff8b4177d9aa4f500f7e8d58df7b5aaf24849'
+source=(
+ "$pkgname::git+https://github.com/freeorion/freeorion.git#commit=$_commit";
+ 'fix-version-string.patch'
+)
+sha512sums=('SKIP'
+
'ab939c24e73f2a2907875d732dbd481914658e2ebf80d682a39cb5904c78591e1ce9b95dff50d1799c177017f525a90cfb2f0b7c77824954ee3b4197ca2381c4')
+b2sums=('SKIP'
+
'c87e0eefd36041a72340a7d31eb91c02e595fa875e032854d80cd6db079f8fcd208a655dfb2bc92376d654f862eafa1e9367045e81fee469398ac41356d4fedf')
+
+pkgver() {
+ cd "$pkgname"
+ git describe --tags | sed 's/^v//'
+}
+
+prepare() {
+ patch \
+ --directory "$pkgname" \
+ --strip=1 \
+ --input=../fix-version-string.patch
+}
+
+build() {
+ cmake \
+ -B build \
+ -S "$pkgname" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Deleted: fix-version-string.patch
===================================================================
--- fix-version-string.patch 2023-04-04 23:05:25 UTC (rev 1435265)
+++ fix-version-string.patch 2023-04-04 23:06:19 UTC (rev 1435266)
@@ -1,21 +0,0 @@
-Prevent 'makepkg' showing up in version string.
-
-This is because the branch name is acquired during creation of
-the version string. The branch variable is normally empty, as
-shown by the diff below.
-
---- a/cmake/make_versioncpp.py
-+++ b/cmake/make_versioncpp.py
-@@ -133,11 +133,6 @@ branch = ""
- build_no = INVALID_BUILD_NO
-
- try:
-- branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
universal_newlines=True).strip()
-- if (branch == "master") 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())
- build_no =
".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit])
-
Copied: freeorion/repos/community-x86_64/fix-version-string.patch (from rev
1435265, freeorion/trunk/fix-version-string.patch)
===================================================================
--- fix-version-string.patch (rev 0)
+++ fix-version-string.patch 2023-04-04 23:06:19 UTC (rev 1435266)
@@ -0,0 +1,30 @@
+Prevent 'makepkg' showing up in version string.
+
+This is because the branch name is acquired during creation of
+the version string. The branch variable is normally empty, as
+shown by the diff below.
+
+--- a/cmake/make_versioncpp.py
++++ b/cmake/make_versioncpp.py
+@@ -137,11 +137,7 @@ build_no = INVALID_BUILD_NO
+ version_file_name = version
+
+ try:
+- 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 += " "
++ 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"
