TDE
/
kdiff3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
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/kdiff3@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 721c5c4ee3
commit f3d0a7eac1
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

4
README
Unescape View File

@ -75,7 +75,7 @@ Installation for KDE3:
If it doesn't contain the correct path, type If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3) export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
- cd into the directory kdiff3-0.9.91 and type - cd into the directory kdiff3-0.9.91 and type
- ./configure --prefix=/opt/kde3 (your KDE3 directory here) - ./configure --prefix=/opt/trinity (your KDE3 directory here)
- (make clean) (Required if you already compiled once.) - (make clean) (Required if you already compiled once.)
- make (Run compilation) - make (Run compilation)
- make install (You must have root-rights for this step.) - make install (You must have root-rights for this step.)
@ -88,7 +88,7 @@ Installation for KDE3:
This command should tell you: kde-config --prefix This command should tell you: kde-config --prefix
For SuSE and most distributions the prefix usually is /opt/kde3. For SuSE and most distributions the prefix usually is /opt/trinity.
For Redhat/Fedora and Mandrake the prefix usually is /usr. For Redhat/Fedora and Mandrake the prefix usually is /usr.
For a local installation, that doesn't need root rights try For a local installation, that doesn't need root rights try
- ./configure --prefix=$KDEHOME ($KDEHOME probably is the same as $HOME/.kde) - ./configure --prefix=$KDEHOME ($KDEHOME probably is the same as $HOME/.kde)

40
acinclude.m4
Unescape View File

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

14
config.log
Unescape View File

@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
It was created by configure, which was It was created by configure, which was
generated by GNU Autoconf 2.61. Invocation command line was generated by GNU Autoconf 2.61. Invocation command line was
$ ./configure --disable-rpath --prefix=/opt/kde3 --with-qt-includes=/usr/include/qt3 --host=x86_64-linux-gnu --build=x86_64-linux-gnu --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde $ ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=x86_64-linux-gnu --build=x86_64-linux-gnu --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
## --------- ## ## --------- ##
## Platform. ## ## Platform. ##
@ -27,9 +27,9 @@ uname -v = #53-Ubuntu SMP Tue Dec 8 04:02:15 UTC 2009
/usr/bin/oslevel = unknown /usr/bin/oslevel = unknown
/bin/universe = unknown /bin/universe = unknown
PATH: /opt/kde3/bin PATH: /opt/trinity/bin
PATH: /opt/kde3/games PATH: /opt/trinity/games
PATH: /opt/kde3/bin PATH: /opt/trinity/bin
PATH: /home/eldarion/bin PATH: /home/eldarion/bin
PATH: /usr/local/sbin PATH: /usr/local/sbin
PATH: /usr/local/bin PATH: /usr/local/bin
@ -295,7 +295,7 @@ include_libkonq_TRUE=''
include_x11_FALSE='' include_x11_FALSE=''
include_x11_TRUE='' include_x11_TRUE=''
includedir='${prefix}/include' includedir='${prefix}/include'
infodir='/opt/kde3/share/info' infodir='/opt/trinity/share/info'
install_sh='' install_sh=''
kde_appsdir='' kde_appsdir=''
kde_bindir='' kde_bindir=''
@ -324,11 +324,11 @@ libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec' libexecdir='${exec_prefix}/libexec'
localedir='${datarootdir}/locale' localedir='${datarootdir}/locale'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
mandir='/opt/kde3/share/man' mandir='/opt/trinity/share/man'
mkdir_p='' mkdir_p=''
oldincludedir='/usr/include' oldincludedir='/usr/include'
pdfdir='${docdir}' pdfdir='${docdir}'
prefix='/opt/kde3' prefix='/opt/trinity'
program_transform_name='s,x,x,' program_transform_name='s,x,x,'
psdir='${docdir}' psdir='${docdir}'
qt_includes='' qt_includes=''

2
doc/README
Unescape View File

