Группа :: Графические оболочки/KDE
Пакет: kdelibs
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: kdelibs-3.3.0-alt_la2so.patch
--- kdelibs-3.3.0/kdecore/klibloader.cpp.orig 2004-07-17 23:22:32 +0400
+++ kdelibs-3.3.0/kdecore/klibloader.cpp 2004-09-27 20:31:46 +0400
@@ -344,7 +344,9 @@ static inline QCString makeLibName( cons
if (pos < 0)
pos = 0;
if (libname.find('.', pos) < 0)
- libname += ".la";
+ libname += ".so";
+ if (libname.right(3) == ".la")
+ libname = libname.replace( qstrlen(libname) - 4, 3, ".so");
return libname;
}
--- kdelibs-3.1.94.old/kdeprint/lpr/kmlprmanager.cpp 2003-07-30 10:51:34 +0400
+++ kdelibs-3.1.94/kdeprint/lpr/kmlprmanager.cpp 2004-01-13 19:45:41 +0300
@@ -137,7 +137,7 @@ void KMLprManager::initHandlers()
insertHandler(new LPRngToolHandler(this));
// now load external handlers
- QStringList l = KGlobal::dirs()->findAllResources("data", "kdeprint/lpr/*.la");
+ QStringList l = KGlobal::dirs()->findAllResources("data", "kdeprint/lpr/*.so");
for (QStringList::ConstIterator it=l.begin(); it!=l.end(); ++it)
{
KLibrary *library = KLibLoader::self()->library(QFile::encodeName(*it));
--- kdelibs-3.1.94.old/kinit/kinit.cpp 2003-11-30 12:47:05 +0300
+++ kdelibs-3.1.94/kinit/kinit.cpp 2004-01-13 19:46:01 +0300
@@ -400,7 +400,7 @@ static pid_t launch(int argc, const char
{
/* Relative name without '.la' */
name = _name;
- lib = name + ".la";
+ lib = name + ".so";
exec = name;
libpath = QFile::encodeName(KLibLoader::findLibrary( lib, s_instance ));
execpath = execpath_avoid_loops( exec, envc, envs, avoid_loops );
@@ -411,7 +411,7 @@ static pid_t launch(int argc, const char
name = _name;
name = name.mid( name.findRev('/') + 1);
exec = _name;
- if (lib.right(3) == ".la")
+ if (lib.right(3) == ".so")
libpath = lib;
else
execpath = exec;
@@ -1714,7 +1714,7 @@ int main(int argc, char **argv, char **e
if (!d.suicide && !getenv("KDE_IS_PRELINKED"))
{
- QString konq = locate("lib", "libkonq.la", s_instance);
+ QString konq = locate("lib", "libkonq.so", s_instance);
if (!konq.isEmpty())
(void) lt_dlopen(QFile::encodeName(konq).data());
}
--- kdelibs-3.1.94.old/kstyles/utils/installtheme/main.cpp 2003-06-26 10:55:25 +0400
+++ kdelibs-3.1.94/kstyles/utils/installtheme/main.cpp 2004-01-13 19:45:46 +0300
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
config.setGroup( "KDE" );
- if (config.readEntry( "widgetStyle" ) == "basicstyle.la")
+ if (config.readEntry( "widgetStyle" ) == "basicstyle.so")
{
//OK, emit a style entry...
if (!themes.contains(name)) //Only add first occurrence, i.e. user local one.