From b89291590d27c22aa67783e1001f518ed9531a9b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 14 Jan 2008 13:37:06 +0000 Subject: [PATCH] rawhide sync --- kdelibs-3.5.7-openssl.patch | 13 +- kdelibs-3.5.8-kspell-hunspell.patch | 303 +++++ kdelibs-3.5.8-kspell2-enchant.patch | 1793 +++++++++++++++++++++++++ kdelibs-3.5.8-kspell2-no-ispell.patch | 21 + kdelibs.spec | 28 +- 5 files changed, 2153 insertions(+), 5 deletions(-) create mode 100644 kdelibs-3.5.8-kspell-hunspell.patch create mode 100644 kdelibs-3.5.8-kspell2-enchant.patch create mode 100644 kdelibs-3.5.8-kspell2-no-ispell.patch diff --git a/kdelibs-3.5.7-openssl.patch b/kdelibs-3.5.7-openssl.patch index b5511ce..f44f096 100644 --- a/kdelibs-3.5.7-openssl.patch +++ b/kdelibs-3.5.7-openssl.patch @@ -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" diff --git a/kdelibs-3.5.8-kspell-hunspell.patch b/kdelibs-3.5.8-kspell-hunspell.patch new file mode 100644 index 0000000..c811553 --- /dev/null +++ b/kdelibs-3.5.8-kspell-hunspell.patch @@ -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 + Copyright (C) 2000-2001 Wolfram Diestel ++ Copyright (C) 2007 Kevin Kofler + + 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 ++ Copyright (C) 2007 Kevin Kofler + + 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 + Copyright (C) 2000-2001 Wolfram Diestel + Copyright (C) 2003 Zack Rusin ++ Copyright (C) 2007 Kevin Kofler + + 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: diff --git a/kdelibs-3.5.8-kspell2-enchant.patch b/kdelibs-3.5.8-kspell2-enchant.patch new file mode 100644 index 0000000..0f8de01 --- /dev/null +++ b/kdelibs-3.5.8-kspell2-enchant.patch @@ -0,0 +1,1793 @@ +diff -Nur kdelibs-3.5.8/configure kdelibs-3.5.8-kspell2-enchant/configure +--- kdelibs-3.5.8/configure 2007-10-08 16:42:25.000000000 +0200 ++++ kdelibs-3.5.8-kspell2-enchant/configure 2007-12-21 23:51:34.000000000 +0100 +@@ -1095,6 +1095,8 @@ + GSSAPI_RPATH + LIBPCRE + PCRECFLAGS ++ENCHANT_CFLAGS ++ENCHANT_LIBS + include_aspell_plugin_TRUE + include_aspell_plugin_FALSE + include_hspell_plugin_TRUE +@@ -8507,7 +8509,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 8510 "configure"' > conftest.$ac_ext ++ echo '#line 8512 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -10248,11 +10250,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10251: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10253: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10255: \$? = $ac_status" >&5 ++ echo "$as_me:10257: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -10481,11 +10483,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10484: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10486: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10488: \$? = $ac_status" >&5 ++ echo "$as_me:10490: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -10548,11 +10550,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10551: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10553: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10555: \$? = $ac_status" >&5 ++ echo "$as_me:10557: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12634,7 +12636,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:14898: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14900: \$? = $ac_status" >&5 ++ echo "$as_me:14902: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -14960,11 +14962,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14963: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14965: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14967: \$? = $ac_status" >&5 ++ echo "$as_me:14969: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16263,7 +16265,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:17189: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17191: \$? = $ac_status" >&5 ++ echo "$as_me:17193: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -17251,11 +17253,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17254: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17256: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17258: \$? = $ac_status" >&5 ++ echo "$as_me:17260: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -19219,11 +19221,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19222: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:19224: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19226: \$? = $ac_status" >&5 ++ echo "$as_me:19228: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -19452,11 +19454,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19455: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:19457: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:19459: \$? = $ac_status" >&5 ++ echo "$as_me:19461: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -19519,11 +19521,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:19522: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:19524: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:19526: \$? = $ac_status" >&5 ++ echo "$as_me:19528: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -21605,7 +21607,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 ++ echo "configure: 34805: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + jpeg_incdir=$i +@@ -35098,7 +35100,7 @@ + do + for j in $kde_qt_header; + do +- echo "configure: 35101: $i/$j" >&5 ++ echo "configure: 35103: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + qt_incdir=$i +@@ -35928,7 +35930,7 @@ + do + for j in $kde_check_header; + do +- echo "configure: 35931: $i/$j" >&5 ++ echo "configure: 35933: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + kde_incdir=$i +@@ -35958,7 +35960,7 @@ + do + for j in $kde_check_lib; + do +- echo "configure: 35961: $i/$j" >&5 ++ echo "configure: 35963: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + kde_libdir=$i +@@ -35976,7 +35978,7 @@ + do + for j in "kde3/plugins/designer/kdewidgets.la"; + do +- echo "configure: 35979: $i/$j" >&5 ++ echo "configure: 35981: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + kde_widgetdir=$i +@@ -37812,7 +37814,7 @@ + do + for j in apps/ksgmltools2/customization/kde-chunk.xsl; + do +- echo "configure: 37815: $i/$j" >&5 ++ echo "configure: 37817: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + KDE_XSL_STYLESHEET=$i +@@ -42136,7 +42138,7 @@ + do + for j in qsql.html; + do +- echo "configure: 42139: $i/$j" >&5 ++ echo "configure: 42141: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + QTDOCDIR=$i +@@ -48585,7 +48587,7 @@ + do + for j in jpeglib.h; + do +- echo "configure: 48588: $i/$j" >&5 ++ echo "configure: 48590: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + jpeg_incdir=$i +@@ -50357,7 +50359,7 @@ + do + for j in openssl/ssl.h; + do +- echo "configure: 50360: $i/$j" >&5 ++ echo "configure: 50362: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + ssl_incdir=$i +@@ -51076,7 +51078,7 @@ + do + for j in gssapi.h; + do +- echo "configure: 51079: $i/$j" >&5 ++ echo "configure: 51081: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + gssapi_incdir=$i +@@ -51098,7 +51100,7 @@ + do + for j in libgssapi.$ext; + do +- echo "configure: 51101: $i/$j" >&5 ++ echo "configure: 51103: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + gssapi_libdir=$i +@@ -51755,6 +51757,108 @@ + + + ++ succeeded=no ++ ++ if test -z "$PKG_CONFIG"; then ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ fi ++ ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** The pkg-config script could not be found. Make sure it is" ++ echo "*** in your path, or set the PKG_CONFIG environment variable" ++ echo "*** to the full path to pkg-config." ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." ++ else ++ PKG_CONFIG_MIN_VERSION=0.9.0 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then ++ { echo "$as_me:$LINENO: checking for enchant >= 1.2.5" >&5 ++echo $ECHO_N "checking for enchant >= 1.2.5... $ECHO_C" >&6; } ++ ++ if $PKG_CONFIG --exists "enchant >= 1.2.5" ; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ succeeded=yes ++ ++ { echo "$as_me:$LINENO: checking ENCHANT_CFLAGS" >&5 ++echo $ECHO_N "checking ENCHANT_CFLAGS... $ECHO_C" >&6; } ++ ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= 1.2.5"` ++ { echo "$as_me:$LINENO: result: $ENCHANT_CFLAGS" >&5 ++echo "${ECHO_T}$ENCHANT_CFLAGS" >&6; } ++ ++ { echo "$as_me:$LINENO: checking ENCHANT_LIBS" >&5 ++echo $ECHO_N "checking ENCHANT_LIBS... $ECHO_C" >&6; } ++ ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= 1.2.5"` ++ { echo "$as_me:$LINENO: result: $ENCHANT_LIBS" >&5 ++echo "${ECHO_T}$ENCHANT_LIBS" >&6; } ++ else ++ ENCHANT_CFLAGS="" ++ ENCHANT_LIBS="" ++ ## If we have a custom action on failure, don't print errors, but ++ ## do set a variable so people can do so. ++ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "enchant >= 1.2.5"` ++ echo $ENCHANT_PKG_ERRORS ++ fi ++ ++ ++ ++ else ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" ++ fi ++ fi ++ ++ if test $succeeded = yes; then ++ : ++ else ++ { { echo "$as_me:$LINENO: error: Library requirements (enchant >= 1.2.5) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 ++echo "$as_me: error: Library requirements (enchant >= 1.2.5) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ ++ ++ ++ + # Check whether --with-aspell was given. + if test "${with_aspell+set}" = set; then + withval=$with_aspell; aspell_test="$withval" +@@ -55436,6 +55540,8 @@ + GSSAPI_RPATH!$GSSAPI_RPATH$ac_delim + LIBPCRE!$LIBPCRE$ac_delim + PCRECFLAGS!$PCRECFLAGS$ac_delim ++ENCHANT_CFLAGS!$ENCHANT_CFLAGS$ac_delim ++ENCHANT_LIBS!$ENCHANT_LIBS$ac_delim + include_aspell_plugin_TRUE!$include_aspell_plugin_TRUE$ac_delim + include_aspell_plugin_FALSE!$include_aspell_plugin_FALSE$ac_delim + include_hspell_plugin_TRUE!$include_hspell_plugin_TRUE$ac_delim +@@ -55495,8 +55601,6 @@ + libkscreensaver_SUBDIR_included_TRUE!$libkscreensaver_SUBDIR_included_TRUE$ac_delim + libkscreensaver_SUBDIR_included_FALSE!$libkscreensaver_SUBDIR_included_FALSE$ac_delim + licenses_SUBDIR_included_TRUE!$licenses_SUBDIR_included_TRUE$ac_delim +-licenses_SUBDIR_included_FALSE!$licenses_SUBDIR_included_FALSE$ac_delim +-mimetypes_SUBDIR_included_TRUE!$mimetypes_SUBDIR_included_TRUE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -55538,6 +55642,8 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++licenses_SUBDIR_included_FALSE!$licenses_SUBDIR_included_FALSE$ac_delim ++mimetypes_SUBDIR_included_TRUE!$mimetypes_SUBDIR_included_TRUE$ac_delim + mimetypes_SUBDIR_included_FALSE!$mimetypes_SUBDIR_included_FALSE$ac_delim + pics_SUBDIR_included_TRUE!$pics_SUBDIR_included_TRUE$ac_delim + pics_SUBDIR_included_FALSE!$pics_SUBDIR_included_FALSE$ac_delim +@@ -55569,7 +55675,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +@@ -56142,11 +56248,6 @@ + + { (exit 0); exit 0; } + _ACEOF +-if test "x$with_fast_perl" = "xyes"; then +- perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS \ +- || mv $CONFIG_STATUS.bak $CONFIG_STATUS +- rm -f $CONFIG_STATUS.bak +-fi + chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + +diff -Nur kdelibs-3.5.8/configure.in kdelibs-3.5.8-kspell2-enchant/configure.in +--- kdelibs-3.5.8/configure.in 2007-10-08 16:41:26.000000000 +0200 ++++ kdelibs-3.5.8-kspell2-enchant/configure.in 2007-12-21 23:50:43.000000000 +0100 +@@ -2005,6 +2005,10 @@ + dnl FILE: ./kspell2/plugins/configure.in.in + dnl ======================================================= + ++PKG_CHECK_MODULES(ENCHANT, enchant >= 1.2.5) ++AC_SUBST(ENCHANT_CFLAGS) ++AC_SUBST(ENCHANT_LIBS) ++ + AC_ARG_WITH(aspell,AC_HELP_STRING([--with-aspell],[Enable aspell support [default=check]]),[aspell_test="$withval"],[aspell_test="yes"]) + + if test "x$aspell_test" = "xyes" ; then +diff -Nur kdelibs-3.5.8/kspell2/plugins/configure.in.in kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/configure.in.in +--- kdelibs-3.5.8/kspell2/plugins/configure.in.in 2006-03-17 11:19:11.000000000 +0100 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/configure.in.in 2007-12-21 23:43:31.000000000 +0100 +@@ -1,3 +1,7 @@ ++PKG_CHECK_MODULES(ENCHANT, enchant >= 1.2.5) ++AC_SUBST(ENCHANT_CFLAGS) ++AC_SUBST(ENCHANT_LIBS) ++ + AC_ARG_WITH(aspell,AC_HELP_STRING([--with-aspell],[Enable aspell support [default=check]]),[aspell_test="$withval"],[aspell_test="yes"]) + + if test "x$aspell_test" = "xyes" ; then +diff -Nur kdelibs-3.5.8/kspell2/plugins/enchant/enchantclient.cpp kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/enchantclient.cpp +--- kdelibs-3.5.8/kspell2/plugins/enchant/enchantclient.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/enchantclient.cpp 2007-12-22 00:22:05.000000000 +0100 +@@ -0,0 +1,103 @@ ++// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- ++/** ++ * Copyright 2006 Zack Rusin ++ * KDE 3 backport Copyright 2007 Kevin Kofler ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ */ ++#include "enchantclient.h" ++#include "enchantdict.h" ++ ++#include ++#include ++ ++typedef KGenericFactory EnchantClientFactory; ++K_EXPORT_COMPONENT_FACTORY(kspell_enchant, EnchantClientFactory("kspell_enchant")) ++ ++using namespace KSpell2; ++ ++static void enchantDictDescribeFn(const char * const lang_tag, ++ const char * const provider_name, ++ const char * const provider_desc, ++ const char * const provider_file, ++ void * user_data) ++{ ++ QSpellEnchantClient *client = ++ reinterpret_cast(user_data); ++ //kdDebug()<addLanguage(QString::fromLatin1(lang_tag)); ++ ++} ++ ++QSpellEnchantClient::QSpellEnchantClient(QObject *parent, const char *name, const QStringList& /* args */) ++ : Client(parent, name) ++{ ++ m_broker = enchant_broker_init(); ++ enchant_broker_list_dicts(m_broker, ++ enchantDictDescribeFn, ++ this); ++} ++ ++QSpellEnchantClient::~QSpellEnchantClient() ++{ ++ enchant_broker_free(m_broker); ++} ++ ++Dictionary *QSpellEnchantClient::dictionary( ++ const QString &language) ++{ ++ EnchantDict *dict = enchant_broker_request_dict(m_broker, ++ language.utf8()); ++ ++ if (!dict) { ++ const char *err = enchant_broker_get_error(m_broker); ++ kdDebug()<<"Couldn't create speller for"< ++ * KDE 3 backport Copyright 2007 Kevin Kofler ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ */ ++#ifndef QSPELL_ENCHANTCLIENT_H ++#define QSPELL_ENCHANTCLIENT_H ++ ++#include "client.h" ++ ++#include ++#include ++ ++namespace KSpell2 { ++ class Dictionary; ++} ++using KSpell2::Dictionary; ++ ++class QSpellEnchantClient : public KSpell2::Client ++{ ++ Q_OBJECT ++public: ++ QSpellEnchantClient(QObject *parent, const char *name, const QStringList & /* args */); ++ ~QSpellEnchantClient(); ++ ++ virtual int reliability() const { ++ return 30; ++ } ++ ++ virtual Dictionary *dictionary(const QString &language); ++ ++ virtual QStringList languages() const; ++ ++ virtual QString name() const { ++ return QString::fromLatin1("Enchant"); ++ } ++ ++ void addLanguage(const QString &lang); ++ ++ void removeDictRef(EnchantDict *dict); ++ ++private: ++ EnchantBroker *m_broker; ++ QStringList m_languages; ++ QMap m_dictRefs; ++}; ++ ++#endif +diff -Nur kdelibs-3.5.8/kspell2/plugins/enchant/enchantdict.cpp kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/enchantdict.cpp +--- kdelibs-3.5.8/kspell2/plugins/enchant/enchantdict.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/enchantdict.cpp 2007-12-22 00:24:28.000000000 +0100 +@@ -0,0 +1,108 @@ ++// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- ++/** ++ * Copyright 2006 Zack Rusin ++ * KDE 3 backport Copyright 2007 Kevin Kofler ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ */ ++#include "enchantdict.h" ++#include "enchantclient.h" ++ ++#include ++#include ++ ++using namespace KSpell2; ++ ++QSpellEnchantDict::QSpellEnchantDict(QSpellEnchantClient *client, ++ EnchantBroker *broker, ++ EnchantDict *dict, ++ const QString &language) ++ : Dictionary(language), ++ m_broker(broker), ++ m_dict(dict), ++ m_client(client) ++{ ++ kdDebug()<<"Enchant dict for"<removeDictRef(m_dict); ++} ++ ++bool QSpellEnchantDict::check(const QString &word) ++{ ++ int wrong = enchant_dict_check(m_dict, word.utf8(), ++ word.utf8().length()); ++ return !wrong; ++} ++ ++QStringList QSpellEnchantDict::suggest(const QString &word) ++{ ++ /* Needed for Unicode conversion */ ++ QTextCodec *codec = QTextCodec::codecForName("utf8"); ++ ++ size_t number = 0; ++ char **suggestions = ++ enchant_dict_suggest(m_dict, word.utf8(), word.utf8().length(), ++ &number); ++ ++ QStringList qsug; ++ for (size_t i = 0; i < number; ++i) { ++ qsug.append(codec->toUnicode(suggestions[i])); ++ } ++ ++ if (suggestions && number) ++ enchant_dict_free_string_list(m_dict, suggestions); ++ return qsug; ++} ++ ++bool QSpellEnchantDict::checkAndSuggest(const QString& word, ++ QStringList& suggestions) ++{ ++ bool c = check(word); ++ if (c) ++ suggestions = suggest(word); ++ return c; ++} ++ ++bool QSpellEnchantDict::storeReplacement(const QString &bad, ++ const QString &good) ++{ ++ enchant_dict_store_replacement(m_dict, ++ bad.utf8(), bad.utf8().length(), ++ good.utf8(), good.utf8().length()); ++ return true; ++} ++ ++bool QSpellEnchantDict::addToPersonal(const QString &word) ++{ ++ kdDebug() << "QSpellEnchantDict::addToPersonal: word = " ++ << word << endl; ++ enchant_dict_add_to_pwl(m_dict, word.utf8(), ++ word.utf8().length()); ++ return true; ++} ++ ++bool QSpellEnchantDict::addToSession(const QString &word) ++{ ++ enchant_dict_add_to_session(m_dict, word.utf8(), ++ word.utf8().length()); ++ return true; ++} +diff -Nur kdelibs-3.5.8/kspell2/plugins/enchant/enchantdict.h kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/enchantdict.h +--- kdelibs-3.5.8/kspell2/plugins/enchant/enchantdict.h 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/enchantdict.h 2007-12-22 00:28:50.000000000 +0100 +@@ -0,0 +1,59 @@ ++// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- ++/** ++ * Copyright 2006 Zack Rusin ++ * KDE 3 backport Copyright 2007 Kevin Kofler ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ */ ++#ifndef QSPELL_ENCHANTDICT_H ++#define QSPELL_ENCHANTDICT_H ++ ++#include "dictionary.h" ++ ++#include ++ ++class QSpellEnchantClient; ++ ++class QSpellEnchantDict : public KSpell2::Dictionary ++{ ++public: ++ ~QSpellEnchantDict(); ++ virtual bool check(const QString &word); ++ ++ virtual QStringList suggest(const QString &word); ++ ++ virtual bool checkAndSuggest(const QString& word, ++ QStringList& suggestions); ++ ++ virtual bool storeReplacement(const QString &bad, ++ const QString &good); ++ ++ virtual bool addToPersonal(const QString &word); ++ virtual bool addToSession(const QString &word); ++protected: ++ friend class QSpellEnchantClient; ++ QSpellEnchantDict(QSpellEnchantClient *client, ++ EnchantBroker *broker, ++ EnchantDict *dict, ++ const QString &language); ++ ++private: ++ EnchantBroker *m_broker; ++ EnchantDict *m_dict; ++ QSpellEnchantClient *m_client; ++}; ++ ++#endif +diff -Nur kdelibs-3.5.8/kspell2/plugins/enchant/kspell_enchant.desktop kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/kspell_enchant.desktop +--- kdelibs-3.5.8/kspell2/plugins/enchant/kspell_enchant.desktop 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/kspell_enchant.desktop 2007-12-22 00:31:32.000000000 +0100 +@@ -0,0 +1,41 @@ ++[Desktop Entry] ++Encoding=UTF-8 ++Type=Service ++ServiceTypes=KSpell/Client ++X-KDE-Library=kspell_enchant ++X-KDE-PluginInfo-Author=Zack Rusin ++X-KDE-PluginInfo-Email=zack@kde.org ++X-KDE-PluginInfo-Name=kspell_enchant ++X-KDE-PluginInfo-Version=0.0.1 ++X-KDE-PluginInfo-Website=http://www.kde.org ++X-KDE-PluginInfo-Category=Clients ++X-KDE-PluginInfo-Category[bn_IN]=ক্লায়েন্ট ++X-KDE-PluginInfo-Category[el]=Πελάτες ++X-KDE-PluginInfo-Category[eo]=Klientoj ++X-KDE-PluginInfo-Category[eu]=Bezeroak ++X-KDE-PluginInfo-Category[ga]=Cliaint ++X-KDE-PluginInfo-Category[hu]=Kliensek ++X-KDE-PluginInfo-Category[is]=Vélar ++X-KDE-PluginInfo-Category[ja]=クライアント ++X-KDE-PluginInfo-Category[km]=ម៉ាស៊ីន​ភ្ញៀវ ++X-KDE-PluginInfo-Category[lv]=Klienti ++X-KDE-PluginInfo-Category[pt]=Clientes ++X-KDE-PluginInfo-Category[pt_BR]=Clientes ++X-KDE-PluginInfo-Category[sr]=Клијенти ++X-KDE-PluginInfo-Category[sr@latin]=Klijenti ++X-KDE-PluginInfo-Category[sv]=Klienter ++X-KDE-PluginInfo-Category[th]=โปรแกรมลูก ++X-KDE-PluginInfo-Category[zh_CN]=客户 ++X-KDE-PluginInfo-Category[zh_TW]=客戶端 ++X-KDE-PluginInfo-Depends= ++X-KDE-PluginInfo-License=LGPL ++X-KDE-PluginInfo-EnabledByDefault=true ++Name=Enchant ++Name[ar]=إنشنت ++Name[hi]=एनचैंट ++Name[kn]=ಎಂಚಾಂಟ್ ++Name[ne]=मोहीत पार्नु ++Name[sr]=Енчант ++Name[ta]=வசீகரம் ++Name[x-test]=xxEnchantxx ++Name[zh_CN]=增强 +diff -Nur kdelibs-3.5.8/kspell2/plugins/enchant/Makefile.am kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/Makefile.am +--- kdelibs-3.5.8/kspell2/plugins/enchant/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/Makefile.am 2007-12-21 23:44:17.000000000 +0100 +@@ -0,0 +1,17 @@ ++METASOURCES = AUTO ++ ++AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes) $(ENCHANT_CFLAGS) ++ ++# For the future: examine if condensing the tons of *_LDFLAGS variables ++# into $(all_libraries) isn't better ++AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) ++ ++kde_module_LTLIBRARIES = kspell_enchant.la ++ ++kspell_enchant_la_SOURCES = enchantclient.cpp enchantdict.cpp ++ ++kspell_enchant_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) ++kspell_enchant_la_LIBADD = ../../ui/libkspell2.la $(ENCHANT_LIBS) ++ ++service_DATA = kspell_enchant.desktop ++servicedir = $(kde_servicesdir) +diff -Nur kdelibs-3.5.8/kspell2/plugins/enchant/Makefile.in kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/Makefile.in +--- kdelibs-3.5.8/kspell2/plugins/enchant/Makefile.in 1970-01-01 01:00:00.000000000 +0100 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/enchant/Makefile.in 2007-12-21 23:49:17.000000000 +0100 +@@ -0,0 +1,848 @@ ++# Makefile.in generated by automake 1.10 from Makefile.am. ++# KDE tags expanded automatically by am_edit - $Revision: 483858 $ ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++ ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++target_triplet = @target@ ++subdir = kspell2/plugins/enchant ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h \ ++ $(top_builddir)/dcop/dcop-path.h \ ++ $(top_builddir)/kdecore/kdemacros.h \ ++ $(top_builddir)/kio/kssl/ksslconfig.h \ ++ $(top_builddir)/kjs/global.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ ++ "$(DESTDIR)$(servicedir)" ++kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(kde_module_LTLIBRARIES) ++kspell_enchant_la_DEPENDENCIES = ../../ui/libkspell2.la ++am_kspell_enchant_la_OBJECTS = enchantclient.lo \ ++ enchantdict.lo ++#>- kspell_enchant_la_OBJECTS = $(am_kspell_enchant_la_OBJECTS) ++#>+ 5 ++kspell_enchant_la_final_OBJECTS = kspell_enchant_la.all_cpp.lo ++kspell_enchant_la_nofinal_OBJECTS = enchantclient.lo \ ++ enchantdict.lo ++@KDE_USE_FINAL_FALSE@kspell_enchant_la_OBJECTS = $(kspell_enchant_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@kspell_enchant_la_OBJECTS = $(kspell_enchant_la_final_OBJECTS) ++#>- kspell_enchant_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ++#>- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ++#>- $(CXXFLAGS) $(kspell_enchant_la_LDFLAGS) $(LDFLAGS) -o $@ ++#>+ 3 ++kspell_enchant_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ++ $(CXXFLAGS) $(KDE_CXXFLAGS) $(kspell_enchant_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs@am__isrc@ ++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp ++am__depfiles_maybe = depfiles ++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++#>+ 2 ++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) ++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++#>+ 3 ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) ++CXXLD = $(CXX) ++#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++#>- $(LDFLAGS) -o $@ ++#>+ 3 ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(kspell_enchant_la_SOURCES) ++DIST_SOURCES = $(kspell_enchant_la_SOURCES) ++serviceDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(service_DATA) ++ETAGS = etags ++CTAGS = ctags ++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++#>+ 1 ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ++ACLOCAL = @ACLOCAL@ ++ACL_LIBS = @ACL_LIBS@ ++ALLOCA = @ALLOCA@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++ARTSCCONFIG = @ARTSCCONFIG@ ++AUTOCONF = @AUTOCONF@ ++AUTODIRS = @AUTODIRS@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CONF_FILES = @CONF_FILES@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DCOPIDL = @DCOPIDL@ ++DCOPIDL2CPP = @DCOPIDL2CPP@ ++DCOPIDLNG = @DCOPIDLNG@ ++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DOXYGEN = @DOXYGEN@ ++DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ ++DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ ++ENCHANT_CFLAGS = @ENCHANT_CFLAGS@ ++ENCHANT_LDFLAGS = @ENCHANT_LDFLAGS@ ++EXEEXT = @EXEEXT@ ++EXR_FLAGS = @EXR_FLAGS@ ++EXTRA_SUBDIRS = @EXTRA_SUBDIRS@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ ++GMSGFMT = @GMSGFMT@ ++GREP = @GREP@ ++GSSAPI_INCS = @GSSAPI_INCS@ ++GSSAPI_LIBS = @GSSAPI_LIBS@ ++GSSAPI_RPATH = @GSSAPI_RPATH@ ++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ ++HAVE_MITSHM = @HAVE_MITSHM@ ++HAVE_SENDFILE = @HAVE_SENDFILE@ ++HELP_SUBDIR = @HELP_SUBDIR@ ++ICE_RLIB = @ICE_RLIB@ ++ICE_SUBDIR = @ICE_SUBDIR@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ ++KCONFIG_COMPILER = @KCONFIG_COMPILER@ ++KDEINIT_SETUID = @KDEINIT_SETUID@ ++KDEINIT_XFT_INCLUDES = @KDEINIT_XFT_INCLUDES@ ++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ ++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ ++KDE_FORCE_INLINE = @KDE_FORCE_INLINE@ ++KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ ++KDE_HAVE_DOT = @KDE_HAVE_DOT@ ++KDE_INCLUDES = @KDE_INCLUDES@ ++KDE_LDFLAGS = @KDE_LDFLAGS@ ++KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ ++KDE_MT_LIBS = @KDE_MT_LIBS@ ++KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ ++KDE_PLUGIN = @KDE_PLUGIN@ ++KDE_RPATH = @KDE_RPATH@ ++KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ ++KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ ++KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ ++KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ ++KDE_USE_FPIE = @KDE_USE_FPIE@ ++KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ ++KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ ++KDE_USE_PIE = @KDE_USE_PIE@ ++KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ ++KJAVA_POLICYPATH = @KJAVA_POLICYPATH@ ++LDFLAGS = @LDFLAGS@ ++LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ ++LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ ++LIBADD_DL = @LIBADD_DL@ ++LIBART_CFLAGS = @LIBART_CFLAGS@ ++LIBART_LIBS = @LIBART_LIBS@ ++LIBART_RPATH = @LIBART_RPATH@ ++LIBASOUND = @LIBASOUND@ ++LIBBZ2 = @LIBBZ2@ ++LIBCOMPAT = @LIBCOMPAT@ ++LIBCRYPT = @LIBCRYPT@ ++LIBDL = @LIBDL@ ++LIBFAM = @LIBFAM@ ++LIBICE = @LIBICE@ ++LIBJPEG = @LIBJPEG@ ++LIBOBJS = @LIBOBJS@ ++LIBPCRE = @LIBPCRE@ ++LIBPNG = @LIBPNG@ ++LIBPTHREAD = @LIBPTHREAD@ ++LIBRESOLV = @LIBRESOLV@ ++LIBS = @LIBS@ ++LIBSM = @LIBSM@ ++LIBSOCKET = @LIBSOCKET@ ++LIBSSL = @LIBSSL@ ++LIBTHAI = @LIBTHAI@ ++LIBTIFF = @LIBTIFF@ ++LIBTOOL = @LIBTOOL@ ++LIBUCB = @LIBUCB@ ++LIBUTEMPTER = @LIBUTEMPTER@ ++LIBUTIL = @LIBUTIL@ ++LIBVOLMGT = @LIBVOLMGT@ ++LIBXML_CFLAGS = @LIBXML_CFLAGS@ ++LIBXML_LIBS = @LIBXML_LIBS@ ++LIBXML_RPATH = @LIBXML_RPATH@ ++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@ ++LIBXSLT_LIBS = @LIBXSLT_LIBS@ ++LIBXSLT_RPATH = @LIBXSLT_RPATH@ ++LIBZ = @LIBZ@ ++LIB_CUPS = @LIB_CUPS@ ++LIB_DNSSD = @LIB_DNSSD@ ++LIB_EXR = @LIB_EXR@ ++LIB_IDN = @LIB_IDN@ ++LIB_JASPER = @LIB_JASPER@ ++LIB_KAB = @LIB_KAB@ ++LIB_KABC = @LIB_KABC@ ++LIB_KDECORE = @LIB_KDECORE@ ++LIB_KDED = @LIB_KDED@ ++LIB_KDEPIM = @LIB_KDEPIM@ ++LIB_KDEPRINT = @LIB_KDEPRINT@ ++LIB_KDEUI = @LIB_KDEUI@ ++LIB_KDNSSD = @LIB_KDNSSD@ ++LIB_KFILE = @LIB_KFILE@ ++LIB_KFM = @LIB_KFM@ ++LIB_KHTML = @LIB_KHTML@ ++LIB_KIMGIO = @LIB_KIMGIO@ ++LIB_KIMPROXY = @LIB_KIMPROXY@ ++LIB_KIO = @LIB_KIO@ ++LIB_KJS = @LIB_KJS@ ++LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ ++LIB_KPARTS = @LIB_KPARTS@ ++LIB_KSPELL = @LIB_KSPELL@ ++LIB_KSYCOCA = @LIB_KSYCOCA@ ++LIB_KUNITTEST = @LIB_KUNITTEST@ ++LIB_KUTILS = @LIB_KUTILS@ ++LIB_POLL = @LIB_POLL@ ++LIB_QPE = @LIB_QPE@ ++LIB_QT = @LIB_QT@ ++LIB_SMB = @LIB_SMB@ ++LIB_X11 = @LIB_X11@ ++LIB_XEXT = @LIB_XEXT@ ++LIB_XRENDER = @LIB_XRENDER@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++LUA = @LUA@ ++LUA_INCLUDES = @LUA_INCLUDES@ ++LUA_LIBS = @LUA_LIBS@ ++MAKEINFO = @MAKEINFO@ ++MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ ++MCOPIDL = @MCOPIDL@ ++MD5SUM = @MD5SUM@ ++MEINPROC = @MEINPROC@ ++MEINPROC_DEP = @MEINPROC_DEP@ ++MKDIR_P = @MKDIR_P@ ++MOC = @MOC@ ++MSGFMT = @MSGFMT@ ++NOOPT_CFLAGS = @NOOPT_CFLAGS@ ++NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PCRECFLAGS = @PCRECFLAGS@ ++PERL = @PERL@ ++PKG_CONFIG = @PKG_CONFIG@ ++QNAMESPACE_H = @QNAMESPACE_H@ ++QTDOCDIR = @QTDOCDIR@ ++QTE_NORTTI = @QTE_NORTTI@ ++QT_INCLUDES = @QT_INCLUDES@ ++QT_LDFLAGS = @QT_LDFLAGS@ ++RANLIB = @RANLIB@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++SSL_INCLUDES = @SSL_INCLUDES@ ++SSL_LDFLAGS = @SSL_LDFLAGS@ ++STRIP = @STRIP@ ++TOPSUBDIRS = @TOPSUBDIRS@ ++UIC = @UIC@ ++UIC_TR = @UIC_TR@ ++USER_INCLUDES = @USER_INCLUDES@ ++USER_LDFLAGS = @USER_LDFLAGS@ ++USE_EXCEPTIONS = @USE_EXCEPTIONS@ ++USE_RTTI = @USE_RTTI@ ++USE_THREADS = @USE_THREADS@ ++VERSION = @VERSION@ ++WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ ++XGETTEXT = @XGETTEXT@ ++XMKMF = @XMKMF@ ++XMLLINT = @XMLLINT@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_INCLUDES = @X_INCLUDES@ ++X_LDFLAGS = @X_LDFLAGS@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++X_RPATH = @X_RPATH@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++all_includes = @all_includes@ ++all_libraries = @all_libraries@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++cups_modeldir = @cups_modeldir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++kde_appsdir = @kde_appsdir@ ++kde_bindir = @kde_bindir@ ++kde_confdir = @kde_confdir@ ++kde_cups_config = @kde_cups_config@ ++kde_datadir = @kde_datadir@ ++kde_htmldir = @kde_htmldir@ ++kde_icondir = @kde_icondir@ ++kde_includes = @kde_includes@ ++kde_kcfgdir = @kde_kcfgdir@ ++kde_libraries = @kde_libraries@ ++kde_libs_htmldir = @kde_libs_htmldir@ ++kde_libs_prefix = @kde_libs_prefix@ ++kde_locale = @kde_locale@ ++kde_mimedir = @kde_mimedir@ ++kde_moduledir = @kde_moduledir@ ++kde_qtver = @kde_qtver@ ++kde_servicesdir = @kde_servicesdir@ ++kde_servicetypesdir = @kde_servicetypesdir@ ++kde_sounddir = @kde_sounddir@ ++kde_styledir = @kde_styledir@ ++kde_templatesdir = @kde_templatesdir@ ++kde_wallpaperdir = @kde_wallpaperdir@ ++kde_widgetdir = @kde_widgetdir@ ++kdeinitdir = @kdeinitdir@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++path_su = @path_su@ ++path_sudo = @path_sudo@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++qt_includes = @qt_includes@ ++qt_libraries = @qt_libraries@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target = @target@ ++target_alias = @target_alias@ ++target_cpu = @target_cpu@ ++target_os = @target_os@ ++target_vendor = @target_vendor@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++x_includes = @x_includes@ ++x_libraries = @x_libraries@ ++xdg_appsdir = @xdg_appsdir@ ++xdg_directorydir = @xdg_directorydir@ ++xdg_menudir = @xdg_menudir@ ++#>- METASOURCES = AUTO ++AM_CPPFLAGS = -I$(top_srcdir)/kspell2 -I$(top_srcdir) $(all_includes) $(ENCHANT_CFLAGS) ++ ++# For the future: examine if condensing the tons of *_LDFLAGS variables ++# into $(all_libraries) isn't better ++AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) ++kde_module_LTLIBRARIES = kspell_enchant.la ++kspell_enchant_la_SOURCES = enchantclient.cpp enchantdict.cpp ++kspell_enchant_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) ++kspell_enchant_la_LIBADD = ../../ui/libkspell2.la $(ENCHANT_LIBS) ++service_DATA = kspell_enchant.desktop ++servicedir = $(kde_servicesdir) ++#>- all: all-am ++#>+ 1 ++all: docs-am all-am ++ ++.SUFFIXES: ++.SUFFIXES: .cpp .lo .o .obj ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++#>- @for dep in $?; do \ ++#>- case '$(am__configure_deps)' in \ ++#>- *$$dep*) \ ++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++#>- && exit 0; \ ++#>- exit 1;; \ ++#>- esac; \ ++#>- done; \ ++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kspell2/plugins/enchant/Makefile'; \ ++#>- cd $(top_srcdir) && \ ++#>- $(AUTOMAKE) --foreign kspell2/plugins/enchant/Makefile ++#>+ 12 ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kspell2/plugins/enchant/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign kspell2/plugins/enchant/Makefile ++ cd $(top_srcdir) && perl admin/am_edit kspell2/plugins/enchant/Makefile.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) ++ @$(NORMAL_INSTALL) ++ test -z "$(kde_moduledir)" || $(MKDIR_P) "$(DESTDIR)$(kde_moduledir)" ++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ ++ if test -f $$p; then \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ ++ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ ++ else :; fi; \ ++ done ++ ++uninstall-kde_moduleLTLIBRARIES: ++ @$(NORMAL_UNINSTALL) ++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ ++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ ++ done ++ ++clean-kde_moduleLTLIBRARIES: ++ -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) ++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test "$$dir" != "$$p" || dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ ++ done ++kspell_enchant.la: $(kspell_enchant_la_OBJECTS) $(kspell_enchant_la_DEPENDENCIES) ++ $(kspell_enchant_la_LINK) -rpath $(kde_moduledir) $(kspell_enchant_la_OBJECTS) $(kspell_enchant_la_LIBADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enchantclient.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enchantdict.Plo@am__quote@ ++ ++.cpp.o: ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< ++ ++.cpp.obj: ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++.cpp.lo: ++@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++install-serviceDATA: $(service_DATA) ++ @$(NORMAL_INSTALL) ++ test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" ++ @list='$(service_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f=$(am__strip_dir) \ ++ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \ ++ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \ ++ done ++ ++uninstall-serviceDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(service_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(servicedir)/$$f"; \ ++ done ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(LTLIBRARIES) $(DATA) ++installdirs: ++ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++#>- clean: clean-am ++#>+ 1 ++clean: kde-rpo-clean clean-am ++ ++#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ ++#>- mostlyclean-am ++#>+ 2 ++clean-am: clean-metasources clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ ++ mostlyclean-am ++ ++distclean: distclean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++#>- install-data-am: install-kde_moduleLTLIBRARIES install-serviceDATA ++#>+ 1 ++install-data-am: install-serviceDATA ++ ++install-dvi: install-dvi-am ++ ++#>- install-exec-am: ++#>+ 1 ++install-exec-am: install-kde_moduleLTLIBRARIES ++ ++install-html: install-html-am ++ ++install-info: install-info-am ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA ++ ++.MAKE: install-am install-strip ++ ++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ++ clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am \ ++ install-kde_moduleLTLIBRARIES install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-serviceDATA \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: ++ ++#>+ 3 ++enchantclient.moc: $(srcdir)/enchantclient.h ++ $(MOC) $(srcdir)/enchantclient.h -o enchantclient.moc ++ ++#>+ 2 ++mocs: enchantclient.moc ++ ++#>+ 3 ++clean-metasources: ++ -rm -f enchantclient.moc ++ ++#>+ 2 ++KDE_DIST=Makefile.in kspell_enchant.desktop enchantclient.h enchantdict.h Makefile.am ++ ++#>+ 2 ++docs-am: ++ ++#>+ 15 ++force-reedit: ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kspell2/plugins/enchant/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign kspell2/plugins/enchant/Makefile ++ cd $(top_srcdir) && perl admin/am_edit kspell2/plugins/enchant/Makefile.in ++ ++ ++#>+ 21 ++clean-bcheck: ++ rm -f *.bchecktest.cc *.bchecktest.cc.class a.out ++ ++bcheck: bcheck-am ++ ++bcheck-am: ++ @for i in ; do \ ++ if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ ++ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ ++ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ ++ echo "$$i"; \ ++ if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ ++ rm -f $$i.bchecktest.cc; exit 1; \ ++ fi ; \ ++ echo "" >> $$i.bchecktest.cc.class; \ ++ perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ ++ rm -f a.out; \ ++ fi ; \ ++ done ++ ++ ++#>+ 11 ++kspell_enchant_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/enchantclient.cpp $(srcdir)/enchantdict.cpp enchantclient.moc ++ @echo 'creating kspell_enchant_la.all_cpp.cpp ...'; \ ++ rm -f kspell_enchant_la.all_cpp.files kspell_enchant_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> kspell_enchant_la.all_cpp.final; \ ++ for file in enchantclient.cpp enchantdict.cpp ; do \ ++ echo "#include \"$$file\"" >> kspell_enchant_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kspell_enchant_la.all_cpp.final; \ ++ done; \ ++ cat kspell_enchant_la.all_cpp.final kspell_enchant_la.all_cpp.files > kspell_enchant_la.all_cpp.cpp; \ ++ rm -f kspell_enchant_la.all_cpp.final kspell_enchant_la.all_cpp.files ++ ++#>+ 3 ++clean-final: ++ -rm -f kspell_enchant_la.all_cpp.cpp ++ ++#>+ 3 ++final: ++ $(MAKE) kspell_enchant_la_OBJECTS="$(kspell_enchant_la_final_OBJECTS)" all-am ++ ++#>+ 3 ++final-install: ++ $(MAKE) kspell_enchant_la_OBJECTS="$(kspell_enchant_la_final_OBJECTS)" install-am ++ ++#>+ 3 ++no-final: ++ $(MAKE) kspell_enchant_la_OBJECTS="$(kspell_enchant_la_nofinal_OBJECTS)" all-am ++ ++#>+ 3 ++no-final-install: ++ $(MAKE) kspell_enchant_la_OBJECTS="$(kspell_enchant_la_nofinal_OBJECTS)" install-am ++ ++#>+ 3 ++kde-rpo-clean: ++ -rm -f *.rpo ++ ++#>+ 5 ++nmcheck: ++enchantclient.lo: enchantclient.moc ++enchantclient.o: enchantclient.moc ++nmcheck-am: nmcheck +diff -Nur kdelibs-3.5.8/kspell2/plugins/Makefile.am kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.am +--- kdelibs-3.5.8/kspell2/plugins/Makefile.am 2005-09-10 10:27:02.000000000 +0200 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.am 2007-12-21 20:39:46.000000000 +0100 +@@ -6,4 +6,4 @@ + LIBHSPELLPLUGIN = hspell + endif + +-SUBDIRS = $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell ++SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell +diff -Nur kdelibs-3.5.8/kspell2/plugins/Makefile.in kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.in +--- kdelibs-3.5.8/kspell2/plugins/Makefile.in 2007-10-08 16:42:21.000000000 +0200 ++++ kdelibs-3.5.8-kspell2-enchant/kspell2/plugins/Makefile.in 2007-12-21 20:40:22.000000000 +0100 +@@ -68,7 +68,7 @@ + distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = aspell hspell ispell ++DIST_SUBDIRS = enchant aspell hspell ispell + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 1 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +@@ -377,7 +377,7 @@ + xdg_menudir = @xdg_menudir@ + @include_aspell_plugin_TRUE@LIBASPELLPLUGIN = aspell + @include_hspell_plugin_TRUE@LIBHSPELLPLUGIN = hspell +-SUBDIRS = $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell ++SUBDIRS = enchant $(LIBASPELLPLUGIN) $(LIBHSPELLPLUGIN) ispell + #>- all: all-recursive + #>+ 1 + all: docs-am all-recursive diff --git a/kdelibs-3.5.8-kspell2-no-ispell.patch b/kdelibs-3.5.8-kspell2-no-ispell.patch new file mode 100644 index 0000000..9ee06c2 --- /dev/null +++ b/kdelibs-3.5.8-kspell2-no-ispell.patch @@ -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 diff --git a/kdelibs.spec b/kdelibs.spec index 161613b..fc54dac 100644 --- a/kdelibs.spec +++ b/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 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 - 3.5.8-21 - updated Flash patch