[SM-Commit] GIT changes to master grimoire by George Sherwood (f29fdc174dc946c59791e61a8962d4aaa99982f8)

George Sherwood scm at mail.sourcemage.org
Sun Jan 21 08:23:41 EST 2007


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 shell-term-fm/xfm/DEPENDS      |    4 ++--
 shell-term-fm/xfm/DETAILS      |    1 -
 shell-term-fm/xfm/HISTORY      |    6 ++++++
 shell-term-fm/xfm/PRE_BUILD    |    3 +++
 shell-term-fm/xfm/malloc.patch |   12 ++++++++++++
 5 files changed, 23 insertions(+), 3 deletions(-)

New commits:
commit f29fdc174dc946c59791e61a8962d4aaa99982f8
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    xfm: Added patch to build with gcc 4.1.1. Removed GCC_VERSION and
    depends gcc33

diff --git a/shell-term-fm/xfm/DEPENDS b/shell-term-fm/xfm/DEPENDS
index 4ff6546..93f9b18 100755
--- a/shell-term-fm/xfm/DEPENDS
+++ b/shell-term-fm/xfm/DEPENDS
@@ -1,2 +1,2 @@
-depends  X11-LIBS &&
-depends  gcc33
+depends  X11-LIBS
+
diff --git a/shell-term-fm/xfm/DETAILS b/shell-term-fm/xfm/DETAILS
index 5df94be..2786c08 100755
--- a/shell-term-fm/xfm/DETAILS
+++ b/shell-term-fm/xfm/DETAILS
@@ -1,6 +1,5 @@
            SPELL=xfm
          VERSION=1.4.3
-     GCC_VERSION=3.3
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.musikwissenschaft.uni-mainz.de/~ag/$SPELL/$SOURCE
diff --git a/shell-term-fm/xfm/HISTORY b/shell-term-fm/xfm/HISTORY
index 664cac9..b8a24b3 100644
--- a/shell-term-fm/xfm/HISTORY
+++ b/shell-term-fm/xfm/HISTORY
@@ -1,3 +1,9 @@
+2007-01-21 George Sherwood <george at beernabeer.com>
+	* DETAILS: Removed GCC_VERSION
+	* DEPENDS: Removed depends gcc
+	* PRE_BUILD: Added for patch
+	* malloc.patch: Added patch to compile with gcc 4.1.1
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/shell-term-fm/xfm/PRE_BUILD b/shell-term-fm/xfm/PRE_BUILD
new file mode 100755
index 0000000..a6c9839
--- /dev/null
+++ b/shell-term-fm/xfm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY  &&
+patch -p0 < $SCRIPT_DIRECTORY/malloc.patch
diff --git a/shell-term-fm/xfm/malloc.patch b/shell-term-fm/xfm/malloc.patch
new file mode 100644
index 0000000..72a9853
--- /dev/null
+++ b/shell-term-fm/xfm/malloc.patch
@@ -0,0 +1,12 @@
+diff -Nru --exclude=Makefile xfm-1.4.3.original/regexp/regexp.c xfm-1.4.3/regexp/regexp.c
+--- regexp/regexp.c	2005-05-07 17:36:22.000000000 +0200
++++ regexp/regexp.c	2005-05-07 17:37:59.000000000 +0200
+@@ -195,7 +195,7 @@
+ 	register char *longest;
+ 	register int len;
+ 	int flags;
+-	extern char *malloc();
++	/* extern char *malloc(); */
+ 
+ 	if (exp == NULL)
+ 		FAIL("NULL argument");



More information about the SM-Commit mailing list