TDE
/
kmplayer
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer
0
0
Fork 0
Code Issues Releases Wiki Activity

Convert remaining references to kde3 (e.g. in paths) to trinity

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmplayer@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent cdbd0571ba
commit ace145bd99
7 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File

2
Makefile.am
Unescape View File

@ -1,4 +1,4 @@
if need_kde33_compatibility
if need_trinity3_compatibility
KDE33PROTOCOLS = protocols
endif

40
acinclude.m4
Unescape View File

@ -479,14 +479,14 @@ if test "$1" = "default"; then
if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2'
else
kde_moduledir='\${libdir}/kde3'
kde_moduledir='\${libdir}/trinity'
fi
fi
if test -z "$kde_styledir"; then
kde_styledir='\${libdir}/kde3/plugins/styles'
kde_styledir='\${libdir}/trinity/plugins/styles'
fi
if test -z "$kde_widgetdir"; then
kde_widgetdir='\${libdir}/kde3/plugins/designer'
kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi
if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde'
@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS
@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
kde32ornewer=1
kde33ornewer=1
trinity2ornewer=1
trinity3ornewer=1
if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
kde32ornewer=
kde33ornewer=
trinity2ornewer=
trinity3ornewer=
else
if test "$kde_qtver" = "3"; then
if test "$kde_qtsubver" -le 1; then
kde32ornewer=
trinity2ornewer=
fi
if test "$kde_qtsubver" -le 2; then
kde33ornewer=
trinity3ornewer=
fi
if test "$KDECONFIG" != "compiled"; then
if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
kde33ornewer=
trinity3ornewer=
fi
fi
fi
fi
if test -n "$kde32ornewer"; then
if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$kde33ornewer"; then
if test -n "$trinity3ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
DCOP_DEPENDENCIES='$(DCOPIDL)'
if test -n "$kde32ornewer"; then
if test -n "$trinity2ornewer"; then
KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
AC_SUBST(KCONFIG_COMPILER)
@ -1793,7 +1793,7 @@ fi
if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@ -1805,7 +1805,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!])
fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO
dnl this might be somewhere else
AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([
@ -1821,14 +1821,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!])
fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
fi
if test -n "$kde_widgetdir"; then
kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi

24
configure.in
Unescape View File

@ -282,9 +282,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.3
#endif
],
need_kde33_compat="no"
need_trinity3_compat="no"
,
need_kde33_compat="yes"
need_trinity3_compat="yes"
)
AC_COMPILE_IFELSE([
@ -293,9 +293,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.2
#endif
],
need_kde32_compat="no"
need_trinity2_compat="no"
,
need_kde32_compat="yes"
need_trinity2_compat="yes"
)
AC_COMPILE_IFELSE([
@ -304,26 +304,26 @@ AC_COMPILE_IFELSE([
#error KDE 3.1
#endif
],
need_kde31_compat="no"
need_trinity1_compat="no"
,
need_kde31_compat="yes"
need_trinity1_compat="yes"
)
CXXFLAGS="$kdeversion_save_CXXFLAGS"
LIBS="$kdeversion_safe_LIBS"
AC_LANG_RESTORE
if test "$need_kde32_compat" = "yes"; then
if test "$need_trinity2_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.2.x])
fi
if test "$need_kde31_compat" = "yes"; then
if test "$need_trinity1_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.1.x])
fi
AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes")
AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes")
AM_CONDITIONAL(need_kde31_compatibility, test "$need_kde31_compat" = "yes")
AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes")
AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes")
AM_CONDITIONAL(need_trinity1_compatibility, test "$need_trinity1_compat" = "yes")
KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ])
@ -344,7 +344,7 @@ AC_CONFIG_FILES([ mimetypes/Makefile ])
AC_CONFIG_FILES([ mimetypes/application/Makefile ])
AC_CONFIG_FILES([ mimetypes/audio/Makefile ])
AC_CONFIG_FILES([ mimetypes/video/Makefile ])
AC_CONFIG_FILES([ mimetypes/video/kde31/Makefile ])
AC_CONFIG_FILES([ mimetypes/video/trinity1/Makefile ])
AC_CONFIG_FILES([ po/Makefile ])
AC_CONFIG_FILES([ protocols/Makefile ])
AC_CONFIG_FILES([ src/Makefile ])

22
configure.in.in
Unescape View File

@ -217,9 +217,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.3
#endif
],
need_kde33_compat="no"
need_trinity3_compat="no"
,
need_kde33_compat="yes"
need_trinity3_compat="yes"
)
AC_COMPILE_IFELSE([
@ -228,9 +228,9 @@ AC_COMPILE_IFELSE([
#error KDE 3.2
#endif
],
need_kde32_compat="no"
need_trinity2_compat="no"
,
need_kde32_compat="yes"
need_trinity2_compat="yes"
)
AC_COMPILE_IFELSE([
@ -239,24 +239,24 @@ AC_COMPILE_IFELSE([
#error KDE 3.1
#endif
],
need_kde31_compat="no"
need_trinity1_compat="no"
,
need_kde31_compat="yes"
need_trinity1_compat="yes"
)
CXXFLAGS="$kdeversion_save_CXXFLAGS"
LIBS="$kdeversion_safe_LIBS"
AC_LANG_RESTORE
if test "$need_kde32_compat" = "yes"; then
if test "$need_trinity2_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.2.x])
fi
if test "$need_kde31_compat" = "yes"; then
if test "$need_trinity1_compat" = "yes"; then
AC_MSG_RESULT([KDE 3.1.x])
fi
AM_CONDITIONAL(need_kde33_compatibility, test "$need_kde33_compat" = "yes")
AM_CONDITIONAL(need_kde32_compatibility, test "$need_kde32_compat" = "yes")
AM_CONDITIONAL(need_kde31_compatibility, test "$need_kde31_compat" = "yes")
AM_CONDITIONAL(need_trinity3_compatibility, test "$need_trinity3_compat" = "yes")
AM_CONDITIONAL(need_trinity2_compatibility, test "$need_trinity2_compat" = "yes")
AM_CONDITIONAL(need_trinity1_compatibility, test "$need_trinity1_compat" = "yes")

2
mimetypes/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
if need_kde32_compatibility
if need_trinity2_compatibility
KDE32MIMEDIR = audio
endif

4
mimetypes/video/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
if need_kde31_compatibility
KDE31MIMEDIR = kde31
if need_trinity1_compatibility
KDE31MIMEDIR = trinity1
endif
SUBDIRS = . $(KDE31MIMEDIR)

2
src/kmplayer_part.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <tqpushbutton.h>
#include <tqslider.h>
class KXMLGUIClient; // workaround for kde3.3 on sarge with gcc4, kactioncollection.h does not forward declare KXMLGUIClient
class KXMLGUIClient; // workaround for trinity.3 on sarge with gcc4, kactioncollection.h does not forward declare KXMLGUIClient
#include <klibloader.h>
#include <kdebug.h>
#include <kconfig.h>

Write Preview
Loading…
Cancel
Save