SOURCES: kdelibs-lib_loader.patch (NEW), kdelibs-kill_la_loader.pa...

[pluto]

Author: pluto                        Date: Mon Dec 18 11:03:28 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- better solution.

---- Files affected:
SOURCES:
   kdelibs-lib_loader.patch (NONE -> 1.1)  (NEW), kdelibs-kill_la_loader.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SOURCES/kdelibs-lib_loader.patch
diff -u /dev/null SOURCES/kdelibs-lib_loader.patch:1.1
--- /dev/null	Mon Dec 18 12:03:28 2006
+++ SOURCES/kdelibs-lib_loader.patch	Mon Dec 18 12:03:23 2006
@@ -0,0 +1,40 @@
+--- kdelibs-3.5.5/kdecore/klibloader.cpp.orig	2006-01-19 17:06:18.000000000 +0000
++++ kdelibs-3.5.5/kdecore/klibloader.cpp	2006-12-18 09:09:18.073572750 +0000
+@@ -341,7 +341,7 @@
+     if (pos < 0)
+       pos = 0;
+     if (libname.find('.', pos) < 0)
+-      libname += ".la";
++      libname += ".so";
+     return libname;
+ }
+ 
+--- kdelibs-3.5.5/kinit/kinit.cpp.orig	2006-10-01 17:33:32.000000000 +0000
++++ kdelibs-3.5.5/kinit/kinit.cpp	2006-12-18 09:10:22.425406500 +0000
+@@ -447,7 +447,7 @@
+   {
+      /* 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 );
+@@ -458,7 +458,7 @@
+      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;
+@@ -1807,7 +1807,7 @@
+ #ifndef __CYGWIN__
+    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());
+    }
================================================================