Attachment #150101 for bug #195582

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




# $FreeBSD$

PORTNAME=	mirall
PORTVERSION=	1.7.0
CATEGORIES=	deskutils
MASTER_SITES=	http://download.owncloud.com/desktop/stable/



.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e \
		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt

post-build:
	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)

post-install:
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (mirall-1.6.3.tar.bz2) = 89e4488881a53956cdedab21d05eb61b2c00bb31a20286b72836e39a3126204b	1	SHA256 (mirall-1.7.0.tar.bz2) = b1cb0612e5022de263dc4c6309eba8207d694a40a80dae6762b4a56fa8d4d944
2	SIZE (mirall-1.6.3.tar.bz2) = 8635406	2	SIZE (mirall-1.7.0.tar.bz2) = 12634961

Lines 1-10 Link Here

(-)files/patch-src__CMakeLists.txt (-8 / +8 lines)
1	--- src/CMakeLists.txt.orig	1	--- src/CMakeLists.txt.orig 2014-11-06 18:26:43 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -131,6 +131,7 @@	3	@@ -23,6 +23,7 @@ if ( APPLE )
		4	endif()
4		5
5	IF( NOT WIN32 AND NOT APPLE )	6	IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
6	set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_linux.cpp)	7	+ link_directories($ENV{INOTIFY_LIB})
7	+ link_directories($ENV{INOTIFY_LIB})	8	list(APPEND OS_SPECIFIC_LINK_LIBRARIES
8	ENDIF()	9	inotify
9	IF( WIN32 )	10	)
10	set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_win.cpp)

Lines 1-10 Link Here

(-)files/patch-src__mirall__filesystem.cpp (-10 lines)
1	--- src/mirall/filesystem.cpp.orig
2	+++ src/mirall/filesystem.cpp
3	@@ -12,6 +12,7 @@
4	*/
5
6	#include "filesystem.h"
7	+#include <sys/time.h>
8	#include <QFile>
9	#include <QDebug>
10




--- src/mirall/generalsettings.cpp.orig	2014-12-02 18:16:18 UTC
+++ src/mirall/generalsettings.cpp
@@ -77,6 +77,7 @@ void GeneralSettings::loadMiscSettings()
 
 void GeneralSettings::slotUpdateInfo()
 {
+  #if 0
     if (OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance()))
     {
         connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection);
@@ -85,9 +86,12 @@ void GeneralSettings::slotUpdateInfo()
         _ui->updateStateLabel->setText(updater->statusString());
         _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
     } else {
+  #endif
         // can't have those infos from sparkle currently
         _ui->updatesGroupBox->setVisible(false);
+  #if 0
     }
+  #endif
 }
 
 void GeneralSettings::saveMiscSettings()

Lines 1-6 Link Here

