Re: Any issues that would hold up release of 4.6.1?

[Mojca M. <moj...@gm...>]

On Tue, Sep 18, 2012 at 8:48 PM, Ethan A Merritt wrote:
>
> === Aquaterm ===
>> Mojca Miklavec <moj...@gm...>
>> I would be very very grateful if this patch could be applied:
>> http://trac.macports.org/browser/trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff?rev=96897
>> (only "configure.in", "m4/apple.m4" and the first line of "term/aquaterm.trm")
>> --- configure.in.orig
>> +++ configure.in
>> @@ -1366,5 +1366,5 @@
>>
>> -if test "$ac_cv_lib_aquaterm_aqtInit" = yes; then
>> +if test "$with_aquaterm" = yes; then
>>    AC_MSG_RESULT([  aqua terminal: yes])
>>  else
>>    AC_MSG_RESULT([  aqua terminal: no])
>
> That change is not in the main branch. Are you sure it is needed?

The main branch has not been patched either. (This patch is only valid
[and required] iff new m4/apple.m4 is included.)

>> m4/apple.m4
> This patch bears little resemblance to what is currently in 4.7.

That patch was against 4.6.0. I'm attaching apple.m4 just in case.

> Does the build system in 4.7 work, or not?

Not without extra fiddling of the system.

> If the 4.7 version does work, should I just copy it to 4.6?
> If not, then please submit a patch against 4.7 rather than 4.6
> and we'll work from there.

Attached.

>> term/aquaterm.trm
>> --- term/aquaterm.trm.orig
>> +++ term/aquaterm.trm
>> @@ -94,3 +94,3 @@
>>  #ifdef TERM_BODY
>> -#import <aquaterm/AQTAdapter.h>
>> +#import <AquaTerm/AQTAdapter.h>
>
> OK.

The same holds here: this should only be included iff the m4/apple.m4
is patched at the same time.

Mojca