Skip to content

Commit

Permalink
hunspell: fix userdirs
Browse files Browse the repository at this point in the history
Closes Homebrew/legacy-homebrew#23044.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
  • Loading branch information
thpani authored and adamv committed Nov 12, 2013
1 parent a4b0de2 commit 92ef370
Showing 1 changed file with 48 additions and 0 deletions.
48 changes: 48 additions & 0 deletions Formula/hunspell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ class Hunspell < Formula

depends_on 'readline'

def patches
# hunspell does not prepend $HOME to all USEROODIRs
# http://sourceforge.net/p/hunspell/bugs/236/
{ :p0 => DATA }
end

def install
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}",
Expand All @@ -17,3 +23,45 @@ def install
system "make install"
end
end

__END__
--- src/tools/hunspell.cxx.old 2013-08-02 18:21:49.000000000 +0200
+++ src/tools/hunspell.cxx 2013-08-02 18:20:27.000000000 +0200
@@ -28,7 +28,7 @@
#ifdef WIN32

#define LIBDIR "C:\\Hunspell\\"
-#define USEROOODIR "Application Data\\OpenOffice.org 2\\user\\wordbook"
+#define USEROOODIR { "Application Data\\OpenOffice.org 2\\user\\wordbook" }
#define OOODIR \
"C:\\Program files\\OpenOffice.org 2.4\\share\\dict\\ooo\\;" \
"C:\\Program files\\OpenOffice.org 2.3\\share\\dict\\ooo\\;" \
@@ -65,11 +65,11 @@
"/usr/share/myspell:" \
"/usr/share/myspell/dicts:" \
"/Library/Spelling"
-#define USEROOODIR \
- ".openoffice.org/3/user/wordbook:" \
- ".openoffice.org2/user/wordbook:" \
- ".openoffice.org2.0/user/wordbook:" \
- "Library/Spelling"
+#define USEROOODIR { \
+ ".openoffice.org/3/user/wordbook:", \
+ ".openoffice.org2/user/wordbook:", \
+ ".openoffice.org2.0/user/wordbook:", \
+ "Library/Spelling" }
#define OOODIR \
"/opt/openoffice.org/basis3.0/share/dict/ooo:" \
"/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \
@@ -1664,7 +1664,10 @@
path = add(path, PATHSEP); // <- check path in root directory
if (getenv("DICPATH")) path = add(add(path, getenv("DICPATH")), PATHSEP);
path = add(add(path, LIBDIR), PATHSEP);
- if (HOME) path = add(add(add(add(path, HOME), DIRSEP), USEROOODIR), PATHSEP);
+ const char* userooodir[] = USEROOODIR;
+ for (int i = 0; i < (sizeof(userooodir) / sizeof(userooodir[0])); i++) {
+ if (HOME) path = add(add(add(add(path, HOME), DIRSEP), userooodir[i]), PATHSEP);
+ }
path = add(path, OOODIR);

if (showpath) {

0 comments on commit 92ef370

Please sign in to comment.