Hi,
update for nextcloudclient v2.6.5.
Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.5
OK?
--
Adriano Barbosa
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 10 Mar 2020 13:11:36 -0000 1.6
+++ Makefile 11 Jul 2020 21:58:01 -0000
@@ -2,7 +2,7 @@
COMMENT = desktop sync client for Nextcloud
-V = 2.6.4
+V = 2.6.5
DISTNAME = nextcloudclient-${V}
GH_ACCOUNT = nextcloud
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 10 Mar 2020 13:11:36 -0000 1.4
+++ distinfo 11 Jul 2020 21:58:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-2.6.4.tar.gz) = rqTf9r8qa9K3g6YXWsI5P/yuKUlTaxXe96rkNy8MJO8=
-SIZE (nextcloudclient-2.6.4.tar.gz) = 19035129
+SHA256 (nextcloudclient-2.6.5.tar.gz) = k1OF/wcXSk2FwtTtpNBprrSqjQ5ohlss+KJMqMyIMog=
+SIZE (nextcloudclient-2.6.5.tar.gz) = 19134736
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 16 Nov 2019 10:27:43 -0000 1.1.1.1
+++ patches/patch-CMakeLists_txt 11 Jul 2020 21:58:01 -0000
@@ -18,7 +18,7 @@ Index: CMakeLists.txt
add_definitions(
-DQT_USE_QSTRINGBUILDER
-DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output
-@@ -182,7 +178,7 @@ if(BUILD_CLIENT)
+@@ -191,7 +187,7 @@ if(BUILD_CLIENT)
find_package(INotify)
endif()
find_package(Sphinx)
@@ -27,7 +27,7 @@ Index: CMakeLists.txt
find_package(OpenSSL 1.1 REQUIRED )
find_package(ZLIB REQUIRED)
-@@ -227,8 +223,8 @@ if(BUILD_CLIENT)
+@@ -238,8 +234,8 @@ if(BUILD_CLIENT)
add_subdirectory(src)
if(NOT BUILD_LIBRARIES_ONLY)
add_subdirectory(man)
Index: patches/patch-src_gui_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_gui_CMakeLists_txt
--- patches/patch-src_gui_CMakeLists_txt 28 Dec 2019 13:48:04 -0000 1.2
+++ patches/patch-src_gui_CMakeLists_txt 11 Jul 2020 21:58:01 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_gui_CMakeLists_txt,v
Index: src/gui/CMakeLists.txt
--- src/gui/CMakeLists.txt.orig
+++ src/gui/CMakeLists.txt
-@@ -35,14 +35,12 @@ set(client_UI_SRCS
+@@ -38,14 +38,12 @@ set(client_UI_SRCS
addcertificatedialog.ui
proxyauthdialog.ui
mnemonicdialog.ui
@@ -18,12 +18,11 @@ Index: src/gui/CMakeLists.txt
)
set(client_SRCS
-@@ -108,24 +106,17 @@ set(client_SRCS
+@@ -110,23 +108,16 @@ set(client_SRCS
creds/credentialsfactory.cpp
creds/httpcredentialsgui.cpp
creds/oauth.cpp
- creds/flow2auth.cpp
- creds/keychainchunk.cpp
- creds/webflowcredentials.cpp
- creds/webflowcredentialsdialog.cpp
wizard/postfixlineedit.cpp
@@ -43,12 +42,12 @@ Index: src/gui/CMakeLists.txt
wizard/slideshow.cpp
)
-@@ -298,7 +289,7 @@ else()
- endif()
-
- add_library(updater STATIC ${updater_SRCS})
--target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
-+target_link_libraries(updater ${synclib_NAME} Qt5::Widgets Qt5::Network Qt5::Xml)
- target_include_directories(updater PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
+@@ -313,7 +304,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPE
set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
+
+-target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml)
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+ IF(BUILD_UPDATER)
+ target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
Index: patches/patch-src_gui_application_cpp
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_gui_application_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_gui_application_cpp
--- patches/patch-src_gui_application_cpp 28 Dec 2019 13:48:04 -0000 1.2
+++ patches/patch-src_gui_application_cpp 11 Jul 2020 21:58:01 -0000
@@ -3,16 +3,18 @@ $OpenBSD: patch-src_gui_application_cpp,
Index: src/gui/application.cpp
--- src/gui/application.cpp.orig
+++ src/gui/application.cpp
-@@ -245,13 +245,6 @@ Application::Application(int &argc, char **argv)
+@@ -260,15 +260,6 @@ Application::Application(int &argc, char **argv)
connect(&_networkConfigurationManager, &QNetworkConfigurationManager::configurationChanged,
this, &Application::slotSystemOnlineConfigurationChanged);
+-#if defined(BUILD_UPDATER)
- // Update checks
- UpdaterScheduler *updaterScheduler = new UpdaterScheduler(this);
- connect(updaterScheduler, &UpdaterScheduler::updaterAnnouncement,
- _gui.data(), &ownCloudGui::slotShowTrayMessage);
- connect(updaterScheduler, &UpdaterScheduler::requestRestart,
- _folderManager.data(), &FolderMan::slotScheduleAppRestart);
+-#endif
-
// Cleanup at Quit.
connect(this, &QCoreApplication::aboutToQuit, this, &Application::slotCleanup);
Index: patches/patch-src_libsync_networkjobs_cpp
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/patches/patch-src_libsync_networkjobs_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_libsync_networkjobs_cpp
--- patches/patch-src_libsync_networkjobs_cpp 28 Dec 2019 13:48:04 -0000 1.2
+++ patches/patch-src_libsync_networkjobs_cpp 11 Jul 2020 21:58:01 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_libsync_networkjobs_
Index: src/libsync/networkjobs.cpp
--- src/libsync/networkjobs.cpp.orig
+++ src/libsync/networkjobs.cpp
-@@ -921,7 +921,7 @@ void DetermineAuthTypeJob::start()
+@@ -922,7 +922,7 @@ void DetermineAuthTypeJob::start()
});
connect(oldFlowRequired, &JsonApiJob::jsonReceived, this, [this](const QJsonDocument &json, int statusCode) {
if (statusCode == 200) {
@@ -12,7 +12,7 @@ Index: src/libsync/networkjobs.cpp
auto data = json.object().value("ocs").toObject().value("data").toObject().value("capabilities").toObject();
auto gs = data.value("globalscale");
-@@ -929,7 +929,7 @@ void DetermineAuthTypeJob::start()
+@@ -930,7 +930,7 @@ void DetermineAuthTypeJob::start()
auto flow = gs.toObject().value("desktoplogin");
if (flow != QJsonValue::Undefined) {
if (flow.toInt() == 1) {
@@ -21,7 +21,7 @@ Index: src/libsync/networkjobs.cpp
}
}
}
-@@ -955,17 +955,12 @@ void DetermineAuthTypeJob::checkAllDone()
+@@ -956,17 +956,12 @@ void DetermineAuthTypeJob::checkAllDone()
// WebViewFlow > OAuth > Shib > Basic
if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 Feb 2020 13:09:06 -0000 1.3
+++ pkg/PLIST 11 Jul 2020 21:58:01 -0000
@@ -16,7 +16,7 @@ include/nextcloudsync/mirall/syncresult.
@lib lib/libnextcloudsync.so.${LIBnextcloudsync_VERSION}
lib/nextcloud/
@lib lib/nextcloud/libocsync.so.${LIBocsync_VERSION}
-share/applications/nextcloud.desktop
+share/applications/com.nextcloud.desktopclient.nextcloud.desktop
share/examples/Nextcloud/
@sample ${SYSCONFDIR}/Nextcloud/
share/examples/Nextcloud/sync-exclude.lst
@@ -72,8 +72,10 @@ share/nextcloud/i18n/client_ja.qm
share/nextcloud/i18n/client_ko.qm
share/nextcloud/i18n/client_lt_LT.qm
share/nextcloud/i18n/client_lv.qm
+share/nextcloud/i18n/client_mk.qm
share/nextcloud/i18n/client_nb_NO.qm
share/nextcloud/i18n/client_nl.qm
+share/nextcloud/i18n/client_oc.qm
share/nextcloud/i18n/client_pl.qm
share/nextcloud/i18n/client_pt.qm
share/nextcloud/i18n/client_pt_BR.qm
