gwyddion @2.33 with mac integration

[nano103]

• version increased to 2.33
• xz archive instead of tgz
• gtk-osx-application dependency in quartz variant
• patches to sources

[rowue@…]

Hi Andrey,

thanks a lot for the patch to the portfile and the work on the patches. However I have some questions regarding your patch on the Portfile:

1. You apply the patches in any case - as far as I understand, they will only be usefull if someone uses quartz ... - however since they will be in 2.34 we should check them now ;)
2. You use "depends_lib" in the quartz section, overriding prior dependencies (f.e. fftw3) is this wanted (I don't think so)

KInd regards,

Rolf

[nano103]

Hello, Rolf

I make a test portfile to build gwyddion from trunk and it works fine, so all patches are accepted to gwyddion and only dependency gtk-osx-application should be inserted into 2.34 portfile after next gwyddion release.

Integration patch completely removes dependence of Carbon both in X11 and Quartz variants so it is basically quartz but not quartz only.

In quartz section I meant "add dependency", perhaps I was wrong in portfile sintax ?

Moreover I suppose gtk-osx-application going to be optional after some fixes in trunk, so dependency insertion into Portfile will be unnecessary i.e if gtk-osx-application already installed it will be used

And I have one question: why portfile warns about broken Quartz GL in 10.8 ? After fixing integration it builds and runs fine and I did not find any problems with GL.

[rowue@…]

Replying to nano103@…:

Hello, Rolf

Hi Andrey,

I make a test portfile to build gwyddion from trunk and it works fine, so all patches are accepted to gwyddion and only dependency gtk-osx-application should be inserted into 2.34 portfile after next gwyddion release.

Yes, that is what I also got from gwyddion-dev

Integration patch completely removes dependence of Carbon both in X11 and Quartz variants so it is basically quartz but not quartz only.

In quartz section I meant "add dependency", perhaps I was wrong in portfile sintax ?

It seems so ;)

Moreover I suppose gtk-osx-application going to be optional after some fixes in trunk, so dependency insertion into Portfile will be unnecessary i.e if gtk-osx-application already installed it will be used

If I get this right, gtk-osx-application is the dependency to get gwyddion running with quartz and 10.8 - so we should keep this as a dependency for the quartz variant (so the user can simply choose +quartz and get the native OS X backend)

And I have one question: why portfile warns about broken Quartz GL in 10.8 ? After fixing integration it builds and runs fine and I did not find any problems with GL.

Simply because I don't manage to get gwyddion compiling with +quartz. It fails on a dependency: py27-cairo. (So in principle I should remove the quartz section and/or file an error)

[rowue@…]

for py27-cairo see also: #38606

[nano103]

Replying to rowue@…:

for py27-cairo see also: #38606

I see - fresh macports installation will not help to reproduce this problem because it solves the problem. May be switch from X11 to Quartz will help. My installation was is initially with +quartz and +no_x11.

[rowue@…]

I did "port clean all; port uninstall installed" and afterwards tried to install gwyddion with "+quartz +no_x11" (ususal test) - it fails at py27-cairo. From this I would assign the "upgrade" error mentioned in #38606 to an upgrade of macports. I can try with a fresh installation (so we can test and recommend) tomorrow evening ....

[rowue@…]

After removing /opt/local installing macports 2.2.0 from dmg py27-cairo works as expected.

Now building of gwyddion (+quartz +no_x11) fails - see log. If I check the output from configure it seems, that your patches don't belong to 2.33:

--->  Applying patches to gwyddion
--->  Applying patch-configure.diff
patching file configure
Hunk #1 succeeded at 19348 (offset 13 lines).
--->  Applying patch-app-mac_integration.c.diff
patching file app/mac_integration.c
--->  Applying patch-app-Makefile.in.diff
patching file app/Makefile.in
patch unexpectedly ends in middle of line
Hunk #1 succeeded at 525 with fuzz 1.
--->  Configuring gwyddion

Can you send the patches against 2.33 (or should I look at the ML?)

[rowue@…]

Log from failed build

[nano103]

Is your plan to upgrade 2.33 Portfile? If so I can recreate patch for 2.33 with latest improvements from trunk.

If you are building from trunk this patches are accepted and should be removed from portfile And gtk-osx-application dependency also should be removed - it is optional now.

Anyway patch-app-Makefile.in.diff is only for build warnings removing

[rowue@…]

My plan is to provide a working (compiling and running) version of gwyddion 2.33 with quartz. So it would be very nice if you can hand me the patches needed to integrate the gwyddion ui into quartz on a 10.8 system. And yes, if necessary I would also update the portfile (which I should do because if gl works (as you stated) we don't need the ui-msg any more) (This sounds more harsh than it should)

I think for the last patches there was only a slight difference which keeps them away from working, so maybe a new diff will help ...

Kind regards,

Rolf

PS: For the py27-cario stuff it seems, that "-x11" is the flag someone needs to get things working with "no_x11" and "quartz"

[nano103]

OK, I'll provide new patch tomorrow And I think the problem in Makefile.in path is a lack of EOL in last line

[nano103]

New revision patch against 2.33 Portfile

[nano103]

Patches are updated

[rowue@…]

committed patches in r112505

[rowue@…]

as stated above, committed - ticket closed

works like a charm -

Andrey: Thanks a lot

[cooljeanius (Eric Gallager)]

Replying to rowue@…:

committed patches in r112505

I think you still have to make the portfile actually use the patches with patchfiles-append still...

[rowue@…]

They are active if you choose the quartz variant.