Группа :: Разработка/KDE и QT
Пакет: kdesdk
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: kdesdk-3.1-fix-conflict-with-lam.patch
diff -pruN kdesdk-3.1.0.old/kmtrace/ksotrace.cpp kdesdk-3.1.0/kmtrace/ksotrace.cpp
--- kdesdk-3.1.0.old/kmtrace/ksotrace.cpp 2000-09-20 23:12:52 +0400
+++ kdesdk-3.1.0/kmtrace/ksotrace.cpp 2002-10-18 19:09:29 +0400
@@ -1,4 +1,4 @@
-#include "ktrace.h"
+#include "kde-ktrace.h"
#include <stdlib.h>
class KTraceActivate
diff -pruN kdesdk-3.1.0.old/kmtrace/Makefile.am kdesdk-3.1.0/kmtrace/Makefile.am
--- kdesdk-3.1.0.old/kmtrace/Makefile.am 2002-10-18 18:30:52 +0400
+++ kdesdk-3.1.0/kmtrace/Makefile.am 2002-10-18 19:09:25 +0400
@@ -47,4 +47,4 @@ libktrace_la_LIBADD = $(LIBDL)
data_DATA = kde.excludes
datadir = $(kde_datadir)/kmtrace
-include_HEADERS = ktrace.h
+include_HEADERS = kde-ktrace.h
diff -pruN kdesdk-3.1.0.old/kmtrace/README kdesdk-3.1.0/kmtrace/README
--- kdesdk-3.1.0.old/kmtrace/README 2002-10-18 18:30:52 +0400
+++ kdesdk-3.1.0/kmtrace/README 2002-10-18 19:11:13 +0400
@@ -8,7 +8,7 @@ THIS PROGRAM DEPENDS ON GLIBC! It does n
Howto use:
-Install the libktrace.so shared library, the ktrace.h header file, the
+Install the libktrace.so shared library, the kde-ktrace.h header file, the
and kde.excludes file and the kmtrace processing tool with:
make install
@@ -29,7 +29,7 @@ You can activate malloc logging by start
Take the KDE application that you want to investigate and add
- #include <ktrace.h>
+ #include <kde-ktrace.h>
Add as first statement in main():