From 6066fc060bcf536843fd2f6359d823d290ddce96 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Tue, 26 Jan 2021 20:04:22 -0500 Subject: [odamex]: upgrade to v0.8.3 --- pcr/odamex/PKGBUILD | 14 ++++++++------ pcr/odamex/fix-cxxflags.diff | 12 ++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 pcr/odamex/fix-cxxflags.diff diff --git a/pcr/odamex/PKGBUILD b/pcr/odamex/PKGBUILD index da26762d0..fa4a9e49e 100644 --- a/pcr/odamex/PKGBUILD +++ b/pcr/odamex/PKGBUILD @@ -5,23 +5,26 @@ # Contributor (AUR): Curtis Smith pkgname=odamex -pkgver=0.8.1 +pkgver=0.8.3 pkgrel=1 pkgdesc='A free client/server multiplayer engine for the classic FPS Doom.' arch=('armv7h' 'i686' 'x86_64') url='http://odamex.net/' license=('GPL') -depends=('sdl_mixer>=1.2.6' 'wxgtk' 'miniupnpc' 'portmidi') +depends=('sdl2_mixer' 'portmidi' 'wxgtk2' 'miniupnpc') makedepends=('cmake') optdepends=('timidity++: Required for music') source=("http://downloads.sourceforge.net/odamex/odamex-src-${pkgver}.tar.gz" - 0001-Fix-WAD-path.patch) -sha256sums=('31704a45eae3a833dcc0c4c840444cda0ba88a2fc9b6115b612e31a6dcc48bfb' - 'c4ce4072515c7dbfe65d1829a317d21b5f1091e04997761cdfee345a60141638') + 0001-Fix-WAD-path.patch + fix-cxxflags.diff) +sha256sums=('26e111bef9af14dd538e6424b6663b24e97eab60fda8c76e2398d575d03b0839' + 'c4ce4072515c7dbfe65d1829a317d21b5f1091e04997761cdfee345a60141638' + '0541328408d71dfcd7cdf866497f9cc2c7f10780986d2fea5743f5df584d923a') prepare() { cd $pkgname-src-$pkgver patch --forward --strip=1 --input="${srcdir}/0001-Fix-WAD-path.patch" + patch --forward --strip=1 --input="${srcdir}/fix-cxxflags.diff" } build() { @@ -38,4 +41,3 @@ package() { # Use system headers. rm -r "$pkgdir/usr/include/miniupnpc/" } - diff --git a/pcr/odamex/fix-cxxflags.diff b/pcr/odamex/fix-cxxflags.diff new file mode 100644 index 000000000..16630c777 --- /dev/null +++ b/pcr/odamex/fix-cxxflags.diff @@ -0,0 +1,12 @@ +diff -aur odamex-src-0.8.3.org/CMakeLists.txt odamex-src-0.8.3/CMakeLists.txt +--- odamex-src-0.8.3.org/CMakeLists.txt 2020-05-10 05:29:36.000000000 +0200 ++++ odamex-src-0.8.3/CMakeLists.txt 2020-06-13 22:56:47.027614254 +0200 +@@ -28,7 +28,7 @@ + set(PROJECT_COPYRIGHT "2006-2020") + + # Use C++ 98/03 for all targets +-set(CMAKE_CXX_STANDARD 98) ++set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + + # identify the target CPU -- cgit v1.2.3