seafile-client-qt: update to 7.0.8

This commit is contained in:
yopito 2020-06-17 19:03:36 +02:00 committed by Daniel Kolesa
parent 075eeb801d
commit 74d25310f3
3 changed files with 61 additions and 3 deletions

View file

@ -0,0 +1,37 @@
source: upstream commit
https://github.com/haiwen/seafile-client/commit/552fb023163db9554eeaa5063bc38a86b01e4e22
From 552fb023163db9554eeaa5063bc38a86b01e4e22 Mon Sep 17 00:00:00 2001
From: sun20121818 <1184550842@qq.com>
Date: Wed, 3 Jun 2020 11:40:56 +0800
Subject: [PATCH] support choose qtwebkit or qtwebengine (#1300)
---
CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a3e5709..a7735112 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -43,6 +43,8 @@ OPTION(BUILD_SHIBBOLETH_SUPPORT "Build Shibboleth support" OFF)
option(BUILD_ENABLE_WARNINGS "Enable compiler warnings." ON)
+option(USE_QT_WEBKIT "Build use QT webkit" OFF)
+
option(BUILD_SPARKLE_SUPPORT "Build Sparkle support" OFF)
IF (BUILD_SPARKLE_SUPPORT)
ADD_DEFINITIONS(-DHAVE_SPARKLE_SUPPORT)
@@ -164,7 +166,7 @@ EXECUTE_PROCESS(COMMAND
OUTPUT_VARIABLE DETECTED_QT_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
MESSAGE("qt5 version: ${DETECTED_QT_VERSION}")
-IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)
+IF(USE_QT_WEBKIT)
ADD_DEFINITIONS(-DSEAFILE_USE_WEBKIT)
SET(WEBKIT_NAME "WebKit")
SET(WEBKIT_WIDGETS_NAME "WebKitWidgets")
--
2.27.0

View file

@ -0,0 +1,21 @@
source: upstream pull request https://github.com/haiwen/seafile-client/pull/1297
--- src/ui/events-list-view.cpp.orig
+++ src/ui/events-list-view.cpp
@@ -1,4 +1,5 @@
#include <QPainter>
+#include <QPainterPath>
#include <QApplication>
#include <QPixmap>
#include <QToolTip>
--- src/ui/private-share-dialog.cpp.orig
+++ src/ui/private-share-dialog.cpp
@@ -2,6 +2,7 @@
#include <QCompleter>
#include <QLineEdit>
#include <QPainter>
+#include <QPainterPath>
#include <QResizeEvent>
#include <QStringList>
#include <QStringListModel>

View file

@ -1,11 +1,11 @@
# Template file for 'seafile-client-qt'
pkgname=seafile-client-qt
version=7.0.7
version=7.0.8
revision=1
_sourcename="seafile-client"
wrksrc="${_sourcename}-${version}"
build_style=cmake
configure_args="$(vopt_if shibboleth -DBUILD_SHIBBOLETH_SUPPORT=ON)"
configure_args="$(vopt_if shibboleth '-DBUILD_SHIBBOLETH_SUPPORT=ON -DUSE_QT_WEBKIT=ON')"
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel seafile-libclient-devel sqlite-devel libevent-devel
$(vopt_if shibboleth 'qt5-webkit-devel')"
@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="Apache-2.0"
homepage="https://seafile.com"
distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
checksum=49a97a1e7c55ff29237ff5b700cde8035b56a56c9176d7d7fc426357f4abab78
checksum=9c737acc7d6e92e36625156346b866c2e90fa5900828fc77a28ed4f622629bae
build_options="shibboleth"
desc_option_shibboleth="Build with Shibboleth support"