From owner-svn-ports-all@freebsd.org Wed May 25 08:20:26 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20DCBB496CB; Wed, 25 May 2016 08:20:26 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B52C612F3; Wed, 25 May 2016 08:20:25 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4P8KOrd039967; Wed, 25 May 2016 08:20:24 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4P8KOwa039960; Wed, 25 May 2016 08:20:24 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201605250820.u4P8KOwa039960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Wed, 25 May 2016 08:20:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415822 - in head/deskutils/owncloudclient: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2016 08:20:26 -0000 Author: madpilot Date: Wed May 25 08:20:24 2016 New Revision: 415822 URL: https://svnweb.freebsd.org/changeset/ports/415822 Log: Update to 2.2.0 PR: 209679 Submitted by: me Approved by: Yonas Yanfa (maintainer) Modified: head/deskutils/owncloudclient/Makefile head/deskutils/owncloudclient/distinfo head/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp head/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp head/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp head/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp head/deskutils/owncloudclient/pkg-plist Modified: head/deskutils/owncloudclient/Makefile ============================================================================== --- head/deskutils/owncloudclient/Makefile Wed May 25 03:24:10 2016 (r415821) +++ head/deskutils/owncloudclient/Makefile Wed May 25 08:20:24 2016 (r415822) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= owncloudclient -PORTVERSION= 2.1.1 +PORTVERSION= 2.2.0 DISTVERSIONPREFIX= v CATEGORIES= deskutils Modified: head/deskutils/owncloudclient/distinfo ============================================================================== --- head/deskutils/owncloudclient/distinfo Wed May 25 03:24:10 2016 (r415821) +++ head/deskutils/owncloudclient/distinfo Wed May 25 08:20:24 2016 (r415822) @@ -1,2 +1,3 @@ -SHA256 (owncloud-client-v2.1.1_GH0.tar.gz) = 3eb349e0b5195dd48cfac3288fd45ae545266202b3e3403bc00ffaa4537a3f9d -SIZE (owncloud-client-v2.1.1_GH0.tar.gz) = 13873040 +TIMESTAMP = 1463740754 +SHA256 (owncloud-client-v2.2.0_GH0.tar.gz) = e3e86eec8f8a07019f510359f65cfb852e380abaadb6a5505b529c1db5ed7323 +SIZE (owncloud-client-v2.2.0_GH0.tar.gz) = 14007830 Modified: head/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp ============================================================================== --- head/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp Wed May 25 03:24:10 2016 (r415821) +++ head/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp Wed May 25 08:20:24 2016 (r415822) @@ -1,8 +1,8 @@ ---- src/gui/accountsettings.cpp.orig 2015-03-16 14:28:58 UTC +--- src/gui/accountsettings.cpp.orig 2016-05-12 07:59:12 UTC +++ src/gui/accountsettings.cpp -@@ -30,7 +30,8 @@ - #include "selectivesyncdialog.h" +@@ -31,7 +31,8 @@ #include "creds/abstractcredentials.h" + #include "tooltipupdater.h" -#include +#include Modified: head/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp ============================================================================== --- head/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp Wed May 25 03:24:10 2016 (r415821) +++ head/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp Wed May 25 08:20:24 2016 (r415822) @@ -1,14 +1,14 @@ ---- src/gui/generalsettings.cpp.orig 2015-09-01 13:50:21 UTC +--- src/gui/generalsettings.cpp.orig 2016-05-12 07:59:12 UTC +++ src/gui/generalsettings.cpp -@@ -105,6 +105,7 @@ void GeneralSettings::loadMiscSettings() +@@ -109,6 +109,7 @@ void GeneralSettings::loadMiscSettings() void GeneralSettings::slotUpdateInfo() { +#if 0 - if (OCUpdater *updater = dynamic_cast(Updater::instance())) { - connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection); - connect(_ui->restartButton, SIGNAL(clicked()), updater, SLOT(slotStartInstaller()), Qt::UniqueConnection); -@@ -112,9 +113,12 @@ void GeneralSettings::slotUpdateInfo() + OCUpdater *updater = dynamic_cast(Updater::instance()); + if (ConfigFile().skipUpdateCheck()) { + updater = 0; // don't show update info if updates are disabled +@@ -121,9 +122,12 @@ void GeneralSettings::slotUpdateInfo() _ui->updateStateLabel->setText(updater->statusString()); _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete); } else { Modified: head/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp ============================================================================== --- head/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp Wed May 25 03:24:10 2016 (r415821) +++ head/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp Wed May 25 08:20:24 2016 (r415822) @@ -1,11 +1,11 @@ ---- src/gui/owncloudgui.cpp.orig 2015-03-16 14:28:58 UTC +--- src/gui/owncloudgui.cpp.orig 2016-05-12 07:59:12 UTC +++ src/gui/owncloudgui.cpp -@@ -33,6 +33,8 @@ - #include "openfilemanager.h" +@@ -34,6 +34,8 @@ + #include "accountmanager.h" #include "creds/abstractcredentials.h" +#include + #include + #include #include - #include Modified: head/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp ============================================================================== --- head/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp Wed May 25 03:24:10 2016 (r415821) +++ head/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp Wed May 25 08:20:24 2016 (r415822) @@ -1,6 +1,6 @@ ---- src/libsync/configfile.cpp.orig 2015-03-16 14:28:58 UTC +--- src/libsync/configfile.cpp.orig 2016-05-12 07:59:12 UTC +++ src/libsync/configfile.cpp -@@ -383,11 +383,22 @@ bool ConfigFile::skipUpdateCheck( const +@@ -415,11 +415,22 @@ bool ConfigFile::skipUpdateCheck( const QString con( connection ); if( connection.isEmpty() ) con = defaultConnection(); Modified: head/deskutils/owncloudclient/pkg-plist ============================================================================== --- head/deskutils/owncloudclient/pkg-plist Wed May 25 03:24:10 2016 (r415821) +++ head/deskutils/owncloudclient/pkg-plist Wed May 25 08:20:24 2016 (r415822) @@ -28,6 +28,7 @@ share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-7.png %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-8.png %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-9.png +%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client12.png %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client6.png %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/folderwizard_local.png %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/folderwizard_remote.png @@ -58,6 +59,7 @@ share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/index.txt %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/installing.txt %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/introduction.txt +%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/lowdiskspace.txt %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/navigating.txt %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/options.txt %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/owncloud.1.txt @@ -71,6 +73,7 @@ share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment-bright.png %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment-close.png %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment.png +%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/default.css %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/doctools.js %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/down-pressed.png %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/down.png @@ -98,6 +101,7 @@ share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/index.html %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/installing.html %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/introduction.html +%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/lowdiskspace.html %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/navigating.html %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/objects.inv %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/options.html @@ -116,6 +120,7 @@ share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/latex/client-7.png %%PORTDOCS%%%%DOCSDIR%%/latex/client-8.png %%PORTDOCS%%%%DOCSDIR%%/latex/client-9.png +%%PORTDOCS%%%%DOCSDIR%%/latex/client12.png %%PORTDOCS%%%%DOCSDIR%%/latex/client6.png %%PORTDOCS%%%%DOCSDIR%%/latex/fncychap.sty %%PORTDOCS%%%%DOCSDIR%%/latex/icon-error.png @@ -129,6 +134,7 @@ share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/latex/logo-blue.pdf %%PORTDOCS%%%%DOCSDIR%%/latex/mac-share.png %%PORTDOCS%%%%DOCSDIR%%/latex/menu.png +%%PORTDOCS%%%%DOCSDIR%%/latex/newfloat.sty %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.aux %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.idx %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ilg