git: 7ce6e4c8cee2 - main - deskutils/fbreader: Fix segmentation fault upon termination

The branch main has been updated by mce:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7ce6e4c8cee28313d97dce2b754e8c4a7c3fc617

commit 7ce6e4c8cee28313d97dce2b754e8c4a7c3fc617
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-09-21 19:25:14 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-09-22 11:04:54 +0000

    deskutils/fbreader: Fix segmentation fault upon termination
    
    PR:             298742
    Reported by:    LuMiWa (via email)
    Approved by:    fluffy (mentor)
---
 deskutils/fbreader/Makefile               |  2 +-
 deskutils/fbreader/files/patch-qt6support | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 22db920cd4fe..7c89c72a09fb 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fbreader
 PORTVERSION=	0.99.6
 DISTVERSIONSUFFIX=	-freebsdport
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	deskutils
 
 MAINTAINER=	mce@FreeBSD.org
diff --git a/deskutils/fbreader/files/patch-qt6support b/deskutils/fbreader/files/patch-qt6support
index 7260eda8b745..e92cf5c9f175 100644
--- a/deskutils/fbreader/files/patch-qt6support
+++ b/deskutils/fbreader/files/patch-qt6support
@@ -222,8 +222,8 @@
  
  #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
  
---- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp.orig	2014-01-11 12:45:25 UTC
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+--- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp.orig	2026-09-22 02:59:21.446335000 +0900
++++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp		2026-09-22 03:00:55.215426000 +0900
 @@ -19,12 +19,12 @@
  
  #include <unistd.h>
@@ -242,15 +242,28 @@
  
  #include "ZLQtProgressDialog.h"
  #include "ZLQtUtil.h"
-@@ -69,7 +69,7 @@ ZLQtWaitMessage::ZLQtWaitMessage(const std::string &me
+@@ -69,13 +69,15 @@ ZLQtWaitMessage::ZLQtWaitMessage(const std::string &me
  	myLayout->addWidget(myLabel);
  
  	if (main == 0) {
 -		main = QApplication::desktop();
 +		main = qApp->activeWindow();
  	}
- 	move(
- 		main->x() + main->width() / 2 - myLabel->width() / 2 - 10,
+-	move(
+-		main->x() + main->width() / 2 - myLabel->width() / 2 - 10,
+-		main->y() + main->height() / 2 - myLabel->height() / 2 - 10
+-	);
+-	show();
++	if (main != 0) {
++		move(
++			main->x() + main->width() / 2 - myLabel->width() / 2 - 10,
++			main->y() + main->height() / 2 - myLabel->height() / 2 - 10
++		);
++		show();
++	}
+ 
+ 	qApp->processEvents();
+ 	usleep(5000);
 --- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h.orig	2014-01-11 12:45:25 UTC
 +++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
 @@ -22,7 +22,8 @@