summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Hasting2021-01-07 14:33:16 -0500
committerDan Hasting2021-01-07 14:33:16 -0500
commit4cf6baddfeaa7ad0e6ad985aab05ca4a7f83c283 (patch)
tree2e608be1c99147e0d9bab7c40ef01b3a71b3faec
parentca7f3b893f5551089177ab1564188988e133f8c3 (diff)
downloadaur-4cf6baddfeaa7ad0e6ad985aab05ca4a7f83c283.tar.gz
Patch for changed quazip location
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
-rw-r--r--quazip-fix.patch40
3 files changed, 50 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bdbbb74c637..2a7c055ebc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mupen64plus-qt
pkgdesc = A customizable launcher for Mupen64Plus
pkgver = 1.14
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/dh4/mupen64plus-qt
install = mupen64plus-qt.install
arch = i686
@@ -11,7 +11,9 @@ pkgbase = mupen64plus-qt
depends = mupen64plus
depends = hicolor-icon-theme
source = mupen64plus-qt-1.14.tar.gz::https://github.com/dh4/mupen64plus-qt/archive/1.14.tar.gz
+ source = quazip-fix.patch
sha256sums = 467f4e5b75a0f63f23b1c8266746b3e7932b9dc4ee950c42b2bfaf9660e64614
+ sha256sums = c4db13e2620d5d16f5c58b5884f1275c225bc8f90720f980cdc2fb1f2d7677f6
pkgname = mupen64plus-qt
diff --git a/PKGBUILD b/PKGBUILD
index 2d870c1b560..1e5b53b6b03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,22 @@
pkgname=mupen64plus-qt
pkgver=1.14
-pkgrel=1
+pkgrel=2
pkgdesc="A customizable launcher for Mupen64Plus"
arch=('i686' 'x86_64')
url="https://github.com/dh4/mupen64plus-qt"
license=('BSD')
depends=('quazip' 'mupen64plus' 'hicolor-icon-theme')
install=mupen64plus-qt.install
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dh4/${pkgname}/archive/${pkgver}.tar.gz")
-sha256sums=('467f4e5b75a0f63f23b1c8266746b3e7932b9dc4ee950c42b2bfaf9660e64614')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dh4/${pkgname}/archive/${pkgver}.tar.gz"
+ "quazip-fix.patch")
+sha256sums=('467f4e5b75a0f63f23b1c8266746b3e7932b9dc4ee950c42b2bfaf9660e64614'
+ 'c4db13e2620d5d16f5c58b5884f1275c225bc8f90720f980cdc2fb1f2d7677f6')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch --forward --strip=1 --input="$srcdir/quazip-fix.patch"
+
qmake-qt5
make
}
diff --git a/quazip-fix.patch b/quazip-fix.patch
new file mode 100644
index 00000000000..bf4b2732dac
--- /dev/null
+++ b/quazip-fix.patch
@@ -0,0 +1,40 @@
+diff -ur old/mupen64plus-qt.pro mupen64plus-qt-1.14/mupen64plus-qt.pro
+--- old/mupen64plus-qt.pro 2020-02-19 22:33:40.000000000 -0500
++++ mupen64plus-qt-1.14/mupen64plus-qt.pro 2021-01-07 14:18:09.915059630 -0500
+@@ -86,7 +86,7 @@
+ LIBS += -lquazip5
+ }
+ } else {
+- LIBS += -lquazip5
++ LIBS += -lquazip1-qt5
+ }
+ }
+ }
+diff -ur old/src/common.cpp mupen64plus-qt-1.14/src/common.cpp
+--- old/src/common.cpp 2020-02-19 22:33:40.000000000 -0500
++++ mupen64plus-qt-1.14/src/common.cpp 2021-01-07 14:17:15.291242409 -0500
+@@ -40,8 +40,8 @@
+ #include <QLocale>
+ #include <QSize>
+
+-#include <quazip5/quazip.h>
+-#include <quazip5/quazipfile.h>
++#include <QuaZip-Qt5-1.1/quazip/quazip.h>
++#include <QuaZip-Qt5-1.1/quazip/quazipfile.h>
+
+ #ifdef Q_OS_WIN
+ #include <QCoreApplication>
+diff -ur old/src/emulation/emulatorhandler.cpp mupen64plus-qt-1.14/src/emulation/emulatorhandler.cpp
+--- old/src/emulation/emulatorhandler.cpp 2020-02-19 22:33:40.000000000 -0500
++++ mupen64plus-qt-1.14/src/emulation/emulatorhandler.cpp 2021-01-07 14:17:31.158049756 -0500
+@@ -38,8 +38,8 @@
+ #include <QFile>
+ #include <QMessageBox>
+
+-#include <quazip5/quazip.h>
+-#include <quazip5/quazipfile.h>
++#include <QuaZip-Qt5-1.1/quazip/quazip.h>
++#include <QuaZip-Qt5-1.1/quazip/quazipfile.h>
+
+
+ EmulatorHandler::EmulatorHandler(QWidget *parent) : QObject(parent)