diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-03-24 19:59:25 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-03-24 19:59:25 +0000 |
commit | 97695f2bb92f85bc6982f220085dc45ad40134dd (patch) | |
tree | eeb21e115c720be3577abc87691f0238e8c6f713 /user/feh/stdout-buff.patch | |
parent | df1c7b8e8a64c40ef6defd7477b1a6ad0d581581 (diff) | |
parent | f58cddd786b78f6adc2d484ef89efba5589a4b02 (diff) | |
download | packages-97695f2bb92f85bc6982f220085dc45ad40134dd.tar.gz packages-97695f2bb92f85bc6982f220085dc45ad40134dd.tar.bz2 packages-97695f2bb92f85bc6982f220085dc45ad40134dd.tar.xz packages-97695f2bb92f85bc6982f220085dc45ad40134dd.zip |
Merge branch 'feh-bump' into 'master'
user/feh: bump to 2.25.1
Drop two patches that were integrated upstream in 2.23.1:
* https://github.com/derf/feh/commit/bb9b759150485ed2da4ac795afeefa9de789381b
* https://github.com/derf/feh/commit/4169eae19a75ce5c1f94f69bcee5ce2e3bed78f7
See merge request !23
Diffstat (limited to 'user/feh/stdout-buff.patch')
-rw-r--r-- | user/feh/stdout-buff.patch | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/user/feh/stdout-buff.patch b/user/feh/stdout-buff.patch deleted file mode 100644 index eaa251a3a..000000000 --- a/user/feh/stdout-buff.patch +++ /dev/null @@ -1,113 +0,0 @@ -On glibc, if output is redirected to a file, output will look like this: - -touch test/ok/gif -touch test/ok/jpg -touch test/ok/png -touch test/ok/pnm -test/ok/gif -test/ok/jpg -test/ok/png -test/ok/pnm - -On musl, if stdout is redirected to a file, output looks like this: - -test/ok/gif -touch test/ok/gif -touch test/ok/jpg -touch test/ok/png -touch test/ok/pnm -test/ok/jpg -test/ok/png -test/ok/pnm - -On glibc and musl, if stdout is interactive, it looks like this: - -test/ok/gif -touch test/ok/gif -test/ok/jpg -touch test/ok/jpg -test/ok/png -touch test/ok/png -test/ok/pnm -touch test/ok/pnm - -Adding two fflush calls makes all behavior look like the last example. - ---- feh-2.22/src/list.c 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/src/list.c 2018-01-03 02:59:08.840000000 +0000 -@@ -92,6 +92,7 @@ - if (opt.verbose) - feh_display_status('.'); - puts(file->filename); -+ fflush(stdout); - feh_action_run(file, opt.actions[0], NULL); - } - else { -@@ -106,6 +107,7 @@ - if (opt.verbose) - feh_display_status('.'); - puts(file->filename); -+ fflush(stdout); - feh_action_run(file, opt.actions[0], NULL); - } - else { ---- feh-2.22/test/nx_action/loadable_action 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/test/nx_action/loadable_action 2018-01-03 02:46:48.030000000 +0000 -@@ -1,8 +1,8 @@ --touch test/ok/gif --touch test/ok/jpg --touch test/ok/png --touch test/ok/pnm - test/ok/gif -+touch test/ok/gif - test/ok/jpg -+touch test/ok/jpg - test/ok/png -+touch test/ok/png - test/ok/pnm -+touch test/ok/pnm ---- feh-2.22/test/nx_action/loadable_naction 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/test/nx_action/loadable_naction 2018-01-03 02:51:05.340000000 +0000 -@@ -1,8 +1,8 @@ --touch test/ok/gif --touch test/ok/jpg --touch test/ok/png --touch test/ok/pnm - test/ok/gif -+touch test/ok/gif - test/ok/jpg -+touch test/ok/jpg - test/ok/png -+touch test/ok/png - test/ok/pnm -+touch test/ok/pnm ---- feh-2.22/test/nx_action/unloadable_action 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/test/nx_action/unloadable_action 2018-01-03 02:51:36.480000000 +0000 -@@ -1,8 +1,8 @@ --rm test/fail/gif --rm test/fail/jpg --rm test/fail/png --rm test/fail/pnm - test/fail/gif -+rm test/fail/gif - test/fail/jpg -+rm test/fail/jpg - test/fail/png -+rm test/fail/png - test/fail/pnm -+rm test/fail/pnm ---- feh-2.22/test/nx_action/unloadable_naction 2017-11-04 14:03:43.000000000 +0000 -+++ feh-2.22/test/nx_action/unloadable_naction 2018-01-03 02:51:51.850000000 +0000 -@@ -1,8 +1,8 @@ --rm test/fail/gif --rm test/fail/jpg --rm test/fail/png --rm test/fail/pnm - test/fail/gif -+rm test/fail/gif - test/fail/jpg -+rm test/fail/jpg - test/fail/png -+rm test/fail/png - test/fail/pnm -+rm test/fail/pnm |