commit: cb6ec2c1481e838c887c871e4833e6d97ca4586f Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Tue Jul 29 06:19:06 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Tue Jul 29 06:52:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6ec2c1
app-misc/vifm: drop 0.13-r1 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> app-misc/vifm/Manifest | 1 - app-misc/vifm/files/vifm-0.13-c23.patch | 46 ----------- app-misc/vifm/files/vifm-0.13-musl.patch | 133 ------------------------------- app-misc/vifm/metadata.xml | 1 - app-misc/vifm/vifm-0.13-r1.ebuild | 103 ------------------------ 5 files changed, 284 deletions(-) diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest index 6093be6b4b0b..efb8582dec53 100644 --- a/app-misc/vifm/Manifest +++ b/app-misc/vifm/Manifest @@ -1,2 +1 @@ -DIST vifm-0.13.tar.gz 2218099 BLAKE2B 99661dd0defcb434abdc397855feac5c6da55a783cf8ad6afe333e208c431b9d10f05928fcf5a9f8e28ed4d602f66414162b14a872ce8881526f679e6e66259a SHA512 bd5e9f84cfb176e220e798dcdfc62e2ae3e89dbebd08cf4cce73eb843b85060c2df05f04f4db994d406baf2e0f90a04f5cb871beaf00fb04174464c81dd85938 DIST vifm-0.14.2.tar.gz 2477513 BLAKE2B a4a3058294a7d2b8ce2f32e2f48e5dc87577d4013a575f68c136fd96c17f31baac478866dab81719078600b5afe2b518e9a10da320792be6a172e0872555bb03 SHA512 b3d800176d7e09599e6b98feef909408c5dae41e0a969b370e41347651ff8f01775a0b7b06e9da8cfd218fefdffbaa5ee9720ac22c47835eda64c87f9ac7b26c diff --git a/app-misc/vifm/files/vifm-0.13-c23.patch b/app-misc/vifm/files/vifm-0.13-c23.patch deleted file mode 100644 index b8d5e97835ff..000000000000 --- a/app-misc/vifm/files/vifm-0.13-c23.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/944197 -https://github.com/vifm/vifm/commit/a31fcbb13a1a52fecff5f5ebaa9ea2d23c059edf - -From a31fcbb13a1a52fecff5f5ebaa9ea2d23c059edf Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -Date: Mon, 18 Nov 2024 06:50:44 +0000 -Subject: [PATCH] src/int/term_title.c: : fix build against -std=c23 (`void - (*)()`) changed the meaning) - -gcc-15 switched to -std=c23 by default: - - https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 - -As a result `vifm` fails the build as: - - int/term_title.c: In function 'get_x11_window_title': - int/term_title.c:364:21: error: - assignment to 'int (*)(void)' from incompatible pointer type 'XErrorHandler' {aka 'int (*)(Display *, XErrorEvent *)'} [-Wincompatible-pointer-types-Wincompatible-pointer-types] - 364 | old_handler = XSetErrorHandlerWrapper(x_error_check); - | ^ - int/term_title.c:367:47: error: - passing argument 1 of 'XSetErrorHandlerWrapper' from incompatible pointer type [-Wincompatible-pointer-types] - 367 | (void)XSetErrorHandlerWrapper(old_handler); - | ^~~~~~~~~~~ - | | - | int (*)(void) - -The changes fully specifies `old_handler` type. ---- - src/int/term_title.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/int/term_title.c b/src/int/term_title.c -index 17327632d..202ca5a9e 100644 ---- a/src/int/term_title.c -+++ b/src/int/term_title.c -@@ -358,7 +358,7 @@ get_x11_disp_and_win(Display **disp, Window *win) - static void - get_x11_window_title(Display *disp, Window win, char *buf, size_t buf_len) - { -- int (*old_handler)(); -+ int (*old_handler)(Display *, XErrorEvent *); - XTextProperty text_prop; - - old_handler = XSetErrorHandlerWrapper(x_error_check); - diff --git a/app-misc/vifm/files/vifm-0.13-musl.patch b/app-misc/vifm/files/vifm-0.13-musl.patch deleted file mode 100644 index 6682da354187..000000000000 --- a/app-misc/vifm/files/vifm-0.13-musl.patch +++ /dev/null @@ -1,133 +0,0 @@ -From c97f144231afbeb4215659d5c685fdf1e3fe5612 Mon Sep 17 00:00:00 2001 -From: xaizek <[email protected]> -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-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" -@@ -254,6 +255,10 @@ view_setup(view_t *view) - view_set_sort(view->sort, SK_BY_NAME, SK_NONE); - view_set_sort(view->sort_g, SK_BY_NAME, SK_NONE); - -+ /* 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/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml index 9be79155e21f..1e4af3af2304 100644 --- a/app-misc/vifm/metadata.xml +++ b/app-misc/vifm/metadata.xml @@ -15,7 +15,6 @@ </longdescription> <use> <flag name="extended-keys">Support for extended keys (arrows, home etc)</flag> - <flag name="gtk">Use gtk+ to determine mimetypes</flag> <flag name="glib">Use <pkg>dev-libs/glib</pkg>:2 to determine mimetypes</flag> <flag name="vim">Install the vifm vim plugin and vim-compatible documentation</flag> </use> diff --git a/app-misc/vifm/vifm-0.13-r1.ebuild b/app-misc/vifm/vifm-0.13-r1.ebuild deleted file mode 100644 index 85b7cfa80ce5..000000000000 --- a/app-misc/vifm/vifm-0.13-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools vim-doc xdg - -DESCRIPTION="Console file manager with vi(m)-like keybindings" -HOMEPAGE="https://vifm.info/"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/vifm/vifm"; - inherit git-r3 -else - SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 ppc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+extended-keys gtk +magic +vim +vim-syntax X" - -DEPEND=" - >=sys-libs/ncurses-5.9-r3:= - 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 ) ) -" -# "Either perl or Vim is necessary to generate tags for documentation in Vim's format." from configure -BDEPEND="|| ( dev-lang/perl app-editors/vim )" - -PATCHES=( - # Backported fix from upstream, - # see also https://github.com/vifm/vifm/issues/913 - "${FILESDIR}/${P}-musl.patch" - # https://github.com/vifm/vifm/pull/1035 - "${FILESDIR}/${P}-c23.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # developer just turns off optimisations and adds -Werror again - # bug #855386 - econf \ - --disable-developer \ - --disable-werror \ - $(use_enable extended-keys) \ - $(use_with magic libmagic) \ - $(use_with gtk) \ - $(use_with X X11) -} - -src_install() { - default - - if use vim; then - local t - for t in app plugin; do - insinto /usr/share/vim/vimfiles/"${t}" - doins -r data/vim/doc/${t}/${PN}* - done - fi - - if use vim-syntax; then - local t - for t in ftdetect ftplugin syntax; do - insinto /usr/share/vim/vimfiles/"${t}" - doins -r data/vim/${t}/${PN}* - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - if use vim; then - update_vim_helptags - - if [[ -n ${REPLACING_VERSIONS} ]]; then - elog - elog "You don't need to copy or link any files for" - elog " the vim plugin and documentation to work anymore." - elog "If you copied any vifm files to ~/.vim/ manually" - elog " in earlier vifm versions, please delete them." - fi - elog - elog "To use vim in vifm to view the documentation" - elog " edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp" - elog - fi -} - -pkg_postrm() { - xdg_pkg_postrm - use vim && update_vim_helptags -}
