summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Warner2018-12-12 04:27:02 -0800
committerLeif Warner2018-12-12 04:27:02 -0800
commitf6268ac6b4318c2f1ebb17e1d5d1672ae2cefcd2 (patch)
tree842afd78ba99ed5acebefb60ea6bac119a1be2e6
parentdb0f0217ede980e606d6ab95e99fa8457d18b7a3 (diff)
downloadaur-f6268ac6b4318c2f1ebb17e1d5d1672ae2cefcd2.tar.gz
Apply patch from github to compile on GHC 8.6
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
2 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d110a734b8d..f5b370a65d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Dec 12 12:26:36 UTC 2018
pkgbase = taffybar
pkgdesc = A desktop bar similar to xmobar, but with more GUI
pkgver = 3.0.0
- pkgrel = 2
+ pkgrel = 3
url = http://github.com/travitch/taffybar
install = taffybar.install
arch = i686
@@ -54,11 +56,13 @@ pkgbase = taffybar
source = taffybar.install
source = taffybar.service
source = https://raw.githubusercontent.com/taffybar/taffybar/13b32fc2bc62129093494e939339a979d641691c/xmonad.hs.example
+ source = https://github.com/taffybar/taffybar/commit/ee2cd6b871ea05bc60a050d5cefc9e307475e794.patch
sha256sums = 6d6de1a4de2c9bf4758db69c8dd322ce0ffe7fe2eb5042bac5d0857230152ffa
sha256sums = ff90b6e3d05b3bb94cfc2365708bbabbb96fd9a9a4919c0face6f8d2b69037e7
sha256sums = e1a1c820057c64fab4521de3c9b153e4d54e7df9a96d94679dbffc9cec245076
sha256sums = f4a08e887ba527a24f4cecc22393023bf7230172cc76f840ddfc5cfc54182a7e
sha256sums = 1a8ca4f177891941960585e228d5386ea9f120a1bb12ac0a956200de839032cb
+ sha256sums = 697275116d1a11410326dc40d9bc8d712f51f9c156b5ff241fb681b79a5ffb18
pkgname = taffybar
diff --git a/PKGBUILD b/PKGBUILD
index b246c56d8a0..2110f34c564 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leif Warner <abimelech@gmail.com>
pkgname=taffybar
pkgver=3.0.0
-pkgrel=2
+pkgrel=3
license=('BSD3')
pkgdesc="A desktop bar similar to xmobar, but with more GUI"
url="http://github.com/travitch/taffybar"
@@ -54,13 +54,16 @@ source=("https://github.com/taffybar/taffybar/archive/v${pkgver}.tar.gz"
"dynamic-compilation.patch"
"taffybar.install"
"taffybar.service"
- "https://raw.githubusercontent.com/taffybar/taffybar/13b32fc2bc62129093494e939339a979d641691c/xmonad.hs.example")
+ "https://raw.githubusercontent.com/taffybar/taffybar/13b32fc2bc62129093494e939339a979d641691c/xmonad.hs.example"
+ "https://github.com/taffybar/taffybar/commit/ee2cd6b871ea05bc60a050d5cefc9e307475e794.patch"
+ )
sha256sums=('6d6de1a4de2c9bf4758db69c8dd322ce0ffe7fe2eb5042bac5d0857230152ffa'
'ff90b6e3d05b3bb94cfc2365708bbabbb96fd9a9a4919c0face6f8d2b69037e7'
'e1a1c820057c64fab4521de3c9b153e4d54e7df9a96d94679dbffc9cec245076'
'f4a08e887ba527a24f4cecc22393023bf7230172cc76f840ddfc5cfc54182a7e'
- '1a8ca4f177891941960585e228d5386ea9f120a1bb12ac0a956200de839032cb')
+ '1a8ca4f177891941960585e228d5386ea9f120a1bb12ac0a956200de839032cb'
+ '697275116d1a11410326dc40d9bc8d712f51f9c156b5ff241fb681b79a5ffb18')
# PKGBUILD functions
@@ -68,8 +71,9 @@ prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# See https://github.com/willdonnelly/dyre/issues/5
- patch -p1 -i ../dynamic-compilation.patch
#sed -i -e 's/Dyre.ghcOpts = \["-threaded", "-rtsopts"\]/Dyre.ghcOpts = \["-threaded", "-rtsopts", "-dynamic"\]/' src/System/Taffybar.hs
+ patch -p1 -i ../dynamic-compilation.patch
+ patch -p1 -i ../ee2cd6b871ea05bc60a050d5cefc9e307475e794.patch
}
build() {