Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3bd255428b36621f058fe19a760813cd566b05a1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3bd255428b36621f058fe19a760813cd566b05a1)
  • Date: Thu, 5 Jun 2008 09:25:59 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

shell-term-fm/sash/BUILD | 2 --
shell-term-fm/sash/HISTORY | 2 ++
shell-term-fm/sash/PRE_BUILD | 5 +++++
shell-term-fm/sash/cmd_chattr.patch | 10 ++++++++++
4 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit df8d0b7d9a6fc0641394205d54ee606cc089d5bb
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

sash: fixed building with a patch and moved makefile editing to PRE_BUILD

diff --git a/shell-term-fm/sash/BUILD b/shell-term-fm/sash/BUILD
index aac32dc..8f58e6d 100755
--- a/shell-term-fm/sash/BUILD
+++ b/shell-term-fm/sash/BUILD
@@ -1,3 +1 @@
-sedit "s:CFLAGS = -O3 -Wall -Wmissing-prototypes:CFLAGS = $CFLAGS:"
Makefile &&
-sedit "s:MANDIR = /usr/man/man1:MANDIR = /usr/share/man/man1:" Makefile
&&
make
diff --git a/shell-term-fm/sash/HISTORY b/shell-term-fm/sash/HISTORY
index a9feae2..0b8e256 100644
--- a/shell-term-fm/sash/HISTORY
+++ b/shell-term-fm/sash/HISTORY
@@ -1,5 +1,7 @@
2008-06-05 Arjan Bouter <abouter AT sourcemage.org>
* BUILD: corrected manpage install dirs
+ * PRE_BUILD: moved patching and sedit from BUILD
+ * cmd_chattr.patch: added missing include

2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide
diff --git a/shell-term-fm/sash/PRE_BUILD b/shell-term-fm/sash/PRE_BUILD
new file mode 100755
index 0000000..e598786
--- /dev/null
+++ b/shell-term-fm/sash/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build
&&
+cd $SOURCE_DIRECTORY
&&
+sedit "s:CFLAGS = -O3 -Wall -Wmissing-prototypes:CFLAGS = $CFLAGS:"
Makefile &&
+sedit "s:MANDIR = /usr/man/man1:MANDIR = /usr/share/man/man1:" Makefile
&&
+patch < $SCRIPT_DIRECTORY/cmd_chattr.patch
diff --git a/shell-term-fm/sash/cmd_chattr.patch
b/shell-term-fm/sash/cmd_chattr.patch
new file mode 100644
index 0000000..4e9ae46
--- /dev/null
+++ b/shell-term-fm/sash/cmd_chattr.patch
@@ -0,0 +1,10 @@
+--- cmd_chattr.c 2008-06-05 16:15:24.000000000 +0200
++++ cmd_chattr.c-fixed 2008-06-05 16:15:15.000000000 +0200
+@@ -13,6 +13,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <linux/ext2_fs.h>
++#include <linux/fs.h>
+
+ #include "sash.h"
+



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (3bd255428b36621f058fe19a760813cd566b05a1), Arjan Bouter, 06/05/2008

Archive powered by MHonArc 2.6.24.

Top of Page