← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/port_to_latest_firefox.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2011-12-20 00:19:52 UTC
  • mfrom: (18.1.3 natty-security)
  • Revision ID: package-import@ubuntu.com-20111220001952-kgbjh71gwu6l8023
Tags: 1.10.0-0ubuntu0.11.04.4
https://launchpad.net/bugs/906389
* Update for Firefox 9 (LP: #906389)
  - update debian/patches/port_to_latest_firefox.patch for
    mozISpellCheckingEngine changes

Show diffs side-by-side

added added

removed removed

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