--===============1577684025932042227== Content-Type: multipart/alternative; boundary="===============3642489114697825940==" --===============3642489114697825940== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit > On Jan. 3, 2016, 4:22 nachm., Alex Richardson wrote: > > According to the documentation AppLocalDataLocation is the following: "C:/Users//AppData/Local/", "C:/ProgramData/", "", "/data" > > > > In which directory are the desktop files? Unfortunately I can't check as my Windows machine broke a while back and I haven't compiled KF5 on Windows since. > > > > Patch looks good to me otherwise as it will still check the same directories change behaviour on Linux. Only minor issue is that the error message is a little bit confusing now. > > Christoph Cullmann wrote: > hi, same problem occurs on mac, too, i think a better fallback would be something install prefix relative, that would work on win + mac. > > Alex Richardson wrote: > Would checking `${KDE_INSTALL_FULL_KSERVICETYPES5DIR} + path` first and then fall back to GenericDataLocation work on Windows and Mac? Or do we still need the AppDataLocation for runtime detection of the paths? From https://build.opensuse.org/build/home:rhabacker:branches:windows:mingw:win32:KF516/openSUSE_13.2/x86_64/mingw32-umbrello5/_log ... Installing: /home/abuild/rpmbuild/BUILDROOT/mingw32-umbrello5-2.18.99.6f6891a-2.25.x86_64/usr/i686-w64-mingw32/sys-root/mingw/share/applications/org.kde.umbrello.desktop - Ralf ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/126618/#review90496 ----------------------------------------------------------- On Jan. 3, 2016, 2:22 nachm., Kåre Särs wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/126618/ > ----------------------------------------------------------- > > (Updated Jan. 3, 2016, 2:22 nachm.) > > > Review request for KDE Frameworks. > > > Repository: kcoreaddons > > > Description > ------- > > Without this patch kcoreaddons_desktop_to_json() will not find the destop file. > > On windows GenericDataLocation returns "C:/Users//AppData/Local" or "C:/ProgramData". That is not a path that contains any destip files ;) > > This patch adds AppLocalDataLocation to the seach if the previous search does not return a match. > > Another option would be to hardcode the absolute path to all places that uses kcoreaddons_desktop_to_json(), but that does not feel too nice... > > What other options do we have? > > > Diffs > ----- > > src/lib/plugin/desktopfileparser.cpp 1122af8 > > Diff: https://git.reviewboard.kde.org/r/126618/diff/ > > > Testing > ------- > > KTextEditor compiles again on windows > > > Thanks, > > Kåre Särs > > --===============3642489114697825940== MIME-Version: 1.0 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: 8bit

This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/126618/

On Januar 3rd, 2016, 4:22 nachm. CET, Alex Richardson wrote:

According to the documentation AppLocalDataLocation is the following: "C:/Users/<USER>/AppData/Local/<APPNAME>", "C:/ProgramData/<APPNAME>", "<APPDIR>", "<APPDIR>/data"

In which directory are the desktop files? Unfortunately I can't check as my Windows machine broke a while back and I haven't compiled KF5 on Windows since.

Patch looks good to me otherwise as it will still check the same directories change behaviour on Linux. Only minor issue is that the error message is a little bit confusing now.

On Januar 3rd, 2016, 4:30 nachm. CET, Christoph Cullmann wrote:

hi, same problem occurs on mac, too, i think a better fallback would be something install prefix relative, that would work on win + mac.

On Januar 3rd, 2016, 5:18 nachm. CET, Alex Richardson wrote:

Would checking ${KDE_INSTALL_FULL_KSERVICETYPES5DIR} + path first and then fall back to GenericDataLocation work on Windows and Mac? Or do we still need the AppDataLocation for runtime detection of the paths?

From https://build.opensuse.org/build/home:rhabacker:branches:windows:mingw:win32:KF516/openSUSE_13.2/x86_64/mingw32-umbrello5/_log ... Installing: /home/abuild/rpmbuild/BUILDROOT/mingw32-umbrello5-2.18.99.6f6891a-2.25.x86_64/usr/i686-w64-mingw32/sys-root/mingw/share/applications/org.kde.umbrello.desktop

- Ralf

On Januar 3rd, 2016, 2:22 nachm. CET, Kåre Särs wrote:

Review request for KDE Frameworks.

By Kåre Särs.

Updated Jan. 3, 2016, 2:22 nachm.

Repository: kcoreaddons

Description

Without this patch kcoreaddons_desktop_to_json() will not find the destop file.
On windows GenericDataLocation returns "C:/Users/<USER>/AppData/Local" or "C:/ProgramData". That is not a path that contains any destip files ;)
This patch adds AppLocalDataLocation to the seach if the previous search does not return a match. 
Another option would be to hardcode the absolute path to all places that uses kcoreaddons_desktop_to_json(), but that does not feel too nice...
What other options do we have?

Testing

KTextEditor compiles again on windows

Diffs

src/lib/plugin/desktopfileparser.cpp (1122af8)

--===============3642489114697825940==-- --===============1577684025932042227== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KS2RlLWZyYW1l d29ya3MtZGV2ZWwgbWFpbGluZyBsaXN0CktkZS1mcmFtZXdvcmtzLWRldmVsQGtkZS5vcmcKaHR0 cHM6Ly9tYWlsLmtkZS5vcmcvbWFpbG1hbi9saXN0aW5mby9rZGUtZnJhbWV3b3Jrcy1kZXZlbAo= --===============1577684025932042227==--