'Re: Review Request 126618: Make CMake macro kcoreaddons_desktop_to_json() work on windows.'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-frameworks-devel
Subject:    Re: Review Request 126618: Make CMake macro kcoreaddons_desktop_to_json() work on windows.
From:       Kåre Särs <kare.sars () iki ! fi>
Date:       2016-03-08 20:35:13
Message-ID: 20160308203513.6298.84594 () mimi ! kde ! org
[Download RAW message or body]

--===============7935377495731829164==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

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

(Updated March 8, 2016, 8:35 p.m.)

Review request for KDE Frameworks.

Changes
-------

Add KDE_INSTALL_KSERVICETYPES5DIR as the first search path (in CMake)

Repository: kcoreaddons

Description (updated)
-------

Without this patch kcoreaddons_desktop_to_json() will not find the service type \
destop file.

On windows GenericDataLocation returns "C:/Users/<USER>/AppData/Local" or \
"C:/ProgramData". That is not a path that contains any destop files ;)

This patch adds KDE_INSTALL_KSERVICETYPES5DIR as fist item in the search paths and if \
not found searches like before and adds ../share/ if the previous searches do not \
return a match.

Diffs (updated)
-----

  KF5CoreAddonsMacros.cmake 5d8e3d4 
  src/lib/plugin/desktopfileparser.cpp 319d29f 

Diff: https://git.reviewboard.kde.org/r/126618/diff/

Testing (updated)
-------

KTextEditor compiles on windows

Thanks,

Kåre Särs

--===============7935377495731829164==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit

<html>
 <body>
  <div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
   <table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">  \
<tr>  <td>
      This is an automatically generated e-mail. To reply, visit:
      <a href="https://git.reviewboard.kde.org/r/126618/">https://git.reviewboard.kde.org/r/126618/</a>
  </td>
    </tr>
   </table>
   <br />

<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;">  <tr>
  <td>

<div>Review request for KDE Frameworks.</div>
<div>By Kåre Särs.</div>

<p style="color: grey;"><i>Updated March 8, 2016, 8:35 p.m.</i></p>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Add KDE_INSTALL_KSERVICETYPES5DIR as the first search path (in \
CMake)</pre>  </td>
 </tr>
</table>

<div style="margin-top: 1.5em;">
 <b style="color: #575012; font-size: 10pt;">Repository: </b>
kcoreaddons
</div>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description  \
(updated)</h1>  <table width="100%" bgcolor="#ffffff" cellspacing="0" \
cellpadding="10" style="border: 1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Without this patch kcoreaddons_desktop_to_json() will not find the \
service type destop file.

On windows GenericDataLocation returns \
&quot;C:/Users/&lt;USER&gt;/AppData/Local&quot; or &quot;C:/ProgramData&quot;. That \
is not a path that contains any destop files ;)

This patch adds KDE_INSTALL_KSERVICETYPES5DIR as fist item in the search paths and if \
not found searches like before and adds ../share/ if the previous searches do not \
return a match.</pre>  </td>
 </tr>
</table>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing \
(updated)</h1> <table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">KTextEditor compiles on windows</pre>  </td>
 </tr>
</table>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> \
(updated)</h1> <ul style="margin-left: 3em; padding-left: 0;">

 <li>KF5CoreAddonsMacros.cmake <span style="color: grey">(5d8e3d4)</span></li>

 <li>src/lib/plugin/desktopfileparser.cpp <span style="color: \
grey">(319d29f)</span></li>

</ul>

<p><a href="https://git.reviewboard.kde.org/r/126618/diff/" style="margin-left: \
3em;">View Diff</a></p>

  </td>
 </tr>
</table>

  </div>
 </body>
</html>

--===============7935377495731829164==--

[Attachment #3 (text/plain)]

_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel

[prev in list] [next in list] [prev in thread] [next in thread] 