(-)files/patch-src__mirall__mirallconfigfile.cpp (-3 / +3 lines)
1	--- src/mirall/mirallconfigfile.cpp.orig	1	--- src/mirall/mirallconfigfile.cpp.orig 2014-12-02 18:21:09 UTC
2	+++ src/mirall/mirallconfigfile.cpp	2	+++ src/mirall/mirallconfigfile.cpp
3	@@ -359,11 +359,22 @@	3	@@ -378,11 +378,22 @@ bool MirallConfigFile::skipUpdateCheck(
4	QString con( connection );	4	QString con( connection );
5	if( connection.isEmpty() ) con = defaultConnection();	5	if( connection.isEmpty() ) con = defaultConnection();
6		6
Lines 16-22 Link Here
16	return value.toBool();	16	return value.toBool();
17	+#else	17	+#else
18	+ if ( !value.toBool() )	18	+ if ( !value.toBool() )
19	+ qDebug() << "FreeBSD package disabled the UpdateCheck mechanism.";	19	+ qDebug() << "FreeBSD package disabled the UpdateCheck mechanism.";
20	+	20	+
21	+ return true;	21	+ return true;
22	+#endif	22	+#endif

Lines 1-5 Link Here

(-)files/patch-src__mirall__syncjournalfilerecord.h (-2 / +2 lines)
1	--- ./src/mirall/syncjournalfilerecord.h.orig 2014-01-09 19:53:32.000000000 +0100	1	--- src/mirall/syncjournalfilerecord.h.orig 2014-11-06 18:26:43 UTC
2	+++ ./src/mirall/syncjournalfilerecord.h 2014-01-09 19:53:44.000000000 +0100	2	+++ src/mirall/syncjournalfilerecord.h
3	@@ -14,6 +14,7 @@	3	@@ -14,6 +14,7 @@
4	#ifndef SYNCJOURNALFILERECORD_H	4	#ifndef SYNCJOURNALFILERECORD_H
5	#define SYNCJOURNALFILERECORD_H	5	#define SYNCJOURNALFILERECORD_H




%%QT_BINDIR%%/owncloud
%%QT_BINDIR%%/owncloudcmd
etc/ownCloud/sync-exclude.lst
include/httpbf.h
include/owncloudsync/creds/abstractcredentials.h
include/owncloudsync/creds/httpcredentials.h
include/owncloudsync/mirall/account.h
include/owncloudsync/mirall/folder.h
include/owncloudsync/mirall/folderman.h
include/owncloudsync/mirall/folderwatcher.h
include/owncloudsync/mirall/mirallconfigfile.h
include/owncloudsync/mirall/networkjobs.h
include/owncloudsync/mirall/progressdispatcher.h

lib/libhttpbf.a
lib/libowncloudsync.so
lib/libowncloudsync.so.0
lib/libowncloudsync.so.1.7.0
lib/owncloud/libocsync.so
lib/owncloud/libocsync.so.0
lib/owncloud/libocsync.so.0.2.1

%%PORTDOCS%%%%DOCSDIR%%/latex/wizard_user.png
%%PORTDOCS%%%%DOCSDIR%%/logo-blue.pdf
%%PORTDOCS%%%%DOCSDIR%%/ownCloudClientManual.pdf
share/icons/hicolor/128x128/apps/ownCloud_error.png
share/icons/hicolor/128x128/apps/ownCloud_error_shared.png
share/icons/hicolor/128x128/apps/ownCloud_ok.png
share/icons/hicolor/128x128/apps/ownCloud_ok_shared.png
share/icons/hicolor/128x128/apps/ownCloud_sync.png
share/icons/hicolor/128x128/apps/ownCloud_sync_shared.png
share/icons/hicolor/128x128/apps/ownCloud_warn.png
share/icons/hicolor/128x128/apps/ownCloud_warn_shared.png
share/icons/hicolor/128x128/apps/owncloud.png
share/icons/hicolor/16x16/apps/ownCloud_error.png
share/icons/hicolor/16x16/apps/ownCloud_error_shared.png
share/icons/hicolor/16x16/apps/ownCloud_ok.png
share/icons/hicolor/16x16/apps/ownCloud_ok_shared.png
share/icons/hicolor/16x16/apps/ownCloud_sync.png
share/icons/hicolor/16x16/apps/ownCloud_sync_shared.png
share/icons/hicolor/16x16/apps/ownCloud_warn.png
share/icons/hicolor/16x16/apps/ownCloud_warn_shared.png
share/icons/hicolor/22x22/apps/owncloud.png
share/icons/hicolor/256x256/apps/ownCloud_error.png
share/icons/hicolor/256x256/apps/ownCloud_error_shared.png
share/icons/hicolor/256x256/apps/ownCloud_ok.png
share/icons/hicolor/256x256/apps/ownCloud_ok_shared.png
share/icons/hicolor/256x256/apps/ownCloud_sync.png
share/icons/hicolor/256x256/apps/ownCloud_sync_shared.png
share/icons/hicolor/256x256/apps/ownCloud_warn.png
share/icons/hicolor/256x256/apps/ownCloud_warn_shared.png
share/icons/hicolor/32x32/apps/ownCloud_error.png
share/icons/hicolor/32x32/apps/ownCloud_error_shared.png
share/icons/hicolor/32x32/apps/ownCloud_ok.png
share/icons/hicolor/32x32/apps/ownCloud_ok_shared.png
share/icons/hicolor/32x32/apps/ownCloud_sync.png
share/icons/hicolor/32x32/apps/ownCloud_sync_shared.png
share/icons/hicolor/32x32/apps/ownCloud_warn.png
share/icons/hicolor/32x32/apps/ownCloud_warn_shared.png
share/icons/hicolor/32x32/apps/owncloud.png
share/icons/hicolor/48x48/apps/ownCloud_error.png
share/icons/hicolor/48x48/apps/ownCloud_error_shared.png
share/icons/hicolor/48x48/apps/ownCloud_ok.png
share/icons/hicolor/48x48/apps/ownCloud_ok_shared.png
share/icons/hicolor/48x48/apps/ownCloud_sync.png
share/icons/hicolor/48x48/apps/ownCloud_sync_shared.png
share/icons/hicolor/48x48/apps/ownCloud_warn.png
share/icons/hicolor/48x48/apps/ownCloud_warn_shared.png
share/icons/hicolor/48x48/apps/owncloud.png
share/icons/hicolor/64x64/apps/ownCloud_error.png
share/icons/hicolor/64x64/apps/ownCloud_error_shared.png
share/icons/hicolor/64x64/apps/ownCloud_ok.png
share/icons/hicolor/64x64/apps/ownCloud_ok_shared.png
share/icons/hicolor/64x64/apps/ownCloud_sync.png
share/icons/hicolor/64x64/apps/ownCloud_sync_shared.png
share/icons/hicolor/64x64/apps/ownCloud_warn.png
share/icons/hicolor/64x64/apps/ownCloud_warn_shared.png
share/icons/hicolor/64x64/apps/owncloud.png
share/icons/hicolor/72x72/apps/ownCloud_error.png
share/icons/hicolor/72x72/apps/ownCloud_error_shared.png
share/icons/hicolor/72x72/apps/ownCloud_ok.png
share/icons/hicolor/72x72/apps/ownCloud_ok_shared.png
share/icons/hicolor/72x72/apps/ownCloud_sync.png
share/icons/hicolor/72x72/apps/ownCloud_sync_shared.png
share/icons/hicolor/72x72/apps/ownCloud_warn.png
share/icons/hicolor/72x72/apps/ownCloud_warn_shared.png
share/nautilus-python/extensions/syncstate.py
share/owncloud/i18n/mirall_TW.qm
share/owncloud/i18n/mirall_ca.qm
share/owncloud/i18n/mirall_cs.qm

Return to bug 195582

Lines 2-8 Link Here

(-)Makefile (-8 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mirall	4	PORTNAME= mirall
5	PORTVERSION= 1.6.3	5	PORTVERSION= 1.7.0
6	CATEGORIES= deskutils	6	CATEGORIES= deskutils
7	MASTER_SITES= http://download.owncloud.com/desktop/stable/	7	MASTER_SITES= http://download.owncloud.com/desktop/stable/
8		8
Lines 37-49 Link Here
37		37
38	.include <bsd.port.options.mk>	38	.include <bsd.port.options.mk>
39		39
40	post-patch:
41	@${REINPLACE_CMD} -e \
42	's\|.lst \|.lst.sample \|' ${WRKSRC}/CMakeLists.txt
43
44	post-build:
45	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)
46
47	post-install:	40	post-install:
48	.if ${PORT_OPTIONS:MDOCS}	41	.if ${PORT_OPTIONS:MDOCS}
49	@${MKDIR} ${STAGEDIR}${DOCSDIR}	42	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-23 Link Here

(-)files/patch-src__mirall__generalsettings.cpp (-7 / +7 lines)
1	--- src/mirall/generalsettings.cpp.orig	1	--- src/mirall/generalsettings.cpp.orig 2014-12-02 18:16:18 UTC
2	+++ src/mirall/generalsettings.cpp	2	+++ src/mirall/generalsettings.cpp
3	@@ -76,6 +76,7 @@	3	@@ -77,6 +77,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	if (OCUpdater updater = dynamic_cast<OCUpdater>(Updater::instance()))
9	{	9	{
10	connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection);	10	connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection);
11	@@ -84,9 +85,12 @@	11	@@ -85,9 +86,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 {
15	+#endif	15	+ #endif
16	// can't have those infos from sparkle currently	16	// can't have those infos from sparkle currently
17	_ui->updatesGroupBox->setVisible(false);	17	_ui->updatesGroupBox->setVisible(false);
18	+#if 0	18	+ #if 0
19	}	19	}
20	+#endif	20	+ #endif
21	}	21	}
22		22
23	void GeneralSettings::saveMiscSettings()	23	void GeneralSettings::saveMiscSettings()

