[Pkg-owncloud-commits] [owncloud-client] 01/02: Added backported FreeBSD patches

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit b4dd499d08891fa5711a503fc7ff89befb587b5e
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Tue Apr 1 12:07:23 2014 +0200

    Added backported FreeBSD patches
---
 debian/patches/0006-Fix-build-on-FreeBSD.patch     | 24 ++++++++++++++++++++++
 .../0007-And-make-it-runnable-on-FreeBSD-too.patch | 22 ++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 48 insertions(+)

diff --git a/debian/patches/0006-Fix-build-on-FreeBSD.patch b/debian/patches/0006-Fix-build-on-FreeBSD.patch
new file mode 100644
index 0000000..a55f74b
--- /dev/null
+++ b/debian/patches/0006-Fix-build-on-FreeBSD.patch
@@ -0,0 +1,24 @@
+From: Mathieu Arnold <mat at mat.cc>
+Date: Tue, 25 Mar 2014 17:19:19 +0100
+Subject: Fix build on FreeBSD.
+
+We use libinotify, so the linux folderwatcher works.
+
+Based on a patch by:	Tobias Berner
+---
+ src/mirall/folderwatcher.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mirall/folderwatcher.cpp b/src/mirall/folderwatcher.cpp
+index 2db8e78..8043700 100644
+--- a/src/mirall/folderwatcher.cpp
++++ b/src/mirall/folderwatcher.cpp
+@@ -29,7 +29,7 @@
+ #include "mirall/folderwatcher_win.h"
+ #elif defined(Q_OS_MAC)
+ #include "mirall/folderwatcher_mac.h"
+-#elif defined(Q_OS_LINUX)
++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+ #include "mirall/folderwatcher_linux.h"
+ #endif
+ 
diff --git a/debian/patches/0007-And-make-it-runnable-on-FreeBSD-too.patch b/debian/patches/0007-And-make-it-runnable-on-FreeBSD-too.patch
new file mode 100644
index 0000000..9aff5cd
--- /dev/null
+++ b/debian/patches/0007-And-make-it-runnable-on-FreeBSD-too.patch
@@ -0,0 +1,22 @@
+From: Mathieu Arnold <mat at mat.cc>
+Date: Tue, 25 Mar 2014 17:20:05 +0100
+Subject: And make it runnable on FreeBSD too.
+
+Patch by:	Tobias Berner
+---
+ src/mirall/application.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
+index 6c51aac..4615402 100644
+--- a/src/mirall/application.cpp
++++ b/src/mirall/application.cpp
+@@ -64,7 +64,7 @@ static const char optionsC[] =
+ 
+ QString applicationTrPath()
+ {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+     return QString::fromLatin1(DATADIR"/"APPLICATION_EXECUTABLE"/i18n/");
+ #endif
+ #ifdef Q_OS_MAC
diff --git a/debian/patches/series b/debian/patches/series
index 740e66b..519565e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@
 0003-respect-the-XDG_CONFIG_HOME-env-variable.patch
 0004-debian_version.patch
 0005-Make-it-an-error-instead-of-a-crash-when-dav_connect.patch
+0006-Fix-build-on-FreeBSD.patch
+0007-And-make-it-runnable-on-FreeBSD-too.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git