From 64e1664807a6e37d4fdfc35d271028104b54c4a1 Mon Sep 17 00:00:00 2001
From: Shackra Sislock <jorgean@lavabit.com>
Date: Thu, 4 Jul 2013 21:50:41 -0600
Subject: updating PKGBUILD for owncloud-client and its dependencies

---
 pcr/owncloud-client/PKGBUILD                | 27 ++++++++++++++-------------
 pcr/owncloud-client/owncloud-client.install |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'pcr/owncloud-client')

diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index 69905f40a..a4e86099b 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+#
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
 ##############################################################
@@ -15,31 +16,32 @@ _buildtype="Release"
 
 _name=mirall
 pkgname=owncloud-client
-pkgver=1.2.3
-pkgrel=1
+pkgver=1.3.0
+pkgrel=2
 pkgdesc="ownCloud client based on mirall"
 arch=('i686' 'x86_64')
 url="http://owncloud.org/"
 license=('GPL2')
 depends=('qt4' 'ocsync')
 makedepends=('cmake')
+optdepends=('qtkeychain: safe password storage')
 provides=('mirall' 'owncloud-client')
 conflicts=('mirall-git')
 install=owncloud-client.install
 backup=('etc/owncloud-client/sync-exclude.lst')
-source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2"
-        "${pkgname}.desktop")
-md5sums=('a3aa2cb1b9ccb13c7e8b0ef8a1b539df'
-         'e223d162626c2ff54efebaa90a182d81')
-
-# Clean options array to strip pkg if release buildtype is chosen
-if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
-  options=()
+source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
+md5sums=('ee2e7bafc714399f2027fefed853f968')
+
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
 fi
 
