Attachment #170530 for bug #209679

View | Details | Raw Unified | Return to bug 209679
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= owncloudclient	4	PORTNAME= owncloudclient
5	PORTVERSION= 2.1.1	5	PORTVERSION= 2.2.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= deskutils	7	CATEGORIES= deskutils
8		8

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (owncloud-client-v2.1.1_GH0.tar.gz) = 3eb349e0b5195dd48cfac3288fd45ae545266202b3e3403bc00ffaa4537a3f9d	1	TIMESTAMP = 1463740754
2	SIZE (owncloud-client-v2.1.1_GH0.tar.gz) = 13873040	2	SHA256 (owncloud-client-v2.2.0_GH0.tar.gz) = e3e86eec8f8a07019f510359f65cfb852e380abaadb6a5505b529c1db5ed7323
		3	SIZE (owncloud-client-v2.2.0_GH0.tar.gz) = 14007830

Lines 1-8 Link Here

(-)files/patch-src_gui_accountsettings.cpp (-3 / +3 lines)
1	--- src/gui/accountsettings.cpp.orig 2015-03-16 14:28:58 UTC	1	--- src/gui/accountsettings.cpp.orig 2016-05-12 07:59:12 UTC
2	+++ src/gui/accountsettings.cpp	2	+++ src/gui/accountsettings.cpp
3	@@ -30,7 +30,8 @@	3	@@ -31,7 +31,8 @@
4	#include "selectivesyncdialog.h"
5	#include "creds/abstractcredentials.h"	4	#include "creds/abstractcredentials.h"
		5	#include "tooltipupdater.h"
6		6
7	-#include <math.h>	7	-#include <math.h>
8	+#include <climits>	8	+#include <climits>




