summaryrefslogtreecommitdiff
path: root/deskutils/owncloudclient/files
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils/owncloudclient/files')
-rw-r--r--deskutils/owncloudclient/files/patch-doc_CMakeLists.txt11
-rw-r--r--deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp12
-rw-r--r--deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp23
-rw-r--r--deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp11
-rw-r--r--deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp25
-rw-r--r--deskutils/owncloudclient/files/patch-src_libsync_syncjournaldb.h11
-rw-r--r--deskutils/owncloudclient/files/patch-src_libsync_syncjournalfilerecord.h10
7 files changed, 103 insertions, 0 deletions
diff --git a/deskutils/owncloudclient/files/patch-doc_CMakeLists.txt b/deskutils/owncloudclient/files/patch-doc_CMakeLists.txt
new file mode 100644
index 000000000000..2c908a10c9d8
--- /dev/null
+++ b/deskutils/owncloudclient/files/patch-doc_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- doc/CMakeLists.txt.orig 2015-03-16 14:28:58 UTC
++++ doc/CMakeLists.txt
+@@ -12,6 +12,8 @@ if(SPHINX_FOUND)
+ # assets
+ set(LATEX_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
+
++ set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/owncloudclient")
++
+ install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
+ install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR} OPTIONAL)
+ install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR} OPTIONAL)
diff --git a/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp b/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp
new file mode 100644
index 000000000000..94fae0c3faea
--- /dev/null
+++ b/deskutils/owncloudclient/files/patch-src_gui_accountsettings.cpp
@@ -0,0 +1,12 @@
+--- src/gui/accountsettings.cpp.orig 2015-03-16 14:28:58 UTC
++++ src/gui/accountsettings.cpp
+@@ -30,7 +30,8 @@
+ #include "selectivesyncdialog.h"
+ #include "creds/abstractcredentials.h"
+
+-#include <math.h>
++#include <climits>
++#include <cmath>
+
+ #include <QDebug>
+ #include <QDesktopServices>
diff --git a/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp b/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp
new file mode 100644
index 000000000000..33e0851414aa
--- /dev/null
+++ b/deskutils/owncloudclient/files/patch-src_gui_generalsettings.cpp
@@ -0,0 +1,23 @@
+--- src/gui/generalsettings.cpp.orig 2015-03-16 14:28:58 UTC
++++ src/gui/generalsettings.cpp
+@@ -85,6 +85,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);
+@@ -93,9 +94,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()
diff --git a/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp
new file mode 100644
index 000000000000..09019a86b3f3
--- /dev/null
+++ b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp
@@ -0,0 +1,11 @@
+--- src/gui/owncloudgui.cpp.orig 2015-03-16 14:28:58 UTC
++++ src/gui/owncloudgui.cpp
+@@ -33,6 +33,8 @@
+ #include "openfilemanager.h"
+ #include "creds/abstractcredentials.h"
+
++#include <climits>
++
+ #include <QDesktopServices>
+ #include <QMessageBox>
+ #include <QSignalMapper>
diff --git a/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp
new file mode 100644
index 000000000000..574696b405e0
--- /dev/null
+++ b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp
@@ -0,0 +1,25 @@
+--- src/libsync/configfile.cpp.orig 2015-03-16 14:28:58 UTC
++++ src/libsync/configfile.cpp
+@@ -383,11 +383,22 @@ bool ConfigFile::skipUpdateCheck( const
+ QString con( connection );
+ if( connection.isEmpty() ) con = defaultConnection();
+
++#if 0
+ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false);
++#else
++ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true);
++#endif
+ fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback);
+
+ QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback);
++#if 0
+ return value.toBool();
++#else
++ if ( !value.toBool() )
++ qDebug() << "FreeBSD package disabled the UpdateCheck mechanism.";
++
++ return true;
++#endif
+ }
+
+ void ConfigFile::setSkipUpdateCheck( bool skip, const QString& connection )
diff --git a/deskutils/owncloudclient/files/patch-src_libsync_syncjournaldb.h b/deskutils/owncloudclient/files/patch-src_libsync_syncjournaldb.h
new file mode 100644
index 000000000000..f1c91c1b9a98
--- /dev/null
+++ b/deskutils/owncloudclient/files/patch-src_libsync_syncjournaldb.h
@@ -0,0 +1,11 @@
+--- src/libsync/syncjournaldb.h.orig 2015-03-16 14:28:58 UTC
++++ src/libsync/syncjournaldb.h
+@@ -19,6 +19,8 @@
+ #include <QDateTime>
+ #include <QHash>
+
++#include <ctime>
++
+ #include "utility.h"
+ #include "ownsql.h"
+
diff --git a/deskutils/owncloudclient/files/patch-src_libsync_syncjournalfilerecord.h b/deskutils/owncloudclient/files/patch-src_libsync_syncjournalfilerecord.h
new file mode 100644
index 000000000000..8d88d3b0bdd4
--- /dev/null
+++ b/deskutils/owncloudclient/files/patch-src_libsync_syncjournalfilerecord.h
@@ -0,0 +1,10 @@
+--- src/libsync/syncjournalfilerecord.h.orig 2015-03-16 14:28:58 UTC
++++ src/libsync/syncjournalfilerecord.h
+@@ -14,6 +14,7 @@
+ #ifndef SYNCJOURNALFILERECORD_H
+ #define SYNCJOURNALFILERECORD_H
+
++#include <time.h>
+ #include <QString>
+ #include <QDateTime>
+