Opened 12 years ago

Closed 12 years ago

#36670 closed update (fixed)

geany: update to 1.22

Reported by: koochy@… Owned by: ryandesign (Ryan Carsten Schmidt)
Priority: Normal Milestone:
Component: ports Version: 2.1.2
Keywords: haspatch Cc:
Port: geany

Description

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

Attachments (3)

vte.c.sonames.diff (1.4 KB) - added by koochy@… 12 years ago.
Update files/vte.c.sonames.diff
Portfile.diff (1015 bytes) - added by koochy@… 12 years ago.
Remove default_variants
Makefile.src.diff (400 bytes) - added by koochy@… 12 years ago.
Remove -Wl

Download all attachments as: .zip

Change History (7)

Changed 12 years ago by koochy@…

Attachment: vte.c.sonames.diff added

Update files/vte.c.sonames.diff

comment:1 Changed 12 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: ryandesign@… added
Keywords: haspatch added; geany removed
Port: geany added; devel/geany removed
Summary: geany @1.22 + Update geany from version 0.21 to 1.22geany: update to 1.22

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.

Changed 12 years ago by koochy@…

Attachment: Portfile.diff added

Remove default_variants

Changed 12 years ago by koochy@…

Attachment: Makefile.src.diff added

Remove -Wl

comment:2 in reply to:  1 ; Changed 12 years ago by 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.

comment:3 in reply to:  2 Changed 12 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: ryandesign@… removed
Owner: changed from macports-tickets@… to ryandesign@…
Status: newassigned

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

comment:4 Changed 12 years ago by ryandesign (Ryan Carsten Schmidt)

Resolution: fixed
Status: assignedclosed

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.

Note: See TracTickets for help on using tickets.