From 6c9da07ccab622dc5766283a8074d899c4908e73 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 14 May 2012 19:38:06 -0500
Subject: [PATCH] Fix kstartperf failure This closes Bug 854 (cherry picked
 from commit 1de68cb32ec6b702879793828653e85ec3bcc5e1)

---
 kstartperf/Makefile.am     |  3 +--
 kstartperf/kstartperf.cpp  |  2 +-
 kstartperf/libkstartperf.c | 17 +++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kstartperf/Makefile.am b/kstartperf/Makefile.am
index 42d9c21a..89355fc2 100644
--- a/kstartperf/Makefile.am
+++ b/kstartperf/Makefile.am
@@ -1,8 +1,7 @@
 INCLUDES = $(all_includes)
 
 lib_LTLIBRARIES = libkstartperf.la
-libkstartperf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -version-info 1:0 -no-undefined
-# libkstartperf_la_LIBADD = ../libltdl/libltdlc.la
+libkstartperf_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -ldl -version-info 1:0 -no-undefined
 libkstartperf_la_SOURCES = libkstartperf.c
 
 bin_PROGRAMS = kstartperf
diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp
index ca8dfcec..a39c6e2e 100644
--- a/kstartperf/kstartperf.cpp
+++ b/kstartperf/kstartperf.cpp
@@ -2,7 +2,7 @@
  *
  * $Id$
  *
- * This file is part of the KDE project, module kstartperf.
+ * This file is part of the TDE project, module kstartperf.
  * Copyright (C) 2000 Geert Jansen <jansen@kde.org> 
  *
  * You can freely redistribute this program under the "Artistic License".
diff --git a/kstartperf/libkstartperf.c b/kstartperf/libkstartperf.c
index 3c8deae0..9c6a0954 100644
--- a/kstartperf/libkstartperf.c
+++ b/kstartperf/libkstartperf.c
@@ -23,8 +23,7 @@
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
-#include <ltdl.h>
-
+#include <dlfcn.h>
 
 /* Prototypes */
 
@@ -64,26 +63,28 @@ int XMapRaised(Display * d, Window w)
 
 void KDE_InterceptXMapRequest(Display * d, Window w)
 {
-    lt_dlhandle handle;
+    void * handle;
+
 
-    handle = lt_dlopen("libX11.so");
+    handle = dlopen("libX11.so", (RTLD_LAZY | RTLD_GLOBAL));
     if (handle == 0L)
-	handle = lt_dlopen("libX11.so.6");
+	handle = dlopen("libX11.so.6", (RTLD_LAZY | RTLD_GLOBAL));
 
     if (handle == 0L)
     {
-	fprintf(stderr, "kstartperf: Could not dlopen libX11\n");
+        const char * ltdlError = dlerror();
+	fprintf(stderr, "kstartperf: Could not dlopen libX11: %s\n", ltdlError);
 	exit(1);
     }
 
-    KDE_RealXMapWindow = (KDE_XMapRequestSignature)lt_dlsym(handle, "XMapWindow");
+    KDE_RealXMapWindow = (KDE_XMapRequestSignature)dlsym(handle, "XMapWindow");
     if (KDE_RealXMapWindow == 0L)
     {
 	fprintf(stderr, "kstartperf: Could not find symbol XMapWindow in libX11\n");
 	exit(1);
     }
 
-    KDE_RealXMapRaised = (KDE_XMapRequestSignature)lt_dlsym(handle, "XMapRaised");
+    KDE_RealXMapRaised = (KDE_XMapRequestSignature)dlsym(handle, "XMapRaised");
     if (KDE_RealXMapRaised == 0L)
     {
 	fprintf(stderr, "kstartperf: Could not find symbol XMapRaised in libX11\n");