-build() {
+prepare() {
   if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi
   mkdir ${srcdir}/${_name}-${pkgver}-build
+}
+
+build() {
   cd ${srcdir}/${_name}-${pkgver}-build
 
   cmake -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
@@ -55,5 +57,4 @@ build() {
 package() {
   cd ${srcdir}/${_name}-${pkgver}-build
   make DESTDIR=${pkgdir} install
-  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 }
diff --git a/pcr/owncloud-client/owncloud-client.install b/pcr/owncloud-client/owncloud-client.install
index e216754c7..eecc35ccd 100644
--- a/pcr/owncloud-client/owncloud-client.install
+++ b/pcr/owncloud-client/owncloud-client.install
@@ -1,5 +1,5 @@
 post_install() {
-  xdg-icon-resource forceupdate --theme hicolor
+  xdg-icon-resource forceupdate --theme hicolor > /dev/null
 }
 
 post_upgrade() {
-- 
cgit v1.2.3


From 9b7260e8a409470302d46dc2c02feabfc933a155 Mon Sep 17 00:00:00 2001
From: Shackra Sislock <jorgean@lavabit.com>
Date: Fri, 6 Sep 2013 22:53:24 -0600
Subject: updating owncloud-client and its dependencies

---
 pcr/ocsync/PKGBUILD          | 7 ++++---
 pcr/owncloud-client/PKGBUILD | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'pcr/owncloud-client')

diff --git a/pcr/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD
index 97bc26754..cde26af30 100644
--- a/pcr/ocsync/PKGBUILD
+++ b/pcr/ocsync/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
 #
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
@@ -15,8 +15,8 @@ _buildtype="Release"
 ##############################################################
 
 pkgname=ocsync
-pkgver=0.80.0
-pkgrel=3
+pkgver=0.90.0
+pkgrel=1
 pkgdesc="A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client."
 arch=("i686" "x86_64")
 url="http://www.csync.org"
@@ -52,3 +52,4 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}-build
   make DESTDIR=${pkgdir} install
 }
+md5sums=('6f1cfe47d6a7741c6e8df8642de52c0f')
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index a4e86099b..44c8fcaa9 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 # https://github.com/zizzfizzix/pkgbuilds
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
 #
 ##############################################################
 #### The section below can be adjusted to suit your needs ####
@@ -16,8 +16,8 @@ _buildtype="Release"
 
 _name=mirall
 pkgname=owncloud-client
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="ownCloud client based on mirall"
 arch=('i686' 'x86_64')
 url="http://owncloud.org/"
@@ -58,3 +58,4 @@ package() {
   cd ${srcdir}/${_name}-${pkgver}-build
   make DESTDIR=${pkgdir} install
 }
+md5sums=('05a69082b4e940b4282c2b05344c143a')
-- 
cgit v1.2.3


From f315becffa2ee6ebf396146d9f38ddf42a575d52 Mon Sep 17 00:00:00 2001
From: Shackra Sislock <jorgean@lavabit.com>
Date: Sun, 8 Sep 2013 21:57:29 -0600
Subject: adding qtkeychain, a owncloud-client dependency

---
 pcr/owncloud-client/PKGBUILD    |  6 +++---
 pcr/qtkeychain/PKGBUILD         | 48 +++++++++++++++++++++++++++++++++++++++++
 pcr/qtkeychain/prefer-qt4.patch | 17 +++++++++++++++
 3 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 pcr/qtkeychain/PKGBUILD
 create mode 100644 pcr/qtkeychain/prefer-qt4.patch

(limited to 'pcr/owncloud-client')

diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index 44c8fcaa9..ea808c1ef 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -22,7 +22,7 @@ pkgdesc="ownCloud client based on mirall"
 arch=('i686' 'x86_64')
 url="http://owncloud.org/"
 license=('GPL2')
-depends=('qt4' 'ocsync')
+depends=('qt4' 'ocsync' 'qtkeychain' 'qtwebkit')
 makedepends=('cmake')
 optdepends=('qtkeychain: safe password storage')
 provides=('mirall' 'owncloud-client')
@@ -30,7 +30,8 @@ conflicts=('mirall-git')
 install=owncloud-client.install
 backup=('etc/owncloud-client/sync-exclude.lst')
 source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
-md5sums=('ee2e7bafc714399f2027fefed853f968')
+md5sums=('05a69082b4e940b4282c2b05344c143a')
+
 
 if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
   options=(!strip)
@@ -58,4 +59,3 @@ package() {
   cd ${srcdir}/${_name}-${pkgver}-build
   make DESTDIR=${pkgdir} install
 }
-md5sums=('05a69082b4e940b4282c2b05344c143a')
diff --git a/pcr/qtkeychain/PKGBUILD b/pcr/qtkeychain/PKGBUILD
new file mode 100644
index 000000000..152971751
--- /dev/null
+++ b/pcr/qtkeychain/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+# Maintainer: Jorge Araya Navarro <shackra@riseup.net>
+# Contributor: Teo Mrnjavac <teo@kde.org>
+# https://github.com/zizzfizzix/pkgbuilds
+
+_buildtype="Release"
+
+pkgname=qtkeychain
+pkgver=0.1
+pkgrel=3
+pkgdesc="Provides support for secure credentials storage."
+arch=('i686' 'x86_64')
+url="https://github.com/frankosterfeld/qtkeychain"
+license=('BSD2')
+depends=('qt4')
+makedepends=('cmake')
+source=("${pkgname}-${pkgver}.zip::https://github.com/frankosterfeld/qtkeychain/archive/${pkgver}.zip" 'prefer-qt4.patch')
+md5sums=('a1d11a611b27759a531896b57be15947'
+         'a2c46e61af02100a6f67487ffeb8a3d0')
+
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
+fi
+
+prepare() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    patch -Np1 -i ${srcdir}/prefer-qt4.patch
+
+    if [[ -e ${srcdir}/${pkgname}-${pkgver}-build ]]; then rm -rf ${srcdir}/${pkgname}-${pkgver}-build; fi
+    mkdir ${srcdir}/${pkgname}-${pkgver}-build
+}
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}-build
+    cmake -DBUILD_WITH_QT4=on \
+          -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_INSTALL_LIBDIR=lib \
+          -DCMAKE_INSTALL_LIBEXECDIR=lib/${pkgname} \
+          -DCMAKE_BUILD_TYPE=${_buildtype} \
+          ../${pkgname}-${pkgver}
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}-build
+    make DESTDIR=${pkgdir} install
+    install -D -m644 ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/pcr/qtkeychain/prefer-qt4.patch b/pcr/qtkeychain/prefer-qt4.patch
new file mode 100644
index 000000000..0e264aad1
--- /dev/null
+++ b/pcr/qtkeychain/prefer-qt4.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aba9032..4de64c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,8 +11,10 @@ set(QTKEYCHAIN_SOVERSION 0)
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
+ include(GNUInstallDirs)
+ 
+-# try Qt5 first, and prefer that if found
+-find_package(Qt5Core QUIET)
++# try Qt5 first, and prefer that if found, unless BUILD_WITH_QT4 is set
++if (NOT BUILD_WITH_QT4)
++  find_package(Qt5Core QUIET)
++endif()
+ if (Qt5Core_FOUND)
+   if(UNIX AND NOT APPLE)
+     find_package(Qt5DBus REQUIRED)
-- 
cgit v1.2.3