build with qt5.11

2 files changed, 55 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5dd1c7e098dd..45049be9c911 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=seafile-client
 pkgver=6.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="GUI client for synchronizing your local files with seafile server"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
 url="https://github.com/haiwen/${pkgname}"
@@ -14,14 +14,19 @@ depends=("seafile" "qt5-tools" "qt5-webkit" "qt5-base"
 makedepends=("cmake")
 conflicts=('seafile-client-qt5')
 provides=('seafile-client-qt5')
-source=("${pkgname}-v${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('daef6d2b5be5659dca55bc782262f7c7cc5a8e4b0b4db5f4a7fedad9e061e6db')
+source=("${pkgname}-v${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+        "qt5.11.patch")
+sha256sums=('daef6d2b5be5659dca55bc782262f7c7cc5a8e4b0b4db5f4a7fedad9e061e6db'
+            '47a2726f442d847e5654d388ae507996609e26dff59287f37f82aeaf1fec46e9')
 
 prepare() {
   cd "${srcdir}"
 
   rm -rf build
   mkdir -p build
+
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < "${srcdir}/qt5.11.patch"
 }
 
 build () {
diff --git a/qt5.11.patch b/qt5.11.patch
new file mode 100644
index 000000000000..afbdd92cca75
--- /dev/null
+++ b/qt5.11.patch
@@ -0,0 +1,47 @@
+From bb7e233333ad12ff33576bed2eb558f3278f9e9c Mon Sep 17 00:00:00 2001
+From: Maximilian Janik <maximilian@janik.xyz>
+Date: Wed, 30 May 2018 16:24:34 +0200
+Subject: [PATCH] Fix for Qt 5.11
+
+---
+ CMakeLists.txt                | 9 +++------
+ src/ui/private-share-dialog.h | 1 +
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f2395e404..381af60b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -799,17 +799,14 @@ TARGET_LINK_LIBRARIES(seafile-applet
+   ${EXTRA_LIBS}
+ )
+ 
+-QT5_USE_MODULES(seafile-applet Core Gui Widgets Network)
++target_link_libraries(seafile-applet Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network)
+ IF (BUILD_SHIBBOLETH_SUPPORT)
+-QT5_USE_MODULES(seafile-applet ${WEBKIT_NAME} ${WEBKIT_WIDGETS_NAME})
++target_link_libraries(seafile-applet Qt5::WebEngine Qt5::WebEngineWidgets)
+ ENDIF()
+ 
+ ## QtBus
+ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
+-  TARGET_LINK_LIBRARIES(seafile-applet
+-    ${QT_QTDBUS_LIBRARIES}
+-  )
+-  QT5_USE_MODULES(seafile-applet ${USE_QT_LIBRARIES})
++  target_link_libraries(seafile-applet Qt5::DBus)
+ ENDIF()
+ 
+ ### Xcode-related, build as a osx bundle
+diff --git a/src/ui/private-share-dialog.h b/src/ui/private-share-dialog.h
+index 427958ea2..4cbcbdbc4 100644
+--- a/src/ui/private-share-dialog.h
++++ b/src/ui/private-share-dialog.h
+@@ -12,6 +12,7 @@
+ #include <QStringList>
+ #include <QStyledItemDelegate>
+ #include <QTableView>
++#include <QHeaderView>
+ #include "ui_private-share-dialog.h"
+ 
+ #include "account.h"