On Sunday 17 February 2013, David Faure wrote:
> On Saturday 16 February 2013 17:23:46 Sune Vuorela wrote:
> > On 2013-02-16, Alexander Neundorf <neund...@kde.org> wrote:
...
> > > _set_fancy(XDG_APPS_INSTALL_DIR
> > > "${SHARE_INSTALL_PREFIX}/applications/kde5" )
> >
> > I'm also a bit unsure about this one. Sure it is nice to avoid path
> > conflicts with other applications hogging the same desktop file names,
> > but from the different end of things: if things does hog the same
> > desktop file name, the content of the file is probably going to be so
> > similar that everyone wants to know about it and ensure that the content
> > is different enough.
>
> Yeah, and this has always created compatibility problems IMHO (with other
> DEs, due to kate.desktop vs kde4-kate.desktop vs kde4/kate.desktop).
>
> Let's remove the /kde5 then.
>
> This leaves the "kde5" in front of "services" and "servicetypes". A subdir
> is necessary there, to separate kde4-based from KF5-based plugins.
> But IIRC Kévin convinced me some time ago to say kf5 instead of kde5.
> My thinking was "any app will want to install stuff there, so it's not kf5-
> specific", but this is about adding files for use by the KF5 kservices
> framework, so why not.
>
> Executive summary: it's "kf5" everywhere.
please have a look at the attached patch.
Ok to commit ?
Alex
commit 2240285623baa800b3aabaf1720e57c3f53277b8
Author: Alex Neundorf <neund...@kde.org>
Date: Wed Feb 20 22:44:14 2013 +0100
remove "kde5" from install dirs, and use "kf5" where necessary
As discussed on kde-frameworks-devel
Alex
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index c3d4d7c..248c03d 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -4,7 +4,7 @@
# They are all relative (to CMAKE_INSTALL_PREFIX).
#
# BIN_INSTALL_DIR - the directory where executables will be installed (default is prefix/bin)
-# BUNDLE_INSTALL_DIR - Mac only: the directory where application bundles will be installed (default is /Applications/KDE5 )
+# BUNDLE_INSTALL_DIR - Mac only: the directory where application bundles will be installed (default is /Applications )
# SBIN_INSTALL_DIR - the directory where system executables will be installed (default is prefix/sbin)
# LIB_INSTALL_DIR - the directory where libraries will be installed (default is prefix/lib)
# CMAKECONFIG_INSTALL_PREFIX - the prefix under which packages will create their own subdirectory for their CMake configuration files
@@ -114,7 +114,7 @@ endmacro(_SET_FANCY)
if(APPLE)
- set(BUNDLE_INSTALL_DIR "/Applications/KDE5" CACHE PATH "Directory where application bundles will be installed to on OSX" )
+ set(BUNDLE_INSTALL_DIR "/Applications" CACHE PATH "Directory where application bundles will be installed to on OSX" )
endif(APPLE)
_set_fancy(EXEC_INSTALL_PREFIX "" "Base directory for executables and libraries")
@@ -126,7 +126,7 @@ _set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${_LIBDIR_DEFAULT}"
if(WIN32)
_set_fancy(LIBEXEC_INSTALL_DIR "${BIN_INSTALL_DIR}" "The install dir for libexec executables (default is ${BIN_INSTALL_DIR} on Windows)")
else()
- _set_fancy(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/kde5/libexec" "The install dir for libexec executables (default is ${LIB_INSTALL_DIR}/kde5/libexec)")
+ _set_fancy(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/kf5/libexec" "The install dir for libexec executables (default is ${LIB_INSTALL_DIR}/kf5/libexec)")
endif()
_set_fancy(INCLUDE_INSTALL_DIR "include" "The install dir for header files")
@@ -140,14 +140,14 @@ _set_fancy(HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML"
_set_fancy(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)")
_set_fancy(KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for kconfig files")
_set_fancy(LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "The install dir for translations")
-_set_fancy(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde5/services" "The install dir for service (desktop, protocol, ...) files")
-_set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde5/servicetypes" "The install dir for servicestypes desktop files")
+_set_fancy(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kf5/services" "The install dir for service (desktop, protocol, ...) files")
+_set_fancy(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kf5/servicetypes" "The install dir for servicestypes desktop files")
_set_fancy(SOUND_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/sounds" "The install dir for sound files")
_set_fancy(TEMPLATES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/templates" "The install dir for templates (Create new file...)")
_set_fancy(WALLPAPER_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/wallpapers" "The install dir for wallpapers")
_set_fancy(KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update" "The kconf_update install dir")
-_set_fancy(XDG_APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applications/kde5" "The XDG apps dir")
+_set_fancy(XDG_APPS_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applications" "The XDG apps dir")
_set_fancy(XDG_DIRECTORY_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories" "The XDG directory")
_set_fancy(XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes")
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
