Hello community, here is the log from the commit of package kdepim4 checked in at Fri May 9 23:04:59 CEST 2008. -------- --- KDE/kdepim4/kdepim4.changes 2008-05-08 13:44:20.000000000 +0200 +++ kdepim4/kdepim4.changes 2008-05-09 17:54:01.000000000 +0200 @@ -1,0 +2,15 @@ +Fri May 9 17:48:18 CEST 2008 - llunak@suse.cz + +- use the backported kdelibs4.1 functionality for spellchecking + +------------------------------------------------------------------- +Fri May 9 15:18:33 CEST 2008 - wstephenson@suse.de + +- update branch diff for mbox fix + +------------------------------------------------------------------- +Fri May 9 09:49:53 CEST 2008 - dmueller@suse.de + +- add missing devel package requires + +------------------------------------------------------------------- New: ---- kdelibs41.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.p16634/_old 2008-05-09 23:03:44.000000000 +0200 +++ /var/tmp/diff_new_pack.p16634/_new 2008-05-09 23:03:44.000000000 +0200 @@ -29,7 +29,7 @@ Summary: Base package of kdepim Url: http://www.kde.org Version: 4.0.73 -Release: 1 +Release: 3 Source0: kdepim-%version.tar.bz2 Patch: 4_1_BRANCH.diff Patch1: akregator-useragent.diff @@ -38,6 +38,7 @@ Patch6: disable-knut.diff Patch7: disable-plasma-dependencies.diff Patch8: disable-kontact-weather-plugin.diff +Patch9: kdelibs41.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Suggests: kde4-ktnef @@ -71,12 +72,13 @@ %prep %setup -q -n kdepim-%version %patch -%patch1 +#%patch1 %patch4 %patch5 %patch6 %patch7 %patch8 +%patch9 %build %if ! %with_kitchensync @@ -573,6 +575,7 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Requires: libkdepim4 = %version +Requires: libkdepimlibs4-devel %description -n libkdepim4-devel This package contains the basic packages for KDE PIM applications. @@ -687,6 +690,12 @@ /usr/share/icons/hicolor/*/apps/office-address-book.* %changelog +* Fri May 09 2008 llunak@suse.cz +- use the backported kdelibs4.1 functionality for spellchecking +* Fri May 09 2008 wstephenson@suse.de +- update branch diff for mbox fix +* Fri May 09 2008 dmueller@suse.de +- add missing devel package requires * Thu May 08 2008 wstephenson@suse.de - Fix invalid return type in KTimeTracker * Wed May 07 2008 dmueller@suse.de ++++++ 4_1_BRANCH.diff ++++++ ++++ 2170 lines (skipped) ++++ between KDE/kdepim4/4_1_BRANCH.diff ++++ and kdepim4/4_1_BRANCH.diff ++++++ kdelibs41.diff ++++++ Subject: Use backported kdelibs4.1 functionality From: Lubos Lunak Patch-upstream: never Relates: kdelibs4/kdelibs4pim.diff Use backported support for spellchecking in kdepim4.1. --- kmail/kmmessage.cpp.sav 2008-05-09 14:45:17.000000000 +0200 +++ kmail/kmmessage.cpp 2008-05-09 14:45:59.000000000 +0200 @@ -1699,7 +1699,6 @@ void KMMessage::initHeader( uint id ) setSubject(""); setDateToday(); -#if KDE_IS_VERSION(4,0,60) // user agent, e.g. KMail/1.9.50 (Windows/5.0; KDE/3.97.1; i686; svn-762186; 2008-01-15) QStringList extraInfo; # if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE @@ -1708,18 +1707,6 @@ void KMMessage::initHeader( uint id ) setHeaderField("User-Agent", KProtocolManager::userAgentForApplication( "KMail", KMAIL_VERSION, extraInfo ) ); -#else - // <FIXME remove later for KDE < 4.0.60 (jstaniek) > - // user agent, e.g. KMail/1.9.50 (KDE/3.97.1; svn-762186; 2008-01-15) - setHeaderField("User-Agent", QString::fromLatin1("KMail/" KMAIL_VERSION " (KDE/%1.%2.%3") - .arg( KDE::versionMajor() ).arg( KDE::versionMinor() ).arg( KDE::versionRelease() ) -# if defined KMAIL_SVN_REVISION_STRING && defined KMAIL_SVN_LAST_CHANGE - + "; " KMAIL_SVN_REVISION_STRING "; " KMAIL_SVN_LAST_CHANGE -# endif - + ")" - ); - // </FIXME> -#endif // This will allow to change Content-Type: setHeaderField("Content-Type","text/plain"); --- libkdepim/kmeditor.cpp.sav 2008-05-09 14:36:23.000000000 +0200 +++ libkdepim/kmeditor.cpp 2008-05-09 16:05:08.000000000 +0200 @@ -404,10 +404,8 @@ void KMeditorPrivate::init() QShortcut * insertMode = new QShortcut( QKeySequence( Qt::Key_Insert ), q ); q->connect( insertMode, SIGNAL( activated() ), q, SLOT( slotChangeInsertMode() ) ); -#if KDE_IS_VERSION(4,0,67) q->connect( q, SIGNAL( languageChanged(const QString &) ), q, SLOT( setSpellCheckLanguage(const QString &) ) ); -#endif } void KMeditor::slotChangeInsertMode() @@ -629,7 +627,6 @@ void KMeditor::disableWordWrap() void KMeditor::contextMenuEvent( QContextMenuEvent *event ) { -#if KDE_IS_VERSION(4,0,73) // Obtain the cursor at the mouse position and the current cursor QTextCursor cursorAtMouse = cursorForPosition( event->pos() ); int mousePos = cursorAtMouse.position(); @@ -724,10 +721,8 @@ void KMeditor::contextMenuEvent( QContex } } } -#else - KTextEdit::contextMenuEvent( event ); - kWarning() << "spell check menu not compiled in, kdelibs too old."; -#endif +// KTextEdit::contextMenuEvent( event ); +//kWarning() << "spell check menu not compiled in, kdelibs too old."; } void KMeditor::slotPasteAsQuotation() @@ -1159,9 +1154,7 @@ void KMeditor::setSpellCheckLanguage( co KTextEdit::highlighter()->setCurrentLanguage( language ); KTextEdit::highlighter()->rehighlight(); } -#if KDE_IS_VERSION(4,0,60) KTextEdit::setSpellCheckingLanguage( language ); -#endif if ( language != d->language ) emit spellcheckLanguageChanged( language ); @@ -1192,12 +1185,10 @@ void KMeditor::showSpellConfigDialog( co { KConfig config( configFileName ); Sonnet::ConfigDialog dialog( &config, this ); -#if KDE_IS_VERSION(4,0,67) if ( !d->language.isEmpty() ) dialog.setLanguage( d->language ); connect( &dialog, SIGNAL( languageChanged(const QString &) ), this, SLOT( setSpellCheckLanguage(const QString &) ) ); -#endif dialog.setWindowIcon( KIcon( "internet-mail" ) ); dialog.exec(); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org