From f629c284059b75ab5b2d654e9a4132b1fc7f73e8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:08:27 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- ChangeLog | 4 +-- acinclude.m4 | 26 +++++++++---------- katapult/katapult/Makefile.am | 2 +- katapult/katapult/katapult.cpp | 2 +- katapult/katapult/katapultsettings.cpp | 2 +- .../catalogs/amarokcatalog/amarokcatalog.cpp | 4 +-- .../bookmarkcatalog/bookmarkcatalog.cpp | 4 +-- .../calculatorcatalog/calculatorcatalog.cpp | 4 +-- .../documentcatalog/documentcatalog.cpp | 4 +-- .../plugins/catalogs/execcatalog/command.h | 2 +- .../catalogs/execcatalog/execcatalog.cpp | 4 +-- .../catalogs/googlecatalog/googlecatalog.cpp | 4 +-- .../plugins/catalogs/googlecatalog/query.h | 2 +- .../programcatalog/programcatalog.cpp | 4 +-- .../catalogs/spellcatalog/spellcatalog.cpp | 4 +-- .../plugins/catalogs/spellcatalog/spelling.h | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 672b83d..5ab4509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -467,7 +467,7 @@ committer: Martin Meredith branch nick: 0.3.x-dev timestamp: Tue 2006-03-07 03:34:35 +0000 message: - - Added kimproxy stuff + - Added tdeimproxy stuff - Provided by John Tapsell tapsell@kde.org - Added ability to remove items from cache - Provided by John Tapsell tapsell@kde.org @@ -476,7 +476,7 @@ message: revno: 34.1.2 merged: mez@ubuntu.com-20060307023522-5f6d00974dee0118 committer: Martin Meredith - branch nick: kimproxy + branch nick: tdeimproxy timestamp: Tue 2006-03-07 02:35:22 +0000 message: Added kim_proxy stuff diff --git a/acinclude.m4 b/acinclude.m4 index be9a254..28598a6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2066,16 +2066,16 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2083,13 +2083,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2538,7 +2538,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3480,7 +3480,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) diff --git a/katapult/katapult/Makefile.am b/katapult/katapult/Makefile.am index af3f9c5..881d19d 100644 --- a/katapult/katapult/Makefile.am +++ b/katapult/katapult/Makefile.am @@ -16,7 +16,7 @@ bin_PROGRAMS = katapult # the application source, library search path, and link libraries katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \ katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel -katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor katapult_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la # this is where the desktop file will go diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 660b8e9..1f5ae44 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index b283ed0..522592c 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp index 0bade79..991dc72 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp @@ -21,8 +21,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp index c8391af..20bb887 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index e8ae53c..dbb006f 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -22,8 +22,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp index 587b119..c1d772a 100644 --- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp +++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/execcatalog/command.h b/katapult/plugins/catalogs/execcatalog/command.h index 010de1e..4ed1ef9 100644 --- a/katapult/plugins/catalogs/execcatalog/command.h +++ b/katapult/plugins/catalogs/execcatalog/command.h @@ -26,7 +26,7 @@ #ifndef COMMAND_H #define COMMAND_H -#include +#include #include diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp index 9aed4e8..b4f136d 100644 --- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp +++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp @@ -25,8 +25,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp index 0db0782..4f65d0c 100644 --- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp +++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp @@ -25,8 +25,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include diff --git a/katapult/plugins/catalogs/googlecatalog/query.h b/katapult/plugins/catalogs/googlecatalog/query.h index 75f43dc..db5a5b5 100644 --- a/katapult/plugins/catalogs/googlecatalog/query.h +++ b/katapult/plugins/catalogs/googlecatalog/query.h @@ -26,7 +26,7 @@ #ifndef QUERY_H #define QUERY_H -#include +#include #include diff --git a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp index ef5ac83..d0d9854 100644 --- a/katapult/plugins/catalogs/programcatalog/programcatalog.cpp +++ b/katapult/plugins/catalogs/programcatalog/programcatalog.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include #include diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp index 0e75cd8..9303674 100644 --- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp @@ -25,8 +25,8 @@ ***************************************************************************/ #include -#include -#include +#include +#include #include #include diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.h b/katapult/plugins/catalogs/spellcatalog/spelling.h index 40dceaa..17fa298 100644 --- a/katapult/plugins/catalogs/spellcatalog/spelling.h +++ b/katapult/plugins/catalogs/spellcatalog/spelling.h @@ -23,7 +23,7 @@ #ifndef SPELLING_H #define SPELLING_H -#include +#include #include