rpms/kdelibs4/F-7 kdelibs-4.0.0-k3spell-hunspell.patch, NONE, 1.1 kdelibs-4.0.0-openssl.patch, NONE, 1.1 kdelibs-4.0.1-autostart.patch, NONE, 1.1 kdelibs-4.0.1-kde#771201-khtml.patch, NONE, 1.1 kdelibs-4.0.1-objectembed-handling.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdelibs4.spec, 1.7, 1.8 sources, 1.6, 1.7 kdelibs-3.97.0-flac113.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Feb 7 03:52:46 UTC 2008
- Previous message (by thread): rpms/qimageblitz/F-8 qimageblitz-0.0.4-noexecstack.patch, NONE, 1.1 qimageblitz.spec, 1.2, 1.3 11_.gnu.note.diff, 1.1, NONE
- Next message (by thread): rpms/kdelibs4/F-8 kdelibs-4.0.0-k3spell-hunspell.patch, NONE, 1.1 kdelibs-4.0.0-openssl.patch, NONE, 1.1 kdelibs-4.0.1-autostart.patch, NONE, 1.1 kdelibs-4.0.1-kde#771201-khtml.patch, NONE, 1.1 kdelibs-4.0.1-objectembed-handling.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdelibs4.spec, 1.9, 1.10 sources, 1.6, 1.7 kdelibs-3.97.0-flac113.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17324/F-7
Modified Files:
.cvsignore kdelibs4.spec sources
Added Files:
kdelibs-4.0.0-k3spell-hunspell.patch
kdelibs-4.0.0-openssl.patch kdelibs-4.0.1-autostart.patch
kdelibs-4.0.1-kde#771201-khtml.patch
kdelibs-4.0.1-objectembed-handling.patch
Removed Files:
kdelibs-3.97.0-flac113.patch
Log Message:
sync w/devel for kde-4.0.1
kdelibs-4.0.0-k3spell-hunspell.patch:
--- NEW FILE kdelibs-4.0.0-k3spell-hunspell.patch ---
diff -ur kdelibs-4.0.0/kde3support/kdeui/k3sconfig.cpp kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3sconfig.cpp
--- kdelibs-4.0.0/kde3support/kdeui/k3sconfig.cpp 2008-01-05 00:59:41.000000000 +0100
+++ kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3sconfig.cpp 2008-01-19 16:47:04.000000000 +0100
@@ -1,6 +1,7 @@
/* This file is part of the KDE libraries
Copyright (C) 1997 David Sweet <dsweet at kde.org>
Copyright (C) 2000-2001 Wolfram Diestel <wolfram at steloj.de>
+ Copyright (C) 2007-2008 Kevin Kofler <Kevin at tigcc.ticalc.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -167,6 +168,7 @@
clientcombo->addItem( i18nc("@item:inlistbox Spell checker", "<application>Aspell</application>") );
clientcombo->addItem( i18nc("@item:inlistbox Spell checker", "<application>Hspell</application>") );
clientcombo->addItem( i18nc("@item:inlistbox Spell checker", "<application>Zemberek</application>") );
+ clientcombo->addItem( i18nc("@item:inlistbox Spell checker", "<application>Hunspell</application>") );
connect( clientcombo, SIGNAL (activated(int)), this,
SLOT (sChangeClient(int)) );
glay->addWidget( clientcombo, 5, 1, 1, 2 );
@@ -261,8 +263,10 @@
dictcombo->addItem( i18nc("@item Spelling dictionary", "Turkish") );
sChangeEncoding( KS_E_UTF8 );
}
- else
+ else if ( iclient == KS_CLIENT_ASPELL )
getAvailDictsAspell();
+ else
+ getAvailDictsHunspell();
}
emit configChanged();
}
@@ -420,8 +424,10 @@
langfnames.append("");
dictcombo->addItem( i18nc("@item Spelling dictionary", "Turkish") );
}
- else
+ else if ( iclient == KS_CLIENT_ASPELL )
getAvailDictsAspell();
+ else
+ getAvailDictsHunspell();
// select the used dictionary in the list
int whichelement=-1;
@@ -606,6 +612,63 @@
}
}
+void K3SpellConfig::getAvailDictsHunspell () {
+
+ langfnames.clear();
+ dictcombo->clear();
+ langfnames.append(""); // Default
+ dictcombo->addItem( i18nc("@item Spelling dictionary",
+ "<application>Hunspell</application> Default") );
+
+ // dictionary path
+ QFileInfo dir ("/usr/share/myspell");
+ if (!dir.exists() || !dir.isDir())
+ dir.setFile ("/usr/share/hunspell");
+ if (!dir.exists() || !dir.isDir()) return;
+
+ kDebug(750) << "K3SpellConfig::getAvailDictsHunspell "
+ << dir.filePath() << " " << dir.path() << endl;
+
+ const QDir thedir (dir.filePath(),"*.dic");
+ const QStringList entryList = thedir.entryList();
+
+ kDebug(750) << "K3SpellConfig" << thedir.path() << "\n";
+ kDebug(750) << "entryList().count()="
+ << entryList.count() << endl;
+
+ QStringList::const_iterator entryListItr = entryList.constBegin();
+ const QStringList::const_iterator entryListEnd = entryList.constEnd();
+
+ for ( ; entryListItr != entryListEnd; ++entryListItr)
+ {
+ QString fname, lname, hname;
+ fname = *entryListItr;
+
+ // remove .dic
+ if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
+
+ if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
+ { // This one is the KDE default language
+ // so place it first in the lists (overwrite "Default")
+
+ langfnames.removeFirst();
+ langfnames.prepend ( fname );
+
+ hname=i18nc("@item Spelling dictionary: %1 dictionary name, %2 file name",
+ "Default - %1 [%2]", hname, fname);
+
+ dictcombo->setItemText (0,hname);
+ }
+ else
+ {
+ langfnames.append (fname);
+ hname=hname+" ["+fname+']';
+
+ dictcombo->addItem (hname);
+ }
+ }
+}
+
void
K3SpellConfig::fillDicts( QComboBox* box, QStringList* dictionaries )
{
@@ -685,8 +748,7 @@
box->addItem( i18nc("@item Spelling dictionary", "Turkish") );
langfnames.append("");
sChangeEncoding( KS_E_UTF8 );
- }
- else {
+ } else if ( iclient == KS_CLIENT_ASPELL ) {
box->clear();
langfnames.append(""); // Default
box->addItem (i18nc("@item Spelling dictionary",
@@ -766,6 +828,59 @@
}
}
}
+ } else {
+ box->clear();
+ langfnames.append(""); // Default
+ box->addItem( i18nc("@item Spelling dictionary",
+ "<application>Hunspell</application> Default") );
+
+ // dictionary path
+ QFileInfo dir ("/usr/share/myspell");
+ if (!dir.exists() || !dir.isDir())
+ dir.setFile ("/usr/share/hunspell");
+ if (!dir.exists() || !dir.isDir()) return;
+
+ kDebug(750) << "K3SpellConfig::getAvailDictsHunspell "
+ << dir.filePath() << " " << dir.path() << endl;
+
+ const QDir thedir (dir.filePath(),"*.dic");
+ const QStringList entryList = thedir.entryList();
+
+ kDebug(750) << "K3SpellConfig" << thedir.path() << "\n";
+ kDebug(750) << "entryList().count()="
+ << entryList.count() << endl;
+
+ QStringList::const_iterator entryListItr = entryList.constBegin();
+ const QStringList::const_iterator entryListEnd = entryList.constEnd();
+
+ for ( ; entryListItr != entryListEnd; ++entryListItr)
+ {
+ QString fname, lname, hname;
+ fname = *entryListItr;
+
+ // remove .dic
+ if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
+
+ if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
+ { // This one is the KDE default language
+ // so place it first in the lists (overwrite "Default")
+
+ langfnames.erase ( langfnames.begin() );
+ langfnames.prepend ( fname );
+
+ hname=i18nc("@item Spelling dictionary: %1 dictionary name, %2 file name",
+ "Default - %1 [%2]", hname, fname);
+
+ box->setItemText (0,hname);
+ }
+ else
+ {
+ langfnames.append (fname);
+ hname=hname+" ["+fname+']';
+
+ box->addItem (hname);
+ }
+ }
}
int whichelement = langfnames.indexOf(qsdict);
if ( whichelement >= 0 ) {
diff -ur kdelibs-4.0.0/kde3support/kdeui/k3sconfig.h kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3sconfig.h
--- kdelibs-4.0.0/kde3support/kdeui/k3sconfig.h 2008-01-05 00:59:41.000000000 +0100
+++ kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3sconfig.h 2008-01-19 16:25:43.000000000 +0100
@@ -1,5 +1,6 @@
/* This file is part of the KDE libraries
Copyright (C) 1997 David Sweet <dsweet at kde.org>
+ Copyright (C) 2007-2008 Kevin Kofler <Kevin at tigcc.ticalc.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -60,7 +61,8 @@
KS_CLIENT_ISPELL=0,
KS_CLIENT_ASPELL=1,
KS_CLIENT_HSPELL=2,
- KS_CLIENT_ZEMBEREK=3
+ KS_CLIENT_ZEMBEREK=3,
+ KS_CLIENT_HUNSPELL=4
};
/**
@@ -287,6 +289,7 @@
K3SpellConfigPrivate *const d;
void getAvailDictsIspell();
void getAvailDictsAspell();
+ void getAvailDictsHunspell();
};
#endif // KDELIBS_KSCONFIG_H
diff -ur kdelibs-4.0.0/kde3support/kdeui/k3spell.cpp kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3spell.cpp
--- kdelibs-4.0.0/kde3support/kdeui/k3spell.cpp 2008-01-05 00:59:41.000000000 +0100
+++ kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3spell.cpp 2008-01-19 16:44:00.000000000 +0100
@@ -2,6 +2,7 @@
Copyright (C) 1997 David Sweet <dsweet at kde.org>
Copyright (C) 2000-2001 Wolfram Diestel <wolfram at steloj.de>
Copyright (C) 2003 Zack Rusin <zack at kde.org>
+ Copyright (C) 2007-2008 Kevin Kofler <Kevin at tigcc.ticalc.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -218,9 +219,14 @@
*proc << "zpspell";
kDebug(750) << "Using zemberek(zpspell)";
break;
+ case KS_CLIENT_HUNSPELL:
+ *proc << "hunspell";
+ kDebug(750) << "Using hunspell";
+ break;
}
- if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL )
+ // Hunspell doesn't need all of these options, but it'll ignore those it doesn't understand.
+ if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
{
*proc << "-a" << "-S";
@@ -238,8 +244,8 @@
*proc << "-t";
break;
case Nroff:
- //only ispell supports
- if ( ksconfig->client() == KS_CLIENT_ISPELL )
+ //only ispell and hunspell support
+ if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
*proc << "-n";
break;
case Text:
@@ -276,7 +282,60 @@
// option, so k3spell tries again without it. That's why as 'ps -ax'
// shows "ispell -a -S ..." withou the "-Tlatin2" option.
- if ( trystart<1 ) {
+ if ( ksconfig->client() == KS_CLIENT_HUNSPELL && trystart<1 ) {
+ // Note: This sets I/O encoding. Hunspell correctly handles dictionary encoding != I/O encoding.
+ // It will be faster if the I/O encoding matches the dictionary encoding, but using UTF-8 is always safe.
+ switch ( ksconfig->encoding() )
+ {
+ case KS_E_LATIN1:
+ *proc << "-i" << "ISO-8859-1";
+ break;
+ case KS_E_LATIN2:
+ *proc << "-i" << "ISO-8859-2";
+ break;
+ case KS_E_LATIN3:
+ *proc << "-i" << "ISO-8859-3";
+ break;
+ case KS_E_LATIN4:
+ *proc << "-i" << "ISO-8859-4";
+ break;
+ case KS_E_LATIN5:
+ *proc << "-i" << "ISO-8859-5";
+ break;
+ case KS_E_LATIN7:
+ *proc << "-i" << "ISO-8859-7";
+ break;
+ case KS_E_LATIN8:
+ *proc << "-i" << "ISO-8859-8";
+ break;
+ case KS_E_LATIN9:
+ *proc << "-i" << "ISO-8859-9";
+ break;
+ case KS_E_LATIN13:
+ *proc << "-i" << "ISO-8859-13";
+ break;
+ case KS_E_LATIN15:
+ *proc << "-i" << "ISO-8859-15";
+ break;
+ case KS_E_UTF8:
+ *proc << "-i" << "UTF-8";
+ break;
+ case KS_E_KOI8R:
+ *proc << "-i" << "KOI8-R";
+ break;
+ case KS_E_KOI8U:
+ *proc << "-i" << "KOI8-U";
+ break;
+ case KS_E_CP1251:
+ *proc << "-i" << "CP1251";
+ break;
+ case KS_E_CP1255:
+ *proc << "-i" << "CP1255";
+ break;
+ default:
+ break;
+ }
+ } else if ( trystart<1 ) {
switch ( ksconfig->encoding() )
{
case KS_E_LATIN1:
kdelibs-4.0.0-openssl.patch:
--- NEW FILE kdelibs-4.0.0-openssl.patch ---
diff -up kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl kdelibs-4.0.0/kio/kssl/kopenssl.cpp
--- kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl 2008-01-04 18:00:20.000000000 -0600
+++ kdelibs-4.0.0/kio/kssl/kopenssl.cpp 2008-01-23 06:58:32.000000000 -0600
@@ -357,6 +357,10 @@ KOpenSSLProxy::KOpenSSLProxy()
#ifdef SHLIB_VERSION_NUMBER
<< "libssl.so." SHLIB_VERSION_NUMBER
#endif
+ << "libssl.so.0.9.8g"
+ << "libssl.so.7"
+ << "libssl.so.0.9.8b"
+ << "libssl.so.6"
<< "libssl.so"
<< "libssl.so.0"
#endif
@@ -374,6 +378,10 @@ KOpenSSLProxy::KOpenSSLProxy()
#ifdef SHLIB_VERSION_NUMBER
<< "libcrypto.so." SHLIB_VERSION_NUMBER
#endif
+ << "libcrypto.so.0.9.8g"
+ << "libcrypto.so.7"
+ << "libcrypto.so.0.9.8b"
+ << "libcrypto.so.6"
<< "libcrypto.so"
<< "libcrypto.so.0"
#endif
kdelibs-4.0.1-autostart.patch:
--- NEW FILE kdelibs-4.0.1-autostart.patch ---
--- kdelibs-4.0.1/kinit/autostart.cpp.sav 2007-10-30 11:13:33.000000000 +0100
+++ kdelibs-4.0.1/kinit/autostart.cpp 2008-02-04 14:08:27.000000000 +0100
@@ -38,7 +38,9 @@ AutoStart::AutoStart()
: m_phase(-1), m_phasedone(false)
{
m_startList = new AutoStartList;
- KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart");
+ KGlobal::dirs()->addResourceType("xdgconf-autostart", NULL, "autostart/"); // xdg ones
+ KGlobal::dirs()->addResourceType("autostart", "xdgconf-autostart", "/"); // merge them
+ KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart"); // KDE ones are higher priority
}
AutoStart::~AutoStart()
--- kdelibs-4.0.1/kdecore/kernel/kautostart.cpp.sav 2007-11-13 11:43:41.000000000 +0100
+++ kdelibs-4.0.1/kdecore/kernel/kautostart.cpp 2008-02-04 14:08:14.000000000 +0100
@@ -51,7 +51,9 @@ KAutostart::KAutostart(const QString& en
: QObject(parent),
d(new Private)
{
- KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart");
+ KGlobal::dirs()->addResourceType("xdgconf-autostart", NULL, "autostart/"); // xdg ones
+ KGlobal::dirs()->addResourceType("autostart", "xdgconf-autostart", "/"); // merge them
+ KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart"); // KDE ones are higher priority
if (entryName.isEmpty())
{
// XXX sure that the mainComponent is available at this point?
kdelibs-4.0.1-kde#771201-khtml.patch:
--- NEW FILE kdelibs-4.0.1-kde#771201-khtml.patch ---
Index: khtml/khtmlview.cpp
===================================================================
--- khtml/khtmlview.cpp (Revision 771203)
+++ khtml/khtmlview.cpp (Revision 771204)
@@ -485,6 +485,13 @@
// not permitting us to forward it up the part hiearchy in our dragEnterEvent,
// etc. handlers
return QWidget::event(e);
+ case QEvent::StyleChange:
+ case QEvent::LayoutRequest: {
+ bool ret = QScrollArea::event(e);
+ if (d->staticWidget && widget()->pos() != QPoint(0,0))
+ widget()->move(0,0);
+ return ret;
+ }
default:
return QScrollArea::event(e);
}
@@ -2108,6 +2115,12 @@
if (o == view) {
if (widgetEvent(e))
return true;
+ else if ( e->type() == QEvent::Resize ) {
+ bool ret = QScrollArea::eventFilter(o, e);
+ if (d->staticWidget && view->pos() != QPoint(0,0))
+ view->move(0,0);
+ return ret;
+ }
} else if (o->isWidgetType()) {
QWidget *v = static_cast<QWidget *>(o);
QWidget *c = v;
kdelibs-4.0.1-objectembed-handling.patch:
--- NEW FILE kdelibs-4.0.1-objectembed-handling.patch ---
Index: khtml/html/html_objectimpl.cpp
===================================================================
--- khtml/html/html_objectimpl.cpp (Revision 769141)
+++ khtml/html/html_objectimpl.cpp (Revision 769142)
@@ -340,6 +340,13 @@
// if the URL isn't there
QString effectiveServiceType = serviceType;
+ // We need to wait until everything has parsed, since we need the <param>s,
+ // and the embedded <embed>
+ if (!closed()) {
+ setNeedComputeContent();
+ return;
+ }
+
// Collect information from <param> children for ...
// It also sometimes supplements or replaces some of the element's attributes
for (NodeImpl* child = firstChild(); child; child = child->nextSibling()) {
@@ -485,13 +492,6 @@
if (m_renderAlternative)
return;
- // Finally, we want to try requesting the KPart. However, params matter here,
- // so we want to defer until closed.
- if (!closed()) {
- setNeedComputeContent();
- return;
- }
-
KHTMLPart* part = getDocument()->part();
clearChildWidget();
@@ -719,6 +719,12 @@
HTMLObjectBaseElementImpl::attach();
}
+void HTMLEmbedElementImpl::computeContent()
+{
+ if (parentNode()->id() != ID_OBJECT)
+ HTMLObjectBaseElementImpl::computeContent();
+}
+
// -------------------------------------------------------------------------
HTMLObjectElementImpl::HTMLObjectElementImpl(DocumentImpl *doc)
Index: khtml/html/html_objectimpl.h
===================================================================
--- khtml/html/html_objectimpl.h (Revision 769141)
+++ khtml/html/html_objectimpl.h (Revision 769142)
@@ -41,7 +41,7 @@
class HTMLEmbedElementImpl;
// Base class of all objects that are displayed as KParts:
-// frames, objects, applets, etc.
+// frames, objects, applets, etc.
class HTMLPartContainerElementImpl : public QObject, public HTMLElementImpl
{
public:
@@ -54,22 +54,22 @@
virtual void recalcStyle(StyleChange ch);
virtual void close();
- // These methods will be called to notify the element of
- // any progress in loading of the document: setWidgetNotify if the
- // KPart was created, and partLoadingErrorNotify when
+ // These methods will be called to notify the element of
+ // any progress in loading of the document: setWidgetNotify if the
+ // KPart was created, and partLoadingErrorNotify when
// there was a problem with creating the part or loading the data
// (hence setWidgetNotify may be followed by partLoadingErrorNotify).
- // This class take care of all the memory management, and during
+ // This class take care of all the memory management, and during
// the setWidgetNotify call, both old (if any) and new widget are alive
// Note: setWidgetNotify may be called with 0...
- virtual void setWidgetNotify(QWidget *widget) = 0;
+ virtual void setWidgetNotify(QWidget *widget) = 0;
virtual void partLoadingErrorNotify();
-
- // This is called when a mimetype is discovered, and should return true
+
+ // This is called when a mimetype is discovered, and should return true
// if KHTMLPart should not make a kpart for it, but rather let it be handled directly.
virtual bool mimetypeHandledInternally(const QString& mime);
- // IMPORTANT: you should call this when requesting a URL, to make sure
+ // IMPORTANT: you should call this when requesting a URL, to make sure
// that we don't get stale references to iframes or such.
void clearChildWidget();
QWidget* childWidget() const { return m_childWidget; }
@@ -80,8 +80,8 @@
void setWidget(QWidget* widget);
private:
virtual void computeContent() = 0;
- bool m_needToComputeContent; // This flag is set to true when
- // we may have to load a new KPart, due to
+ bool m_needToComputeContent; // This flag is set to true when
+ // we may have to load a new KPart, due to
// source changing, etc.
QPointer<QWidget> m_childWidget; // may be deleted by global child widget cleanup on us..
};
@@ -102,7 +102,7 @@
QString classId;
QString serviceType;
- bool m_rerender; // This is set to true if a reattach is pending,
+ bool m_rerender; // This is set to true if a reattach is pending,
// due to a change in how we need to display this...
bool m_renderAlternative;
@@ -119,7 +119,7 @@
virtual void partLoadingErrorNotify();
virtual bool mimetypeHandledInternally(const QString& mime);
- // This method figures out what to render -- perhaps KPart, perhaps an image, perhaps
+ // This method figures out what to render -- perhaps KPart, perhaps an image, perhaps
// alternative content, and forces a reattach if need be.
virtual void computeContent();
@@ -164,6 +164,7 @@
virtual void parseAttribute(AttributeImpl *attr);
virtual void attach();
+ virtual void computeContent();
virtual HTMLEmbedElementImpl* relevantEmbed();
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 10 Jan 2008 05:40:20 -0000 1.6
+++ .cvsignore 7 Feb 2008 03:52:08 -0000 1.7
@@ -1 +1,2 @@
kdelibs-4.0.0.tar.bz2
+kdelibs-4.0.1.tar.bz2
Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/kdelibs4.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdelibs4.spec 10 Jan 2008 05:40:20 -0000 1.7
+++ kdelibs4.spec 7 Feb 2008 03:52:08 -0000 1.8
@@ -3,8 +3,8 @@
# 1. package some noarch bits separately: apidocs.
Summary: K Desktop Environment 4 - Libraries
-Version: 4.0.0
-Release: 1%{?dist}
+Version: 4.0.1
+Release: 4%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -28,9 +28,9 @@
BuildRequires: kde-filesystem >= 4
Requires: dbus-x11
Requires: hicolor-icon-theme
-# not *strictly* required here, but how better to pull kdebase-runtime in? -- Rex
+# kdebase-runtime not *strictly* required here, but how better to pull
+# it in? comps only?
#Requires: kdebase-runtime
-#Requires: oxygen-icon-theme
Requires: kde-filesystem >= 4
Requires: kde-settings
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -38,6 +38,9 @@
%if "%{name}" == "kdelibs"
Requires: kdelibs-common
%endif
+%if 0%{?fedora} >= 9
+Requires: hunspell
+%endif
Source1: kde4.sh
Source2: kde4.csh
@@ -48,12 +51,20 @@
Patch1: kdelibs-3.93.0-kde149703.diff
# fix kde#149705
Patch2: kdelibs-3.95.0-kde149705.patch
-# FLAC 1.1.3+ support for FindFlac.cmake (patch by Alex Merry)
-# http://lists.kde.org/?l=kde-multimedia&m=119806833708186&w=2
-Patch3: kdelibs-3.97.0-flac113.patch
# Force Phonon to use the ALSA default device by default
# This should make it work better with PulseAudio.
Patch4: kdelibs-3.97.0-alsa-default-device.patch
+# Hunspell support for K3Spell
+# http://fedoraproject.org/wiki/Releases/FeatureDictionary
+# http://bugs.kde.org/show_bug.cgi?id=154561
+Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
+# openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
+Patch6: kdelibs-4.0.0-openssl.patch
+
+# upstream patches
+Patch100: kdelibs-4.0.1-objectembed-handling.patch
+Patch101: kdelibs-4.0.1-autostart.patch
+Patch102: kdelibs-4.0.1-kde#771201-khtml.patch
BuildRequires: qt4-devel >= 4.3.0
Requires: qt4 >= %{_qt4_version}
@@ -131,9 +142,18 @@
%patch0 -p1 -b .parallel_devel
%patch1 -p1 -b .kde149703
%patch2 -p1 -b .kde149705
-%patch3 -p1 -b .flac113
%patch4 -p1 -b .alsa-default
+%if 0%{?fedora} >= 9
+%patch5 -p1 -b .k3spell-hunspell
+%else
+# shouldn't be needed f9+, we'll see -- Rex
+%patch6 -p1 -b .openssl
+%endif
+# upstream patches
+%patch100 -p0 -b .objectembed-handling
+%patch101 -p1 -b .xdg-autostart
+%patch102 -p0 -b .kde#771201-khtml
%build
@@ -261,6 +281,29 @@
%changelog
+* Wed Feb 06 2008 Than Ngo <than at redhat.com> 4.0.1-4
+- upstream patch to make sure that static widget is always at position 0,0
+
+* Fri Feb 01 2008 Than Ngo <than at redhat.com> 4.0.1-3
+- upstream patch to fix a regression in <object><embed> handling
+- autostart upstream patch
+
+* Fri Feb 01 2008 Than Ngo <than at redhat.com> 4.0.1-2
+- autostart from XDG_CONFIG_DIRS
+
+* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-1
+- 4.0.1
+
+* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-4
+- omit openssl patch (f9+ #429846)
+- respin (qt4)
+
+* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
+- openssl patch
+
+* Sat Jan 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-2
+- patch K3Spell for hunspell support on F9+ (FeatureDictionary, kde#154561)
+
* Mon Jan 07 2008 Than Ngo <than at redhat.com> 4.0.0-1
- 4.0.0
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 10 Jan 2008 05:40:20 -0000 1.6
+++ sources 7 Feb 2008 03:52:08 -0000 1.7
@@ -1 +1 @@
-79d0f83ca81fc4a135663943340c0b8f kdelibs-4.0.0.tar.bz2
+4a756aa3cc8926efba2ee0b8a5e078dd kdelibs-4.0.1.tar.bz2
--- kdelibs-3.97.0-flac113.patch DELETED ---
- Previous message (by thread): rpms/qimageblitz/F-8 qimageblitz-0.0.4-noexecstack.patch, NONE, 1.1 qimageblitz.spec, 1.2, 1.3 11_.gnu.note.diff, 1.1, NONE
- Next message (by thread): rpms/kdelibs4/F-8 kdelibs-4.0.0-k3spell-hunspell.patch, NONE, 1.1 kdelibs-4.0.0-openssl.patch, NONE, 1.1 kdelibs-4.0.1-autostart.patch, NONE, 1.1 kdelibs-4.0.1-kde#771201-khtml.patch, NONE, 1.1 kdelibs-4.0.1-objectembed-handling.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdelibs4.spec, 1.9, 1.10 sources, 1.6, 1.7 kdelibs-3.97.0-flac113.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list