Commit 160c84c1 authored by Clint Adams's avatar Clint Adams

Merge branch 'master' into experimental

what a mess
parents e7d091a0 82ce4559
bnfc (2.8-6) UNRELEASED; urgency=medium
bnfc (2.8.1-1) unstable; urgency=medium
[ Dmitry Bogatov ]
* Use secure (https) uri in Vcs-Git field in 'debian/control'
[ Gianfranco Costamagna ]
* Fix VCS fields
[ Clint Adams ]
* New upstream release
-- Dmitry Bogatov <KAction@gnu.org> Tue, 10 May 2016 09:34:41 +0300
-- Clint Adams <clint@debian.org> Mon, 05 Sep 2016 00:00:43 -0400
bnfc (2.8-5) unstable; urgency=medium
......
--- a/src/BNFC/Backend/Haskell/CFtoAlex3.hs
+++ b/src/BNFC/Backend/Haskell/CFtoAlex3.hs
@@ -51,6 +51,7 @@
if byteStrings then "import qualified Data.ByteString.Char8 as BS" else "",
"import qualified Data.Bits",
"import Data.Word (Word8)",
+ "import Data.Char (ord)",
"}",
""
]
--- a/src/LexBNF.x
+++ b/src/LexBNF.x
@@ -9,6 +9,7 @@
import qualified Data.Bits
import Data.Word (Word8)
+import Data.Char (ord)
}
cabal-debian (4.32.4-2) UNRELEASED; urgency=medium
cabal-debian (4.32.5-1) unstable; urgency=medium
* Fix VCS fields
* New upstream release
-- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 02 Jun 2016 19:12:10 +0200
-- Clint Adams <clint@debian.org> Tue, 12 Jul 2016 16:13:29 -0400
cabal-debian (4.32.4-1) unstable; urgency=medium
......
carettah (0.4.2-2) unstable; urgency=medium
* Adjust Homepage and Description to not point to obsolete URLs,
thanks to Axel Beckert. closes: #839399
-- Clint Adams <clint@debian.org> Sat, 01 Oct 2016 11:39:08 -0400
carettah (0.4.2-1) unstable; urgency=medium
* New upstream version.
-- Clint Adams <clint@debian.org> Fri, 30 Sep 2016 11:30:36 -0400
carettah (0.3.0-1) unstable; urgency=medium
[ Joachim Breitner ]
* Adjust watch file to new hackage layout
[ Kiwamu Okabe ]
* New upstream version.
-- Kiwamu Okabe <kiwamu@debian.or.jp> Wed, 28 May 2014 23:27:17 +0900
carettah (0.2.0-2) unstable; urgency=low
* /usr/share/carettah-0.2.0 -> /usr/share/carettah
* Bump version of Build-Depends: on haskell-devscripts
-- Louis Bettens <louis@bettens.info> Mon, 29 Jul 2013 19:53:10 +0200
carettah (0.2.0-1) unstable; urgency=low
[ Joachim Breitner ]
* Depend on haskell-devscripts 0.8.13 to ensure this packages is built
against experimental
* Bump standards version, no change
* Enable compat level 9
[ Kiwamu Okabe ]
* New upstream version.
* Support pandoc 1.11.1.
-- Kiwamu Okabe <kiwamu@debian.or.jp> Sat, 25 May 2013 18:14:30 +0900
carettah (0.1.2-1) unstable; urgency=low
* New upstream version
-- Kiwamu Okabe <kiwamu@debian.or.jp> Sun, 13 May 2012 21:52:34 +0900
carettah (0.1.1-1) unstable; urgency=high
[ Joachim Breitner ]
* Fix Typo in the synopsis (Closes: #647051)
[ Kiwamu Okabe ]
* New upstream version
* Fix mojibake BUG with new gtk2hs
* Use IPA fonts
-- Kiwamu Okabe <kiwamu@debian.or.jp> Sun, 13 May 2012 11:44:20 +0900
carettah (0.0.7-3) unstable; urgency=low
* Build-Depends: libghc-hcwiid-{dev,prof},libcwiid-dev
* ITP (Closes: #646409)
-- Kiwamu Okabe <kiwamu@debian.or.jp> Fri, 28 Oct 2011 19:24:12 +0900
carettah (0.0.7-2) UNRELEASED; urgency=low
* hosting in darcs.debian.org
-- Kiwamu Okabe <kiwamu@debian.or.jp> Wed, 26 Oct 2011 14:20:43 +0900
carettah (0.0.7-1) UNRELEASED; urgency=low
* Debianization generated by cabal-debian
-- Kiwamu Okabe <kiwamu@debian.or.jp> Wed, 26 Oct 2011 00:29:31 +0900
Source: carettah
Priority: extra
Section: haskell
Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Uploaders: Kiwamu Okabe <kiwamu@debian.or.jp>
, Louis Bettens <louis@bettens.info>
Build-Depends: debhelper (>= 9),
haskell-devscripts (>= 0.8.19),
cdbs,
ghc,
ghc-prof,
libghc-cairo-dev,
libghc-cairo-prof,
libghc-gtk-dev,
libghc-gtk-prof,
libghc-mtl-dev,
libghc-mtl-prof,
libghc-pandoc-dev,
libghc-pandoc-prof,
libghc-pango-dev,
libghc-pango-prof,
libghc-hcwiid-dev,
libghc-hcwiid-prof,
libghc-highlighting-kate-dev,
libghc-highlighting-kate-prof,
libcwiid-dev
Standards-Version: 3.9.8
Homepage: https://github.com/master-q/carettah
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/carettah
Vcs-Git: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git
Package: carettah
Architecture: any
Section: misc
Depends: ${shlibs:Depends}, ${haskell:Depends}, ${misc:Depends}, fonts-noto-cjk
Description: presentation tool that renders Markdown
A presentation tool, Carettah generates new presentation boilerplate
and displays it when invoked like `carettah -n markdown.md`. You can
then edit the Markdown and hit 'r' to re-render.
It can be controlled by keyboard or Wiimote.
.
It's a clone of the rabbit package, written in Haskell.
Copyright 2011 Kiwamu Okabe
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in `/usr/share/common-licenses/GPL-2'.
--- a/Carettah.hs
+++ b/Carettah.hs
@@ -36,7 +36,7 @@
backgroundTop :: [P.Block] -> [P.Block]
backgroundTop blocks = filter go blocks ++ filter (not . go) blocks
- where go (P.Para [P.Image [P.Str "background"] _]) = True
+ where go (P.Para [P.Image _ [P.Str "background"] _]) = True
go _ = False
inlinesToString :: [P.Inline] -> String
@@ -57,9 +57,9 @@
tcbs = textCodeBlockSize gCfg
tcbo = textCodeBlockOfs gCfg
go :: P.Block -> Double -> C.Render Double
- go (P.Para [P.Image [P.Str "background"] (pngfile, _)]) =
+ go (P.Para [P.Image _ [P.Str "background"] (pngfile, _)]) =
\y -> renderPngFit ag pngfile >> return y
- go (P.Para [P.Image [P.Str "inline"] (pngfile, _)]) =
+ go (P.Para [P.Image _ [P.Str "inline"] (pngfile, _)]) =
\y -> renderPngInline (CCenter, CPosition y) (CFit, CFit)
1 pngfile
go (P.Header 1 _ strs) =
@@ -85,7 +85,7 @@
tccy = textContextCoverY gCfg
tccs = textContextCoverSize gCfg
go :: P.Block -> Double -> C.Render Double
- go (P.Para [P.Image [P.Str "background"] (pngfile, _)]) =
+ go (P.Para [P.Image _ [P.Str "background"] (pngfile, _)]) =
\y -> renderPngFit ag pngfile >> return y
go (P.Header 1 _ strs) =
\y -> renderLayoutM (CCenter, CPosition ttcy) ttcs (inlinesToString strs) >> return y
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
build/carettah :: build-ghc-stamp
install/carettah :: debian/tmp-inst-ghc
mkdir -p debian/carettah/usr/bin
cp debian/tmp-inst-ghc/usr/bin/*carettah* debian/carettah/usr/bin/
mkdir -p debian/carettah/usr/share
cp -r debian/tmp-inst-ghc/usr/share/carettah debian/carettah/usr/share/
version=3
http://hackage.haskell.org/package/carettah/distro-monitor .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
cpphs (1.20.1-2) UNRELEASED; urgency=medium
cpphs (1.20.2-1) unstable; urgency=medium
* Fix VCS fields
* New upstream release
-- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 02 Jun 2016 19:12:10 +0200
-- Clint Adams <clint@debian.org> Fri, 09 Sep 2016 11:25:23 -0400
cpphs (1.20.1-1) unstable; urgency=medium
......
......@@ -94,6 +94,16 @@ ghc (8.0.0.20160111-1) experimental; urgency=medium
-- Joachim Breitner <nomeata@debian.org> Thu, 14 Jan 2016 16:16:37 +0100
ghc (7.10.3-10) unstable; urgency=medium
[ Clint Adams ]
* Backport upstream 563a4857abcee4a6e43c68323274309c58f42aa0 to use gcc's
SMP primitives instead of GHC's broken ones.
* Backport upstream 7053019e7b04842dd7364039381d8c4c069489a2 to add a
missing MO_WriteBarrier to emitPrimOp.
-- Clint Adams <clint@debian.org> Wed, 05 Oct 2016 15:27:23 -0400
ghc (7.10.3-9) unstable; urgency=medium
* Improve debian/watch file.
......
From: Ben Gamari <bgamari.foss@gmail.com>
Date: Tue, 30 Aug 2016 21:08:05 +0000 (-0400)
Subject: StgCmmPrim: Add missing MO_WriteBarrier
X-Git-Url: https://git.haskell.org/ghc.git/commitdiff_plain/7053019e7b04842dd7364039381d8c4c069489a2
StgCmmPrim: Add missing MO_WriteBarrier
Test Plan: Good question
Reviewers: austin, trommler, simonmar, rrnewton
Reviewed By: simonmar
Subscribers: RyanGlScott, thomie
Differential Revision: https://phabricator.haskell.org/D2495
GHC Trac Issues: #12469
(cherry picked from commit d40d6df74a9fca382a84709ac9bc862897fbec18)
---
diff --git a/compiler/codeGen/StgCmmPrim.hs b/compiler/codeGen/StgCmmPrim.hs
index 5d3b94f..3cb9f83 100644
--- a/compiler/codeGen/StgCmmPrim.hs
+++ b/compiler/codeGen/StgCmmPrim.hs
@@ -310,8 +310,11 @@ emitPrimOp _ [res] GetCurrentCCSOp [_dummy_arg]
emitPrimOp dflags [res] ReadMutVarOp [mutv]
= emitAssign (CmmLocal res) (cmmLoadIndexW dflags mutv (fixedHdrSizeW dflags) (gcWord dflags))
-emitPrimOp dflags [] WriteMutVarOp [mutv,var]
- = do emitStore (cmmOffsetW dflags mutv (fixedHdrSizeW dflags)) var
+emitPrimOp dflags res@[] WriteMutVarOp [mutv,var]
+ = do -- Without this write barrier, other CPUs may see this pointer before
+ -- the writes for the closure it points to have occurred.
+ emitPrimCall res MO_WriteBarrier []
+ emitStore (cmmOffsetW dflags mutv (fixedHdrSizeW dflags)) var
emitCCall
[{-no results-}]
(CmmLit (CmmLabel mkDirty_MUT_VAR_Label))
From: Peter Trommler <ptrommler@acm.org>
Date: Mon, 16 May 2016 13:19:09 +0000 (+0200)
Subject: PPC: Implement SMP primitives using gcc built-ins
X-Git-Tag: ghc-8.0.1-release~11
X-Git-Url: https://git.haskell.org/ghc.git/commitdiff_plain/f4e6b32831bd718a040b382865ac7aea1254bf4e
PPC: Implement SMP primitives using gcc built-ins
The SMP primitives were missing appropriate memory barriers
(sync, isync instructions) on all PowerPCs.
Use the built-ins _sync_* provided by gcc and clang. This
reduces code size significantly.
Remove broken mark for concprog001 on powerpc64. The referenced
ticket number (11259) was wrong.
Test Plan: validate on powerpc and ARM
Reviewers: erikd, austin, simonmar, bgamari, hvr
Reviewed By: bgamari, hvr
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2225
GHC Trac Issues: #12070
(cherry picked from commit 563a4857abcee4a6e43c68323274309c58f42aa0)
---
--- a/includes/stg/SMP.h
+++ b/includes/stg/SMP.h
@@ -119,14 +119,8 @@
:"+r" (result), "+m" (*p)
: /* no input-only operands */
);
-#elif powerpc_HOST_ARCH
- __asm__ __volatile__ (
- "1: lwarx %0, 0, %2\n"
- " stwcx. %1, 0, %2\n"
- " bne- 1b"
- :"=&r" (result)
- :"r" (w), "r" (p)
- );
+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
+ result = __sync_lock_test_and_set(p, w);
#elif sparc_HOST_ARCH
result = w;
__asm__ __volatile__ (
@@ -194,20 +188,8 @@
:"=a"(o), "+m" (*(volatile unsigned int *)p)
:"0" (o), "r" (n));
return o;
-#elif powerpc_HOST_ARCH
- StgWord result;
- __asm__ __volatile__ (
- "1: lwarx %0, 0, %3\n"
- " cmpw %0, %1\n"
- " bne 2f\n"
- " stwcx. %2, 0, %3\n"
- " bne- 1b\n"
- "2:"
- :"=&r" (result)
- :"r" (o), "r" (n), "r" (p)
- :"cc", "memory"
- );
- return result;
+#elif powerpc_HOST_ARCH || powerpc64_HOST_ARCH || powerpc64le_HOST_ARCH
+ return __sync_val_compare_and_swap(p, o, n);
#elif sparc_HOST_ARCH
__asm__ __volatile__ (
"cas [%1], %2, %0"
@@ -268,6 +250,7 @@
// RRN: Generalized to arbitrary increments to enable fetch-and-add in
// Haskell code (fetchAddIntArray#).