diff options
author | Javier Tiá | 2018-07-19 20:47:15 -0600 |
---|---|---|
committer | Javier Tiá | 2018-07-19 20:47:15 -0600 |
commit | a604c206f4bf1def73211fc9e98f75818531ea5a (patch) | |
tree | 90bb94ceb5904094686fc128158c90102f973903 | |
parent | 392892296a4774167ada70ecd54f5097328fdc9c (diff) | |
download | aur-a604c206f4bf1def73211fc9e98f75818531ea5a.tar.gz |
Bump up rtags 2.18-3
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 52 | ||||
-rw-r--r-- | rtags.install | 34 |
3 files changed, 40 insertions, 58 deletions
@@ -1,9 +1,8 @@ pkgbase = rtags pkgdesc = RTags is a client/server application that indexes C/C++ code pkgver = 2.18 - pkgrel = 2 + pkgrel = 3 url = https://github.com/Andersbakken/rtags - install = rtags.install arch = i686 arch = x86_64 license = GPL3 @@ -16,10 +15,17 @@ pkgbase = rtags optdepends = bash-completion: for bash completion optdepends = zlib optdepends = lua: Lua bindings - provides = rtags conflicts = rtags-git + source = git+https://github.com/Andersbakken/rtags.git#tag=v2.18 + source = git+https://github.com/Andersbakken/rct.git + source = git+https://github.com/jeremyong/Selene.git + source = git+https://github.com/LuaDist/lua.git source = rdm.service source = rdm.socket + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP sha256sums = c2235b4360442d309f14a38cbd7a7cbb2091061cb1d12a827ef173c1aa0bf556 sha256sums = 56bf4f3e8208ea142c61ed6f80b4907f15e2bab8d690763cff8fb15f893ad16d @@ -1,50 +1,60 @@ # Maintainer: Javier Tiá <javier dot tia at gmail dot com> +# Contributor: Vladimir Panteleev <arch-pkg at thecybershadow dot net> pkgname=rtags pkgver=2.18 -pkgrel=2 +pkgrel=3 pkgdesc='RTags is a client/server application that indexes C/C++ code' arch=('i686' 'x86_64') -url='https://github.com/Andersbakken/rtags' +_url='https://github.com/Andersbakken' +url="${_url}/rtags" license=('GPL3') depends=('bash' 'clang') +conflicts=("${pkgname}-git") makedepends=('cmake' 'git' 'llvm' 'zlib') optdepends=('bash-completion: for bash completion' 'zlib' 'lua: Lua bindings') -provides=('rtags') -conflicts=('rtags-git') -install="${pkgname}.install" -source=(rdm.service - rdm.socket) -sha256sums=('c2235b4360442d309f14a38cbd7a7cbb2091061cb1d12a827ef173c1aa0bf556' +source=("git+${_url}/rtags.git#tag=v${pkgver}" + "git+${_url}/rct.git" + 'git+https://github.com/jeremyong/Selene.git' + 'git+https://github.com/LuaDist/lua.git' + rdm.service + rdm.socket +) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'c2235b4360442d309f14a38cbd7a7cbb2091061cb1d12a827ef173c1aa0bf556' '56bf4f3e8208ea142c61ed6f80b4907f15e2bab8d690763cff8fb15f893ad16d') prepare() { - git clone --no-checkout --no-tags --single-branch --branch v${pkgver} \ - ${url}.git ${pkgname} - cd ${pkgname} - git checkout -b v${pkgver} v${pkgver} + cd "${pkgname}" git submodule init + git config submodule.src/rct.url "${srcdir}"/rct + git config submodule.src/selene.url "${srcdir}"/Selene + git config submodule.src/lua.url "${srcdir}"/lua git submodule update } build() { - cd ${pkgname} - msg "Starting to build ${pkgname} v${pkgver}..." + cd "${pkgname}" cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd ${pkgname} + cd "${pkgname}" make DESTDIR="${pkgdir}/" install - install -D --mode=644 ${srcdir}/rdm.service \ - ${pkgdir}/usr/lib/systemd/user/rdm.service - install -D --mode=644 ${srcdir}/rdm.socket \ - ${pkgdir}/usr/lib/systemd/user/rdm.socket + install -D --mode=644 "${srcdir}"/rdm.service \ + "${pkgdir}"/usr/lib/systemd/user/rdm.service + install -D --mode=644 "${srcdir}"/rdm.socket \ + "${pkgdir}"/usr/lib/systemd/user/rdm.socket - cd ${srcdir}/${pkgname} + # Remove after https://github.com/Andersbakken/rtags/pull/1213 is + # merged and appears in a tagged release + cd "${srcdir}/${pkgname}" install -D --mode=644 LICENSE.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE } # vim:set ft=sh ts=2 sw=2 et: diff --git a/rtags.install b/rtags.install deleted file mode 100644 index 07a3e065b072..000000000000 --- a/rtags.install +++ /dev/null @@ -1,34 +0,0 @@ -users=$(loginctl --no-legend list-users | awk '{ print $2 }' | sed ':a;N;$!ba;s/\n/ /g') - -post_install() { - cat << EOF - -You might want to run rtags as a systemd service: - - systemctl --user enable rdm.socket - systemctl --user start rdm.socket - -EOF -} - -pre_remove() { - for i in "$users"; do - running="$(su $i -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user is-active rdm.socket')" - if [[ "$running" = "active" ]]; then - su $i -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user stop rdm.socket' - su $i -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user disable rdm.socket' - fi - done -} - -post_upgrade() { - _daemon_refresh -} - -_daemon_refresh() { - for i in "$users"; do - su $i -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID systemctl --user restart rdm.socket' - done -} - -# vim:set ft=sh ts=2 sw=2 et: |