Fix default config paths. Refresh patches.

5 files changed, 48 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c94cd5d6854..3f93a0ae8f1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = m64p-git
 	pkgdesc = Mupen64Plus with custom plugins and Qt5 GUI (git version)
-	pkgver = 20201008.r0.g1b7a010
+	pkgver = 20201017.r1.g4033a04
 	pkgrel = 1
 	url = https://m64p.github.io/
 	arch = x86_64
@@ -30,12 +30,14 @@ pkgbase = m64p-git
 	conflicts = mupen64plus-video-gliden64
 	conflicts = mupen64plus
 	source = git+https://github.com/loganmc10/m64p.git
-	source = 010-m64p-git-remove-build-jobs-limitation.patch
-	source = 020-m64p-git-enable-optimizations.patch
+	source = 010-m64p-remove-build-jobs-limitation.patch
+	source = 020-m64p-enable-optimizations.patch
+	source = 030-m64p-fix-default-config-paths.patch
 	source = m64p.desktop
 	sha256sums = SKIP
-	sha256sums = b6e91689d151dfc8e60b3d095a9c20f7777b2df79083cd55a9ed43dd32dcd96b
-	sha256sums = 4366b57c9e909495d3d462eb2ce64335cbd015764be7c490fe675fbf6dfe2f84
+	sha256sums = 28c95005fbfa3b30bcee412070c5fc13f74a2b6f52526a9ad733778de3aaec04
+	sha256sums = d3834a29ccf06be9ad1c0a3039efb4ed69d81f61e814d1578a6bd19474aa11c3
+	sha256sums = c3f932cfe90909bd2f69a352add4acdd4d67d1fb73559d651de3cec3acdc3737
 	sha256sums = 8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808
 
 pkgname = m64p-git
diff --git a/010-m64p-git-remove-build-jobs-limitation.patch b/010-m64p-remove-build-jobs-limitation.patch
index 955617f7cbba..c449a259b76a 100644
--- a/010-m64p-git-remove-build-jobs-limitation.patch
+++ b/010-m64p-remove-build-jobs-limitation.patch
@@ -1,6 +1,6 @@
 --- a/build.sh
 +++ b/build.sh
-@@ -19,22 +19,22 @@ mkdir -p $install_dir
+@@ -25,22 +25,22 @@ mkdir -p $install_dir
  base_dir=$PWD
  
  cd $base_dir/mupen64plus-core/projects/unix
@@ -27,7 +27,7 @@
  if [[ $UNAME == *"MINGW"* ]]; then
    cp $base_dir/mupen64plus-input-qt/build/release/mupen64plus-input-qt.dll $install_dir
  else
-@@ -42,7 +42,7 @@ else
+@@ -48,7 +48,7 @@ else
  fi
  
  cd $base_dir/mupen64plus-audio-sdl2/projects/unix
