Remove old patch, use CMake switch that is available now

epel9
Dan Vrátil 9 years ago
parent 84e0175c41
commit 2f9ac4f422

@ -17,10 +17,6 @@ URL: http://www.kde.org
%endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
## downstream patches
# adjust hard-coded mysql dict paths to what fedora uses
Patch1: sonnet-5.10.0-myspell_path.patch
# workaround multilib conflicts in trigrams.map by using QMap instead of QHash
# https://bugzilla.redhat.com/show_bug.cgi?id=1262746
Patch2: sonnet-5.13.0-multilib.patch
@ -75,7 +71,7 @@ GUI part of the Sonnet framework provides widgets with spell checking support.
%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kf5} ..
%{cmake_kf5} .. -DHUNSPELL_MAIN_DICT_PATH=%{_datadir}/myspell
popd
make %{?_smp_mflags} -C %{_target_platform}

@ -1,27 +0,0 @@
diff -up sonnet-5.10.0/src/plugins/hunspell/hunspellclient.cpp.myspell_path sonnet-5.10.0/src/plugins/hunspell/hunspellclient.cpp
--- sonnet-5.10.0/src/plugins/hunspell/hunspellclient.cpp.myspell_path 2015-05-03 10:28:45.000000000 -0500
+++ sonnet-5.10.0/src/plugins/hunspell/hunspellclient.cpp 2015-06-03 11:30:16.509324330 -0500
@@ -47,7 +47,7 @@ SpellerPlugin *HunspellClient::createSpe
QStringList HunspellClient::languages() const
{
QStringList lst;
- QDir dir(QStringLiteral("/usr/share/myspell/dicts/"));
+ QDir dir(QStringLiteral("/usr/share/myspell/"));
if (dir.exists()) {
QStringList lstDic = dir.entryList(QStringList(QStringLiteral("*.dic")), QDir::Files);
foreach (const QString &tmp, lstDic) {
diff -up sonnet-5.10.0/src/plugins/hunspell/hunspelldict.cpp.myspell_path sonnet-5.10.0/src/plugins/hunspell/hunspelldict.cpp
--- sonnet-5.10.0/src/plugins/hunspell/hunspelldict.cpp.myspell_path 2015-06-03 11:26:37.874222011 -0500
+++ sonnet-5.10.0/src/plugins/hunspell/hunspelldict.cpp 2015-06-03 11:30:36.993427926 -0500
@@ -31,9 +31,9 @@ HunspellDict::HunspellDict(const QString
: SpellerPlugin(lang), m_speller(0)
{
qCDebug(SONNET_HUNSPELL) << " HunspellDict::HunspellDict( const QString& lang ):" << lang;
- QString dic = QStringLiteral("/usr/share/myspell/dicts/%1.dic").arg(lang);
+ QString dic = QStringLiteral("/usr/share/myspell/%1.dic").arg(lang);
if (QFileInfo(dic).exists()) {
- m_speller = new Hunspell(QStringLiteral("/usr/share/myspell/dicts/%1.aff").arg(lang).toUtf8().constData(), dic.toUtf8().constData());
+ m_speller = new Hunspell(QStringLiteral("/usr/share/myspell/%1.aff").arg(lang).toUtf8().constData(), dic.toUtf8().constData());
} else {
m_speller = 0;
}
Loading…
Cancel
Save