[139660] trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

[Michael Dickens]

This directory and -any- Qt directory should not make a difference if
the port is using this PortGroup and the project honors the variables
found in QMake (and here). I have no objection to the changes, except
that they should not be needed. Now that they are done, let's leave them
in place and fix the projects to honor their location. - MLD

On Sun, Aug 23, 2015, at 05:22 PM, ionic at macports.org wrote:
> Revision 139660[1] Author ionic at macports.org Date 2015-08-23 14:22:04
> -0700 (Sun, 23 Aug 2015) Log Message


> dports/_resources/port1.0/group/qt4-1.0.tcl: don't append /data to
> qt_data_dir. Breaks mkspecs installation. Modified Paths


>  * trunk/dports/_resources/port1.0/group/qt4-1.0.tcl Diff


>
> Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl (139659
> => 139660)


> --- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl 2015-08-23
> 20:37:39 UTC (rev 139659)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl   2015-08-23
21:22:04 UTC (rev 139660)
> @@ -116,11 +116,12 @@ }
>  # standard Qt data directory
> +# Don't append /data. Here be dragons. global qt_data_dir if
> {${qt_dir} ne ${prefix}} {
> -    set qt_data_dir         ${qt_share_dir}/data
> +    set qt_data_dir         ${qt_share_dir} } else {
> -    set qt_data_dir         ${qt_share_dir}/${qt_name}/data
> +    set qt_data_dir         ${qt_share_dir}/${qt_name} }
>  # standard Qt translations directory
>
> _________________________________________________
> macports-changes mailing list macports-changes at lists.macosforge.org
> https://lists.macosforge.org/mailman/listinfo/macports-changes



Links:

  1. https://trac.macports.org/changeset/139660
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-dev/attachments/20150824/307dff1a/attachment-0001.html>