~ubuntu-branches/ubuntu/natty/mozvoikko/natty-proposed

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
Index: mozvoikko-1.10.0/src/Makefile.xulrunner
===================================================================
--- mozvoikko-1.10.0.orig/src/Makefile.xulrunner	2011-06-21 15:22:37.000000000 +0100
+++ mozvoikko-1.10.0/src/Makefile.xulrunner	2011-11-15 23:33:42.327534429 +0000
@@ -19,8 +19,8 @@
 CC_LINK=g++ -shared -Wl,--no-undefined
 include ../mozvoikko.config
 
-XULRUNNER_INCLUDES=$(shell pkg-config --cflags libxul-unstable)
-XULRUNNER_LIBS=$(shell pkg-config --libs libxul-unstable)
+XULRUNNER_INCLUDES=$(shell pkg-config --cflags libxul)
+XULRUNNER_LIBS=$(shell pkg-config --libs libxul)
 
 HEADERS=mozVoikko.hxx mozVoikkoSpell.hxx mozVoikkoUtils.hxx
 OBJECTS=mozVoikko mozVoikkoSpell mozVoikkoUtils mozVoikkoSpellFactory
@@ -31,7 +31,7 @@
 ifndef CFLAGS
 	CFLAGS=-O2
 endif
-CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fPIC
+CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-strict-aliasing -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fPIC
 CC_INCLUDES=$(XULRUNNER_INCLUDES) -include mozilla-config.h -include xpcom-config.h
 CC_DEFINES=-DSYSTEM_LIBVOIKKO
 CC_LIBS=-Wl,--as-needed $(XULRUNNER_LIBS)
Index: mozvoikko-1.10.0/mozvoikko.config
===================================================================
--- mozvoikko-1.10.0.orig/mozvoikko.config	2011-06-21 15:22:37.000000000 +0100
+++ mozvoikko-1.10.0/mozvoikko.config	2011-11-15 22:56:35.000000000 +0000
@@ -24,12 +24,12 @@
 #    https://addons.mozilla.org/en-US/firefox/pages/appversions
 
 # Supported Firefox versions.
-MOZVOIKKO_FF_MIN  = 3.0
-MOZVOIKKO_FF_MAX  = 5.0.*
+MOZVOIKKO_FF_MIN  = 9.0a1
+MOZVOIKKO_FF_MAX  = 9.*
 
 # Supported Thunderbird versions
-MOZVOIKKO_TB_MIN  = 3.0
-MOZVOIKKO_TB_MAX  = 3.3a2pre
+MOZVOIKKO_TB_MIN  = 9.0a1
+MOZVOIKKO_TB_MAX  = 9.*
 
 # Supported SeaMonkey versions
 MOZVOIKKO_SM_MIN  = 2.0
Index: mozvoikko-1.10.0/src/mozVoikkoSpell.cpp
===================================================================
--- mozvoikko-1.10.0.orig/src/mozVoikkoSpell.cpp	2011-11-15 23:41:17.059518553 +0000
+++ mozvoikko-1.10.0/src/mozVoikkoSpell.cpp	2011-11-15 23:42:55.807515106 +0000
@@ -83,6 +83,16 @@
     delete voikkoSpell;
 }
 
+NS_IMETHODIMP mozVoikkoSpell::AddDirectory(nsIFile *aDir)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP mozVoikkoSpell::RemoveDirectory(nsIFile *aDir)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP mozVoikkoSpell::LoadDictionariesFromDir(nsIFile* aFile)
 {
 	return NS_ERROR_NOT_IMPLEMENTED;