Attachment 150101 Details for Bug 195582 – [patch] mirall-1.7.0.diff

[patch] [patch] mirall-1.7.0.diff

mirall-1.7.0.diff (text/plain), 9.32 KB, created by Bugzilla Automation on 2014-12-02 18:50:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bugzilla Automation

Created: 2014-12-02 18:50:13 UTC

Size: 9.32 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 373698)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mirall
>-PORTVERSION=	1.6.3
>+PORTVERSION=	1.7.0
> CATEGORIES=	deskutils
> MASTER_SITES=	http://download.owncloud.com/desktop/stable/
> 
>@@ -37,13 +37,6 @@
> 
> .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}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 373698)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (mirall-1.6.3.tar.bz2) = 89e4488881a53956cdedab21d05eb61b2c00bb31a20286b72836e39a3126204b
>-SIZE (mirall-1.6.3.tar.bz2) = 8635406
>+SHA256 (mirall-1.7.0.tar.bz2) = b1cb0612e5022de263dc4c6309eba8207d694a40a80dae6762b4a56fa8d4d944
>+SIZE (mirall-1.7.0.tar.bz2) = 12634961
>Index: files/patch-src__CMakeLists.txt
>===================================================================
>--- files/patch-src__CMakeLists.txt	(revision 373698)
>+++ files/patch-src__CMakeLists.txt	(working copy)
>@@ -1,10 +1,10 @@
>---- src/CMakeLists.txt.orig
>+--- src/CMakeLists.txt.orig	2014-11-06 18:26:43 UTC
> +++ src/CMakeLists.txt
>-@@ -131,6 +131,7 @@
>+@@ -23,6 +23,7 @@ if ( APPLE )
>+ endif()
>  
>- IF( NOT WIN32 AND NOT APPLE )
>-     set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_linux.cpp)
>-+    link_directories($ENV{INOTIFY_LIB})
>- ENDIF()
>- IF( WIN32 )
>-     set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_win.cpp)
>+ IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
>++  link_directories($ENV{INOTIFY_LIB})
>+     list(APPEND OS_SPECIFIC_LINK_LIBRARIES
>+ 	inotify
>+     )
>Index: files/patch-src__mirall__filesystem.cpp
>===================================================================
>--- files/patch-src__mirall__filesystem.cpp	(revision 373698)
>+++ files/patch-src__mirall__filesystem.cpp	(working copy)
>@@ -1,10 +0,0 @@
>---- src/mirall/filesystem.cpp.orig
>-+++ src/mirall/filesystem.cpp
>-@@ -12,6 +12,7 @@
>-  */
>- 
>- #include "filesystem.h"
>-+#include <sys/time.h>
>- #include <QFile>
>- #include <QDebug>
>- 
>Index: files/patch-src__mirall__generalsettings.cpp
>===================================================================
>--- files/patch-src__mirall__generalsettings.cpp	(revision 373698)
>+++ files/patch-src__mirall__generalsettings.cpp	(working copy)
>@@ -1,23 +1,23 @@
>---- src/mirall/generalsettings.cpp.orig
>+--- src/mirall/generalsettings.cpp.orig	2014-12-02 18:16:18 UTC
> +++ src/mirall/generalsettings.cpp
>-@@ -76,6 +76,7 @@
>+@@ -77,6 +77,7 @@ void GeneralSettings::loadMiscSettings()
>  
>  void GeneralSettings::slotUpdateInfo()
>  {
>-+#if 0
>++  #if 0
>      if (OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance()))
>      {
>          connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection);
>-@@ -84,9 +85,12 @@
>+@@ -85,9 +86,12 @@ void GeneralSettings::slotUpdateInfo()
>          _ui->updateStateLabel->setText(updater->statusString());
>          _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete);
>      } else {
>-+#endif
>++  #endif
>          // can't have those infos from sparkle currently
>          _ui->updatesGroupBox->setVisible(false);
>-+#if 0
>++  #if 0
>      }
>-+#endif
>++  #endif
>  }
>  
>  void GeneralSettings::saveMiscSettings()
>Index: files/patch-src__mirall__mirallconfigfile.cpp
>===================================================================
>--- files/patch-src__mirall__mirallconfigfile.cpp	(revision 373698)
>+++ files/patch-src__mirall__mirallconfigfile.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- src/mirall/mirallconfigfile.cpp.orig
>+--- src/mirall/mirallconfigfile.cpp.orig	2014-12-02 18:21:09 UTC
> +++ src/mirall/mirallconfigfile.cpp
>-@@ -359,11 +359,22 @@
>+@@ -378,11 +378,22 @@ bool MirallConfigFile::skipUpdateCheck( 
>      QString con( connection );
>      if( connection.isEmpty() ) con = defaultConnection();
>  
>@@ -16,7 +16,7 @@
>      return value.toBool();
> +#else
> +    if ( !value.toBool() )
>-+        qDebug() << "FreeBSD package disabled the UpdateCheck mechanism.";
>++      qDebug() << "FreeBSD package disabled the UpdateCheck mechanism.";
> +
> +    return true;
> +#endif
>Index: files/patch-src__mirall__syncjournalfilerecord.h
>===================================================================
>--- files/patch-src__mirall__syncjournalfilerecord.h	(revision 373698)
>+++ files/patch-src__mirall__syncjournalfilerecord.h	(working copy)
>@@ -1,5 +1,5 @@
>---- ./src/mirall/syncjournalfilerecord.h.orig	2014-01-09 19:53:32.000000000 +0100
>-+++ ./src/mirall/syncjournalfilerecord.h	2014-01-09 19:53:44.000000000 +0100
>+--- src/mirall/syncjournalfilerecord.h.orig	2014-11-06 18:26:43 UTC
>++++ src/mirall/syncjournalfilerecord.h
> @@ -14,6 +14,7 @@
>  #ifndef SYNCJOURNALFILERECORD_H
>  #define SYNCJOURNALFILERECORD_H
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 373698)
>+++ pkg-plist	(working copy)
>@@ -1,13 +1,10 @@
>-bin/owncloud
>-bin/owncloudcmd
>-@sample etc/ownCloud/sync-exclude.lst.sample
>+%%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
>@@ -18,7 +15,7 @@
> lib/libhttpbf.a
> lib/libowncloudsync.so
> lib/libowncloudsync.so.0
>-lib/libowncloudsync.so.1.6.3
>+lib/libowncloudsync.so.1.7.0
> lib/owncloud/libocsync.so
> lib/owncloud/libocsync.so.0
> lib/owncloud/libocsync.so.0.2.1
>@@ -231,11 +228,68 @@
> %%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

Actions: View | Diff

Attachments on bug 195582: 150101