Lines 1-13 Link Here

(-)pkg-plist (-7 / +61 lines)
1	bin/owncloud	1	%%QT_BINDIR%%/owncloud
2	bin/owncloudcmd	2	%%QT_BINDIR%%/owncloudcmd
3	@sample etc/ownCloud/sync-exclude.lst.sample	3	etc/ownCloud/sync-exclude.lst
4	include/httpbf.h	4	include/httpbf.h
5	include/owncloudsync/creds/abstractcredentials.h	5	include/owncloudsync/creds/abstractcredentials.h
6	include/owncloudsync/creds/httpcredentials.h	6	include/owncloudsync/creds/httpcredentials.h
7	include/owncloudsync/mirall/account.h	7	include/owncloudsync/mirall/account.h
8	include/owncloudsync/mirall/folder.h
9	include/owncloudsync/mirall/folderman.h
10	include/owncloudsync/mirall/folderwatcher.h
11	include/owncloudsync/mirall/mirallconfigfile.h	8	include/owncloudsync/mirall/mirallconfigfile.h
12	include/owncloudsync/mirall/networkjobs.h	9	include/owncloudsync/mirall/networkjobs.h
13	include/owncloudsync/mirall/progressdispatcher.h	10	include/owncloudsync/mirall/progressdispatcher.h
Lines 18-24 Link Here
18	lib/libhttpbf.a	15	lib/libhttpbf.a
19	lib/libowncloudsync.so	16	lib/libowncloudsync.so
20	lib/libowncloudsync.so.0	17	lib/libowncloudsync.so.0
21	lib/libowncloudsync.so.1.6.3	18	lib/libowncloudsync.so.1.7.0
22	lib/owncloud/libocsync.so	19	lib/owncloud/libocsync.so
23	lib/owncloud/libocsync.so.0	20	lib/owncloud/libocsync.so.0
24	lib/owncloud/libocsync.so.0.2.1	21	lib/owncloud/libocsync.so.0.2.1
Lines 231-241 Link Here
231	%%PORTDOCS%%%%DOCSDIR%%/latex/wizard_user.png	228	%%PORTDOCS%%%%DOCSDIR%%/latex/wizard_user.png
232	%%PORTDOCS%%%%DOCSDIR%%/logo-blue.pdf	229	%%PORTDOCS%%%%DOCSDIR%%/logo-blue.pdf
233	%%PORTDOCS%%%%DOCSDIR%%/ownCloudClientManual.pdf	230	%%PORTDOCS%%%%DOCSDIR%%/ownCloudClientManual.pdf
		231	share/icons/hicolor/128x128/apps/ownCloud_error.png
		232	share/icons/hicolor/128x128/apps/ownCloud_error_shared.png
		233	share/icons/hicolor/128x128/apps/ownCloud_ok.png
		234	share/icons/hicolor/128x128/apps/ownCloud_ok_shared.png
		235	share/icons/hicolor/128x128/apps/ownCloud_sync.png
		236	share/icons/hicolor/128x128/apps/ownCloud_sync_shared.png
		237	share/icons/hicolor/128x128/apps/ownCloud_warn.png
		238	share/icons/hicolor/128x128/apps/ownCloud_warn_shared.png
