Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 9 years ago
parent
commit
f629c28405
  1. 4
      ChangeLog
  2. 26
      acinclude.m4
  3. 2
      katapult/katapult/Makefile.am
  4. 2
      katapult/katapult/katapult.cpp
  5. 2
      katapult/katapult/katapultsettings.cpp
  6. 4
      katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
  7. 4
      katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp
  8. 4
      katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
  9. 4
      katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
  10. 2
      katapult/plugins/catalogs/execcatalog/command.h
  11. 4
      katapult/plugins/catalogs/execcatalog/execcatalog.cpp
  12. 4
      katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
  13. 2
      katapult/plugins/catalogs/googlecatalog/query.h
  14. 4
      katapult/plugins/catalogs/programcatalog/programcatalog.cpp
  15. 4
      katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
  16. 2
      katapult/plugins/catalogs/spellcatalog/spelling.h

4
ChangeLog

@ -467,7 +467,7 @@ committer: Martin Meredith <mez@ubuntu.com>
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 <mez@ubuntu.com>
branch nick: kimproxy
branch nick: tdeimproxy
timestamp: Tue 2006-03-07 02:35:22 +0000
message:
Added kim_proxy stuff

26
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)

2
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

2
katapult/katapult/katapult.cpp

@ -24,7 +24,7 @@
#include <twin.h>
#include <kkeydialog.h>
#include <kaction.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <kpassivepopup.h>
#include <kpopupmenu.h>
#include <klocale.h>

2
katapult/katapult/katapultsettings.cpp

@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kconfig.h>
#include <kparts/componentfactory.h>
#include <tdeparts/componentfactory.h>
#include <klocale.h>
#include <tqstring.h>

4
katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp

@ -21,8 +21,8 @@
***************************************************************************/
#include <kapplication.h>
#include <ksycocaentry.h>
#include <ksycocatype.h>
#include <tdesycocaentry.h>
#include <tdesycocatype.h>
#include <knuminput.h>
#include <kurl.h>
#include <kapp.h>

4
katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp

@ -19,8 +19,8 @@
***************************************************************************/
#include <kservicegroup.h>
#include <ksycocaentry.h>
#include <ksycocatype.h>
#include <tdesycocaentry.h>
#include <tdesycocatype.h>
#include <kapplication.h>
#include <kbookmarkmanager.h>
#include <kbookmark.h>

4
katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp

@ -22,8 +22,8 @@
***************************************************************************/
#include <kservicegroup.h>
#include <ksycocaentry.h>
#include <ksycocatype.h>
#include <tdesycocaentry.h>
#include <tdesycocatype.h>
#include <kapplication.h>
#include <knuminput.h>
#include <kcombobox.h>

4
katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp

@ -19,8 +19,8 @@
***************************************************************************/
#include <kservicegroup.h>
#include <ksycocaentry.h>
#include <ksycocatype.h>
#include <tdesycocaentry.h>
#include <tdesycocatype.h>
#include <kapplication.h>
#include <knuminput.h>
#include <kcombobox.h>

2
katapult/plugins/catalogs/execcatalog/command.h

@ -26,7 +26,7 @@
#ifndef COMMAND_H
#define COMMAND_H
#include <kspell.h>
#include <tdespell.h>
#include <katapultitem.h>

4
katapult/plugins/catalogs/execcatalog/execcatalog.cpp

@ -25,8 +25,8 @@
***************************************************************************/
#include <kservicegroup.h>
#include <ksycocaentry.h>
#include <ksycocatype.h>
#include <tdesycocaentry.h>
#include <tdesycocatype.h>
#include <kapplication.h>
#include <tqlineedit.h>

4
katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp

@ -25,8 +25,8 @@
***************************************************************************/
#include <kservicegroup.h>
#include <ksycocaentry.h>
#include <ksycocatype.h>
#include <tdesycocaentry.h>
#include <tdesycocatype.h>
#include <kapplication.h>
#include <tqlineedit.h>

2
katapult/plugins/catalogs/googlecatalog/query.h

@ -26,7 +26,7 @@
#ifndef QUERY_H
#define QUERY_H
#include <kspell.h>
#include <tdespell.h>
#include <katapultitem.h>

4
katapult/plugins/catalogs/programcatalog/programcatalog.cpp

@ -19,8 +19,8 @@
***************************************************************************/
#include <kservicegroup.h>
#include <ksycocaentry.h>
#include <ksycocatype.h>
#include <tdesycocaentry.h>
#include <tdesycocatype.h>
#include <kapplication.h>
#include <knuminput.h>
#include <kcombobox.h>

4
katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp

@ -25,8 +25,8 @@
***************************************************************************/
#include <kservicegroup.h>
#include <ksycocaentry.h>
#include <ksycocatype.h>
#include <tdesycocaentry.h>
#include <tdesycocatype.h>
#include <kapplication.h>
#include <tqlineedit.h>

2
katapult/plugins/catalogs/spellcatalog/spelling.h

@ -23,7 +23,7 @@
#ifndef SPELLING_H
#define SPELLING_H
#include <kspell.h>
#include <tdespell.h>
#include <katapultitem.h>

Loading…
Cancel
Save