Opened 22 months ago

Last modified 5 days ago

#67408 assigned defect

gimp2,gtk3: submit latest patches to upstream

Reported by: mascguy (Christopher Nielsen) Owned by: mascguy (Christopher Nielsen)
Priority: Normal Milestone:
Component: ports Version: 2.8.1
Keywords: pending Cc: lukaso (Lukas Oberhuber), rmottola (Riccardo), cooljeanius (Eric Gallager)
Port: gtk3 gimp2

Description (last modified by mascguy (Christopher Nielsen))

For their latest releases, several patches have been applied to gtk3 and gimp2. Submit PRs/MRs to upstream, in hopes of having the changes merged.

Patches for gtk3:

  • patch-quartz-meson-appleframeworks.diff: patch gdk/quartz/meson.build, to make framework CoreGraphics optional; not available for 10.7 and earlier.
  • patch-quartz-nseventtype.diff: patch gdk/quartz/gdkdisplaylinksource.c, to replace hard-coded use of NSEventTypeApplicationDefined, with GDK_QUARTZ_APPLICATION_DEFINED.

Patches for gimp2:

  • patch-updatecheck-nsurlsession.diff: disable use of NSURLSession for macOS 10.8 and earlier; only available in 10.9 and later.

Attachments (4)

gtk3_gdkquartznswindows_c.patch (963 bytes) - added by rmottola (Riccardo) 18 months ago.
some 10.5/10.6 replacement methods
gtk3_gdkquartzview_c.diff (377 bytes) - added by rmottola (Riccardo) 18 months ago.
other minor 10.5/10.6 replacement
gtk3_gdk_gdkglcontext-quartz_c.diff (456 bytes) - added by rmottola (Riccardo) 18 months ago.
ignore 10.7+ format attribute if not supported
gtk3_gdkwindow_quartz_c.diff (1.6 KB) - added by rmottola (Riccardo) 18 months ago.
futher replacements for 10.5/10.6

Download all attachments as: .zip

Change History (19)

comment:1 Changed 22 months ago by mascguy (Christopher Nielsen)

Cc: lukaso added

comment:2 Changed 22 months ago by mascguy (Christopher Nielsen)

Description: modified (diff)

comment:3 Changed 22 months ago by mascguy (Christopher Nielsen)

Description: modified (diff)

comment:4 Changed 22 months ago by mascguy (Christopher Nielsen)

Last edited 22 months ago by mascguy (Christopher Nielsen) (previous) (diff)

comment:5 Changed 22 months ago by mascguy (Christopher Nielsen)

gtk3 patch patch-quartz-meson-appleframeworks.diff submitted to upstream:

5959 - macOS 10.7 Quartz patch: gdk/quartz/meson.build: make dependency CoreGraphics optional

Last edited 22 months ago by mascguy (Christopher Nielsen) (previous) (diff)

comment:6 Changed 22 months ago by mascguy (Christopher Nielsen)

comment:7 Changed 22 months ago by Christopher Nielsen <mascguy@…>

In 808bf02dd384bca17589b55a827cecec242eb594/macports-ports (master):

gimp2*: patches: add upstream detail
See: #67408

comment:8 Changed 22 months ago by Christopher Nielsen <mascguy@…>

In 5a2012e4eeba7af4d71fef1b93d3616edf85fded/macports-ports (master):

gtk3*: patches: add upstream detail
See: #67408

comment:9 Changed 22 months ago by mascguy (Christopher Nielsen)

Observers: While all of the patches have been submitted, let's keep this open until all have been accepted.

Last edited 22 months ago by mascguy (Christopher Nielsen) (previous) (diff)

comment:10 Changed 21 months ago by mascguy (Christopher Nielsen)

Cc: rmottola added

comment:11 Changed 21 months ago by Christopher Nielsen <mascguy@…>

In 378b7274634aa891cf0a1f7ae40f8dc6e79ca721/macports-ports (master):

gtk3*: quartz: don't require CoreGraphics for 10.7 and earlier
See: #67408#comment:10

comment:12 Changed 20 months ago by cooljeanius (Eric Gallager)

Cc: cooljeanius added

Changed 18 months ago by rmottola (Riccardo)

some 10.5/10.6 replacement methods

Changed 18 months ago by rmottola (Riccardo)

Attachment: gtk3_gdkquartzview_c.diff added

other minor 10.5/10.6 replacement

comment:13 Changed 18 months ago by rmottola (Riccardo)

in updateLayer, I get an issue casting from and to CGRect and NSRect... I didn't get it. The method convertRectToBacking I supply is correctly taking and giving NSRect.

Is the compiler more sensitive?

I tried this now:

  CGRect backing_bounds = NSRectToCGRect([self convertRectToBacking: NSRectFromCGRect(layer_bounds)]);

Changed 18 months ago by rmottola (Riccardo)

ignore 10.7+ format attribute if not supported

Changed 18 months ago by rmottola (Riccardo)

futher replacements for 10.5/10.6

comment:14 Changed 6 days ago by rmottola (Riccardo)

comment:15 Changed 5 days ago by lukaso (Lukas Oberhuber)

In 808bf02dd384bca17589b55a827cecec242eb594/macports-ports (master):

gimp2*: patches: add upstream detail See: #67408

I looked at this patch just now, and we didn't accept it at the time because it had a few comments to fix. Here's a direct link: https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/913. Looks like we all forgot about it after that.

Since then we've stopped supporting GIMP 2.10 on MacOS (I simply don't have time and there's just me) and focused all efforts on GIMP 3. Doesn't mean a fixed patch can't be accepted, but it's low priority now. The last official GIMP version for Mac is and will be 2.10.38.1.

Note: See TracTickets for help on using tickets.