* [PR PATCH] Update vifm to 0.13
@ 2023-07-24 23:17 hholst80
2023-10-23 1:45 ` vifm: update " github-actions
2023-11-06 1:46 ` [PR PATCH] [Closed]: " github-actions
0 siblings, 2 replies; 4+ messages in thread
From: hholst80 @ 2023-07-24 23:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 597 bytes --]
There is a new pull request by hholst80 against master on the void-packages repository
https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/45233
Update vifm to 0.13
#### Testing the changes
- I tested the changes in this PR:
- glibc and musl x86_64 builds in void
- running the actual application on void.
All credit goes to the maintainer (vifm - not void maintainers) for assisting in making the required changes to the musl build, and fixing it.
A patch file from https://github.com/void-linux/void-packages/pull/45233.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-45233.patch --]
[-- Type: text/x-diff, Size: 7932 bytes --]
From 0535e3bed6ea9fe065363f931041c78ceab4131b Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH] Update vifm to 0.13
Co-authored-by: xaizek <xaizek@posteo.net>
---
.../vifm/patches/disable-failed-tests.patch | 38 -----
.../vifm/patches/vifm-v0.13-musl-tests.patch | 139 ++++++++++++++++++
srcpkgs/vifm/template | 10 +-
3 files changed, 144 insertions(+), 43 deletions(-)
delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch
create mode 100644 srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d82..0000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
-
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
-
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- mark_selection_or_current(curr_view);
- fops_chown(0, 1, 0, gid1);
- assert_success(os_stat("dir/chown-me", &s));
-- assert_true(s.st_gid == gid1);
-
- mark_selection_or_current(curr_view);
- fops_chown(0, 1, 0, gid2);
- assert_success(os_stat("dir/chown-me", &s));
-- assert_true(s.st_gid == gid2);
-
- assert_success(unlink("dir/chown-me"));
- assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch b/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
new file mode 100644
index 0000000000000..e94866bfbe38b
--- /dev/null
+++ b/srcpkgs/vifm/patches/vifm-v0.13-musl-tests.patch
@@ -0,0 +1,139 @@
+diff --git a/src/filelist.c b/src/filelist.c
+index 1e63c1120..e5fe0131e 100644
+--- a/src/filelist.c
++++ b/src/filelist.c
+@@ -329,7 +329,11 @@ flist_free_view(view_t *view)
+ modview_info_free(view->vi);
+ view->vi = NULL;
+
+- regfree(&view->primary_group);
++ if(view->primary_group_set)
++ {
++ regfree(&view->primary_group);
++ view->primary_group_set = 0;
++ }
+
+ marks_clear_view(view);
+
+diff --git a/src/opt_handlers.c b/src/opt_handlers.c
+index f655da5da..69935d669 100644
+--- a/src/opt_handlers.c
++++ b/src/opt_handlers.c
+@@ -3250,9 +3250,13 @@ set_sortgroups(view_t *view, char **opt, char value[])
+ {
+ if(scope == OPT_LOCAL)
+ {
+- regfree(&view->primary_group);
++ if(view->primary_group_set)
++ {
++ regfree(&view->primary_group);
++ }
+ (void)regexp_compile(&view->primary_group, first,
+ REG_EXTENDED | REG_ICASE);
++ view->primary_group_set = 1;
+ }
+ free(first);
+ }
+diff --git a/src/sort.c b/src/sort.c
+index 792364aa6..75efad5ef 100644
+--- a/src/sort.c
++++ b/src/sort.c
+@@ -43,6 +43,10 @@
+ #include "status.h"
+ #include "types.h"
+
++#ifdef HAVE_STRVERSCMP_FUNC
++# undef HAVE_STRVERSCMP_FUNC
++#endif
++
+ static void sort_tree_slice(dir_entry_t *entries, const dir_entry_t *children,
+ size_t nchildren, int root);
+ static void sort_sequence(dir_entry_t *entries, size_t nentries);
+diff --git a/src/ui/fileview.c b/src/ui/fileview.c
+index 7a4b9f189..4539e0530 100644
+--- a/src/ui/fileview.c
++++ b/src/ui/fileview.c
+@@ -215,6 +215,7 @@ fview_init(view_t *view)
+ view->sort_groups_g = strdup("");
+ (void)regexp_compile(&view->primary_group, view->sort_groups,
+ REG_EXTENDED | REG_ICASE);
++ view->primary_group_set = 1;
+
+ view->preview_prg = strdup("");
+ view->preview_prg_g = strdup("");
+diff --git a/src/ui/ui.h b/src/ui/ui.h
+index 91c90eb49..69654d4c6 100644
+--- a/src/ui/ui.h
++++ b/src/ui/ui.h
+@@ -448,6 +448,9 @@ struct view_t
+ char *sort_groups, *sort_groups_g;
+ /* Primary group of sort_groups (not sort_groups_g) in compiled form. */
+ regex_t primary_group;
++ /* Indicates that primary_group was initialized, which is used to avoid
++ * freeing uninitialized data or freeing it twice. */
++ int primary_group_set;
+
+ int history_num; /* Number of used history elements. */
+ int history_pos; /* Current position in history. */
+diff --git a/tests/misc/sort.c b/tests/misc/sort.c
+index bad2120ee..4b9ce6a3b 100644
+--- a/tests/misc/sort.c
++++ b/tests/misc/sort.c
+@@ -424,8 +424,13 @@ TEST(groups_sorting_works)
+ lwin.dir_entry[6].origin = lwin.curr_dir;
+
+ update_string(&lwin.sort_groups, "-(done|todo).*");
++ if(lwin.primary_group_set)
++ {
++ regfree(&lwin.primary_group);
++ }
+ (void)regcomp(&lwin.primary_group, "-(done|todo).*",
+ REG_EXTENDED | REG_ICASE);
++ lwin.primary_group_set = 1;
+
+ /* Ascending sorting. */
+
+@@ -458,15 +463,17 @@ TEST(groups_sorting_works)
+ assert_string_equal("11-todo-publish", lwin.dir_entry[4].name);
+ assert_string_equal("1-done", lwin.dir_entry[5].name);
+ assert_string_equal("3-done", lwin.dir_entry[6].name);
+-
+- regfree(&lwin.primary_group);
+- update_string(&lwin.sort_groups, NULL);
+ }
+
+ TEST(global_groups_sorts_entries_list)
+ {
+ update_string(&lwin.sort_groups_g, "([0-9])");
++ if(lwin.primary_group_set)
++ {
++ regfree(&lwin.primary_group);
++ }
+ (void)regcomp(&lwin.primary_group, "([a-z])", REG_EXTENDED | REG_ICASE);
++ lwin.primary_group_set = 1;
+
+ lwin.sort_g[0] = SK_BY_GROUPS;
+ lwin.sort_g[1] = SK_BY_NAME;
+diff --git a/tests/test-support/test-utils.c b/tests/test-support/test-utils.c
+index 6938d0538..bb449d441 100644
+--- a/tests/test-support/test-utils.c
++++ b/tests/test-support/test-utils.c
+@@ -32,6 +32,7 @@
+ #include "../../src/utils/macros.h"
+ #include "../../src/utils/matcher.h"
+ #include "../../src/utils/path.h"
++#include "../../src/utils/regexp.h"
+ #include "../../src/utils/str.h"
+ #include "../../src/utils/string_array.h"
+ #include "../../src/utils/utils.h"
+@@ -253,6 +254,10 @@ view_setup(view_t *view)
+ memset(&view->sort[1], SK_NONE, sizeof(view->sort) - 1);
+ memcpy(view->sort_g, view->sort, sizeof(view->sort_g));
+
++ /* The code assumes that this field is initialized. */
++ assert_success(regexp_compile(&view->primary_group, "", REG_ICASE));
++ view->primary_group_set = 1;
++
+ view->custom.entry_count = 0;
+ view->custom.entries = NULL;
+
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943c..6ee4b6b794800 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,18 +1,18 @@
# Template file for 'vifm'
pkgname=vifm
-version=0.12
+version=0.13
revision=1
build_style=gnu-configure
configure_args="--without-gtk"
-hostmakedepends="mdocml"
+hostmakedepends="mdocml perl coreutils"
makedepends="ncurses-devel file-devel"
depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="File manager with curses interface and a Vim-like environment"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
CFLAGS="-fcommon"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: vifm: update to 0.13
2023-07-24 23:17 [PR PATCH] Update vifm to 0.13 hholst80
@ 2023-10-23 1:45 ` github-actions
2023-11-06 1:46 ` [PR PATCH] [Closed]: " github-actions
1 sibling, 0 replies; 4+ messages in thread
From: github-actions @ 2023-10-23 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/45233#issuecomment-1774305089
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Closed]: vifm: update to 0.13
2023-07-24 23:17 [PR PATCH] Update vifm to 0.13 hholst80
2023-10-23 1:45 ` vifm: update " github-actions
@ 2023-11-06 1:46 ` github-actions
1 sibling, 0 replies; 4+ messages in thread
From: github-actions @ 2023-11-06 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There's a closed pull request on the void-packages repository
vifm: update to 0.13
https://github.com/void-linux/void-packages/pull/45233
Description:
#### Testing the changes
- I tested the changes in this PR:
- glibc and musl x86_64 builds in void
- running the actual application on void.
All credit goes to the maintainer (vifm - not void maintainers) for assisting in making the required changes to the musl build, and fixing it.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PR PATCH] Update vifm to 0.13
@ 2023-07-05 22:33 hholst80
0 siblings, 0 replies; 4+ messages in thread
From: hholst80 @ 2023-07-05 22:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is a new pull request by hholst80 against master on the void-packages repository
https://github.com/hholst80/void-packages master
https://github.com/void-linux/void-packages/pull/44870
Update vifm to 0.13
#### Testing the changes
- I tested the changes in this PR: Litterally works on my machine.
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/44870.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-44870.patch --]
[-- Type: text/x-diff, Size: 3149 bytes --]
From 32c92b6b987e503b5bc8331ef8fc9876c865a93e Mon Sep 17 00:00:00 2001
From: Henrik Holst <6200749+hholst80@users.noreply.github.com>
Date: Wed, 5 Jul 2023 22:32:17 +0000
Subject: [PATCH] Update vifm to 0.13
---
.../vifm/patches/disable-failed-tests.patch | 38 -------------------
srcpkgs/vifm/template | 12 +++---
2 files changed, 6 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/vifm/patches/disable-failed-tests.patch
diff --git a/srcpkgs/vifm/patches/disable-failed-tests.patch b/srcpkgs/vifm/patches/disable-failed-tests.patch
deleted file mode 100644
index f674a4be66d8..000000000000
--- a/srcpkgs/vifm/patches/disable-failed-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git tests/Makefile tests/Makefile
-index 1419a4edd..a213d70ef 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -67,14 +67,14 @@ B ?=
- BUILD := $(B)bin/build/$(BINSUBDIR)
-
- # engine
--suites += abbrevs autocmds cmds commands completion keys options parsing
-+suites += abbrevs autocmds cmds completion keys options parsing
- suites += text_buffer variables
- # io
- suites += ioeta ionotif iop ior
- # ui
- suites += colmgr column_view viewcolumns_parser
- # everything else
--suites += bmarks env escape fileops filetype filter lua misc undo utils
-+suites += bmarks env escape fileops filetype filter undo utils
-
- # these are built, but not automatically executed
- apps := fuzz regs_shmem_app
-diff --git tests/fileops/chown.c tests/fileops/chown.c
-index ef7b1a405..cd2c33388 100644
---- a/tests/fileops/chown.c
-+++ b/tests/fileops/chown.c
-@@ -65,12 +65,10 @@ TEST(file_group_is_changed, IF(has_more_than_one_group))
- mark_selection_or_current(curr_view);
- fops_chown(0, 1, 0, gid1);
- assert_success(os_stat("dir/chown-me", &s));
-- assert_true(s.st_gid == gid1);
-
- mark_selection_or_current(curr_view);
- fops_chown(0, 1, 0, gid2);
- assert_success(os_stat("dir/chown-me", &s));
-- assert_true(s.st_gid == gid2);
-
- assert_success(unlink("dir/chown-me"));
- assert_success(rmdir("dir"));
diff --git a/srcpkgs/vifm/template b/srcpkgs/vifm/template
index 67cc901ec943..91cb9bbb88d7 100644
--- a/srcpkgs/vifm/template
+++ b/srcpkgs/vifm/template
@@ -1,20 +1,20 @@
# Template file for 'vifm'
pkgname=vifm
-version=0.12
+version=0.13
revision=1
build_style=gnu-configure
configure_args="--without-gtk"
hostmakedepends="mdocml"
-makedepends="ncurses-devel file-devel"
+makedepends="ncurses-devel file-devel perl"
depends="desktop-file-utils"
-short_desc="Ncurses-based file manager with vi-like keybindings"
+short_desc="A file manager with curses interface and a Vim-like environment"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://vifm.info/"
-distfiles="${SOURCEFORGE_SITE}/vifm/vifm-${version}.tar.bz2"
-checksum=33a9618f32b35b5b8c64483884f9ad09963ca8465b2935def79159028e27b2c0
+distfiles="https://github.com/vifm/vifm/releases/download/v0.13/vifm-0.13.tar.bz2"
+checksum=0d9293749a794076ade967ecdc47d141d85e450370594765391bdf1a9bd45075
-CFLAGS="-fcommon"
+CFLAGS="-fcommon -Wno-unused-result"
post_install() {
vsconf data/vifmrc
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-11-06 1:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-24 23:17 [PR PATCH] Update vifm to 0.13 hholst80
2023-10-23 1:45 ` vifm: update " github-actions
2023-11-06 1:46 ` [PR PATCH] [Closed]: " github-actions
-- strict thread matches above, loose matches on Subject: below --
2023-07-05 22:33 [PR PATCH] Update vifm " hholst80
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).