Match latest upstream changes

3 files changed, 8 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0343f9777f6..80c4b35e0ed0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = m64p-git
 	pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI (git version)
-	pkgver = 20210809.r0.g4229fad
+	pkgver = 20211122.r4.gdb0e652
 	pkgrel = 1
 	url = https://m64p.github.io/
 	arch = x86_64
@@ -41,7 +41,7 @@ pkgbase = m64p-git
 	sha256sums = SKIP
 	sha256sums = b8882d2b3cce965bd03b100fc53419ff43d8934c364136bbe63473fca0692fec
 	sha256sums = bd2964654f5c346af76a5408adc76d34bf490435c4400cfa1d2340f0ad598dcd
-	sha256sums = 53824848c8ec88e8c6dbc86682b6910ec7f80950279fdfa6809f08721b3fb592
+	sha256sums = afb952edd1f1766ae23433e9101b6aed5283c0ebe7f1723749ae464e65490bc4
 	sha256sums = 5c604da87c9deb3582b43efa724589080a7070a108ab0c0d00e115cb35eb4b13
 	sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
 
diff --git a/030-m64p-fix-paths.patch b/030-m64p-fix-paths.patch
index 1a4a392ee8c9..b6ce57c65d24 100644
--- a/030-m64p-fix-paths.patch
+++ b/030-m64p-fix-paths.patch
@@ -8,22 +8,16 @@
  #include "settingsdialog.h"
  #include "plugindialog.h"
  #include "mainwindow.h"
-@@ -371,11 +372,11 @@ MainWindow::MainWindow(QWidget *parent) :
+@@ -370,7 +371,7 @@ MainWindow::MainWindow(QWidget *parent) :
      updatePIF(ui);
  
-     if (!settings->contains("coreLibPath"))
--        settings->setValue("coreLibPath", "$APP_PATH$");
-+        settings->setValue("coreLibPath", "/usr/lib");
-     if (!settings->contains("pluginDirPath"))
--        settings->setValue("pluginDirPath", "$APP_PATH$");
-+        settings->setValue("pluginDirPath", "/usr/lib/mupen64plus");
      if (!settings->contains("configDirPath"))
 -        settings->setValue("configDirPath", "$CONFIG_PATH$");
 +        settings->setValue("configDirPath", QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/mupen64plus");
  
- #ifdef CORE_LIBRARY_PATH
-     settings->setValue("coreLibPath", CORE_LIBRARY_PATH);
-@@ -438,7 +439,7 @@ void MainWindow::updateApp()
+ #ifdef CONFIG_DIR_PATH
+     settings->setValue("configDirPath", CONFIG_DIR_PATH);
+@@ -430,7 +431,7 @@ void MainWindow::updateApp()
  
  void MainWindow::setupDiscord()
  {
diff --git a/PKGBUILD b/PKGBUILD
index 105bfb2cae92..e96210d3ef88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=m64p-git
-pkgver=20210809.r0.g4229fad
+pkgver=20211122.r4.gdb0e652
 pkgrel=1
 pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI (git version)'
 arch=('x86_64')
@@ -23,7 +23,7 @@ source=('git+https://github.com/loganmc10/m64p.git'
 sha256sums=('SKIP'
             'b8882d2b3cce965bd03b100fc53419ff43d8934c364136bbe63473fca0692fec'
             'bd2964654f5c346af76a5408adc76d34bf490435c4400cfa1d2340f0ad598dcd'
-            '53824848c8ec88e8c6dbc86682b6910ec7f80950279fdfa6809f08721b3fb592'
+            'afb952edd1f1766ae23433e9101b6aed5283c0ebe7f1723749ae464e65490bc4'
             '5c604da87c9deb3582b43efa724589080a7070a108ab0c0d00e115cb35eb4b13'
             '8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')