--- src/gui/generalsettings.cpp.orig	2016-05-12 07:59:12 UTC
+++ src/gui/generalsettings.cpp
@@ -109,6 +109,7 @@ void GeneralSettings::loadMiscSettings()
 
 void GeneralSettings::slotUpdateInfo()
 {
+#if 0
     OCUpdater *updater = dynamic_cast<OCUpdater*>(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 {




--- src/gui/owncloudgui.cpp.orig	2016-05-12 07:59:12 UTC
+++ src/gui/owncloudgui.cpp
@@ -34,6 +34,8 @@
 #include "accountmanager.h"
 #include "creds/abstractcredentials.h"
 
+#include <climits>
+
 #include <QDesktopServices>
 #include <QDir>
 #include <QMessageBox>
 #include <QSignalMapper>

Lines 1-6 Link Here

(-)files/patch-src_libsync_configfile.cpp (-2 / +2 lines)
1	--- src/libsync/configfile.cpp.orig 2015-03-16 14:28:58 UTC	1	--- src/libsync/configfile.cpp.orig 2016-05-12 07:59:12 UTC
2	+++ src/libsync/configfile.cpp	2	+++ src/libsync/configfile.cpp
3	@@ -383,11 +383,22 @@ bool ConfigFile::skipUpdateCheck( const	3	@@ -415,11 +415,22 @@ bool ConfigFile::skipUpdateCheck( const
4	QString con( connection );	4	QString con( connection );
5	if( connection.isEmpty() ) con = defaultConnection();	5	if( connection.isEmpty() ) con = defaultConnection();
6		6




%%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

%%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

%%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

%%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

%%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

%%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

Return to bug 209679

Lines 1-14 Link Here

(-)files/patch-src_gui_generalsettings.cpp (-6 / +6 lines)
1	--- src/gui/generalsettings.cpp.orig 2015-09-01 13:50:21 UTC	1	--- src/gui/generalsettings.cpp.orig 2016-05-12 07:59:12 UTC
2	+++ src/gui/generalsettings.cpp	2	+++ src/gui/generalsettings.cpp
3	@@ -105,6 +105,7 @@ void GeneralSettings::loadMiscSettings()	3	@@ -109,6 +109,7 @@ void GeneralSettings::loadMiscSettings()
4		4
5	void GeneralSettings::slotUpdateInfo()	5	void GeneralSettings::slotUpdateInfo()
6	{	6	{
7	+#if 0	7	+#if 0
8	if (OCUpdater updater = dynamic_cast<OCUpdater>(Updater::instance())) {	8	OCUpdater updater = dynamic_cast<OCUpdater>(Updater::instance());
9	connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection);	9	if (ConfigFile().skipUpdateCheck()) {
10	connect(_ui->restartButton, SIGNAL(clicked()), updater, SLOT(slotStartInstaller()), Qt::UniqueConnection);	10	updater = 0; // don't show update info if updates are disabled
11	@@ -112,9 +113,12 @@ void GeneralSettings::slotUpdateInfo()	11	@@ -121,9 +122,12 @@ void GeneralSettings::slotUpdateInfo()
12	_ui->updateStateLabel->setText(updater->statusString());	12	_ui->updateStateLabel->setText(updater->statusString());
13	_ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);	13	_ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
14	} else {	14	} else {

Lines 1-11 Link Here

(-)files/patch-src_gui_owncloudgui.cpp (-4 / +4 lines)
1	--- src/gui/owncloudgui.cpp.orig 2015-03-16 14:28:58 UTC	1	--- src/gui/owncloudgui.cpp.orig 2016-05-12 07:59:12 UTC
2	+++ src/gui/owncloudgui.cpp	2	+++ src/gui/owncloudgui.cpp
3	@@ -33,6 +33,8 @@	3	@@ -34,6 +34,8 @@
4	#include "openfilemanager.h"	4	#include "accountmanager.h"
5	#include "creds/abstractcredentials.h"	5	#include "creds/abstractcredentials.h"
6		6
7	+#include <climits>	7	+#include <climits>
8	+	8	+
9	#include <QDesktopServices>	9	#include <QDesktopServices>
		10	#include <QDir>
10	#include <QMessageBox>	11	#include <QMessageBox>
11	#include <QSignalMapper>

Lines 28-33 Link Here

(-)pkg-plist (+6 lines)
28	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-7.png	28	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-7.png
29	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-8.png	29	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-8.png
30	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-9.png	30	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client-9.png
		31	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client12.png
31	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client6.png	32	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client6.png
32	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/folderwizard_local.png	33	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/folderwizard_local.png
33	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/folderwizard_remote.png	34	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/folderwizard_remote.png
Lines 58-63 Link Here
58	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/index.txt	59	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/index.txt
59	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/installing.txt	60	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/installing.txt
60	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/introduction.txt	61	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/introduction.txt
		62	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/lowdiskspace.txt
61	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/navigating.txt	63	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/navigating.txt
62	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/options.txt	64	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/options.txt
63	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/owncloud.1.txt	65	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/owncloud.1.txt
Lines 71-76 Link Here
71	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment-bright.png	73	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment-bright.png
72	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment-close.png	74	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment-close.png
73	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment.png	75	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment.png
		76	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/default.css
74	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/doctools.js	77	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/doctools.js
75	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/down-pressed.png	78	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/down-pressed.png
76	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/down.png	79	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/down.png
Lines 98-103 Link Here
98	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/index.html	101	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/index.html
99	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/installing.html	102	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/installing.html
100	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/introduction.html	103	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/introduction.html
		104	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/lowdiskspace.html
101	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/navigating.html	105	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/navigating.html
102	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/objects.inv	106	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/objects.inv
103	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/options.html	107	%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/options.html
Lines 116-121 Link Here
116	%%PORTDOCS%%%%DOCSDIR%%/latex/client-7.png	120	%%PORTDOCS%%%%DOCSDIR%%/latex/client-7.png
117	%%PORTDOCS%%%%DOCSDIR%%/latex/client-8.png	121	%%PORTDOCS%%%%DOCSDIR%%/latex/client-8.png
118	%%PORTDOCS%%%%DOCSDIR%%/latex/client-9.png	122	%%PORTDOCS%%%%DOCSDIR%%/latex/client-9.png
		123	%%PORTDOCS%%%%DOCSDIR%%/latex/client12.png
119	%%PORTDOCS%%%%DOCSDIR%%/latex/client6.png	124	%%PORTDOCS%%%%DOCSDIR%%/latex/client6.png
120	%%PORTDOCS%%%%DOCSDIR%%/latex/fncychap.sty	125	%%PORTDOCS%%%%DOCSDIR%%/latex/fncychap.sty
121	%%PORTDOCS%%%%DOCSDIR%%/latex/icon-error.png	126	%%PORTDOCS%%%%DOCSDIR%%/latex/icon-error.png
Lines 129-134 Link Here
129	%%PORTDOCS%%%%DOCSDIR%%/latex/logo-blue.pdf	134	%%PORTDOCS%%%%DOCSDIR%%/latex/logo-blue.pdf
130	%%PORTDOCS%%%%DOCSDIR%%/latex/mac-share.png	135	%%PORTDOCS%%%%DOCSDIR%%/latex/mac-share.png
131	%%PORTDOCS%%%%DOCSDIR%%/latex/menu.png	136	%%PORTDOCS%%%%DOCSDIR%%/latex/menu.png
		137	%%PORTDOCS%%%%DOCSDIR%%/latex/newfloat.sty
132	%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.aux	138	%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.aux
133	%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.idx	139	%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.idx
134	%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ilg	140	%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ilg