瀏覽代碼

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

tags/r14.0.0
Timothy Pearson 6 年之前
父節點
當前提交
d04d2847e1
共有 8 個檔案被更改,包括 18 行新增18 行删除
  1. 4
    4
      acinclude.m4
  2. 3
    3
      kdirstat.spec
  3. 1
    1
      kdirstat/Makefile.am
  4. 1
    1
      kdirstat/kactivitytracker.cpp
  5. 2
    2
      kdirstat/kdirstatapp.cpp
  6. 4
    4
      kdirstat/kdirtree.cpp
  7. 2
    2
      kdirstat/kdirtree.h
  8. 1
    1
      kdirstat/ktreemapview.cpp

+ 4
- 4
acinclude.m4 查看文件

@@ -590,7 +590,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi

if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -1741,7 +1741,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi

if test -z "$1"; then
@@ -2037,7 +2037,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2047,7 +2047,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])

+ 3
- 3
kdirstat.spec 查看文件

@@ -64,7 +64,7 @@ make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
%dir /opt/trinity/share/icons/locolor/16x16/apps
%dir /opt/trinity/share/icons/locolor/32x32/apps
/opt/trinity/share/icons/??color/??x??/*/kdirstat*
%dir /opt/trinity/share/apps/kconf_update
/opt/trinity/share/apps/kconf_update/kdirstat.upd
/opt/trinity/share/apps/kconf_update/fix_move_to_trash_bin.pl
%dir /opt/trinity/share/apps/tdeconf_update
/opt/trinity/share/apps/tdeconf_update/kdirstat.upd
/opt/trinity/share/apps/tdeconf_update/fix_move_to_trash_bin.pl


+ 1
- 1
kdirstat/Makefile.am 查看文件

@@ -53,7 +53,7 @@ EXTRA_DIST = \
hi16-app-kdirstat.png


updatedir = $(kde_datadir)/kconf_update
updatedir = $(kde_datadir)/tdeconf_update
update_DATA = kdirstat.upd
update_SCRIPTS = fix_move_to_trash_bin.pl


+ 1
- 1
kdirstat/kactivitytracker.cpp 查看文件

@@ -11,7 +11,7 @@

#include <kapp.h>
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "kactivitytracker.h"



+ 2
- 2
kdirstat/kdirstatapp.cpp 查看文件

@@ -17,8 +17,8 @@
#include <kaccel.h>
#include <kaction.h>
#include <kapp.h>
#include <kconfig.h>
#include <kfiledialog.h>
#include <tdeconfig.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmenubar.h>

+ 4
- 4
kdirstat/kdirtree.cpp 查看文件

@@ -14,13 +14,13 @@
#include <tqtimer.h>
#include <kapp.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "kdirtree.h"
#include "kdirtreeiterators.h"
#include "kdirtreeview.h"
#include "kdirsaver.h"
#include "kio/job.h"
#include "kio/netaccess.h"
#include "tdeio/job.h"
#include "tdeio/netaccess.h"

#define HAVE_STUPID_COMPILER 0

@@ -1556,7 +1556,7 @@ KDirStat::fixedUrl( const TQString & dirtyUrl )
}


// Strip off the rightmost slash - some kioslaves (e.g. 'tar') can't handle that.
// Strip off the rightmost slash - some tdeioslaves (e.g. 'tar') can't handle that.

TQString path = url.path();


+ 2
- 2
kdirstat/kdirtree.h 查看文件

@@ -21,8 +21,8 @@
#include <dirent.h>
#include <tqptrqueue.h>
#include <kdebug.h>
#include <kfileitem.h>
#include <kio/jobclasses.h>
#include <tdefileitem.h>
#include <tdeio/jobclasses.h>

#ifndef NOT_USED
# define NOT_USED(PARAM) ( (void) (PARAM) )

+ 1
- 1
kdirstat/ktreemapview.cpp 查看文件

@@ -14,7 +14,7 @@
#include <tqregexp.h>

#include <kapp.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <klocale.h>


Loading…
取消
儲存