Skip to content

Commit

Permalink
Fix #301 - Apply patch for crash on exit
Browse files Browse the repository at this point in the history 
Signed-off-by: Hubert Figuière <[email protected]>
  • Loading branch information
@hfiguiere
hfiguiere committed Apr 6, 2024
1 parent 1ed9e41 commit 9949eef
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
3 changes: 2 additions & 1 deletion org.gimp.GIMP.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,8 @@
"paths": [
"patches/0001-desktop-rename-launchable-in-appdata.patch",
"patches/0002-appdata-remove-group.patch",
"patches/gimp-extension-path.patch"
"patches/gimp-extension-path.patch",
"patches/gimp-glib-crash.patch"
]
}
],
Expand Down
28 changes: 28 additions & 0 deletions patches/gimp-glib-crash.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 0a67fb0484001e7a0bf14eb73c67f9e74325d524 Mon Sep 17 00:00:00 2001
From: Luca Bacci <[email protected]>
Date: Tue, 2 Apr 2024 11:31:08 +0200
Subject: [PATCH] QuitDialog: disconnect signal handler on dialog destroy

...rather than finalize.

Fixes #10785
---
app/dialogs/quit-dialog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
index 11737f9ad51..435ea4961a3 100644
--- a/app/dialogs/quit-dialog.c
+++ b/app/dialogs/quit-dialog.c
@@ -273,7 +273,7 @@ quit_close_all_dialog_new (Gimp *gimp,

closure = g_cclosure_new (G_CALLBACK (quit_close_all_dialog_container_changed),
private, NULL);
- g_object_watch_closure (G_OBJECT (private->dialog), closure);
+ g_signal_connect_swapped (private->dialog, "destroy", G_CALLBACK (g_closure_invalidate), closure);
g_signal_connect_closure (private->images, "add", closure, FALSE);
g_signal_connect_closure (private->images, "remove", closure, FALSE);

--
GitLab

4 comments on commit 9949eef

@Perkolator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit is still in "Some checks haven’t completed yet ... 1 pending check" state.

@Jehan
Copy link
Collaborator

@Jehan Jehan commented on 9949eef Apr 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Perkolator You mean it hasn't been published to Flathub? One more of these cases where a publication doesn't go to the end and we aren't warned (which is this report: flathub/flathub#2399).

And indeed, I verified the builds with our in-repo tool:

$ tools/flatpak-releases 
 0: Remove custom libjxl build (1ed9e411) [2024-03-25 01:38:51 +0000] - app-commit: 72bea9bc45de074e2301f0426b8ff52398403782ee35ad472a4c9743cba0cda9
 1: Update runtime to GNOME 46 (cf9f4fda) [2024-03-23 20:26:12 +0000] - app-commit: 519b656f8dc36e032947dc05079a54f82d2d8f8014f544f2077de7a73d11bf5e
 2: Fix build: remove group GNOME in appstream (af0cff23) [2024-03-19 17:12:47 +0000] - app-commit: c8815facd6930a54004c6d1fcda1de812dc9aed667ba4575a97af09505c2d2e7
 3: Removing the branch metadata. (3cd49e36) [2023-11-09 12:56:44 +0000] - app-commit: 7f7303578b857283204e63a839957adef2cbedd5cef396812c95187a6e008586
 4: Update runtime to GNOME 44 (8f711b20) [2023-09-20 23:17:47 +0000] - app-commit: 8fed191e6f07b5964a4c036f57a7c2079efc59211615686fd202e2cbc6884830
 5: Bump babl and GEGL. (6acd6e00) [2023-08-09 01:32:22 +0000] - app-commit: e5501c5d81fd92a4ff920ace2a0daa7a6585b65c1b6766d483fb8c6c5250a988
 6: Update libjxl (2e2d8bde) [2023-06-21 20:23:43 +0000] - app-commit: c82ed2d90d2afced9282d2747bba448abb8f0dc3bc9f1f98107a477fbb8d03ee
 7: libheif moved away from autotools to CMake. (6cdef59c) [2023-06-12 08:43:38 +0000] - app-commit: 0b0ea290f59a820f5d4234ce4b35456d359899bb89a1151d4356c990e1f63448
 8: Update libwmf v0.2.12 to v0.2.13 (6165c4f7) [2023-04-25 11:20:31 +0000] - app-commit: 6b73214102d2c232a520923fc04166aed89fa52c392b4173ad77d44c1a8fb51b
 9: Sync the stable branch with the dependencies on beta branch. (cce0da77) [2023-04-04 20:11:08 +0000] - app-commit: c1ee136d4880fd0c0c49e13a4a22507b69dc0489cbfccd503ebb45e240122563
10: Sync the stable branch with the dependencies on beta branch. (cce0da77) [2023-04-04 20:11:08 +0000] - app-commit: af2b348ebd61d80ce79a2c78c43ed991897f170a112c1dc223dfd1115e2cfd1d
11: Bump babl to 0.10.102 for the "white text" bug. (d0c65eef) [2023-02-27 02:42:53 +0000] - app-commit: cc7d5e5d1dfc2709044b0a839145eccea264c1aef1e32648c74aa4a18162dfc2
12: Bump babl to 0.10.102 for the "white text" bug. (d0c65eef) [2023-02-27 02:42:53 +0000] - app-commit: eba27a30268301bca88aa924aad75bdec0a445f6738ce2d0d5d60ac951553a18
13: Revert "Update Cairo to version 1.17.8." (303a64aa) [2023-02-25 11:51:00 +0000] - app-commit: f5281d0637b84e3ed219bfd0a312d8d0ff603a60809604373c8923b62e8ee3d5
14: Patch Changes in version 2.10.34 (2fdc5b30) [2023-02-24 14:50:38 +0000] - app-commit: dcd1ec70ecefad72290cec53cb1157d4c23d4b1cb7d0915d34e48ab6a9cfaf6d
15: Releasing GIMP 2.10.34. (1955da94) [2023-02-23 00:13:59 +0000] - app-commit: f4e6e8c75ce77d69f28e9a3d7192b97193a3700c3b67b053483909c141b59935
16: Bump libheif version from 1.13.0 to 1.14.0. (9d9431a4) [2022-11-24 18:08:37 +0000] - app-commit: 206e51f29170e2852001fd12af41bd42bdf4322cb6d55ed0330774ceab6b2f07
17: Bump back to GNOME runtime version 43. (84ce16aa) [2022-11-16 18:29:17 +0000] - app-commit: 7fad12864e7741e49d104e6e35ac36e63f0d08f165ac94d22f773624499ff3ed
18: Update babl and GEGL to last releases. (d57f1b3d) [2022-11-14 15:08:31 +0000] - app-commit: a447ad827275c304f122545af1e326f94858db3f01b3595f1374e28c948870bd
19: Update 2 modules (dd91153a) [2022-11-12 21:38:16 +0000] - app-commit: decae5425cab6312febddfb2714c5f5d748edff5d903ffc7363b5a8985d07077
20: Remove lcms too. (18abfd1d) [2022-11-12 19:23:32 +0000] - app-commit: 0fb43c0eab0a7a93b276e2f3abdc5051dcf64ce562b495608af50126626a0bbc

The last patch was never published.

I've triggered a manual build: https://buildbot.flathub.org/#/builders/6/builds/114726

@Jehan
Copy link
Collaborator

@Jehan Jehan commented on 9949eef Apr 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P.S.: thanks @Perkolator for the notification!

@Jehan
Copy link
Collaborator

@Jehan Jehan commented on 9949eef Apr 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's apparently published, according to my flatpak-releases tool. :-)

Please sign in to comment.