Hello community,
here is the log from the commit of package feh for openSUSE:Factory checked in
at 2019-02-20 14:14:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/feh (Old)
and /work/SRC/openSUSE:Factory/.feh.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "feh"
Wed Feb 20 14:14:02 2019 rev:31 rq:677523 version:3.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/feh/feh.changes 2019-01-10 15:22:48.786363238
+0100
+++ /work/SRC/openSUSE:Factory/.feh.new.28833/feh.changes 2019-02-20
14:14:04.454884422 +0100
@@ -1,0 +2,6 @@
+Mon Feb 18 05:38:11 UTC 2019 - sean...@opensuse.org
+
+- update to 3.1.3
+ * Fix missing filename in ~/.fehbg when using --no-xinerama
+
+-------------------------------------------------------------------
Old:
----
feh-3.1.1.tar.bz2
feh-3.1.1.tar.bz2.asc
New:
----
feh-3.1.3.tar.bz2
feh-3.1.3.tar.bz2.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ feh.spec ++++++
--- /var/tmp/diff_new_pack.hwQcY3/_old 2019-02-20 14:14:05.270884148 +0100
+++ /var/tmp/diff_new_pack.hwQcY3/_new 2019-02-20 14:14:05.274884146 +0100
@@ -17,7 +17,7 @@
Name: feh
-Version: 3.1.1
+Version: 3.1.3
Release: 0
Summary: X11 image viewer
License: MIT AND LGPL-2.0-or-later
++++++ feh-3.1.1.tar.bz2 -> feh-3.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/ChangeLog new/feh-3.1.3/ChangeLog
--- old/feh-3.1.1/ChangeLog 2018-12-07 22:56:49.000000000 +0100
+++ new/feh-3.1.3/ChangeLog 2019-02-17 08:47:27.000000000 +0100
@@ -1,3 +1,18 @@
+Sun, 17 Feb 2019 08:41:53 +0100 Daniel Friesel <derf+...@finalrewind.org>
+
+* Releasev v3.1.3
+ * Fix missing filename in ~/.fehbg when using --no-xinerama on a feh
+ binary compiled with xinerama=1. This issue was introduced in v3.1.2.
+
+Mon, 11 Feb 2019 17:24:13 +0100 Daniel Friesel <derf+...@finalrewind.org>
+
+* Release v3.1.2
+ * Fix missing filenames in ~/.fehbg when using --bg-* on directories and/or
+ with --randomize
+ * Fix repeated --slideshow-delay/-D option not properly overriding the
+ 'start paused' flag
+ * Fix repeated --info option not properly overriding the 'draw info' flag
+
Fri, 07 Dec 2018 22:51:15 +0100 Daniel Friesel <derf+...@finalrewind.org>
* Release v3.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/config.mk new/feh-3.1.3/config.mk
--- old/feh-3.1.1/config.mk 2018-12-07 22:56:49.000000000 +0100
+++ new/feh-3.1.3/config.mk 2019-02-17 08:47:27.000000000 +0100
@@ -1,5 +1,5 @@
PACKAGE ?= feh
-VERSION ?= 3.1.1
+VERSION ?= 3.1.3
app ?= 0
curl ?= 1
@@ -86,7 +86,7 @@
MAN_EXIF = disabled
endif
-MAN_DATE ?= December 07, 2018
+MAN_DATE ?= February 17, 2019
# Uncomment this to use dmalloc
#CFLAGS += -DWITH_DMALLOC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/man/feh.pre new/feh-3.1.3/man/feh.pre
--- old/feh-3.1.1/man/feh.pre 2018-12-07 22:56:49.000000000 +0100
+++ new/feh-3.1.3/man/feh.pre 2019-02-17 08:47:27.000000000 +0100
@@ -129,21 +129,21 @@
.Sh SUPPORTED FORMATS
.
.Nm
-can open any format supported by Imlib2, most notably jpeg, png,
+can open any format supported by imlib2, most notably jpeg, png,
pnm, tiff, and bmp.
The gif format is also supported, but only for static images.
In case of animations, only the first frame will be shown.
.
If the convert binary
.Pq supplied by ImageMagick
-is available, it also has limited support for many other filetypes, such as
+is available, it also has limited support for many other file types, such as
svg, xcf and otf.
If dcraw is available,
.Nm
also supports RAW files provided by cameras and will display the embedded
thumbnails.
Use
-.Cm --conversion-timeout Ar num
+.Cm --conversion-timeout Ar timeout
with a non-negative value to enable support for these formats.
.
.
@@ -224,7 +224,7 @@
.
.It Cm --cache-size Ar size
.
-Set Imlib2 in-memory cache to
+Set imlib2 in-memory cache to
.Ar size
MiB.
A higher cache size can significantly improve performance especially for small
@@ -259,7 +259,7 @@
.It Cm --conversion-timeout Ar timeout
.
.Nm
-can use ImageMagick to try converting unloadable files into a supportad
+can use ImageMagick to try converting unloadable files into a supported
file format.
As this can take a long time, it is disabled by default.
Set
@@ -293,7 +293,7 @@
.
.It Cm -d , --draw-filename
.
-Draw the filename at the top-left of the image.
+Draw the file name at the top-left of the image.
.
.It Cm --draw-tinted
.
@@ -313,8 +313,8 @@
If
.Ar file
exists, it will be read for a list of files to load, in the order they appear.
-The format is a list of image filenames, absolute or relative to the current
-directory, one filename per line.
+The format is a list of image file names, absolute or relative to the current
+directory, one file name per line.
.
.Pp
.
@@ -363,7 +363,7 @@
.
.It Cm --force-aliasing
.
-Disable antialiasing for zooming, background setting etc.
+Disable anti-aliasing for zooming, background setting etc.
.
.It Cm -I , --fullindex
.
@@ -428,7 +428,7 @@
.Ar style
as background for transparent image parts and the like.
Accepted values: default, checks, or an XColor
-.Pq eg. Qo black Qc or Qo #428bdd Qc .
+.Pq e.g. Qo black Qc or Qo #428bdd Qc .
.
In windowed mode, the default is checks
.Pq a checkered background so transparent image parts are easy to see .
@@ -447,10 +447,10 @@
and
.Sx MONTAGE MODE OPTIONS .
.
-.It Cm --info Oo Ar flag Oc Ns Ar commandline
+.It Cm --info Oo Ar flag Oc Ns Ar command_line
.
Execute
-.Ar commandline
+.Ar command_line
and display its output in the bottom left corner of the image.
Can be used to display e.g. image dimensions or EXIF information.
Supports
@@ -627,7 +627,7 @@
.
.It Cm -r , --recursive
.
-Recursively expand any directories in the commandline arguments
+Recursively expand any directories in the command line arguments
to the content of those directories, all the way down to the bottom level.
.
.It Cm --no-recursive
@@ -699,15 +699,19 @@
.It Cm -S , --sort Ar sort_type
.
Sort file list according to image parameters.
-Allowed sort types are: name, filename, dirname, mtime, width, height, pixels,
-size, format.
-For sort modes other than name, filename, dirname, or mtime, a preload run is
+Allowed sort types are:
+.Cm name , filename , dirname , mtime , width , height , pixels , size ,
format .
+For sort modes other than
+.Cm name , filename , dirname ,
+or
+.Cm mtime ,
+a preload run is
necessary, causing a delay proportional to the number of images in the list.
.
.Pp
.
.Cm mtime
-starts with the most recently modified image,
+starts with the most recently modified image.
.Cm width , height , pixels
and
.Cm size
@@ -721,7 +725,7 @@
For
.Cm name , filename ,
and
-.Cm dirname ,
+.Cm dirname
you can use
.Cm --version-sort
to sort numbers naturally, so that e.g. 10.jpg comes after 2.jpg.
@@ -730,7 +734,7 @@
.
Start the filelist at
.Ar filename .
-If no other files or filelists were specifed on the commandline,
+If no other files or filelists were specified on the command line,
.Nm
will first load all files from the directory in which
.Ar filename
@@ -762,7 +766,7 @@
- see
.Sx THEMES CONFIG SYNTAX
for more info.
-Note that commandline options always override theme options.
+Note that command line options always override theme options.
The theme can also be set via the program name
.Pq e.g. with symlinks ,
so by default
@@ -1318,6 +1322,9 @@
.
Note that you can split a theme over several lines by placing a backslash at
the end of an unfinished line.
+A single option-argument-pair must not span multiple lines.
+A single line must not be longer than 1023 characters, but there's no upper
+limit for the length of a theme.
.
.Pp
.
@@ -1637,7 +1644,7 @@
.
Scroll down.
Note that the scroll keys work without anti-aliasing for performance reasons;
-hit the render key after scrolling to antialias the image.
+hit the render key after scrolling to anti-alias the image.
.
.It Aq Alt+Left Bq scroll_left_page
.
@@ -1657,7 +1664,7 @@
.
.It R, Ao keypad begin Ac Bq render
.
-Antialias the image.
+Anti-alias the image.
Opens the currently selected image in thumbnail mode.
.
.It Ao keypad + Ac , Ao Up Ac Bq zoom_in
@@ -1947,6 +1954,12 @@
Recursively remove all images with dimensions below or equal to 1000x800 pixels
from the current directory.
.
+.It feh -L '%w %h %f' \&| awk '{ if \&($1 > $2\&) { print $0 } }' \&| cut -d '
' -f 3- \&| feh -f -
+.
+Show landscape pictures
+.Pq image width greater than height
+in the current directory.
+.
.El
.
.
@@ -1966,7 +1979,7 @@
.
.Pp
.
-To view images from URLs such as http://,
+To view images from URLs such as "http://";,
.Nm
must be compiled with libcurl support.
It is $MAN_CURL$ in this build
@@ -2012,7 +2025,7 @@
If you find a bug, please report it to
.Aq derf+...@finalrewind.org
or via
-.Aq http://github.com/derf/feh/issues .
+.Aq https://github.com/derf/feh/issues .
You are also welcome to direct any feh-related comments/questions/... to #feh
on irc.oftc.net.
.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/share/applications/feh.pre
new/feh-3.1.3/share/applications/feh.pre
--- old/feh-3.1.1/share/applications/feh.pre 2018-12-07 22:56:49.000000000
+0100
+++ new/feh-3.1.3/share/applications/feh.pre 2019-02-17 08:47:27.000000000
+0100
@@ -3,7 +3,7 @@
Name[en_US]=feh
GenericName=Image viewer
GenericName[en_US]=Image viewer
-Comment=Fast Imlib2-based Image Viewer
+Comment=Image viewer and cataloguer
Exec=feh --start-at %f
Terminal=false
Type=Application
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/src/main.c new/feh-3.1.3/src/main.c
--- old/feh-3.1.1/src/main.c 2018-12-07 22:56:49.000000000 +0100
+++ new/feh-3.1.3/src/main.c 2019-02-17 08:47:27.000000000 +0100
@@ -183,7 +183,7 @@
&& ((errno == ENOMEM) || (errno ==
EINVAL)
|| (errno == EBADF)))
eprintf("Connection to X display lost");
- if ((ft) && (count == 0)) {
+ if (count == 0) {
/* This means the timer is due to be executed.
If count was > 0,
that would mean an X event had woken us,
we're not interested
in that */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/src/options.c new/feh-3.1.3/src/options.c
--- old/feh-3.1.1/src/options.c 2018-12-07 22:56:49.000000000 +0100
+++ new/feh-3.1.3/src/options.c 2019-02-17 08:47:27.000000000 +0100
@@ -131,6 +131,7 @@
char *rcpath = NULL;
char *oldrcpath = NULL;
char *confbase = getenv("XDG_CONFIG_HOME");
+ // s, s1 and s2 must always have identical size
char s[1024], s1[1024], s2[1024];
int cont = 0;
int bspos;
@@ -167,11 +168,19 @@
s2[0] = '\0';
if (cont) {
+ /*
+ * fgets ensures that s contains no more than 1023
characters
+ * (+ 1 null byte)
+ */
sscanf(s, " %[^\n]\n", (char *) &s2);
if (!*s2)
break;
D(("Got continued options %s\n", s2));
} else {
+ /*
+ * fgets ensures that s contains no more than 1023
characters
+ * (+ 1 null byte)
+ */
sscanf(s, "%s %[^\n]\n", (char *) &s1, (char *) &s2);
if (!(*s1) || (!*s2) || (*s1 == '\n') || (*s1 == '#')) {
cont = 0;
@@ -461,6 +470,8 @@
if (opt.slideshow_delay < 0.0) {
opt.slideshow_delay *= (-1);
opt.paused = 1;
+ } else {
+ opt.paused = 0;
}
break;
case 'E':
@@ -742,10 +753,12 @@
break;
case 234:
opt.info_cmd = estrdup(optarg);
- if (opt.info_cmd[0] == ';')
+ if (opt.info_cmd[0] == ';') {
+ opt.draw_info = 0;
opt.info_cmd++;
- else
+ } else {
opt.draw_info = 1;
+ }
break;
case 235:
opt.force_aliasing = 1;
@@ -825,8 +838,6 @@
add_file_to_filelist_recursively(".", FILELIST_FIRST);
}
}
- else if (finalrun && !opt.filelistfile && !opt.bgmode)
- add_file_to_filelist_recursively(".", FILELIST_FIRST);
/* So that we can safely be called again */
optind = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/src/signals.h new/feh-3.1.3/src/signals.h
--- old/feh-3.1.1/src/signals.h 2018-12-07 22:56:49.000000000 +0100
+++ new/feh-3.1.3/src/signals.h 2019-02-17 08:47:27.000000000 +0100
@@ -27,5 +27,5 @@
#define SIGNALS_H
void setup_signal_handlers();
-volatile extern int sig_exit;
+extern volatile int sig_exit;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/src/wallpaper.c
new/feh-3.1.3/src/wallpaper.c
--- old/feh-3.1.1/src/wallpaper.c 2018-12-07 22:56:49.000000000 +0100
+++ new/feh-3.1.3/src/wallpaper.c 2019-02-17 08:47:27.000000000 +0100
@@ -502,15 +502,16 @@
}
fputc(' ', fp);
if (use_filelist) {
- for (int i = 0; i < cmdargc;
i++) {
- if (filelist_pos &&
!strcmp(FEH_FILE(filelist_pos->data)->filename, cmdargv[i])) {
- /* argument is
a file */
- absolute_path =
feh_absolute_path(cmdargv[i]);
-
fputs(shell_escape(absolute_path), fp);
- filelist_pos =
filelist_pos->next;
-
free(absolute_path);
- fputc(' ', fp);
- }
+#ifdef HAVE_LIBXINERAMA
+ for (int i = 0; (i <
opt.xinerama ? num_xinerama_screens : 1) && filelist_pos; i++) {
+#else
+ for (int i = 0; (i < 1
) && filelist_pos; i++) {
+#endif
+ absolute_path =
feh_absolute_path(FEH_FILE(filelist_pos->data)->filename);
+
fputs(shell_escape(absolute_path), fp);
+ filelist_pos =
filelist_pos->next;
+ free(absolute_path);
+ fputc(' ', fp);
}
} else if (fil) {
absolute_path =
feh_absolute_path(fil);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/feh-3.1.1/src/winwidget.c
new/feh-3.1.3/src/winwidget.c
--- old/feh-3.1.1/src/winwidget.c 2018-12-07 22:56:49.000000000 +0100
+++ new/feh-3.1.3/src/winwidget.c 2019-02-17 08:47:27.000000000 +0100
@@ -203,7 +203,6 @@
}
if (opt.paused) {
- printf("name %s\n", ret->name);
tmpname = estrjoin(" ", ret->name, "[Paused]", NULL);
free(ret->name);
ret->name = tmpname;
@@ -740,8 +739,6 @@
void winwidget_move(winwidget winwid, int x, int y)
{
if (winwid && ((winwid->x != x) || (winwid->y != y))) {
- winwid->x = x;
- winwid->y = y;
winwid->x = (x > scr->width) ? scr->width : x;
winwid->y = (y > scr->height) ? scr->height : y;
XMoveWindow(disp, winwid->win, winwid->x, winwid->y);
