git: 2ccd6b5da7df - main - editors/lazarus-*: Fix issues with Qt5/Qt6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 May 2024 06:54:33 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2ccd6b5da7dfaddcdf0cbbafee469b133310410b
commit 2ccd6b5da7dfaddcdf0cbbafee469b133310410b
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2024-05-04 06:37:02 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2024-05-04 06:54:24 +0000
editors/lazarus-*: Fix issues with Qt5/Qt6
- Bump PORTREVISION
Obtained from: https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/40246
---
editors/lazarus-devel/Makefile | 2 +-
.../files/patch-lcl_interfaces_qt5_qtwidgets.pas | 11 +++++++++++
.../files/patch-lcl_interfaces_qt6_qtwidgets.pas | 11 +++++++++++
editors/lazarus-qt5/Makefile | 2 +-
editors/lazarus-qt6/Makefile | 2 +-
editors/lazarus/Makefile | 2 +-
.../lazarus/files/patch-lcl_interfaces_qt5_qtwidgets.pas | 11 +++++++++++
.../lazarus/files/patch-lcl_interfaces_qt6_qtwidgets.pas | 14 ++++++++++++++
8 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/editors/lazarus-devel/Makefile b/editors/lazarus-devel/Makefile
index 42aef8d1abbf..02c99c5d37ac 100644
--- a/editors/lazarus-devel/Makefile
+++ b/editors/lazarus-devel/Makefile
@@ -1,7 +1,7 @@
PORTNAME= lazarus
DISTVERSION= 3.3.1.20240503
PKGNAMESUFFIX?= -gtk2-devel
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= editors devel
DIST_SUBDIR= freepascal
diff --git a/editors/lazarus-devel/files/patch-lcl_interfaces_qt5_qtwidgets.pas b/editors/lazarus-devel/files/patch-lcl_interfaces_qt5_qtwidgets.pas
new file mode 100644
index 000000000000..2a6d1a08d233
--- /dev/null
+++ b/editors/lazarus-devel/files/patch-lcl_interfaces_qt5_qtwidgets.pas
@@ -0,0 +1,11 @@
+--- lcl/interfaces/qt5/qtwidgets.pas.orig 2024-05-04 05:19:24 UTC
++++ lcl/interfaces/qt5/qtwidgets.pas
+@@ -10213,7 +10213,7 @@ end;
+
+ procedure TQtTextEdit.setReadOnly(const AReadOnly: Boolean);
+ begin
+- {$IFDEF DARWIN} // issue #40246
++ {$IF DEFINED(DARWIN) OR DEFINED(FREEBSD)} // issue #40246
+ if AReadOnly <> QTextEdit_isReadOnly(QTextEditH(Widget)) then
+ {$ENDIF}
+ QTextEdit_setReadOnly(QTextEditH(Widget), AReadOnly);
diff --git a/editors/lazarus-devel/files/patch-lcl_interfaces_qt6_qtwidgets.pas b/editors/lazarus-devel/files/patch-lcl_interfaces_qt6_qtwidgets.pas
new file mode 100644
index 000000000000..c220646a5d25
--- /dev/null
+++ b/editors/lazarus-devel/files/patch-lcl_interfaces_qt6_qtwidgets.pas
@@ -0,0 +1,11 @@
+--- lcl/interfaces/qt6/qtwidgets.pas.orig 2024-05-04 04:27:27 UTC
++++ lcl/interfaces/qt6/qtwidgets.pas
+@@ -10245,7 +10245,7 @@ end;
+
+ procedure TQtTextEdit.setReadOnly(const AReadOnly: Boolean);
+ begin
+- {$IFDEF DARWIN} // issue #40246
++ {$IF DEFINED(DARWIN) OR DEFINED(FREEBSD)} // issue #40246
+ if AReadOnly <> QTextEdit_isReadOnly(QTextEditH(Widget)) then
+ {$ENDIF}
+ QTextEdit_setReadOnly(QTextEditH(Widget), AReadOnly);
diff --git a/editors/lazarus-qt5/Makefile b/editors/lazarus-qt5/Makefile
index bb76ab95d975..ec166591334a 100644
--- a/editors/lazarus-qt5/Makefile
+++ b/editors/lazarus-qt5/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX?= -qt5
diff --git a/editors/lazarus-qt6/Makefile b/editors/lazarus-qt6/Makefile
index 73dcdd87498c..e9f76dc35150 100644
--- a/editors/lazarus-qt6/Makefile
+++ b/editors/lazarus-qt6/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX?= -qt6
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 1572e5ad4273..b5c36f008e52 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -1,7 +1,7 @@
PORTNAME= lazarus
DISTVERSION= 3.2.0
PKGNAMESUFFIX?= -gtk2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= editors devel
DIST_SUBDIR= freepascal
diff --git a/editors/lazarus/files/patch-lcl_interfaces_qt5_qtwidgets.pas b/editors/lazarus/files/patch-lcl_interfaces_qt5_qtwidgets.pas
new file mode 100644
index 000000000000..584702005287
--- /dev/null
+++ b/editors/lazarus/files/patch-lcl_interfaces_qt5_qtwidgets.pas
@@ -0,0 +1,11 @@
+--- lcl/interfaces/qt5/qtwidgets.pas.orig 2024-05-04 04:39:55 UTC
++++ lcl/interfaces/qt5/qtwidgets.pas
+@@ -10213,7 +10213,7 @@ begin
+
+ procedure TQtTextEdit.setReadOnly(const AReadOnly: Boolean);
+ begin
+- {$IFDEF DARWIN} // issue #40246
++ {$IF DEFINED(DARWIN) OR DEFINED(FREEBSD)} // issue #40246
+ if AReadOnly <> QTextEdit_isReadOnly(QTextEditH(Widget)) then
+ {$ENDIF}
+ QTextEdit_setReadOnly(QTextEditH(Widget), AReadOnly);
diff --git a/editors/lazarus/files/patch-lcl_interfaces_qt6_qtwidgets.pas b/editors/lazarus/files/patch-lcl_interfaces_qt6_qtwidgets.pas
new file mode 100644
index 000000000000..462601cd0328
--- /dev/null
+++ b/editors/lazarus/files/patch-lcl_interfaces_qt6_qtwidgets.pas
@@ -0,0 +1,14 @@
+--- lcl/interfaces/qt6/qtwidgets.pas.orig 2024-05-04 05:06:13 UTC
++++ lcl/interfaces/qt6/qtwidgets.pas
+@@ -10243,7 +10243,10 @@ begin
+
+ procedure TQtTextEdit.setReadOnly(const AReadOnly: Boolean);
+ begin
+- QTextEdit_setReadOnly(QTextEditH(Widget), AReadOnly);
++ {$IF DEFINED(DARWIN) OR DEFINED(FREEBSD)} // issue #40246
++ if AReadOnly <> QTextEdit_isReadOnly(QTextEditH(Widget)) then
++ {$ENDIF}
++ QTextEdit_setReadOnly(QTextEditH(Widget), AReadOnly);
+ end;
+
+ procedure TQtTextEdit.setSelection(const AStart, ALength: Integer);