diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 95fc4994a61b..8fa74cfc77dd 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -1,196 +1,196 @@ # MAINTAINER: ports@FreeBSD.org # # Note: before committing to this file, contact portmgr to arrange for an # experimental ports run. Untested commits may be backed out at portmgr's # discretion. # # Provide default versions for ports with multiple versions selectable # by the user. # # Users who want to override these defaults can easily do so by defining # DEFAULT_VERSIONS in their make.conf as follows: # # DEFAULT_VERSIONS= perl5=5.20 ruby=3.1 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK) _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes LOCALBASE?= /usr/local . for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \ GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \ LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \ PYCRYPTOGRAPHY PYTHON PYTHON2 RUBY RUST SAMBA SSL TCLTK VARNISH . if defined(${lang}_DEFAULT) ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" . endif #.undef ${lang}_DEFAULT . endfor . for lang in ${DEFAULT_VERSIONS} _l= ${lang:C/=.*//g} ${_l:tu}_DEFAULT= ${lang:C/.*=//g} . endfor # Possible values: 2.4 APACHE_DEFAULT?= 2.4 # Possible values: 5, 18 BDB_DEFAULT?= 5 # Possible values: 2, 3 COROSYNC_DEFAULT?= 3 # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) EBUR128_DEFAULT?= rust . else EBUR128_DEFAULT?= legacy . endif # Possible_values: full canna nox devel_full devel_nox #EMACS_DEFAULT?= let the flavor be the default if not explicitly set # Possible values: 3.0, 4.0 FIREBIRD_DEFAULT?= 3.0 # Possible values: gfortran FORTRAN_DEFAULT?= gfortran # Possible values: 3.2.3, 3.3.1 . if (defined(WANT_FPC_DEVEL) && !empty(WANT_FPC_DEVEL)) || ${ARCH:Maarch64} FPC_DEFAULT?= 3.3.1 . else FPC_DEFAULT?= 3.2.3 . endif # Possible values: 11, 12, 13, 14, 15, 16 # (Any other version is completely unsupported and not meant for general use.) GCC_DEFAULT?= 13 # Possible values: 10 GHOSTSCRIPT_DEFAULT?= 10 # Possible values: mesa-libs, mesa-devel GL_DEFAULT?= mesa-libs # Possible values: 1.20, 1.21, 1.22, 1.23, 1.24, 1.25-devel GO_DEFAULT?= 1.24 # Possible values: 1.8, 2.2, 3.0 GUILE_DEFAULT?= 2.2 # Possible versions: 6, 7 # Possible flavors: x11, nox11 # (defaults to x11 when not specified) # Format: version[-flavor] # Examples: 6-nox11, 7 IMAGEMAGICK_DEFAULT?= 7 # Possible values: 8, 11, 17, 18, 19, 20, 21, 22, 23, 24 JAVA_DEFAULT?= 8 -# Possible values: 3.8.0, 4.99 +# Possible values: 4.0, 4.99 . if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64} LAZARUS_DEFAULT?= 4.99 . else -LAZARUS_DEFAULT?= 3.8.0 +LAZARUS_DEFAULT?= 4.0 . endif # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) LIBRSVG2_DEFAULT?= rust . else LIBRSVG2_DEFAULT?= legacy . endif # Possible values: c7 rl9 . if ${ARCH:Mi386} LINUX_DEFAULT?= c7 . else LINUX_DEFAULT?= rl9 . endif # Possible values: 11, 12, 13, 14, 15, 16, 17, 18, 19, -devel (to be used when non-base compiler is required) LLVM_DEFAULT?= 19 # Possible values: 5.1, 5.2, 5.3, 5.4 LUA_DEFAULT?= 5.4 # Possible values: luajit, luajit-devel, luajit-openresty . if ${ARCH:Mpowerpc64*} LUAJIT_DEFAULT?= luajit-openresty . else LUAJIT_DEFAULT?= luajit-devel . endif # Possible values: 5.10, 5.20, 6.8 MONO_DEFAULT?= 5.20 # Possible values: 8.0, 8.4, 9.1, 10.5m, 10.6m, 10.11m, 11.4m MYSQL_DEFAULT?= 8.0 # Possible values: ninja, samurai NINJA_DEFAULT?= ninja # Possible value: 18, 20, 22, 23, 24, current, lts (Note: current = 24 and lts = 22) NODEJS_DEFAULT?= lts # Possible value: 25, 26 OPENLDAP_DEFAULT?= 26 # Possible values: 5.36, 5.38, 5.40, devel . if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ defined(PACKAGE_BUILDING)) # When changing the default here, make sure the DEPRECATED/EXPIRATION lines in # the older Perl 5 ports are uncommented at the same time. PERL5_DEFAULT?= 5.40 . elif !defined(PERL5_DEFAULT) # There's no need to replace development versions, like "5.23" with "devel" # because 1) nobody is supposed to use it outside of poudriere, and 2) it must # be set manually in /etc/make.conf in the first place, and we're never getting # in here. . if !defined(_PERL5_FROM_BIN) _PERL5_FROM_BIN!= ${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;' . endif _EXPORTED_VARS+= _PERL5_FROM_BIN PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} . endif # Possible values: 13, 14, 15, 16, 17 PGSQL_DEFAULT?= 17 # Possible values: 8.1, 8.2, 8.3, 8.4 PHP_DEFAULT?= 8.3 # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) PYCRYPTOGRAPHY_DEFAULT?= rust . else PYCRYPTOGRAPHY_DEFAULT?= legacy . endif # Possible values: 3.9, 3.10, 3.11, 3.12 PYTHON_DEFAULT?= 3.11 # Possible values: 2.7 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.2, 3.3, 3.4, 3.5 RUBY_DEFAULT?= 3.3 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust # Possible values: 4.16, 4.19, 4.20 SAMBA_DEFAULT?= 4.16 # When updating this, please also update the same list in ssl.mk and the checks # for USES=ssl in qa.sh! # Possible values: base, openssl, openssl111, openssl31, openssl32, openssl33, libressl, libressl-devel . if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version # but give an installed port preference over it. . if !defined(SSL_DEFAULT) && \ !exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \ exists(${DESTDIR}/usr/include/openssl/opensslv.h) SSL_DEFAULT= base . else . if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) . if defined(PKG_BIN) # find installed port and use it for dependency . if !defined(OPENSSL_INSTALLED) . if defined(DESTDIR) PKGARGS= -c ${DESTDIR} . else PKGARGS= . endif OPENSSL_INSTALLED!= ${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || : . endif . if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED) SSL_DEFAULT:= ${OPENSSL_INSTALLED:T} WARNING+= "You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf" . endif . else check-makevars:: @${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable" @${ECHO_MSG} "to determine what port it comes from." @${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl= to your /etc/make.conf and try again." @${FALSE} . endif . endif . endif # Make sure we have a default in the end SSL_DEFAULT?= base . endif # Possible values: 8.6, 9.0 TCLTK_DEFAULT?= 8.6 # Possible values: 6, 7 VARNISH_DEFAULT?= 6 .endif diff --git a/editors/lazarus-qt5/Makefile b/editors/lazarus-qt5/Makefile index fdbad1d94475..297dbb04a88c 100644 --- a/editors/lazarus-qt5/Makefile +++ b/editors/lazarus-qt5/Makefile @@ -1,14 +1,14 @@ PKGNAMESUFFIX?= -qt5 COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT5) -CONFLICTS= lazarus-gtk2 lazarus-gtk2-devel lazarus-qt5-devel lazarus-qt6 \ - lazarus-qt6-devel +CONFLICTS= lazarus-gtk2 lazarus-gtk2-devel lazarus-gtk3-devel lazarus-qt5-devel \ + lazarus-qt6 lazarus-qt6-devel LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas LCL_PLATFORM= qt5 MASTERDIR= ${.CURDIR}/../../editors/lazarus .include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus-qt6/Makefile b/editors/lazarus-qt6/Makefile index beda06699a11..00b407456e42 100644 --- a/editors/lazarus-qt6/Makefile +++ b/editors/lazarus-qt6/Makefile @@ -1,14 +1,14 @@ PKGNAMESUFFIX?= -qt6 COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT6) -CONFLICTS= lazarus-gtk2 lazarus-gtk2-devel lazarus-qt5 lazarus-qt5-devel \ - lazarus-qt6-devel +CONFLICTS= lazarus-gtk2 lazarus-gtk2-devel lazarus-gtk3-devel lazarus-qt5 \ + lazarus-qt5-devel lazarus-qt6-devel LIB_DEPENDS= libQt6Pas.so:x11-toolkits/qt6pas LCL_PLATFORM= qt6 MASTERDIR= ${.CURDIR}/../../editors/lazarus .include "${MASTERDIR}/Makefile" diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index d02cf5eece4c..499d3f619636 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -1,181 +1,181 @@ PORTNAME= lazarus -DISTVERSION= 3.8.0 +DISTVERSION= 4.0 PKGNAMESUFFIX?= -gtk2 PORTREVISION?= 0 CATEGORIES= editors devel DIST_SUBDIR= freepascal MAINTAINER?= acm@FreeBSD.org COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2) WWW= https://www.lazarus-ide.org/ -CONFLICTS?= lazarus-gtk2-devel lazarus-qt5 lazarus-qt5-devel lazarus-qt6 \ - lazarus-qt6-devel +CONFLICTS?= lazarus-gtk2-devel lazarus-gtk3-devel lazarus-qt5 lazarus-qt5-devel \ + lazarus-qt6 lazarus-qt6-devel BUILD_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils RUN_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ gmake:devel/gmake \ ${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc${FPC_DEVELSUFFIX}-source ONLY_FOR_ARCHS= i386 amd64 USE_GITLAB= yes GL_ACCOUNT= freepascal.org/lazarus GL_PROJECT= ${PORTNAME} -GL_COMMIT= 57e899e4bbe50b6653ec20434bdb7799aa629e06 +GL_COMMIT= 9d15c73c91a1545be50bee02b27bd3b43f9d90e8 USES= desktop-file-utils fpc:run gettext gmake iconv shared-mime-info xorg USE_XORG= x11 OPT?= "-Sgic " MAKE_ENV= OPT=${OPT} PLIST= ${WRKDIR}/pkg-plist #WRKSRC?= ${WRKDIR}/${PORTNAME} DATADIR?= ${PREFIX}/share/${PORTNAME}-${LAZARUS_BASE} OPTIONS_DEFINE= GDB GDB_DESC= Install a newest version of gdb OPTIONS_DEFAULT= GDB .include LAZARUS_ARCH= ${ARCH:S,amd64,x86_64,} -LAZARUS_BASE= 3.8.0 +LAZARUS_BASE= 4.0 BUILDNAME= ${LAZARUS_ARCH}-${OPSYS:tl} LCL_PLATFORM?= gtk2 MAN1S= lazarus-ide.1 lazbuild.1 startlazarus.1 SUB_FILES= pkg-message SUB_LIST+= PORTSDIR="${PORTSDIR}" .if ${PORT_OPTIONS:MGDB} RUN_DEPENDS+= ${LOCALBASE}/bin/gdb:devel/gdb .endif .if ${PKGNAMESUFFIX} == "-gtk2" USES+= gnome USE_GNOME= cairo gtk20 gdkpixbuf .endif post-extract: @${MKDIR} ${WRKDIR}/man1 @${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/install/man/man1/lazbuild.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/install/man/man1/startlazarus.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/examples ${WRKDIR}/examples @${MV} ${WRKSRC}/docs ${WRKDIR}/docs @${RM} ${WRKSRC}/tools/.gitignore @${RM} ${WRKSRC}/Dockerfile.buildenv @${RM} ${WRKSRC}/buildenv.Dockerfile @${RM} ${WRKSRC}/.git* post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's|startlazarus|${PORTNAME}|g' ${WRKSRC}/install/${PORTNAME}.desktop do-build: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} bigide LCL_PLATFORM=${LCL_PLATFORM} post-build: @cd ${WRKSRC} && \ ${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \ ide/Makefile*.orig ide/Makefile*.bak lcl/interfaces/qt5/qtobjects.pas.orig \ .git* @cd ${WRKSRC} && \ ${FIND} . -name ".gitignore" -exec ${RM} "{}" \; pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper @${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/lazarus-wrapper @${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper @${RM} ${PLIST} @${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \ ${WRKSRC}/lazarus.app/Contents/MacOS \ ${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS . for FILE in bin/lazarus bin/lazbuild @${ECHO_CMD} ${FILE} >> ${PLIST} . endfor . for m in ${MAN1S} @${ECHO_CMD} share/man/man1/${m}.gz >> ${PLIST} . endfor @${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST} @cd ${WRKDIR}/docs && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST} @${ECHO_CMD} "%%DATADIR%%/examples" >> ${PLIST} @cd ${WRKDIR}/examples && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%EXAMPLESDIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%EXAMPLESDIR%%/|' >> ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} @${ECHO_CMD} "share/applications/lazarus.desktop" >> ${PLIST} . for RESO in 128 16 256 32 48 64 @${ECHO_CMD} share/icons/hicolor/${RESO}x${RESO}/apps/lazarus.png >> ${PLIST} . endfor @cd ${WRKSRC}/images/mimetypes && \ ${FIND} * -type f -name "*.png" | ${SORT} | ${SED} -e 's|^|share/icons/hicolor/48x48/mimetypes/|' >> ${PLIST} @${ECHO_CMD} "share/icons/hicolor/scalable/apps/lazarus.svg" >> ${PLIST} @${ECHO_CMD} "share/mime/packages/lazarus.xml" >> ${PLIST} do-install: .for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \ packager tools units @${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE} @cd ${WRKSRC}/${DIRE} && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} -p {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; .endfor @${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \ ${STAGEDIR}${DATADIR}/tools/updatepofiles .for FILE in lazarus lazbuild startlazarus ${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR} .endfor @cd ${WRKDIR}/docs && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \; @${LN} -sf ${DOCSDIR} ${STAGEDIR}${DATADIR}/docs @cd ${WRKDIR}/examples && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${EXAMPLESDIR}/{}" \; @${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples .for RESO in 128 16 256 32 48 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps ${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}${RESO}x${RESO}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps/${PORTNAME}.png .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes @cd ${WRKSRC}/images/mimetypes && \ ${FIND} * -type f -name "*.png" -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes/{} \; @${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps @${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg @${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages @${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}-mime.xml ${STAGEDIR}${PREFIX}/share/mime/packages/${PORTNAME}.xml ${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/Makefile* ${WRKSRC}/fpmake* ${STAGEDIR}${DATADIR} .for FILE in ${MAN1S} ${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${PREFIX}/share/man/man1 .endfor ${LN} -sf ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild .include diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo index 2507de300fbf..5c4b4049b587 100644 --- a/editors/lazarus/distinfo +++ b/editors/lazarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737610002 -SHA256 (freepascal/freepascal.org/lazarus-lazarus-57e899e4bbe50b6653ec20434bdb7799aa629e06_GL0.tar.gz) = a0d97da6787218eb66572a17f2cfa3e0bbc7b1aaf019a3cf1bdcbdad9140d197 -SIZE (freepascal/freepascal.org/lazarus-lazarus-57e899e4bbe50b6653ec20434bdb7799aa629e06_GL0.tar.gz) = 56248974 +TIMESTAMP = 1748046926 +SHA256 (freepascal/freepascal.org/lazarus-lazarus-9d15c73c91a1545be50bee02b27bd3b43f9d90e8_GL0.tar.gz) = d0f81afd1be9f7deeb2d7941c72ab07acaa1fced288117ee341d7db83ec995af +SIZE (freepascal/freepascal.org/lazarus-lazarus-9d15c73c91a1545be50bee02b27bd3b43f9d90e8_GL0.tar.gz) = 60530688 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..cd33b8876870 --- /dev/null +++ b/editors/lazarus/files/patch-lcl_interfaces_qt6_qtwidgets.pas @@ -0,0 +1,25 @@ +--- qtwidgets.pas.orig 2025-05-23 12:42:39.954693000 -0700 ++++ qtwidgets.pas 2025-05-23 12:44:46.183970000 -0700 +@@ -16496,10 +16496,6 @@ + + FActions.Free; + end; +- +- if Assigned(FActionHandle) then +- QAction_Destroy(FActionHandle); +- FActionHandle := nil; + + inherited Destroy; + end; +@@ -16554,6 +16550,11 @@ + QMenu_hook_destroy(FAboutToHideHook); + FAboutToHideHook := nil; + end; ++ ++ if Assigned(FActionHandle) then ++ QAction_Destroy(FActionHandle); ++ FActionHandle := nil; ++ + inherited DetachEvents; + end; + diff --git a/editors/lazarus/files/pkg-message.in b/editors/lazarus/files/pkg-message.in index 9fe32565884c..c9b15d113647 100644 --- a/editors/lazarus/files/pkg-message.in +++ b/editors/lazarus/files/pkg-message.in @@ -1,51 +1,48 @@ [ { type: install message: <