Hello community, here is the log from the commit of package seafile-client for openSUSE:Factory checked in at 2020-10-13 15:42:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/seafile-client (Old) and /work/SRC/openSUSE:Factory/.seafile-client.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "seafile-client" Tue Oct 13 15:42:29 2020 rev:5 rq:841271 version:7.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/seafile-client/seafile-client.changes 2020-08-10 14:52:00.771810893 +0200 +++ /work/SRC/openSUSE:Factory/.seafile-client.new.3486/seafile-client.changes 2020-10-13 15:44:06.761410005 +0200 @@ -1,0 +2,6 @@ +Mon Oct 12 09:31:40 UTC 2020 - Paolo Stivanin <i...@paolostivanin.com> + +- Update to 7.0.10 (no changelog) +- Add fix-cmake-name.patch + +------------------------------------------------------------------- Old: ---- v7.0.9.tar.gz New: ---- fix-cmake-name.patch v7.0.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seafile-client.spec ++++++ --- /var/tmp/diff_new_pack.8fHczj/_old 2020-10-13 15:44:10.153411470 +0200 +++ /var/tmp/diff_new_pack.8fHczj/_new 2020-10-13 15:44:10.153411470 +0200 @@ -16,9 +16,8 @@ # -# See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: seafile-client -Version: 7.0.9 +Version: 7.0.10 Release: 0 Summary: Cloud storage client License: GPL-3.0-only @@ -27,6 +26,7 @@ Source1: seafile.appdata.xml Patch0: 01-fix-no-return-in-nonvoid.patch Patch1: fix_qpainterpath.patch +Patch2: fix-cmake-name.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cmake @@ -56,7 +56,6 @@ %else BuildRequires: libqt5-linguist-devel BuildRequires: libqt5-qtbase-common-devel -BuildRequires: libqt5-qtwebengine-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Designer) @@ -65,6 +64,7 @@ BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5WebEngineCore) BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(jansson) @@ -80,10 +80,9 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p0 %build -# set path, otherwise qmake is not found -export PATH=$PATH:/usr/lib64/qt5/bin/ export CFLAGS="%{optflags} -fPIE -pie" export CXXFLAGS="%{optflags} -fPIE -pie" %cmake \ ++++++ fix-cmake-name.patch ++++++ --- CMakeLists.txt.orig 2020-10-12 11:46:17.285489025 +0200 +++ CMakeLists.txt 2020-10-12 11:49:32.338025745 +0200 @@ -160,7 +160,7 @@ # have to keep using QtWebKit on windows because QtWebEngine can't be # compiled in msys2/mingw (QtWebEnigne is based on chrome, which has to be # compiled with MSVC.) -FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe) +FIND_PROGRAM(qmake_executable NAMES qmake qmake-qt5 qmake.exe) EXECUTE_PROCESS(COMMAND bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'" OUTPUT_VARIABLE DETECTED_QT_VERSION ++++++ v7.0.9.tar.gz -> v7.0.10.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.9/CMakeLists.txt new/seafile-client-7.0.10/CMakeLists.txt --- old/seafile-client-7.0.9/CMakeLists.txt 2020-07-29 04:24:40.000000000 +0200 +++ new/seafile-client-7.0.10/CMakeLists.txt 2020-10-12 03:57:39.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 9) +SET(SEAFILE_CLIENT_VERSION_PATCH 10) SET(PROJECT_VERSION "${SEAFILE_CLIENT_VERSION_MAJOR}.${SEAFILE_CLIENT_VERSION_MINOR}.${SEAFILE_CLIENT_VERSION_PATCH}") ADD_DEFINITIONS(-DSEAFILE_CLIENT_VERSION=${PROJECT_VERSION}) INCLUDE(FindPkgConfig) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.9/Info.plist new/seafile-client-7.0.10/Info.plist --- old/seafile-client-7.0.9/Info.plist 2020-07-29 04:24:40.000000000 +0200 +++ new/seafile-client-7.0.10/Info.plist 2020-10-12 03:57:39.000000000 +0200 @@ -15,9 +15,9 @@ <key>CFBundleName</key> <string>Seafile</string> <key>CFBundleShortVersionString</key> - <string>7.0.9</string> + <string>7.0.10</string> <key>CFBundleVersion</key> - <string>7.0.9</string> + <string>7.0.10</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.9/debian/changelog new/seafile-client-7.0.10/debian/changelog --- old/seafile-client-7.0.9/debian/changelog 2020-07-29 04:24:40.000000000 +0200 +++ new/seafile-client-7.0.10/debian/changelog 2020-10-12 03:57:39.000000000 +0200 @@ -1,3 +1,7 @@ +seafile-gui (7.0.10) unstable; urgency=low + + * new upstream release + -- Jonathan Xu <jonathan...@seafile.com> Mon, 12 Oct 2020 09:53:25 +0800 seafile-gui (7.0.9) unstable; urgency=low * new upstream release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.9/src/ext-handler.cpp new/seafile-client-7.0.10/src/ext-handler.cpp --- old/seafile-client-7.0.9/src/ext-handler.cpp 2020-07-29 04:24:40.000000000 +0200 +++ new/seafile-client-7.0.10/src/ext-handler.cpp 2020-10-12 03:57:39.000000000 +0200 @@ -140,6 +140,26 @@ return status; } +QString translateHttpErrorCode(const ApiError& error, const QString& req_type) { + QString error_msg; + if ( error.httpErrorCode() == 400 ) { + error_msg = QObject::tr("path or repo_id invalid."); + } else if ( error.httpErrorCode() == 403 ) { + if (req_type == "shared link") { + error_msg = QObject::tr("no permissions to create a shared link"); + } else if (req_type == "upload link") { + error_msg = QObject::tr("no permissions to create a upload link"); + } + } else if ( error.httpErrorCode() == 404 ) { + error_msg = QObject::tr("the file or folder or library could not be found."); + } else if ( error.httpErrorCode() == 500 ) { + error_msg = QObject::tr("internal Server Error"); + } else { + error_msg = QObject::tr("unknown error"); + } + return error_msg; +} + } // namespace @@ -214,6 +234,8 @@ connect(req, SIGNAL(success(const QString&, const QString&)), this, SLOT(onShareLinkGenerated(const QString&))); + connect(req, SIGNAL(failed(const ApiError&)), + this, SLOT(onGetSharedLinkFailed(const ApiError&))); req->send(); } @@ -292,6 +314,11 @@ dialog->activateWindow(); } +void SeafileExtensionHandler::onGetSharedLinkFailed(const ApiError& error) { + QString error_msg = translateHttpErrorCode(error, "shared link"); + seafApplet->warningBox(tr("failed to get share link: ") + error_msg); +} + void SeafileExtensionHandler::onLockFileSuccess() { LockFileRequest *req = qobject_cast<LockFileRequest *>(sender()); @@ -341,8 +368,8 @@ void SeafileExtensionHandler::onGetUploadLinkFailed(const ApiError& error) { GetUploadLinkRequest *req = qobject_cast<GetUploadLinkRequest *>(sender()); - const QString file = ::getBaseName(req->path()); - seafApplet->messageBox(tr("Failed to get upload link information for file \"%1\"").arg(file)); + QString error_msg = translateHttpErrorCode(error, "upload link"); + seafApplet->messageBox(tr("Failed to get upload link: ") + error_msg); req->deleteLater(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.9/src/ext-handler.h new/seafile-client-7.0.10/src/ext-handler.h --- old/seafile-client-7.0.9/src/ext-handler.h 2020-07-29 04:24:40.000000000 +0200 +++ new/seafile-client-7.0.10/src/ext-handler.h 2020-10-12 03:57:39.000000000 +0200 @@ -31,6 +31,7 @@ private slots: void onShareLinkGenerated(const QString& link); + void onGetSharedLinkFailed(const ApiError& error); void onLockFileSuccess(); void onLockFileFailed(const ApiError& error); void generateShareLink(const QString& repo_id, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seafile-client-7.0.9/src/ui/create-repo-dialog.cpp new/seafile-client-7.0.10/src/ui/create-repo-dialog.cpp --- old/seafile-client-7.0.9/src/ui/create-repo-dialog.cpp 2020-07-29 04:24:40.000000000 +0200 +++ new/seafile-client-7.0.10/src/ui/create-repo-dialog.cpp 2020-10-12 03:57:39.000000000 +0200 @@ -115,7 +115,7 @@ } // printf ("magic is %s, random_key is %s salt is %s\n", toCStr(magic), toCStr(random_key), toCStr(salt)); - if (enc_version == 3) { + if (enc_version == 3 || enc_version == 4) { request_ = new CreateRepoRequest( account_, name_, name_, enc_version, repo_id, magic, random_key, salt); } else {
