Quellcode durchsuchen

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

tags/r14.0.0
Timothy Pearson vor 7 Jahren
Ursprung
Commit
0923f15537
13 geänderte Dateien mit 25 neuen und 25 gelöschten Zeilen
  1. +1
    -1
      TODO
  2. +4
    -4
      acinclude.m4
  3. +4
    -4
      aclocal.m4
  4. +1
    -1
      systemsettings/HACKING
  5. +2
    -2
      systemsettings/menu/Makefile.am
  6. +1
    -1
      systemsettings/menu/audioencoding.desktop
  7. +1
    -1
      systemsettings/menu/defaultapplication.desktop
  8. +5
    -5
      systemsettings/menu/kcm_knetwortdeconfmodule_ss.desktop
  9. +1
    -1
      systemsettings/menu/kcmfontinst.desktop
  10. +1
    -1
      systemsettings/menu/laptop.desktop
  11. +1
    -1
      systemsettings/menu/medianotifications.desktop
  12. +2
    -2
      systemsettings/menu/system-settings.menu
  13. +1
    -1
      systemsettings/tdecmodulemenu.h

+ 1
- 1
TODO Datei anzeigen

@@ -18,6 +18,6 @@ Modules
Search
-Make search smaller and on the right
-Grep docs?
-Tie into kconfigXT somehow?
-Tie into tdeconfigXT somehow?
-Look at Spotlight
-Task oriented?

+ 4
- 4
acinclude.m4 Datei anzeigen

@@ -602,7 +602,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
if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,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
@@ -2094,7 +2094,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")
@@ -2104,7 +2104,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
])


+ 4
- 4
aclocal.m4 Datei anzeigen

@@ -614,7 +614,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
if test -n "$trinity3ornewer"; then
@@ -1800,7 +1800,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
@@ -2106,7 +2106,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")
@@ -2116,7 +2116,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
])


+ 1
- 1
systemsettings/HACKING Datei anzeigen

@@ -28,4 +28,4 @@ Also don't forget to install the ui file.
And the desktop file.
-share/applications/tde/systemsettings.desktop

When you change (or install) any of the first three files make sure to run kbuildsycoca to re-generate the cache files or log out and back in.
When you change (or install) any of the first three files make sure to run tdebuildsycoca to re-generate the cache files or log out and back in.

+ 2
- 2
systemsettings/menu/Makefile.am Datei anzeigen

@@ -1,5 +1,5 @@
#temporary till KDE4 and it can be renamed
xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetworkconfmodule_ss.desktop laptop.desktop medianotifications.desktop
xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetwortdeconfmodule_ss.desktop laptop.desktop medianotifications.desktop

xdg_menu_DATA = system-settings.menu

@@ -33,4 +33,4 @@ tde-settings-windowbehavior.directory \
system-settings.directory

#install-data-local:
# kbuildsycoca
# tdebuildsycoca

+ 1
- 1
systemsettings/menu/audioencoding.desktop Datei anzeigen

@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Exec=kcmshell audiocd
Exec=tdecmshell audiocd
Icon=cdaudio_unmount
Type=Application



+ 1
- 1
systemsettings/menu/defaultapplication.desktop Datei anzeigen

@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Exec=kcmshell defaultapplication
Exec=tdecmshell defaultapplication
Icon=blockdevice
Type=Application



systemsettings/menu/kcm_knetworkconfmodule_ss.desktop → systemsettings/menu/kcm_knetwortdeconfmodule_ss.desktop Datei anzeigen

@@ -3,12 +3,12 @@ X-TDE-RootOnly=true
## Keep this out of kcontrol
#Categories=Qt;TDE;Settings;X-TDE-settings-network;Configuration-TDE-Network-mdk;
X-TDE-ModuleType=Library
X-TDE-Library=knetworkconfmodule
X-TDE-FactoryName=knetworkconfmodule
X-TDE-Library=knetwortdeconfmodule
X-TDE-FactoryName=knetwortdeconfmodule
Type=Application
Exec=kcmshell kcm_knetworkconfmodule
Icon=knetworkconf
DocPath=knetworkconf/index.html
Exec=tdecmshell kcm_knetwortdeconfmodule
Icon=knetwortdeconf
DocPath=knetwortdeconf/index.html

Comment=Configure Network Settings
Comment[ar]=إعداد تعيينات الشبكة

+ 1
- 1
systemsettings/menu/kcmfontinst.desktop Datei anzeigen

@@ -1,5 +1,5 @@
[Desktop Entry]
Exec=kcmshell kcmfontinst
Exec=tdecmshell kcmfontinst
Icon=fonts
Type=Application
DocPath=kcontrol/kcmfontinst/index.html


+ 1
- 1
systemsettings/menu/laptop.desktop Datei anzeigen

@@ -2,7 +2,7 @@
X-TDE-Library=laptop
X-TDE-FactoryName=laptop
X-TDE-Init=laptop
Exec=kcmshell laptop
Exec=tdecmshell laptop
Icon=laptop_battery
Type=Application
DocPath=kcontrol/laptop/index.html


+ 1
- 1
systemsettings/menu/medianotifications.desktop Datei anzeigen

@@ -3,7 +3,7 @@ Encoding=UTF-8
Type=Application
#DocPath=
Icon=system
Exec=kcmshell media
Exec=tdecmshell media


X-TDE-Library=media


+ 2
- 2
systemsettings/menu/system-settings.menu Datei anzeigen

@@ -290,7 +290,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
<Directory>tde-settings-networksettings.directory</Directory>

<Layout>
<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
<Filename>tde-kcm_knetwortdeconfmodule_ss.desktop</Filename>
<Filename>tde-proxy.desktop</Filename>
<Filename>tde-netpref.desktop</Filename>
<Filename>tde-kcm_tdednssd.desktop</Filename>
@@ -298,7 +298,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
</Layout>

<Include>
<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
<Filename>tde-kcm_knetwortdeconfmodule_ss.desktop</Filename>
<Filename>tde-proxy.desktop</Filename>
<Filename>tde-netpref.desktop</Filename>
<Filename>tde-kcm_tdednssd.desktop</Filename>


+ 1
- 1
systemsettings/tdecmodulemenu.h Datei anzeigen

@@ -66,7 +66,7 @@ class TDECModuleMenuPrivate;
*
* example.menu should be installed in xdg/menus/ so that ksyscoco will find
* it. See the above url for example menus. After changing the menu you need
* to run "kbuildsycoca" to regenerate the cache as ksyscoco will cache the
* to run "tdebuildsycoca" to regenerate the cache as ksyscoco will cache the
* menu and is a file that doesn't change on users.
*/



Laden…
Abbrechen
Speichern