@ -24,7 +24,7 @@ file into HTML.
meinproc index.docbook meinproc index.docbook
If you prefer everything in one big HTML/Postscript/PDF-file: If you prefer everything in one big HTML/Postscript/PDF-file:
LANG=de_DE meinproc --check index.docbook --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-nochunk.xsl LANG=de_DE meinproc --check index.docbook --stylesheet /opt/trinity/share/apps/ksgmltools2/customization/kde-nochunk.xsl
(The LANG=de_DE prevents that meinproc writes the file in UTF-8 encoding, which isn't understood by html2ps.) (The LANG=de_DE prevents that meinproc writes the file in UTF-8 encoding, which isn't understood by html2ps.)
Create ps-file: Create ps-file:
html2ps -D -u -n index.html >index.ps html2ps -D -u -n index.html >index.ps

2
doc/createpdfdoc
Unescape View File

@ -1,7 +1,7 @@
for i in `find * -maxdepth 0 -type d`; do for i in `find * -maxdepth 0 -type d`; do
cd $i cd $i
echo $i echo $i
LANG=de_DE meinproc --check index.docbook --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-nochunk.xsl LANG=de_DE meinproc --check index.docbook --stylesheet /opt/trinity/share/apps/ksgmltools2/customization/kde-nochunk.xsl
html2ps -D -u -n index.html >index.ps html2ps -D -u -n index.html >index.ps
ps2pdf index.ps ../kdiff3_$i.pdf ps2pdf index.ps ../kdiff3_$i.pdf
cd .. cd ..

2
kdiff3.kdevelop
Unescape View File

@ -43,7 +43,7 @@
<cxxflags>-O2 -g0</cxxflags> <cxxflags>-O2 -g0</cxxflags>
</optimized> </optimized>
<debug> <debug>
<configargs>--enable-debug=full --prefix=/opt/kde3</configargs> <configargs>--enable-debug=full --prefix=/opt/trinity</configargs>
<builddir>debug</builddir> <builddir>debug</builddir>
<ccompiler>kdevgccoptions</ccompiler> <ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler> <cxxcompiler>kdevgppoptions</cxxcompiler>

2
kdiff3.spec
Unescape View File

@ -53,7 +53,7 @@ source /etc/profile.d/qt.sh
%{_datadir}/locale/* %{_datadir}/locale/*
%{_datadir}/man/man1/kdiff3* %{_datadir}/man/man1/kdiff3*
%{_datadir}/services/kdiff3* %{_datadir}/services/kdiff3*
%{_libdir}/kde3/libkdiff3* %{_libdir}/trinity/libkdiff3*
%changelog %changelog
* Mon May 15 2006 Vadim Likhota <vadim-lvv@yandex.ru> - 0.9.90-1.fc * Mon May 15 2006 Vadim Likhota <vadim-lvv@yandex.ru> - 0.9.90-1.fc

6
kdiff3plugin/po/Makefile
Unescape View File

@ -262,15 +262,15 @@ kde_libs_htmldir = /usr/share/doc/kde/HTML
kde_libs_prefix = /usr kde_libs_prefix = /usr
kde_locale = ${datadir}/locale kde_locale = ${datadir}/locale
kde_mimedir = ${datadir}/mimelnk kde_mimedir = ${datadir}/mimelnk
kde_moduledir = ${libdir}/kde3 kde_moduledir = ${libdir}/trinity
kde_qtver = 3 kde_qtver = 3
kde_servicesdir = ${datadir}/services kde_servicesdir = ${datadir}/services
kde_servicetypesdir = ${datadir}/servicetypes kde_servicetypesdir = ${datadir}/servicetypes
kde_sounddir = ${datadir}/sounds kde_sounddir = ${datadir}/sounds
kde_styledir = ${libdir}/kde3/plugins/styles kde_styledir = ${libdir}/trinity/plugins/styles
kde_templatesdir = ${datadir}/templates kde_templatesdir = ${datadir}/templates
kde_wallpaperdir = ${datadir}/wallpapers kde_wallpaperdir = ${datadir}/wallpapers
kde_widgetdir = /usr/lib/kde3/plugins/designer kde_widgetdir = /usr/lib/trinity/plugins/designer
kdeinitdir = $(kde_moduledir) kdeinitdir = $(kde_moduledir)
libdir = ${exec_prefix}/lib libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec libexecdir = ${exec_prefix}/libexec

Write Preview
Loading…
Cancel
Save