Merge branch 'master' into show_top_with_zoom

Author: signedByteOverflow

ChangeLog

@@ -1,4 +1,42 @@
-Thu, 28 Dec 2017 19:26:29 +0100
+Sun, 04 Mar 2018 08:53:50 +0100  Daniel Friesel <[email protected]>
+
+* Release v2.25
+    * Add --version-sort option to enable natural sorting of file and directory
+      names. This requires a libc with strverscmp support, which is a
+      non-POSIX GNU extension. Use the new build flag `verscmp=0` to disable
+      this feature on systems which do not ship strverscmp
+      (patch by ulteq)
+    * Allow arbitrary X11 colors as -B/--image-bg argument (patch by ulteq)
+    * Improve --image-bg support and transparency handling in --bg-* mode
+    * Respect --geometry settings in --bg-fill mode
+    * Add keybinding toggle_auto_zoom (default "Z") to toggle --auto-zoom
+    * Fix filelists specified by -f/--filelist not being reloaded when using
+      --reload
+
+Mon, 26 Feb 2018 21:41:38 +0100  Daniel Friesel <[email protected]>
+
+* Release v2.24
+    * Improve performance when using --{max,min}-dimension in slideshow mode
+      (patch by ulteq)
+    * Fix crash when using %m format specifier in slideshow mode
+      (introduced in feh 2.23.1)
+
+
+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
+      CFLAGS for user-provided include paths
+    * Fix %u format specifier in multiwindow and list modes (patch by ulteq)
+    * Minor performance improvements (patches by ulteq)
+    * Stability improvements when using --magick-timeout (patch by ulteq)
+
+Thu, 28 Dec 2017 19:26:29 +0100  Daniel Friesel <[email protected]>
 
 * Release v2.23
     * Fix broken thumbnail/index windows when using --scale-down
@@ -178,7 +216,7 @@ Thu, 28 Apr 2016 11:41:04 +0200  Daniel Friesel <[email protected]>
       size which will not be updated when changing images (as was the case in
       feh < 2.15). This may or may not be fixed in the future.
 
-Sat, 16 Apr 2016 18:32:38 +0200  Daniel Frisel <[email protected]>
+Sat, 16 Apr 2016 18:32:38 +0200  Daniel Friesel <[email protected]>
 
 * Release v2.15.2
     * Fix --keep-zoom-vp not keeping the viewport x/y offsets (broken by 2.15)
@@ -750,7 +788,7 @@ Fri, 25 Jun 2010 16:07:20 +0200  Daniel Friesel <[email protected]>
       malicious URLs containing shell metacharacters (but only if those URLs
       led to a valid file)
     * Don't add ?randomnumber to URLs when downloading them, it confuses some
-      servers and is not really neccessary in general
+      servers and is not really necessary in general
 
 Thu Jun 10 12:12:04 CEST 2010  Daniel Friesel <[email protected]>
 

Makefile

@@ -65,12 +65,14 @@ install-bin:
 install-font:
 	@echo installing fonts to ${font_dir}
 	@mkdir -p ${font_dir}
+	@chmod 755 ${font_dir}
 	@cp share/fonts/* ${font_dir}
 	@chmod 644 ${font_dir}/*
 
 install-img:
 	@echo installing images to ${image_dir}
 	@mkdir -p ${image_dir}
+	@chmod 755 ${image_dir}
 	@cp share/images/* ${image_dir}
 	@chmod 644 ${image_dir}/*
 

README.md

@@ -83,6 +83,7 @@ Available flags are:
 | exif | 0 | Builtin EXIF tag display support |
 | help | 0 | include help text (refers to the manpage otherwise) |
 | stat64 | 0 | Support CIFS shares from 64bit hosts on 32bit machines |
+| verscmp | 1 | Support naturing sorting (`--version-sort`). Requires a GNU-compatible libc exposing `strverscmp` |
 | xinerama | 1 | Support Xinerama/XRandR multiscreen setups |
 
 So, by default **libcurl** and **Xinerama** are enabled, the rest is disabled.

config.mk

@@ -5,9 +5,10 @@ app ?= 0
 cam ?= 0
 curl ?= 1
 debug ?= 0
+exif ?= 0
 help ?= 0
+verscmp ?= 1
 xinerama ?= 1
-exif ?= 0
 
 # Prefix for all installed files
 PREFIX ?= /usr/local
@@ -63,6 +64,13 @@ ifeq (${stat64},1)
 	CFLAGS += -D_FILE_OFFSET_BITS=64
 endif
 
+ifeq (${verscmp},1)
+	CFLAGS += -DHAVE_VERSCMP
+	MAN_VERSCMP = enabled
+else
+	MAN_VERSCMP = disabled
+endif
+
 ifeq (${xinerama},1)
 	CFLAGS += -DHAVE_LIBXINERAMA
 	LDLIBS += -lXinerama

man/Makefile

@@ -12,6 +12,7 @@ all: ${TARGETS}
 	-e 's/\$$MAN_CURL\$$/${MAN_CURL}/' \
 	-e 's/\$$MAN_DEBUG\$$/${MAN_DEBUG}/' \
 	-e 's/\$$MAN_EXIF\$$/${MAN_EXIF}/' \
+	-e 's/\$$MAN_VERSCMP\$$/${MAN_VERSCMP}/' \
 	-e 's/\$$MAN_XINERAMA\$$/${MAN_XINERAMA}/' \
 	< ${@:.1=.pre} > $@