Date: Tue, 18 Jun 2024 10:20:22 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: 39e60c16fa8e - main - x11-fm/doublecmd: update to 1.1.15 gamma release Message-ID: <202406181020.45IAKMYc019715@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=39e60c16fa8e8a7ab77b7c369590ac28471d74d2 commit 39e60c16fa8e8a7ab77b7c369590ac28471d74d2 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2024-06-18 10:17:47 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2024-06-18 10:20:13 +0000 x11-fm/doublecmd: update to 1.1.15 gamma release --- x11-fm/doublecmd/Makefile | 28 +++++++++++++--------- x11-fm/doublecmd/distinfo | 10 ++++---- .../files/patch-src_platform_unix_upollthread.pas | 2 +- x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas | 13 ++-------- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index 890e20f2743a..caa2503c911b 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -1,7 +1,6 @@ PORTNAME= doublecmd -PORTVERSION= 1.1.8 +PORTVERSION= 1.1.15 DISTVERSIONPREFIX= v -PORTREVISION= 4 CATEGORIES= x11-fm PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} @@ -21,7 +20,7 @@ USES= desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg DOS2UNIX_FILES= components/multithreadprocs/mtpcpu.pas src/dmhelpmanager.pas USE_GITHUB= yes GH_PROJECT= doublecmd.github.io:help -GH_TAGNAME= 1.0.10:help +GH_TAGNAME= ${DISTVERSIONPREFIX}1.1.10:help USE_GNOME= cairo glib20 USE_XORG= x11 @@ -49,8 +48,8 @@ OPTIONS_DEFAULT= DSX_LOCATE WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_UNRAR \ OPTIONS_GROUP= DSX WCX WDX WFX WLX OPTIONS_GROUP_DSX= DSX_LOCATE -OPTIONS_GROUP_WCX= WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_UNBZ2 WCX_UNRAR \ - WCX_ZIP +OPTIONS_GROUP_WCX= WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_SEVENZIP \ + WCX_TORRENT 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 @@ -63,7 +62,8 @@ WCX_CPIO_DESC= CPIO format support WCX_DEB_DESC= Debian package archive support WCX_DESC= Packer plugins to work with archives WCX_RPM_DESC= Red Hat package archive support -WCX_UNBZ2_DESC= BZIP2 format support +WCX_SEVENZIP_DESC= 7z format support (broken yet) +WCX_TORRENT_DESC= BitTorrent format support WCX_UNRAR_DESC= RAR format support WCX_ZIP_DESC= ZIP format support @@ -85,6 +85,8 @@ WCX_UNRAR_LIB_DEPENDS= libunrar.so:archivers/libunrar WFX_SAMBA_USES= samba:lib WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer +WCX_SEVENZIP_BROKEN= Not ready yet to use, require unit JwaWinBase + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDEBUG} @@ -96,7 +98,7 @@ LAZARUS_PROJECT_FILES+= plugins/wfx/ftp/src/ftp.lpi .endif .if ${PORT_OPTIONS:MWCX_BASE64} -LAZARUS_PROJECT_FILES+= plugins/wcx/base64/src/base64wcx.lpi +LAZARUS_PROJECT_FILES+= plugins/wcx/base64/src/base64wcx.lpi .endif .if ${PORT_OPTIONS:MWCX_CPIO} @@ -107,14 +109,18 @@ LAZARUS_PROJECT_FILES+= plugins/wcx/cpio/src/cpio.lpi LAZARUS_PROJECT_FILES+= plugins/wcx/deb/src/deb.lpi .endif -.if ${PORT_OPTIONS:MWCX_UNBZ2} -LAZARUS_PROJECT_FILES+= plugins/wcx/unbz2/src/unbz2.lpi -.endif - .if ${PORT_OPTIONS:MWCX_RPM} LAZARUS_PROJECT_FILES+= plugins/wcx/rpm/src/rpm.lpi .endif +.if ${PORT_OPTIONS:MWCX_SEVENZIP} +LAZARUS_PROJECT_FILES+= plugins/wcx/sevenzip/src/SevenZipWcx.lpi +.endif + +.if ${PORT_OPTIONS:MWCX_TORRENT} +LAZARUS_PROJECT_FILES+= plugins/wcx/torrent/src/torrent.lpi +.endif + .if ${PORT_OPTIONS:MWCX_UNRAR} LAZARUS_PROJECT_FILES+= plugins/wcx/unrar/src/unrar.lpi .endif diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo index 064c48c3be79..646f6a88a9e2 100644 --- a/x11-fm/doublecmd/distinfo +++ b/x11-fm/doublecmd/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1718700145 +SHA256 (doublecmd-doublecmd-v1.1.15_GH0.tar.gz) = 785351f1a444478b8804c59647b0d44e563091115869da4a835f9175c2fd45c9 +SIZE (doublecmd-doublecmd-v1.1.15_GH0.tar.gz) = 9609492 +SHA256 (doublecmd-doublecmd.github.io-v1.1.10_GH0.tar.gz) = 8175d082712beb757aa48136e6443f3532e950d437292f3e3de50f1baeef1ab1 +SIZE (doublecmd-doublecmd.github.io-v1.1.10_GH0.tar.gz) = 7947552 diff --git a/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas b/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas index d7ec77137bdf..f378eb8b4f5a 100644 --- a/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas +++ b/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas @@ -5,7 +5,7 @@ FEventPipe[0] := -1; FEventPipe[1] := -1; - if fpPipe(FEventPipe) < 0 then -+ if fpPipe(FEventPipe, 0) < 0 then ++ if fpPipe(FEventPipe, longint(0)) < 0 then Print(SysErrorMessage(fpGetErrNo)) else begin // Set both ends of pipe non blocking diff --git a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas index 62d6eac7ed3a..c7cc83f548b4 100644 --- a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas +++ b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas @@ -1,6 +1,6 @@ ---- src/uGlobsPaths.pas.orig 2024-01-04 17:03:35 UTC +--- src/uGlobsPaths.pas.orig 2024-02-29 18:56:08 UTC +++ src/uGlobsPaths.pas -@@ -3,7 +3,7 @@ unit uGlobsPaths; +@@ -3,7 +3,7 @@ var interface var @@ -17,12 +17,3 @@ //Global Configuration Filename const -@@ -74,7 +75,7 @@ end; - - procedure Initialize; - begin -- 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?202406181020.45IAKMYc019715>