summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2021-07-10 12:40:26 +0000
committerDaniel Bermond2021-07-10 12:40:26 +0000
commit8eb4949e6926143578f9ca807a7de41de9b95a01 (patch)
tree662db03673ce80ab26dcfad5a4cf1731dbffca50
parentea2c16cdc6d559af140c58d83f5e4b9153b912e0 (diff)
downloadaur-8eb4949e6926143578f9ca807a7de41de9b95a01.tar.gz
Update to version 20210705
-rw-r--r--.SRCINFO8
-rw-r--r--030-m64p-fix-paths.patch6
-rw-r--r--040-m64p-add-pie.patch2
-rw-r--r--PKGBUILD6
4 files changed, 11 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2759970e538d..20269c2b5ca7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = m64p
pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI
- pkgver = 20210623
+ pkgver = 20210705
pkgrel = 1
url = https://m64p.github.io/
arch = x86_64
@@ -27,7 +27,7 @@ pkgbase = m64p
provides = mupen64plus-gui
conflicts = mupen64plus-gui
conflicts = mupen64plus
- source = git+https://github.com/loganmc10/m64p.git#tag=v2021.6.23
+ source = git+https://github.com/loganmc10/m64p.git#tag=v2021.7.5
source = 010-m64p-remove-build-jobs-limitation.patch
source = 020-m64p-change-optimizations.patch
source = 030-m64p-fix-paths.patch
@@ -36,8 +36,8 @@ pkgbase = m64p
sha256sums = SKIP
sha256sums = b8882d2b3cce965bd03b100fc53419ff43d8934c364136bbe63473fca0692fec
sha256sums = bd2964654f5c346af76a5408adc76d34bf490435c4400cfa1d2340f0ad598dcd
- sha256sums = 4271db8d4a4c8a39373897562cf0429f20cd95d952ab8385c1b376451ea55096
- sha256sums = 13879a08f76881c75597883c54917dbcd782ed0486050856043abaeff8ec86db
+ sha256sums = 53824848c8ec88e8c6dbc86682b6910ec7f80950279fdfa6809f08721b3fb592
+ sha256sums = 5c604da87c9deb3582b43efa724589080a7070a108ab0c0d00e115cb35eb4b13
sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
pkgname = m64p
diff --git a/030-m64p-fix-paths.patch b/030-m64p-fix-paths.patch
index e960273c4677..1a4a392ee8c9 100644
--- a/030-m64p-fix-paths.patch
+++ b/030-m64p-fix-paths.patch
@@ -21,9 +21,9 @@
- settings->setValue("configDirPath", "$CONFIG_PATH$");
+ settings->setValue("configDirPath", QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/mupen64plus");
- updatePlugins();
-
-@@ -428,7 +429,7 @@ void MainWindow::updateApp()
+ #ifdef CORE_LIBRARY_PATH
+ settings->setValue("coreLibPath", CORE_LIBRARY_PATH);
+@@ -438,7 +439,7 @@ void MainWindow::updateApp()
void MainWindow::setupDiscord()
{
diff --git a/040-m64p-add-pie.patch b/040-m64p-add-pie.patch
index 0e4f7980a476..95fd43babc17 100644
--- a/040-m64p-add-pie.patch
+++ b/040-m64p-add-pie.patch
@@ -1,6 +1,6 @@
--- a/mupen64plus-gui/mupen64plus-gui.pro
+++ b/mupen64plus-gui/mupen64plus-gui.pro
-@@ -97,8 +97,6 @@ FORMS += mainwindow.ui
+@@ -99,8 +99,6 @@ FORMS += mainwindow.ui
QMAKE_INCDIR += api interface
diff --git a/PKGBUILD b/PKGBUILD
index 95e8e929c476..8dc6c4df4c01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=m64p
-pkgver=20210623
+pkgver=20210705
pkgrel=1
pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI'
arch=('x86_64')
@@ -24,8 +24,8 @@ source=("git+https://github.com/loganmc10/m64p.git#tag=${_tag}"
sha256sums=('SKIP'
'b8882d2b3cce965bd03b100fc53419ff43d8934c364136bbe63473fca0692fec'
'bd2964654f5c346af76a5408adc76d34bf490435c4400cfa1d2340f0ad598dcd'
- '4271db8d4a4c8a39373897562cf0429f20cd95d952ab8385c1b376451ea55096'
- '13879a08f76881c75597883c54917dbcd782ed0486050856043abaeff8ec86db'
+ '53824848c8ec88e8c6dbc86682b6910ec7f80950279fdfa6809f08721b3fb592'
+ '5c604da87c9deb3582b43efa724589080a7070a108ab0c0d00e115cb35eb4b13'
'8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
prepare() {