diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-10 11:32:41 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-10 11:32:41 +0100 |
commit | bdf817c3549ba377334deb1161de703579670d62 (patch) | |
tree | c1b80c05c917cda2619e267049978f971bdad169 /community/xmonad-contrib | |
parent | df609724f30aaccfb05d9fb73f68e7a37118f2f8 (diff) | |
parent | 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cdemu-client/PKGBUILD
community/dcron/PKGBUILD
community/freevo/PKGBUILD
community/gmerlin-avdecoder/PKGBUILD
community/hacburn/PKGBUILD
community/htmldoc/PKGBUILD
community/ibus-table/PKGBUILD
community/iksemel/PKGBUILD
community/isomaster/PKGBUILD
community/libmatio/PKGBUILD
community/libtlen/PKGBUILD
community/luarocks/PKGBUILD
community/lxde-common/PKGBUILD
community/multipath-tools/PKGBUILD
community/nvclock/PKGBUILD
community/pam-krb5/PKGBUILD
community/pidgin-musictracker/PKGBUILD
community/pkgfile/PKGBUILD
community/pkgtools/PKGBUILD
community/print-manager/PKGBUILD
community/python-pyro/PKGBUILD
community/python-pyxmpp/PKGBUILD
community/python2-simplejson/PKGBUILD
community/rsnapshot/PKGBUILD
community/setconf/PKGBUILD
community/tagpy/PKGBUILD
community/terminator/PKGBUILD
community/udunits/PKGBUILD
community/vlock/PKGBUILD
community/winefish/PKGBUILD
core/nss-myhostname/PKGBUILD
extra/avfs/PKGBUILD
extra/bmp-musepack/PKGBUILD
extra/bmp-wma/PKGBUILD
extra/bochs/PKGBUILD
extra/botan/PKGBUILD
extra/cdargs/PKGBUILD
extra/cx_freeze/PKGBUILD
extra/dcfldd/PKGBUILD
extra/devilspie/PKGBUILD
extra/emelfm2/PKGBUILD
extra/evilwm/PKGBUILD
extra/fssos-nsvs/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-gap/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gmpc/PKGBUILD
extra/gtkpod/PKGBUILD
extra/hercules/PKGBUILD
extra/herqq/PKGBUILD
extra/hydrogen/PKGBUILD
extra/kdegames/PKGBUILD
extra/kradio/PKGBUILD
extra/kshutdown/PKGBUILD
extra/libmusicbrainz4/PKGBUILD
extra/mahjong/PKGBUILD
extra/mcrypt/PKGBUILD
extra/monica/PKGBUILD
extra/mpck/PKGBUILD
extra/mrtg/PKGBUILD
extra/nicotine/PKGBUILD
extra/normalize/PKGBUILD
extra/oprofile/PKGBUILD
extra/perl-event/PKGBUILD
extra/perl-unicode-string/PKGBUILD
extra/pidgin-encryption/PKGBUILD
extra/proftpd/PKGBUILD
extra/pymad/PKGBUILD
extra/qiv/PKGBUILD
extra/quodlibet/PKGBUILD
extra/ratpoison/PKGBUILD
extra/rox/PKGBUILD
extra/scrot/PKGBUILD
extra/stardict/PKGBUILD
extra/terminal/PKGBUILD
extra/usbview/PKGBUILD
extra/xdelta/PKGBUILD
extra/xdelta3/PKGBUILD
extra/xorg-xlsfonts/PKGBUILD
extra/zile/PKGBUILD
mozilla-testing/iceweasel-libre/mozconfig
mozilla-testing/iceweasel-libre/vendor.js
social/tokyocabinet/PKGBUILD
~fauno/notmuch/PKGBUILD
~mtjm/thinkfan/PKGBUILD
~mtjm/zbar/PKGBUILD
Diffstat (limited to 'community/xmonad-contrib')
-rw-r--r-- | community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch deleted file mode 100644 index 8372b4144..000000000 --- a/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch +++ /dev/null @@ -1,46 +0,0 @@ -Tue Mar 20 03:53:11 FET 2012 Adam Vogt <vogt.adam@gmail.com> - * Bump version to 0.10.1 - - Raising the X11 dependency while keeping the xmonad version the same leads to - problems where cabal install uses the dependency versions following hackage, - not what is installed. -diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal -index 743bdc8..0fbf4ac 100644 ---- a/xmonad-contrib.cabal -+++ b/xmonad-contrib.cabal -@@ -61,7 +61,7 @@ library - extensions: ForeignFunctionInterface - cpp-options: -DXFT - -- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string -+ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string - - if true - ghc-options: -fwarn-tabs -Wall -diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs -index a485d95..5e388e2 100644 ---- a/XMonad/Layout/Spiral.hs -+++ b/XMonad/Layout/Spiral.hs -@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral ( - ) where - - import Data.Ratio --import XMonad -+import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..)) - import XMonad.StackSet ( integrate ) - - -- $usage -diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs -index 0d78653..4b7fd3b 100644 ---- a/XMonad/Util/Paste.hs -+++ b/XMonad/Util/Paste.hs -@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage - where - - import XMonad (io, theRoot, withDisplay, X ()) --import Graphics.X11 -+import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode) -+import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask) - import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent) - import Control.Monad.Reader (asks) - import XMonad.Operations (withFocused) |