summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Choina2019-08-05 18:16:41 -0400
committerSolomon Choina2019-08-05 18:16:41 -0400
commit42d52b30d972275921dc38b6590a071d18885868 (patch)
tree506125a168067b8750630e81137a81a306d13db4
parent2c493c36d5f21b2d5e45fb300765e5d675101db3 (diff)
downloadaur-42d52b30d972275921dc38b6590a071d18885868.tar.gz
well, it seems upstream changed some and doesn't include a taffybar.hs in their git anymore
-rw-r--r--.SRCINFO6
-rw-r--r--0001-will-hopefully-work.patch25
-rw-r--r--PKGBUILD7
-rw-r--r--taffybar.install1
4 files changed, 4 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ee14526a77ab..d28c9d3dd8fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = taffybar
pkgdesc = A desktop bar similar to xmobar, but with more GUI
pkgver = 3.2.1
- pkgrel = 2
+ pkgrel = 3
url = http://github.com/travitch/taffybar
install = taffybar.install
arch = i686
@@ -55,14 +55,12 @@ pkgbase = taffybar
depends = xmonad-contrib
source = https://github.com/taffybar/taffybar/archive/v3.2.1.tar.gz
source = dynamic-compilation.patch
- source = 0001-will-hopefully-work.patch
source = taffybar.install
source = taffybar.service
source = https://raw.githubusercontent.com/taffybar/taffybar/13b32fc2bc62129093494e939339a979d641691c/xmonad.hs.example
sha256sums = 51ca3f4dd505a9d5fb03a3150898bcd090e037ca851f04a4ce4185135bf537ca
sha256sums = ff90b6e3d05b3bb94cfc2365708bbabbb96fd9a9a4919c0face6f8d2b69037e7
- sha256sums = 80a3eba5861ec0d92e0b4e5ebdd7b7c0797695c5f997ca9d329e53eee02508f0
- sha256sums = e1a1c820057c64fab4521de3c9b153e4d54e7df9a96d94679dbffc9cec245076
+ sha256sums = 554340a052abecb78fbb959d1a05b8f4f4db947fc151e7f0f8c49f2300f1ab6d
sha256sums = f4a08e887ba527a24f4cecc22393023bf7230172cc76f840ddfc5cfc54182a7e
sha256sums = 1a8ca4f177891941960585e228d5386ea9f120a1bb12ac0a956200de839032cb
diff --git a/0001-will-hopefully-work.patch b/0001-will-hopefully-work.patch
deleted file mode 100644
index cfd9e9306c47..000000000000
--- a/0001-will-hopefully-work.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 04184c6077d2d28db0c383a5c271f5b1bfd30d98 Mon Sep 17 00:00:00 2001
-From: Solomon Choina <shlomochoina@gmail.com>
-Date: Mon, 5 Aug 2019 09:14:49 -0400
-Subject: [PATCH] will hopefully work
-
----
- taffybar.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/taffybar.cabal b/taffybar.cabal
-index 4b7521c..0b9066b 100644
---- a/taffybar.cabal
-+++ b/taffybar.cabal
-@@ -43,7 +43,7 @@ library
- , HStringTemplate >= 0.8 && < 0.9
- , X11 >= 1.5.0.1
- , ansi-terminal
-- , broadcast-chan >= 0.2.0.2
-+ , broadcast-chan
- , bytestring
- , containers
- , dbus >= 1.2.1 && < 2.0.0
---
-2.22.0
-
diff --git a/PKGBUILD b/PKGBUILD
index e4143bf5fbef..44cb9ff3f466 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leif Warner <abimelech@gmail.com>
pkgname=taffybar
pkgver=3.2.1
-pkgrel=2
+pkgrel=3
license=('BSD3')
pkgdesc="A desktop bar similar to xmobar, but with more GUI"
url="http://github.com/travitch/taffybar"
@@ -56,7 +56,6 @@ makedepends=('ghc')
install=taffybar.install
source=("https://github.com/taffybar/taffybar/archive/v${pkgver}.tar.gz"
"dynamic-compilation.patch"
- "0001-will-hopefully-work.patch"
"taffybar.install"
"taffybar.service"
"https://raw.githubusercontent.com/taffybar/taffybar/13b32fc2bc62129093494e939339a979d641691c/xmonad.hs.example"
@@ -64,8 +63,7 @@ source=("https://github.com/taffybar/taffybar/archive/v${pkgver}.tar.gz"
sha256sums=('51ca3f4dd505a9d5fb03a3150898bcd090e037ca851f04a4ce4185135bf537ca'
'ff90b6e3d05b3bb94cfc2365708bbabbb96fd9a9a4919c0face6f8d2b69037e7'
- '80a3eba5861ec0d92e0b4e5ebdd7b7c0797695c5f997ca9d329e53eee02508f0'
- 'e1a1c820057c64fab4521de3c9b153e4d54e7df9a96d94679dbffc9cec245076'
+ '554340a052abecb78fbb959d1a05b8f4f4db947fc151e7f0f8c49f2300f1ab6d'
'f4a08e887ba527a24f4cecc22393023bf7230172cc76f840ddfc5cfc54182a7e'
'1a8ca4f177891941960585e228d5386ea9f120a1bb12ac0a956200de839032cb')
@@ -105,7 +103,6 @@ package() {
install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
install -Dm 644 CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}"
install -Dm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -Dm 644 taffybar.hs.example -t "${pkgdir}/usr/share/doc/${pkgname}"
install -Dm 644 ${srcdir}/taffybar.service -t "${pkgdir}/usr/lib/systemd/user"
install -Dm 644 ${srcdir}/xmonad.hs.example -t "{$pkgdir}/usr/share/doc/${pkgname}"
diff --git a/taffybar.install b/taffybar.install
index 33a507bd4295..ffcd63af5b32 100644
--- a/taffybar.install
+++ b/taffybar.install
@@ -3,7 +3,6 @@
post_install(){
echo 'Place a taffybar.hs config file in $HOME/.config/taffybar to use.'
- echo 'There is an example one at /usr/share/doc/taffybar/taffbar.hs.example'
echo 'there is an example xmonad.hs in the above folder'
}