patch for Qt5 with big kudos to Kiwii :)

3 files changed, 101 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e095e9dff2f..6c5df9a00ead 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
 # Generated by mksrcinfo v8
-# Wed Dec  7 23:24:43 UTC 2016
+# Sun Jul  2 15:35:12 UTC 2017
 pkgbase = qt-ponies-git
 	pkgdesc = Desktop ponies in Qt
 	pkgver = v0.9.3.g882a8cf
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/myszha/qt-ponies
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	depends = qt4
+	depends = qt5-base
 	depends = libxfixes
 	provides = qt-ponies
 	source = git://github.com/myszha/qt-ponies.git
-	md5sums = SKIP
+	source = qt-ponies-qt5.patch
+	sha256sums = SKIP
+	sha256sums = 5681360eb583cd25d42200abda9c01c050db69778c63a8a2ab79b6ecbb441034
 
 pkgname = qt-ponies-git
 
diff --git a/PKGBUILD b/PKGBUILD
index f24d786e7da2..d43205860253 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,20 @@
 _gitname="qt-ponies"
 pkgname="$_gitname-git"
 pkgver=v0.9.3.g882a8cf
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop ponies in Qt"
 arch=("i686" "x86_64")
 url="https://github.com/myszha/qt-ponies"
 license=('GPL')
-depends=("qt4" "libxfixes")
+depends=("qt5-base" "libxfixes")
 makedepends=("git")
 provides=("qt-ponies")
-source=("git://github.com/myszha/$_gitname.git")
-md5sums=('SKIP')
+source=(
+  "git://github.com/myszha/$_gitname.git"
+  "qt-ponies-qt5.patch"
+)
+sha256sums=('SKIP'
+            '5681360eb583cd25d42200abda9c01c050db69778c63a8a2ab79b6ecbb441034')
 
 
 pkgver() {
@@ -25,13 +29,15 @@ prepare() {
   cd "$srcdir/$_gitname"
   # Set default desktop-ponies directory
   sed -i "s/.\/desktop-ponies/\/usr\/share\/qt-ponies\/desktop-ponies/g" src/configwindow.cpp
+  # Patch for Qt5 - big kudos to Kiwii for this :)
+  patch -p1 < "$srcdir/qt-ponies-qt5.patch"
 }
 
 package() {
   cd "$srcdir/$_gitname"
-  qmake-qt4
+  qmake-qt5
   make
-  make INSTALL_ROOT="$pkgdir/" install
+  make INSTALL_ROOT="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/qt-ponies-qt5.patch b/qt-ponies-qt5.patch
new file mode 100644
index 000000000000..d1abccd51af7
--- /dev/null
+++ b/qt-ponies-qt5.patch
@@ -0,0 +1,83 @@
+commit 810e01e9d63717a8f41df27781af4b1ce8a013c0
+Author: Daniel Maslowski <daniel.maslowski@shop.co>
+Date:   Sun Jul 2 17:24:21 2017 +0200
+
+    Changes needed for Qt5
+    - QApplication & QLabel moved to QtWidgets
+    - Remove setting text codec (hoping it just defaults to UTF-8 now)
+    - Replace qInstallMsgHandler with InstallMessageHandler
+
+diff --git a/src/configwindow.cpp b/src/configwindow.cpp
+index dd1df7e..c60d657 100644
+--- a/src/configwindow.cpp
++++ b/src/configwindow.cpp
+@@ -63,10 +63,10 @@ const std::unordered_map<QString, const QVariant> ConfigWindow::config_defaults
+ static DebugWindow* log_class = nullptr;
+ static bool debug = false;
+ 
+-void handle_message(QtMsgType type, const char *msg)
++void handle_message(QtMsgType type, const QMessageLogContext &, const QString & str)
+ {
+     if(log_class && debug){
+-        log_class->handle_message(type,msg);
++        log_class->handle_message(type,str.toStdString().c_str());
+     }
+ }
+ 
+@@ -80,7 +80,7 @@ ConfigWindow::ConfigWindow(QWidget *parent) :
+     ui_debug = std::unique_ptr<DebugWindow>(new DebugWindow());
+     log_class = ui_debug.get();
+ 
+-    qInstallMsgHandler(handle_message);
++    qInstallMessageHandler(handle_message);
+ 
+ #ifndef Q_WS_X11
+     // Do not show X11 specific options on other platforms
+diff --git a/src/effect.h b/src/effect.h
+index 682c71c..c81b598 100644
+--- a/src/effect.h
++++ b/src/effect.h
+@@ -21,7 +21,7 @@
+ #define EFFECT_H
+ 
+ #include <QtGui/QMovie>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QLabel>
+ #include <QMainWindow>
+ #include <QVariant>
+ #include <QMovie>
+diff --git a/src/main.cpp b/src/main.cpp
+index a5dd427..2e6c0d5 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -17,7 +17,7 @@
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtCore/QLocale>
+ #include <QTranslator>
+ #include <QDebug>
+@@ -54,8 +54,6 @@ int main(int argc, char *argv[])
+     app.installTranslator(&translator);
+ 
+     app.setQuitOnLastWindowClosed(false);
+-    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+-    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+     QSettings::setDefaultFormat(QSettings::IniFormat);
+ 
+     if ( app.isRunning() ) {
+diff --git a/src/pony.h b/src/pony.h
+index 3c32801..e6d4d92 100644
+--- a/src/pony.h
++++ b/src/pony.h
+@@ -21,7 +21,7 @@
+ #define PONY_H
+ 
+ #include <QtGui/QMovie>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QLabel>
+ #include <QMainWindow>
+ #include <QMouseEvent>
+ #include <QHash>