[mozvoikko: 1/2] Rebuild against newer gecko

[Martin Stransky]

commit 299c1f0627543a6101100227d0283009dcd01603
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Aug 17 12:26:24 2011 +0200

     Rebuild against newer gecko

 mozvoikko-dict.patch |   24 ++++++++++++++++++++++++
 mozvoikko.spec       |   15 +++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/mozvoikko-dict.patch b/mozvoikko-dict.patch
new file mode 100644
index 0000000..82fc1b2
--- /dev/null
+++ b/mozvoikko-dict.patch
@@ -0,0 +1,24 @@
+A patch for:
+
+# HG changeset patch
+# User Kyle Huey <khuey at kylehuey.com>
+# Date 1297987780 18000
+# Node ID f99b6caaaff9afe4a4b2f9d7106586125f00690b
+# Parent  14033ede4ba6498d10223fb88605324eb1848b5d
+Bug 629734: Integrate hunspell test suite as an xpcshell test. r=ehsan
+
+
+diff -up mozvoikko/src/mozVoikkoSpell.cpp.old mozvoikko/src/mozVoikkoSpell.cpp
+--- mozvoikko/src/mozVoikkoSpell.cpp.old	2010-11-22 21:45:39.000000000 +0100
++++ mozvoikko/src/mozVoikkoSpell.cpp	2011-06-22 17:48:54.360684336 +0200
+@@ -293,3 +293,10 @@ NS_IMETHODIMP mozVoikkoSpell::Suggest(co
+ 
+     return rv;
+ }
++
++/* void loadDictionariesFromDir (in nsIFile dir); */
++NS_IMETHODIMP mozVoikkoSpell::LoadDictionariesFromDir(nsIFile *dir)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
diff --git a/mozvoikko.spec b/mozvoikko.spec
index ed33efa..bf27892 100644
--- a/mozvoikko.spec
+++ b/mozvoikko.spec
@@ -1,5 +1,5 @@
 # For the xulrunner unstable requires
-%define gecko_ver 2.0
+%define gecko_ver 6.0
 # These come from install.rdf
 %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %global firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -11,7 +11,7 @@
 
 Name:           mozvoikko
 Version:        1.9.0
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
@@ -24,6 +24,7 @@ URL:            http://voikko.sourceforge.net
 Source0:         http://ap1.pp.fi/mozilla/mozvoikko/1.9.0/%{name}-%{version}.tar.bz2
 # From upstream mailing list, will probably be applied to SVN at some point
 Patch0:         %{name}-%{version}-xulrunner-includes-linking.patch
+Patch1:         mozvoikko-dict.patch
 
 # For xulrunner unstable
 BuildRequires:  gecko-devel-unstable >= %{gecko_ver}
@@ -44,10 +45,10 @@ spell-checker Voikko.
 %prep
 %setup -q -n mozvoikko
 %patch0 -p1
-
+%patch1 -p1
 
 %build
-make -f Makefile.xulrunner extension-files CFLAGS="$RPM_OPT_FLAGS" \
+make -f Makefile.xulrunner extension-files CFLAGS="$RPM_OPT_FLAGS -std=gnu++0x -fno-strict-aliasing" \
   CC_LINK="g++ -shared -Wl,--no-undefined $RPM_OPT_FLAGS" %{?_smp_mflags}
 
 
@@ -67,6 +68,12 @@ chmod +x \
 
 
 %changelog
+* Wed Aug 17 2011 Jan Horak <jhorak at redhat.com> - 1.9.0-6
+- Rebuild against newer gecko
+
+* Wed Jun 22 2011 Jan Horak <jhorak at redhat.com> - 1.9.0-5
+- Rebuild against newer gecko
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild