Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (bddd0e0d31c55e25f983713c7910a3aaa29c8624)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (bddd0e0d31c55e25f983713c7910a3aaa29c8624)
  • Date: Mon, 30 Jul 2018 21:01:29 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

haskell/haskell-xmonad-contrib/0001-accept-xmonad-0.14.patch | 25
+++++++++++
haskell/haskell-xmonad-contrib/DETAILS | 1
haskell/haskell-xmonad-contrib/HISTORY | 4 +
haskell/haskell-xmonad-contrib/PRE_BUILD | 6 ++
haskell/haskell-xmonad/DETAILS | 5 --
haskell/haskell-xmonad/HISTORY | 3 +
libs/ncurses/DETAILS | 1
libs/ncurses/HISTORY | 3 +
8 files changed, 45 insertions(+), 3 deletions(-)

New commits:
commit bddd0e0d31c55e25f983713c7910a3aaa29c8624
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/ncurses: disable staging

commit 83fd62658c321b73c304337839902f32f860ff57
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-xmonad: version 0.14

commit 3fb508fba88fb7f238e414cc217b71837d8bb501
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-xmonad-contrib: accept xmonad 0.14

diff --git a/haskell/haskell-xmonad-contrib/0001-accept-xmonad-0.14.patch
b/haskell/haskell-xmonad-contrib/0001-accept-xmonad-0.14.patch
new file mode 100644
index 0000000..fd8fe9d
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/0001-accept-xmonad-0.14.patch
@@ -0,0 +1,25 @@
+From 26899e480e3a434a7cbcb1e7586e555decef38c2 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Mon, 30 Jul 2018 20:22:51 +0200
+Subject: [PATCH] accept xmonad 0.14
+
+---
+ xmonad-contrib.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
+index da9c0ae..a1bd343 100644
+--- a/xmonad-contrib.cabal
++++ b/xmonad-contrib.cabal
+@@ -64,7 +64,7 @@ library
+ mtl >= 1 && < 3,
+ unix,
+ X11>=1.6.1 && < 1.9,
+- xmonad>=0.13 && < 0.14,
++ xmonad>=0.13 && <= 0.14,
+ utf8-string
+
+ if flag(use_xft)
+--
+2.18.0
+
diff --git a/haskell/haskell-xmonad-contrib/DETAILS
b/haskell/haskell-xmonad-contrib/DETAILS
index 0b52fd5..05ee7dd 100755
--- a/haskell/haskell-xmonad-contrib/DETAILS
+++ b/haskell/haskell-xmonad-contrib/DETAILS
@@ -1,5 +1,6 @@
SPELL=haskell-xmonad-contrib
VERSION=0.13
+ PATCHLEVEL=1
SOURCE="xmonad-contrib-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/xmonad-contrib/${VERSION}/${SOURCE}

SOURCE_HASH=sha512:40b8a8fc8a1fa134f2726c273ff75eee26a43c9f18095bad9251e4b37b0cca5ee6c32eec5c42aa00c9e0c5c90ae54e6414739a2cee5b5d2917814358449d55f5
diff --git a/haskell/haskell-xmonad-contrib/HISTORY
b/haskell/haskell-xmonad-contrib/HISTORY
index 6ea0a31..04d3f47 100644
--- a/haskell/haskell-xmonad-contrib/HISTORY
+++ b/haskell/haskell-xmonad-contrib/HISTORY
@@ -1,3 +1,7 @@
+2018-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-accept-xmonad-0.14.patch: accept xmonad 0.14
+ * DETAILS: PATCHLEVEL++
+
2017-02-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.13

diff --git a/haskell/haskell-xmonad-contrib/PRE_BUILD
b/haskell/haskell-xmonad-contrib/PRE_BUILD
new file mode 100755
index 0000000..bbc7b57
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+
+cd "$SOURCE_DIRECTORY"
+
+patch -p1 < "$SPELL_DIRECTORY/0001-accept-xmonad-0.14.patch"
+
diff --git a/haskell/haskell-xmonad/DETAILS b/haskell/haskell-xmonad/DETAILS
index df6c3cc..145e350 100755
--- a/haskell/haskell-xmonad/DETAILS
+++ b/haskell/haskell-xmonad/DETAILS
@@ -1,9 +1,8 @@
SPELL=haskell-xmonad
- VERSION=0.13
- PATCHLEVEL=1
+ VERSION=0.14
SOURCE="xmonad-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/xmonad/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:9d9436f36fe0f6a9732502b0211fc41a224b1320b843d266b6d2dd201e4329b688f7eed5b08597b2edd713cc25f2b88a2a1f1ee43e18615c0a78e97e4716b122
+
SOURCE_HASH=sha512:6b9c83ba5a524a2b2c2d0087a95fdabd477995bcf7751dff116df4eb1bfaee5df87a7070963c05bc2509463cf386c8c5946620731eac70c30ea450911952c57d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/xmonad-${VERSION}"
WEB_SITE="http://xmonad.org";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-xmonad/HISTORY b/haskell/haskell-xmonad/HISTORY
index 692941b..827a572 100644
--- a/haskell/haskell-xmonad/HISTORY
+++ b/haskell/haskell-xmonad/HISTORY
@@ -1,3 +1,6 @@
+2018-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.14
+
2018-02-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, dynamic-compilation.patch: patch from archlinux to allow
xmonad
recompile to link against shared libraries
diff --git a/libs/ncurses/DETAILS b/libs/ncurses/DETAILS
index 32154a0..3df7310 100755
--- a/libs/ncurses/DETAILS
+++ b/libs/ncurses/DETAILS
@@ -1,6 +1,7 @@
SPELL=ncurses
VERSION=6.1
PATCHLEVEL=2
+ STAGED_INSTALL=off
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 0306abb..758725a 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,6 @@
+2018-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: disable staging to work around segfault during install
+
2018-05-17 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS, BUILD: PATCHLEVEL++, enabled staging




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (bddd0e0d31c55e25f983713c7910a3aaa29c8624), Florian Franzmann, 07/30/2018

Archive powered by MHonArc 2.6.24.

Top of Page