Date: Fri, 5 Jan 2024 14:49:00 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 917a5031c95a - main - x11-fm/doublecmd: update to 1.1.8 beta (+) Message-ID: <202401051449.405En0kg070473@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=917a5031c95a92143896816a03112b7a75654aa8 commit 917a5031c95a92143896816a03112b7a75654aa8 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2024-01-05 14:44:29 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2024-01-05 14:44:29 +0000 x11-fm/doublecmd: update to 1.1.8 beta (+) Prefer beta over stable relase to match lazarus 3.0+ - Add qt6 support - Add qt6 CONFLICTS - Add base64 plugin - Remove obsolete plugin PR: 276118 --- x11-fm/doublecmd/Makefile | 61 +++++++++++----------- x11-fm/doublecmd/distinfo | 6 +-- ...onents_virtualterminal_source_unix_vtemupty.pas | 11 ++++ ...patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr | 4 +- x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas | 18 +++---- 5 files changed, 56 insertions(+), 44 deletions(-) diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index f9e1300773f2..a17962131494 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -1,6 +1,5 @@ PORTNAME= doublecmd -PORTVERSION= 1.0.11 -PORTREVISION= 3 +PORTVERSION= 1.1.8 DISTVERSIONPREFIX= v CATEGORIES= x11-fm PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} @@ -13,8 +12,9 @@ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 -gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5 -qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5 ${PORTNAME}-qt6 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt6 +qt6_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 USES= desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg DOS2UNIX_FILES= components/multithreadprocs/mtpcpu.pas src/dmhelpmanager.pas @@ -24,16 +24,16 @@ GH_TAGNAME= 1.0.10:help USE_GNOME= cairo glib20 USE_XORG= x11 -LAZARUS_NO_FLAVORS= qt6 LAZARUS_PROJECT_FILES= components/chsdet/chsdet.lpk \ - components/CmdLine/cmdbox.lpk \ components/multithreadprocs/multithreadprocslaz.lpk \ - components/dcpcrypt/dcpcrypt.lpk \ + components/kascrypt/kascrypt.lpk \ components/doublecmd/doublecmd_common.lpk \ + components/Image32/Image32.lpk \ components/KASToolBar/kascomp.lpk \ components/viewer/viewerpackage.lpk \ components/gifanim/pkg_gifanim.lpk \ - components/synunihighlighter/synuni.lpk + components/synunihighlighter/synuni.lpk \ + components/virtualterminal/virtualterminal.lpk LAZBUILD_ARGS= --pcp=${WRKSRC}/tmppcp -d MAKE_ENV+= LDVER=ld.bfd # for DragonFly @@ -42,21 +42,22 @@ PLIST= ${WRKDIR}/pkg-plist PORTDOCS= * OPTIONS_DEFINE= DEBUG DOCS -OPTIONS_DEFAULT= DSX_LOCATE WCX_CPIO WCX_DEB WCX_RPM WCX_UNRAR WCX_ZIP \ - WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE \ - WDX_XPI WFX_FTP WFX_SAMBA +OPTIONS_DEFAULT= DSX_LOCATE WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_UNRAR \ + WCX_ZIP WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS \ + WDX_TEXTLINE WFX_FTP WFX_SAMBA OPTIONS_GROUP= DSX WCX WDX WFX WLX OPTIONS_GROUP_DSX= DSX_LOCATE -OPTIONS_GROUP_WCX= WCX_CPIO WCX_DEB WCX_RPM WCX_UNBZ2 WCX_UNRAR WCX_ZIP -OPTIONS_GROUP_WDX= WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE \ - WDX_XPI +OPTIONS_GROUP_WCX= WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_UNBZ2 WCX_UNRAR \ + WCX_ZIP +OPTIONS_GROUP_WDX= WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE OPTIONS_GROUP_WFX= WFX_FTP WFX_SAMBA OPTIONS_GROUP_WLX= WLX_MPLAYER DSX_DESC= Search plugins DSX_LOCATE_DESC= Support locate command +WCX_BASE64_DESC= BASE64 plugin support WCX_CPIO_DESC= CPIO format support WCX_DEB_DESC= Debian package archive support WCX_DESC= Packer plugins to work with archives @@ -71,7 +72,6 @@ WDX_DESC= Plugins to display and search extended file attributes WDX_RPM_DESC= Red Hat package file information WDX_SCRIPTS_DESC= Add support to use custom Lua scripts WDX_TEXTLINE_DESC= Show and replace single lines in text files -WDX_XPI_DESC= Mozilla plugin file information WFX_DESC= File system plugins WFX_FTP_DESC= FTP protocol support @@ -94,6 +94,10 @@ LAZBUILD_ARGS+= --bm="Debug" LAZARUS_PROJECT_FILES+= plugins/wfx/ftp/src/ftp.lpi .endif +.if ${PORT_OPTIONS:MWCX_BASE64} +LAZARUS_PROJECT_FILES+= plugins/wcx/base64/src/base64wcx.lpi +.endif + .if ${PORT_OPTIONS:MWCX_CPIO} LAZARUS_PROJECT_FILES+= plugins/wcx/cpio/src/cpio.lpi .endif @@ -130,10 +134,6 @@ LAZARUS_PROJECT_FILES+= plugins/wdx/rpm_wdx/src/rpm_wdx.lpi LAZARUS_PROJECT_FILES+= plugins/wdx/deb_wdx/src/deb_wdx.lpi .endif -.if ${PORT_OPTIONS:MWDX_XPI} -LAZARUS_PROJECT_FILES+= plugins/wdx/xpi_wdx/src/xpi_wdx.lpi -.endif - .if ${PORT_OPTIONS:MWDX_TEXTLINE} LAZARUS_PROJECT_FILES+= plugins/wdx/textline/src/TextLine.lpi .endif @@ -177,6 +177,9 @@ pre-install: @${ECHO_CMD} "@dir %%DATADIR%%/plugins/wlx" >> ${PLIST} @${ECHO_CMD} "@dir %%DATADIR%%/plugins/dsx" >> ${PLIST} +.if ${PORT_OPTIONS:MWCX_BASE64} + @${ECHO_CMD} "%%DATADIR%%/plugins/wcx/base64/base64.wcx" >> ${PLIST} +.endif .if ${PORT_OPTIONS:MWCX_CPIO} @${ECHO_CMD} "%%DATADIR%%/plugins/wcx/cpio/cpio.wcx" >> ${PLIST} .endif @@ -205,9 +208,6 @@ pre-install: .if ${PORT_OPTIONS:MWDX_DEB} @${ECHO_CMD} "%%DATADIR%%/plugins/wdx/deb_wdx/deb_wdx.wdx" >> ${PLIST} .endif -.if ${PORT_OPTIONS:MWDX_XPI} - @${ECHO_CMD} "%%DATADIR%%/plugins/wdx/xpi_wdx/xpi_wdx.wdx" >> ${PLIST} -.endif .if ${PORT_OPTIONS:MWDX_SCRIPTS} @cd ${WRKSRC}/plugins/wdx/scripts && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/plugins/wdx/scripts/|' >> ${PLIST} @@ -231,9 +231,9 @@ pre-install: @${ECHO_CMD} "%%DATADIR%%/plugins/dsx/dsxlocate/dsxlocate.dsx" >> ${PLIST} .endif -.for FILE in %%DATADIR%%/doublecmd.ext.example %%DATADIR%%/pixmaps.txt \ - %%DATADIR%%/multiarc.ini bin/doublecmd share/applications/doublecmd.desktop \ - share/pixmaps/doublecmd.png share/icons/hicolor/scalable/apps/doublecmd.svg +.for FILE in %%DATADIR%%/pixmaps.txt %%DATADIR%%/multiarc.ini bin/doublecmd \ + share/applications/doublecmd.desktop share/pixmaps/doublecmd.png \ + share/icons/hicolor/scalable/apps/doublecmd.svg @${ECHO_CMD} ${FILE} >> ${PLIST} .endfor @@ -254,6 +254,11 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wlx @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/dsx + +.if ${PORT_OPTIONS:MWCX_BASE64} + @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/base64 + ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/base64/base64.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/base64/ +.endif .if ${PORT_OPTIONS:MWCX_CPIO} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/cpio ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/cpio/cpio.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/cpio/ @@ -291,10 +296,6 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/ ${INSTALL_LIB} ${WRKSRC}/plugins/wdx/deb_wdx/deb_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/ .endif -.if ${PORT_OPTIONS:MWDX_XPI} - @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/xpi_wdx/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wdx/xpi_wdx/xpi_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/xpi_wdx/ -.endif .if ${PORT_OPTIONS:MWDX_SCRIPTS} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/ ${INSTALL_DATA} ${WRKSRC}/plugins/wdx/scripts/* ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/ @@ -330,7 +331,7 @@ do-install: ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; .endfor -.for FILE in doublecmd.ext.example pixmaps.txt multiarc.ini +.for FILE in default/pixmaps.txt default/multiarc.ini ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR} .endfor diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo index cfe11524d5ed..064c48c3be79 100644 --- a/x11-fm/doublecmd/distinfo +++ b/x11-fm/doublecmd/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1680545622 -SHA256 (doublecmd-doublecmd-v1.0.11_GH0.tar.gz) = 9d5c178682f28590fd9e4e1e7b63b6dbbfb1e40122fdaf643c9eed0ed42c5bf6 -SIZE (doublecmd-doublecmd-v1.0.11_GH0.tar.gz) = 9079779 +TIMESTAMP = 1704384484 +SHA256 (doublecmd-doublecmd-v1.1.8_GH0.tar.gz) = 77de83ad2d76c7dda9b5c2a310198f6184ff0d68d5f01aa299ba77941fe11f72 +SIZE (doublecmd-doublecmd-v1.1.8_GH0.tar.gz) = 9072246 SHA256 (doublecmd-doublecmd.github.io-1.0.10_GH0.tar.gz) = f13935373728d654e1b3e39be6156e5e3d878569dd9d64992f1684fc17f28eff SIZE (doublecmd-doublecmd.github.io-1.0.10_GH0.tar.gz) = 7605382 diff --git a/x11-fm/doublecmd/files/patch-components_virtualterminal_source_unix_vtemupty.pas b/x11-fm/doublecmd/files/patch-components_virtualterminal_source_unix_vtemupty.pas new file mode 100644 index 000000000000..66da8cc01f3a --- /dev/null +++ b/x11-fm/doublecmd/files/patch-components_virtualterminal_source_unix_vtemupty.pas @@ -0,0 +1,11 @@ +--- components/virtualterminal/source/unix/vtemupty.pas.orig 2024-01-04 17:04:32 UTC ++++ components/virtualterminal/source/unix/vtemupty.pas +@@ -171,7 +171,7 @@ end; + constructor TPtyDevice.Create(AOwner: TComponent); + begin + inherited Create(AOwner); +- if fpPipe(FEventPipe) < 0 then ++ if fpPipe(FEventPipe,0) < 0 then + WriteLn(SysErrorMessage(fpGetErrNo)) + else begin + // Set both ends of pipe non blocking diff --git a/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr b/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr index b3256a0b558c..73bd1b7dbe9e 100644 --- a/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr +++ b/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr @@ -1,6 +1,6 @@ ---- plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2016-01-13 13:19:01 UTC +--- plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2023-12-15 21:28:19 UTC +++ plugins/wlx/WlxMplayer/src/wlxMplayer.lpr -@@ -258,7 +258,7 @@ var +@@ -263,7 +263,7 @@ var sPlayerPath: String; p: TMPlayer; begin diff --git a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas index 6499f2e9650a..62d6eac7ed3a 100644 --- a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas +++ b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas @@ -1,4 +1,4 @@ ---- src/uGlobsPaths.pas.orig 2017-12-11 10:45:31 UTC +--- src/uGlobsPaths.pas.orig 2024-01-04 17:03:35 UTC +++ src/uGlobsPaths.pas @@ -3,7 +3,7 @@ unit uGlobsPaths; interface @@ -17,12 +17,12 @@ //Global Configuration Filename const -@@ -37,7 +38,7 @@ end; - procedure LoadPaths; +@@ -74,7 +75,7 @@ end; + + procedure Initialize; begin - OnGetApplicationName := @GetAppName; -- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0))); -+ //gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0))); - DCDebug('Executable directory: ', gpExePath); - - gpGlobalCfgDir := gpExePath; +- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStr(0))); ++ //gpExePath := ExtractFilePath(TryReadAllLinks(ParamStr(0))); + gpGlobalCfgDir := gpExePath + 'settings' + DirectorySeparator; + end; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401051449.405En0kg070473>