Hello community, here is the log from the commit of package feh for openSUSE:Factory checked in at 2018-02-18 11:45:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/feh (Old) and /work/SRC/openSUSE:Factory/.feh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "feh" Sun Feb 18 11:45:57 2018 rev:20 rq:577664 version:2.23.2 Changes: -------- --- /work/SRC/openSUSE:Factory/feh/feh.changes 2018-02-14 10:52:41.319380380 +0100 +++ /work/SRC/openSUSE:Factory/.feh.new/feh.changes 2018-02-18 11:45:59.797777167 +0100 @@ -1,0 +2,9 @@ +Sun Feb 18 03:02:38 UTC 2018 - [email protected] + +- update to 2.23.2 + * Fix support for nested quotes in .config/feh/themes +- feh-makefile_app.patch + * use DESTDIR variable +- spec file: simplify a bit + +------------------------------------------------------------------- Old: ---- feh-2.23.1.tar.bz2 feh-2.23.1.tar.bz2.asc New: ---- feh-2.23.2.tar.bz2 feh-2.23.2.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ feh.spec ++++++ --- /var/tmp/diff_new_pack.xbLLtt/_old 2018-02-18 11:46:02.097694602 +0100 +++ /var/tmp/diff_new_pack.xbLLtt/_new 2018-02-18 11:46:02.101694458 +0100 @@ -17,13 +17,13 @@ Name: feh -Version: 2.23.1 +Version: 2.23.2 Release: 0 Summary: X11 image viewer License: MIT AND LGPL-2.0+ Group: Productivity/Graphics/Viewers Url: https://feh.finalrewind.org/ -Source: https://feh.finalrewind.org/feh-%{version}.tar.bz2 +Source: https://feh.finalrewind.org/%{name}-%{version}.tar.bz2 Source1: https://feh.finalrewind.org/%{name}-%{version}.tar.bz2.asc Source2: %{name}.keyring Source3: jpegexiforient.c @@ -70,15 +70,14 @@ xinerama=1 \ debug=0 \ exif=1 \ - PREFIX="%{_prefix}" \ OPTFLAGS="%{optflags} -Wall -Wextra" gcc %{optflags} -fwhole-program jpegexiforient.c -o jpegexiforient %install -make \ - PREFIX="%{buildroot}%{_prefix}" \ - install cam=1 app=1 examples=0 +%make_install \ + PREFIX="%{_prefix}" \ + cam=1 app=1 examples=0 rm -rf "%{buildroot}%{_datadir}/doc" ++++++ feh-2.23.1.tar.bz2 -> feh-2.23.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.23.1/ChangeLog new/feh-2.23.2/ChangeLog --- old/feh-2.23.1/ChangeLog 2018-01-31 17:39:02.000000000 +0100 +++ new/feh-2.23.2/ChangeLog 2018-02-12 22:13:54.000000000 +0100 @@ -1,4 +1,9 @@ -Wed, 31 Jan 2018 17:38:25 +0100 +Mon, 12 Feb 2018 22:11:55 +0100 Daniel Friesel <[email protected]> + +* Release v2.23.2 + * Fix support for nested quotes in .confeg/feh/themes + +Wed, 31 Jan 2018 17:38:25 +0100 Daniel Friesel <[email protected]> * Release v2.23.1 * The Makefile no longer honors CPPFLAGS and instead consistently uses @@ -7,7 +12,7 @@ * Minor performance improvements (patches by ulteq) * Stability improvements when using --magick-timeout (patch by ulteq) -Thu, 28 Dec 2017 19:26:29 +0100 +Thu, 28 Dec 2017 19:26:29 +0100 Daniel Friesel <[email protected]> * Release v2.23 * Fix broken thumbnail/index windows when using --scale-down diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.23.1/config.mk new/feh-2.23.2/config.mk --- old/feh-2.23.1/config.mk 2018-01-31 17:39:02.000000000 +0100 +++ new/feh-2.23.2/config.mk 2018-02-12 22:13:54.000000000 +0100 @@ -1,5 +1,5 @@ PACKAGE ?= feh -VERSION ?= 2.23.1 +VERSION ?= 2.23.2 app ?= 0 cam ?= 0 @@ -79,7 +79,7 @@ MAN_EXIF = disabled endif -MAN_DATE ?= January 31, 2018 +MAN_DATE ?= February 12, 2018 # Uncomment this to use dmalloc #CFLAGS += -DWITH_DMALLOC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.23.1/man/feh.pre new/feh-2.23.2/man/feh.pre --- old/feh-2.23.1/man/feh.pre 2018-01-31 17:39:02.000000000 +0100 +++ new/feh-2.23.2/man/feh.pre 2018-02-12 22:13:54.000000000 +0100 @@ -1111,16 +1111,27 @@ .Ar options are the options which will be applied when the theme is used. . -Note that the options are not parsed by any shell. Therefore, filename expansion -.Po -.Qq *.jpg -and similar -.Pc -is not supported. Quoting with both single and double quotes works, though. +.Pp +. +Note that the option parser does not behave like a normal shell: filename +expansion and backslash escape sequences are not supported and passed to +feh's option parser as-is. However, quoting of arguments is respected +and can be used for arguments with whitespace. +. +So, the sequence +.Qq --info Qq foo bar +works as intended +.Pq that is, it display the string Qq foo bar , +whereas the option string +.Qq --info foo\e bar +will only display +.Qq foo\e +and complain about the file bar not existing. +Please keep this in mind when writing theme files. . .Pp . -An example entry would be +An example entry is .Qq imagemap -rVq --thumb-width 40 --thumb-height 30 --index-info \&'%n\en\&%wx\&%h\&' . . .Pp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.23.1/src/options.c new/feh-2.23.2/src/options.c --- old/feh-2.23.1/src/options.c 2018-01-31 17:39:02.000000000 +0100 +++ new/feh-2.23.2/src/options.c 2018-02-12 22:13:54.000000000 +0100 @@ -214,7 +214,7 @@ char *s; char *t; char last = 0; - int inquote = 0; + char inquote = 0; int i = 0; /* So we don't reinvent the wheel (not again, anyway), we use the @@ -229,7 +229,7 @@ eprintf(PACKAGE " does not support more than 64 words per " "theme definition.\n Please shorten your lines."); - if ((*t == ' ') && !(inquote)) { + if ((*t == ' ') && !inquote) { *t = '\0'; num++; @@ -240,8 +240,10 @@ list[num - 1] = feh_string_normalize(s); break; - } else if (((*t == '\"') || (*t == '\'')) && last != '\\') - inquote = !(inquote); + } else if ((*t == inquote) && (last != '\\')) { + inquote = 0; + } else if (((*t == '\"') || (*t == '\'')) && (last != '\\') && !inquote) + inquote = *t; last = *t; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/feh-2.23.1/test/mandoc.t new/feh-2.23.2/test/mandoc.t --- old/feh-2.23.1/test/mandoc.t 2018-01-31 17:39:02.000000000 +0100 +++ new/feh-2.23.2/test/mandoc.t 2018-02-12 22:13:54.000000000 +0100 @@ -6,15 +6,22 @@ use Test::More tests => 3; SKIP: { - qx{mandoc -V}; + my $mandoc_present = 0; - if ( $? != 0 ) { + for my $path (split(qr{:}, $ENV{PATH})) { + if (-x "${path}/mandoc") { + $mandoc_present = 1; + last; + } + } + + if ( not $mandoc_present ) { diag('mandoc not installed, test skipped. This is NOT fatal.'); skip( 'mandoc not installed', 3 ); } for my $file ( 'feh', 'feh-cam', 'gen-cam-menu' ) { - qx{mandoc -Tlint man/${file}.1}; + qx{mandoc -Tlint -Werror man/${file}.1}; is( $?, 0, "${file}.1: Valid mdoc syntax" ); } } ++++++ feh-makefile_app.patch ++++++ --- /var/tmp/diff_new_pack.xbLLtt/_old 2018-02-18 11:46:03.005662007 +0100 +++ /var/tmp/diff_new_pack.xbLLtt/_new 2018-02-18 11:46:03.005662007 +0100 @@ -7,7 +7,7 @@ # /usr/share/icons if the user wants to install feh on their local machine. ifeq (${app},1) - ICON_PREFIX = /usr/share/icons -+ ICON_PREFIX = ${PREFIX}/share/icons ++ ICON_PREFIX = ${DESTDIR}${PREFIX}/share/icons endif # Directories for manuals, executables, docs, data, etc.
