D24810: Ensure defintion of XDG_DATA_DIRS

[Adriaan de Groot]

adridg added a subscriber: davidedmundson.
adridg added a comment.


  Calling @davidedmundson .. I would migrate this to invent, except in 
3c1a34a26dbdf7c123782746881d914cd47b27b6 
 the 
similar adjustment for XDG_DATA_DIRS was already removed. We carry this patch, 
but recent Plasma's no longer set XDG_DATA dir so I think your call on the 
variable (noone relies on it) is the right one and this can be abandoned.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D24810

To: tcberner, #freebsd, dfaure, apol
Cc: davidedmundson, adridg, plasma-devel, Orage, LeGast00n, The-Feren-OS-Dev, 
cblack, jraleigh, zachus, fbampaloukas, ragreen, ZrenBot, ngraham, himcesjf, 
lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra, mart

D24810: Ensure defintion of XDG_DATA_DIRS

[Adriaan de Groot]

adridg added inline comments.

INLINE COMMENTS

> dfaure wrote in startplasma.cpp:197
> Wait, where does /usr/local/etc/xdg come from? 
> https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html 
> says the default is only /etc/xdg.

On FreeBSD (other BSD's, too), `/etc` is for the **base** system only, and all 
user-add-ons go in *$LOCALBASE*, usually `/usr/local` .. so XDG stuff, which is 
a user-add-on, goes into `/usr/local/etc`. Even our `/etc/os-release` is in 
`/usr/local/etc/os-release` (and Frameworks are suitably patched for that).

**Some** BSD derivatives are less dogmatic about `/etc`, but not us.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D24810

To: tcberner, #freebsd, dfaure, apol
Cc: adridg, plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, 
GB_2, ragreen, ZrenBot, ngraham, alexeymin, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, ahiemstra, mart

D24810: Ensure defintion of XDG_DATA_DIRS

[David Faure]

dfaure requested changes to this revision.
dfaure added a comment.
This revision now requires changes to proceed.


  Please make sure the first line of the commit log says CONFIG and not DATA, 
too (the phab title still says DATA).

INLINE COMMENTS

> startplasma.cpp:197
> +if (!qEnvironmentVariableIsSet("XDG_CONFIG_DIRS")) {
> +qputenv("XDG_CONFIG_DIRS", KDE_INSTALL_FULL_CONFDIR 
> ":/etc/xdg:/usr/local/etc/xdg");
> +}

Wait, where does /usr/local/etc/xdg come from? 
https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html 
says the default is only /etc/xdg.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D24810

To: tcberner, #freebsd, dfaure, apol
Cc: plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, 
ragreen, ZrenBot, ngraham, alexeymin, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, ahiemstra, mart

D24810: Ensure defintion of XDG_DATA_DIRS

[Tobias C. Berner]

tcberner updated this revision to Diff 68732.
tcberner edited the summary of this revision.
tcberner added a comment.


  Update commit message in diff.

REPOSITORY
  R120 Plasma Workspace

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D24810?vs=68731=68732

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D24810

AFFECTED FILES
  startkde/config-startplasma.h.cmake
  startkde/startplasma.cpp

To: tcberner, #freebsd, dfaure, apol
Cc: plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, 
ragreen, ZrenBot, ngraham, alexeymin, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, ahiemstra, mart

D24810: Ensure defintion of XDG_DATA_DIRS

[Tobias C. Berner]

tcberner updated this revision to Diff 68731.
tcberner added a comment.


  Fix comment and commit message.

REPOSITORY
  R120 Plasma Workspace

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D24810?vs=68379=68731

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D24810

AFFECTED FILES
  startkde/config-startplasma.h.cmake
  startkde/startplasma.cpp

To: tcberner, #freebsd, dfaure, apol
Cc: plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, 
ragreen, ZrenBot, ngraham, alexeymin, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, ahiemstra, mart

D24810: Ensure defintion of XDG_DATA_DIRS

[David Faure]

dfaure requested changes to this revision.
dfaure added a comment.
This revision now requires changes to proceed.


  Bug in the commit log: s/ also make XDG_DATA_DIRS/ also make XDG_CONFIG_DIRS/

INLINE COMMENTS

> startplasma.cpp:195
>  }
> +   // Additionally also set default value for XDG_CONFIG_DIRS which is not 
> set by default on FreeBSD.
> +   if (!qEnvironmentVariableIsSet("XDG_CONFIG_DIRS")) {

I see nothing FreeBSD specific about this, I suggest simplifying the comment.

REPOSITORY
  R120 Plasma Workspace

REVISION DETAIL
  https://phabricator.kde.org/D24810

To: tcberner, #freebsd, dfaure, apol
Cc: plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, 
ragreen, ZrenBot, ngraham, alexeymin, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, ahiemstra, mart

D24810: Ensure defintion of XDG_DATA_DIRS

[Tobias C. Berner]

tcberner created this revision.
tcberner added reviewers: FreeBSD, dfaure, apol.
Herald added a project: Plasma.
Herald added a subscriber: plasma-devel.
tcberner requested review of this revision.

REVISION SUMMARY
  Similar to XDG_DATA_DIRS defaulting to KDE_INSTALL_FULL_DATAROOTDIR, and
  some sensible constants, also make XDG_DATA_DIRS default to 
KDE_INSTALL_FULL_CONFDIR
  and some sensible constants.

REPOSITORY
  R120 Plasma Workspace

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D24810

AFFECTED FILES
  startkde/config-startplasma.h.cmake
  startkde/startplasma.cpp

To: tcberner, #freebsd, dfaure, apol
Cc: plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, 
ragreen, ZrenBot, ngraham, alexeymin, himcesjf, lesliezhai, ali-mohamed, 
jensreuterberg, abetts, sebas, apol, ahiemstra, mart