Hello community, here is the log from the commit of package seafile-client for openSUSE:Factory checked in at 2020-06-09 00:05:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seafile-client (Old) and /work/SRC/openSUSE:Factory/.seafile-client.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seafile-client" Tue Jun 9 00:05:08 2020 rev:3 rq:812483 version:7.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/seafile-client/seafile-client.changes 2020-04-10 23:54:13.264741396 +0200 +++ /work/SRC/openSUSE:Factory/.seafile-client.new.3606/seafile-client.changes 2020-06-09 00:06:54.357767850 +0200 @@ -1,0 +2,6 @@ +Mon Jun 8 08:34:19 UTC 2020 - Paolo Stivanin <[email protected]> + +- Update to 7.0.8 (no changelog) +- Add fix_qpainterpath.patch + +------------------------------------------------------------------- Old: ---- v7.0.7.tar.gz New: ---- fix_qpainterpath.patch v7.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seafile-client.spec ++++++ --- /var/tmp/diff_new_pack.mcirsD/_old 2020-06-09 00:06:57.221778011 +0200 +++ /var/tmp/diff_new_pack.mcirsD/_new 2020-06-09 00:06:57.225778025 +0200 @@ -18,7 +18,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: seafile-client -Version: 7.0.7 +Version: 7.0.8 Release: 0 Summary: Cloud storage client License: GPL-3.0-only @@ -26,6 +26,7 @@ Source0: https://github.com/haiwen/%{name}/archive/v%{version}.tar.gz Source1: seafile.appdata.xml Patch0: 01-fix-no-return-in-nonvoid.patch +Patch1: fix_qpainterpath.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cmake @@ -77,6 +78,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags} -fPIE -pie" ++++++ fix_qpainterpath.patch ++++++ diff -ru a/src/ui/events-list-view.cpp b/src/ui/events-list-view.cpp --- a/src/ui/events-list-view.cpp 2020-06-02 10:44:36.000000000 +0200 +++ b/src/ui/events-list-view.cpp 2020-06-08 10:24:42.162320044 +0200 @@ -4,6 +4,7 @@ #include <QToolTip> #include <QLayout> #include <QDebug> +#include <QPainterPath> #include "seafile-applet.h" #include "main-window.h" diff -ru a/src/ui/private-share-dialog.cpp b/src/ui/private-share-dialog.cpp --- a/src/ui/private-share-dialog.cpp 2020-06-02 10:44:36.000000000 +0200 +++ b/src/ui/private-share-dialog.cpp 2020-06-08 10:24:53.538345357 +0200 @@ -7,6 +7,7 @@ #include <QStringListModel> #include <QDateTime> #include <QScrollBar> +#include <QPainterPath> #include "api/api-error.h" #include "api/requests.h" #include "private-share-dialog.h" ++++++ v7.0.7.tar.gz -> v7.0.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/CMakeLists.txt new/seafile-client-7.0.8/CMakeLists.txt --- old/seafile-client-7.0.7/CMakeLists.txt 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/CMakeLists.txt 2020-06-02 10:44:36.000000000 +0200 @@ -3,7 +3,7 @@ PROJECT(seafile-client) SET(SEAFILE_CLIENT_VERSION_MAJOR 7) SET(SEAFILE_CLIENT_VERSION_MINOR 0) -SET(SEAFILE_CLIENT_VERSION_PATCH 7) +SET(SEAFILE_CLIENT_VERSION_PATCH 8) SET(PROJECT_VERSION "${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}") ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION}) INCLUDE(FindPkgConfig) @@ -716,24 +716,14 @@ ## set up our crash reporter: breakpad -IF (PATH_TO_BREAKPAD_ROOT) - FIND_LIBRARY(BREAKPAD_LIBRARY breakpad - PATHS ${PATH_TO_BREAKPAD_ROOT}/out/Debug_Base - PATHS ${PATH_TO_BREAKPAD_ROOT}/out/Default/obj - NO_DEFAULT_PATH) - FIND_LIBRARY(BREAKPAD_UTILITIES_LIBRARY breakpad_utilities - PATHS ${PATH_TO_BREAKPAD_ROOT}/out/Debug_Base - PATHS ${PATH_TO_BREAKPAD_ROOT}/out/Default/obj - NO_DEFAULT_PATH) - MESSAGE(STATUS "Found library: ${BREAKPAD_LIBRARY}") - MESSAGE(STATUS "Found library: ${BREAKPAD_UTILITIES_LIBRARY}") - - SET(seafile_client_sources ${seafile_client_sources} src/crash-handler.cpp) - INCLUDE_DIRECTORIES() - ADD_DEFINITIONS(-DSEAFILE_CLIENT_HAS_CRASH_REPORTER) - SET_SOURCE_FILES_PROPERTIES(src/crash-handler.cpp - PROPERTIES COMPILE_FLAGS "-I${PATH_TO_BREAKPAD_ROOT}/src") - SET(EXTRA_LIBS ${EXTRA_LIBS} ${BREAKPAD_LIBRARY} ${BREAKPAD_UTILITIES_LIBRARY}) +IF (WIN32) +FIND_LIBRARY(BREAKPAD_LIBRARY breakpad) +FIND_LIBRARY(BREAKPAD_CLIENT_LIBRARY breakpad_client) +MESSAGE(STATUS "Found library: ${BREAKPAD_LIBRARY}") +MESSAGE(STATUS "Found library: ${BREAKPAD_CLIENT_LIBRARY}") +SET(seafile_client_sources ${seafile_client_sources} src/crash-handler.cpp) +ADD_DEFINITIONS(-DSEAFILE_CLIENT_HAS_CRASH_REPORTER) +SET(EXTRA_LIBS ${EXTRA_LIBS} ${BREAKPAD_LIBRARY} ${BREAKPAD_CLIENT_LIBRARY}) ENDIF() #################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/Info.plist new/seafile-client-7.0.8/Info.plist --- old/seafile-client-7.0.7/Info.plist 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/Info.plist 2020-06-02 10:44:36.000000000 +0200 @@ -15,9 +15,9 @@ <key>CFBundleName</key> <string>Seafile</string> <key>CFBundleShortVersionString</key> - <string>7.0.7</string> + <string>7.0.8</string> <key>CFBundleVersion</key> - <string>7.0.7</string> + <string>7.0.8</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/debian/changelog new/seafile-client-7.0.8/debian/changelog --- old/seafile-client-7.0.7/debian/changelog 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/debian/changelog 2020-06-02 10:44:36.000000000 +0200 @@ -1,3 +1,7 @@ +seafile-gui (7.0.8) unstable; urgency=low + + * new upstream release + -- Jonathan Xu <[email protected]> Tue, 2 Jun 2020 16:41:28 +0800 seafile-gui (7.0.7) unstable; urgency=low * new upstream release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/src/account-info-service.cpp new/seafile-client-7.0.8/src/account-info-service.cpp --- old/seafile-client-7.0.7/src/account-info-service.cpp 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/src/account-info-service.cpp 2020-06-02 10:44:36.000000000 +0200 @@ -14,11 +14,11 @@ SINGLETON_IMPL(AccountInfoService) AccountInfoService::AccountInfoService(QObject* parent) - : QObject(parent), request_(NULL) + : QObject(parent) { refresh_timer_ = new QTimer(this); connect(refresh_timer_, SIGNAL(timeout()), this, SLOT(refresh())); - refresh(); + // refresh(); } void AccountInfoService::start() @@ -37,28 +37,27 @@ if (!account.isValid()) { return; } - if (request_) { - request_->deleteLater(); - } - request_ = new FetchAccountInfoRequest(account); - connect(request_, SIGNAL(success(const AccountInfo&)), this, + FetchAccountInfoRequest* fetch_account_info_request = new FetchAccountInfoRequest(account); + connect(fetch_account_info_request, SIGNAL(success(const AccountInfo&)), this, SLOT(onFetchAccountInfoSuccess(const AccountInfo&))); - connect(request_, SIGNAL(failed(const ApiError&)), this, + connect(fetch_account_info_request, SIGNAL(failed(const ApiError&)), this, SLOT(onFetchAccountInfoFailed())); - request_->send(); + fetch_account_info_request->send(); } void AccountInfoService::onFetchAccountInfoSuccess(const AccountInfo& info) { - seafApplet->accountManager()->updateAccountInfo(request_->account(), info); - request_->deleteLater(); - request_ = NULL; + FetchAccountInfoRequest *req = (FetchAccountInfoRequest *)QObject::sender(); + seafApplet->accountManager()->updateAccountInfo(req->account(), info); + req->deleteLater(); + req = NULL; } void AccountInfoService::onFetchAccountInfoFailed() { - request_->deleteLater(); - request_ = NULL; + FetchAccountInfoRequest *req = (FetchAccountInfoRequest *)QObject::sender(); + req->deleteLater(); + req = NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/src/account-info-service.h new/seafile-client-7.0.8/src/account-info-service.h --- old/seafile-client-7.0.7/src/account-info-service.h 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/src/account-info-service.h 2020-06-02 10:44:36.000000000 +0200 @@ -36,7 +36,6 @@ AccountInfoService(QObject *parent=0); QTimer *refresh_timer_; - FetchAccountInfoRequest *request_; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/src/crash-handler.cpp new/seafile-client-7.0.8/src/crash-handler.cpp --- old/seafile-client-7.0.7/src/crash-handler.cpp 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/src/crash-handler.cpp 2020-06-02 10:44:36.000000000 +0200 @@ -4,11 +4,11 @@ #include <cstdio> #if defined(Q_OS_LINUX) -#include "client/linux/handler/exception_handler.h" +#include "breakpad/client/linux/handler/exception_handler.h" #elif defined(Q_OS_WIN32) -#include "client/windows/handler/exception_handler.h" +#include "breakpad/client/windows/handler/exception_handler.h" #elif defined(Q_OS_MAC) -#include "client/mac/handler/exception_handler.h" +#include "breakpad/client/mac/handler/exception_handler.h" #endif namespace Breakpad { @@ -24,24 +24,45 @@ void InitCrashHandler(const QString& dumpPath); #if defined(Q_OS_WIN32) - static bool DumpCallback(const wchar_t* _dump_dir, const wchar_t* _minidump_id, void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion, bool success); + static bool DumpCallback(const wchar_t* _dump_dir, + const wchar_t* _minidump_id, + void* context, + EXCEPTION_POINTERS* exinfo, + MDRawAssertionInfo* assertion, + bool success); #elif defined(Q_OS_LINUX) - static bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success); + static bool DumpCallback(const google_breakpad::MinidumpDescriptor &md, + void *context, + bool success); #elif defined(Q_OS_MAC) - static bool DumpCallback(const char* _dump_dir,const char* _minidump_id,void *context, bool success); + static bool DumpCallback(const char* _dump_dir, + const char* _minidump_id, + void *context, + bool success); #endif static google_breakpad::ExceptionHandler* handler; }; + google_breakpad::ExceptionHandler* CrashHandlerPrivate::handler = NULL; #if defined(Q_OS_WIN32) -bool CrashHandlerPrivate::DumpCallback(const wchar_t* _dump_dir, const wchar_t* _minidump_id, void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion, bool success); +bool CrashHandlerPrivate::DumpCallback(const wchar_t* _dump_dir, + const wchar_t* _minidump_id, + void* context, + EXCEPTION_POINTERS* exinfo, + MDRawAssertionInfo* assertion, + bool success) #elif defined(Q_OS_LINUX) -bool CrashHandlerPrivate::DumpCallback(const google_breakpad::MinidumpDescriptor &md, void *context, bool success) +bool CrashHandlerPrivate::DumpCallback(const google_breakpad::MinidumpDescriptor &md, + void *context, + bool success) #elif defined(Q_OS_MAC) -bool CrashHandlerPrivate::DumpCallback(const char* _dump_dir,const char* _minidump_id,void *context, bool success) +bool CrashHandlerPrivate::DumpCallback(const char* _dump_dir, + const char* _minidump_id, + void *context, + bool success) #endif { Q_UNUSED(context); @@ -103,7 +124,7 @@ DumpCallback, /*context*/ this, true, - NULL + google_breakpad::ExceptionHandler::HANDLER_ALL ); #endif fprintf(stderr, "[breakpad] initialized\n"); @@ -135,4 +156,3 @@ d->InitCrashHandler(reportPath); } } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/src/main.cpp new/seafile-client-7.0.8/src/main.cpp --- old/seafile-client-7.0.7/src/main.cpp 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/src/main.cpp 2020-06-02 10:44:36.000000000 +0200 @@ -153,7 +153,9 @@ initGlib(); // initialize breakpad if enabled +#if defined(Q_OS_WIN32) initBreakpad(); +#endif // Apply hidpi support setupHIDPIFix(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/src/shib/shib-login-dialog.cpp new/seafile-client-7.0.8/src/shib/shib-login-dialog.cpp --- old/seafile-client-7.0.7/src/shib/shib-login-dialog.cpp 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/src/shib/shib-login-dialog.cpp 2020-06-02 10:44:36.000000000 +0200 @@ -64,7 +64,11 @@ this, SLOT(onNewCookieCreated(const QUrl&, const QNetworkCookie&))); #else webview_ = new QWebEngineView; - webview_->setPage(new SeafileQWebEnginePage(this)); + + web_engine_profile_ = new QWebEngineProfile(); + web_engine_page_ = new QWebEnginePage(web_engine_profile_); + + webview_->setPage(web_engine_page_); QWebEngineCookieStore *jar = webview_->page()->profile()->cookieStore(); connect(jar, SIGNAL(cookieAdded(const QNetworkCookie&)), this, SLOT(onWebEngineCookieAdded(const QNetworkCookie&))); @@ -86,6 +90,15 @@ shib_login_url, ::getSeafileLoginParams(computer_name, "shib_"))); } +#if !defined(SEAFILE_USE_WEBKIT) +ShibLoginDialog::~ShibLoginDialog() +{ + + // The web_engine_page_ object must delete before web_engine_profile. + web_engine_page_->deleteLater(); + web_engine_profile_->deleteLater(); +} +#endif void ShibLoginDialog::sslErrorHandler(QNetworkReply* reply, const QList<QSslError> & ssl_errors) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.7/src/shib/shib-login-dialog.h new/seafile-client-7.0.8/src/shib/shib-login-dialog.h --- old/seafile-client-7.0.7/src/shib/shib-login-dialog.h 2020-04-01 10:05:13.000000000 +0200 +++ new/seafile-client-7.0.8/src/shib/shib-login-dialog.h 2020-06-02 10:44:36.000000000 +0200 @@ -13,6 +13,8 @@ class QWebView; #else class QWebEngineView; +class QWebEngineProfile; +class QWebEnginePage; #endif class QSslError; @@ -32,6 +34,9 @@ ShibLoginDialog(const QUrl& url, const QString& computer_name, QWidget *parent=0); +#if !defined(SEAFILE_USE_WEBKIT) +~ShibLoginDialog(); +#endif private slots: void sslErrorHandler(QNetworkReply* reply, const QList<QSslError> & ssl_errors); @@ -46,6 +51,8 @@ QWebView *webview_; #else QWebEngineView *webview_; + QWebEngineProfile *web_engine_profile_; + QWebEnginePage *web_engine_page_; #endif QUrl url_; QLineEdit *address_text_;
