From a098c9d2c42581c2d013cdb01ae0814d014fb16e Mon Sep 17 00:00:00 2001 From: arcan1s Date: Fri, 22 May 2015 00:48:28 +0300 Subject: [PATCH] rebuild package to git version --- arch/{PKGBUILD-kde4 => PKGBUILD} | 35 +++++++++++------ arch/PKGBUILD-kf5 | 43 --------------------- arch/plasma5-applet-awesome-widgets.install | 11 ------ 3 files changed, 24 insertions(+), 65 deletions(-) rename arch/{PKGBUILD-kde4 => PKGBUILD} (62%) delete mode 100644 arch/PKGBUILD-kf5 delete mode 100644 arch/plasma5-applet-awesome-widgets.install diff --git a/arch/PKGBUILD-kde4 b/arch/PKGBUILD similarity index 62% rename from arch/PKGBUILD-kde4 rename to arch/PKGBUILD index 64d5ad1..f41945d 100644 --- a/arch/PKGBUILD-kde4 +++ b/arch/PKGBUILD @@ -17,27 +17,40 @@ optdepends=("amarok: for music player monitor" "mpd: for music player monitor" "nvidia-utils: for GPU monitor" "qmmp: for music player monitor") -makedepends=('automoc4' 'cmake') -source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) +makedepends=('automoc4' 'cmake' 'git') +source=(${_pkgname}::git+https://github.com/arcan1s/awesome-widgets.git#branch=release-2.2.1) install=${pkgname}.install -md5sums=('74099a8150aa1992b8a168934878d928') +md5sums=('SKIP') backup=('usr/share/config/plasma-dataengine-extsysmon.conf') -prepare() { - rm -rf "${srcdir}/build" - mkdir "${srcdir}/build" + +pkgver() { + cd "${srcdir}/${_pkgname}" + git describe --tags --long | sed 's/V\.//' | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } + +prepare() { + rm -rf "${srcdir}/${_pkgname}/build" + mkdir "${srcdir}/${_pkgname}/build" + + # update submobules + cd "${srcdir}/${_pkgname}" + git submodule init + git submodule update --recursive +} + + build () { - cd "${srcdir}/build" - cmake -DBUILD_KDE4=ON \ - -DCMAKE_BUILD_TYPE=Release \ + cd "${srcdir}/${_pkgname}/build" + cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) \ - "../${_pkgname}" + "../sources" make } + package() { - cd "${srcdir}/build" + cd "${srcdir}/${_pkgname}/build" make DESTDIR="${pkgdir}" install } diff --git a/arch/PKGBUILD-kf5 b/arch/PKGBUILD-kf5 deleted file mode 100644 index 8aac74e..0000000 --- a/arch/PKGBUILD-kf5 +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Evgeniy Alekseev - -pkgname=plasma5-applet-awesome-widgets -_pkgname=awesome-widgets -pkgver=2.2.1 -pkgrel=1 -pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)" -arch=('i686' 'x86_64') -url="http://arcanis.name/projects/awesome-widgets" -license=('GPL3') -depends=('plasma-framework') -optdepends=("amarok: for music player monitor" - "clementine: for music player monitor" - "catalyst: for GPU monitor" - "hddtemp: for HDD temperature monitor" - "smartmontools: for HDD temperature monitor" - "mpd: for music player monitor" - "nvidia-utils: for GPU monitor" - "qmmp: for music player monitor") -makedepends=('cmake' 'extra-cmake-modules') -source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) -install=${pkgname}.install -md5sums=('74099a8150aa1992b8a168934878d928') -backup=('etc/xdg/plasma-dataengine-extsysmon.conf') - -prepare() { - rm -rf "${srcdir}/build" - mkdir "${srcdir}/build" -} - -build () { - cd "${srcdir}/build" - cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - "../${_pkgname}" - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/arch/plasma5-applet-awesome-widgets.install b/arch/plasma5-applet-awesome-widgets.install deleted file mode 100644 index fb7647d..0000000 --- a/arch/plasma5-applet-awesome-widgets.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - kbuildsycoca5 > /dev/null 2>&1 -} - -post_upgrade() { - post_install "$1" -} - -post_remove() { - post_install "$1" -}