[SM-Commit] GIT changes to master grimoire by Eric Sandall (aff7a80b3b04f990b75cc6fffedd962d595ed19b)

Eric Sandall scm at sourcemage.org
Sat Apr 24 03:02:04 EDT 2010


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 spelling/mythes/DEPENDS     |    3 ++-
 spelling/mythes/DETAILS     |    2 +-
 spelling/mythes/HISTORY     |    7 +++++++
 spelling/mythes/PRE_BUILD   |    3 ++-
 spelling/mythes/gcc44.patch |   12 ++++++++++++
 5 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit aff7a80b3b04f990b75cc6fffedd962d595ed19b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mythes: Fix compilation with GCC 4.4
    (cherry picked from commit 264c5513351f4d0826b610c61f63f28bb1398c96)

commit 6ef0b0c889aa61a466face6d4acddec1a3f58fe2
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mythes: License is BSD-based
    (cherry picked from commit 606a5ccfab622eb700d993316f1cca8ac3a384fd)

commit 835d80f38162ff15ce275f7f1e0493e4769d71a7
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mythes: Add newline to HISTORY
    (cherry picked from commit bb3c8837a4ca5b3adeb759fb373089ca022eff7a)

commit f99bdec561a9c7e569e01849e538b0f03b2e467c
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mythes: Depends on hunspell
    
    example.cxx:7:33: error: hunspell/hunspell.hxx: No such file or
    directory
    (cherry picked from commit feda4892ab302ea0ae9a289b7f92243349f5d612)

diff --git a/spelling/mythes/DEPENDS b/spelling/mythes/DEPENDS
index fd0b0eb..43c31ff 100755
--- a/spelling/mythes/DEPENDS
+++ b/spelling/mythes/DEPENDS
@@ -1 +1,2 @@
-depends g++
+depends g++ &&
+depends hunspell
diff --git a/spelling/mythes/DETAILS b/spelling/mythes/DETAILS
index 08302f8..69886e8 100755
--- a/spelling/mythes/DETAILS
+++ b/spelling/mythes/DETAILS
@@ -5,7 +5,7 @@
      SOURCE_HASH=sha512:4969b5445aa9fa14a440191103f80b70f2c22ef659cd5b1c6a94f6201699b44ad496b24c7da04e3dbdd49398602f2abaae0e59bbe6755ed7f6cf7f079838a832
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MyThes-${VERSION}"
         WEB_SITE="http://hyphen.sourceforge.net"
-      LICENSE[0]=other
+      LICENSE[0]=BSD
          ENTERED=20090901
            SHORT="thesaurus library"
 cat << EOF
diff --git a/spelling/mythes/HISTORY b/spelling/mythes/HISTORY
index af196a9..f34a36c 100644
--- a/spelling/mythes/HISTORY
+++ b/spelling/mythes/HISTORY
@@ -1,2 +1,9 @@
+2010-04-23 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Depends on hunspell
+	* DETAILS: LICENSE is BSD-based
+	* PRE_BUILD: Apply gcc44.patch
+	* gcc44.patch: Fix compilation with GCC 4.4
+
 2010-03-31 Arjan Bouter <abouter at sourcemage.org>
 	* BUILD,DEPENDS,DETAILS,INSTALL,PRE_BUILD: spell created
+
diff --git a/spelling/mythes/PRE_BUILD b/spelling/mythes/PRE_BUILD
index 50757b0..2bb0b42 100755
--- a/spelling/mythes/PRE_BUILD
+++ b/spelling/mythes/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
-sedit 's/^CXXFLAGS/#CXXFLAGS/' Makefile
+sedit 's/^CXXFLAGS/#CXXFLAGS/' Makefile &&
+patch -p1 < "${SCRIPT_DIRECTORY}/gcc44.patch"
diff --git a/spelling/mythes/gcc44.patch b/spelling/mythes/gcc44.patch
new file mode 100644
index 0000000..204980b
--- /dev/null
+++ b/spelling/mythes/gcc44.patch
@@ -0,0 +1,12 @@
+diff -Naur MyThes-1.1.orig/mythes.cxx MyThes-1.1/mythes.cxx
+--- MyThes-1.1.orig/mythes.cxx	2010-04-23 23:58:06.210695856 -0700
++++ MyThes-1.1/mythes.cxx	2010-04-24 00:00:15.750704314 -0700
+@@ -26,7 +26,7 @@
+ // return index of char in string
+ int mystr_indexOfChar(const char * d, int c)
+ {
+-  char * p = strchr(d,c);
++  const char * p = strchr(d,c);
+   if (p) return (int)(p-d);
+   return -1;
+ }



More information about the SM-Commit mailing list