From b0cb6839dceec62dcc202f36478a08edc665a086 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 7 Jan 2021 14:27:36 -0800
Subject: Add patch to build against non-legacy quazip

---
 PKGBUILD         | 21 +++++++++++++++------
 quazip-fix.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 quazip-fix.patch

diff --git a/PKGBUILD b/PKGBUILD
index b85ba00..d858185 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,21 +5,29 @@
 
 pkgname=mupen64plus-qt
 pkgver=1.14
-pkgrel=1.4
+pkgrel=2
 pkgdesc="A customizable launcher for Mupen64Plus"
 arch=('i686' 'x86_64')
 url="https://github.com/dh4/mupen64plus-qt"
 license=('BSD')
-depends=('quazip-legacy' 'mupen64plus' 'hicolor-icon-theme')
+depends=('quazip' 'mupen64plus' 'hicolor-icon-theme')
 install=mupen64plus-qt.install
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dh4/${pkgname}/archive/${pkgver}.tar.gz")
-b2sums=('f81681861de61db9e68eb80941e97644a2e903b221c470e981c9e7f39e3cc720f59e57a08a7d5346b99ae963d6639c275c98f6519df9a203b0aaf567e9169451')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/dh4/${pkgname}/archive/${pkgver}.tar.gz"
+        "quazip-fix.patch")
+b2sums=('f81681861de61db9e68eb80941e97644a2e903b221c470e981c9e7f39e3cc720f59e57a08a7d5346b99ae963d6639c275c98f6519df9a203b0aaf567e9169451'
+        '8c312e5fe002bca6194ece5638ac2b80e3b3d7da23e6594aade37f1952981ae4874f92ce55f1b54ff122514de6070d25af99ec365d382ec04551d941950e0fc1')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir"/quazip-fix.patch
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  export CFLAGS="$CFLAGS -O3 -flto=4 -fPIE"
-  export CXXFLAGS="$CXXFLAGS -O3 -flto=4 -fPIE"
+  export CFLAGS="$CFLAGS -O3 -flto=auto -fPIE"
+  export CXXFLAGS="$CXXFLAGS -O3 -flto=auto -fPIE"
   export LDFLAGS="$LDFLAGS,-pie"
 
   qmake-qt5
@@ -28,6 +36,7 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+
   install -Dm755 "mupen64plus-qt" "$pkgdir/usr/bin/mupen64plus-qt"
   install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm644 "resources/mupen64plus-qt.desktop" "$pkgdir/usr/share/applications/mupen64plus-qt.desktop"
diff --git a/quazip-fix.patch b/quazip-fix.patch
new file mode 100644
index 0000000..bf4b273
--- /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)
-- 
cgit v1.2.1