From nobody Sat May 04 06:54:33 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VWdh96dd8z5K0nS; Sat, 4 May 2024 06:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VWdh966Blz4SXD; Sat, 4 May 2024 06:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714805673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XkbGyd3xYM5oa+anA0AGSbYL1pTdorkbxfDDej+80yc=; b=kmcc1Vp0IBkzppSugrQwGKBTXMFpa4ZMyXOnt+PmjLXhqUuNCxkWBZkmSLUfNdHzvO4znJ 0ONWZ7+2gqNGIwD2tbwrI7isQAXGcC+9v9zwXfJUYDUEpsSBQR3yxsqpcFqtzE1hoSFq79 njYDP4qodt8pya/gMgkmX/XFZMYN0BwxTY7/toZeg4NV/q4R1DgiWYLJmyRl6HRyx5y/ap g3c7Qp3zB2e0/1SRxzyuem1BLChHtTaJ23xwS222yPGjuaNsLNN5i/s3LC3YAURcBuczEP y1+HMZq1JGELm3Vm6sHMU4SyPQeK+n/0BAEXqOoeoqNqzm4vFUKQyX4dwa7F5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714805673; a=rsa-sha256; cv=none; b=k2M8VEeAsG/0jVCW6BFKrDvHb9a6bneaFmgXM/PY1v4fd3gj6LIU13a0APnVykhT6cKZxI 64F/VCbgBI8EmHgk2dr6PZIC9r5Yo3D2JO1X0BQ7qnFK2MIPpyjZ9qSCmiNBwPcd++4ykc TbQE6elO2eglWdFSIaahZK5/ByQOxEkD8HkQc4UcX35HJS/VbTcRfyfahSNyvAqLYAqz2V DMpsNIJn6Z6PxWW2AixMtIWMC84zxZKrHyBtmSRWer+Aog0VhHwdIi9f4zD9+bWAPy4qez aRqsJ2wrOhTZ1mFrmYjsRSlqismoEnEl/3aOVP1g/cQK8qY30VJt32qZPJ4Lqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714805673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XkbGyd3xYM5oa+anA0AGSbYL1pTdorkbxfDDej+80yc=; b=asDixjNgu5WrXQEmKyibGlXWhS+SsbGjb1XeVoPkGYRmZw+KPgLw+UG3tpye+etX/6Y3IL Mu2JIRaptkWnA3zKCa3gZg2q7d3tpNbcT52WsbviEz223i2/g2gXFLOs84e+0KEsmRNX3c 5lcg+CTa1sWCsxMLfpabV6AEKqXQFBUmbMK38VrX68+yd3djrGug834UXafK9c9UgktCWt 3SrMD7phsqMxPEqCP4ExE1AzzJscVFM2cuidHCnBMUw3HT57D1JMxAM1fUvCG0haeWHDRG S8j2rnauk/pIwhYXp/RP+4IV3f1n/LWoccE2N3YEHQwym4HWmNTrlR3c0+Hs7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VWdh95QlyzKQJ; Sat, 4 May 2024 06:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4446sXqk096181; Sat, 4 May 2024 06:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4446sXEN096178; Sat, 4 May 2024 06:54:33 GMT (envelope-from git) Date: Sat, 4 May 2024 06:54:33 GMT Message-Id: <202405040654.4446sXEN096178@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 2ccd6b5da7df - main - editors/lazarus-*: Fix issues with Qt5/Qt6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ccd6b5da7dfaddcdf0cbbafee469b133310410b Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ccd6b5da7dfaddcdf0cbbafee469b133310410b commit 2ccd6b5da7dfaddcdf0cbbafee469b133310410b Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-05-04 06:37:02 +0000 Commit: Jose Alonso Cardenas Marquez 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);