Merge lp:~heikki-mantysaari/firefox-extensions/mozvoikko.ubuntu-0.9.5-1ubuntu2_to_1.0-1ubuntu2 into lp:~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu

[Heikki Mäntysaari]

=== modified file 'ChangeLog'
--- ChangeLog	2008-12-16 16:26:09 +0000
+++ ChangeLog	2009-05-15 19:01:12 +0000
@@ -1,3 +1,35 @@
[phone] Harri Pitkänen <[e-mail]>
+
+	* Increase version to 1.0.
+
[phone] Harri Pitkänen <[e-mail]>
+
+        * Increase version to 0.9.7.
+
[phone] Andris Pavenis <[e-mail]>
+
+	* Add support of Darwin_x86-gcc3 from
+	  http://verteksi.net/soks/2009/01/12/firefoxin-mozvoikko-lisaosa-ja-mac-os-x/
+	* Do not use non-frozen interface nsIXULRuntime for getting target name.
+	  Generate source with needed constants instead while build.
+	* Exclude some unneeded code when building with Xulrunner SDK.
+	
[phone] Harri Pitkänen <[e-mail]>
+
+	* Tag version 0.9.6.
+	
[phone] Harri Pitkänen <[e-mail]>
+
+	* Link with --as-needed.
+
[phone] Ville-Pekka Vainio <[e-mail]>
+
+	* Makefile cleanup.
+
[phone] Heikki Mäntysaari <[e-mail]>
+
+	* Build fix from Ubuntu.
+
 2008-06-16 Harri Pitkänen <[e-mail]>
 
 	* Remove maximum application version restrictions

=== modified file 'Makefile.in'
--- Makefile.in	2008-12-16 16:26:09 +0000
+++ Makefile.in	2009-05-15 19:01:12 +0000
@@ -28,7 +28,7 @@
 MODULE		= mozvoikko
 XPI_NAME	= mozvoikko
 INSTALL_EXTENSION_ID = [e-mail]
-XPI_PKGNAME 	= mozvoikko-$(MOZVOIKKO_VERSION)-$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)
+XPI_PKGNAME 	= mozvoikko-$(MOZVOIKKO_VERSION)-$(OS_ARCH)_$(TARGET_XPCOM_ABI)
 
 DIST_FILES	= README COPYING
 

=== modified file 'README'
--- README	2008-12-16 16:26:09 +0000
+++ README	2009-05-15 19:01:12 +0000
@@ -11,6 +11,7 @@
 -  32-bit Windows (WINNT_x86-msvc)
 -  32-bit Linux (Linux_ix86-gcc3)
 -  64-bit Linux (Linux_x86_64-gcc3)
+-  32-bit OS X 10.5 (Darwin_x86-gcc3)
 
 Binary extension package may contain support one or more of these targets.
 When building against xulrunner on Linux, more platforms may be supported.
@@ -19,6 +20,6 @@
 separate installation of Voikko: all needed files are included. Builds
 against xulrunner will only work with system libvoikko.
 
-FIXME: add homepage and similar related info.
+For more information, see http://voikko.sourceforge.net
 
 Andris Pavenis <[e-mail]>

=== modified file 'README.BUILD'
--- README.BUILD	2008-12-16 16:26:09 +0000
+++ README.BUILD	2009-05-15 19:01:12 +0000
@@ -8,15 +8,15 @@
 Supported versions:
 ==================
 
-Firefox: 3.0b1 or newer (one can really use firefox-a9pre newer than 
-    	 20.09.2007, but why to use version earlier than 3.0b1 any more)
+Firefox: 3.0b1 or newer. Released versions of Firefox-3.0.X are OK. So
+         should also alpha versions of next Firefox-3.1 (I have tested
+         that extension works with them, but not that it builds in
+         that case).
 
