diff options
author | Charles Milette | 2017-09-12 12:50:24 -0400 |
---|---|---|
committer | Charles Milette | 2017-09-12 12:50:24 -0400 |
commit | 79ed86a87842d97ed9cc7d1f4f4b4fe93ccaf8a2 (patch) | |
tree | f1de2d5ae19d3f262f6c2adc15807613aebd0375 /PKGBUILD | |
parent | a578c54a34bb577e4e7982c0d4e9b21b3a07617e (diff) | |
download | aur-79ed86a87842d97ed9cc7d1f4f4b4fe93ccaf8a2.tar.gz |
Fix conflicts
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -14,18 +14,17 @@ optdepends=('arc-icon-theme: recommended icon theme' 'gnome-themes-standard: for gtk2 themes') makedepends=('gtk3') source=("git+https://github.com/eti0/${_pkgname}.git" - 'change-solid-theme-path.patch') + 'orange-no-conflict.patch') sha512sums=('SKIP' - '5b1ca739206e386cb4bf1f2f0a9524a08f2590972126cc96ef7c2e56ca59e94136cf7f8dc8184cd1c688a488e5e96384d654e279778f93e8f34860f7281afff9') + 'c3b5e0f91e6af117fe3fcb2521d77f50ec7108c43c2a5b1a497d0f00367b5cdc75090864ccb63c04d842db92d6ca6d04717fcc1b9d4ecd436559424b76c2335f') pkgver() { cd "${srcdir}/${_pkgname}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { + patch -p1 -i ../orange-no-conflict.patch cp -a ${_pkgname}{,-solid} - cd ${_pkgname}-solid - patch -p1 -i ../change-solid-theme-path.patch } build() { |