The two functions are defined if the BSD-specific apm headers are found and
if libapm is not found. Both of these conditions will be true on BSD
systems, so we use #elif instead of the separate #if statements.
If autoconf finds an apm.h other than the one belonging to libapm, we get
builds errors like the ones reported by Haroldo Gambini Santos in [1].
[1] http://lists.windowmaker.org/dev/msg07937.html
In particular,
- We need to link against gdk_pixbuf-2.0 in addition to
gdk_pixbuf_xlib-2.0.
- The header gdk-pixbuf-xlib.h has been moved to the gdk-pixbuf-xlib
directory.
- The function gdk_pixbuf_new_from_file now requires two arguments.
- We need to define GdkColor ourselves since we don't include gdk.h.
Inspired by a patch by Nerijus Baliunas [1].
[1] http://lists.windowmaker.org/dev/msg07994.html
In particular,
- Remove option to compile with deprecated GDK-PixBuf 1.0.
- Remove *ROOT variables; libdockapp should be in the default include search
path and X11R6 directories are deprecated.
- Remove /opt/gtk2/bin from PIXBUF_CFG; pkg-config is likely elsewhere.
- Remove CPPFLAGS from CFLAGS and INCDIRS and DEFINES from CFLAGS; we don't
want these to disappear if user defines different flags.
Inspired in part by similar patches in Gentoo [1] and by Nerijus Baliunas [2].
[1] http://mirrors.telepoint.bg/gentoo-portage/x11-plugins/wmmenu/files/wmmenu-1.2-Makefile.patch
[2] http://lists.windowmaker.org/dev/msg07994.html
In particular,
- Add new --version command line option. (This was already documented in
the manpage.) Remove this information from the --help text. Also took
the opportunity to properly align the --fire line in the --help text.
- Remove WMFSM_VERSION macro in favor of PACKAGE_VERSION from autconf.
- Remove hard-coded version number at top of source file for
maintainability.
In particular,
- Apply, with some modification, a patch by Jari Aalto
<jari.aalto@poboxes.com> to clarify the format of the configuration file.
See [1].
- Escape minus signs to avoid hyphen-used-as-minus-sign Lintian warning in
the Debian package.
- Remove docbook-to-man comments to avoid manpage-has-errors-from-man
Lintian warning in the Debian package.
- Add commas between short and long options for readability.
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=yes&bug=226274
The individual patches no longer seem to exist, so I submit them together.
According to debian/changelog entries by Arthur Korn <arthur@debian.org>,
these patches include:
* fixed memleak introduced in 0.34-2 with the patch by Timo Benk.
global char *mp[] was assigned the result of stdup() repeatedly
without free. My ugly fix is to free it all up at the beginning of
readFileSystems(). Now I'm a proud Perl coder ... closes: #196057
* memleak news: avoid it if there are more than 9 filesystems too.
* Fixed filesystem name corruption, thanks to Ralf Horstmann and Cristian
Ionescu-Idbohrn for the patch.
In particular,
- Update AM_INIT_AUTOMAKE to silence "two- and three-arguments forms are
deprecated" warnings.
- Update AC_DEFINEs to silence "missing template" warnings.
