Skip to Content.
Sympa Menu

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

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 (28ecf81c8e1347d6b22e14eb6d4c2209aecde347)
  • Date: Wed, 14 Apr 2010 09:43:22 -0500

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

x11/slim/HISTORY | 4 ++++
x11/slim/PRE_BUILD | 3 ++-
x11/slim/gcc44.patch | 10 ++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)

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

x11/slim: fix for gcc 4.4

diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index 5143df9..dd0ed7a 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,7 @@
+2010-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * gcc44.patch, PRE_BUILD: added patch from gentoo to make
+ slim compile with gcc 4.4
+
2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* init.d/slim: made it non-sh, bug #13702

diff --git a/x11/slim/PRE_BUILD b/x11/slim/PRE_BUILD
index 991d3a6..13c1852 100755
--- a/x11/slim/PRE_BUILD
+++ b/x11/slim/PRE_BUILD
@@ -9,4 +9,5 @@ sed -i -e "s:^CXXFLAGS=\(.*\):CXXFLAGS=\1 ${CXXFLAGS}:" \

sed -i "s:X11R6\/::g" "$SOURCE_DIRECTORY/slim.conf" &&

-patch -p0 < "$SPELL_DIRECTORY/gcc43.patch"
+patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/gcc44.patch"
diff --git a/x11/slim/gcc44.patch b/x11/slim/gcc44.patch
new file mode 100644
index 0000000..ff680fd
--- /dev/null
+++ b/x11/slim/gcc44.patch
@@ -0,0 +1,10 @@
+--- switchuser.h 2008-11-11 19:40:18.000000000 +0000
++++ switchuser.h 2008-11-11 19:40:28.000000000 +0000
+@@ -18,6 +18,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <paths.h>
++#include <cstdio>
+ #include <iostream>
+ #include "const.h"
+ #include "cfg.h"



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (28ecf81c8e1347d6b22e14eb6d4c2209aecde347), Florian Franzmann, 04/14/2010

Archive powered by MHonArc 2.6.24.

Top of Page