[packages/ghc-xmonad-contrib] - new

atler atler at pld-linux.org
Sat Mar 16 12:22:05 CET 2013


commit 4f8c9050b9f9d65ee8a193d8aa042b1e0caad605
Author: Jan Palus <jan.palus at gmail.com>
Date:   Sat Mar 16 12:21:47 2013 +0100

    - new

 ghc-xmonad-contrib.spec          | 90 ++++++++++++++++++++++++++++++++++++++++
 xmonad-contrib-getAtomName.patch | 33 +++++++++++++++
 2 files changed, 123 insertions(+)
---
diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
new file mode 100644
index 0000000..18af90c
--- /dev/null
+++ b/ghc-xmonad-contrib.spec
@@ -0,0 +1,90 @@
+%define		pkgname	xmonad-contrib
+Summary:	Third party extensions for xmonad
+Name:		ghc-%{pkgname}
+Version:	0.11
+Release:	0.1
+License:	BSD
+Group:		Development/Languages
+Source0:	http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
+# Source0-md5:	05fba258ac6063e49b50786a0869bd1f
+Patch0:		%{pkgname}-getAtomName.patch
+URL:		http://www.xmonad.org
+BuildRequires:	ghc >= 6.12.3
+BuildRequires:	ghc-extensible-exceptions
+BuildRequires:	ghc-mtl
+BuildRequires:	ghc-random
+BuildRequires:	ghc-utf8-string
+BuildRequires:	ghc-X11 >= 1.6
+BuildRequires:	rpmbuild(macros) >= 1.608
+BuildRequires:	xmonad >= 0.11
+%requires_eq	ghc
+Requires:	ghc-extensible-exceptions
+Requires:	ghc-mtl
+Requires:	ghc-random
+Requires:	ghc-utf8-string
+Requires:	ghc-X11 >= 1.6
+Requires:	xmonad >= 0.11
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+# debuginfo is not useful for ghc
+%define		_enable_debug_packages	0
+
+%description
+Third party extensions for xmonad.
+
+%package doc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
+
+%description doc
+HTML documentation for %{pkgname}.
+
+%description doc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
+%prep
+%setup -q -n %{pkgname}-%{version}
+%patch0 -p1
+
+%build
+runhaskell Setup.lhs configure -v2 \
+	--prefix=%{_prefix} \
+	--libdir=%{_libdir} \
+	--libexecdir=%{_libexecdir} \
+	--docdir=%{_docdir}/%{name}-%{version}
+
+runhaskell Setup.lhs build
+runhaskell Setup.lhs haddock --executables
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d
+
+runhaskell Setup.lhs copy --destdir=$RPM_BUILD_ROOT
+
+# work around automatic haddock docs installation
+rm -rf %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{name}-%{version}-doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
+runhaskell Setup.lhs register \
+	--gen-pkg-config=$RPM_BUILD_ROOT/%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%ghc_pkg_recache
+
+%postun
+%ghc_pkg_recache
+
+%files
+%defattr(644,root,root,755)
+%{_libdir}/%{ghcdir}/package.conf.d/%{pkgname}.conf
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}
+
+%files doc
+%defattr(644,root,root,755)
+%doc %{name}-%{version}-doc/*
diff --git a/xmonad-contrib-getAtomName.patch b/xmonad-contrib-getAtomName.patch
new file mode 100644
index 0000000..ef4b907
--- /dev/null
+++ b/xmonad-contrib-getAtomName.patch
@@ -0,0 +1,33 @@
+Mon Feb 25 21:03:23 FET 2013  Daniel Wagner <daniel at wagner-home.com>
+  * getAtomName is now defined in the X11 library
+diff -rN -u old-XMonadContrib/XMonad/Hooks/DebugEvents.hs new-XMonadContrib/XMonad/Hooks/DebugEvents.hs
+--- old-XMonadContrib/XMonad/Hooks/DebugEvents.hs	2013-02-26 17:41:10.187127142 +0300
++++ new-XMonadContrib/XMonad/Hooks/DebugEvents.hs	2013-02-26 17:41:10.207127143 +0300
+@@ -42,27 +42,12 @@
+ import           Data.Maybe                                  (fromMaybe)
+ import           Data.Monoid
+ import           Foreign
+-import           Foreign.C.String
+ import           Foreign.C.Types
+ import           Numeric                                     (showHex)
+ import           System.Exit
+ import           System.IO
+ import           System.Process
+ 
+--- this should move into X11
+-foreign import ccall unsafe "XGetAtomName"
+-  xGetAtomName :: Display -> Atom -> IO CString
+-
+-getAtomName     :: Display -> Atom -> IO (Maybe String)
+-getAtomName d a =  do
+-  n <- xGetAtomName d a
+-  if n == nullPtr
+-    then return Nothing
+-    else do
+-      n' <- peekCString n
+-      xFree n
+-      return $ Just n'
+-
+ -- | Event hook to dump all received events.  You should probably not use this
+ --   unconditionally; it will produce massive amounts of output.
+ debugEventsHook   :: Event -> X All
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ghc-xmonad-contrib.git/commitdiff/4f8c9050b9f9d65ee8a193d8aa042b1e0caad605



More information about the pld-cvs-commit mailing list