From 8c23073a34ba94c887003d8d7ee66029d15e8ec2 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Jul 20 2015 23:15:40 +0000 Subject: respin patch (conflicts in the changelog) --- diff --git a/vifm-0.8-aarch64.patch b/vifm-0.8-aarch64.patch index 99fad38..6a05e5e 100644 --- a/vifm-0.8-aarch64.patch +++ b/vifm-0.8-aarch64.patch @@ -1,52 +1,26 @@ -From be821157bb9c22ac1928c2f0e9b189880ce77505 Mon Sep 17 00:00:00 2001 -From: xaizek -Date: Mon, 20 Jul 2015 20:36:52 +0300 -Subject: [PATCH] Work around compilation on AArch64 GNU/Linux - -Or in general on systems where MAX_ARG_STRLEN is defined, but is -unusable (it's either shouldn't be defined or should work, not the -way it is at the moment). Thanks to Marcin Juszkiewicz (a.k.a. -hrw). ---- - ChangeLog | 3 +++ - THANKS | 1 + - config.h.in | 3 +++ - configure | 17 +++++++++++++++++ - configure.ac | 11 +++++++++++ - src/utils/utils_nix.c | 5 +++-- - 6 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 837ed0c..772639c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -22,6 +22,9 @@ - - Normalize surrounding spaces in menu and dialog titles. +diff -u -r -U5 --no-dereference vifm-0.8/ChangeLog vifm-0.8.aarch64/ChangeLog +--- vifm-0.8/ChangeLog 2015-07-09 12:00:42.000000000 -0400 ++++ vifm-0.8.aarch64/ChangeLog 2015-07-20 19:14:11.292314611 -0400 +@@ -94,10 +94,13 @@ + Fixed crash/leak on processing of background jobs. Thanks to Christian + Fillion (a.k.a. cfillion). + + Fixed several memory access errors and leaks. + Work around compilation on systems where MAX_ARG_STRLEN is defined, but + unusable. Thanks to Marcin Juszkiewicz (a.k.a. hrw). + - Fixed resetting "vborder" of 'fillchars' after it has been set to - something (as in `:set fillchars=vborder:\* fillchars&`). - -diff --git a/THANKS b/THANKS -index 7f4ae95..93c4322 100644 ---- a/THANKS -+++ b/THANKS -@@ -53,6 +53,7 @@ lcj - Lomov Vladimir (lomov_vl) - lyuts - MadMaverick9 -+Marcin Juszkiewicz (hrw) - Martin Fischer - Marton Balazs (balmar) - Merovius -diff --git a/config.h.in b/config.h.in -index 9ad2014..6fa0c5a 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -43,6 +43,9 @@ + 0.7.8 to 0.8-beta + + Removed per-view last search pattern. Don't worry, you probably won't + even notice it: this doesn't affect regular use case, rather more exotic + one, which is hard to notice. +diff -u -r -U5 --no-dereference vifm-0.8/config.h.in vifm-0.8.aarch64/config.h.in +--- vifm-0.8/config.h.in 2015-07-09 12:01:49.000000000 -0400 ++++ vifm-0.8.aarch64/config.h.in 2015-07-20 19:13:41.539062375 -0400 +@@ -41,10 +41,13 @@ + #undef HAVE_LINUX_BINFMTS_H + /* malloc.h header is available. */ #undef HAVE_MALLOC_H @@ -56,11 +30,14 @@ index 9ad2014..6fa0c5a 100644 /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -diff --git a/configure b/configure -index f7ae7d5..3cfc647 100755 ---- a/configure -+++ b/configure -@@ -6315,6 +6315,23 @@ fi + /* Define to 1 if you have the header file. */ + #undef HAVE_MNTENT_H +diff -u -r -U5 --no-dereference vifm-0.8/configure vifm-0.8.aarch64/configure +--- vifm-0.8/configure 2015-07-09 12:01:49.000000000 -0400 ++++ vifm-0.8.aarch64/configure 2015-07-20 19:13:41.541062392 -0400 +@@ -6313,10 +6313,27 @@ + + fi done @@ -84,11 +61,14 @@ index f7ae7d5..3cfc647 100755 ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default" if test "x$ac_cv_type_uid_t" = xyes; then : -diff --git a/configure.ac b/configure.ac -index ee0200b..a81afc6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,6 +74,17 @@ AC_CHECK_HEADER([wchar.h], [], [AC_MSG_ERROR([wchar.h header not found.])]) + + fi +diff -u -r -U5 --no-dereference vifm-0.8/configure.ac vifm-0.8.aarch64/configure.ac +--- vifm-0.8/configure.ac 2015-07-09 12:00:42.000000000 -0400 ++++ vifm-0.8.aarch64/configure.ac 2015-07-20 19:13:41.542062401 -0400 +@@ -72,10 +72,21 @@ + AC_CHECK_HEADER([unistd.h], [], [AC_MSG_ERROR([unistd.h header not found.])]) + AC_CHECK_HEADER([wchar.h], [], [AC_MSG_ERROR([wchar.h header not found.])]) AC_CHECK_HEADER([wctype.h], [], [AC_MSG_ERROR([wctype.h header not found.])]) dnl Headers required for breaking too long command-lines. AC_CHECK_HEADERS([sys/user.h linux/binfmts.h]) @@ -106,11 +86,14 @@ index ee0200b..a81afc6 100644 dnl Check for various system types. AC_CHECK_TYPE([uid_t]) -diff --git a/src/utils/utils_nix.c b/src/utils/utils_nix.c -index 31efc0f..1d6a33d 100644 ---- a/src/utils/utils_nix.c -+++ b/src/utils/utils_nix.c -@@ -20,7 +20,8 @@ + AC_CHECK_TYPE([gid_t]) + AC_CHECK_TYPE([mode_t]) +diff -u -r -U5 --no-dereference vifm-0.8/src/utils/utils_nix.c vifm-0.8.aarch64/src/utils/utils_nix.c +--- vifm-0.8/src/utils/utils_nix.c 2015-07-09 12:00:42.000000000 -0400 ++++ vifm-0.8.aarch64/src/utils/utils_nix.c 2015-07-20 19:13:41.542062401 -0400 +@@ -18,11 +18,12 @@ + */ + #include "utils_nix.h" #include "utils_int.h" @@ -120,7 +103,11 @@ index 31efc0f..1d6a33d 100644 #include #include #endif -@@ -261,7 +262,7 @@ run_from_fork(int pipe[2], int err_only, char cmd[]) + + #include /* select() FD_SET FD_ZERO */ +@@ -258,11 +259,11 @@ + } + char ** make_execv_array(char shell[], char cmd[]) { @@ -128,5 +115,21 @@ index 31efc0f..1d6a33d 100644 +#ifdef HAVE_MAX_ARG_STRLEN /* Don't use maximum length, leave some room or commands fail to run. */ const size_t safe_arg_len = MIN(MAX_ARG_STRLEN, MAX_ARG_STRLEN - 4096U); - const size_t npieces = DIV_ROUND_UP(strlen(cmd 100 4114 0 4114 0 0 6979 0 --:--:-- --:--:-- --:--:-- 6972 -), safe_arg_len); + const size_t npieces = DIV_ROUND_UP(strlen(cmd), safe_arg_len); + #else + /* Actual value doesn't matter in this case. */ +diff -u -r -U5 --no-dereference vifm-0.8/THANKS vifm-0.8.aarch64/THANKS +--- vifm-0.8/THANKS 2015-07-09 12:00:42.000000000 -0400 ++++ vifm-0.8.aarch64/THANKS 2015-07-20 19:13:41.539062375 -0400 +@@ -51,10 +51,11 @@ + Larry Hynes (larryhynes) + lcj + Lomov Vladimir (lomov_vl) + lyuts + MadMaverick9 ++Marcin Juszkiewicz (hrw) + Martin Fischer + Marton Balazs (balmar) + Merovius + Michael Kopp + Michael Maddern (madders) diff --git a/vifm.spec b/vifm.spec index e29c9d7..a609056 100644 --- a/vifm.spec +++ b/vifm.spec @@ -12,6 +12,7 @@ License: GPLv2+ URL: http://vifm.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 # https://github.com/vifm/vifm/commit/be821157bb9c22ac1928c2f0e9b189880ce77505 (issue #103) +# Patch respun for conflicts. Patch0: vifm-0.8-aarch64.patch BuildRequires: autoconf