Hello community,
here is the log from the commit of package libreoffice-voikko for
openSUSE:Factory checked in at 2015-01-22 21:49:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice-voikko (Old)
and /work/SRC/openSUSE:Factory/.libreoffice-voikko.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice-voikko"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice-voikko/libreoffice-voikko.changes
2014-03-06 11:59:30.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libreoffice-voikko.new/libreoffice-voikko.changes
2015-01-22 21:50:24.000000000 +0100
@@ -1,0 +2,8 @@
+Thu Jan 22 12:20:32 UTC 2015 - [email protected]
+
+- Update to version 4.1:
+ + Unconditionally enable grammar checker since it is now used
+ only with dictionaries and backends that support it.
+ + Switch to passive component registration.
+
+-------------------------------------------------------------------
Old:
----
libreoffice-voikko-4.0.tar.gz
New:
----
libreoffice-voikko-4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-voikko.spec ++++++
--- /var/tmp/diff_new_pack.1OMhZs/_old 2015-01-22 21:50:24.000000000 +0100
+++ /var/tmp/diff_new_pack.1OMhZs/_new 2015-01-22 21:50:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libreoffice-voikko
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libreoffice-voikko
-Version: 4.0
+Version: 4.1
Release: 0
Summary: LibreOffice spellchecker/hyphenator for finnish language
License: MPL-2.0 or GPL-3.0+
++++++ libreoffice-voikko-4.0.tar.gz -> libreoffice-voikko-4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-voikko-4.0/ChangeLog
new/libreoffice-voikko-4.1/ChangeLog
--- old/libreoffice-voikko-4.0/ChangeLog 2013-11-26 16:17:28.000000000
+0100
+++ new/libreoffice-voikko-4.1/ChangeLog 2014-09-20 09:50:45.000000000
+0200
@@ -1,3 +1,10 @@
+2014-08-22 Harri Pitkänen <[email protected]>
+ * Unconditionally enable grammar checker since it is now
+ used only with dictionaries and backends that support it.
+
+2014-08-19 Harri Pitkänen <[email protected]>
+ * Switch to passive component registration.
+
2013-10-16 Harri Pitkänen <[email protected]>
* Re-license under MPL 2.0 and GPLv3+.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-voikko-4.0/Makefile
new/libreoffice-voikko-4.1/Makefile
--- old/libreoffice-voikko-4.0/Makefile 2013-11-26 16:17:28.000000000 +0100
+++ new/libreoffice-voikko-4.1/Makefile 2014-09-20 09:50:45.000000000 +0200
@@ -1,5 +1,5 @@
# Libreoffice-voikko: Linguistic extension for LibreOffice
-# Copyright (C) 2005 - 2013 Harri Pitkänen <[email protected]>
+# Copyright (C) 2005 - 2014 Harri Pitkänen <[email protected]>
#
# This Source Code Form is subject to the terms of the Mozilla Public License,
# v. 2.0. If a copy of the MPL was not distributed with this file, You can
@@ -23,7 +23,7 @@
# ===== Build settings =====
# Version number of the libreoffice-voikko extension
-VOIKKO_VERSION=4.0
+VOIKKO_VERSION=4.1
# VOIKKO_DEBUG controls the amount of debugging information in the resulting
UNO
# package. Possible values are NO (creates an optimized build without any
@@ -48,9 +48,6 @@
# of this extension, uncomment the following.
# SHOW_LICENSE=1
-# If you want to enable the grammar checker, set this option to 1
-ENABLE_GRAMMAR_CHECKER=1
-
# Setting this option to 1 causes ugly warnings to be added to visible places
# in the extension without removing any functionality (codename "tekstintuho").
# Useful for binary builds that are released for public testing.
@@ -64,7 +61,7 @@
# Platform specific variables
ifeq "$(PLATFORM)" "windows"
- WARNING_FLAGS=-Wall -WX -wd4061 -wd4127 -wd4265 -wd4365 -wd4514 -wd4619
-wd4625 -wd4626 -wd4668 -wd4710 -wd4711 -wd4820
+ WARNING_FLAGS=-Wall -WX -wd4061 -wd4127 -wd4265 -wd4365 -wd4514 -wd4619
-wd4625 -wd4626 -wd4668 -wd4710 -wd4711 -wd4820 -wd4996
# The following warnings should be fixed in the future
WARNING_FLAGS+= -wd4640
COPYDIR=xcopy /E /I
@@ -77,6 +74,12 @@
LINKER_FLAGS=-Wl,--no-undefined
endif
+ifeq "$(PLATFORM)" "freebsd"
+ CC=cc
+ LINK=c++
+ LIBVOIKKO_PATH=/usr/local
+ SDK_ZIP=zip
+endif
# General variables
ifeq "$(VOIKKO_DEBUG)" "FULL"
@@ -121,10 +124,6 @@
LINK_LIBS += -lvoikko
endif
-ifndef ENABLE_GRAMMAR_CHECKER
- VOIKKO_CC_DEFINES += -DDISABLE_GRAMMAR_CHECKER
-endif
-
# Build extension package name
ifdef SHOW_UGLY_WARNINGS
VOIKKO_PACKAGENAME:=tekstintuho
@@ -158,10 +157,10 @@
SRCDIST=COPYING Makefile README ChangeLog $(patsubst
%,src/%.hxx,$(VOIKKO_HEADERS)) \
$(patsubst %,src/%.cxx,$(VOIKKO_OBJECTS)) oxt/description.xml.template
\
$(patsubst %,oxt/%,$(COPY_TEMPLATES)) \
- oxt/META-INF/manifest.xml.template oxt/icon.svg
+ oxt/voikko.components.template oxt/META-INF/manifest.xml.template
oxt/icon.svg
SED=sed
-EXTENSION_FILES=build/oxt/META-INF/manifest.xml build/oxt/description.xml \
+EXTENSION_FILES=build/oxt/META-INF/manifest.xml build/oxt/description.xml
build/oxt/voikko.components \
build/oxt/$(VOIKKO_EXTENSION_SHAREDLIB) \
$(patsubst %,build/oxt/%,$(STANDALONE_EXTENSION_FILES)) \
$(patsubst %,build/oxt/%,$(COPY_TEMPLATES))
@@ -181,16 +180,14 @@
install -m 755 -d "$(DESTDIR)" "$(DESTDIR)/META-INF"
install -m 644 build/oxt/META-INF/manifest.xml "$(DESTDIR)/META-INF"
install -m 644 build/oxt/$(VOIKKO_EXTENSION_SHAREDLIB) \
- build/oxt/description.xml \
+ build/oxt/description.xml build/oxt/voikko.components \
$(patsubst %,build/oxt/%,$(STANDALONE_EXTENSION_FILES)) \
$(patsubst %,build/oxt/%,$(COPY_TEMPLATES)) $(DESTDIR)
# Sed scripts for modifying templates
-MANIFEST_SEDSCRIPT:=s/VOIKKO_EXTENSION_SHAREDLIB/$(VOIKKO_EXTENSION_SHAREDLIB)/g;s/UNOPKG_PLATFORM/$(UNOPKG_PLATFORM)/g
+MANIFEST_SEDSCRIPT:=s/UNOPKG_PLATFORM/$(UNOPKG_PLATFORM)/g
+COMPONENTS_SEDSCRIPT:=s/VOIKKO_EXTENSION_SHAREDLIB/$(VOIKKO_EXTENSION_SHAREDLIB)/g
DESCRIPTION_SEDSCRIPT:=s/VOIKKO_VERSION/$(VOIKKO_VERSION)/g
-ifdef ENABLE_GRAMMAR_CHECKER
- MANIFEST_SEDSCRIPT:=$(MANIFEST_SEDSCRIPT);/GRAMMAR_CHECKER_DISABLED/d
-endif
ifdef SHOW_LICENSE
DESCRIPTION_SEDSCRIPT:=$(DESCRIPTION_SEDSCRIPT);/SHOW_LICENSE/d
endif
@@ -209,6 +206,10 @@
-$(MKDIR) $(subst /,$(PS),$(@D))
$(SED) -e $(DESCRIPTION_SEDSCRIPT) < $^ > $@
+build/oxt/voikko.components: oxt/voikko.components.template
+ -$(MKDIR) $(subst /,$(PS),$(@D))
+ $(SED) -e $(COMPONENTS_SEDSCRIPT) < $^ > $@
+
$(patsubst %,build/oxt/%,$(COPY_TEMPLATES)): build/oxt/%: oxt/%
-$(MKDIR) $(subst /,$(PS),$(@D))
$(COPY) "$(subst /,$(PS),$^)" "$(subst /,$(PS),$@)"
@@ -239,8 +240,8 @@
mt -manifest build/oxt/voikko.dll.manifest
-outputresource:build/oxt/voikko.dll;2
else
ifeq "$(PLATFORM)" "macosx"
- cat $(PRJ)/settings/component.uno.map > build/voikko.map
- $(LINK) $(COMP_LINK_FLAGS) build/voikko.map $(LINK_LIBS) -o $@
$^ \
+# cat $(PRJ)/settings/component.uno.map > build/voikko.map
+ $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $^ \
$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(CPPUHELPERDYLIB)
$(CPPUDYLIB) $(SALDYLIB) \
-lvoikko
$(INSTALL_NAME_URELIBS) $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-voikko-4.0/README
new/libreoffice-voikko-4.1/README
--- old/libreoffice-voikko-4.0/README 2013-11-26 16:17:28.000000000 +0100
+++ new/libreoffice-voikko-4.1/README 2014-09-20 09:50:45.000000000 +0200
@@ -17,16 +17,16 @@
=======
Source code:
- 2005 - 2013 Harri Pitkänen ([email protected])
+ 2005 - 2014 Harri Pitkänen ([email protected])
Icon:
2011 Tarja Lindfors ([email protected])
Porting status
==============
- Linux: This is the primary development platform, and should always work
-- FreeBSD: Status unknown
+- FreeBSD: Is known to work with at least LibreOffice 4.2 and FreeBSD 10.
- Windows: Should usually work without too much patching.
-- Mac OS X: Version 10.5 (Intel) was supported, current status unknown.
+- Mac OS X: Usually works but may need some Makefile patching depending on OS
X version.
Build requirements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libreoffice-voikko-4.0/oxt/META-INF/manifest.xml.template
new/libreoffice-voikko-4.1/oxt/META-INF/manifest.xml.template
--- old/libreoffice-voikko-4.0/oxt/META-INF/manifest.xml.template
2013-11-26 16:17:28.000000000 +0100
+++ new/libreoffice-voikko-4.1/oxt/META-INF/manifest.xml.template
2014-09-20 09:50:45.000000000 +0200
@@ -3,8 +3,8 @@
"Manifest.dtd">
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest";>
<manifest:file-entry
-
manifest:media-type="application/vnd.sun.star.uno-component;type=native;platform=UNOPKG_PLATFORM"
- manifest:full-path="VOIKKO_EXTENSION_SHAREDLIB"/>
+
manifest:media-type="application/vnd.sun.star.uno-components;type=native;platform=UNOPKG_PLATFORM"
+ manifest:full-path="voikko.components"/>
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="config.xcu"/>
@@ -14,10 +14,8 @@
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="SettingsDialog.xcu"/>
- <!-- GRAMMAR_CHECKER_DISABLED
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="Linguistic.xcu"/>
- GRAMMAR_CHECKER_DISABLED -->
</manifest:manifest>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libreoffice-voikko-4.0/oxt/voikko.components.template
new/libreoffice-voikko-4.1/oxt/voikko.components.template
--- old/libreoffice-voikko-4.0/oxt/voikko.components.template 1970-01-01
01:00:00.000000000 +0100
+++ new/libreoffice-voikko-4.1/oxt/voikko.components.template 2014-09-20
09:50:46.000000000 +0200
@@ -0,0 +1,16 @@
+<components xmlns="http://openoffice.org/2010/uno-components";>
+ <component loader="com.sun.star.loader.SharedLibrary"
uri="VOIKKO_EXTENSION_SHAREDLIB">
+ <implementation
name="org.puimula.ooovoikko.SettingsEventHandlerImplementation">
+ <service name="org.puimula.ooovoikko.SettingsEventHandlerService"/>
+ </implementation>
+ <implementation name="voikko.Hyphenator">
+ <service name="com.sun.star.linguistic2.Hyphenator"/>
+ </implementation>
+ <implementation name="voikko.SpellChecker">
+ <service name="com.sun.star.linguistic2.SpellChecker"/>
+ </implementation>
+ <implementation name="voikko.GrammarChecker">
+ <service name="com.sun.star.linguistic2.Proofreader"/>
+ </implementation>
+ </component>
+</components>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-voikko-4.0/src/VoikkoHandlePool.cxx
new/libreoffice-voikko-4.1/src/VoikkoHandlePool.cxx
--- old/libreoffice-voikko-4.0/src/VoikkoHandlePool.cxx 2013-11-26
16:17:28.000000000 +0100
+++ new/libreoffice-voikko-4.1/src/VoikkoHandlePool.cxx 2014-09-20
09:50:46.000000000 +0200
@@ -192,6 +192,89 @@
{"vro", "vro", "EE"},
{"xh", "xh", "ZA"},
{"yrk", "yrk", "RU"},
+// Added a new block of language codes - should be sorted and merged with the
+// rest when accepted.
+ {"an", "an", "ES"},
+ {"as", "as", "IN"},
+ {"as-BT", "as", "BT"},
+ {"ast", "ast", "ES"},
+ {"av", "av", "RU"},
+ {"av-AZ", "av", "AZ"},
+ {"av-GE", "av", "GE"},
+ {"av-KZ", "av", "KZ"},
+ {"azj", "azj", "AZ"},
+ {"azj-RU", "azj", "RU"},
+ {"bak", "bak", "RU"},
+ {"bak-KZ", "bak", "KZ"},
+ {"be", "be", "BY"},
+ {"bg", "bg", "BG"},
+ {"bla", "bla", "CA"},
+ {"bla-US", "bla", "US"},
+ {"br", "br", "FR"},
+ {"bxr", "bxr", "RU"},
+ {"ce", "ce", "RU"},
+ {"ceb", "ceb", "PH"},
+ {"chp", "chp", "CA"},
+ {"ciw", "ciw", "US"},
+ {"cos", "cos", "FR"},
+ {"crk", "crk", "CA"},
+ {"crk-US", "crk", "US"},
+ {"dsb", "dsb", "DE"},
+ {"eve", "eve", "RU"},
+ {"evn", "evn", "CN"},
+ {"evn-RU", "evn", "RU"},
+ {"fkv", "fkv", "NO"},
+ {"fry", "fry", "NL"},
+ {"glk", "glk", "IR"},
+ {"grn", "grn", "PY"},
+ {"guc", "guc", "CO"},
+ {"guc-VE", "guc", "VE"},
+ {"gv", "gv", "IM"},
+ {"hdn", "hdn", "CA"},
+ {"hdn-US", "hdn", "US"},
+ {"hsb", "hsb", "DE"},
+ {"hy", "hy", "AM"},
+ {"ik", "ik", "US"},
+ {"izh", "izh", "RU"},
+ {"kaa", "kaa", "UZ"},
+ {"kaa-RU", "kaa", "RU"},
+ {"kaz", "kaz", "KZ"},
+ {"khk", "khk", "MN"},
+ {"khk-KG", "khk", "KG"},
+ {"khk-RU", "khk", "RU"},
+ {"khk-CN", "khk", "CN"},
+ {"kw", "kw", "UK"},
+ {"ltz", "ltz", "LU"},
+ {"ml", "ml", "IN"},
+ {"mr", "mr", "IN"},
+ {"mt", "mt", "MT"},
+ {"ndl", "ndl", "CD"},
+ {"quz", "quz", "PE"},
+ {"qve", "qve", "PE"},
+ {"rup", "rup", "MK"},
+ {"rup-GR", "rup", "GR"},
+ {"rup-RO", "rup", "RO"},
+ {"sc", "sc", "IT"},
+ {"sel", "sel", "RU"},
+ {"si", "si", "LK"},
+ {"sje", "sje", "SE"},
+ {"so", "so", "SO"},
+ {"sq", "sq", "AL"},
+ {"sto", "sto", "CA"},
+ {"te", "te", "IN"},
+ {"tg", "tg", "TJ"},
+ {"tg-UZ", "tg", "UZ"},
+ {"tl", "tl", "PH"},
+ {"tk", "tk", "TM"},
+ {"tku", "tku", "MX"},
+ {"tus", "tus", "CA"},
+ {"tyv", "tyv", "RU"},
+ {"ur", "ur", "PK"},
+ {"uz", "uz", "UZ"},
+ {"uz-KG", "uz", "KG"},
+ {"zu", "zu", "ZA"},
+ {"zu-LS", "zu", "LS"},
+ {"zu-SZ", "zu", "SZ"},
{0, 0, 0}
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-voikko-4.0/src/registry.cxx
new/libreoffice-voikko-4.1/src/registry.cxx
--- old/libreoffice-voikko-4.0/src/registry.cxx 2013-11-26 16:17:28.000000000
+0100
+++ new/libreoffice-voikko-4.1/src/registry.cxx 2014-09-20 09:50:46.000000000
+0200
@@ -35,8 +35,7 @@
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":unsafe";
}
-Reference<XInterface> SAL_CALL regSettingsCreate(const
Reference<XComponentContext> & context)
- SAL_THROW((Exception)) {
+Reference<XInterface> SAL_CALL regSettingsCreate(const
Reference<XComponentContext> & context) {
return static_cast< ::cppu::OWeakObject * >(new
SettingsEventHandler(context));
}
@@ -49,12 +48,10 @@
&Hyphenator::getImplementationName_static,
&Hyphenator::getSupportedServiceNames_static,
&::cppu::createSingleComponentFactory, 0, 0 },
-#ifndef DISABLE_GRAMMAR_CHECKER
{ &GrammarChecker::get,
&GrammarChecker::getImplementationName_static,
&GrammarChecker::getSupportedServiceNames_static,
&::cppu::createSingleComponentFactory, 0, 0 },
-#endif
{ ®SettingsCreate,
&SettingsEventHandler::getImplementationName_static,
&SettingsEventHandler::getSupportedServiceNames_static,
@@ -62,11 +59,6 @@
{ 0, 0, 0, 0, 0, 0 }
};
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void *
serviceManager, void * registryKey) {
- VOIKKO_DEBUG("component_writeInfo");
- return ::cppu::component_writeInfoHelper(serviceManager, registryKey,
regEntries);
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL
component_getFactory(const char * implName, void * serviceManager, void
* registryKey) {
VOIKKO_DEBUG("component_getFactory");
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
