summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2025-01-12 09:11:11 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2025-01-12 09:11:11 -0800
commit07918085d52925d72906b20ab7176517e58acaa6 (patch)
tree84be4c5face0c8c8003767ba6a7d3d1a8f91ba2c
parentRebuild against x265 4.0 (diff)
downloadmgba-07918085d52925d72906b20ab7176517e58acaa6.tar.xz
Updated to 0.10.4
-rw-r--r--3a3ebb5d.patch22
-rw-r--r--PKGBUILD18
2 files changed, 5 insertions, 35 deletions
diff --git a/3a3ebb5d.patch b/3a3ebb5d.patch
deleted file mode 100644
index d58572d..0000000
--- a/3a3ebb5d.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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; }
-
diff --git a/PKGBUILD b/PKGBUILD
index cbb3634..a1b7077 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
pkgbase=mgba
pkgname=('libmgba' 'mgba-sdl' 'mgba-qt')
-pkgver=0.10.3
-pkgrel=4.2
+pkgver=0.10.4
+pkgrel=1
arch=('x86_64')
url='http://mgba.io'
license=('custom:MPL2')
@@ -20,17 +20,9 @@ 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
- 3a3ebb5d.patch)
-sha256sums=('be2cda7de3da8819fdab0c659c5cd4c4b8ca89d9ecddeeeef522db6d31a64143'
- '3fb63923547c42165dfd8bd47925cae3c711fec87f767bb5a94361dd022c8bd2')
-b2sums=('2109c53455ece7beba0af30787cd75cad85db334be44e41b51f579f813393f8d83c5c9537832b190bb8b0ac1c28d78e92adb6af23191b17b463847df3360f656'
- 'ce266b073694ab7b390c5138721a9a90ce6751a956e49c5daf86c084b12b6d11f4df6a69661c963688924b6ce4c7d599c89fa45e79b753ea278d44f24e038b03')
-
-prepare() {
- cd mgba-$pkgver
- patch -p1 -i ../3a3ebb5d.patch # Fix build with GCC 14
-}
+source=($pkgbase-$pkgver.tar.gz::https://github.com/mgba-emu/mgba/archive/$pkgver.tar.gz)
+sha256sums=('f85eeb8f78f847f5217a87bd5e2d6c1214b461ffd4ec129cc656162ab707cb24')
+b2sums=('1f99fd1f79e1645f2de8c1fbd07bdc4996fbc12263fd14b3588e0dcccff910780be73ed92084e53ed873f5e55eef70a983afee2f3f0bd166c578a03bcf57ea0b')
build() {
# Workaround for gcc14