Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(x11/far2l): 2.6.4 #22608

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions x11-packages/far2l/WinPort-src-Backend-WinPortMain.cpp.patch

This file was deleted.

8 changes: 4 additions & 4 deletions x11-packages/far2l/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://github.com/elfmz/far2l
TERMUX_PKG_DESCRIPTION="FAR Manager v2"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider setting yourself as the package maintainer.
This field is mostly a point of contact for us to know who is working on a package.

It doesn't mean you have to do everything related to a package.

TERMUX_PKG_VERSION="2.6.3"
TERMUX_PKG_VERSION="2.6.4"
TERMUX_PKG_REVISION=1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Package revisions on Termux start at 0.
Please remove this line.

Suggested change
TERMUX_PKG_REVISION=1

TERMUX_PKG_SRCURL=https://github.com/elfmz/far2l/archive/refs/tags/v_${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=ffb216a4f9b24bb45a2194d5e833c60334a4f4e9150c1ce0fc8eddffa6a9e173
TERMUX_PKG_DEPENDS="libarchive, libc++, libuchardet, pcre"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is pcre (or pcre2) not supported anymore?

TERMUX_PKG_SHA256=49bf67dd5cb2069b1212ff3256d85123ceaee74470bedeef9ef1836582e4a5bc
TERMUX_PKG_DEPENDS="libarchive, libc++, libuchardet"
TERMUX_PKG_SUGGESTS="chafa, exiftool, htop, timg"
TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/applications"
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DCMAKE_BUILD_TYPE=Release
-DANDROID=ON
-DUSEWX=OFF
-DCOLORER=OFF
"
6 changes: 6 additions & 0 deletions x11-packages/far2l/far2l-plugins-colorer.subpackage.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TERMUX_SUBPKG_DESCRIPTION="FAR2L colorer plugin"
TERMUX_SUBPKG_DEPENDS="libxml2"
TERMUX_SUBPKG_INCLUDE="
lib/far2l/Plugins/colorer
share/far2l/Plugins/colorer
"
15 changes: 12 additions & 3 deletions x11-packages/far2l/far2l-src-cfg-ConfigOpt.cpp.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
--- a/far2l/src/cfg/ConfigOpt.cpp
+++ b/far2l/src/cfg/ConfigOpt.cpp
@@ -157,7 +157,7 @@
{true, NSecInterface, "ExclusiveWinLeft", &Opt.ExclusiveWinLeft, 0},
{true, NSecInterface, "ExclusiveWinRight", &Opt.ExclusiveWinRight, 0},
@@ -168,7 +168,7 @@ const ConfigOpt g_cfg_opts[] {
{true, NSecInterface, "TimeSeparator", &Opt.strTimeSeparator, GetTimeSeparatorDefaultStr()},
{true, NSecInterface, "DecimalSeparator", &Opt.strDecimalSeparator, GetDecimalSeparatorDefaultStr()},

- {true, NSecInterface, "OSC52ClipSet", &Opt.OSC52ClipSet, 0},
+ {true, NSecInterface, "OSC52ClipSet", &Opt.OSC52ClipSet, 1},
{true, NSecInterface, "TTYPaletteOverride", &Opt.TTYPaletteOverride, 1},

{false, NSecInterface, "ShowTimeoutDelFiles", &Opt.ShowTimeoutDelFiles, 50},
@@ -260,7 +260,7 @@ const ConfigOpt g_cfg_opts[] {
{true, NSecSystem, "SaveViewHistory", &Opt.SaveViewHistory, 1},
{true, NSecSystem, "HistoryRemoveDupsRule", &Opt.HistoryRemoveDupsRule, 2},
{true, NSecSystem, "AutoHighlightHistory", &Opt.AutoHighlightHistory, 1},
- {true, NSecSystem, "AutoSaveSetup", &Opt.AutoSaveSetup, 0},
+ {true, NSecSystem, "AutoSaveSetup", &Opt.AutoSaveSetup, 1},
{true, NSecSystem, "DeleteToRecycleBin", &Opt.DeleteToRecycleBin, 0},
{true, NSecSystem, "DeleteToRecycleBinKillLink", &Opt.DeleteToRecycleBinKillLink, 1},
{false, NSecSystem, "WipeSymbol", &Opt.WipeSymbol, 0},
99 changes: 0 additions & 99 deletions x11-packages/far2l/multiarc-src-formats-7z-C.patch

This file was deleted.

Loading