234	share/icons/hicolor/128x128/apps/owncloud.png	239	share/icons/hicolor/128x128/apps/owncloud.png
		240	share/icons/hicolor/16x16/apps/ownCloud_error.png
		241	share/icons/hicolor/16x16/apps/ownCloud_error_shared.png
		242	share/icons/hicolor/16x16/apps/ownCloud_ok.png
		243	share/icons/hicolor/16x16/apps/ownCloud_ok_shared.png
		244	share/icons/hicolor/16x16/apps/ownCloud_sync.png
		245	share/icons/hicolor/16x16/apps/ownCloud_sync_shared.png
		246	share/icons/hicolor/16x16/apps/ownCloud_warn.png
		247	share/icons/hicolor/16x16/apps/ownCloud_warn_shared.png
235	share/icons/hicolor/22x22/apps/owncloud.png	248	share/icons/hicolor/22x22/apps/owncloud.png
		249	share/icons/hicolor/256x256/apps/ownCloud_error.png
		250	share/icons/hicolor/256x256/apps/ownCloud_error_shared.png
		251	share/icons/hicolor/256x256/apps/ownCloud_ok.png
		252	share/icons/hicolor/256x256/apps/ownCloud_ok_shared.png
		253	share/icons/hicolor/256x256/apps/ownCloud_sync.png
		254	share/icons/hicolor/256x256/apps/ownCloud_sync_shared.png
		255	share/icons/hicolor/256x256/apps/ownCloud_warn.png
		256	share/icons/hicolor/256x256/apps/ownCloud_warn_shared.png
		257	share/icons/hicolor/32x32/apps/ownCloud_error.png
		258	share/icons/hicolor/32x32/apps/ownCloud_error_shared.png
		259	share/icons/hicolor/32x32/apps/ownCloud_ok.png
		260	share/icons/hicolor/32x32/apps/ownCloud_ok_shared.png
		261	share/icons/hicolor/32x32/apps/ownCloud_sync.png
		262	share/icons/hicolor/32x32/apps/ownCloud_sync_shared.png
		263	share/icons/hicolor/32x32/apps/ownCloud_warn.png
		264	share/icons/hicolor/32x32/apps/ownCloud_warn_shared.png
