geany: update to 1.22

[koochy@…]

Updated Geany from Version 0.21 to 1.22 (current stable)

• Add new files/Make.src.diff
• Updated files/vte-sonames.diff
• Updated Portfile

Tested on Mac OS X 10.7.5 - Darwin Kernel Version 11.4.2

[koochy@…]

Update files/vte.c.sonames.diff

[ryandesign (Ryan Carsten Schmidt)]

In the Makefile, the construct "-Wl,--export-dynamic" means "pass the option --export-dynamic to the linker". If you don't want to pass --export-dynamic to the linker, the entire "-Wl,--export-dynamic" construct should be removed.

In the Portfile, I don't think we should use the quartz variant by default. In MacPorts we currently require the user to make a conscious choice to enable quartz, and default to x11. And at the moment, that choice really has to be made before any ports have been installed. There is discussion of breaking ports that can use either x11 or quartz into two subports each, but until we reach a decision on that we should not default individual ports to quartz because that would adversely affect the rest of MacPorts.

[koochy@…]

Remove default_variants

[koochy@…]

Remove -Wl

[koochy@…]

I have removed the default_variants from the Portfile. I've also removed the -Wl part. The main reason why I've removed the --export--dynamic, is that for me it does not work with it. I guess this parameter is not aval. on mac. If there is a similar parameter for the mac, I could test it. For now all stuff works in geany. Build and add Plugins, Themes Please let me know if there is something missing

Replying to ryandesign@…:

In the Makefile, the construct "-Wl,--export-dynamic" means "pass the option --export-dynamic to the linker". If you don't want to pass --export-dynamic to the linker, the entire "-Wl,--export-dynamic" construct should be removed.

In the Portfile, I don't think we should use the quartz variant by default. In MacPorts we currently require the user to make a conscious choice to enable quartz, and default to x11. And at the moment, that choice really has to be made before any ports have been installed. There is discussion of breaking ports that can use either x11 or quartz into two subports each, but until we reach a decision on that we should not default individual ports to quartz because that would adversely affect the rest of MacPorts.

[ryandesign (Ryan Carsten Schmidt)]

Replying to koochy@…:

The main reason why I've removed the --export--dynamic, is that for me it does not work with it. I guess this parameter is not aval. on mac.

That seems to be true. And here's the commit where upstream fixed it: ​https://github.com/geany/geany/commit/d11f9a51b939bf39c3c1676ab823147d460ede75

[ryandesign (Ryan Carsten Schmidt)]

r99049. I used the upstream version of the patch, then re-generated the Makefile.in using autoconf 1.11.5. I applied the patch always, not just on darwin, because the upstream change says that's safe. I also disabled silent rules so the build log will be more useful.