diff options
| author | Thomas Pani | 2013-10-04 14:19:21 +0200 |
|---|---|---|
| committer | Adam Vandenberg | 2013-11-11 20:47:16 -0800 |
| commit | dfd9457afdc3d789fa6a6d5c14db57eb9fabdb28 (patch) | |
| tree | 3f113884b8b342598349906b3f0a523b481e7301 | |
| parent | 907670ec80f0f27577bd98db48433c801315567d (diff) | |
| download | homebrew-dfd9457afdc3d789fa6a6d5c14db57eb9fabdb28.tar.bz2 | |
hunspell: fix userdirs
Closes #23044.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
| -rw-r--r-- | Library/Formula/hunspell.rb | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/Library/Formula/hunspell.rb b/Library/Formula/hunspell.rb index a7db5a034..0714fce9f 100644 --- a/Library/Formula/hunspell.rb +++ b/Library/Formula/hunspell.rb @@ -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}", @@ -17,3 +23,45 @@ class Hunspell < Formula 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) { |