@@ -36,7 +36,7 @@
  cp $base_dir/mupen64plus-audio-sdl2/projects/unix/*$suffix $install_dir
  
  cd $base_dir
-@@ -61,7 +61,7 @@ fi
+@@ -67,7 +67,7 @@ fi
  mkdir -p $base_dir/mupen64plus-gui/build
  cd $base_dir/mupen64plus-gui/build
  qmake ../mupen64plus-gui.pro
@@ -45,7 +45,7 @@
  if [[ $UNAME == *"MINGW"* ]]; then
    cp $base_dir/mupen64plus-gui/build/release/mupen64plus-gui.exe $install_dir
  else
-@@ -77,7 +77,7 @@ if [[ $UNAME == *"MINGW"* ]]; then
+@@ -83,7 +83,7 @@ if [[ $UNAME == *"MINGW"* ]]; then
  else
    cmake -DMUPENPLUSAPI_GLIDENUI=On -DNOHQ=On -DVEC4_OPT=On -DCRC_OPT=On -DMUPENPLUSAPI=On ../../src/
  fi
diff --git a/020-m64p-git-enable-optimizations.patch b/020-m64p-enable-optimizations.patch
index 1d5a404d1c02..752375810666 100644
--- a/020-m64p-git-enable-optimizations.patch
+++ b/020-m64p-enable-optimizations.patch
@@ -1,6 +1,6 @@
 --- a/build.sh
 +++ b/build.sh
-@@ -19,7 +19,7 @@ mkdir -p $install_dir
+@@ -25,7 +25,7 @@ mkdir -p $install_dir
  base_dir=$PWD
  
  cd $base_dir/mupen64plus-core/projects/unix
@@ -9,7 +9,7 @@
  cp -P $base_dir/mupen64plus-core/projects/unix/*$suffix* $install_dir
  cp $base_dir/mupen64plus-core/data/* $install_dir
  
-@@ -73,9 +73,9 @@ cd $base_dir/GLideN64/src
+@@ -79,9 +79,9 @@ cd $base_dir/GLideN64/src
  
  cd $base_dir/GLideN64/projects/cmake
  if [[ $UNAME == *"MINGW"* ]]; then
diff --git a/030-m64p-fix-default-config-paths.patch b/030-m64p-fix-default-config-paths.patch
new file mode 100644
index 000000000000..1c32a2f7b4af
--- /dev/null
+++ b/030-m64p-fix-default-config-paths.patch
@@ -0,0 +1,25 @@
+--- a/mupen64plus-gui/mainwindow.cpp
++++ b/mupen64plus-gui/mainwindow.cpp
+@@ -4,6 +4,7 @@
+ #include <QCloseEvent>
+ #include <QActionGroup>
+ #include <QDesktopServices>
++#include <QStandardPaths>
+ #include "settingsdialog.h"
+ #include "plugindialog.h"
+ #include "mainwindow.h"
+@@ -406,11 +407,11 @@ 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");
+ 
+     updatePlugins();
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 4e8b7c96e0b4..03c412b36eb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=m64p-git
-pkgver=20201008.r0.g1b7a010
+pkgver=20201017.r1.g4033a04
 pkgrel=1
 pkgdesc='Mupen64Plus with custom plugins and Qt5 GUI (git version)'
 arch=('x86_64')
@@ -14,18 +14,21 @@ makedepends=('git' 'cmake' 'nasm' 'icoutils')
 provides=('m64p' 'mupen64plus-gui' 'mupen64plus-video-gliden64')
 conflicts=('m64p' 'mupen64plus-gui' 'mupen64plus-video-gliden64' 'mupen64plus')
 source=('git+https://github.com/loganmc10/m64p.git'
-        '010-m64p-git-remove-build-jobs-limitation.patch'
-        '020-m64p-git-enable-optimizations.patch'
+        '010-m64p-remove-build-jobs-limitation.patch'
+        '020-m64p-enable-optimizations.patch'
+        '030-m64p-fix-default-config-paths.patch'
         'm64p.desktop')
 sha256sums=('SKIP'
-            'b6e91689d151dfc8e60b3d095a9c20f7777b2df79083cd55a9ed43dd32dcd96b'
-            '4366b57c9e909495d3d462eb2ce64335cbd015764be7c490fe675fbf6dfe2f84'
+            '28c95005fbfa3b30bcee412070c5fc13f74a2b6f52526a9ad733778de3aaec04'
+            'd3834a29ccf06be9ad1c0a3039efb4ed69d81f61e814d1578a6bd19474aa11c3'
+            'c3f932cfe90909bd2f69a352add4acdd4d67d1fb73559d651de3cec3acdc3737'
             '8df4e8076d28a1bc44f41b0129a9935da9839e8a8cb9944206757e47da561808')
 
 prepare() {
     icotool -x m64p/mupen64plus-gui/mupen64plus.ico -o m64p/mupen64plus-gui
-    patch -d m64p -Np1 -i "${srcdir}/010-m64p-git-remove-build-jobs-limitation.patch"
-    patch -d m64p -Np1 -i "${srcdir}/020-m64p-git-enable-optimizations.patch"
+    patch -d m64p -Np1 -i "${srcdir}/010-m64p-remove-build-jobs-limitation.patch"
+    patch -d m64p -Np1 -i "${srcdir}/020-m64p-enable-optimizations.patch"
+    patch -d m64p -Np1 -i "${srcdir}/030-m64p-fix-default-config-paths.patch"
 }
 
 pkgver() {