diff options
| -rw-r--r-- | desktop/xmobar/slack-desc | 10 | ||||
| -rw-r--r-- | desktop/xmobar/xmobar.SlackBuild | 9 | ||||
| -rw-r--r-- | desktop/xmobar/xmobar.info | 6 | ||||
| -rw-r--r-- | desktop/xmobar/xmobar_cabal.patch | 11 |
4 files changed, 11 insertions, 25 deletions
diff --git a/desktop/xmobar/slack-desc b/desktop/xmobar/slack-desc index 035513ca2c..be82b740fb 100644 --- a/desktop/xmobar/slack-desc +++ b/desktop/xmobar/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| xmobar: xmobar (A Minimalistic Text Based Status Bar) diff --git a/desktop/xmobar/xmobar.SlackBuild b/desktop/xmobar/xmobar.SlackBuild index f895befa0f..fb16fc8c17 100644 --- a/desktop/xmobar/xmobar.SlackBuild +++ b/desktop/xmobar/xmobar.SlackBuild @@ -4,7 +4,7 @@ # Written by Xavier Maillard <xma@gnu.org> # Updated by Andy Bailey <bailey@akamai.com> -# Copyright 2012 Mikko Värri, Finland +# Copyright 2013 Mikko Värri, Finland # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xmobar -VERSION=${VERSION:-0.15} +VERSION=${VERSION:-0.16} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,9 +73,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix mtl 2.1 compatibility -patch -p0 <$CWD/xmobar_cabal.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ runghc Setup configure \ @@ -95,7 +92,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE readme.md news.md samples \ +cp -a license readme.md news.md samples \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/xmobar/xmobar.info b/desktop/xmobar/xmobar.info index 4c732b855f..18802bfa0d 100644 --- a/desktop/xmobar/xmobar.info +++ b/desktop/xmobar/xmobar.info @@ -1,8 +1,8 @@ PRGNAM="xmobar" -VERSION="0.15" +VERSION="0.16" HOMEPAGE="http://hackage.haskell.org/package/xmobar/" -DOWNLOAD="http://hackage.haskell.org/packages/archive/xmobar/0.15/xmobar-0.15.tar.gz" -MD5SUM="0658679b39168f49d32fe178029ff9f1" +DOWNLOAD="http://hackage.haskell.org/packages/archive/xmobar/0.16/xmobar-0.16.tar.gz" +MD5SUM="4742f1556a8e9b292f18df1176dcd378" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="haskell-hinotify haskell-stm haskell-X11-xft haskell-parsec xmonad-contrib" diff --git a/desktop/xmobar/xmobar_cabal.patch b/desktop/xmobar/xmobar_cabal.patch deleted file mode 100644 index 5c64847665..0000000000 --- a/desktop/xmobar/xmobar_cabal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmobar.cabal.orig 2012-06-23 16:00:20.668999533 +0300 -+++ xmobar.cabal 2012-06-23 16:01:42.749000428 +0300 -@@ -112,7 +112,7 @@ - time, - filepath, - X11 == 1.6.*, -- mtl == 2.0.*, -+ mtl >= 2.0.0 && < 2.2, - parsec == 3.1.*, - stm == 2.3.* - |