-Thunderbird: 3.0a1pre newer than 20.09.2007
+Thunderbird: 3.0 versions beginning with 3.0a1pre of than 20.09.2007.
 
 SeaMonkey: 2.0a1pre newer than 20.09.2007 (for these versions install.js
-	 script is no more needed, install.rdf is enough). I only verified
-         that Voikko spell-check works with SeaMonkey nightly builds
-         under Windows XP. 
+	 script is no more needed, install.rdf is enough). 
 
 I wanted also to try Sunbird nightly builds, but there seems to be no way
 using of using spell-check. So Sunbird is not supported.
@@ -87,14 +87,8 @@
 What I used for building mozvoikko
 ==================================
 
-I built Linux 32 bit version of mozvoikko under Slackware-11 Linux distribution (running in
-KVM (http://kvm.qumranet.com/kvmwiki) virtual machine under Fedora Core x86_64 version and
-tested built extension in following Linux distributions: Slackware-11, Debian 4r1, Fedora 8.
-
-64 bit Linux version were built under Debian 4r1 Etch amd64 version running in KVM virtual
-machine under Fedora 8 and tested built extension in Debian 4r1 and Fedora 8.
-
- 
+I built both Linux 32 and 64-bit versions of mozvoikko in CentOS-5.1 Linux distribution
+running in chroot on Fedora 9 x86_64 version. 
 
 Andris Pavenis <[e-mail]>
 

=== modified file 'README.xulrunner'
--- README.xulrunner	2008-12-16 16:26:09 +0000
+++ README.xulrunner	2009-05-15 19:01:12 +0000
@@ -4,7 +4,8 @@
 There are two build systems and two source packages
 for mozvoikko. The original system is designed to be used
 within Mozilla source tree and the second build system
-uses Xulrunner SDK.
+uses Xulrunner SDK on Linux distributions. Using binary packages
+of Xulrunner from Mozilla may not work.
 
 To build using Xulrunner SDK, install it and libvoikko
 (preferably version 1.7 or later). Check the

=== modified file 'debian/changelog'
--- debian/changelog	2009-01-26 13:07:13 +0000
+++ debian/changelog	2009-08-10 17:22:42 +0000
@@ -1,3 +1,44 @@
+mozvoikko (1.0-1ubuntu2) karmic; urgency=low
+
+  * drop firefox-3.0 and firefox-3.1 from Depends; add 3.0 to Breaks instead.
+
+ -- Alexander Sack <[e-mail]>  Fri, 07 Aug 2009 10:43:15 +0200
+
+mozvoikko (1.0-1ubuntu1.xul191) karmic; urgency=low
+
+  * xulrunner-1.9.1 by default transition
+    + see: https://blueprints.launchpad.net/ubuntu/+spec/desktop-karmic-firefox-3.5
+      - bump minimal xulrunner-dev version
+
+ -- Alexander Sack <[e-mail]>  Fri, 07 Aug 2009 10:42:03 +0200
+
+mozvoikko (1.0-1ubuntu1) karmic; urgency=low
+
+  * Merge new upstream release from Debian. Closes LP: #377049
+  * Keep Ubuntu changes in debian/control
+  * Add optional dependency to firefox-3.5.
+  * Change conflict to abrowser (>= 3.6)
+
+ -- Heikki Mäntysaari <[e-mail]>  Fri, 15 May 2009 21:59:04 +0300
+
+mozvoikko (1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Change conflict to iceweasel (>= 3.6). 
+  * Change Standards-Version to 3.8.1
+
+ -- Heikki Mäntysaari <[e-mail]>  Mon, 11 May 2009 18:45:48 +0300
+
+mozvoikko (0.9.6-1) unstable; urgency=low
+
+  * New upstream release. Closes: #515505
+  * debian/control:  
+    - Improve description (thanks to Teemu Likonen)
+    - Add conflict to iceweasel (>= 3.2)
+  * debian/rules: Remove useless LDFLAGS setting (thanks to Harri Pitkänen) 
+
+ -- Heikki Mäntysaari <[e-mail]>  Wed, 18 Feb 2009 21:12:20 +0200
+
 mozvoikko (0.9.5-1ubuntu2) jaunty; urgency=low
 
   * debian/patches/90_modify-makefile-to-use-pkg-config.patch:

=== modified file 'debian/control'
--- debian/control	2009-01-13 10:39:15 +0000
+++ debian/control	2009-08-10 17:22:42 +0000
@@ -3,14 +3,15 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <[e-mail]>
 XSBC-Original-Maintainer: Heikki Mäntysaari <[e-mail]>
-Build-Depends: debhelper (>= 5), xulrunner-dev (>= 1.9~rc2), libvoikko-dev
+Build-Depends: debhelper (>= 5), xulrunner-dev (>= 1.9.1~), libvoikko-dev
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/mozvoikko.ubuntu
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 
 Package: mozvoikko
 Architecture: any 
-Depends: ${shlibs:Depends}, libvoikko1, voikko-fi, firefox-3.0 | firefox-3.1 | abrowser (>= 3) | iceweasel (>= 3)
-Conflicts: iceweasel (>= 3.2), abrowser (>= 3.2)
+Depends: ${shlibs:Depends}, libvoikko1, voikko-fi, firefox-3.5 | abrowser (>= 3) | iceweasel (>= 3)
+Breaks: firefox-3.0
+Conflicts: iceweasel (>= 3.6), abrowser (>= 3.6)
 Description: Finnish spell-checker extension for Firefox  
  Finnish spell-checker extension for Firefox 3. Spell-checking 
  functionality is provided by Voikko - a free spellchecker 

=== removed directory 'debian/patches'
=== removed file 'debian/patches/90_modify-makefile-to-use-pkg-config.patch'
--- debian/patches/90_modify-makefile-to-use-pkg-config.patch	2009-01-13 19:30:44 +0000
+++ debian/patches/90_modify-makefile-to-use-pkg-config.patch	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
---- mozvoikko-0.9.5/src/Makefile.xulrunner	2009-01-13 20:18:49.000000000 +0200
-+++ mozvoikko-0.9.5/src/Makefile.xulrunner	2009-01-13 20:20:19.000000000 +0200
-@@ -14,23 +14,14 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
--XULRUNNER_SDK=$(shell pkg-config --variable=sdkdir libxul)
--XULRUNNER_INCDIR=$(shell pkg-config --variable=includedir libxul)
- NSPR_INCLUDES=$(shell pkg-config --cflags-only-I nspr)
- DESTDIR=/usr/lib/firefox
- CC=g++ -c
- CC_LINK=g++ -shared -Wl,--no-undefined
- include ../mozvoikko.config
- 
--XULRUNNER_INCLUDES=-I$(XULRUNNER_SDK)/sdk/include -I$(XULRUNNER_SDK)/include \
---I$(XULRUNNER_INCDIR)/xpcom \
---I$(XULRUNNER_INCDIR)/spellchecker \
---I$(XULRUNNER_INCDIR)/uconv \
---I$(XULRUNNER_INCDIR)/unicharutil \
---I$(XULRUNNER_INCDIR)/xulapp \
---I$(XULRUNNER_INCDIR)/unstable
--XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \
---Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4
-+XULRUNNER_INCLUDES=$(shell pkg-config --cflags libxul-unstable)
-+XULRUNNER_LIBS=$(shell pkg-config --libs libxul-unstable)
- 
- HEADERS=mozVoikko.hxx mozVoikkoSpell.hxx mozVoikkoUtils.hxx
- OBJECTS=mozVoikko mozVoikkoSpell mozVoikkoUtils mozVoikkoSpellFactory

=== modified file 'debian/rules'
--- debian/rules	2009-01-13 19:30:44 +0000
+++ debian/rules	2009-05-15 19:01:12 +0000
@@ -22,17 +22,17 @@
 	touch configure-stamp
 
 
-build: patch build-stamp
+build: build-stamp
 
 build-stamp: configure-stamp 
 	dh_testdir
 
 	# Add here commands to compile the package.
-	 LDFLAGS="-Wl, --as-needed" $(MAKE) -f Makefile.xulrunner extension-files
+	$(MAKE) -f Makefile.xulrunner extension-files
 
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -81,32 +81,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-
-# Apply patches to the package
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	@patches=debian/patches/*.patch; for patch in $$patches; do \
-		test -f $$patch || continue; \
-		echo "Applying $$patch"; \
-		patch -stuN -p1 < $$patch || exit 1; \
-	done
-	touch $@
-
-# Remove patches from the package
-unpatch:
-	dh_testdir
-	@if test -f patch-stamp; then \
-		patches=debian/patches/*.patch; \
-		for patch in $$patches; do \
-			reversepatches="$$patch $$reversepatches"; \
-		done; \
-		for patch in $$reversepatches; do \
-			test -f $$patch || continue; \
-			echo "Reversing $$patch"; \
-			patch -suRf -p1 < $$patch || exit 1; \
-		done; \
-		rm -f patch-stamp; \
-	fi
-
 .PHONY: build clean binary-indep binary-arch binary install configure

=== modified file 'mozvoikko.config'
--- mozvoikko.config	2008-12-16 16:26:09 +0000
+++ mozvoikko.config	2009-05-15 19:01:12 +0000
@@ -17,16 +17,20 @@
 #
 # ***** END LICENSE BLOCK *****
 
-MOZVOIKKO_VERSION = 0.9.5
-
-# Supported Firefox versions
+MOZVOIKKO_VERSION = 1.0
+
+# Supported application versions.
+# For official list see:
+#    https://addons.mozilla.org/en-US/firefox/pages/appversions
+
+# Supported Firefox versions.
 MOZVOIKKO_FF_MIN  = 3.0a9pre
-MOZVOIKKO_FF_MAX  = 3.0
+MOZVOIKKO_FF_MAX  = 3.6a1pre
 
 # Supported Thunderbird versions
 MOZVOIKKO_TB_MIN  = 3.0a1pre
-MOZVOIKKO_TB_MAX  = 3.0a1
+MOZVOIKKO_TB_MAX  = 3.1a1pre
 
 # Supported SeaMonkey versions
 MOZVOIKKO_SM_MIN  = 2.0a1pre
-MOZVOIKKO_SM_MAX  = 2.0a1
+MOZVOIKKO_SM_MAX  = 2.0b1pre

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2008-12-16 16:26:09 +0000
+++ src/Makefile.in	2009-05-15 19:01:12 +0000
@@ -50,6 +50,7 @@
 		mozVoikkoSpellFactory.cpp	\
 		mozVoikko.cpp			\
 		mozVoikkoUtils.cpp		\
+		mozvoikko-target.cpp		\
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
@@ -58,10 +59,12 @@
 
 WINNT_EXTRA_LIBS = intl.dll iconv.dll libglib-2.0-0.dll malaga.dll libvoikko-1.dll
 LINUX_EXTRA_LIBS = libmalaga.so.7 libvoikko.so.1 
+DARWIN_EXTRA_LIBS = libmalaga.7.0.0.dylib libvoikko.1.7.0.dylib 
 
 MOZVOIKKO_WINNT_X86_MSVC_EXTRA_LIBS = $(patsubst %.dll, $(srcdir)/voikko-libs/WINNT_x86-msvc/%.dll, $(WINNT_EXTRA_LIBS))
 MOZVOIKKO_LINUX_X86_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Linux_x86-gcc3/lib%, $(LINUX_EXTRA_LIBS))
 MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Linux_x86_64-gcc3/lib%, $(LINUX_EXTRA_LIBS))
+MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS = $(patsubst lib%, $(srcdir)/voikko-libs/Darwin_x86-gcc3/lib%, $(DARWIN_EXTRA_LIBS))
 SUOMI_MALAGA_FILES = $(srcdir)/voikko-data/voikko-fi_FI.pro $(wildcard $(srcdir)/voikko-data/voikko-fi_FI.*_l)
 
 ifeq ($(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI),WINNT_x86-msvc)
@@ -76,6 +79,10 @@
 MOZVOIKKO_EXTRA_LIBS = $(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS)
 endif
 
+ifeq ($(OS_ARCH)_$(TARGET_XPCOM_ABI),Darwin_x86-gcc3)
+MOZVOIKKO_EXTRA_LIBS = $(MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS)
+endif
+
 install.rdf:	$(srcdir)/install.rdf.in
 	sed	-e "s:@VERSION@:$(MOZVOIKKO_VERSION):g" \
 		-e "s:@FF_MIN@:$(MOZVOIKKO_FF_MIN):g" \
@@ -84,9 +91,16 @@
 		-e "s:@TB_MAX@:$(MOZVOIKKO_TB_MAX):g" \
 		-e "s:@SM_MIN@:$(MOZVOIKKO_SM_MIN):g" \
 		-e "s:@SM_MAX@:$(MOZVOIKKO_SM_MAX):g" \
-		-e "s:@TARGET_PLATFORM@:$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI):g" \
+		-e "s:@TARGET_PLATFORM@:$(OS_ARCH)_$(TARGET_XPCOM_ABI):g" \
 	    $(srcdir)/install.rdf.in >install.rdf
 
+mozvoikko-target.cpp:	Makefile
+	echo "#include \"mozVoikkoUtils.hxx\"" >$@
+	echo "" >>$@
+	echo "const char *mozvoikko_target_short = \"$(OS_ARCH)\";" >>$@
+	echo "const char *mozvoikko_target_long = \"$(OS_ARCH)_$(TARGET_XPCOM_ABI)\";" >>$@
+	echo "" >>$@
+
 libs::
 	echo "EXTRA_LIBS=$(MOZVOIKKO_EXTRA_LIBS)"
 
@@ -97,9 +111,9 @@
 	$(NSINSTALL) install.rdf $(FINAL_TARGET)/
 
 install-ext-libs:
-	mkdir -p $(FINAL_TARGET)/voikko/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)
+	mkdir -p $(FINAL_TARGET)/voikko/$(OS_ARCH)_$(TARGET_XPCOM_ABI)
 	for file in $(MOZVOIKKO_EXTRA_LIBS); do \
-		$(NSINSTALL) $$file $(FINAL_TARGET)/voikko/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI); \
+		$(NSINSTALL) $$file $(FINAL_TARGET)/voikko/$(OS_ARCH)_$(TARGET_XPCOM_ABI); \
 	done
 
 install-voikko-data:
@@ -109,15 +123,15 @@
 	done
 
 install-move:
-	rm -rf $(FINAL_TARGET)/platform/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)
-	mkdir -p $(FINAL_TARGET)/platform/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)
-	cp -rvL $(FINAL_TARGET)/components $(FINAL_TARGET)/platform/$(HOST_OS_ARCH)_$(TARGET_XPCOM_ABI)/
+	rm -rf $(FINAL_TARGET)/platform/$(OS_ARCH)_$(TARGET_XPCOM_ABI)
+	mkdir -p $(FINAL_TARGET)/platform/$(OS_ARCH)_$(TARGET_XPCOM_ABI)
+	cp -RvL $(FINAL_TARGET)/components $(FINAL_TARGET)/platform/$(OS_ARCH)_$(TARGET_XPCOM_ABI)/
 	rm -rf $(FINAL_TARGET)/components
 
 check-extra-files:	$(MOZVOIKKO_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)
 
 check-all-extra-files:	$(MOZVOIKKO_WINNT_X86_MSVC_EXTRA_LIBS) $(MOZVOIKKO_LINUX_X86_GCC3_EXTRA_LIBS) \
-	$(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)
+	$(MOZVOIKKO_LINUX_X86_64_GCC3_EXTRA_LIBS) $(MOZVOIKKO_DARWIN_X86_GCC3_EXTRA_LIBS) $(SUOMI_MALAGA_FILES)
 
 clean::
 	rm -f install.rdf s-extra-libs

=== modified file 'src/Makefile.xulrunner'
--- src/Makefile.xulrunner	2008-12-16 16:26:09 +0000
+++ src/Makefile.xulrunner	2009-05-15 19:01:12 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Harri Pitkänen <[e-mail]>
+# Copyright (C) 2008 - 2009 Harri Pitkänen <[e-mail]>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14,23 +14,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-XULRUNNER_SDK=$(shell pkg-config --variable=sdkdir libxul)
-XULRUNNER_INCDIR=$(shell pkg-config --variable=includedir libxul)
-NSPR_INCLUDES=$(shell pkg-config --cflags-only-I nspr)
 DESTDIR=/usr/lib/firefox
 CC=g++ -c
 CC_LINK=g++ -shared -Wl,--no-undefined
 include ../mozvoikko.config
 
-XULRUNNER_INCLUDES=-I$(XULRUNNER_SDK)/sdk/include -I$(XULRUNNER_SDK)/include \
--I$(XULRUNNER_INCDIR)/xpcom \
--I$(XULRUNNER_INCDIR)/spellchecker \
--I$(XULRUNNER_INCDIR)/uconv \
--I$(XULRUNNER_INCDIR)/unicharutil \
--I$(XULRUNNER_INCDIR)/xulapp \
--I$(XULRUNNER_INCDIR)/unstable
-XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \
--Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4
+XULRUNNER_INCLUDES=$(shell pkg-config --cflags libxul-unstable)
+XULRUNNER_LIBS=$(shell pkg-config --libs libxul-unstable)
 
 HEADERS=mozVoikko.hxx mozVoikkoSpell.hxx mozVoikkoUtils.hxx
 OBJECTS=mozVoikko mozVoikkoSpell mozVoikkoUtils mozVoikkoSpellFactory
@@ -41,11 +31,10 @@
 ifndef CFLAGS
 	CFLAGS=-O2
 endif
-CC_FLAGS=$(CFLAGS) -Wall -Werror -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fshort-wchar -fPIC
-CC_INCLUDES=$(NSPR_INCLUDES) $(XULRUNNER_INCLUDES) \
--include mozilla-config.h -include xpcom-config.h
+CC_FLAGS=$(CFLAGS) -Wall -Werror -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=$(XULRUNNER_LIBS)
+CC_LIBS=-Wl,--as-needed $(XULRUNNER_LIBS)
 
 .PHONY: all clean xpi extension-files install-unpacked
 

=== modified file 'src/mozVoikkoUtils.cpp'
--- src/mozVoikkoUtils.cpp	2008-12-16 16:26:09 +0000
+++ src/mozVoikkoUtils.cpp	2009-05-15 19:01:12 +0000
@@ -40,10 +40,18 @@
     "libvoikko.so.1"
 };
 
-const unsigned numPreloadedLibs = sizeof(preloadLibNames)/sizeof(*preloadLibNames);
-
 const char * libvoikkoName = "libvoikko.so.1";
 
+#elif defined(XP_MACOSX)
+
+const char *preloadLibNames[] =
+{
+    "libmalaga.7.0.0.dylib",
+    "libvoikko.1.7.0.dylib"
+};
+
+const char * libvoikkoName = "libvoikko.1.7.0.dylib";
+
 #elif defined(_WIN32)
 
 
@@ -56,8 +64,6 @@
     "libvoikko-1.dll"
 };
 
-const unsigned numPreloadedLibs = sizeof(preloadLibNames)/sizeof(*preloadLibNames);
-
 const char * libvoikkoName = "libvoikko-1.dll";
 
 #else
@@ -66,6 +72,8 @@
 
 #endif
 
+const unsigned numPreloadedLibs = sizeof(preloadLibNames)/sizeof(*preloadLibNames);
+
 #define CH(statement, errRetVal) do \
     { \
         nsresult rv = statement; \
@@ -243,42 +251,30 @@
     return NS_OK;
 }
 
+#ifndef SYSTEM_LIBVOIKKO
+
 nsresult getMozVoikkoBaseDirs(nsIFile **libDir, nsIFile **dataDir)
 {
     nsresult rv;
     nsCOMPtr<nsIFile> mozVoikkoLibName;
     nsCOMPtr<nsIFile> currDir, parentDir;
     nsCOMPtr<nsIFile> tmpDir, tmpFile;
-    nsCString leafName, tmp;
+    nsCString leafName;
     nsCString shortTargetName;
     nsCString fullTargetName;
 
-    // Get platform name (eg. WINNT_x86-msvc or Linux_x86_64-gcc3).
-    // WARNING: not frozen interface nsIXULRuntime is being used.
-    // String shortTargetName will contain only target OS name (like WINNT)
-    // String fullTargetName will contain additionally XPCOMAPI_NAME
-
-    nsCOMPtr<nsIXULRuntime> runtime = do_GetService("@mozilla.org/xre/app-info;1", &rv);
-
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = runtime->GetOS(shortTargetName);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    fullTargetName = shortTargetName;
-
-    rv = runtime->GetXPCOMABI(tmp);
-    if (NS_SUCCEEDED(rv))
-    {
-        fullTargetName.Append("_");
-        fullTargetName.Append(tmp);
-    }
- 
+    shortTargetName = mozvoikko_target_short;
+    fullTargetName = mozvoikko_target_long;
+
     // Get path of mozvoikko shared library.
     // mozVoikkoSpell::registerExtension() has saved it using nsICategory manager
     // when registrating the extension
     rv = getMozVoikkoLibrary(getter_AddRefs(mozVoikkoLibName));
-    NS_ENSURE_SUCCESS(rv, rv);
+    if (NS_FAILED(rv))
+    {
+        logMessage("mozvoikko: Failed to get nsICategoryManager entry");
+        return rv;
+    }
 
     // Extract directory part
     rv = mozVoikkoLibName->GetParent(getter_AddRefs(currDir));
@@ -374,6 +370,8 @@
     return NS_OK;
 }
 
+#endif
+
 PreloadedLibraries::PreloadedLibraries(nsIFile *libDir, const char **names, unsigned numLibs) :
     ok(false), numLibs(numLibs), libraries(NULL)
 {

=== modified file 'src/mozVoikkoUtils.hxx'
--- src/mozVoikkoUtils.hxx	2008-12-16 16:26:09 +0000
+++ src/mozVoikkoUtils.hxx	2009-05-15 19:01:12 +0000
@@ -74,10 +74,6 @@
     const nsACString &subDirName,
     const nsACString &fileName);
 
-nsresult loadExtraLibraries(int numLibs, const char **names);
-
-nsresult getMozVoikkoBaseDirs(nsIFile **libDir, nsIFile **dataDir);
-
 class PreloadedLibraries
 {
     bool ok;
@@ -91,4 +87,20 @@
     operator bool() const { return ok; }
 };
 
+#ifndef SYSTEM_LIBVOIKKO
+
+nsresult loadExtraLibraries(int numLibs, const char **names);
+
+nsresult getMozVoikkoBaseDirs(nsIFile **libDir, nsIFile **dataDir);
+
+// 2 string constants provided by autogenerated file mozvoikko-target.cpp
+//
+// They contains extension target string for example
+// "Linux" and "Linux_x86_64-gcc3" for Linux on x86_64. 
+//
+extern const char *mozvoikko_target_short;
+extern const char *mozvoikko_target_long;
+
+#endif /* SYSTEM_LIBVOIKKO */
+
 #endif