Commit aaf0065e authored by Joachim Breitner's avatar Joachim Breitner

Refresh or opportunistically remove a few patches

parent 78ed0683
......@@ -5,14 +5,14 @@ Author: Colin Watson <cjwatson@ubuntu.com>
Forwarded: no
Last-Update: 2014-12-03
Index: gtk3-0.13.3/gtk3.cabal
Index: haskell-gtk3/gtk3.cabal
===================================================================
--- gtk3-0.13.3.orig/gtk3.cabal 2014-12-21 19:53:50.820873355 +0100
+++ gtk3-0.13.3/gtk3.cabal 2014-12-21 19:53:50.820873355 +0100
@@ -381,6 +381,8 @@
--- haskell-gtk3.orig/gtk3.cabal 2015-08-15 14:35:59.670399380 +0200
+++ haskell-gtk3/gtk3.cabal 2015-08-15 14:35:59.666399298 +0200
@@ -385,6 +385,8 @@
pkgconfig-depends: gthread-2.0, gtk+-3.0
+ cpp-options: -Upixel
+
Executable gtk2hs-demo-actionMenu
......
Index: happstack-server-7.3.9/happstack-server.cabal
Index: haskell-happstack-server/happstack-server.cabal
===================================================================
--- happstack-server-7.3.9.orig/happstack-server.cabal 2015-06-18 13:00:30.275601032 +0200
+++ happstack-server-7.3.9/happstack-server.cabal 2015-06-18 13:02:35.043596430 +0200
@@ -104,6 +104,7 @@
--- haskell-happstack-server.orig/happstack-server.cabal 2015-08-15 14:36:14.690710352 +0200
+++ haskell-happstack-server/happstack-server.cabal 2015-08-15 14:36:14.690710352 +0200
@@ -105,6 +105,7 @@
if (flag(template_haskell) && !(arch(arm)))
Build-Depends: template-haskell
cpp-options: -DTEMPLATE_HASKELL
+ Extensions: TemplateHaskell
hs-source-dirs: src
@@ -111,7 +112,7 @@
@@ -112,7 +113,7 @@
Build-Depends: unix
cpp-options: -DUNIX
- Extensions: TemplateHaskell, DeriveDataTypeable, MultiParamTypeClasses,
+ Extensions: DeriveDataTypeable, MultiParamTypeClasses,
TypeFamilies, FlexibleContexts, OverlappingInstances,
......
Index: hledger-web-0.24.1/hledger-web.cabal
===================================================================
--- hledger-web-0.24.1.orig/hledger-web.cabal 2015-06-23 12:35:51.293411272 +0200
+++ hledger-web-0.24.1/hledger-web.cabal 2015-06-23 12:35:51.289411182 +0200
@@ -171,7 +171,6 @@
, http-conduit
, http-client
, HUnit
- , network-conduit
, conduit-extra
, old-locale
, parsec >= 3
@@ -242,7 +241,6 @@
, http-conduit
, http-client
, HUnit
- , network-conduit
, conduit-extra
, old-locale
, parsec >= 3
......@@ -3,17 +3,18 @@ Author: Colin Watson <cjwatson@debian.org>
Forwarded: no
Last-Update: 2015-05-08
Index: b/hmatrix.cabal
Index: haskell-hmatrix/hmatrix.cabal
===================================================================
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -90,7 +90,9 @@
--- haskell-hmatrix.orig/hmatrix.cabal 2015-08-15 14:36:37.499182986 +0200
+++ haskell-hmatrix/hmatrix.cabal 2015-08-15 14:36:37.495182903 +0200
@@ -101,7 +101,9 @@
-fno-warn-missing-signatures
-fno-warn-orphans
- cc-options: -O4 -msse2 -Wall
+ cc-options: -O4 -Wall
+ if arch(x86_64) || arch(i386)
+ cc-options: -msse2
cpp-options: -DBINARY
Index: b/src/Recipe/Haddock.hs
Index: haskell-hoogle/src/Recipe/Haddock.hs
===================================================================
--- a/src/Recipe/Haddock.hs
+++ b/src/Recipe/Haddock.hs
--- haskell-hoogle.orig/src/Recipe/Haddock.hs 2015-08-15 14:37:07.203799247 +0200
+++ haskell-hoogle/src/Recipe/Haddock.hs 2015-08-15 14:37:07.199799164 +0200
@@ -1,7 +1,7 @@
{-# LANGUAGE PatternGuards #-}
module Recipe.Haddock(
- haddockToHTML, haddockHacks
+ haddockToHTML, haddockHacks, haddockPackageUrl
) where
import General.Base
Index: b/src/CmdLine/Type.hs
Index: haskell-hoogle/src/CmdLine/Type.hs
===================================================================
--- a/src/CmdLine/Type.hs
+++ b/src/CmdLine/Type.hs
@@ -47,7 +47,8 @@
--- haskell-hoogle.orig/src/CmdLine/Type.hs 2015-08-15 14:37:07.203799247 +0200
+++ haskell-hoogle/src/CmdLine/Type.hs 2015-08-15 14:37:07.199799164 +0200
@@ -49,7 +49,8 @@
, outfile :: String
, doc :: Maybe String
, merge :: [String]
......@@ -25,22 +25,22 @@ Index: b/src/CmdLine/Type.hs
| Log {logfiles :: [FilePath]}
| Test {testFiles :: [String], example :: Bool}
| Dump {database :: String, section :: [String]}
@@ -110,6 +111,7 @@
@@ -112,6 +113,7 @@
,doc = def &= typDir &= help "Path to the root of local or Hackage documentation for the package (implies --haddock)"
,merge = def &= typ "DATABASE" &= help "Merge other databases"
,haddock = def &= help "Apply haddock-specific hacks"
+ ,addlocation = def &= help "Add location information to database"
} &= help "Convert an input file to a database"
data_ = Data
Index: b/src/Console/All.hs
Index: haskell-hoogle/src/Console/All.hs
===================================================================
--- a/src/Console/All.hs
+++ b/src/Console/All.hs
--- haskell-hoogle.orig/src/Console/All.hs 2015-08-15 14:37:07.203799247 +0200
+++ haskell-hoogle/src/Console/All.hs 2015-08-15 14:37:07.199799164 +0200
@@ -40,12 +40,15 @@
action (Log files) = logFiles files
-action (Convert url from to doc merge haddock) = do
+action (Convert url from to doc merge haddock addloc) = do
when (any isUpper $ takeBaseName to) $ putStrLn $ "Warning: Hoogle databases should be all lower case, " ++ takeBaseName to
......
--- a/tests/test-pandoc-citeproc.hs
+++ b/tests/test-pandoc-citeproc.hs
@@ -63,7 +63,7 @@
Index: haskell-pandoc-citeproc/tests/test-pandoc-citeproc.hs
===================================================================
--- haskell-pandoc-citeproc.orig/tests/test-pandoc-citeproc.hs 2015-08-15 14:41:00.948579842 +0200
+++ haskell-pandoc-citeproc/tests/test-pandoc-citeproc.hs 2015-08-15 14:41:00.948579842 +0200
@@ -69,7 +69,7 @@
(ec, jsonOut, errout) <- pipeProcess
(Just [("LANG","en_US.UTF-8"),("HOME",".")])
- "dist/build/pandoc-citeproc/pandoc-citeproc"
......@@ -9,7 +11,7 @@
[] jsonIn
if ec == ExitSuccess
then do
@@ -104,7 +104,7 @@
@@ -113,7 +113,7 @@
let expected = BL.unlines yamllines
(ec, result, errout) <- pipeProcess
(Just [("LANG","en_US.UTF-8"),("HOME",".")])
......
Index: parsers-0.12.1.1/parsers.cabal
Index: haskell-parsers/parsers.cabal
===================================================================
--- parsers-0.12.1.1.orig/parsers.cabal 2015-06-15 10:09:33.000000000 +0200
+++ parsers-0.12.1.1/parsers.cabal 2015-06-15 10:09:56.072109255 +0200
@@ -58,6 +58,7 @@
--- haskell-parsers.orig/parsers.cabal 2015-08-15 14:41:17.724924754 +0200
+++ haskell-parsers/parsers.cabal 2015-08-15 14:41:17.720924673 +0200
@@ -59,6 +59,7 @@
-- Verify the results of the examples
test-suite doctests
+ buildable: false
......
Index: haskell-quickcheck-2.7.6/QuickCheck.cabal
===================================================================
--- haskell-quickcheck-2.7.6.orig/QuickCheck.cabal 2014-07-31 11:17:10.419698248 +0200
+++ haskell-quickcheck-2.7.6/QuickCheck.cabal 2014-07-31 11:17:30.431697469 +0200
@@ -144,3 +144,7 @@
QuickCheck == 2.7.6,
template-haskell >= 2.4,
test-framework >= 0.4 && < 0.9
+ if flag(templateHaskell)
+ Buildable: True
+ else
+ Buildable: False
Index: unlambda-0.1.3/Language/Unlambda.hs
===================================================================
--- unlambda-0.1.3.orig/Language/Unlambda.hs 2012-10-31 12:57:28.000000000 -0400
+++ unlambda-0.1.3/Language/Unlambda.hs 2012-11-01 12:45:35.773424569 -0400
@@ -5,7 +5,7 @@
This is an interpreter of the Unlambda language, written in
the pure, lazy, functional language Haskell.
-Copyright (C) 2001 by rjan Johansen <oerjan@nvg.ntnu.no>
+Copyright (C) 2001 by Ørjan Johansen <oerjan@nvg.ntnu.no>
Copyright (C) 2006 by Don Stewart - http://www.cse.unsw.edu.au/~dons
This program is free software; you can redistribute it and/or modify
Index: web-routes-0.27.8/web-routes.cabal
Index: haskell-web-routes/web-routes.cabal
===================================================================
--- web-routes-0.27.8.orig/web-routes.cabal 2015-06-16 13:00:17.135077130 +0200
+++ web-routes-0.27.8/web-routes.cabal 2015-06-16 13:01:30.652722369 +0200
@@ -41,8 +41,7 @@
--- haskell-web-routes.orig/web-routes.cabal 2015-08-15 14:42:38.962598983 +0200
+++ haskell-web-routes/web-routes.cabal 2015-08-15 14:42:38.958598901 +0200
@@ -42,8 +42,7 @@
Web.Routes.RouteT
Web.Routes.Site
- Extensions: TemplateHaskell,
- FlexibleContexts,
+ Extensions: FlexibleContexts,
CPP
source-repository head
Description: In Debian the bf binary was renamed to hsbrainfuck.
Forwarded: not-needed
Author: Raúl Benencia <rul@kalgan.cc>
--- a/src/Lambdabot/Config/Core.hs
+++ b/src/Lambdabot/Config/Core.hs
@@ -56,7 +56,7 @@
-- Program names/locations
config "aspellBinary" [t| String |] [| "aspell" |]
-config "bfBinary" [t| String |] [| "bf" |]
+config "bfBinary" [t| String |] [| "hsbrainfuck" |]
config "djinnBinary" [t| String |] [| "djinn" |]
config "ghcBinary" [t| String |] [| "ghc" |]
config "ghciBinary" [t| String |] [| "ghci" |]
Description: Disable some plugins
Not all plugins are very useful, and some pull in a lot of dependencies.
Disable these. Also implement random in Lambdabot.Utils more naively.
Author: Joachim Breitner <nomeata@debian.org>
--- a/lambdabot.cabal
+++ b/lambdabot.cabal
@@ -77,7 +77,7 @@
Lambdabot.Plugin.Check
Lambdabot.Plugin.Check.ShowQ
Lambdabot.Plugin.Compose
- Lambdabot.Plugin.Dice
+ --Lambdabot.Plugin.Dice
Lambdabot.Plugin.Dict
Lambdabot.Plugin.Djinn
Lambdabot.Plugin.Dummy
@@ -98,20 +98,20 @@
Lambdabot.Plugin.Localtime
Lambdabot.Plugin.Log
Lambdabot.Plugin.More
- Lambdabot.Plugin.Numberwang
+ --Lambdabot.Plugin.Numberwang
Lambdabot.Plugin.OEIS
Lambdabot.Plugin.OfflineRC
Lambdabot.Plugin.Pl
Lambdabot.Plugin.Pointful
Lambdabot.Plugin.Poll
Lambdabot.Plugin.Pretty
- Lambdabot.Plugin.Quote
+ --Lambdabot.Plugin.Quote
Lambdabot.Plugin.Search
Lambdabot.Plugin.Seen
Lambdabot.Plugin.Slap
Lambdabot.Plugin.Source
Lambdabot.Plugin.Spell
- Lambdabot.Plugin.Stats
+ --Lambdabot.Plugin.Stats
Lambdabot.Plugin.System
Lambdabot.Plugin.Tell
Lambdabot.Plugin.Ticker
@@ -161,17 +161,17 @@
dependent-map == 0.1.*,
dependent-sum == 0.2.*,
dependent-sum-template >= 0.0.0.1,
- dice >= 0.1,
+ --dice >= 0.1,
directory >= 1.1,
edit-distance >= 0.2,
filepath >= 1.3,
haskeline >= 0.7,
haskell-src-exts >= 1.14.0,
- hstatsd >= 0.1,
+ --hstatsd >= 0.1,
hslogger >= 1.2.1,
HTTP >= 4000,
lifted-base >= 0.2,
- misfortune >= 0.1,
+ --misfortune >= 0.1,
monad-control >= 0.3,
mtl >= 2,
network >= 2.3.0.13,
@@ -182,8 +182,8 @@
process >= 1.1,
QuickCheck >= 2,
random >= 1,
- random-fu >= 0.2,
- random-source >= 0.3,
+ --random-fu >= 0.2,
+ --random-source >= 0.3,
regex-tdfa >= 1.1,
SafeSemaphore >= 0.9,
show >= 0.4,
--- a/main/Modules.hs
+++ b/main/Modules.hs
@@ -12,7 +12,7 @@
import Lambdabot.Plugin.BF
import Lambdabot.Plugin.Check
import Lambdabot.Plugin.Compose
-import Lambdabot.Plugin.Dice
+--import Lambdabot.Plugin.Dice
import Lambdabot.Plugin.Dict
import Lambdabot.Plugin.Djinn
import Lambdabot.Plugin.Dummy
@@ -35,7 +35,7 @@
import Lambdabot.Plugin.Pointful
import Lambdabot.Plugin.Poll
import Lambdabot.Plugin.Pretty
-import Lambdabot.Plugin.Quote
+--import Lambdabot.Plugin.Quote
import Lambdabot.Plugin.Search
import Lambdabot.Plugin.Seen
import Lambdabot.Plugin.Slap
@@ -68,7 +68,7 @@
, "bfPlugin"
, "checkPlugin"
, "composePlugin"
- , "dicePlugin"
+ --, "dicePlugin"
, "dictPlugin"
, "djinnPlugin"
, "dummyPlugin"
@@ -90,7 +90,7 @@
, "pointfulPlugin"
, "pollPlugin"
, "prettyPlugin"
- , "quotePlugin"
+ --, "quotePlugin"
, "searchPlugin"
, "seenPlugin"
, "slapPlugin"
--- a/src/Lambdabot.hs
+++ b/src/Lambdabot.hs
@@ -39,7 +39,7 @@
import Control.Monad.Reader
import Control.Monad.State
import qualified Data.Map as M
-import Data.Random.Source
+--import Data.Random.Source
import qualified Data.Set as S
------------------------------------------------------------------------
@@ -173,15 +173,3 @@
ircPrivmsg' who msg = send $ privmsg who msg
------------------------------------------------------------------------
-
-monadRandom [d|
-
- instance MonadRandom LB where
- getRandomWord8 = LB (lift getRandomWord8)
- getRandomWord16 = LB (lift getRandomWord16)
- getRandomWord32 = LB (lift getRandomWord32)
- getRandomWord64 = LB (lift getRandomWord64)
- getRandomDouble = LB (lift getRandomDouble)
- getRandomNByteInteger n = LB (lift (getRandomNByteInteger n))
-
- |]
--- a/src/Lambdabot/Util.hs
+++ b/src/Lambdabot/Util.hs
@@ -24,7 +24,7 @@
import Control.Monad.Trans
import Data.Char
import Data.List
-import Data.Random
+import System.Random (randomRIO)
------------------------------------------------------------------------
@@ -57,7 +57,10 @@
-- | Pick a random element of the list.
random :: MonadIO m => [a] -> m a
-random = io . sample . randomElement
+random = io . pick
+ where
+ pick :: [a] -> IO a
+ pick xs = randomRIO (0, length xs - 1) >>= return . (xs !!)
------------------------------------------------------------------------
Index: lambdabot-4.3.0.1/src/Lambdabot/Monad.hs-boot
===================================================================
--- lambdabot-4.3.0.1.orig/src/Lambdabot/Monad.hs-boot 2015-06-20 19:20:39.812844448 +0200
+++ lambdabot-4.3.0.1/src/Lambdabot/Monad.hs-boot 2015-06-20 19:26:29.294282756 +0200
@@ -1,5 +1,6 @@
-{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE RankNTypes, RoleAnnotations #-}
module Lambdabot.Monad where
+type role LB nominal
data LB a
instance Monad LB
Index: lambdabot-4.3.0.1/lambdabot.cabal
===================================================================
--- lambdabot-4.3.0.1.orig/lambdabot.cabal 2015-06-20 19:20:50.280989420 +0200
+++ lambdabot-4.3.0.1/lambdabot.cabal 2015-06-20 19:21:16.133353190 +0200
@@ -174,7 +174,8 @@
--misfortune >= 0.1,
monad-control >= 0.3,
mtl >= 2,
- network >= 2.3.0.13,
+ network >= 2.6,
+ network-uri >= 2.6,
oeis >= 0.3.1,
time >= 1.4,
parsec >= 3,
correct-bf-binary-name.patch
disable-some-plugins
network-uri
fix-type-roles
Index: taffybar-0.4.4/taffybar.cabal
Index: taffybar/taffybar.cabal
===================================================================
--- taffybar-0.4.4.orig/taffybar.cabal 2014-12-30 13:40:09.980001474 +0100
+++ taffybar-0.4.4/taffybar.cabal 2014-12-30 13:40:53.696939599 +0100
@@ -55,7 +55,7 @@
--- taffybar.orig/taffybar.cabal 2015-08-15 14:43:19.035427092 +0200
+++ taffybar/taffybar.cabal 2015-08-15 14:43:19.031427009 +0200
@@ -56,7 +56,7 @@
if flag(network-uri)
build-depends: network-uri >= 2.6 && < 3, network >= 2.6 && < 3
else
......
......@@ -5,16 +5,16 @@ Forwarded: not-needed
Last-Update: 2012-07-07
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: xmonad-0.10.1~darcs20120707/XMonad/Config.hs
Index: xmonad/XMonad/Config.hs
===================================================================
--- xmonad-0.10.1~darcs20120707.orig/XMonad/Config.hs 2012-07-07 15:45:06.287889056 -0400
+++ xmonad-0.10.1~darcs20120707/XMonad/Config.hs 2012-07-07 15:45:08.123898152 -0400
@@ -151,7 +151,7 @@
--- xmonad.orig/XMonad/Config.hs 2015-08-15 14:43:32.443704478 +0200
+++ xmonad/XMonad/Config.hs 2015-08-15 14:43:32.439704396 +0200
@@ -152,7 +152,7 @@
-- | The preferred terminal program, which is used in a binding below and by
-- certain contrib modules.
terminal :: String
-terminal = "xterm"
+terminal = "x-terminal-emulator"
-- | Whether focus follows the mouse pointer.
focusFollowsMouse :: Bool
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment