rawhide sync
This commit is contained in:
parent
1723e220c6
commit
b89291590d
@ -1,9 +1,12 @@
|
||||
--- kdelibs-3.5.7/kio/kssl/kopenssl.cc.openssl 2006-07-22 03:16:39.000000000 -0500
|
||||
+++ kdelibs-3.5.7/kio/kssl/kopenssl.cc 2007-06-20 08:58:25.000000000 -0500
|
||||
@@ -329,6 +329,15 @@ KConfig *cfg;
|
||||
diff -up kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.8/kio/kssl/kopenssl.cc
|
||||
--- kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl 2006-07-22 03:16:39.000000000 -0500
|
||||
+++ kdelibs-3.5.8/kio/kssl/kopenssl.cc 2007-12-04 08:13:44.000000000 -0600
|
||||
@@ -329,6 +329,17 @@ KConfig *cfg;
|
||||
#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.0.9.8a"
|
||||
+ << "libssl.so.6"
|
||||
@ -16,10 +19,12 @@
|
||||
<< "libssl.so"
|
||||
<< "libssl.so.0"
|
||||
#endif
|
||||
@@ -346,6 +355,15 @@ KConfig *cfg;
|
||||
@@ -346,6 +357,17 @@ KConfig *cfg;
|
||||
#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.0.9.8a"
|
||||
+ << "libcrypto.so.6"
|
||||
|
303
kdelibs-3.5.8-kspell-hunspell.patch
Normal file
303
kdelibs-3.5.8-kspell-hunspell.patch
Normal file
@ -0,0 +1,303 @@
|
||||
diff -ur kdelibs-3.5.8/kdeui/ksconfig.cpp kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.cpp
|
||||
--- kdelibs-3.5.8/kdeui/ksconfig.cpp 2007-10-08 11:52:12.000000000 +0200
|
||||
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.cpp 2007-12-22 01:45:47.000000000 +0100
|
||||
@@ -1,6 +1,7 @@
|
||||
/* This file is part of the KDE libraries
|
||||
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||
Copyright (C) 2000-2001 Wolfram Diestel <wolfram@steloj.de>
|
||||
+ Copyright (C) 2007 Kevin Kofler <Kevin@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
|
||||
@@ -149,6 +150,7 @@
|
||||
clientcombo->insertItem( i18n("Aspell") );
|
||||
clientcombo->insertItem( i18n("Hspell") );
|
||||
clientcombo->insertItem( i18n("Zemberek") );
|
||||
+ clientcombo->insertItem( i18n("Hunspell") );
|
||||
connect( clientcombo, SIGNAL (activated(int)), this,
|
||||
SLOT (sChangeClient(int)) );
|
||||
glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 );
|
||||
@@ -240,8 +242,10 @@
|
||||
dictcombo->insertItem( i18n("Turkish") );
|
||||
sChangeEncoding( KS_E_UTF8 );
|
||||
}
|
||||
- else
|
||||
+ else if ( iclient == KS_CLIENT_ASPELL )
|
||||
getAvailDictsAspell();
|
||||
+ else
|
||||
+ getAvailDictsHunspell();
|
||||
}
|
||||
emit configChanged();
|
||||
}
|
||||
@@ -399,8 +403,10 @@
|
||||
langfnames.append("");
|
||||
dictcombo->insertItem( i18n("Turkish") );
|
||||
}
|
||||
- else
|
||||
+ else if ( iclient == KS_CLIENT_ASPELL )
|
||||
getAvailDictsAspell();
|
||||
+ else
|
||||
+ getAvailDictsHunspell();
|
||||
|
||||
// select the used dictionary in the list
|
||||
int whichelement=-1;
|
||||
@@ -583,6 +589,62 @@
|
||||
}
|
||||
}
|
||||
|
||||
+void KSpellConfig::getAvailDictsHunspell () {
|
||||
+
|
||||
+ langfnames.clear();
|
||||
+ dictcombo->clear();
|
||||
+ langfnames.append(""); // Default
|
||||
+ dictcombo->insertItem( i18n("Hunspell Default") );
|
||||
+
|
||||
+ // dictionary path
|
||||
+ QFileInfo dir ("/usr/share/myspell");
|
||||
+ if (!dir.exists() || !dir.isDir())
|
||||
+ dir.setFile ("/usr/share/hunspell");
|
||||
+ if (!dir.exists() || !dir.isDir()) return;
|
||||
+
|
||||
+ kdDebug(750) << "KSpellConfig::getAvailDictsHunspell "
|
||||
+ << dir.filePath() << " " << dir.dirPath() << endl;
|
||||
+
|
||||
+ const QDir thedir (dir.filePath(),"*.dic");
|
||||
+ const QStringList entryList = thedir.entryList();
|
||||
+
|
||||
+ kdDebug(750) << "KSpellConfig" << thedir.path() << "\n" << endl;
|
||||
+ kdDebug(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.remove ( langfnames.begin() );
|
||||
+ langfnames.prepend ( fname );
|
||||
+
|
||||
+ hname=i18n("default spelling dictionary"
|
||||
+ ,"Default - %1 [%2]").arg(hname).arg(fname);
|
||||
+
|
||||
+ dictcombo->changeItem (hname,0);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ langfnames.append (fname);
|
||||
+ hname=hname+" ["+fname+"]";
|
||||
+
|
||||
+ dictcombo->insertItem (hname);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void
|
||||
KSpellConfig::fillDicts( QComboBox* box, QStringList* dictionaries )
|
||||
{
|
||||
@@ -661,8 +723,7 @@
|
||||
box->insertItem( i18n("Turkish") );
|
||||
langfnames.append("");
|
||||
sChangeEncoding( KS_E_UTF8 );
|
||||
- }
|
||||
- else {
|
||||
+ } else if ( iclient == KS_CLIENT_ASPELL ) {
|
||||
box->clear();
|
||||
langfnames.append(""); // Default
|
||||
box->insertItem (i18n("ASpell Default"));
|
||||
@@ -741,6 +802,58 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
+ } else {
|
||||
+ box->clear();
|
||||
+ langfnames.append(""); // Default
|
||||
+ box->insertItem( i18n("Hunspell Default") );
|
||||
+
|
||||
+ // dictionary path
|
||||
+ QFileInfo dir ("/usr/share/myspell");
|
||||
+ if (!dir.exists() || !dir.isDir())
|
||||
+ dir.setFile ("/usr/share/hunspell");
|
||||
+ if (!dir.exists() || !dir.isDir()) return;
|
||||
+
|
||||
+ kdDebug(750) << "KSpellConfig::getAvailDictsHunspell "
|
||||
+ << dir.filePath() << " " << dir.dirPath() << endl;
|
||||
+
|
||||
+ const QDir thedir (dir.filePath(),"*.dic");
|
||||
+ const QStringList entryList = thedir.entryList();
|
||||
+
|
||||
+ kdDebug(750) << "KSpellConfig" << thedir.path() << "\n" << endl;
|
||||
+ kdDebug(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.remove ( langfnames.begin() );
|
||||
+ langfnames.prepend ( fname );
|
||||
+
|
||||
+ hname=i18n("default spelling dictionary"
|
||||
+ ,"Default - %1 [%2]").arg(hname).arg(fname);
|
||||
+
|
||||
+ box->changeItem (hname,0);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ langfnames.append (fname);
|
||||
+ hname=hname+" ["+fname+"]";
|
||||
+
|
||||
+ box->insertItem (hname);
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
int whichelement = langfnames.findIndex(qsdict);
|
||||
if ( whichelement >= 0 ) {
|
||||
diff -ur kdelibs-3.5.8/kdeui/ksconfig.h kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.h
|
||||
--- kdelibs-3.5.8/kdeui/ksconfig.h 2005-10-10 17:06:38.000000000 +0200
|
||||
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/ksconfig.h 2007-12-22 01:35:25.000000000 +0100
|
||||
@@ -1,5 +1,6 @@
|
||||
/* This file is part of the KDE libraries
|
||||
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||
+ Copyright (C) 2007 Kevin Kofler <Kevin@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
|
||||
@@ -61,7 +62,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
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -283,6 +285,7 @@
|
||||
KSpellConfigPrivate *d;
|
||||
void getAvailDictsIspell();
|
||||
void getAvailDictsAspell();
|
||||
+ void getAvailDictsHunspell();
|
||||
};
|
||||
|
||||
#endif // KDELIBS_KSCONFIG_H
|
||||
diff -ur kdelibs-3.5.8/kdeui/kspell.cpp kdelibs-3.5.8-kspell-hunspell/kdeui/kspell.cpp
|
||||
--- kdelibs-3.5.8/kdeui/kspell.cpp 2005-10-10 17:06:38.000000000 +0200
|
||||
+++ kdelibs-3.5.8-kspell-hunspell/kdeui/kspell.cpp 2007-12-22 02:26:29.000000000 +0100
|
||||
@@ -2,6 +2,7 @@
|
||||
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||
Copyright (C) 2000-2001 Wolfram Diestel <wolfram@steloj.de>
|
||||
Copyright (C) 2003 Zack Rusin <zack@kde.org>
|
||||
+ Copyright (C) 2007 Kevin Kofler <Kevin@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
|
||||
@@ -181,9 +182,14 @@
|
||||
*proc << "zpspell";
|
||||
kdDebug(750) << "Using zemberek(zpspell)" << endl;
|
||||
break;
|
||||
+ case KS_CLIENT_HUNSPELL:
|
||||
+ *proc << "hunspell";
|
||||
+ kdDebug(750) << "Using hunspell" << endl;
|
||||
+ 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";
|
||||
|
||||
@@ -201,8 +207,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:
|
||||
@@ -239,7 +245,60 @@
|
||||
// option, so kspell 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:
|
1793
kdelibs-3.5.8-kspell2-enchant.patch
Normal file
1793
kdelibs-3.5.8-kspell2-enchant.patch
Normal file
File diff suppressed because it is too large
Load Diff
21
kdelibs-3.5.8-kspell2-no-ispell.patch
Normal file
21
kdelibs-3.5.8-kspell2-no-ispell.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -ur kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.am kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.am
|
||||
--- kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.am 2007-12-21 20:39:46.000000000 +0100
|
||||
+++ kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.am 2007-12-22 21:34:10.000000000 +0100
|
||||
@@ -6,4 +6,4 @@
|
||||
LIBHSPELLPLUGIN = hspell
|
||||
endif
|
||||
|
||||
-SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell
|
||||
+SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN)
|
||||
diff -ur kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.in kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.in
|
||||
--- kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.in 2007-12-21 20:40:22.000000000 +0100
|
||||
+++ kdelibs-3.5.8-kspell2-no-ispell/kspell2/plugins/Makefile.in 2007-12-22 21:35:39.000000000 +0100
|
||||
@@ -377,7 +377,7 @@
|
||||
xdg_menudir = @xdg_menudir@
|
||||
@include_aspell_plugin_TRUE@LIBASPELLPLUGIN = aspell
|
||||
@include_hspell_plugin_TRUE@LIBHSPELLPLUGIN = hspell
|
||||
-SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell
|
||||
+SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN)
|
||||
#>- all: all-recursive
|
||||
#>+ 1
|
||||
all: docs-am all-recursive
|
28
kdelibs.spec
28
kdelibs.spec
@ -21,7 +21,7 @@
|
||||
|
||||
Summary: K Desktop Environment 3 - Libraries
|
||||
Version: 3.5.8
|
||||
Release: 21%{?dist}
|
||||
Release: 22%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs3
|
||||
@ -63,6 +63,9 @@ Patch43: kdelibs-3.5.6-lang.patch
|
||||
Patch45: kdelibs-3.5.7-autostart.patch
|
||||
Patch46: kdelibs-3.5.8-kate-vhdl.patch
|
||||
Patch47: kdelibs-3.5.8-new-flash.patch
|
||||
Patch48: kdelibs-3.5.8-kspell-hunspell.patch
|
||||
Patch49: kdelibs-3.5.8-kspell2-enchant.patch
|
||||
Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
|
||||
|
||||
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
||||
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
||||
@ -130,7 +133,12 @@ BuildRequires: libart_lgpl-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libacl-devel libattr-devel
|
||||
%if 0%{?fedora} >= 9
|
||||
BuildRequires: enchant-devel
|
||||
Requires: hunspell
|
||||
%else
|
||||
BuildRequires: aspell-devel
|
||||
%endif
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: openldap-devel
|
||||
BuildRequires: db4-devel
|
||||
@ -225,6 +233,11 @@ format for easy browsing
|
||||
%patch45 -p1 -b .xdg-autostart
|
||||
%patch46 -p1 -b .kate-vhdl
|
||||
%patch47 -p0 -b .new-flash
|
||||
%if 0%{?fedora} >= 9
|
||||
%patch48 -p1 -b .kspell
|
||||
%patch49 -p1 -b .kspell2
|
||||
%patch50 -p1 -b .no-ispell
|
||||
%endif
|
||||
|
||||
%patch100 -p1 -b .kstandarddirs
|
||||
%patch101 -p1 -b .libtool-shlibext
|
||||
@ -269,7 +282,12 @@ fi
|
||||
--enable-sendfile \
|
||||
--with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
|
||||
--with-alsa \
|
||||
%if 0%{?fedora} >= 9
|
||||
--without-aspell \
|
||||
%else
|
||||
--with-aspell \
|
||||
%endif
|
||||
--without-hspell \
|
||||
--disable-libfam \
|
||||
--enable-dnotify \
|
||||
--enable-inotify \
|
||||
@ -518,6 +536,14 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Dec 22 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.8-22
|
||||
- BR enchant-devel instead of aspell-devel on F9+ (FeatureDictionary)
|
||||
- Requires: hunspell on F9+ (FeatureDictionary)
|
||||
- patch KSpell for hunspell support on F9+ (FeatureDictionary)
|
||||
- add and build enchant backend for KSpell2 (backported from Sonnet) on F9+
|
||||
(FeatureDictionary)
|
||||
- don't build aspell and ispell backends for KSpell2 on F9+ (FeatureDictionary)
|
||||
|
||||
* Fri Dec 21 2007 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.8-21
|
||||
- updated Flash patch
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user