diff options
-rw-r--r-- | pcr/owncloud-client/PKGBUILD | 38 | ||||
-rw-r--r-- | pcr/owncloud-client/man.patch | 11 | ||||
-rw-r--r-- | pcr/owncloud-client/owncloud-client.desktop | 11 | ||||
-rw-r--r-- | pcr/qtkeychain/PKGBUILD | 34 | ||||
-rw-r--r-- | pcr/thinkfan/PKGBUILD | 31 | ||||
-rw-r--r-- | pcr/thinkfan/thinkfan | 54 | ||||
-rw-r--r-- | pcr/thinkfan/thinkfan.install | 40 | ||||
-rw-r--r-- | pcr/thinkfan/thinkfan.service | 2 | ||||
-rw-r--r-- | pcr/thinkfan/thinkpad_acpi.conf | 1 |
9 files changed, 113 insertions, 109 deletions
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD index 594d3ec20..32b344f79 100644 --- a/pcr/owncloud-client/PKGBUILD +++ b/pcr/owncloud-client/PKGBUILD @@ -1,14 +1,13 @@ -# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> +# Maintainer (Arch): Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> # https://github.com/zizzfizzix/pkgbuilds # Maintainer: Jorge Araya Navarro <shackra@riseup.net> -# + ############################################################## #### The section below can be adjusted to suit your needs #### ############################################################## # What type of build do you want? # See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported. -# Default is RelWithDebInfo to help with debugging. _buildtype='Release' @@ -16,41 +15,48 @@ _buildtype='Release' _name=mirall pkgname=owncloud-client -pkgver=1.5.1 -pkgrel=3 +pkgver=1.6.2 +pkgrel=2 pkgdesc='ownCloud client based on mirall' -arch=('i686' 'x86_64' 'armv7h') +arch=('i686' 'x86_64' 'mips64el') url='http://owncloud.org/' license=('GPL2') -depends=('qt4' 'qtkeychain' 'qtwebkit') -makedepends=('cmake') -provides=('mirall' 'owncloud-client' 'ocsync') -conflicts=('mirall-git') +depends=('qtkeychain' 'qtwebkit' 'neon') +makedepends=('cmake' 'python-sphinx') +provides=('mirall' 'ocsync') +conflicts=('mirall-git' 'ocsync') install=owncloud-client.install backup=('etc/ownCloud/sync-exclude.lst') -source=("http://download.owncloud.com/desktop/stable/${_name}-${pkgver}.tar.bz2") -sha256sums=('79c41f8c72c994ab803b7053a1c7e0a46bbd20c25c1eed900e1c98433745daee') +source=("https://download.owncloud.com/desktop/stable/${_name}-${pkgver}.tar.bz2" + "https://download.owncloud.com/desktop/stable/${_name}-${pkgver}.tar.bz2.asc" + 'man.patch') +md5sums=('52518b622e9b2c151e64a4b56bcf2414' + 'SKIP' + '4e252cf4df3276c3dadf45232b4e17a2') if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then - options=(!strip) + options=('debug') fi prepare() { if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi mkdir ${srcdir}/${_name}-${pkgver}-build + + cd ${srcdir}/${_name}-${pkgver} + patch -p0 -i ${srcdir}/man.patch } build() { cd ${srcdir}/${_name}-${pkgver}-build - cmake -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + cmake -DBUILD_WITH_QT4=on \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=${_buildtype} \ - -DCSYNC_INCLUDE_PATH=/usr/include/ocsync \ -DCMAKE_INSTALL_SYSCONFDIR=/etc/${pkgname} \ ../${_name}-${pkgver} make + make doc-man } package() { diff --git a/pcr/owncloud-client/man.patch b/pcr/owncloud-client/man.patch new file mode 100644 index 000000000..8adc07546 --- /dev/null +++ b/pcr/owncloud-client/man.patch @@ -0,0 +1,11 @@ +--- doc/CMakeLists.txt 2014-06-02 20:38:04.000000000 +0300 ++++ doc/CMakeLists.txt_ 2014-06-03 23:22:59.809715820 +0300 +@@ -4,7 +4,7 @@ + set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees") + # HTML output directory + set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html") +- set(SPHINX_MAN_DIR "${CMAKE_CURRENT_BINARY_DIR}/man") ++ set(SPHINX_MAN_DIR "${CMAKE_CURRENT_BINARY_DIR}/man1") + set(SPHINX_PDF_DIR "${CMAKE_CURRENT_BINARY_DIR}/latex") + set(SPHINX_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/qthelp") + set(SPHINX_HTMLHELP_DIR "${CMAKE_CURRENT_BINARY_DIR}/htmlhelp") diff --git a/pcr/owncloud-client/owncloud-client.desktop b/pcr/owncloud-client/owncloud-client.desktop deleted file mode 100644 index 005e52219..000000000 --- a/pcr/owncloud-client/owncloud-client.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=ownCloud 2012 client -GenericName=File Sync -TryExec=owncloud -Exec=owncloud %u -Comment=ownCloud - Your Cloud, Your Data, Your Way! -Icon=mirall -Terminal=false -Categories=Qt;Utility; diff --git a/pcr/qtkeychain/PKGBUILD b/pcr/qtkeychain/PKGBUILD index 438dd6ea0..f6b911274 100644 --- a/pcr/qtkeychain/PKGBUILD +++ b/pcr/qtkeychain/PKGBUILD @@ -1,31 +1,31 @@ -# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> -# Maintainer: Jorge Araya Navarro <shackra@riseup.net> +# Maintainer (Arch): Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> # Contributor (Arch): Teo Mrnjavac <teo@kde.org> # https://github.com/zizzfizzix/pkgbuilds +# Maintainer: Jorge Araya Navarro <shackra@riseup.net> -_buildtype="Release" +# What type of build do you want? +# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported. + +_buildtype='Release' pkgname=qtkeychain -pkgver=0.1 -pkgrel=3 -pkgdesc="Provides support for secure credentials storage." +pkgver=0.3 +pkgrel=2 +pkgdesc='Provides support for secure credentials storage.' arch=('i686' 'x86_64' 'mips64el') -url="https://github.com/frankosterfeld/qtkeychain" -license=('BSD2') +url='https://github.com/frankosterfeld/qtkeychain' +license=('BSD') depends=('qt4') -makedepends=('cmake') -source=("${pkgname}-${pkgver}.zip::https://github.com/frankosterfeld/qtkeychain/archive/${pkgver}.zip" 'prefer-qt4.patch') -md5sums=('a1d11a611b27759a531896b57be15947' - 'a2c46e61af02100a6f67487ffeb8a3d0') +makedepends=('cmake' 'icu') +optdepends=('kdeutils-kwalletmanager: KDE password manager' 'gnome-keyring: GNOME password manager') +source=("${pkgname}-${pkgver}.zip::https://github.com/frankosterfeld/qtkeychain/archive/${pkgver}.zip") +md5sums=('8a82d813969fd1144d1d06769a2476f8') -if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then - options=(!strip) +if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then + options=('debug') 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 } diff --git a/pcr/thinkfan/PKGBUILD b/pcr/thinkfan/PKGBUILD index c8bc49e0b..9af51d9c7 100644 --- a/pcr/thinkfan/PKGBUILD +++ b/pcr/thinkfan/PKGBUILD @@ -2,25 +2,36 @@ # Contributor (Arch): Frederik Alkærsig (FALKER) <havnelisten AT gmail.com> pkgname=thinkfan -pkgver=0.8.1 -pkgrel=3 +pkgver=0.9.2 +pkgrel=1 pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi" arch=('i686' 'x86_64' 'mips64el') +makedepends=('cmake') +depends=('libatasmart') license=('GPL') source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz - "thinkfan" "thinkfan.service") + "thinkfan.install" "thinkfan.service" "thinkpad_acpi.conf") url="http://thinkfan.sourceforge.net/" -md5sums=('aaa6c88bab3b43756ac5a1638622828c' - '16fc3a83a1468e3ccaeba67e14ab2177' - '7639b82035fcee712753e05de6b0601d') +install="thinkfan.install" +md5sums=('4292633aebd61b91f04cd332c4d3e181' + '76553f63dc55a6e09a429bb4e28eb649' + '0197bde7c3d3b64d34635ead78cf3437' + 'bca920d066846e5811a2465aefa13012') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir} + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DUSE_ATASMART:BOOL=ON make - install -D -m755 ${pkgname} ${pkgdir}/usr/sbin/${pkgname} - install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname} +} + +package() { + cd ${srcdir} + install -D -m755 ${pkgname} ${pkgdir}/usr/bin/${pkgname} + install -D -m644 ${srcdir}/thinkpad_acpi.conf ${pkgdir}/usr/lib/modprobe.d/thinkpad_acpi.conf install -D -m644 README ${pkgdir}/usr/share/doc/${pkgname}/README - install -D -m644 ${srcdir}/thinkfan.service ${pkgdir}/usr/lib/systemd/system/thinkfan.service + install -D -m644 NEWS ${pkgdir}/usr/share/doc/${pkgname}/README + install -D -m644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service + install -D -m644 ${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 cp -r examples ${pkgdir}/usr/share/doc/${pkgname}/ } diff --git a/pcr/thinkfan/thinkfan b/pcr/thinkfan/thinkfan deleted file mode 100644 index d37c81424..000000000 --- a/pcr/thinkfan/thinkfan +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -test -f /usr/sbin/thinkfan || exit 0 - -case "$1" in - start) - stat_busy "Starting thinkfan" - /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon thinkfan - stat_done - fi - ;; - stop) - stat_busy "Stopping thinkfan" - PID=$(</var/run/thinkfan.pid) - kill $PID - rm -f /var/run/thinkfan.pid - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon thinkfan - stat_done - fi - ;; - restart) - stat_busy "Restarting thinkfan" - - PID=$(</var/run/thinkfan.pid) - kill $PID - rm -f /var/run/thinkfan.pid - if [ $? -gt 0 ]; then - stat_fail - rm_daemon thinkfan - else - /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - rm_daemon thinkfan - else - stat_done - fi - fi - ;; - *) - echo "Usage: $0 {stop|start|restart}" - ;; -esac -exit 0 diff --git a/pcr/thinkfan/thinkfan.install b/pcr/thinkfan/thinkfan.install new file mode 100644 index 000000000..ecf947a7d --- /dev/null +++ b/pcr/thinkfan/thinkfan.install @@ -0,0 +1,40 @@ +# This is an install file for thinkfan package. + +_update() { + echo "Please configure thinkfan in: /etc/thinkfan.conf" + echo "Have a look at the examples in: /usr/share/doc/thinkfan/examples for details." +} + +## arg 1: the new package version +pre_install() { + : +} + +# arg 1: the new package version +post_install() { + _update +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + : +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + _update +} + +# arg 1: the old package version +pre_remove() { + : +} + +# arg 1: the old package version +post_remove() { + : +} + +# vim:set ts=2 sw=2 noet: diff --git a/pcr/thinkfan/thinkfan.service b/pcr/thinkfan/thinkfan.service index 7895b8d3a..e7c8badd1 100644 --- a/pcr/thinkfan/thinkfan.service +++ b/pcr/thinkfan/thinkfan.service @@ -3,7 +3,7 @@ Description=Thinkfan Daemon - simple and lightweight fan control program After=basic.target [Service] -ExecStart=/usr/sbin/thinkfan -n -s5 -q +ExecStart=/usr/bin/thinkfan -n -s5 -q [Install] WantedBy=multi-user.target diff --git a/pcr/thinkfan/thinkpad_acpi.conf b/pcr/thinkfan/thinkpad_acpi.conf new file mode 100644 index 000000000..00e1014b8 --- /dev/null +++ b/pcr/thinkfan/thinkpad_acpi.conf @@ -0,0 +1 @@ +options thinkpad_acpi fan_control=1 |