diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2024-07-04 02:49:14 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2024-07-04 02:49:14 -0700 |
| commit | 6b9c82e3924bc07d2e6bf684815eaf4f8bcb6b9a (patch) | |
| tree | 606e8005b3da5ec9be0db6e1c849667d203a58b6 | |
| parent | Updated to 0.10.3 (diff) | |
| download | mgba-6b9c82e3924bc07d2e6bf684815eaf4f8bcb6b9a.tar.xz | |
Rebuild for gcc14.
Disable discord support.
Clean up some warnings.
| -rw-r--r-- | 3a3ebb5d.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 23 |
2 files changed, 41 insertions, 4 deletions
diff --git a/3a3ebb5d.patch b/3a3ebb5d.patch new file mode 100644 index 0000000..d58572d --- /dev/null +++ b/3a3ebb5d.patch @@ -0,0 +1,22 @@ +From 3a3ebb5dc7a1dc6f8f893093d213a637acfc4024 Mon Sep 17 00:00:00 2001 +From: Vicki Pfau <vi@endrift.com> +Date: Sat, 25 May 2024 01:33:26 -0700 +Subject: [PATCH] Third-Party: Cherry-pick rapidjson buildfix + +--- + src/third-party/discord-rpc/include/rapidjson/document.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/third-party/discord-rpc/include/rapidjson/document.h b/src/third-party/discord-rpc/include/rapidjson/document.h +index e3e20dfbdc9..b0f1f70beba 100644 +--- a/src/third-party/discord-rpc/include/rapidjson/document.h ++++ b/src/third-party/discord-rpc/include/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } + @@ -7,11 +7,12 @@ # Arch version lacks additional optimization and hardening flags # Arch version is broken with lua 5.4 # Arch version does not list lua as a depends +# Arch version does not disable discord pkgbase=mgba pkgname=('libmgba' 'mgba-sdl' 'mgba-qt') pkgver=0.10.3 -pkgrel=1 +pkgrel=2 arch=('x86_64') url='http://mgba.io' license=('custom:MPL2') @@ -19,11 +20,22 @@ options=('lto') depends=('lua53') makedepends=('cmake' 'qt5-multimedia' 'sdl2' 'zlib' 'libpng' 'libzip' 'libedit' 'ffmpeg' 'desktop-file-utils' 'qt5-tools') -source=($pkgbase-$pkgver.tar.gz::https://github.com/mgba-emu/mgba/archive/$pkgver.tar.gz) -sha256sums=('be2cda7de3da8819fdab0c659c5cd4c4b8ca89d9ecddeeeef522db6d31a64143') -b2sums=('2109c53455ece7beba0af30787cd75cad85db334be44e41b51f579f813393f8d83c5c9537832b190bb8b0ac1c28d78e92adb6af23191b17b463847df3360f656') +source=($pkgbase-$pkgver.tar.gz::https://github.com/mgba-emu/mgba/archive/$pkgver.tar.gz + 3a3ebb5d.patch) +sha256sums=('be2cda7de3da8819fdab0c659c5cd4c4b8ca89d9ecddeeeef522db6d31a64143' + '3fb63923547c42165dfd8bd47925cae3c711fec87f767bb5a94361dd022c8bd2') +b2sums=('2109c53455ece7beba0af30787cd75cad85db334be44e41b51f579f813393f8d83c5c9537832b190bb8b0ac1c28d78e92adb6af23191b17b463847df3360f656' + 'ce266b073694ab7b390c5138721a9a90ce6751a956e49c5daf86c084b12b6d11f4df6a69661c963688924b6ce4c7d599c89fa45e79b753ea278d44f24e038b03') + +prepare() { + cd mgba-$pkgver + patch -p1 -i ../3a3ebb5d.patch # Fix build with GCC 14 +} build() { +# Workaround for gcc14 + CFLAGS+=" -Wno-incompatible-pointer-types" + CXXFLAGS+=" -Wno-incompatible-pointer-types" # -fPIE and -pie break compilation export CFLAGS="$CFLAGS -O3 -fPIC" @@ -33,6 +45,9 @@ build() { -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ + -DUSE_MINIZIP=OFF \ + -DUSE_DISCORD_RPC=OFF \ + -DUSE_EPOXY=OFF \ -Wno-dev cmake --build build } |