Hello community, here is the log from the commit of package libkdeedu4 for openSUSE:Factory checked in at 2012-01-31 10:20:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdeedu4 (Old) and /work/SRC/openSUSE:Factory/.libkdeedu4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkdeedu4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdeedu4/libkdeedu4.changes 2011-12-08 12:12:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdeedu4.new/libkdeedu4.changes 2012-01-31 10:21:07.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 18 20:59:56 CET 2012 - [email protected] + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 16:34:31 CET 2012 - [email protected] + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- Old: ---- libkdeedu-4.7.4.tar.bz2 New: ---- libkdeedu-4.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdeedu4.spec ++++++ --- /var/tmp/diff_new_pack.SnunSX/_old 2012-01-31 10:21:08.000000000 +0100 +++ /var/tmp/diff_new_pack.SnunSX/_new 2012-01-31 10:21:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkdeedu4 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -40,7 +40,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.7.4 +Version: 4.8.0 Release: 0 Summary: Library for KDE Education Applications License: GPL-2.0+ ++++++ libkdeedu-4.7.4.tar.bz2 -> libkdeedu-4.8.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdeedu-4.7.4/keduvocdocument/keduvocdeclension.cpp new/libkdeedu-4.8.0/keduvocdocument/keduvocdeclension.cpp --- old/libkdeedu-4.7.4/keduvocdocument/keduvocdeclension.cpp 2011-10-02 15:25:45.000000000 +0200 +++ new/libkdeedu-4.8.0/keduvocdocument/keduvocdeclension.cpp 2011-12-20 20:13:11.000000000 +0100 @@ -80,6 +80,11 @@ QDomDocument domDoc = parent.ownerDocument(); QDomElement declensionElement = domDoc.createElement( KVTML_DECLENSION ); + QMap<int, KEduVocWordFlags> genders; + genders[0] = KEduVocWordFlag::Masculine; + genders[1] = KEduVocWordFlag::Feminine; + genders[2] = KEduVocWordFlag::Neuter; + QMap<int, KEduVocWordFlags> numbers; numbers[0] = KEduVocWordFlag::Singular; numbers[1] = KEduVocWordFlag::Dual; @@ -95,19 +100,25 @@ cases[6] = KEduVocWordFlag::Vocative; + for ( int gen = 0; gen <= 2; ++gen) + { + QDomElement genderElement = domDoc.createElement( KVTML_GRAMMATICAL_GENDER[gen] ); + for ( int num = 0; num <= 2; ++num) { + QDomElement numberElement = domDoc.createElement( KVTML_GRAMMATICAL_NUMBER[num] ); + for ( int dcase = 0; dcase <= 6; ++dcase ) { + QDomElement caseElement = domDoc.createElement( KVTML_DECLENSION_CASE[dcase] ); + declension(genders[gen] | numbers[num] | cases[dcase]).toKVTML2(caseElement); - for ( int num = 0; num <= 2; ++num) { - QDomElement numberElement = domDoc.createElement( KVTML_GRAMMATICAL_NUMBER[num] ); - for ( int dcase = 0; dcase <= 6; ++dcase ) { - QDomElement caseElement = domDoc.createElement( KVTML_DECLENSION_CASE[dcase] ); - declension(numbers[num] | cases[dcase]).toKVTML2(caseElement); - - if (caseElement.hasChildNodes()) { - numberElement.appendChild(caseElement); + if (caseElement.hasChildNodes()) { + numberElement.appendChild(caseElement); + } + } + if (numberElement.hasChildNodes()) { + genderElement.appendChild(numberElement); } } - if (numberElement.hasChildNodes()) { - declensionElement.appendChild(numberElement); + if (genderElement.hasChildNodes()) { + declensionElement.appendChild(genderElement); } } if (declensionElement.hasChildNodes()) { @@ -124,6 +135,11 @@ } + QMap<int, KEduVocWordFlags> genders; + genders[0] = KEduVocWordFlag::Masculine; + genders[1] = KEduVocWordFlag::Feminine; + genders[2] = KEduVocWordFlag::Neuter; + QMap<int, KEduVocWordFlags> numbers; numbers[0] = KEduVocWordFlag::Singular; numbers[1] = KEduVocWordFlag::Dual; @@ -138,17 +154,24 @@ cases[5] = KEduVocWordFlag::Locative; cases[6] = KEduVocWordFlag::Vocative; + KEduVocDeclension* declension = new KEduVocDeclension; - for ( int num = 0; num <= 2; ++num ) { - QDomElement numberElement = declensionElement.firstChildElement( KVTML_GRAMMATICAL_NUMBER[num] ); - if (!numberElement.isNull()) { - for ( int dcase = 0; dcase <= 6; ++dcase) { - QDomElement caseElement = numberElement.firstChildElement( KVTML_DECLENSION_CASE[dcase] ); - if (!caseElement.isNull()) { - KEduVocText text; - text.fromKVTML2(caseElement); - declension->setDeclension(text, numbers[num] | cases[dcase]); + for ( int gen = 0; gen <= 2; ++gen ) { + QDomElement genderElement = declensionElement.firstChildElement( KVTML_GRAMMATICAL_GENDER[gen] ); + if (!genderElement.isNull()) + { + for ( int num = 0; num <= 2; ++num ) { + QDomElement numberElement = genderElement.firstChildElement( KVTML_GRAMMATICAL_NUMBER[num] ); + if (!numberElement.isNull()) { + for ( int dcase = 0; dcase <= 6; ++dcase) { + QDomElement caseElement = numberElement.firstChildElement( KVTML_DECLENSION_CASE[dcase] ); + if (!caseElement.isNull()) { + KEduVocText text; + text.fromKVTML2(caseElement); + declension->setDeclension(text, genders[gen] | numbers[num] | cases[dcase]); + } + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdeedu-4.7.4/keduvocdocument/keduvockvtml2reader.cpp new/libkdeedu-4.8.0/keduvocdocument/keduvockvtml2reader.cpp --- old/libkdeedu-4.7.4/keduvocdocument/keduvockvtml2reader.cpp 2011-10-02 15:25:45.000000000 +0200 +++ new/libkdeedu-4.8.0/keduvocdocument/keduvockvtml2reader.cpp 2011-12-02 22:31:45.000000000 +0100 @@ -589,6 +589,9 @@ if ( specialType == KVTML_SPECIALWORDTYPE_NOUN_NEUTRAL ) { wordTypeContainer->setWordType(KEduVocWordFlag::Noun| KEduVocWordFlag::Neuter); } + if ( specialType == KVTML_SPECIALWORDTYPE_CONJUNCTION ) { + wordTypeContainer->setWordType(KEduVocWordFlag::Conjunction); + } } // special type // read entries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdeedu-4.7.4/keduvocdocument/keduvockvtml2writer.cpp new/libkdeedu-4.8.0/keduvocdocument/keduvockvtml2writer.cpp --- old/libkdeedu-4.7.4/keduvocdocument/keduvockvtml2writer.cpp 2011-10-02 15:25:45.000000000 +0200 +++ new/libkdeedu-4.8.0/keduvocdocument/keduvockvtml2writer.cpp 2011-12-02 22:31:45.000000000 +0100 @@ -403,6 +403,9 @@ else if (wordType->wordType().testFlag(KEduVocWordFlag::Adverb)) typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, KVTML_SPECIALWORDTYPE_ADVERB ) ); + else if (wordType->wordType().testFlag(KEduVocWordFlag::Conjunction)) + typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, KVTML_SPECIALWORDTYPE_CONJUNCTION ) ); + // child entries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdeedu-4.7.4/keduvocdocument/kvtml2defs.h new/libkdeedu-4.8.0/keduvocdocument/kvtml2defs.h --- old/libkdeedu-4.7.4/keduvocdocument/kvtml2defs.h 2011-10-02 15:25:45.000000000 +0200 +++ new/libkdeedu-4.8.0/keduvocdocument/kvtml2defs.h 2011-12-02 22:31:45.000000000 +0100 @@ -111,6 +111,7 @@ #define KVTML_SPECIALWORDTYPE_VERB "verb" #define KVTML_SPECIALWORDTYPE_ADJECTIVE "adjective" #define KVTML_SPECIALWORDTYPE_ADVERB "adverb" +#define KVTML_SPECIALWORDTYPE_CONJUNCTION "conjunction" #define KVTML_TENSES "tenses" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