236	share/icons/hicolor/32x32/apps/owncloud.png	265	share/icons/hicolor/32x32/apps/owncloud.png
		266	share/icons/hicolor/48x48/apps/ownCloud_error.png
		267	share/icons/hicolor/48x48/apps/ownCloud_error_shared.png
		268	share/icons/hicolor/48x48/apps/ownCloud_ok.png
		269	share/icons/hicolor/48x48/apps/ownCloud_ok_shared.png
		270	share/icons/hicolor/48x48/apps/ownCloud_sync.png
		271	share/icons/hicolor/48x48/apps/ownCloud_sync_shared.png
		272	share/icons/hicolor/48x48/apps/ownCloud_warn.png
		273	share/icons/hicolor/48x48/apps/ownCloud_warn_shared.png
237	share/icons/hicolor/48x48/apps/owncloud.png	274	share/icons/hicolor/48x48/apps/owncloud.png
		275	share/icons/hicolor/64x64/apps/ownCloud_error.png
		276	share/icons/hicolor/64x64/apps/ownCloud_error_shared.png
		277	share/icons/hicolor/64x64/apps/ownCloud_ok.png
		278	share/icons/hicolor/64x64/apps/ownCloud_ok_shared.png
		279	share/icons/hicolor/64x64/apps/ownCloud_sync.png
		280	share/icons/hicolor/64x64/apps/ownCloud_sync_shared.png
		281	share/icons/hicolor/64x64/apps/ownCloud_warn.png
		282	share/icons/hicolor/64x64/apps/ownCloud_warn_shared.png
238	share/icons/hicolor/64x64/apps/owncloud.png	283	share/icons/hicolor/64x64/apps/owncloud.png
		284	share/icons/hicolor/72x72/apps/ownCloud_error.png
		285	share/icons/hicolor/72x72/apps/ownCloud_error_shared.png
		286	share/icons/hicolor/72x72/apps/ownCloud_ok.png
		287	share/icons/hicolor/72x72/apps/ownCloud_ok_shared.png
		288	share/icons/hicolor/72x72/apps/ownCloud_sync.png
		289	share/icons/hicolor/72x72/apps/ownCloud_sync_shared.png
		290	share/icons/hicolor/72x72/apps/ownCloud_warn.png
		291	share/icons/hicolor/72x72/apps/ownCloud_warn_shared.png
		292	share/nautilus-python/extensions/syncstate.py
239	share/owncloud/i18n/mirall_TW.qm	293	share/owncloud/i18n/mirall_TW.qm
240	share/owncloud/i18n/mirall_ca.qm	294	share/owncloud/i18n/mirall_ca.qm
241	share/owncloud/i18n/mirall_cs.qm	295	share/owncloud/i18n/mirall_cs.qm