packages (DEVEL): kde4-kdelibs/kde4-kdelibs.spec, kde4-kdelibs/kde4-kdelibs...
arekm
arekm at pld-linux.org
Fri Feb 12 08:32:09 CET 2010
Author: arekm Date: Fri Feb 12 07:32:09 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- rel 4; branch diff is back
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs.spec (1.157.2.38 -> 1.157.2.39) , kde4-kdelibs-branch.diff (1.1.2.2 -> 1.1.2.3)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.157.2.38 packages/kde4-kdelibs/kde4-kdelibs.spec:1.157.2.39
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.157.2.38 Tue Feb 9 15:26:45 2010
+++ packages/kde4-kdelibs/kde4-kdelibs.spec Fri Feb 12 08:32:03 2010
@@ -16,12 +16,12 @@
Summary(uk.UTF-8): K Desktop Environment - Бібліотеки
Name: kde4-kdelibs
Version: 4.4.0
-Release: 3
+Release: 4
License: LGPL
Group: X11/Libraries
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
# Source0-md5: 957bca85de744a9ddd316fd85e882b40
-#Patch100: %{name}-branch.diff
+Patch100: %{name}-branch.diff
Patch0: %{orgname}4-findqt4.patch
Patch1: %{name}-findboost.patch
Patch2: %{name}-branding.patch
@@ -201,7 +201,7 @@
%prep
%setup -q -n %{orgname}-%{version}
-#%patch100 -p0
+%patch100 -p0
#%patch0 -p0
#%patch1 -p0
%patch2 -p0
@@ -1040,6 +1040,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.157.2.39 2010/02/12 07:32:03 arekm
+- rel 4; branch diff is back
+
Revision 1.157.2.38 2010/02/09 14:26:45 arekm
- rel 3; new tarball
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branch.diff
diff -u /dev/null packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.1.2.3
--- /dev/null Fri Feb 12 08:32:09 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-branch.diff Fri Feb 12 08:32:03 2010
@@ -0,0 +1,1339 @@
+Index: interfaces/ktexteditor/templateinterface.cpp
+===================================================================
+--- interfaces/ktexteditor/templateinterface.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ interfaces/ktexteditor/templateinterface.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -114,7 +114,7 @@
+ {
+ QMap<QString, QString> enhancedInitValues( initialValues );
+
+- QRegExp rx( "[$%]\\{([^}\\s]+)\\}" );
++ QRegExp rx( "[$%]\\{([^}\\r\\n]+)\\}" );
+ rx.setMinimal( true );
+ int pos = 0;
+ int offset;
+Index: kate/smart/katesmartregion.cpp
+===================================================================
+--- kate/smart/katesmartregion.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ kate/smart/katesmartregion.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -55,6 +55,8 @@
+ else
+ *m_bounding = m_bounding->encompass(*range);
+ }
++
++ m_bounding->setInternal();
+ }
+
+
+Index: kate/utils/kateconfig.cpp
+===================================================================
+--- kate/utils/kateconfig.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ kate/utils/kateconfig.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -1392,6 +1392,7 @@
+ KColorScheme schemeView(QPalette::Active, KColorScheme::View);
+ KColorScheme schemeWindow(QPalette::Active, KColorScheme::Window);
+ KColorScheme schemeSelection(QPalette::Active, KColorScheme::Selection);
++ KColorScheme schemeTooltip(QPalette::Active, KColorScheme::Tooltip);
+ QColor tmp0( schemeView.background().color() );
+ QColor tmp1( schemeSelection.background().color() );
+ QColor tmp2( schemeView.background(KColorScheme::AlternateBackground).color() );
+@@ -1446,11 +1447,18 @@
+ m_fontMetrics = QFontMetrics(m_font);
+ m_fontSet = true;
+
+- m_templateBackgroundColor=config.readEntry(QString("Color Template Background"),QColor(0xcc,0xcc,0xcc));
+- m_templateEditablePlaceholderColor = config.readEntry(QString("Color Template Editable Placeholder"),QColor(0xcc,0xff,0xcc));
+- m_templateFocusedEditablePlaceholderColor=config.readEntry(QString("Color Template Focused Editable Placeholder"),QColor(0x66,0xff,0x66));
+- m_templateNotEditablePlaceholderColor=config.readEntry(QString("Color Template Not Editable Placeholder"),QColor(0xff,0xcc,0xcc));
++ m_templateBackgroundColor=config.readEntry(QString("Color Template Background"),
++ schemeTooltip.background(KColorScheme::NormalBackground).color());
+
++ m_templateEditablePlaceholderColor = config.readEntry(QString("Color Template Editable Placeholder"),
++ schemeTooltip.background(KColorScheme::NeutralBackground).color());
++
++ m_templateFocusedEditablePlaceholderColor=config.readEntry(QString("Color Template Focused Editable Placeholder"),
++ schemeTooltip.background(KColorScheme::PositiveBackground).color());
++
++ m_templateNotEditablePlaceholderColor=config.readEntry(QString("Color Template Not Editable Placeholder"),
++ schemeTooltip.background(KColorScheme::NegativeBackground).color());
++
+ m_templateColorsSet=true;
+ }
+
+Index: kate/utils/katetemplatehandler.cpp
+===================================================================
+--- kate/utils/katetemplatehandler.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ kate/utils/katetemplatehandler.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -49,6 +49,9 @@
+ {
+ ifDebug(kDebug() << templateString << initialValues;)
+
++ connect(m_doc, SIGNAL(aboutToReload(KTextEditor::Document*)),
++ this, SLOT(cleanupAndExit()));
++
+ connect(m_doc, SIGNAL(textInserted(KTextEditor::Document*, KTextEditor::Range)),
+ this, SLOT(slotTemplateInserted(KTextEditor::Document*, KTextEditor::Range)));
+
+@@ -295,12 +298,12 @@
+ }
+
+ /**
+- * Returns an attribute with \p color as background with 0x88 alpha value.
++ * Returns an attribute with \p color as background with @p alpha alpha value.
+ */
+-Attribute::Ptr getAttribute(QColor color)
++Attribute::Ptr getAttribute(QColor color, int alpha = 230)
+ {
+ Attribute::Ptr attribute(new Attribute());
+- color.setAlpha(0x88);
++ color.setAlpha(alpha);
+ attribute->setBackground(QBrush(color));
+ return attribute;
+ }
+@@ -433,12 +436,12 @@
+
+ Attribute::Ptr editableAttribute = getAttribute(config->templateEditablePlaceholderColor());
+ editableAttribute->setDynamicAttribute(
+- Attribute::ActivateCaretIn, getAttribute(config->templateFocusedEditablePlaceholderColor())
++ Attribute::ActivateCaretIn, getAttribute(config->templateFocusedEditablePlaceholderColor(), 255)
+ );
+
+ Attribute::Ptr mirroredAttribute = getAttribute(config->templateNotEditablePlaceholderColor());
+
+- m_wholeTemplateRange->setAttribute(getAttribute(config->templateBackgroundColor()));
++ m_wholeTemplateRange->setAttribute(getAttribute(config->templateBackgroundColor(), 200));
+ m_doc->addHighlightToDocument(m_wholeTemplateRange, true);
+
+ // create smart ranges for each found variable
+Index: kate/utils/katetemplatehandler.h
+===================================================================
+--- kate/utils/katetemplatehandler.h (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ kate/utils/katetemplatehandler.h (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -144,6 +144,13 @@
+ void syncMirroredRanges(KTextEditor::SmartRange* range);
+
+ /**
++ * Jumps to the final cursor position. This is either \p m_finalCursorPosition, or
++ * if that is not set, the end of \p m_templateRange.
++ */
++ void jumpToFinalCursorPosition();
++
++ private Q_SLOTS:
++ /**
+ * Cleans up the template handler and deletes it.
+ *
+ * We cannot always do that blindly in the dtor, as it would crash
+@@ -153,13 +160,6 @@
+ void cleanupAndExit();
+
+ /**
+- * Jumps to the final cursor position. This is either \p m_finalCursorPosition, or
+- * if that is not set, the end of \p m_templateRange.
+- */
+- void jumpToFinalCursorPosition();
+-
+- private Q_SLOTS:
+- /**
+ * Saves the range of the inserted template. This is required since
+ * tabs could get expanded on insert. While we are at it, we can
+ * use it to auto-indent the code after insert.
+Index: kate/spellcheck/ontheflycheck.cpp
+===================================================================
+--- kate/spellcheck/ontheflycheck.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ kate/spellcheck/ontheflycheck.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2008-2009 by Michel Ludwig (michel.ludwig at kdemail.net)
++ * Copyright (C) 2008-2010 by Michel Ludwig (michel.ludwig at kdemail.net)
+ * Copyright (C) 2009 by Joseph Wenninger (jowenn at kde.org)
+ *
+ * This library is free software; you can redistribute it and/or
+@@ -443,6 +443,10 @@
+ m_currentDecToEncOffsetList,
+ encToDecOffsetList);
+ ON_THE_FLY_DEBUG << "next spell checking" << text;
++ if(text.isEmpty()) { // passing an empty string to Sonnet can lead to a bad allocation exception
++ spellCheckDone(); // (bug 225867)
++ return;
++ }
+ if(m_speller.language() != language) {
+ m_speller.setLanguage(language);
+ }
+Index: kate/spellcheck/spellcheck.cpp
+===================================================================
+--- kate/spellcheck/spellcheck.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ kate/spellcheck/spellcheck.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2008-2009 by Michel Ludwig (michel.ludwig at kdemail.net)
++ * Copyright (C) 2008-2010 by Michel Ludwig (michel.ludwig at kdemail.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+@@ -174,7 +174,7 @@
+ const int start = (line == startLine) ? startColumn : 0;
+ const int end = (line == endLine) ? endColumn : kateTextLine->length();
+ const KTextEditor::Cursor startCursor();
+- for(int i = start; i < end; ++i) {
++ for(int i = start; i < end;) { // WARNING: 'i' has to be incremented manually!
+ int attr = kateTextLine->attribute(i);
+ const KatePrefixStore& prefixStore = highlighting->getCharacterEncodingsPrefixStore(attr);
+ QString prefixFound = prefixStore.findPrefix(kateTextLine, i);
+@@ -182,6 +182,7 @@
+ if(!document->highlight()->attributeRequiresSpellchecking(attribute)
+ && prefixFound.isEmpty()) {
+ if(i == start) {
++ ++i;
+ continue;
+ }
+ else if(inSpellCheckArea) {
+@@ -205,6 +206,9 @@
+ if(!prefixFound.isEmpty()) {
+ i += prefixFound.length();
+ }
++ else {
++ ++i;
++ }
+ }
+ }
+ if(inSpellCheckArea) {
+Index: kfile/kfilewidget.cpp
+===================================================================
+--- kfile/kfilewidget.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ kfile/kfilewidget.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -405,6 +405,7 @@
+ KDirOperator::FileActions |
+ KDirOperator::ViewActions);
+ KActionCollection *coll = d->ops->actionCollection();
++ coll->addAssociatedWidget(this);
+
+ // add nav items to the toolbar
+ //
+Index: kfile/kdirselectdialog.cpp
+===================================================================
+--- kfile/kdirselectdialog.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ kfile/kdirselectdialog.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -288,6 +288,7 @@
+ hlay->setMargin(0);
+ QVBoxLayout *mainLayout = new QVBoxLayout();
+ d->m_actions=new KActionCollection(this);
++ d->m_actions->addAssociatedWidget(this);
+ d->m_placesView = new KFilePlacesView( page );
+ d->m_placesView->setModel(new KFilePlacesModel(d->m_placesView));
+ d->m_placesView->setObjectName( QLatin1String( "speedbar" ) );
+Index: doc/common/Doxyfile.global
+===================================================================
+--- doc/common/Doxyfile.global (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ doc/common/Doxyfile.global (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -649,7 +649,6 @@
+ *unload.* \
+ */test/* \
+ */tests/* \
+- *_p.h \
+ *_p.cpp
+
+ # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+Index: doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook
+===================================================================
+--- doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -15,8 +15,8 @@
+ </affiliation>
+ </author>
+
+-<date>2001-04-25</date>
+-<releaseinfo>0.01.01</releaseinfo>
++<date>2010-01-04</date>
++<releaseinfo>1.1 (&kde; 4.4)</releaseinfo>
+
+ </refentryinfo>
+
+@@ -38,7 +38,12 @@
+
+ <group>
+ <arg choice="opt">--nosignal</arg>
+-<arg choice="opt">--incremental</arg>
++<arg choice="opt">--noincremental</arg>
++<arg choice="opt">--checkstamps</arg>
++<arg choice="opt">--nocheckfiles</arg>
++<arg choice="opt">--global</arg>
++<arg choice="opt">--menutest</arg>
++<arg choice="opt">--track <replaceable>menu-id</replaceable></arg>
+ <arg choice="opt">--help</arg>
+ <arg choice="opt">--help-qt</arg>
+ <arg choice="opt">--help-kde</arg>
+@@ -58,9 +63,8 @@
+ <command>kbuildsycoca4</command>, as part of the &kde; command line
+ tools ensures the proper operation of &kde; by reading in all the
+ <literal role="extension">.desktop</literal>, <literal
+-role="extension">.directory</literal>, <literal
+-role="extension">.kimgio</literal> and <literal
+-role="extension">.protocol</literal> files to constructs a binary
++role="extension">.xml</literal>, and <literal
++role="extension">.protocol</literal> files to construct a binary
+ database.
+ </para>
+
+@@ -70,7 +74,7 @@
+ </para>
+
+ <para>
+-This tool is part of ksycoca, which stands for &kde; System
++This tool is part of ksycoca4, which stands for &kde; System
+ Configuration Cache
+ </para>
+
+@@ -83,17 +87,52 @@
+ <varlistentry>
+ <term><option>--nosignal</option></term>
+ <listitem>
+-<para>Don't signal applications </para>
++<para>Do not signal applications to update</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+-<term><option>--incremental</option></term>
++<term><option>--noincremental</option></term>
+ <listitem>
+-<para>Incremental Update</para>
++<para>Disable incremental update, re-read everything</para>
+ </listitem>
+ </varlistentry>
+
++<varlistentry>
++<term><option>--checkstamps</option></term>
++<listitem>
++<para>Check file timestamps</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--nocheckfiles</option></term>
++<listitem>
++<para>Disable checking files (dangerous)</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--global</option></term>
++<listitem>
++<para>Create global database</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--menutest</option></term>
++<listitem>
++<para>Perform menu generation test run only</para>
++</listitem>
++</varlistentry>
++
++<varlistentry>
++<term><option>--track <replaceable>menu-id</replaceable></option></term>
++<listitem>
++<para>Track menu id for debug purposes</para>
++</listitem>
++</varlistentry>
++
+ <!-- this entire section from here to the end of the section could be an -->
+ <!-- entity.. or maybe just so irrelevant as to leave it out -->
+
+@@ -143,7 +182,7 @@
+ </varlistentry>
+
+ <varlistentry>
+-<term><option>--version</option></term>
++<term><option>-v , --version</option></term>
+ <listitem>
+ <para>
+ Show version information
+@@ -178,9 +217,9 @@
+
+ <variablelist>
+ <varlistentry>
+-<term><filename>/tmp/kde-$USER/ksycoca</filename></term>
++<term><filename>/var/tmp/kde-$USER/ksycoca4</filename></term>
+ <listitem>
+-<para>...</para>
++<para>The default directory where the cache files are stored.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+Index: doc/sonnet/index.docbook
+===================================================================
+--- doc/sonnet/index.docbook (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ doc/sonnet/index.docbook (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -1,23 +1,24 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+ <!ENTITY kappname "&sonnet;">
+ <!ENTITY % English "INCLUDE" > <!-- change language only here -->
+ <!ENTITY % addindex "IGNORE">
+ ]>
+
+-<book lang="&language;">
++<article lang="&language;">
+
+-<bookinfo>
+-<title>The &sonnet; Handbook</title>
++<articleinfo>
++<!--title>The &sonnet; Handbook</title-->
++<title>Check Spelling Dialog</title>
++
+ <authorgroup>
+ <author>&David.Sweet; &David.Sweet.mail;</author>
+
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+-
+ </authorgroup>
+
+-<date>2003-02-24</date>
+-<releaseinfo>1.00.00</releaseinfo>
++<date>2010-01-19</date>
++<releaseinfo>&kde; 4.4</releaseinfo>
+ <abstract>
+ <para>&sonnet; is the spelling checker used by &kde; applications such
+ as &kate;, &kmail;, and &kword;. It is a &GUI;
+@@ -35,35 +36,24 @@
+ <keyword>checker</keyword>
+ <keyword>KDE</keyword>
+ </keywordset>
+-</bookinfo>
++</articleinfo>
+
+-<chapter id="misspelled-word-dialog">
+-<title>Misspelled Word Dialog</title>
+-
+-<!-- This one might need a paragraph of its own) -->
+-<para>(If you do not have <application>Ispell</application> installed
+-you can obtain it from the <ulink
+-url="http://fmg-www.cs.ucla.edu/geoff/ispell.html">International
+-ISpell home page</ulink>. ASpell is available from the <ulink
+-url="http://aspell.sourceforge.net/">ASpell home page</ulink>.)
+-</para>
+-
+-<sect1 id="general-use">
+-<title>General Use</title>
+-
+ <para><anchor id="spelldlg"/>
+ The top line in the dialog displays a possibly misspelled word which was found in your
+ document. &sonnet; attempts to find an appropriate replacement word. One or
+-several may be found. The best guess is shown to the right of <guilabel>Replacement:</guilabel>.
+-To accept this replacement, click on <guibutton>Replace</guibutton>. You may also select a word
+-from the list of <guilabel>Suggestions</guilabel> and then click <guibutton>Replace</guibutton> to replace the
+-misspelled word with the selected word.</para>
++several may be found.</para>
++<para>The best guess is shown to the right of <guilabel>Replace with</guilabel>.
++To accept this replacement, click on <guibutton>Replace</guibutton>.</para>
++<para>You may also select a word
++from the list of suggestions and then click <guibutton>Replace</guibutton>
++to replace the misspelled word with the selected word. To add more suggestions
++from the dictionary to the suggestions list click the <guibutton>Suggest</guibutton>
++button.</para>
+
+ <para>To keep your original spelling, click on <guilabel>Ignore</guilabel>.</para>
+
+ <para>To stop the spellchecking -- keeping the changes you've already made -- click
+-on <guibutton>Stop</guibutton>.</para>
+-<!-- The button is actually called "&Finished" -->
++on <guibutton>Finished</guibutton>.</para>
+
+ <para>To stop the spellchecking and cancel the changes you've already made, click on
+ <guibutton>Cancel</guibutton>.</para>
+@@ -76,90 +66,17 @@
+ <para>The <guibutton>Ignore All</guibutton> button ignores this and all future occurrences of the
+ misspelled word.</para>
+
+-<para>Clicking on <guibutton>Add</guibutton> will add the misspelled word to your personal dictionary
++<para>Clicking on <guibutton>Add to Dictionary</guibutton> will add the misspelled word to your personal dictionary
+ (this is distinct from the original system dictionary, so the additions you make
+ will not be seen by other users).</para>
+-</sect1>
+-</chapter>
+
+-<chapter id="configuration-dialog">
+-<title>Configuration Dialog </title>
+-<anchor id="configuration"/>
++<para>The drop down box <guilabel>Language</guilabel> at the bottom of this dialog
++allows you to switch to another dictionary temporarily.</para>
+
+-<sect1 id="dictionaries">
+-<title>Dictionaries</title>
++<para>The default configuration options are available in the &systemsettings; module
++<ulink url="help:kcontrol/spellchecking">Spell Checker</ulink>.</para>
+
+-<para>You can choose the dictionary to use for spellchecking from the list of
+-installed dictionaries.</para>
+-</sect1>
+-
+-<sect1 id="encodings">
+-<title>Encodings</title>
+-
+-<para>The most commonly used character encodings are:
+-<variablelist>
+-<varlistentry>
+-<term>US-ASCII</term>
+-<listitem>
+-<para>This is the character set used for English text.</para>
+-</listitem>
+-</varlistentry>
+-<varlistentry>
+-<term>ISO-8859-1</term>
+-<listitem>
+-<para>This is used for Western European languages.</para>
+-</listitem>
+-</varlistentry>
+-<varlistentry>
+-<term>UTF-8</term>
+-<listitem>
+-<para>This is a Unicode encoding that can be used for almost any language, if
+-your system has the necessary fonts.</para>
+-</listitem>
+-</varlistentry>
+-</variablelist>
+-</para>
+-
+-<para>You should select the one that matches the character set you are using.
+-In some cases, dictionaries will support more than one encoding. A
+-dictionary might, for example, accept accented characters when <guilabel>ISO-8859-1</guilabel> is
+-selected, but accept email-style character combinations (like <literal>'a</literal> for an
+-accented <literal>a</literal>) when <guilabel>US-ASCII</guilabel> is selected. Please see
+-your dictionary's distribution for more information.</para>
+-</sect1>
+-
+-<sect1 id="spell-checking-client">
+-<title>Spell-checking client</title>
+-
+-<para>You may choose to use <application>Ispell</application> or <application>Aspell</application> as the spell-checking
+-backend for &sonnet;. <application>Ispell</application> is more widely available and may
+-have better international support, but <application>Aspell</application> is gaining
+-popularity as it claims to give better suggestions for word replacements.</para>
+-</sect1>
+-
+-<sect1 id="other">
+-<title>Other</title>
+-
+-<para>It is recommend that you do not change the first two options unless you have
+-read the International <application>ISpell</application> man page.</para>
+-</sect1>
+-</chapter>
+-
+-<chapter id="contact-information">
+-<title>Contact Information</title>
+-
+-<para>For more information about &sonnet;, visit the <ulink url="http://www.chaos.umd.edu/~dsweet/KDE/Sonnet">&sonnet;
+-Home Page</ulink>. In particular, you will find information about programming the &sonnet; C++ class.</para>
+-
+-<para>You may email the author/maintainer with questions and/or comments at
+-&David.Sweet.mail;.</para>
+-
+-<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+-&underFDL;
+-
+-</chapter>
+-&documentation.index;
+-</book>
++</article>
+ <!--
+ Local Variables:
+ mode: sgml
+Index: nepomuk/query/queryserviceclient.cpp
+===================================================================
+--- nepomuk/query/queryserviceclient.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089010)
++++ nepomuk/query/queryserviceclient.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089010)
+@@ -149,6 +149,7 @@
+ Nepomuk::Query::QueryServiceClient::~QueryServiceClient()
+ {
+ close();
++ delete d->queryServiceInterface;
+ delete d;
+ }
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.157.2.38&r2=1.157.2.39&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-branch.diff?r1=1.1.2.2&r2=1.1.2.3&f=u
More information about the pld-cvs-commit
mailing list