Qt5.11 patch + git submodules

3 files changed, 71 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47a3a9ced6ff..ad3c1cac75f5 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,7 +20,15 @@ pkgbase = qomp
 	optdepends = gst-plugins-bad
 	optdepends = gst-plugins-ugly
 	source = git+https://github.com/qomp/qomp#commit=230443ed40a99cedbfee7624dcce6db16977a9f6
+	source = git+https://github.com/qomp/translations
+	source = git+https://github.com/qomp/themes
+	source = git+https://github.com/wadealer/SingleApplication
+	source = 0001-Fixed-compilation-with-Qt-5.11.patch
 	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = 83664a00dc0d2ea7cd81a69ff51c40f3
 
 pkgname = qomp
 
diff --git a/0001-Fixed-compilation-with-Qt-5.11.patch b/0001-Fixed-compilation-with-Qt-5.11.patch
new file mode 100644
index 000000000000..66ddf9532628
--- /dev/null
+++ b/0001-Fixed-compilation-with-Qt-5.11.patch
@@ -0,0 +1,37 @@
+From 78886eda1a7c6d7d6fa8a4ce41f36ab3d9daccb4 Mon Sep 17 00:00:00 2001
+From: Vitozz <thetvg@gmail.com>
+Date: Fri, 1 Jun 2018 17:36:33 +0300
+Subject: [PATCH] Fixed compilation with Qt-5.11
+
+---
+ libqomp/src/plugins/qompplugingettunesdlg.cpp   | 1 +
+ plugins/tunetofileplugin/tunetofilesettings.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libqomp/src/plugins/qompplugingettunesdlg.cpp b/libqomp/src/plugins/qompplugingettunesdlg.cpp
+index 5fed017..5f7f0b3 100644
+--- a/libqomp/src/plugins/qompplugingettunesdlg.cpp
++++ b/libqomp/src/plugins/qompplugingettunesdlg.cpp
+@@ -32,6 +32,7 @@
+ #include <QTimer>
+ #include <QDialog>
+ #include <QMessageBox>
++#include <QAbstractItemView>
+ 
+ static const int sugTimerInterval = 500;
+ 
+diff --git a/plugins/tunetofileplugin/tunetofilesettings.cpp b/plugins/tunetofileplugin/tunetofilesettings.cpp
+index 42212dd..e29ea00 100644
+--- a/plugins/tunetofileplugin/tunetofilesettings.cpp
++++ b/plugins/tunetofileplugin/tunetofilesettings.cpp
+@@ -23,6 +23,7 @@
+ #include "ui_tunetofilesettings.h"
+ 
+ #include <QFileDialog>
++#include <QStyle>
+ #ifdef Q_OS_WIN
+ #include <QProcessEnvironment>
+ #endif
+-- 
+2.17.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 233a4f2bb6d7..29d1a84a364b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Fabio Loli <loli_fabio@protonmail.com>
+# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> -> https://github.com/FabioLolix
 # Contributor: alex korobtsov <korobcoff@gmail.com>
 # Contributor: Alexander Bantyev <balsoft@yandex.ru>
 
@@ -16,24 +16,46 @@ optdepends=('gst-plugins-bad'
             'gst-plugins-ugly')
 makedepends=('git' 'cmake')
 _commit=230443ed40a99cedbfee7624dcce6db16977a9f6 #tag 1.3.1
-source=("git+https://github.com/qomp/qomp#commit=$_commit")
-md5sums=('SKIP')
+source=("git+https://github.com/qomp/qomp#commit=$_commit"
+        "git+https://github.com/qomp/translations"
+        "git+https://github.com/qomp/themes"
+        "git+https://github.com/wadealer/SingleApplication"
+        0001-Fixed-compilation-with-Qt-5.11.patch)
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         '83664a00dc0d2ea7cd81a69ff51c40f3')
 
 pkgver() {
   cd $pkgname
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
-build() {
+prepare() {
   cd "$srcdir/${pkgname}"
+  patch -Np1 -i ../0001-Fixed-compilation-with-Qt-5.11.patch
+
   git submodule init
+
+  git config 'submodule.translations.url' "${srcdir}/translations"
+  git config 'submodule.themes.url' "${srcdir}/themes"
+  git config 'submodule.src/singleapplication.url' "${srcdir}/SingleApplication"
+
   git submodule update
+
+}
+
+build() {
+  cd "$srcdir/${pkgname}"
+
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr/ \
 	-DUSE_QT5=ON \
 	-DCMAKE_BUILD_TYPE=Release
   make
 }
+
 package() {
   cd "$srcdir/${pkgname}"
   make DESTDIR="$pkgdir/"  install