to address issues with NetBSD-6(and earlier)'s fontconfig not being
new enough for pango.
While doing that, also bump freetype2 dependency to current pkgsrc
version.
Suggested by tron in PR 47882
a) refer 'perl' in their Makefile, or
b) have a directory name of p5-*, or
c) have any dependency on any p5-* package
Like last time, where this caused no complaints.
pkgsrc changes
--------------
Don't mess with CFLAGS. I can't remember why that was even necessary, and it
breaks the Linux build.
Should fix PR pkg/46390.
upstream changes
----------------
* Add R, * and / bindings for keypad begin, keypad * and keypad /
* Try to convert unloadable files with imagemagick for up to 5 seconds
* Add --magick-timeout option to set imagemagick conversion timeout or disable
it altogether
* Clean up temporary / to-delete files when receiving SIG{INT,TERM,QUIT}
* Do not scroll past image borders when using key bindings
* --loadable / --unloadable: indicate result in exit status
changes:
-Experimental --scale-down and --auto-zoom tiling support
-The button-options -0 through -9 are no longer supported.
Use .config/feh/buttons instead (see feh manpage)
-more minor UI changes
-bugfixes
pkgsrc-changes:
- Update MASTER_SITES and HOMEPAGE
- Set LICENSE
Upstream changes:
* Release v1.14.1
* Fix compilation with curl=0
* Make zoom_default key work properly with --geometry
Wed, 11 May 2011 11:37:32 +0200 Daniel Friesel <derf@finalrewind.org>
* Release v1.14
* Only create caption directory when actually writing out a caption.
<http://github.com/derf/feh/issues/42>
* The --menu-bg option has been deprecated. It will be removed along with
--menu-style by the end of 2012.
<http://github.com/derf/feh/issues/27>
* read directory contents sorted by filename instead of 'randomly'
(as returned by readdir) by default. Thanks talisein!
<https://github.com/derf/feh/pull/20>
* Show certain warnings in the image window as well as on the commandline
<http://github.com/derf/feh/issues/43>
* Since the manual is way better structured and more detailed than the
--help output, it now simply refers to the manual. To include the old
help text, build feh with 'help=1'
* You can now use the next/prev/jump keys to navigate thumbnails. Use the
render key to open the currently selected thumbnail.
<http://github.com/derf/feh/issues/26>
* Change a patch for NETWM fullscreen support to only apply to fullscreen
windows. This fixes the moving windows bug in fluxbox (since fluxbox
doesn't report its window border width).
<http://github.com/derf/feh/issues/22>
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570903>
* Minor manpage fixes.
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625683>
* Fix --auto-zoom / --zoom max/fill documentation, the "Auto-Zoom" menu
option is now always checked when these options are used
* Set _NET_WM_NAME and _NET_WM_ICON_NAME properties
<http://github.com/derf/feh/issues/44>
* The 'A' key (toggle_aliasing) now actually changes the current window,
and not just the default for new windows
* The zoom_default key now works fine with --scale-down
<http://github.com/derf/feh/issues/41>
* Fix access of uninitialized memory / malloc/realloc clash in continued
theme definition handling. Having a theme line with just one
option/value pair used to produce undefined behaviour
Sat, 23 Apr 2011 22:00:27 +0200 Daniel Friesel <derf@finalrewind.org>
* Release v1.13
* Fix segfault upon unloadable images when image-related format specifiers
(e.g. %h) are used in --title
* Show images in current directory when invoked without file arguments
* Option to disable antialiasing, either global (--force-aliasing) or per
image (press 'A' to toggle, keybinding toggle_aliasing)
* Use SIGUSR1/SIGUSR2 to reload all images in multiwindow mode
* Fix Imlib2 caching bug in reload (only worked after the second try)
* The --bg options are now Xinerama-aware. That is, they set the image in
the respective mode (scale/fill/max/center) on each Xinerama screen. Use
--no-xinerama to disable this.
Sat, 12 Mar 2011 22:49:53 +0100 Daniel Friesel <derf@finalrewind.org>
* Release v1.12
* Add --zoom fill as equivalent for --auto-zoom
* Add --zoom max (zooming like in --bg-max)
* --menu-style is now deprecated
* http images are now viewed using libcurl, not wget (thanks to talisein)
This adds libcurl as dependency, and removes the wget recommendation
* Slight build system change: make now has flags, e.g.
"make xinerama=0 debug=1". By default feh is compiled with xinerama and
libcurl support enabled, see README.
* Remove builtin http client (--builtin)
* Fix compilation issues with libpng 1.5.1
Wed, 09 Feb 2011 20:11:26 +0100 Daniel Friesel <derf@finalrewind.org>
* Release v1.11.2
* Use wget --no-clobber to prevent TOCTTOU-based hole allowing a
well-informed attacker to rewrite arbitrary user files with images.
The attacker needs to know feh's PID and the URL the user gave it.
It is still possible for an attacker to _create_ arbitrary files via the
same hole.
Wed, 26 Jan 2011 21:07:19 +0100 Daniel Friesel <derf@finalrewind.org>
* Release v1.11.1
* Show correct image dimensions in for cached thumbnails
* Allow commandline options to override those set in a theme
* Remove support for FEH_OPTIONS (was deprecated >5 years ago)
* Restrict available modifiers to Control/Mod1/Mod4
Sat, 22 Jan 2011 11:48:33 +0100 Daniel Friesel <derf@finalrewind.org>
* Release v1.11
* Patch by Pascal Bleser: Use getaddrinfo for builtin http client,
this enables IPv6 support
* Fix zooming when --scale-down is used
* The themes are now read from ~/.config/feh/themes (BC for .fehrc exists)
* Key bindings can now be configured via ~/.config/feh/keys
* Removes --rcpath, use XDG_CONFIG_HOME instead
* Increase movement steps for Ctrl+Left etc.
* Make in/out zoom use equal zoom ratio
Fri, 03 Dec 2010 19:41:45 +0100 Daniel Friesel <derf@finalrewind.org>
* Release v1.10.1
* Partially fix --scale-down behaviour (zooming is still broken)
* Fix buffer overflow when using --draw-actions
* Fix segfaults after trying to load several unloadable images
* Fix fehrc created by feh (contined escape errors)
Thu, 07 Oct 2010 20:15:12 +0200 Daniel Friesel <derf@finalrewind.org>
* Release v1.10 (aka "2.0 will come real soon now")
* Patch by Stefan Mark: Add --bg-max (scaled with borders)
* Removed rather obscure --bg-seamless mode
* Short option -Y for --hide-pointer
* Panning via keys: Make it behave like scrolling (inverted directions)
* Workaround for Xinerama fuckups: Set XINERAMA_SCREEN to the correct
xinerama screen number
* Add --info option to display custom image information
* Do not change to the next slide when executing an action with ; as first
character (this character is stripped when executing the action)
* Speed up panning, zooming etc. by hiding image overlay text
* Zoom button: Zoom to 100% on button release, not button click
* --draw-filename: Always show position in filelist
Tue, 24 Aug 2010 19:23:36 +0200 Daniel Friesel <derf@chaosdorf.de>
* Release v1.9
* Add --fullscreen option, --full-screen is now deprecated
* Removed --menu-border option, it is largely useless
* Add short options: -P for --cache-thumbnails,
-K for --caption-papth,
-G for --draw-actions
and -J for --thumb-redraw
* Patch by Noel Cragg: Improve support for tiling window managers
* Set correct window title when starting feh in paused mode
* Add Up/Down keys for zooming
* When zooming via keyboard: Always zoom around the center of the window
* The image can now be panned with Ctrl + arrow keys
Fri, 25 Jun 2010 16:07:20 +0200 Daniel Friesel <derf@chaosdorf.de>
* Release v1.8
* support LDLIBS in Makefile/config.mk
* Don't make the --thumbnails window fullscreen. The images launched from
thumbnail mode may be fullscreen, though. You can still use 'v' to
toggle fullscreen, should you really need it.
* --font now sets the global default font (for action/filename display etc.)
* Rename --screen-clip 0 to --no-screen-clip
* Allow multiline theme definitions (via backslash, like in the shell)
* Center the image after pressing <keypad /> or <keypad *>
* Saving the filelist from thumbnail mode caused undefined behaviour due
to handling of uninitialised memory. Since I consider this a rarely
useful action, the feature has been disabled for thumbnail mode.
* Remove -G/--wget-timestamp option. It was probably not working
correctly, plus it contained a code execution hole when used with
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
Thu Jun 10 12:12:04 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* Release v1.7
* Fix segfault in Thumbnail mode when trying to open a no longer
existing image (e.g. when the file was renamed by a previous action)
* Set a negative slideshow-delay to start the slideshow in paused mode
* Remove Shift+Key bindings, they were doing the same as Nothing+Key
anyways. Plus, I might want to bind Shift + <already used key> to other
stuff in the future
* Documentation improvements
* Remove undocumented hjkl menu keys. Most of the menu options can also be
accessed directly with keys, plus the number of non-qwerty users (which
have no use for these shortcuts) is growing.
* Draw a nice little message when in caption editing mode with empty
caption (to indicate that caption editing is actually active)
* caption mode: Automatically create caption directory if it doesn't exist
* Slideshow mode: SIGUSR1 = next image, SIGUSR2 = previous image
Sat Jun 5 21:35:25 CEST 2010 Daniel Friesel <derf@chaosdorf.de
* Release v1.6.1
* Fix omitted image borders at high zoom levels
* Re-add getopt_long files (possibly relevant for non-glibc systems)
* Do not require a running X server for -L, -u, -U options
Tue Jun 1 10:21:19 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* Release v1.6
* Patch by aaptel: Support numpad keys for actions
* Fix blur mode (Ctrl + left mouse key)
* Center images in index/thumbnail mode relative to the text below them
* Support caching of "large" (up to 256x256 pixels) thumbnails
* New --thumb-redraw option as workaround to speed up thumbnail mode
(thumbnail mode redrawing is quite slow, so now a redraw only happens
every 10 thumbnails by default - can be changed with this option)
* Because of that: Major speed improvements for --thumbnails, especially
with cached thumbnails
* Do not link against Xext and freetype, they're only used by other libs
* Fix "make uninstall". You do NOT want to call this for feh versions
1.4.2 to 1.5
Thu May 6 08:34:39 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* Release v1.5
* Rewrite parts of the menu code & fix a memory leak while there
* Make --start-at work with filenames instead of list positions
* Add keybinding to toggle pointer visibility (see --hide-pointer)
* Sort manual a bit
Thu Apr 22 22:28:09 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* Release v1.4.3
* Warp the pointer when reaching a window border in pan mode
* Various zoom mode improvements, should be more intuitive now
+ When entering zoom mode, always continue from previous zoom level
+ The image part you clicked on to start zoom mode will remain where it
is. The zoom happen around at that pixel.
* Manpage review
Fri Apr 2 16:20:55 CEST 2010 Daniel Friesel <derf@chaosdorf.de>
* Release v1.4.2
* Replace autoconf by config.mk
* patch by decklin: Use z key to randomly jump in the filelist
* patch by muennich: Correctly set [Paused] window title in slideshow mode
* patch by dylan: Remove temporary files if url opening fails
* Fix problems with unexpectedly empty filelists
Tue Mar 16 07:56:36 CET 2010 Daniel Friesel <derf@chaosdorf.de>
* Release v1.4.1
* Fix chrome theme in the default .fehrc
* Rename cam to feh-cam and gen_cam_menu.sh to gen-cam-menu
* Add manual for feh-cam and gen-cam-menu (from Debian)
* Fix lossless rotate for filenames with spaces etc.
Thu Mar 4 14:55:02 CET 2010 Daniel Friesel <derf@chaosdorf.de>
* Release v1.4
* Lots of documentation fixes/improvements
(including previously undocumented options)
* Fix --(un)loadable option
* Add --draw-actions (show defined actions and their number)
* Use <keypad begin> to antialias the image
* Fix some keypad keys (+,-,/,*)
* The button-related options have changed (NOT backwards-compatible)
* Remove --xinerama option
* Use jpegtran binary instead of libjpeg for lossless rotation
* Add --bg-fill option (patch by Anonymous)
Mon Feb 8 21:47:56 CET 2010 Daniel Friesel <derf@chaosdorf.de>
* Release v1.3.5
* Import various Debian patches
* Update feh(1) manpage
* Make feh -l / feh -O work without a running X
* Don't die after encountering three or more unloadable images
(former "No more slides in show" error)
* Depracate --xinerama <0|1>, use --no-xinerama or nothing instead
* Fix transparency in thumbnail mode
alternative from mk/jpeg.buildlink3.mk
This allows selection of an alternative jpeg library (namely the x86 MMX,
SSE, SSE2 accelerated libjpeg-turbo) via JPEG_DEFAULT=libjpeg-turbo, and
follows the current standard model for alternatives (fam, motif, fuse etc).
The mechanical edits were applied via the following script:
#!/bin/sh
for d in */*; do
[ -d "$d" ] || continue
for i in "$d/"Makefile* "$d/"*.mk; do
case "$i" in *.orig|*"*"*) continue;; esac
out="$d/x"
sed -e 's;graphics/jpeg/buildlink3\.mk;mk/jpeg.buildlink3.mk;g' \
-e 's;BUILDLINK_PREFIX\.jpeg;JPEGBASE;g' \
< "$i" > "$out"
if cmp -s "$i" "$out"; then
rm -f "$out"
else
echo "Edited $i"
mv -f "$i" "$i.orig" && mv "$out" "$i"
fi
done
done
RECOMMENDED is removed. It becomes ABI_DEPENDS.
BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
BUILDLINK_DEPENDS does not change.
IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".
Added to obsolete.mk checking for IGNORE_RECOMMENDED.
I did not manually go through and fix any aesthetic tab/spacing issues.
I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.
I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.
As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.
As discussed on tech-pkg.
I will commit to revbump, pkglint, pkg_install, createbuildlink separately.
Note that if you use wip, it will fail! I will commit to pkgsrc-wip
later (within day).
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
changes:
* Back out fmmode (buggy, unportable) for now
* Better tiled background support (makes various windowmanagers/terminal
emulators happier)
* fixed a bug with --action's and thumbnail mode
* Disabled thumbnail caching until a better spec can be sorted out (the
current freedesktop.org spec doesn't support custom sizing. feh does).
* New option --cycle-once to exit feh after one loop through a slideshow.
Requested by various people
Changes:
* Require giblib 1.2.4 now.
* Applied large patch from Claes Nasten <pekdon@pekdon.net>
* Several tweaks to thumbnail.c including support for the "Thumbnail
Managing Standard" described at freedesktop.org. Thumbnails are cached in
a way which makes them accessible to other programs, under ~/.thumbnails
using md5sum filenames.
* He had to invoke libpng directly to write out the comments/tags required
by the spec, but that seems to be a trend with feh now so what the hell :p
* Nice patch from JC <jcm314@yahoo.com>
* Alongside the original --action option, adds --action1 through --action9,
allowing you to define multiple actions which can be run using the number
keys. Lets you set up a list of commands for organising images.
* New method for rotating jpegs - does a lossless jpeg rotation (thanks,
IJG) and preserves EXIF data, as requested by many users :)
* Fix minor documentation omissions (debian bug reports)
* Various warning fixes from Claes Nasten <pekdon@pekdon.net>
* Support full X geometry flags
* removed extraneous XFlush
* switched to global file list length (avoid recalculating it
constantly)
