From 01667e4aeca54f93a5551c2b49a2d10bca3b0869 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 17 May 2020 13:30:39 -0700 Subject: Add hotfix --- 0001-fix-Add-missing-string-include.patch | 10 ++++++++++ PKGBUILD | 18 +++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 0001-fix-Add-missing-string-include.patch diff --git a/0001-fix-Add-missing-string-include.patch b/0001-fix-Add-missing-string-include.patch new file mode 100644 index 0000000..eeb12a5 --- /dev/null +++ b/0001-fix-Add-missing-string-include.patch @@ -0,0 +1,10 @@ +--- a/source/Panel.h ++++ b/source/Panel.h +@@ -17,6 +17,7 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details. + + #include + #include ++#include + + #include + diff --git a/PKGBUILD b/PKGBUILD index f37abc6..fbade93 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ pkgname=endless-sky pkgver=0.9.12 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'aarch64') url="https://endless-sky.github.io/" depends=(openal libpng glew hicolor-icon-theme libjpeg-turbo sdl2 libmad) @@ -19,12 +19,20 @@ optdepends=('endless-sky-high-dpi: high resolution graphics assets' license=('GPL3' 'CCPL' 'custom:public domain') pkgdesc="A space exploration and combat game similar to Escape Velocity" source=("$pkgname-$pkgver.tar.gz::https://github.com/endless-sky/endless-sky/archive/v${pkgver}.tar.gz" - ${pkgname}.desktop) + ${pkgname}.desktop + 0001-fix-Add-missing-string-include.patch) b2sums=('8df20650524cb179e92306084668a8e341f88ca5adb1c6b6e2e48d450556a36556efcbff256dd6c0f47b4435739cfdbc7af357285af4ab15d5355e8f0ecba923' - '8cb5f3300c003ae2c2316ac0ad342c7baa90851013e94811ec076cb6274d998b2aa9e0139b5bcb757b645c15382b4d2cb3f267eae589006902468e04a0534d01') + '8cb5f3300c003ae2c2316ac0ad342c7baa90851013e94811ec076cb6274d998b2aa9e0139b5bcb757b645c15382b4d2cb3f267eae589006902468e04a0534d01' + '87bce26dee8a4626ebdd2a8cc71ec87ca48c55295853db7b824a3429a96552a0fa00c2b8dcd009ece889937e5bfeba5ce983f1a399fb1437dfa0d5af213adb08') + +# remove this in the next version, as the patch is backported from upstream +prepare() { + cd "$pkgname-$pkgver" + patch -sp1 < "$srcdir/0001-fix-Add-missing-string-include.patch" +} build() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" export CFLAGS="$CFLAGS -O3 -flto=4 -fPIE" export CXXFLAGS="$CXXFLAGS -O3 -flto=4 -fPIE" export LDFLAGS="$LDFLAGS,-pie" @@ -33,7 +41,7 @@ build() { package() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" # Install executable install -Dm755 endless-sky "${pkgdir}/usr/bin/endless-sky" -- cgit v1.2.1