Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 0ad
Commits:
6cc07797 by Antonio Rojas at 2024-08-30T13:41:08+02:00
upgpkg: a26-16: boost 1.86 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + af348d84.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = 0ad
pkgdesc = Cross-platform, 3D and historically-based real-time strategy
game
pkgver = a26
- pkgrel = 15
+ pkgrel = 16
url = http://play0ad.com/
arch = x86_64
license = GPL-2.0-or-later
@@ -47,6 +47,7 @@ pkgbase = 0ad
source = https://github.com/0ad/0ad/commit/d2426312.patch
source = fix_gcc_14_ftbfs.patch
source = miniupnpc-2.2.8.patch
+ source = af348d84.patch
validpgpkeys = A035C8C19219BA821ECEA86B64E628F8D684696D
sha512sums =
aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c500bf4162651a5e1fcdb42bd5fb5b4f5c512c78372479fbd8565dd093f272
sha512sums =
2b0a1d936b4ef8376f9655797aece8ffdff75031ad7bfa840f330cac2aed189aecc80c163edc12ea772851d7a011f3fc1960470a73d9d4290cf3ab8ad6ed7e6a
@@ -58,5 +59,6 @@ pkgbase = 0ad
sha512sums =
5f32d47f01d845e07b2f919c9b04ac5e50dc9977fa97f981eba4a53677a29d797d0d76bc385ac047dd7c7d24af7d95cd8256d433bd43ce1a6606763c0ea736cb
sha512sums =
b991b27168b0bfb13fe27aea1dd1f2759b6f243dba62a169612ebc28d601a84d06d3f3a44f3af6dd79ccf8b71f9eacd3fcdb9cb5de9fce7684614afb4ad91851
sha512sums =
cb858c31d7748e99b3332f28dddb00ac264b7352f59a4e9eddca21b92d1cf4c5a8b47d2be29aa4c1960a73fe47ef9772a2e7abae45fe297ef55c2eee1cc498ed
+ sha512sums =
42351c34b6a871c9efd463db18b8dd3ea4e143657d9bafd3cce604e724556b63a7d7b670c8c512f7509fb474778108b4a51635a1e4965a7532f7af35773983ac
pkgname = 0ad
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=0ad
pkgver=a26
_pkgver=0.0.26-alpha
-pkgrel=15
+pkgrel=16
pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
arch=('x86_64')
url="http://play0ad.com/";
@@ -22,7 +22,8 @@
source=("https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz";
https://github.com/0ad/0ad/commit/093e1eb2.patch
https://github.com/0ad/0ad/commit/d2426312.patch
fix_gcc_14_ftbfs.patch
- miniupnpc-2.2.8.patch)
+ miniupnpc-2.2.8.patch
+ af348d84.patch)
validpgpkeys=('A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo
Salgado <[email protected]>
sha512sums=('aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c500bf4162651a5e1fcdb42bd5fb5b4f5c512c78372479fbd8565dd093f272'
'2b0a1d936b4ef8376f9655797aece8ffdff75031ad7bfa840f330cac2aed189aecc80c163edc12ea772851d7a011f3fc1960470a73d9d4290cf3ab8ad6ed7e6a'
@@ -33,7 +34,8 @@
sha512sums=('aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c
'a7fd1454385f56b7c8cb0fc6ac001761d4419df4aeec570ba846c7df4eb327d25b9ff1a7946cb334315109fa90ca2c1820583619f4e1ec5d53805afa08e10093'
'5f32d47f01d845e07b2f919c9b04ac5e50dc9977fa97f981eba4a53677a29d797d0d76bc385ac047dd7c7d24af7d95cd8256d433bd43ce1a6606763c0ea736cb'
'b991b27168b0bfb13fe27aea1dd1f2759b6f243dba62a169612ebc28d601a84d06d3f3a44f3af6dd79ccf8b71f9eacd3fcdb9cb5de9fce7684614afb4ad91851'
-
'cb858c31d7748e99b3332f28dddb00ac264b7352f59a4e9eddca21b92d1cf4c5a8b47d2be29aa4c1960a73fe47ef9772a2e7abae45fe297ef55c2eee1cc498ed')
+
'cb858c31d7748e99b3332f28dddb00ac264b7352f59a4e9eddca21b92d1cf4c5a8b47d2be29aa4c1960a73fe47ef9772a2e7abae45fe297ef55c2eee1cc498ed'
+
'42351c34b6a871c9efd463db18b8dd3ea4e143657d9bafd3cce604e724556b63a7d7b670c8c512f7509fb474778108b4a51635a1e4965a7532f7af35773983ac')
prepare() {
cd "$pkgname-$_pkgver"
@@ -46,6 +48,7 @@ prepare() {
patch -p1 -i ../d2426312.patch # Fix build with libxml2 2.12
patch -p1 -i ../fix_gcc_14_ftbfs.patch # Fix build with GCC 14
patch -p1 -i ../miniupnpc-2.2.8.patch # Fix build with miniupnpc 2.2.8
+ patch -p1 -i ../af348d84.patch # Fix build with boost 1.85
}
build() {
=====================================
af348d84.patch
=====================================
@@ -0,0 +1,57 @@
+From af348d84240e9a7cf8ea3c2c19d059278c952329 Mon Sep 17 00:00:00 2001
+From: Stan <Stan@3db68df2-c116-0410-a063-a993310a9797>
+Date: Fri, 2 Aug 2024 16:17:22 +0000
+Subject: [PATCH] Fix build with Boost 1.85
+
+Patch by: @Cayleb-Ordo
+Accepted by: @Stan
+Comments by: @sera
+
+Differential Revision: https://code.wildfiregames.com/D5267
+
+
+
+git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@28176
3db68df2-c116-0410-a063-a993310a9797
+---
+ .../data/mods/public/gui/credits/texts/programming.json | 1 +
+ source/graphics/TextureManager.cpp | 4 ++--
+ source/lib/file/file_system.cpp | 7 ++++++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/source/graphics/TextureManager.cpp
b/source/graphics/TextureManager.cpp
+index ec68b159894..9cfa615997e 100644
+--- a/source/graphics/TextureManager.cpp
++++ b/source/graphics/TextureManager.cpp
+@@ -806,7 +806,7 @@ class CTextureManagerImpl
+ files.push_back(f);
+ p = p / GetWstringFromWpath(*it);
+ }
+- return
m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files);
++ return
m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()),
files);
+ }
+
+ /**
+diff --git a/source/lib/file/file_system.cpp b/source/lib/file/file_system.cpp
+index 1db6dc65d30..2b1fdba0565 100644
+--- a/source/lib/file/file_system.cpp
++++ b/source/lib/file/file_system.cpp
+@@ -32,6 +32,7 @@
+ #include "lib/sysdep/filesystem.h"
+
+ #include <boost/filesystem.hpp>
++#include <boost/version.hpp>
+ #include <memory>
+
+ bool DirectoryExists(const OsPath& path)
+@@ -229,7 +230,11 @@ Status CopyFile(const OsPath& path, const OsPath&
newPath, bool override_if_exis
+ try
+ {
+ if(override_if_exists)
++#if BOOST_VERSION >=107400
++ fs::copy_file(fs::path(path.string()),
fs::path(newPath.string()),
boost::filesystem::copy_options::overwrite_existing);
++#else
+ fs::copy_file(fs::path(path.string()),
fs::path(newPath.string()),
boost::filesystem::copy_option::overwrite_if_exists);
++#endif
+ else
+ fs::copy_file(fs::path(path.string()),
fs::path(newPath.string()));
+ }
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/0ad/-/commit/6cc07797261f1f012752afcdbd164cada45b94cb
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/0ad/-/commit/6cc07797261f1f012752afcdbd164cada45b94cb
You're receiving this email because of your account on gitlab.archlinux.org.
