[gentoo-commits] repo/gentoo:master commit in: app-misc/vifm/, app-misc/vifm/files/
commit: de0cbbdec3fee91cecfa47f14debe69c672046c0
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Sep 4 13:31:07 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Sep 4 13:32:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0cbbde
app-misc/vifm: fix tests on musl
Closes: https://bugs.gentoo.org/833896
Signed-off-by: Petr Vaněk gentoo.org>
app-misc/vifm/files/vifm-0.13-musl.patch | 133 +++
app-misc/vifm/vifm-0.13-r1.ebuild| 101 +++
2 files changed, 234 insertions(+)
diff --git a/app-misc/vifm/files/vifm-0.13-musl.patch
b/app-misc/vifm/files/vifm-0.13-musl.patch
new file mode 100644
index ..6682da354187
--- /dev/null
+++ b/app-misc/vifm/files/vifm-0.13-musl.patch
@@ -0,0 +1,133 @@
+From c97f144231afbeb4215659d5c685fdf1e3fe5612 Mon Sep 17 00:00:00 2001
+From: xaizek
+Date: Sat, 8 Jul 2023 15:02:37 +0300
+Subject: [PATCH] Fix running tests with musl libc
+
+Thanks to Henrik Holst (a.k.a. hholst80).
+---
+Upstream commit
https://github.com/vifm/vifm/commit/c97f144231afbeb4215659d5c685fdf1e3fe5612
+
+diff --git a/src/filelist.c b/src/filelist.c
+index 28d26c69f..a7121f238 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 5d1c000b0..9905b2b7f 100644
+--- a/src/opt_handlers.c
b/src/opt_handlers.c
+@@ -3301,9 +3301,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/ui/fileview.c b/src/ui/fileview.c
+index 11c80fe8b..ef5f422be 100644
+--- a/src/ui/fileview.c
b/src/ui/fileview.c
+@@ -253,6 +253,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 c9fee0782..886eb9d38 100644
+--- a/src/ui/ui.h
b/src/ui/ui.h
+@@ -449,6 +449,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 9938414b5..3db71db5b 100644
+--- a/tests/misc/sort.c
b/tests/misc/sort.c
+@@ -409,8 +409,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. */
+
+@@ -437,15 +442,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;
+
+ dir_entry_t entry_list[] = { { .name = "a1" }, { .name = "b0" } };
+ entries_t entries = { entry_list, 2 };
+diff --git a/tests/test-support/test-utils.c b/tests/test-support/test-utils.c
+index 932bdc9c9..e3d9ba694 100644
+--- a/tests/test-support/test-utils.c
b/tests/test-suppo
[gentoo-commits] repo/gentoo:master commit in: app-misc/vifm/, app-misc/vifm/files/
commit: 1c91a15ba84512dbd9d0a1236a0ede17b842069e
Author: Viacheslav Ostroukh ostroukh me>
AuthorDate: Tue Apr 24 11:06:51 2018 +
Commit: José María Alonso gentoo org>
CommitDate: Tue Apr 24 11:08:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c91a15b
app-misc/vifm: Fix ncurses linking
Closes: https://bugs.gentoo.org/651914
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/vifm-0.9.1-fix-ncurses-linking.patch | 60 ++
app-misc/vifm/vifm-0.9.1.ebuild| 6 ++-
2 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
new file mode 100644
index 000..40d41dcc8f1
--- /dev/null
+++ b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
@@ -0,0 +1,60 @@
+From 8196704a5dafa4c8e194f1643728ed45b4b55df6 Mon Sep 17 00:00:00 2001
+From: xaizek
+Date: Mon, 9 Apr 2018 19:31:06 +0300
+Subject: [PATCH] fix ncurses linking
+
+---
+ THANKS | 2 ++
+ configure| 2 +-
+ configure.ac | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index e708f4d3..faab4f8a 100644
+--- a/THANKS
b/THANKS
+@@ -25,6 +25,7 @@ c02y
+ Carl Mueller (carlmuller)
+ Carlos Pita
+ Charles Kauffman
++Chema Alonso Josa (nimiux)
+ Christian Fillion (cfillion)
+ Christian Herdtweck
+ Christoph (informationen)
+@@ -128,6 +129,7 @@ Richard Benson
+ Robert Sarkozi
+ Roger Bongers
+ Ross Hadden (rosshadden)
++Ruslan Osmanov (rosmanov)
+ Russell Urquhart
+ SanLe
+ santhoshr
+diff --git a/configure b/configure
+index 0054dbde..a3c9bd43 100755
+--- a/configure
b/configure
+@@ -8707,7 +8707,7 @@ return curs_set ();
+ return 0;
+ }
+ _ACEOF
+-for ac_lib in '' tinfo; do
++for ac_lib in '' tinfow; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+diff --git a/configure.ac b/configure.ac
+index 61b3ed5d..65e550a2 100644
+--- a/configure.ac
b/configure.ac
+@@ -437,7 +437,7 @@ AC_CHECK_LIB(${curses_lib_name}, initscr,
+ CPPFLAGS="$CPPFLAGS -I/usr/include/${curses_lib_name}"
+ fi
+ ncurses_found=yes]
+-AC_SEARCH_LIBS([curs_set], [tinfo],,
++AC_SEARCH_LIBS([curs_set], [tinfow],,
+ AC_MSG_ERROR(could not find a library providing curs_set)))
+ dnl If libncursesw is not found on OS X, check for libncurses. On OS X it has
+ dnl support of wide characters.
+--
+2.16.1
+
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
index 283cc2139c3..fc8ca7c795a 100644
--- a/app-misc/vifm/vifm-0.9.1.ebuild
+++ b/app-misc/vifm/vifm-0.9.1.ebuild
@@ -28,14 +28,18 @@ RDEPEND="
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-ncurses-linking.patch"
+)
+
DOCS="AUTHORS FAQ NEWS README TODO"
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ default
sed -i -e '/stat.h/a#include '
"${S}/src/modes/file_info.c" \
|| die
- eapply_user
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: app-misc/vifm/, app-misc/vifm/files/
commit: aacca1b3a5cb4bc7845fcf1fc2306699cbb0dae7
Author: José María Alonso Josa gentoo org>
AuthorDate: Sat Jan 9 19:57:30 2016 +
Commit: José María Alonso gentoo org>
CommitDate: Sat Jan 9 19:57:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aacca1b3
app-misc/vifm: drop old
Package-Manager: portage-2.2.20.1
app-misc/vifm/Manifest | 2 -
.../vifm/files/vifm-0.7.8-fix-ncurses-tinfo.patch | 14
app-misc/vifm/vifm-0.7.7.ebuild| 85 ---
app-misc/vifm/vifm-0.7.8.ebuild| 95 --
4 files changed, 196 deletions(-)
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 1a802b0..02657c0 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,5 +1,3 @@
DIST vifm-0.7.2.tar.bz2 468086 SHA256
f95e49a8518dd1acc9b7b750658a98bcf1cb538e25520a5a300b5812108fbc8d SHA512
24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9
WHIRLPOOL
9c954dbe659e3303315642738bafb962f6f20820af0fe587b3c525ad7a93aca3f9090fe5d2d871a291ce95c9add81f7d717ae5adbdcbe2a58d2889e0bf3e50dc
-DIST vifm-0.7.7.tar.bz2 633812 SHA256
0dc0271c016ab2d2017bc3c2389bd2ab747603f1c05f425a8a181f5cdaacd4d1 SHA512
a95ee365a287c06515c5541ce67e609dacb8b8640f0fec5b33bd3794a8f8445fd8052e5bbd42bda0d23f9c5b5e5591978412bcea0c7ceb6ab403fa271e219455
WHIRLPOOL
8faea36324a8cf6c125996170ab87ee58f71cadea4263857d6c89593ceea54a1a2645368718d89ec31daf477bb54c3955275c68e933a5220373a620c10d2df97
-DIST vifm-0.7.8.tar.bz2 623154 SHA256
5dfbb26c2038a58dcff12026dab736e29d547b4aa3ff5912e4d844064c9e7603 SHA512
ac70055739aeee915ccf5b22bd497ff691d159d9c0aaa4d38de69db33538a5360c9cabe0678ce51f7bce26adfc5657860d071725a14adf577f263bd180fab676
WHIRLPOOL
899ee45e6ff1ee8a3aa05bed01358c0e95cfad226713597737bd0b5eef8518deefabe9f3eff9ebde91a508818d1fcc2a3bd8ade714da8e91eaf11ac314ae51dd
DIST vifm-0.8.1-beta.tar.bz2 819256 SHA256
e0e3e4d7cc06ac75e4acdd1c03f1b91e433b0df3ef817024e27bdc268f32b80f SHA512
873d6cecb3926395d48a3b56cd7c30f3dee930394c31c520d7eb4f12a6a938c632246b84f271dc98841eebe494fa1cf4b2c36bb560ad95574185dbdd47f888c7
WHIRLPOOL
5cde8d5010b7d96b142a662d9188f82f05ea41eb98372ab4628026bfc209b7afa991bd4fc3d9206c3b8e4cc251a20c056b5d11dff4752528c44c3152d92d5f96
DIST vifm-0.8.tar.bz2 756795 SHA256
69eb6b50dcf462f4233ff987f0b6a295df08a27bc42577ebef725bfe58dbdeeb SHA512
b4727b7a9f577eb05c4e8830849a00759cbeb35457c8fa533136a0a68124312f2bb8c5c21239fbbd34f567ddaca247ede05e48e72b890bb4f15d12adebc23210
WHIRLPOOL
78d030cc9eda292ce75656eedc3ede3e02c87522517d7b7d49f0e993dbfc438a5b5e0dcf8fed531eeb1e045f01d5418d1e7fbc84cb53da800bb54d7ab4a636d7
diff --git a/app-misc/vifm/files/vifm-0.7.8-fix-ncurses-tinfo.patch
b/app-misc/vifm/files/vifm-0.7.8-fix-ncurses-tinfo.patch
deleted file mode 100644
index 888acd4..000
--- a/app-misc/vifm/files/vifm-0.7.8-fix-ncurses-tinfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/configure.ac b/configure.ac
a/configure.ac 2014-10-25 17:09:35.0 +0200
-+++ b/configure.ac 2014-11-26 16:42:50.22426 +0100
-@@ -335,7 +335,9 @@
- if test x$vifm_cv_curses = x/usr -a -d /usr/include/${curses_lib_name};
then
- CPPFLAGS="$CPPFLAGS -I/usr/include/${curses_lib_name}"
- fi
-- ncurses_found=yes])
-+ ncurses_found=yes]
-+ AC_SEARCH_LIBS([curs_set], [tinfo],,
-+ AC_MSG_ERROR(could not find a library providing curs_set)))
- dnl If libncursesw is not found on OS X, check for libncurses. On OS X it has
- dnl support of wide characters.
- if test -n "$OSX_HOST" -a "x$ncurses_found" != "xyes"; then
diff --git a/app-misc/vifm/vifm-0.7.7.ebuild b/app-misc/vifm/vifm-0.7.7.ebuild
deleted file mode 100644
index 06c2fbf..000
--- a/app-misc/vifm/vifm-0.7.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base vim-doc
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="http://vifm.info/";
-SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~s390 x86"
-IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
-
-DEPEND="
- >=sys-libs/ncurses-5.7-r7
- magic? ( sys-apps/file )
- gtk? ( x11-libs/gtk+:2 )
- X? ( x11-libs/libX11 )
-"
-RDEPEND="
- ${DEPEND}
- vim? ( || ( app-editors/vim app-editors/gvim ) )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-DOCS=( AUTHORS FAQ NEWS README TODO )
-
-src_configure() {
- econf \
- $(use_enable developer) \
- $(use_enable extended-keys) \
- $(use_with magic libmagic) \
- $(use_with gtk) \
- $(use_with X X11)
-}
-
-src_install() {
- base_src_install
-
- if use vim;
