From 5da0ba088de49f675a1cf8c7bb7702b571d313a3 Mon Sep 17 00:00:00 2001
From: Chronos <robie@centrum.cz>
Date: Mon, 16 Dec 2024 17:43:47 +0100
Subject: [PATCH] Fixed Qt5 crash. Do not use image browser by default due to
 needed extra permissions.

---
 Install/flatpak/0001-avoid-crash-on-Qt5.patch | 37 +++++++++++++++++++
 .../flatpak/io.github.bgrabitmap.LazPaint.yml |  4 ++
 .../flatpak/no-image-browser-by-default.patch | 13 +++++++
 3 files changed, 54 insertions(+)
 create mode 100644 Install/flatpak/0001-avoid-crash-on-Qt5.patch
 create mode 100644 Install/flatpak/no-image-browser-by-default.patch

diff --git a/Install/flatpak/0001-avoid-crash-on-Qt5.patch b/Install/flatpak/0001-avoid-crash-on-Qt5.patch
new file mode 100644
index 00000000..b0e8ce2d
--- /dev/null
+++ b/Install/flatpak/0001-avoid-crash-on-Qt5.patch
@@ -0,0 +1,37 @@
+From d73455025d71226472e7eb880da36f6fb85c5df0 Mon Sep 17 00:00:00 2001
+From: Johann ELSASS <circular@fastmail.com>
+Date: Thu, 6 Oct 2022 21:44:47 +0200
+Subject: [PATCH] avoid crash on Qt5
+
+---
+ lazpaint/lazpaintinstance.pas | 1 +
+ lazpaint/lazpaintmainform.pas | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/lazpaint/lazpaintinstance.pas b/lazpaint/lazpaintinstance.pas
+index 5da9ac6..b5f624b 100644
+--- a/lazpaint/lazpaintinstance.pas
++++ b/lazpaint/lazpaintinstance.pas
+@@ -374,6 +374,7 @@ procedure TLazPaintInstance.ReportActionProgress(AProgressPercent: integer);
+ var
+   delay: Integer;
+ begin
++  {$IFDEF LCLqt5}exit;{$ENDIF}
+   if AProgressPercent < 100 then delay := 10000 else delay := 1000;
+   if Assigned(FMain) then FMain.UpdatingPopup:= true;
+   try
+diff --git a/lazpaint/lazpaintmainform.pas b/lazpaint/lazpaintmainform.pas
+index 0fe875c..708cb24 100644
+--- a/lazpaint/lazpaintmainform.pas
++++ b/lazpaint/lazpaintmainform.pas
+@@ -2695,6 +2695,7 @@ end;
+ 
+ procedure TFMain.TimerUpdateTimer(Sender: TObject);
+ begin
++  if FLazPaintInstance = nil then exit;
+   TimerUpdate.Enabled := false;
+   if ToolManager.ToolSleeping and not spacePressed and
+      ([ssLeft,ssRight,ssMiddle] * FLayout.MouseButtonState = []) then
+-- 
+2.43.0
+
diff --git a/Install/flatpak/io.github.bgrabitmap.LazPaint.yml b/Install/flatpak/io.github.bgrabitmap.LazPaint.yml
index 48440819..549602fd 100644
--- a/Install/flatpak/io.github.bgrabitmap.LazPaint.yml
+++ b/Install/flatpak/io.github.bgrabitmap.LazPaint.yml
@@ -39,6 +39,10 @@ modules:
         path: io.github.bgrabitmap.LazPaint.metainfo.xml
       - type: patch
         path: 0001-515-runtime-fix-for-Qt.patch
+      - type: patch
+        path: 0001-avoid-crash-on-Qt5.patch
+      - type: patch
+        path: no-image-browser-by-default.patch
     buildsystem: simple
     build-commands:
       - |
diff --git a/Install/flatpak/no-image-browser-by-default.patch b/Install/flatpak/no-image-browser-by-default.patch
new file mode 100644
index 00000000..19d8345e
--- /dev/null
+++ b/Install/flatpak/no-image-browser-by-default.patch
@@ -0,0 +1,13 @@
+diff --git a/lazpaint/uconfig.pas b/lazpaint/uconfig.pas
+index ee16357..b13b491 100644
+--- a/lazpaint/uconfig.pas
++++ b/lazpaint/uconfig.pas
+@@ -804,7 +804,7 @@ end;
+ 
+ function TLazPaintConfig.DefaultUseImageBrowser: boolean;
+ begin
+-  result := iniOptions.ReadBool('General','UseImageBrowser',{$IFDEF DARWIN}false{$ELSE}true{$ENDIF});
++  result := iniOptions.ReadBool('General','UseImageBrowser',{$IFDEF DARWIN}false{$ELSE}false{$ENDIF});
+ end;
+ 
+ procedure TLazPaintConfig.SetDefaultUseImageBrowser(value: boolean);