diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-04-21 10:01:01 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-04-21 10:01:01 +0200 |
commit | 1916dddb8368c08101026563be15b4de305a480a (patch) | |
tree | 391a8792276b065377bd44cc92a00a394fab4664 /debian/patches | |
parent | 22434f30cd1e59fbe65f286b1fbff3d67ff1759a (diff) |
Add patch 0001 from upstream implementing configure option -threaded.
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/0001_threaded.patch | 40 | ||||
-rw-r--r-- | debian/patches/README | 3 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 44 insertions, 0 deletions
diff --git a/debian/patches/0001_threaded.patch b/debian/patches/0001_threaded.patch new file mode 100644 index 000000000..03ed9e3e7 --- /dev/null +++ b/debian/patches/0001_threaded.patch @@ -0,0 +1,40 @@ +Description: Implement configure option -threaded +Author: John MacFarlane <jgm@berkeley.edu> +Forwarded: not-needed +Last-Update: 2010-04-21 +--- a/pandoc.cabal ++++ b/pandoc.cabal +@@ -124,6 +124,9 @@ + tests/RunTests.hs + Extra-Tmp-Files: man/man1/pandoc.1, man/man1/markdown2pdf.1 + ++Flag threaded ++ Description: Compile markdown2pdf with -threaded option. ++ Default: True + Flag highlighting + Description: Compile in support for syntax highlighting of code blocks. + Default: False +@@ -204,9 +207,9 @@ + Hs-Source-Dirs: src + Main-Is: pandoc.hs + if impl(ghc >= 6.12) +- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind ++ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind + else +- Ghc-Options: -O2 -Wall -threaded ++ Ghc-Options: -O2 -Wall + Ghc-Prof-Options: -auto-all -caf-all + Extensions: CPP + +@@ -223,7 +226,10 @@ + Executable markdown2pdf + Hs-Source-Dirs: src + Main-Is: markdown2pdf.hs +- Ghc-Options: -Wall -threaded ++ if flag(threaded) ++ Ghc-Options: -Wall -threaded ++ else ++ Ghc-Options: -Wall + Ghc-Prof-Options: -auto-all + Extensions: CPP + if flag(wrappers) diff --git a/debian/patches/README b/debian/patches/README new file mode 100644 index 000000000..80c158437 --- /dev/null +++ b/debian/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..d3d74104a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001_threaded.patch |