[Pkg-owncloud-commits] [owncloud-client] 05/09: Added freebsd support.

[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 21b45483fbd1842d96333a4cfd770ce5a39f5131
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Oct 21 23:47:00 2013 +0200

    Added freebsd support.
---
 debian/control                          |    3 ++-
 debian/patches/freebsd-libinotify.patch |   30 ++++++++++++++++++++++++++++++
 debian/patches/freebsd-statvfs64.patch  |   19 +++++++++++++++++++
 debian/patches/series                   |    3 +++
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index a3cb395..c34df48 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>
 Uploaders: Sandro Knauß <bugs at sandroknauss.de>
 Build-Depends: debhelper (>= 9), cmake, libqt4-dev, hardening-wrapper, pkg-kde-tools, python-sphinx | python3-sphinx,
- qt4-dev-tools, libqtwebkit-dev,  kdelibs5-dev, libocsync-dev (>= 0.90.1), qtkeychain-dev
+ qt4-dev-tools, libqtwebkit-dev,  kdelibs5-dev, libocsync-dev (>= 0.90.1), qtkeychain-dev,
+ libinotify-dev [kfreebsd-any]
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, xsltproc
 Vcs-Git: git://anonscm.debian.org/pkg-owncloud/owncloud-client.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/owncloud-client.git
diff --git a/debian/patches/freebsd-libinotify.patch b/debian/patches/freebsd-libinotify.patch
new file mode 100644
index 0000000..a933d9f
--- /dev/null
+++ b/debian/patches/freebsd-libinotify.patch
@@ -0,0 +1,30 @@
+Description: Using inotify on FreeBSD
+Author: mat
+Origin: FreeBSD, http://svnweb.freebsd.org/ports?view=revision&revision=329193
+Last-Update: 2013-10-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: owncloud-client/src/CMakeLists.txt
+===================================================================
+--- owncloud-client.orig/src/CMakeLists.txt	2013-09-26 19:53:50.332336775 +0200
++++ owncloud-client/src/CMakeLists.txt	2013-10-21 23:33:44.738426238 +0200
+@@ -140,9 +140,18 @@
+ list(APPEND libsync_LINK_TARGETS
+     ${QT_LIBRARIES}
+     ${CSYNC_LIBRARY}
+-    dl
+ )
+ 
++IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++   list(APPEND libsync_LINK_TARGETS
++       inotify
++   )
++ELSE(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++   list(APPEND libsync_LINK_TARGETS
++       dl
++   )
++ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++
+ if(QTKEYCHAIN_FOUND)
+     list(APPEND libsync_LINK_TARGETS ${QTKEYCHAIN_LIBRARY})
+     include_directories(${QTKEYCHAIN_INCLUDE_DIR})
diff --git a/debian/patches/freebsd-statvfs64.patch b/debian/patches/freebsd-statvfs64.patch
new file mode 100644
index 0000000..50b39ab
--- /dev/null
+++ b/debian/patches/freebsd-statvfs64.patch
@@ -0,0 +1,19 @@
+Description: FreeBSD doesn't have statvfs64, like MacOS X.
+Author: Mathieu Arnold
+Origin: upstream, https://github.com/Absolight/mirall/commit/1c594b6a8d47728659ce97e96ec90d06f3b246bd
+Last-Update: 2013-10-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: owncloud-client/src/mirall/utility.cpp
+===================================================================
+--- owncloud-client.orig/src/mirall/utility.cpp	2013-09-26 19:53:50.341336793 +0200
++++ owncloud-client/src/mirall/utility.cpp	2013-10-21 23:22:55.232991955 +0200
+@@ -315,7 +315,7 @@
+ 
+ qint64 Utility::freeDiskSpace(const QString &path, bool *ok)
+ {
+-#ifdef Q_OS_MAC
++#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
+     struct statvfs stat;
+     statvfs(path.toUtf8().data(), &stat);
+     return (qint64) stat.f_bavail * stat.f_frsize;
diff --git a/debian/patches/series b/debian/patches/series
index a2fd246..5383900 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 disable-updatecheck.patch
+create-manpage.patch
+freebsd-statvfs64.patch
+freebsd-libinotify.patch

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