Diff of the two buildlogs:

--
--- b1/build.log	2020-07-12 07:33:24.444714263 +0000
+++ b2/build.log	2020-07-12 07:58:44.593533319 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Sat Jul 11 19:26:35 -12 2020
-I: pbuilder-time-stamp: 1594538795
+I: Current time: Sun Jul 12 21:33:47 +14 2020
+I: pbuilder-time-stamp: 1594539227
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz]
 I: copying local configuration
@@ -17,7 +17,7 @@
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
 gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error
-gpgv: Signature made Sat Feb  2 05:35:03 2019 -12
+gpgv: Signature made Sun Feb  3 07:35:03 2019 +14
 gpgv:                using RSA key ECA1E3F28E112432D485DD95EB36171A6FF9435F
 gpgv: Can't check signature: No public key
 dpkg-source: warning: failed to verify signature on ./viking_1.7-1.dsc
@@ -30,136 +30,170 @@
 dpkg-source: info: applying no-doc-dir
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/24516/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/24028/tmp/hooks/D01_modify_environment starting
+debug: Running on odu3a.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by bash'
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/24028/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/24028/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='armhf'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3'
-  DISTRIBUTION=''
-  HOME='/root'
-  HOST_ARCH='armhf'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="0" [2]="3" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf")
+  BASH_VERSION='5.0.3(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=armhf
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4'
+  DIRSTACK=()
+  DISTRIBUTION=
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=arm
+  HOST_ARCH=armhf
   IFS=' 	
   '
-  INVOCATION_ID='685c39b1b72c4422b1cf094343c51cc7'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='24516'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=dc84c6ca7a44478aa0da213ecf1d8b90
+  LANG=C
+  LANGUAGE=it_CH:it
+  LC_ALL=C
+  MACHTYPE=arm-unknown-linux-gnueabihf
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnueabihf
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=24028
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.Df8wdPBbT9/pbuilderrc_1iqb --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.Df8wdPBbT9/b1 --logfile b1/build.log viking_1.7-1.dsc'
-  SUDO_GID='111'
-  SUDO_UID='107'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://10.0.0.15:8000/'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.Df8wdPBbT9/pbuilderrc_kxwU --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.Df8wdPBbT9/b2 --logfile b2/build.log viking_1.7-1.dsc'
+  SUDO_GID=114
+  SUDO_UID=109
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://10.0.0.15:8000/
 I: uname -a
-  Linux jtx1c 4.19.0-9-arm64 #1 SMP Debian 4.19.118-2+deb10u1 (2020-06-07) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 4.19.0-9-armmp #1 SMP Debian 4.19.118-2+deb10u1 (2020-06-07) armv7l GNU/Linux
 I: ls -l /bin
   total 3328
-  -rwxr-xr-x 1 root root 767656 Apr 17  2019 bash
-  -rwxr-xr-x 3 root root  26052 Jul 10  2019 bunzip2
-  -rwxr-xr-x 3 root root  26052 Jul 10  2019 bzcat
-  lrwxrwxrwx 1 root root      6 Jul 10  2019 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root   2227 Jul 10  2019 bzdiff
-  lrwxrwxrwx 1 root root      6 Jul 10  2019 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root   4877 Jun 24  2019 bzexe
-  lrwxrwxrwx 1 root root      6 Jul 10  2019 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root   3641 Jul 10  2019 bzgrep
-  -rwxr-xr-x 3 root root  26052 Jul 10  2019 bzip2
-  -rwxr-xr-x 1 root root   9636 Jul 10  2019 bzip2recover
-  lrwxrwxrwx 1 root root      6 Jul 10  2019 bzless -> bzmore
-  -rwxr-xr-x 1 root root   1297 Jul 10  2019 bzmore
-  -rwxr-xr-x 1 root root  22432 Feb 28  2019 cat
-  -rwxr-xr-x 1 root root  38868 Feb 28  2019 chgrp
-  -rwxr-xr-x 1 root root  38836 Feb 28  2019 chmod
-  -rwxr-xr-x 1 root root  42972 Feb 28  2019 chown
-  -rwxr-xr-x 1 root root  88376 Feb 28  2019 cp
-  -rwxr-xr-x 1 root root  75516 Jan 17  2019 dash
-  -rwxr-xr-x 1 root root  71648 Feb 28  2019 date
-  -rwxr-xr-x 1 root root  51212 Feb 28  2019 dd
-  -rwxr-xr-x 1 root root  55672 Feb 28  2019 df
-  -rwxr-xr-x 1 root root  88444 Feb 28  2019 dir
-  -rwxr-xr-x 1 root root  54872 Jan  9  2019 dmesg
-  lrwxrwxrwx 1 root root      8 Sep 26  2018 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root      8 Sep 26  2018 domainname -> hostname
-  -rwxr-xr-x 1 root root  22364 Feb 28  2019 echo
-  -rwxr-xr-x 1 root root     28 Jan  7  2019 egrep
-  -rwxr-xr-x 1 root root  18260 Feb 28  2019 false
-  -rwxr-xr-x 1 root root     28 Jan  7  2019 fgrep
-  -rwxr-xr-x 1 root root  47356 Jan  9  2019 findmnt
-  -rwsr-xr-x 1 root root  21980 Apr 22 07:38 fusermount
-  -rwxr-xr-x 1 root root 124508 Jan  7  2019 grep
-  -rwxr-xr-x 2 root root   2345 Jan  5  2019 gunzip
-  -rwxr-xr-x 1 root root   6375 Jan  5  2019 gzexe
-  -rwxr-xr-x 1 root root  64232 Jan  5  2019 gzip
-  -rwxr-xr-x 1 root root  13784 Sep 26  2018 hostname
-  -rwxr-xr-x 1 root root  43044 Feb 28  2019 ln
-  -rwxr-xr-x 1 root root  34932 Jul 26  2018 login
-  -rwxr-xr-x 1 root root  88444 Feb 28  2019 ls
-  -rwxr-xr-x 1 root root  67036 Jan  9  2019 lsblk
-  -rwxr-xr-x 1 root root  47168 Feb 28  2019 mkdir
-  -rwxr-xr-x 1 root root  43040 Feb 28  2019 mknod
-  -rwxr-xr-x 1 root root  26552 Feb 28  2019 mktemp
-  -rwxr-xr-x 1 root root  26024 Jan  9  2019 more
-  -rwsr-xr-x 1 root root  34268 Jan  9  2019 mount
-  -rwxr-xr-x 1 root root   9688 Jan  9  2019 mountpoint
-  -rwxr-xr-x 1 root root  84284 Feb 28  2019 mv
-  lrwxrwxrwx 1 root root      8 Sep 26  2018 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root     14 Feb 14  2019 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root  22416 Feb 28  2019 pwd
-  lrwxrwxrwx 1 root root      4 Apr 17  2019 rbash -> bash
-  -rwxr-xr-x 1 root root  26504 Feb 28  2019 readlink
-  -rwxr-xr-x 1 root root  42968 Feb 28  2019 rm
-  -rwxr-xr-x 1 root root  26496 Feb 28  2019 rmdir
-  -rwxr-xr-x 1 root root  14136 Jan 21  2019 run-parts
-  -rwxr-xr-x 1 root root  76012 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root      4 Jul 10 20:26 sh -> dash
-  -rwxr-xr-x 1 root root  22384 Feb 28  2019 sleep
-  -rwxr-xr-x 1 root root  51124 Feb 28  2019 stty
-  -rwsr-xr-x 1 root root  42472 Jan  9  2019 su
-  -rwxr-xr-x 1 root root  22392 Feb 28  2019 sync
-  -rwxr-xr-x 1 root root 283324 Apr 23  2019 tar
-  -rwxr-xr-x 1 root root   9808 Jan 21  2019 tempfile
-  -rwxr-xr-x 1 root root  63464 Feb 28  2019 touch
-  -rwxr-xr-x 1 root root  18260 Feb 28  2019 true
-  -rwxr-xr-x 1 root root   9636 Apr 22 07:38 ulockmgr_server
-  -rwsr-xr-x 1 root root  21976 Jan  9  2019 umount
-  -rwxr-xr-x 1 root root  22380 Feb 28  2019 uname
-  -rwxr-xr-x 2 root root   2345 Jan  5  2019 uncompress
-  -rwxr-xr-x 1 root root  88444 Feb 28  2019 vdir
-  -rwxr-xr-x 1 root root  21980 Jan  9  2019 wdctl
-  -rwxr-xr-x 1 root root    946 Jan 21  2019 which
-  lrwxrwxrwx 1 root root      8 Sep 26  2018 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root   1983 Jan  5  2019 zcat
-  -rwxr-xr-x 1 root root   1677 Jan  5  2019 zcmp
-  -rwxr-xr-x 1 root root   5879 Jan  5  2019 zdiff
-  -rwxr-xr-x 1 root root     29 Jan  5  2019 zegrep
-  -rwxr-xr-x 1 root root     29 Jan  5  2019 zfgrep
-  -rwxr-xr-x 1 root root   2080 Jan  5  2019 zforce
-  -rwxr-xr-x 1 root root   7584 Jan  5  2019 zgrep
-  -rwxr-xr-x 1 root root   2205 Jan  5  2019 zless
-  -rwxr-xr-x 1 root root   1841 Jan  5  2019 zmore
-  -rwxr-xr-x 1 root root   4552 Jan  5  2019 znew
-I: user script /srv/workspace/pbuilder/24516/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 767656 Apr 18  2019 bash
+  -rwxr-xr-x 3 root root  26052 Jul 11  2019 bunzip2
+  -rwxr-xr-x 3 root root  26052 Jul 11  2019 bzcat
+  lrwxrwxrwx 1 root root      6 Jul 11  2019 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root   2227 Jul 11  2019 bzdiff
+  lrwxrwxrwx 1 root root      6 Jul 11  2019 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root   4877 Jun 25  2019 bzexe
+  lrwxrwxrwx 1 root root      6 Jul 11  2019 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root   3641 Jul 11  2019 bzgrep
+  -rwxr-xr-x 3 root root  26052 Jul 11  2019 bzip2
+  -rwxr-xr-x 1 root root   9636 Jul 11  2019 bzip2recover
+  lrwxrwxrwx 1 root root      6 Jul 11  2019 bzless -> bzmore
+  -rwxr-xr-x 1 root root   1297 Jul 11  2019 bzmore
+  -rwxr-xr-x 1 root root  22432 Mar  1  2019 cat
+  -rwxr-xr-x 1 root root  38868 Mar  1  2019 chgrp
+  -rwxr-xr-x 1 root root  38836 Mar  1  2019 chmod
+  -rwxr-xr-x 1 root root  42972 Mar  1  2019 chown
+  -rwxr-xr-x 1 root root  88376 Mar  1  2019 cp
+  -rwxr-xr-x 1 root root  75516 Jan 18  2019 dash
+  -rwxr-xr-x 1 root root  71648 Mar  1  2019 date
+  -rwxr-xr-x 1 root root  51212 Mar  1  2019 dd
+  -rwxr-xr-x 1 root root  55672 Mar  1  2019 df
+  -rwxr-xr-x 1 root root  88444 Mar  1  2019 dir
+  -rwxr-xr-x 1 root root  54872 Jan 10  2019 dmesg
+  lrwxrwxrwx 1 root root      8 Sep 27  2018 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root      8 Sep 27  2018 domainname -> hostname
+  -rwxr-xr-x 1 root root  22364 Mar  1  2019 echo
+  -rwxr-xr-x 1 root root     28 Jan  8  2019 egrep
+  -rwxr-xr-x 1 root root  18260 Mar  1  2019 false
+  -rwxr-xr-x 1 root root     28 Jan  8  2019 fgrep
+  -rwxr-xr-x 1 root root  47356 Jan 10  2019 findmnt
+  -rwsr-xr-x 1 root root  21980 Apr 23 09:38 fusermount
+  -rwxr-xr-x 1 root root 124508 Jan  8  2019 grep
+  -rwxr-xr-x 2 root root   2345 Jan  6  2019 gunzip
+  -rwxr-xr-x 1 root root   6375 Jan  6  2019 gzexe
+  -rwxr-xr-x 1 root root  64232 Jan  6  2019 gzip
+  -rwxr-xr-x 1 root root  13784 Sep 27  2018 hostname
+  -rwxr-xr-x 1 root root  43044 Mar  1  2019 ln
+  -rwxr-xr-x 1 root root  34932 Jul 27  2018 login
+  -rwxr-xr-x 1 root root  88444 Mar  1  2019 ls
+  -rwxr-xr-x 1 root root  67036 Jan 10  2019 lsblk
+  -rwxr-xr-x 1 root root  47168 Mar  1  2019 mkdir
+  -rwxr-xr-x 1 root root  43040 Mar  1  2019 mknod
+  -rwxr-xr-x 1 root root  26552 Mar  1  2019 mktemp
+  -rwxr-xr-x 1 root root  26024 Jan 10  2019 more
+  -rwsr-xr-x 1 root root  34268 Jan 10  2019 mount
+  -rwxr-xr-x 1 root root   9688 Jan 10  2019 mountpoint
+  -rwxr-xr-x 1 root root  84284 Mar  1  2019 mv
+  lrwxrwxrwx 1 root root      8 Sep 27  2018 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root     14 Feb 15  2019 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root  22416 Mar  1  2019 pwd
+  lrwxrwxrwx 1 root root      4 Apr 18  2019 rbash -> bash
+  -rwxr-xr-x 1 root root  26504 Mar  1  2019 readlink
+  -rwxr-xr-x 1 root root  42968 Mar  1  2019 rm
+  -rwxr-xr-x 1 root root  26496 Mar  1  2019 rmdir
+  -rwxr-xr-x 1 root root  14136 Jan 22  2019 run-parts
+  -rwxr-xr-x 1 root root  76012 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root      4 Jul 12 21:35 sh -> bash
+  lrwxrwxrwx 1 root root      4 Jul 10 22:26 sh.distrib -> dash
+  -rwxr-xr-x 1 root root  22384 Mar  1  2019 sleep
+  -rwxr-xr-x 1 root root  51124 Mar  1  2019 stty
+  -rwsr-xr-x 1 root root  42472 Jan 10  2019 su
+  -rwxr-xr-x 1 root root  22392 Mar  1  2019 sync
+  -rwxr-xr-x 1 root root 283324 Apr 24  2019 tar
+  -rwxr-xr-x 1 root root   9808 Jan 22  2019 tempfile
+  -rwxr-xr-x 1 root root  63464 Mar  1  2019 touch
+  -rwxr-xr-x 1 root root  18260 Mar  1  2019 true
+  -rwxr-xr-x 1 root root   9636 Apr 23 09:38 ulockmgr_server
+  -rwsr-xr-x 1 root root  21976 Jan 10  2019 umount
+  -rwxr-xr-x 1 root root  22380 Mar  1  2019 uname
+  -rwxr-xr-x 2 root root   2345 Jan  6  2019 uncompress
+  -rwxr-xr-x 1 root root  88444 Mar  1  2019 vdir
+  -rwxr-xr-x 1 root root  21980 Jan 10  2019 wdctl
+  -rwxr-xr-x 1 root root    946 Jan 22  2019 which
+  lrwxrwxrwx 1 root root      8 Sep 27  2018 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root   1983 Jan  6  2019 zcat
+  -rwxr-xr-x 1 root root   1677 Jan  6  2019 zcmp
+  -rwxr-xr-x 1 root root   5879 Jan  6  2019 zdiff
+  -rwxr-xr-x 1 root root     29 Jan  6  2019 zegrep
+  -rwxr-xr-x 1 root root     29 Jan  6  2019 zfgrep
+  -rwxr-xr-x 1 root root   2080 Jan  6  2019 zforce
+  -rwxr-xr-x 1 root root   7584 Jan  6  2019 zgrep
+  -rwxr-xr-x 1 root root   2205 Jan  6  2019 zless
+  -rwxr-xr-x 1 root root   1841 Jan  6  2019 zmore
+  -rwxr-xr-x 1 root root   4552 Jan  6  2019 znew
+I: user script /srv/workspace/pbuilder/24028/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -647,7 +681,7 @@
 Get: 410 http://deb.debian.org/debian buster/main armhf libnss3-dev armhf 2:3.42.1-1+deb10u2 [231 kB]
 Get: 411 http://deb.debian.org/debian buster/main armhf liboauth0 armhf 1.0.3-3 [18.7 kB]
 Get: 412 http://deb.debian.org/debian buster/main armhf liboauth-dev armhf 1.0.3-3 [33.0 kB]
-Fetched 168 MB in 24s (7122 kB/s)
+Fetched 168 MB in 41s (4080 kB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libbsd0:armhf.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 18932 files and directories currently installed.)
@@ -2348,7 +2382,7 @@
 fakeroot is already the newest version (1.23-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/viking-1.7/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b
+I: Running cd /build/viking-1.7/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b
 dpkg-buildpackage: info: source package viking
 dpkg-buildpackage: info: source version 1.7-1
 dpkg-buildpackage: info: source distribution unstable
@@ -2859,7 +2893,7 @@
 "
 make[1]: Leaving directory '/build/viking-1.7'
    dh_auto_build
-	make -j3
+	make -j4
 make[1]: Entering directory '/build/viking-1.7'
 Making all in src
 make[2]: Entering directory '/build/viking-1.7/src'
@@ -2873,779 +2907,779 @@
 gdk-pixbuf-csource --name="`basename viking.png .png`_pixbuf" --struct --extern viking.png > viking_pixmap.h
 gdk-pixbuf-csource --name="`basename bing_maps.png .png`_pixbuf" --struct --extern bing_maps.png > bing_maps_pixmap.h
 gdk-pixbuf-csource --name="`basename addtr_18.png .png`_pixbuf" --struct --extern addtr_18.png > addtr_18_pixmap.h
+gdk-pixbuf-csource --name="`basename vik_new_route_18.png .png`_pixbuf" --struct --extern vik_new_route_18.png > vik_new_route_18_pixmap.h
 cat addtr_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempaddtr_18_pixmap.h.h
 cat viking_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempviking_pixmap.h.h
 cat bing_maps_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempbing_maps_pixmap.h.h
-mv tempaddtr_18_pixmap.h.h addtr_18_pixmap.h
-mv tempviking_pixmap.h.h viking_pixmap.h
+cat vik_new_route_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvik_new_route_18_pixmap.h.h
 mv tempbing_maps_pixmap.h.h bing_maps_pixmap.h
-gdk-pixbuf-csource --name="`basename vik_new_route_18.png .png`_pixbuf" --struct --extern vik_new_route_18.png > vik_new_route_18_pixmap.h
+mv tempviking_pixmap.h.h viking_pixmap.h
+mv tempaddtr_18_pixmap.h.h addtr_18_pixmap.h
 gdk-pixbuf-csource --name="`basename addwp_18.png .png`_pixbuf" --struct --extern addwp_18.png > addwp_18_pixmap.h
-gdk-pixbuf-csource --name="`basename edtr_18.png .png`_pixbuf" --struct --extern edtr_18.png > edtr_18_pixmap.h
-cat vik_new_route_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvik_new_route_18_pixmap.h.h
-cat addwp_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempaddwp_18_pixmap.h.h
-cat edtr_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempedtr_18_pixmap.h.h
 mv tempvik_new_route_18_pixmap.h.h vik_new_route_18_pixmap.h
-mv tempedtr_18_pixmap.h.h edtr_18_pixmap.h
-mv tempaddwp_18_pixmap.h.h addwp_18_pixmap.h
+gdk-pixbuf-csource --name="`basename edtr_18.png .png`_pixbuf" --struct --extern edtr_18.png > edtr_18_pixmap.h
 gdk-pixbuf-csource --name="`basename edwp_18.png .png`_pixbuf" --struct --extern edwp_18.png > edwp_18_pixmap.h
 gdk-pixbuf-csource --name="`basename geomove_18.png .png`_pixbuf" --struct --extern geomove_18.png > geomove_18_pixmap.h
-gdk-pixbuf-csource --name="`basename geozoom_18.png .png`_pixbuf" --struct --extern geozoom_18.png > geozoom_18_pixmap.h
+cat addwp_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempaddwp_18_pixmap.h.h
+cat edtr_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempedtr_18_pixmap.h.h
 cat edwp_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempedwp_18_pixmap.h.h
 cat geomove_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempgeomove_18_pixmap.h.h
-cat geozoom_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempgeozoom_18_pixmap.h.h
-mv tempgeomove_18_pixmap.h.h geomove_18_pixmap.h
+mv tempaddwp_18_pixmap.h.h addwp_18_pixmap.h
+mv tempedtr_18_pixmap.h.h edtr_18_pixmap.h
+gdk-pixbuf-csource --name="`basename geozoom_18.png .png`_pixbuf" --struct --extern geozoom_18.png > geozoom_18_pixmap.h
 mv tempedwp_18_pixmap.h.h edwp_18_pixmap.h
-mv tempgeozoom_18_pixmap.h.h geozoom_18_pixmap.h
 gdk-pixbuf-csource --name="`basename mapdl_18.png .png`_pixbuf" --struct --extern mapdl_18.png > mapdl_18_pixmap.h
+mv tempgeomove_18_pixmap.h.h geomove_18_pixmap.h
 gdk-pixbuf-csource --name="`basename demdl_18.png .png`_pixbuf" --struct --extern demdl_18.png > demdl_18_pixmap.h
 gdk-pixbuf-csource --name="`basename mover_22.png .png`_pixbuf" --struct --extern mover_22.png > mover_22_pixmap.h
+cat geozoom_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempgeozoom_18_pixmap.h.h
 cat mapdl_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempmapdl_18_pixmap.h.h
 cat demdl_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempdemdl_18_pixmap.h.h
 cat mover_22_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempmover_22_pixmap.h.h
+mv tempgeozoom_18_pixmap.h.h geozoom_18_pixmap.h
 mv tempmapdl_18_pixmap.h.h mapdl_18_pixmap.h
-mv tempdemdl_18_pixmap.h.h demdl_18_pixmap.h
 gdk-pixbuf-csource --name="`basename ruler_18.png .png`_pixbuf" --struct --extern ruler_18.png > ruler_18_pixmap.h
+mv tempdemdl_18_pixmap.h.h demdl_18_pixmap.h
 mv tempmover_22_pixmap.h.h mover_22_pixmap.h
 gdk-pixbuf-csource --name="`basename showpic_18.png .png`_pixbuf" --struct --extern showpic_18.png > showpic_18_pixmap.h
 gdk-pixbuf-csource --name="`basename zoom_18.png .png`_pixbuf" --struct --extern zoom_18.png > zoom_18_pixmap.h
+gdk-pixbuf-csource --name="`basename route_finder_18.png .png`_pixbuf" --struct --extern route_finder_18.png > route_finder_18_pixmap.h
 cat ruler_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempruler_18_pixmap.h.h
 cat showpic_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempshowpic_18_pixmap.h.h
 cat zoom_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempzoom_18_pixmap.h.h
 mv tempruler_18_pixmap.h.h ruler_18_pixmap.h
+cat route_finder_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > temproute_finder_18_pixmap.h.h
+gdk-pixbuf-csource --name="`basename splitter_18.png .png`_pixbuf" --struct --extern splitter_18.png > splitter_18_pixmap.h
 mv tempshowpic_18_pixmap.h.h showpic_18_pixmap.h
 mv tempzoom_18_pixmap.h.h zoom_18_pixmap.h
-gdk-pixbuf-csource --name="`basename route_finder_18.png .png`_pixbuf" --struct --extern route_finder_18.png > route_finder_18_pixmap.h
-gdk-pixbuf-csource --name="`basename splitter_18.png .png`_pixbuf" --struct --extern splitter_18.png > splitter_18_pixmap.h
 gdk-pixbuf-csource --name="`basename select_18.png .png`_pixbuf" --struct --extern select_18.png > select_18_pixmap.h
-cat route_finder_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > temproute_finder_18_pixmap.h.h
-cat splitter_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempsplitter_18_pixmap.h.h
-cat select_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempselect_18_pixmap.h.h
-mv tempselect_18_pixmap.h.h select_18_pixmap.h
 mv temproute_finder_18_pixmap.h.h route_finder_18_pixmap.h
-mv tempsplitter_18_pixmap.h.h splitter_18_pixmap.h
 gdk-pixbuf-csource --name="`basename thumbnails.png .png`_pixbuf" --struct --extern thumbnails.png > thumbnails_pixmap.h
 gdk-pixbuf-csource --name="`basename vikaggregatelayer.png .png`_pixbuf" --struct --extern vikaggregatelayer.png > vikaggregatelayer_pixmap.h
-gdk-pixbuf-csource --name="`basename vikcoordlayer.png .png`_pixbuf" --struct --extern vikcoordlayer.png > vikcoordlayer_pixmap.h
-cat vikaggregatelayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikaggregatelayer_pixmap.h.h
-cat vikcoordlayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikcoordlayer_pixmap.h.h
-mv tempvikaggregatelayer_pixmap.h.h vikaggregatelayer_pixmap.h
+cat splitter_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempsplitter_18_pixmap.h.h
+cat select_18_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempselect_18_pixmap.h.h
 cat thumbnails_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempthumbnails_pixmap.h.h
-mv tempvikcoordlayer_pixmap.h.h vikcoordlayer_pixmap.h
+cat vikaggregatelayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikaggregatelayer_pixmap.h.h
+mv tempsplitter_18_pixmap.h.h splitter_18_pixmap.h
+mv tempselect_18_pixmap.h.h select_18_pixmap.h
+gdk-pixbuf-csource --name="`basename vikcoordlayer.png .png`_pixbuf" --struct --extern vikcoordlayer.png > vikcoordlayer_pixmap.h
 gdk-pixbuf-csource --name="`basename vikdemlayer.png .png`_pixbuf" --struct --extern vikdemlayer.png > vikdemlayer_pixmap.h
-gdk-pixbuf-csource --name="`basename vikgeoreflayer.png .png`_pixbuf" --struct --extern vikgeoreflayer.png > vikgeoreflayer_pixmap.h
 mv tempthumbnails_pixmap.h.h thumbnails_pixmap.h
+mv tempvikaggregatelayer_pixmap.h.h vikaggregatelayer_pixmap.h
+gdk-pixbuf-csource --name="`basename vikgeoreflayer.png .png`_pixbuf" --struct --extern vikgeoreflayer.png > vikgeoreflayer_pixmap.h
 gdk-pixbuf-csource --name="`basename vikgpslayer.png .png`_pixbuf" --struct --extern vikgpslayer.png > vikgpslayer_pixmap.h
 cat vikdemlayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikdemlayer_pixmap.h.h
+cat vikcoordlayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikcoordlayer_pixmap.h.h
 cat vikgeoreflayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikgeoreflayer_pixmap.h.h
+cat vikgpslayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikgpslayer_pixmap.h.h
 mv tempvikdemlayer_pixmap.h.h vikdemlayer_pixmap.h
+mv tempvikcoordlayer_pixmap.h.h vikcoordlayer_pixmap.h
 mv tempvikgeoreflayer_pixmap.h.h vikgeoreflayer_pixmap.h
-cat vikgpslayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikgpslayer_pixmap.h.h
 gdk-pixbuf-csource --name="`basename vikmapslayer.png .png`_pixbuf" --struct --extern vikmapslayer.png > vikmapslayer_pixmap.h
-gdk-pixbuf-csource --name="`basename vikmapniklayer.png .png`_pixbuf" --struct --extern vikmapniklayer.png > vikmapniklayer_pixmap.h
 mv tempvikgpslayer_pixmap.h.h vikgpslayer_pixmap.h
+gdk-pixbuf-csource --name="`basename vikmapniklayer.png .png`_pixbuf" --struct --extern vikmapniklayer.png > vikmapniklayer_pixmap.h
 gdk-pixbuf-csource --name="`basename viktrwlayer.png .png`_pixbuf" --struct --extern viktrwlayer.png > viktrwlayer_pixmap.h
+gdk-pixbuf-csource --name="`basename viktrwlayer_external.png .png`_pixbuf" --struct --extern viktrwlayer_external.png > viktrwlayer_external_pixmap.h
 cat vikmapslayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikmapslayer_pixmap.h.h
 cat vikmapniklayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempvikmapniklayer_pixmap.h.h
+cat viktrwlayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempviktrwlayer_pixmap.h.h
+cat viktrwlayer_external_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempviktrwlayer_external_pixmap.h.h
 mv tempvikmapslayer_pixmap.h.h vikmapslayer_pixmap.h
 mv tempvikmapniklayer_pixmap.h.h vikmapniklayer_pixmap.h
-cat viktrwlayer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempviktrwlayer_pixmap.h.h
-gdk-pixbuf-csource --name="`basename viktrwlayer_external.png .png`_pixbuf" --struct --extern viktrwlayer_external.png > viktrwlayer_external_pixmap.h
-gdk-pixbuf-csource --name="`basename viktrwlayer_external_nowrite.png .png`_pixbuf" --struct --extern viktrwlayer_external_nowrite.png > viktrwlayer_external_nowrite_pixmap.h
 mv tempviktrwlayer_pixmap.h.h viktrwlayer_pixmap.h
+gdk-pixbuf-csource --name="`basename viktrwlayer_external_nowrite.png .png`_pixbuf" --struct --extern viktrwlayer_external_nowrite.png > viktrwlayer_external_nowrite_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_camp.png .png`_pixbuf" --struct --extern wp_camp.png > wp_camp_pixmap.h
-cat viktrwlayer_external_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempviktrwlayer_external_pixmap.h.h
-cat viktrwlayer_external_nowrite_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempviktrwlayer_external_nowrite_pixmap.h.h
 mv tempviktrwlayer_external_pixmap.h.h viktrwlayer_external_pixmap.h
-mv tempviktrwlayer_external_nowrite_pixmap.h.h viktrwlayer_external_nowrite_pixmap.h
-cat wp_camp_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_camp_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_car.png .png`_pixbuf" --struct --extern wp_car.png > wp_car_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_deer.png .png`_pixbuf" --struct --extern wp_deer.png > wp_deer_pixmap.h
-mv tempwp_camp_pixmap.h.h wp_camp_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_flag.png .png`_pixbuf" --struct --extern wp_flag.png > wp_flag_pixmap.h
+cat viktrwlayer_external_nowrite_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempviktrwlayer_external_nowrite_pixmap.h.h
+cat wp_camp_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_camp_pixmap.h.h
 cat wp_car_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_car_pixmap.h.h
 cat wp_deer_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_deer_pixmap.h.h
+mv tempwp_camp_pixmap.h.h wp_camp_pixmap.h
+mv tempviktrwlayer_external_nowrite_pixmap.h.h viktrwlayer_external_nowrite_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_flag.png .png`_pixbuf" --struct --extern wp_flag.png > wp_flag_pixmap.h
 mv tempwp_car_pixmap.h.h wp_car_pixmap.h
-cat wp_flag_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_flag_pixmap.h.h
 mv tempwp_deer_pixmap.h.h wp_deer_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_geocache.png .png`_pixbuf" --struct --extern wp_geocache.png > wp_geocache_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_geocache_fnd.png .png`_pixbuf" --struct --extern wp_geocache_fnd.png > wp_geocache_fnd_pixmap.h
-mv tempwp_flag_pixmap.h.h wp_flag_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_house.png .png`_pixbuf" --struct --extern wp_house.png > wp_house_pixmap.h
+cat wp_flag_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_flag_pixmap.h.h
 cat wp_geocache_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_geocache_pixmap.h.h
 cat wp_geocache_fnd_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_geocache_fnd_pixmap.h.h
-mv tempwp_geocache_pixmap.h.h wp_geocache_pixmap.h
 cat wp_house_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_house_pixmap.h.h
-mv tempwp_geocache_fnd_pixmap.h.h wp_geocache_fnd_pixmap.h
+mv tempwp_flag_pixmap.h.h wp_flag_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_wpt_dot.png .png`_pixbuf" --struct --extern wp_wpt_dot.png > wp_wpt_dot_pixmap.h
+mv tempwp_geocache_pixmap.h.h wp_geocache_pixmap.h
+mv tempwp_geocache_fnd_pixmap.h.h wp_geocache_fnd_pixmap.h
 mv tempwp_house_pixmap.h.h wp_house_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_dollar.png .png`_pixbuf" --struct --extern wp_dollar.png > wp_dollar_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_golf.png .png`_pixbuf" --struct --extern wp_golf.png > wp_golf_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_summit.png .png`_pixbuf" --struct --extern wp_summit.png > wp_summit_pixmap.h
 cat wp_wpt_dot_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_wpt_dot_pixmap.h.h
 cat wp_dollar_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dollar_pixmap.h.h
-mv tempwp_wpt_dot_pixmap.h.h wp_wpt_dot_pixmap.h
 cat wp_golf_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_golf_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_summit.png .png`_pixbuf" --struct --extern wp_summit.png > wp_summit_pixmap.h
+cat wp_summit_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_summit_pixmap.h.h
+mv tempwp_wpt_dot_pixmap.h.h wp_wpt_dot_pixmap.h
 mv tempwp_dollar_pixmap.h.h wp_dollar_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_anchor.png .png`_pixbuf" --struct --extern wp_anchor.png > wp_anchor_pixmap.h
-mv tempwp_golf_pixmap.h.h wp_golf_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_forest.png .png`_pixbuf" --struct --extern wp_forest.png > wp_forest_pixmap.h
-cat wp_summit_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_summit_pixmap.h.h
-cat wp_anchor_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_anchor_pixmap.h.h
 mv tempwp_summit_pixmap.h.h wp_summit_pixmap.h
-mv tempwp_anchor_pixmap.h.h wp_anchor_pixmap.h
+mv tempwp_golf_pixmap.h.h wp_golf_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_parking.png .png`_pixbuf" --struct --extern wp_parking.png > wp_parking_pixmap.h
-cat wp_forest_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_forest_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_sml_cty.png .png`_pixbuf" --struct --extern wp_sml_cty.png > wp_sml_cty_pixmap.h
+cat wp_anchor_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_anchor_pixmap.h.h
+cat wp_forest_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_forest_pixmap.h.h
+cat wp_sml_cty_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_sml_cty_pixmap.h.h
+cat wp_parking_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_parking_pixmap.h.h
+mv tempwp_anchor_pixmap.h.h wp_anchor_pixmap.h
 mv tempwp_forest_pixmap.h.h wp_forest_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_med_cty.png .png`_pixbuf" --struct --extern wp_med_cty.png > wp_med_cty_pixmap.h
-cat wp_parking_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_parking_pixmap.h.h
-cat wp_sml_cty_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_sml_cty_pixmap.h.h
-mv tempwp_parking_pixmap.h.h wp_parking_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_lrg_cty.png .png`_pixbuf" --struct --extern wp_lrg_cty.png > wp_lrg_cty_pixmap.h
 mv tempwp_sml_cty_pixmap.h.h wp_sml_cty_pixmap.h
-cat wp_med_cty_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_med_cty_pixmap.h.h
+gdk-pixbuf-csource --name="`basename wp_lrg_cty.png .png`_pixbuf" --struct --extern wp_lrg_cty.png > wp_lrg_cty_pixmap.h
+mv tempwp_parking_pixmap.h.h wp_parking_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_cap_cty.png .png`_pixbuf" --struct --extern wp_cap_cty.png > wp_cap_cty_pixmap.h
-mv tempwp_med_cty_pixmap.h.h wp_med_cty_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_bell.png .png`_pixbuf" --struct --extern wp_bell.png > wp_bell_pixmap.h
+cat wp_med_cty_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_med_cty_pixmap.h.h
 cat wp_lrg_cty_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_lrg_cty_pixmap.h.h
 cat wp_cap_cty_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_cap_cty_pixmap.h.h
+cat wp_bell_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bell_pixmap.h.h
+mv tempwp_med_cty_pixmap.h.h wp_med_cty_pixmap.h
 mv tempwp_lrg_cty_pixmap.h.h wp_lrg_cty_pixmap.h
 mv tempwp_cap_cty_pixmap.h.h wp_cap_cty_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_diamond_grn.png .png`_pixbuf" --struct --extern wp_diamond_grn.png > wp_diamond_grn_pixmap.h
-cat wp_bell_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bell_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_diamond_red.png .png`_pixbuf" --struct --extern wp_diamond_red.png > wp_diamond_red_pixmap.h
 mv tempwp_bell_pixmap.h.h wp_bell_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_dive1.png .png`_pixbuf" --struct --extern wp_dive1.png > wp_dive1_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_dive2.png .png`_pixbuf" --struct --extern wp_dive2.png > wp_dive2_pixmap.h
 cat wp_diamond_grn_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_diamond_grn_pixmap.h.h
 cat wp_diamond_red_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_diamond_red_pixmap.h.h
+cat wp_dive1_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dive1_pixmap.h.h
+cat wp_dive2_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dive2_pixmap.h.h
 mv tempwp_diamond_grn_pixmap.h.h wp_diamond_grn_pixmap.h
 mv tempwp_diamond_red_pixmap.h.h wp_diamond_red_pixmap.h
-cat wp_dive1_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dive1_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_dive2.png .png`_pixbuf" --struct --extern wp_dive2.png > wp_dive2_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_fish.png .png`_pixbuf" --struct --extern wp_fish.png > wp_fish_pixmap.h
 mv tempwp_dive1_pixmap.h.h wp_dive1_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_fuel.png .png`_pixbuf" --struct --extern wp_fuel.png > wp_fuel_pixmap.h
-cat wp_dive2_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dive2_pixmap.h.h
-cat wp_fish_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fish_pixmap.h.h
 mv tempwp_dive2_pixmap.h.h wp_dive2_pixmap.h
-mv tempwp_fish_pixmap.h.h wp_fish_pixmap.h
-cat wp_fuel_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fuel_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_horn.png .png`_pixbuf" --struct --extern wp_horn.png > wp_horn_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_knife.png .png`_pixbuf" --struct --extern wp_knife.png > wp_knife_pixmap.h
-mv tempwp_fuel_pixmap.h.h wp_fuel_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_light.png .png`_pixbuf" --struct --extern wp_light.png > wp_light_pixmap.h
+cat wp_fish_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fish_pixmap.h.h
+cat wp_fuel_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fuel_pixmap.h.h
 cat wp_horn_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_horn_pixmap.h.h
 cat wp_knife_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_knife_pixmap.h.h
+mv tempwp_fuel_pixmap.h.h wp_fuel_pixmap.h
+mv tempwp_fish_pixmap.h.h wp_fish_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_light.png .png`_pixbuf" --struct --extern wp_light.png > wp_light_pixmap.h
 mv tempwp_horn_pixmap.h.h wp_horn_pixmap.h
 mv tempwp_knife_pixmap.h.h wp_knife_pixmap.h
-cat wp_light_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_light_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_mug.png .png`_pixbuf" --struct --extern wp_mug.png > wp_mug_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_skull.png .png`_pixbuf" --struct --extern wp_skull.png > wp_skull_pixmap.h
-mv tempwp_light_pixmap.h.h wp_light_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_square_grn.png .png`_pixbuf" --struct --extern wp_square_grn.png > wp_square_grn_pixmap.h
+cat wp_light_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_light_pixmap.h.h
 cat wp_mug_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_mug_pixmap.h.h
 cat wp_skull_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_skull_pixmap.h.h
+cat wp_square_grn_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_square_grn_pixmap.h.h
+mv tempwp_light_pixmap.h.h wp_light_pixmap.h
 mv tempwp_mug_pixmap.h.h wp_mug_pixmap.h
 mv tempwp_skull_pixmap.h.h wp_skull_pixmap.h
-cat wp_square_grn_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_square_grn_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_square_red.png .png`_pixbuf" --struct --extern wp_square_red.png > wp_square_red_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_wbuoy.png .png`_pixbuf" --struct --extern wp_wbuoy.png > wp_wbuoy_pixmap.h
 mv tempwp_square_grn_pixmap.h.h wp_square_grn_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_wbuoy.png .png`_pixbuf" --struct --extern wp_wbuoy.png > wp_wbuoy_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_wreck.png .png`_pixbuf" --struct --extern wp_wreck.png > wp_wreck_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_null.png .png`_pixbuf" --struct --extern wp_null.png > wp_null_pixmap.h
 cat wp_square_red_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_square_red_pixmap.h.h
 cat wp_wbuoy_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_wbuoy_pixmap.h.h
+cat wp_wreck_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_wreck_pixmap.h.h
+cat wp_null_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_null_pixmap.h.h
 mv tempwp_square_red_pixmap.h.h wp_square_red_pixmap.h
 mv tempwp_wbuoy_pixmap.h.h wp_wbuoy_pixmap.h
-cat wp_wreck_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_wreck_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_null.png .png`_pixbuf" --struct --extern wp_null.png > wp_null_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_mine.png .png`_pixbuf" --struct --extern wp_mine.png > wp_mine_pixmap.h
 mv tempwp_wreck_pixmap.h.h wp_wreck_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_mine.png .png`_pixbuf" --struct --extern wp_mine.png > wp_mine_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_school.png .png`_pixbuf" --struct --extern wp_school.png > wp_school_pixmap.h
-cat wp_null_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_null_pixmap.h.h
-cat wp_mine_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_mine_pixmap.h.h
-mv tempwp_mine_pixmap.h.h wp_mine_pixmap.h
 mv tempwp_null_pixmap.h.h wp_null_pixmap.h
-cat wp_school_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_school_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_cemetery.png .png`_pixbuf" --struct --extern wp_cemetery.png > wp_cemetery_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_church.png .png`_pixbuf" --struct --extern wp_church.png > wp_church_pixmap.h
-mv tempwp_school_pixmap.h.h wp_school_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_military.png .png`_pixbuf" --struct --extern wp_military.png > wp_military_pixmap.h
+cat wp_mine_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_mine_pixmap.h.h
+cat wp_school_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_school_pixmap.h.h
 cat wp_cemetery_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_cemetery_pixmap.h.h
 cat wp_church_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_church_pixmap.h.h
+mv tempwp_school_pixmap.h.h wp_school_pixmap.h
+mv tempwp_mine_pixmap.h.h wp_mine_pixmap.h
 mv tempwp_cemetery_pixmap.h.h wp_cemetery_pixmap.h
-mv tempwp_church_pixmap.h.h wp_church_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_military.png .png`_pixbuf" --struct --extern wp_military.png > wp_military_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_mob.png .png`_pixbuf" --struct --extern wp_mob.png > wp_mob_pixmap.h
-cat wp_military_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_military_pixmap.h.h
+mv tempwp_church_pixmap.h.h wp_church_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_ambr.png .png`_pixbuf" --struct --extern wp_buoy_ambr.png > wp_buoy_ambr_pixmap.h
-mv tempwp_military_pixmap.h.h wp_military_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_blck.png .png`_pixbuf" --struct --extern wp_buoy_blck.png > wp_buoy_blck_pixmap.h
+cat wp_military_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_military_pixmap.h.h
 cat wp_mob_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_mob_pixmap.h.h
 cat wp_buoy_ambr_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_ambr_pixmap.h.h
+cat wp_buoy_blck_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_blck_pixmap.h.h
 mv tempwp_mob_pixmap.h.h wp_mob_pixmap.h
+mv tempwp_military_pixmap.h.h wp_military_pixmap.h
 mv tempwp_buoy_ambr_pixmap.h.h wp_buoy_ambr_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_blue.png .png`_pixbuf" --struct --extern wp_buoy_blue.png > wp_buoy_blue_pixmap.h
-cat wp_buoy_blck_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_blck_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_buoy_grn.png .png`_pixbuf" --struct --extern wp_buoy_grn.png > wp_buoy_grn_pixmap.h
 mv tempwp_buoy_blck_pixmap.h.h wp_buoy_blck_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_grn_red.png .png`_pixbuf" --struct --extern wp_buoy_grn_red.png > wp_buoy_grn_red_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_buoy_grn_wht.png .png`_pixbuf" --struct --extern wp_buoy_grn_wht.png > wp_buoy_grn_wht_pixmap.h
 cat wp_buoy_blue_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_blue_pixmap.h.h
 cat wp_buoy_grn_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_pixmap.h.h
+cat wp_buoy_grn_red_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_red_pixmap.h.h
+cat wp_buoy_grn_wht_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_wht_pixmap.h.h
 mv tempwp_buoy_blue_pixmap.h.h wp_buoy_blue_pixmap.h
 mv tempwp_buoy_grn_pixmap.h.h wp_buoy_grn_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_buoy_grn_wht.png .png`_pixbuf" --struct --extern wp_buoy_grn_wht.png > wp_buoy_grn_wht_pixmap.h
-cat wp_buoy_grn_red_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_red_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_buoy_orng.png .png`_pixbuf" --struct --extern wp_buoy_orng.png > wp_buoy_orng_pixmap.h
 mv tempwp_buoy_grn_red_pixmap.h.h wp_buoy_grn_red_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_buoy_red.png .png`_pixbuf" --struct --extern wp_buoy_red.png > wp_buoy_red_pixmap.h
-cat wp_buoy_grn_wht_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_wht_pixmap.h.h
-cat wp_buoy_orng_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_orng_pixmap.h.h
-mv tempwp_buoy_orng_pixmap.h.h wp_buoy_orng_pixmap.h
 mv tempwp_buoy_grn_wht_pixmap.h.h wp_buoy_grn_wht_pixmap.h
-cat wp_buoy_red_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_red_pixmap.h.h
+gdk-pixbuf-csource --name="`basename wp_buoy_red.png .png`_pixbuf" --struct --extern wp_buoy_red.png > wp_buoy_red_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_red_grn.png .png`_pixbuf" --struct --extern wp_buoy_red_grn.png > wp_buoy_red_grn_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_red_wht.png .png`_pixbuf" --struct --extern wp_buoy_red_wht.png > wp_buoy_red_wht_pixmap.h
-mv tempwp_buoy_red_pixmap.h.h wp_buoy_red_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_buoy_violet.png .png`_pixbuf" --struct --extern wp_buoy_violet.png > wp_buoy_violet_pixmap.h
+cat wp_buoy_orng_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_orng_pixmap.h.h
+cat wp_buoy_red_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_red_pixmap.h.h
 cat wp_buoy_red_grn_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_red_grn_pixmap.h.h
 cat wp_buoy_red_wht_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_red_wht_pixmap.h.h
+mv tempwp_buoy_orng_pixmap.h.h wp_buoy_orng_pixmap.h
+mv tempwp_buoy_red_pixmap.h.h wp_buoy_red_pixmap.h
 mv tempwp_buoy_red_grn_pixmap.h.h wp_buoy_red_grn_pixmap.h
-cat wp_buoy_violet_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_violet_pixmap.h.h
 mv tempwp_buoy_red_wht_pixmap.h.h wp_buoy_red_wht_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_buoy_violet.png .png`_pixbuf" --struct --extern wp_buoy_violet.png > wp_buoy_violet_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_wht.png .png`_pixbuf" --struct --extern wp_buoy_wht.png > wp_buoy_wht_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_wht_grn.png .png`_pixbuf" --struct --extern wp_buoy_wht_grn.png > wp_buoy_wht_grn_pixmap.h
-mv tempwp_buoy_violet_pixmap.h.h wp_buoy_violet_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_wht_red.png .png`_pixbuf" --struct --extern wp_buoy_wht_red.png > wp_buoy_wht_red_pixmap.h
+cat wp_buoy_violet_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_violet_pixmap.h.h
 cat wp_buoy_wht_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_wht_pixmap.h.h
 cat wp_buoy_wht_grn_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_wht_grn_pixmap.h.h
 cat wp_buoy_wht_red_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_wht_red_pixmap.h.h
-mv tempwp_buoy_wht_grn_pixmap.h.h wp_buoy_wht_grn_pixmap.h
+mv tempwp_buoy_violet_pixmap.h.h wp_buoy_violet_pixmap.h
 mv tempwp_buoy_wht_pixmap.h.h wp_buoy_wht_pixmap.h
-mv tempwp_buoy_wht_red_pixmap.h.h wp_buoy_wht_red_pixmap.h
+mv tempwp_buoy_wht_grn_pixmap.h.h wp_buoy_wht_grn_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_dot.png .png`_pixbuf" --struct --extern wp_dot.png > wp_dot_pixmap.h
+mv tempwp_buoy_wht_red_pixmap.h.h wp_buoy_wht_red_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_rbcn.png .png`_pixbuf" --struct --extern wp_rbcn.png > wp_rbcn_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_boat_ramp.png .png`_pixbuf" --struct --extern wp_boat_ramp.png > wp_boat_ramp_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_restroom.png .png`_pixbuf" --struct --extern wp_restroom.png > wp_restroom_pixmap.h
 cat wp_dot_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dot_pixmap.h.h
 cat wp_rbcn_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_rbcn_pixmap.h.h
 cat wp_boat_ramp_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_boat_ramp_pixmap.h.h
-mv tempwp_rbcn_pixmap.h.h wp_rbcn_pixmap.h
+cat wp_restroom_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_restroom_pixmap.h.h
 mv tempwp_dot_pixmap.h.h wp_dot_pixmap.h
 mv tempwp_boat_ramp_pixmap.h.h wp_boat_ramp_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_restroom.png .png`_pixbuf" --struct --extern wp_restroom.png > wp_restroom_pixmap.h
+mv tempwp_rbcn_pixmap.h.h wp_rbcn_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_shower.png .png`_pixbuf" --struct --extern wp_shower.png > wp_shower_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_drinking_wtr.png .png`_pixbuf" --struct --extern wp_drinking_wtr.png > wp_drinking_wtr_pixmap.h
-cat wp_restroom_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_restroom_pixmap.h.h
-cat wp_shower_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_shower_pixmap.h.h
-cat wp_drinking_wtr_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_drinking_wtr_pixmap.h.h
 mv tempwp_restroom_pixmap.h.h wp_restroom_pixmap.h
-mv tempwp_drinking_wtr_pixmap.h.h wp_drinking_wtr_pixmap.h
-mv tempwp_shower_pixmap.h.h wp_shower_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_drinking_wtr.png .png`_pixbuf" --struct --extern wp_drinking_wtr.png > wp_drinking_wtr_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_phone.png .png`_pixbuf" --struct --extern wp_phone.png > wp_phone_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_1st_aid.png .png`_pixbuf" --struct --extern wp_1st_aid.png > wp_1st_aid_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_info.png .png`_pixbuf" --struct --extern wp_info.png > wp_info_pixmap.h
+cat wp_shower_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_shower_pixmap.h.h
+cat wp_drinking_wtr_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_drinking_wtr_pixmap.h.h
 cat wp_phone_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_phone_pixmap.h.h
 cat wp_1st_aid_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_1st_aid_pixmap.h.h
-cat wp_info_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_info_pixmap.h.h
 mv tempwp_phone_pixmap.h.h wp_phone_pixmap.h
-mv tempwp_1st_aid_pixmap.h.h wp_1st_aid_pixmap.h
-mv tempwp_info_pixmap.h.h wp_info_pixmap.h
+mv tempwp_drinking_wtr_pixmap.h.h wp_drinking_wtr_pixmap.h
+mv tempwp_shower_pixmap.h.h wp_shower_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_info.png .png`_pixbuf" --struct --extern wp_info.png > wp_info_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_park.png .png`_pixbuf" --struct --extern wp_park.png > wp_park_pixmap.h
+mv tempwp_1st_aid_pixmap.h.h wp_1st_aid_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_picnic.png .png`_pixbuf" --struct --extern wp_picnic.png > wp_picnic_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_scenic.png .png`_pixbuf" --struct --extern wp_scenic.png > wp_scenic_pixmap.h
+cat wp_info_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_info_pixmap.h.h
 cat wp_park_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_park_pixmap.h.h
 cat wp_picnic_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_picnic_pixmap.h.h
 cat wp_scenic_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_scenic_pixmap.h.h
+mv tempwp_info_pixmap.h.h wp_info_pixmap.h
 mv tempwp_park_pixmap.h.h wp_park_pixmap.h
 mv tempwp_picnic_pixmap.h.h wp_picnic_pixmap.h
-mv tempwp_scenic_pixmap.h.h wp_scenic_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_skiing.png .png`_pixbuf" --struct --extern wp_skiing.png > wp_skiing_pixmap.h
+mv tempwp_scenic_pixmap.h.h wp_scenic_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_swimming.png .png`_pixbuf" --struct --extern wp_swimming.png > wp_swimming_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_dam.png .png`_pixbuf" --struct --extern wp_dam.png > wp_dam_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_controlled.png .png`_pixbuf" --struct --extern wp_controlled.png > wp_controlled_pixmap.h
 cat wp_skiing_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_skiing_pixmap.h.h
 cat wp_swimming_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_swimming_pixmap.h.h
 cat wp_dam_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dam_pixmap.h.h
+cat wp_controlled_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_controlled_pixmap.h.h
 mv tempwp_skiing_pixmap.h.h wp_skiing_pixmap.h
 mv tempwp_swimming_pixmap.h.h wp_swimming_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_controlled.png .png`_pixbuf" --struct --extern wp_controlled.png > wp_controlled_pixmap.h
 mv tempwp_dam_pixmap.h.h wp_dam_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_danger.png .png`_pixbuf" --struct --extern wp_danger.png > wp_danger_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_restricted.png .png`_pixbuf" --struct --extern wp_restricted.png > wp_restricted_pixmap.h
-cat wp_controlled_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_controlled_pixmap.h.h
+gdk-pixbuf-csource --name="`basename wp_ball.png .png`_pixbuf" --struct --extern wp_ball.png > wp_ball_pixmap.h
+mv tempwp_controlled_pixmap.h.h wp_controlled_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_rv_park.png .png`_pixbuf" --struct --extern wp_rv_park.png > wp_rv_park_pixmap.h
 cat wp_danger_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_danger_pixmap.h.h
 cat wp_restricted_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_restricted_pixmap.h.h
-mv tempwp_controlled_pixmap.h.h wp_controlled_pixmap.h
+cat wp_ball_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ball_pixmap.h.h
+cat wp_rv_park_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_rv_park_pixmap.h.h
 mv tempwp_danger_pixmap.h.h wp_danger_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_ball.png .png`_pixbuf" --struct --extern wp_ball.png > wp_ball_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_rv_park.png .png`_pixbuf" --struct --extern wp_rv_park.png > wp_rv_park_pixmap.h
 mv tempwp_restricted_pixmap.h.h wp_restricted_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_bridge.png .png`_pixbuf" --struct --extern wp_bridge.png > wp_bridge_pixmap.h
-cat wp_ball_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ball_pixmap.h.h
-cat wp_rv_park_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_rv_park_pixmap.h.h
-cat wp_bridge_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bridge_pixmap.h.h
 mv tempwp_ball_pixmap.h.h wp_ball_pixmap.h
-mv tempwp_rv_park_pixmap.h.h wp_rv_park_pixmap.h
-mv tempwp_bridge_pixmap.h.h wp_bridge_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_building.png .png`_pixbuf" --struct --extern wp_building.png > wp_building_pixmap.h
+mv tempwp_rv_park_pixmap.h.h wp_rv_park_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_tunnel.png .png`_pixbuf" --struct --extern wp_tunnel.png > wp_tunnel_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_beach.png .png`_pixbuf" --struct --extern wp_beach.png > wp_beach_pixmap.h
+cat wp_bridge_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bridge_pixmap.h.h
 cat wp_building_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_building_pixmap.h.h
 cat wp_tunnel_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_tunnel_pixmap.h.h
 cat wp_beach_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_beach_pixmap.h.h
+mv tempwp_bridge_pixmap.h.h wp_bridge_pixmap.h
 mv tempwp_building_pixmap.h.h wp_building_pixmap.h
 mv tempwp_tunnel_pixmap.h.h wp_tunnel_pixmap.h
-mv tempwp_beach_pixmap.h.h wp_beach_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_airplane.png .png`_pixbuf" --struct --extern wp_airplane.png > wp_airplane_pixmap.h
+mv tempwp_beach_pixmap.h.h wp_beach_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_ice_skating.png .png`_pixbuf" --struct --extern wp_ice_skating.png > wp_ice_skating_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_1st_aid_large.png .png`_pixbuf" --struct --extern wp_1st_aid_large.png > wp_1st_aid_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_airplane_large.png .png`_pixbuf" --struct --extern wp_airplane_large.png > wp_airplane_large_pixmap.h
 cat wp_airplane_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_airplane_pixmap.h.h
 cat wp_ice_skating_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ice_skating_pixmap.h.h
 cat wp_1st_aid_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_1st_aid_large_pixmap.h.h
-mv tempwp_ice_skating_pixmap.h.h wp_ice_skating_pixmap.h
+cat wp_airplane_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_airplane_large_pixmap.h.h
 mv tempwp_airplane_pixmap.h.h wp_airplane_pixmap.h
-mv tempwp_1st_aid_large_pixmap.h.h wp_1st_aid_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_airplane_large.png .png`_pixbuf" --struct --extern wp_airplane_large.png > wp_airplane_large_pixmap.h
+mv tempwp_ice_skating_pixmap.h.h wp_ice_skating_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_amuse_pk_large.png .png`_pixbuf" --struct --extern wp_amuse_pk_large.png > wp_amuse_pk_large_pixmap.h
+mv tempwp_1st_aid_large_pixmap.h.h wp_1st_aid_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_anchor_large.png .png`_pixbuf" --struct --extern wp_anchor_large.png > wp_anchor_large_pixmap.h
-cat wp_airplane_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_airplane_large_pixmap.h.h
-cat wp_amuse_pk_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_amuse_pk_large_pixmap.h.h
-cat wp_anchor_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_anchor_large_pixmap.h.h
 mv tempwp_airplane_large_pixmap.h.h wp_airplane_large_pixmap.h
-mv tempwp_amuse_pk_large_pixmap.h.h wp_amuse_pk_large_pixmap.h
-mv tempwp_anchor_large_pixmap.h.h wp_anchor_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_animal_tracks_large.png .png`_pixbuf" --struct --extern wp_animal_tracks_large.png > wp_animal_tracks_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_atv_large.png .png`_pixbuf" --struct --extern wp_atv_large.png > wp_atv_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_ball_large.png .png`_pixbuf" --struct --extern wp_ball_large.png > wp_ball_large_pixmap.h
-cat wp_animal_tracks_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_animal_tracks_large_pixmap.h.h
+cat wp_amuse_pk_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_amuse_pk_large_pixmap.h.h
 cat wp_atv_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_atv_large_pixmap.h.h
-cat wp_ball_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ball_large_pixmap.h.h
-mv tempwp_animal_tracks_large_pixmap.h.h wp_animal_tracks_large_pixmap.h
-mv tempwp_ball_large_pixmap.h.h wp_ball_large_pixmap.h
+cat wp_anchor_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_anchor_large_pixmap.h.h
+mv tempwp_amuse_pk_large_pixmap.h.h wp_amuse_pk_large_pixmap.h
+cat wp_animal_tracks_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_animal_tracks_large_pixmap.h.h
 mv tempwp_atv_large_pixmap.h.h wp_atv_large_pixmap.h
+mv tempwp_anchor_large_pixmap.h.h wp_anchor_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_ball_large.png .png`_pixbuf" --struct --extern wp_ball_large.png > wp_ball_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_beach_large.png .png`_pixbuf" --struct --extern wp_beach_large.png > wp_beach_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_bell_large.png .png`_pixbuf" --struct --extern wp_bell_large.png > wp_bell_large_pixmap.h
+mv tempwp_animal_tracks_large_pixmap.h.h wp_animal_tracks_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_big_game_large.png .png`_pixbuf" --struct --extern wp_big_game_large.png > wp_big_game_large_pixmap.h
+cat wp_ball_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ball_large_pixmap.h.h
 cat wp_beach_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_beach_large_pixmap.h.h
 cat wp_bell_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bell_large_pixmap.h.h
-cat wp_big_game_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_big_game_large_pixmap.h.h
+mv tempwp_ball_large_pixmap.h.h wp_ball_large_pixmap.h
 mv tempwp_beach_large_pixmap.h.h wp_beach_large_pixmap.h
+cat wp_big_game_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_big_game_large_pixmap.h.h
 mv tempwp_bell_large_pixmap.h.h wp_bell_large_pixmap.h
-mv tempwp_big_game_large_pixmap.h.h wp_big_game_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_bike_trail_large.png .png`_pixbuf" --struct --extern wp_bike_trail_large.png > wp_bike_trail_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_blind_large.png .png`_pixbuf" --struct --extern wp_blind_large.png > wp_blind_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_blood_trail_large.png .png`_pixbuf" --struct --extern wp_blood_trail_large.png > wp_blood_trail_large_pixmap.h
+mv tempwp_big_game_large_pixmap.h.h wp_big_game_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_block_blue_large.png .png`_pixbuf" --struct --extern wp_block_blue_large.png > wp_block_blue_large_pixmap.h
 cat wp_bike_trail_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bike_trail_large_pixmap.h.h
 cat wp_blind_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_blind_large_pixmap.h.h
 cat wp_blood_trail_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_blood_trail_large_pixmap.h.h
-mv tempwp_bike_trail_large_pixmap.h.h wp_bike_trail_large_pixmap.h
 mv tempwp_blind_large_pixmap.h.h wp_blind_large_pixmap.h
+cat wp_block_blue_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_block_blue_large_pixmap.h.h
+mv tempwp_bike_trail_large_pixmap.h.h wp_bike_trail_large_pixmap.h
 mv tempwp_blood_trail_large_pixmap.h.h wp_blood_trail_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_block_blue_large.png .png`_pixbuf" --struct --extern wp_block_blue_large.png > wp_block_blue_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_block_green_large.png .png`_pixbuf" --struct --extern wp_block_green_large.png > wp_block_green_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_block_red_large.png .png`_pixbuf" --struct --extern wp_block_red_large.png > wp_block_red_large_pixmap.h
-cat wp_block_blue_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_block_blue_large_pixmap.h.h
+gdk-pixbuf-csource --name="`basename wp_boat_ramp_large.png .png`_pixbuf" --struct --extern wp_boat_ramp_large.png > wp_boat_ramp_large_pixmap.h
+mv tempwp_block_blue_large_pixmap.h.h wp_block_blue_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_bowling_large.png .png`_pixbuf" --struct --extern wp_bowling_large.png > wp_bowling_large_pixmap.h
 cat wp_block_green_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_block_green_large_pixmap.h.h
 cat wp_block_red_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_block_red_large_pixmap.h.h
-mv tempwp_block_blue_large_pixmap.h.h wp_block_blue_large_pixmap.h
+cat wp_boat_ramp_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_boat_ramp_large_pixmap.h.h
+cat wp_bowling_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bowling_large_pixmap.h.h
 mv tempwp_block_green_large_pixmap.h.h wp_block_green_large_pixmap.h
 mv tempwp_block_red_large_pixmap.h.h wp_block_red_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_boat_ramp_large.png .png`_pixbuf" --struct --extern wp_boat_ramp_large.png > wp_boat_ramp_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_bowling_large.png .png`_pixbuf" --struct --extern wp_bowling_large.png > wp_bowling_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_bridge_large.png .png`_pixbuf" --struct --extern wp_bridge_large.png > wp_bridge_large_pixmap.h
-cat wp_boat_ramp_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_boat_ramp_large_pixmap.h.h
-cat wp_bowling_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bowling_large_pixmap.h.h
-cat wp_bridge_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bridge_large_pixmap.h.h
-mv tempwp_bowling_large_pixmap.h.h wp_bowling_large_pixmap.h
 mv tempwp_boat_ramp_large_pixmap.h.h wp_boat_ramp_large_pixmap.h
-mv tempwp_bridge_large_pixmap.h.h wp_bridge_large_pixmap.h
+mv tempwp_bowling_large_pixmap.h.h wp_bowling_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_building_large.png .png`_pixbuf" --struct --extern wp_building_large.png > wp_building_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_ambr_large.png .png`_pixbuf" --struct --extern wp_buoy_ambr_large.png > wp_buoy_ambr_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_blck_large.png .png`_pixbuf" --struct --extern wp_buoy_blck_large.png > wp_buoy_blck_large_pixmap.h
+cat wp_bridge_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_bridge_large_pixmap.h.h
 cat wp_building_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_building_large_pixmap.h.h
-cat wp_buoy_ambr_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_ambr_large_pixmap.h.h
 cat wp_buoy_blck_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_blck_large_pixmap.h.h
-mv tempwp_buoy_ambr_large_pixmap.h.h wp_buoy_ambr_large_pixmap.h
-mv tempwp_buoy_blck_large_pixmap.h.h wp_buoy_blck_large_pixmap.h
+cat wp_buoy_ambr_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_ambr_large_pixmap.h.h
+mv tempwp_bridge_large_pixmap.h.h wp_bridge_large_pixmap.h
 mv tempwp_building_large_pixmap.h.h wp_building_large_pixmap.h
+mv tempwp_buoy_blck_large_pixmap.h.h wp_buoy_blck_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_blue_large.png .png`_pixbuf" --struct --extern wp_buoy_blue_large.png > wp_buoy_blue_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_grn_large.png .png`_pixbuf" --struct --extern wp_buoy_grn_large.png > wp_buoy_grn_large_pixmap.h
+mv tempwp_buoy_ambr_large_pixmap.h.h wp_buoy_ambr_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_grn_red_large.png .png`_pixbuf" --struct --extern wp_buoy_grn_red_large.png > wp_buoy_grn_red_large_pixmap.h
-cat wp_buoy_grn_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_large_pixmap.h.h
+gdk-pixbuf-csource --name="`basename wp_buoy_grn_wht_large.png .png`_pixbuf" --struct --extern wp_buoy_grn_wht_large.png > wp_buoy_grn_wht_large_pixmap.h
 cat wp_buoy_blue_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_blue_large_pixmap.h.h
-mv tempwp_buoy_grn_large_pixmap.h.h wp_buoy_grn_large_pixmap.h
+cat wp_buoy_grn_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_large_pixmap.h.h
 cat wp_buoy_grn_red_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_red_large_pixmap.h.h
+cat wp_buoy_grn_wht_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_wht_large_pixmap.h.h
 mv tempwp_buoy_blue_large_pixmap.h.h wp_buoy_blue_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_buoy_grn_wht_large.png .png`_pixbuf" --struct --extern wp_buoy_grn_wht_large.png > wp_buoy_grn_wht_large_pixmap.h
-mv tempwp_buoy_grn_red_large_pixmap.h.h wp_buoy_grn_red_large_pixmap.h
+mv tempwp_buoy_grn_large_pixmap.h.h wp_buoy_grn_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_orng_large.png .png`_pixbuf" --struct --extern wp_buoy_orng_large.png > wp_buoy_orng_large_pixmap.h
+mv tempwp_buoy_grn_red_large_pixmap.h.h wp_buoy_grn_red_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_red_grn_large.png .png`_pixbuf" --struct --extern wp_buoy_red_grn_large.png > wp_buoy_red_grn_large_pixmap.h
-cat wp_buoy_grn_wht_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_grn_wht_large_pixmap.h.h
-cat wp_buoy_orng_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_orng_large_pixmap.h.h
-cat wp_buoy_red_grn_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_red_grn_large_pixmap.h.h
 mv tempwp_buoy_grn_wht_large_pixmap.h.h wp_buoy_grn_wht_large_pixmap.h
-mv tempwp_buoy_orng_large_pixmap.h.h wp_buoy_orng_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_red_large.png .png`_pixbuf" --struct --extern wp_buoy_red_large.png > wp_buoy_red_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_red_wht_large.png .png`_pixbuf" --struct --extern wp_buoy_red_wht_large.png > wp_buoy_red_wht_large_pixmap.h
-mv tempwp_buoy_red_grn_large_pixmap.h.h wp_buoy_red_grn_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_buoy_violet_large.png .png`_pixbuf" --struct --extern wp_buoy_violet_large.png > wp_buoy_violet_large_pixmap.h
+cat wp_buoy_orng_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_orng_large_pixmap.h.h
+cat wp_buoy_red_grn_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_red_grn_large_pixmap.h.h
 cat wp_buoy_red_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_red_large_pixmap.h.h
 cat wp_buoy_red_wht_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_red_wht_large_pixmap.h.h
-mv tempwp_buoy_red_wht_large_pixmap.h.h wp_buoy_red_wht_large_pixmap.h
+mv tempwp_buoy_orng_large_pixmap.h.h wp_buoy_orng_large_pixmap.h
+mv tempwp_buoy_red_grn_large_pixmap.h.h wp_buoy_red_grn_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_buoy_violet_large.png .png`_pixbuf" --struct --extern wp_buoy_violet_large.png > wp_buoy_violet_large_pixmap.h
 mv tempwp_buoy_red_large_pixmap.h.h wp_buoy_red_large_pixmap.h
-cat wp_buoy_violet_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_violet_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_buoy_wht_grn_large.png .png`_pixbuf" --struct --extern wp_buoy_wht_grn_large.png > wp_buoy_wht_grn_large_pixmap.h
+mv tempwp_buoy_red_wht_large_pixmap.h.h wp_buoy_red_wht_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_wht_large.png .png`_pixbuf" --struct --extern wp_buoy_wht_large.png > wp_buoy_wht_large_pixmap.h
-mv tempwp_buoy_violet_large_pixmap.h.h wp_buoy_violet_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_buoy_wht_red_large.png .png`_pixbuf" --struct --extern wp_buoy_wht_red_large.png > wp_buoy_wht_red_large_pixmap.h
+cat wp_buoy_violet_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_violet_large_pixmap.h.h
 cat wp_buoy_wht_grn_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_wht_grn_large_pixmap.h.h
 cat wp_buoy_wht_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_wht_large_pixmap.h.h
-mv tempwp_buoy_wht_grn_large_pixmap.h.h wp_buoy_wht_grn_large_pixmap.h
 cat wp_buoy_wht_red_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_buoy_wht_red_large_pixmap.h.h
-mv tempwp_buoy_wht_large_pixmap.h.h wp_buoy_wht_large_pixmap.h
+mv tempwp_buoy_violet_large_pixmap.h.h wp_buoy_violet_large_pixmap.h
+mv tempwp_buoy_wht_grn_large_pixmap.h.h wp_buoy_wht_grn_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_camp_large.png .png`_pixbuf" --struct --extern wp_camp_large.png > wp_camp_large_pixmap.h
+mv tempwp_buoy_wht_large_pixmap.h.h wp_buoy_wht_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_car_large.png .png`_pixbuf" --struct --extern wp_car_large.png > wp_car_large_pixmap.h
 mv tempwp_buoy_wht_red_large_pixmap.h.h wp_buoy_wht_red_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_car_rental_large.png .png`_pixbuf" --struct --extern wp_car_rental_large.png > wp_car_rental_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_car_repair_large.png .png`_pixbuf" --struct --extern wp_car_repair_large.png > wp_car_repair_large_pixmap.h
 cat wp_camp_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_camp_large_pixmap.h.h
 cat wp_car_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_car_large_pixmap.h.h
-mv tempwp_camp_large_pixmap.h.h wp_camp_large_pixmap.h
 cat wp_car_rental_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_car_rental_large_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_car_repair_large.png .png`_pixbuf" --struct --extern wp_car_repair_large.png > wp_car_repair_large_pixmap.h
+cat wp_car_repair_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_car_repair_large_pixmap.h.h
+mv tempwp_camp_large_pixmap.h.h wp_camp_large_pixmap.h
 mv tempwp_car_large_pixmap.h.h wp_car_large_pixmap.h
-mv tempwp_car_rental_large_pixmap.h.h wp_car_rental_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_cemetery_large.png .png`_pixbuf" --struct --extern wp_cemetery_large.png > wp_cemetery_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_church_large.png .png`_pixbuf" --struct --extern wp_church_large.png > wp_church_large_pixmap.h
-cat wp_car_repair_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_car_repair_large_pixmap.h.h
-cat wp_cemetery_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_cemetery_large_pixmap.h.h
+mv tempwp_car_rental_large_pixmap.h.h wp_car_rental_large_pixmap.h
 mv tempwp_car_repair_large_pixmap.h.h wp_car_repair_large_pixmap.h
-cat wp_church_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_church_large_pixmap.h.h
-mv tempwp_cemetery_large_pixmap.h.h wp_cemetery_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_church_large.png .png`_pixbuf" --struct --extern wp_church_large.png > wp_church_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_civil_large.png .png`_pixbuf" --struct --extern wp_civil_large.png > wp_civil_large_pixmap.h
-mv tempwp_church_large_pixmap.h.h wp_church_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_controlled_large.png .png`_pixbuf" --struct --extern wp_controlled_large.png > wp_controlled_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_conv_store_large.png .png`_pixbuf" --struct --extern wp_conv_store_large.png > wp_conv_store_large_pixmap.h
+cat wp_cemetery_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_cemetery_large_pixmap.h.h
+cat wp_church_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_church_large_pixmap.h.h
 cat wp_civil_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_civil_large_pixmap.h.h
 cat wp_controlled_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_controlled_large_pixmap.h.h
-cat wp_conv_store_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_conv_store_large_pixmap.h.h
+mv tempwp_cemetery_large_pixmap.h.h wp_cemetery_large_pixmap.h
 mv tempwp_civil_large_pixmap.h.h wp_civil_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_cover_large.png .png`_pixbuf" --struct --extern wp_cover_large.png > wp_cover_large_pixmap.h
+mv tempwp_church_large_pixmap.h.h wp_church_large_pixmap.h
 mv tempwp_controlled_large_pixmap.h.h wp_controlled_large_pixmap.h
-mv tempwp_conv_store_large_pixmap.h.h wp_conv_store_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_conv_store_large.png .png`_pixbuf" --struct --extern wp_conv_store_large.png > wp_conv_store_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_cover_large.png .png`_pixbuf" --struct --extern wp_cover_large.png > wp_cover_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_covey_large.png .png`_pixbuf" --struct --extern wp_covey_large.png > wp_covey_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_crossing_large.png .png`_pixbuf" --struct --extern wp_crossing_large.png > wp_crossing_large_pixmap.h
+cat wp_conv_store_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_conv_store_large_pixmap.h.h
 cat wp_cover_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_cover_large_pixmap.h.h
 cat wp_covey_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_covey_large_pixmap.h.h
-mv tempwp_cover_large_pixmap.h.h wp_cover_large_pixmap.h
 cat wp_crossing_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_crossing_large_pixmap.h.h
-mv tempwp_covey_large_pixmap.h.h wp_covey_large_pixmap.h
+mv tempwp_conv_store_large_pixmap.h.h wp_conv_store_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_dam_large.png .png`_pixbuf" --struct --extern wp_dam_large.png > wp_dam_large_pixmap.h
+mv tempwp_covey_large_pixmap.h.h wp_covey_large_pixmap.h
+mv tempwp_cover_large_pixmap.h.h wp_cover_large_pixmap.h
 mv tempwp_crossing_large_pixmap.h.h wp_crossing_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_danger_large.png .png`_pixbuf" --struct --extern wp_danger_large.png > wp_danger_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_deer_large.png .png`_pixbuf" --struct --extern wp_deer_large.png > wp_deer_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_dive1_large.png .png`_pixbuf" --struct --extern wp_dive1_large.png > wp_dive1_large_pixmap.h
 cat wp_dam_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dam_large_pixmap.h.h
 cat wp_danger_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_danger_large_pixmap.h.h
+cat wp_dive1_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dive1_large_pixmap.h.h
 cat wp_deer_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_deer_large_pixmap.h.h
 mv tempwp_dam_large_pixmap.h.h wp_dam_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_dive1_large.png .png`_pixbuf" --struct --extern wp_dive1_large.png > wp_dive1_large_pixmap.h
 mv tempwp_danger_large_pixmap.h.h wp_danger_large_pixmap.h
-mv tempwp_deer_large_pixmap.h.h wp_deer_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_dive2_large.png .png`_pixbuf" --struct --extern wp_dive2_large.png > wp_dive2_large_pixmap.h
+mv tempwp_deer_large_pixmap.h.h wp_deer_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_dollar_large.png .png`_pixbuf" --struct --extern wp_dollar_large.png > wp_dollar_large_pixmap.h
-cat wp_dive1_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dive1_large_pixmap.h.h
-cat wp_dive2_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dive2_large_pixmap.h.h
 mv tempwp_dive1_large_pixmap.h.h wp_dive1_large_pixmap.h
-cat wp_dollar_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dollar_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_drinking_wtr_large.png .png`_pixbuf" --struct --extern wp_drinking_wtr_large.png > wp_drinking_wtr_large_pixmap.h
-mv tempwp_dive2_large_pixmap.h.h wp_dive2_large_pixmap.h
-mv tempwp_dollar_large_pixmap.h.h wp_dollar_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_exit_large.png .png`_pixbuf" --struct --extern wp_exit_large.png > wp_exit_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_fastfood_large.png .png`_pixbuf" --struct --extern wp_fastfood_large.png > wp_fastfood_large_pixmap.h
+cat wp_dive2_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dive2_large_pixmap.h.h
+cat wp_dollar_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_dollar_large_pixmap.h.h
 cat wp_drinking_wtr_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_drinking_wtr_large_pixmap.h.h
 cat wp_exit_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_exit_large_pixmap.h.h
-mv tempwp_drinking_wtr_large_pixmap.h.h wp_drinking_wtr_large_pixmap.h
-cat wp_fastfood_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fastfood_large_pixmap.h.h
+mv tempwp_dive2_large_pixmap.h.h wp_dive2_large_pixmap.h
+mv tempwp_dollar_large_pixmap.h.h wp_dollar_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_fastfood_large.png .png`_pixbuf" --struct --extern wp_fastfood_large.png > wp_fastfood_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_fhs_facility_large.png .png`_pixbuf" --struct --extern wp_fhs_facility_large.png > wp_fhs_facility_large_pixmap.h
+mv tempwp_drinking_wtr_large_pixmap.h.h wp_drinking_wtr_large_pixmap.h
 mv tempwp_exit_large_pixmap.h.h wp_exit_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_fish_large.png .png`_pixbuf" --struct --extern wp_fish_large.png > wp_fish_large_pixmap.h
-mv tempwp_fastfood_large_pixmap.h.h wp_fastfood_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_fitness_large.png .png`_pixbuf" --struct --extern wp_fitness_large.png > wp_fitness_large_pixmap.h
+cat wp_fastfood_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fastfood_large_pixmap.h.h
 cat wp_fhs_facility_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fhs_facility_large_pixmap.h.h
 cat wp_fish_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fish_large_pixmap.h.h
-mv tempwp_fhs_facility_large_pixmap.h.h wp_fhs_facility_large_pixmap.h
+mv tempwp_fastfood_large_pixmap.h.h wp_fastfood_large_pixmap.h
 cat wp_fitness_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fitness_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_flag_blue_large.png .png`_pixbuf" --struct --extern wp_flag_blue_large.png > wp_flag_blue_large_pixmap.h
+mv tempwp_fhs_facility_large_pixmap.h.h wp_fhs_facility_large_pixmap.h
 mv tempwp_fish_large_pixmap.h.h wp_fish_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_flag_green_large.png .png`_pixbuf" --struct --extern wp_flag_green_large.png > wp_flag_green_large_pixmap.h
 mv tempwp_fitness_large_pixmap.h.h wp_fitness_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_flag_red_large.png .png`_pixbuf" --struct --extern wp_flag_red_large.png > wp_flag_red_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_food_source_large.png .png`_pixbuf" --struct --extern wp_food_source_large.png > wp_food_source_large_pixmap.h
 cat wp_flag_blue_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_flag_blue_large_pixmap.h.h
 cat wp_flag_green_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_flag_green_large_pixmap.h.h
-mv tempwp_flag_blue_large_pixmap.h.h wp_flag_blue_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_food_source_large.png .png`_pixbuf" --struct --extern wp_food_source_large.png > wp_food_source_large_pixmap.h
 cat wp_flag_red_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_flag_red_large_pixmap.h.h
+cat wp_food_source_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_food_source_large_pixmap.h.h
+mv tempwp_flag_blue_large_pixmap.h.h wp_flag_blue_large_pixmap.h
 mv tempwp_flag_green_large_pixmap.h.h wp_flag_green_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_forest_large.png .png`_pixbuf" --struct --extern wp_forest_large.png > wp_forest_large_pixmap.h
 mv tempwp_flag_red_large_pixmap.h.h wp_flag_red_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_fuel_large.png .png`_pixbuf" --struct --extern wp_fuel_large.png > wp_fuel_large_pixmap.h
-cat wp_food_source_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_food_source_large_pixmap.h.h
-cat wp_forest_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_forest_large_pixmap.h.h
 mv tempwp_food_source_large_pixmap.h.h wp_food_source_large_pixmap.h
-mv tempwp_forest_large_pixmap.h.h wp_forest_large_pixmap.h
-cat wp_fuel_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fuel_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_furbearer_large.png .png`_pixbuf" --struct --extern wp_furbearer_large.png > wp_furbearer_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_geocache_fnd_large.png .png`_pixbuf" --struct --extern wp_geocache_fnd_large.png > wp_geocache_fnd_large_pixmap.h
-mv tempwp_fuel_large_pixmap.h.h wp_fuel_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_geocache_large.png .png`_pixbuf" --struct --extern wp_geocache_large.png > wp_geocache_large_pixmap.h
+cat wp_forest_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_forest_large_pixmap.h.h
+cat wp_fuel_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_fuel_large_pixmap.h.h
 cat wp_furbearer_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_furbearer_large_pixmap.h.h
 cat wp_geocache_fnd_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_geocache_fnd_large_pixmap.h.h
+mv tempwp_fuel_large_pixmap.h.h wp_fuel_large_pixmap.h
+mv tempwp_forest_large_pixmap.h.h wp_forest_large_pixmap.h
 mv tempwp_furbearer_large_pixmap.h.h wp_furbearer_large_pixmap.h
-cat wp_geocache_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_geocache_large_pixmap.h.h
-mv tempwp_geocache_fnd_large_pixmap.h.h wp_geocache_fnd_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_geocache_large.png .png`_pixbuf" --struct --extern wp_geocache_large.png > wp_geocache_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_glider_large.png .png`_pixbuf" --struct --extern wp_glider_large.png > wp_glider_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_golf_large.png .png`_pixbuf" --struct --extern wp_golf_large.png > wp_golf_large_pixmap.h
-mv tempwp_geocache_large_pixmap.h.h wp_geocache_large_pixmap.h
+mv tempwp_geocache_fnd_large_pixmap.h.h wp_geocache_fnd_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_grnd_trans_large.png .png`_pixbuf" --struct --extern wp_grnd_trans_large.png > wp_grnd_trans_large_pixmap.h
+cat wp_geocache_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_geocache_large_pixmap.h.h
 cat wp_glider_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_glider_large_pixmap.h.h
 cat wp_golf_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_golf_large_pixmap.h.h
-mv tempwp_glider_large_pixmap.h.h wp_glider_large_pixmap.h
 cat wp_grnd_trans_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_grnd_trans_large_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_helipad_large.png .png`_pixbuf" --struct --extern wp_helipad_large.png > wp_helipad_large_pixmap.h
+mv tempwp_geocache_large_pixmap.h.h wp_geocache_large_pixmap.h
+mv tempwp_glider_large_pixmap.h.h wp_glider_large_pixmap.h
 mv tempwp_golf_large_pixmap.h.h wp_golf_large_pixmap.h
-mv tempwp_grnd_trans_large_pixmap.h.h wp_grnd_trans_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_helipad_large.png .png`_pixbuf" --struct --extern wp_helipad_large.png > wp_helipad_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_horn_large.png .png`_pixbuf" --struct --extern wp_horn_large.png > wp_horn_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_house_large.png .png`_pixbuf" --struct --extern wp_house_large.png > wp_house_large_pixmap.h
+mv tempwp_grnd_trans_large_pixmap.h.h wp_grnd_trans_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_ice_skating_large.png .png`_pixbuf" --struct --extern wp_ice_skating_large.png > wp_ice_skating_large_pixmap.h
 cat wp_helipad_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_helipad_large_pixmap.h.h
-mv tempwp_helipad_large_pixmap.h.h wp_helipad_large_pixmap.h
 cat wp_horn_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_horn_large_pixmap.h.h
 cat wp_house_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_house_large_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_ice_skating_large.png .png`_pixbuf" --struct --extern wp_ice_skating_large.png > wp_ice_skating_large_pixmap.h
-mv tempwp_house_large_pixmap.h.h wp_house_large_pixmap.h
-mv tempwp_horn_large_pixmap.h.h wp_horn_large_pixmap.h
+mv tempwp_helipad_large_pixmap.h.h wp_helipad_large_pixmap.h
+cat wp_ice_skating_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ice_skating_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_info_large.png .png`_pixbuf" --struct --extern wp_info_large.png > wp_info_large_pixmap.h
+mv tempwp_horn_large_pixmap.h.h wp_horn_large_pixmap.h
+mv tempwp_house_large_pixmap.h.h wp_house_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_knife_large.png .png`_pixbuf" --struct --extern wp_knife_large.png > wp_knife_large_pixmap.h
-cat wp_ice_skating_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ice_skating_large_pixmap.h.h
 mv tempwp_ice_skating_large_pixmap.h.h wp_ice_skating_large_pixmap.h
-cat wp_info_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_info_large_pixmap.h.h
-cat wp_knife_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_knife_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_light_large.png .png`_pixbuf" --struct --extern wp_light_large.png > wp_light_large_pixmap.h
-mv tempwp_info_large_pixmap.h.h wp_info_large_pixmap.h
-mv tempwp_knife_large_pixmap.h.h wp_knife_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_lodging_large.png .png`_pixbuf" --struct --extern wp_lodging_large.png > wp_lodging_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_lodge_large.png .png`_pixbuf" --struct --extern wp_lodge_large.png > wp_lodge_large_pixmap.h
+cat wp_info_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_info_large_pixmap.h.h
 cat wp_light_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_light_large_pixmap.h.h
-mv tempwp_light_large_pixmap.h.h wp_light_large_pixmap.h
+mv tempwp_info_large_pixmap.h.h wp_info_large_pixmap.h
+cat wp_knife_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_knife_large_pixmap.h.h
 cat wp_lodging_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_lodging_large_pixmap.h.h
-cat wp_lodge_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_lodge_large_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_lrg_cty_large.png .png`_pixbuf" --struct --extern wp_lrg_cty_large.png > wp_lrg_cty_large_pixmap.h
-mv tempwp_lodge_large_pixmap.h.h wp_lodge_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_lodge_large.png .png`_pixbuf" --struct --extern wp_lodge_large.png > wp_lodge_large_pixmap.h
+mv tempwp_light_large_pixmap.h.h wp_light_large_pixmap.h
+mv tempwp_knife_large_pixmap.h.h wp_knife_large_pixmap.h
 mv tempwp_lodging_large_pixmap.h.h wp_lodging_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_lrg_cty_large.png .png`_pixbuf" --struct --extern wp_lrg_cty_large.png > wp_lrg_cty_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_med_cty_large.png .png`_pixbuf" --struct --extern wp_med_cty_large.png > wp_med_cty_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_mine_large.png .png`_pixbuf" --struct --extern wp_mine_large.png > wp_mine_large_pixmap.h
+cat wp_lodge_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_lodge_large_pixmap.h.h
 cat wp_lrg_cty_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_lrg_cty_large_pixmap.h.h
-mv tempwp_lrg_cty_large_pixmap.h.h wp_lrg_cty_large_pixmap.h
 cat wp_med_cty_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_med_cty_large_pixmap.h.h
+mv tempwp_lodge_large_pixmap.h.h wp_lodge_large_pixmap.h
 cat wp_mine_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_mine_large_pixmap.h.h
+mv tempwp_lrg_cty_large_pixmap.h.h wp_lrg_cty_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_mob_large.png .png`_pixbuf" --struct --extern wp_mob_large.png > wp_mob_large_pixmap.h
 mv tempwp_med_cty_large_pixmap.h.h wp_med_cty_large_pixmap.h
-mv tempwp_mine_large_pixmap.h.h wp_mine_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_movie_large.png .png`_pixbuf" --struct --extern wp_movie_large.png > wp_movie_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_mug_large.png .png`_pixbuf" --struct --extern wp_mug_large.png > wp_mug_large_pixmap.h
+mv tempwp_mine_large_pixmap.h.h wp_mine_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_museum_large.png .png`_pixbuf" --struct --extern wp_museum_large.png > wp_museum_large_pixmap.h
 cat wp_mob_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_mob_large_pixmap.h.h
 cat wp_movie_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_movie_large_pixmap.h.h
-mv tempwp_mob_large_pixmap.h.h wp_mob_large_pixmap.h
 cat wp_mug_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_mug_large_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_museum_large.png .png`_pixbuf" --struct --extern wp_museum_large.png > wp_museum_large_pixmap.h
+mv tempwp_mob_large_pixmap.h.h wp_mob_large_pixmap.h
+cat wp_museum_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_museum_large_pixmap.h.h
 mv tempwp_movie_large_pixmap.h.h wp_movie_large_pixmap.h
-mv tempwp_mug_large_pixmap.h.h wp_mug_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_oil_field_large.png .png`_pixbuf" --struct --extern wp_oil_field_large.png > wp_oil_field_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_parachute_large.png .png`_pixbuf" --struct --extern wp_parachute_large.png > wp_parachute_large_pixmap.h
-cat wp_museum_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_museum_large_pixmap.h.h
+mv tempwp_mug_large_pixmap.h.h wp_mug_large_pixmap.h
 mv tempwp_museum_large_pixmap.h.h wp_museum_large_pixmap.h
-cat wp_oil_field_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_oil_field_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_parking_large.png .png`_pixbuf" --struct --extern wp_parking_large.png > wp_parking_large_pixmap.h
-mv tempwp_oil_field_large_pixmap.h.h wp_oil_field_large_pixmap.h
-cat wp_parachute_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_parachute_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_park_large.png .png`_pixbuf" --struct --extern wp_park_large.png > wp_park_large_pixmap.h
-mv tempwp_parachute_large_pixmap.h.h wp_parachute_large_pixmap.h
+cat wp_oil_field_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_oil_field_large_pixmap.h.h
+cat wp_parachute_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_parachute_large_pixmap.h.h
 cat wp_parking_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_parking_large_pixmap.h.h
+cat wp_park_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_park_large_pixmap.h.h
+mv tempwp_oil_field_large_pixmap.h.h wp_oil_field_large_pixmap.h
+mv tempwp_parachute_large_pixmap.h.h wp_parachute_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_pharmacy_large.png .png`_pixbuf" --struct --extern wp_pharmacy_large.png > wp_pharmacy_large_pixmap.h
 mv tempwp_parking_large_pixmap.h.h wp_parking_large_pixmap.h
-cat wp_park_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_park_large_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_phone_large.png .png`_pixbuf" --struct --extern wp_phone_large.png > wp_phone_large_pixmap.h
-cat wp_pharmacy_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_pharmacy_large_pixmap.h.h
 mv tempwp_park_large_pixmap.h.h wp_park_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_phone_large.png .png`_pixbuf" --struct --extern wp_phone_large.png > wp_phone_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_picnic_large.png .png`_pixbuf" --struct --extern wp_picnic_large.png > wp_picnic_large_pixmap.h
-mv tempwp_pharmacy_large_pixmap.h.h wp_pharmacy_large_pixmap.h
-cat wp_phone_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_phone_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_pin_blue_large.png .png`_pixbuf" --struct --extern wp_pin_blue_large.png > wp_pin_blue_large_pixmap.h
-mv tempwp_phone_large_pixmap.h.h wp_phone_large_pixmap.h
+cat wp_pharmacy_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_pharmacy_large_pixmap.h.h
+cat wp_phone_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_phone_large_pixmap.h.h
 cat wp_picnic_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_picnic_large_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_pin_green_large.png .png`_pixbuf" --struct --extern wp_pin_green_large.png > wp_pin_green_large_pixmap.h
-mv tempwp_picnic_large_pixmap.h.h wp_picnic_large_pixmap.h
 cat wp_pin_blue_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_pin_blue_large_pixmap.h.h
+mv tempwp_pharmacy_large_pixmap.h.h wp_pharmacy_large_pixmap.h
+mv tempwp_phone_large_pixmap.h.h wp_phone_large_pixmap.h
+mv tempwp_picnic_large_pixmap.h.h wp_picnic_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_pin_green_large.png .png`_pixbuf" --struct --extern wp_pin_green_large.png > wp_pin_green_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_pin_red_large.png .png`_pixbuf" --struct --extern wp_pin_red_large.png > wp_pin_red_large_pixmap.h
 mv tempwp_pin_blue_large_pixmap.h.h wp_pin_blue_large_pixmap.h
-cat wp_pin_green_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_pin_green_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_pizza_large.png .png`_pixbuf" --struct --extern wp_pizza_large.png > wp_pizza_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_police_large.png .png`_pixbuf" --struct --extern wp_police_large.png > wp_police_large_pixmap.h
+cat wp_pin_green_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_pin_green_large_pixmap.h.h
 cat wp_pin_red_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_pin_red_large_pixmap.h.h
+cat wp_pizza_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_pizza_large_pixmap.h.h
+cat wp_police_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_police_large_pixmap.h.h
+mv tempwp_pizza_large_pixmap.h.h wp_pizza_large_pixmap.h
 mv tempwp_pin_green_large_pixmap.h.h wp_pin_green_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_police_large.png .png`_pixbuf" --struct --extern wp_police_large.png > wp_police_large_pixmap.h
 mv tempwp_pin_red_large_pixmap.h.h wp_pin_red_large_pixmap.h
-cat wp_pizza_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_pizza_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_post_ofc_large.png .png`_pixbuf" --struct --extern wp_post_ofc_large.png > wp_post_ofc_large_pixmap.h
-mv tempwp_pizza_large_pixmap.h.h wp_pizza_large_pixmap.h
-cat wp_police_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_police_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_rbcn_large.png .png`_pixbuf" --struct --extern wp_rbcn_large.png > wp_rbcn_large_pixmap.h
-cat wp_post_ofc_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_post_ofc_large_pixmap.h.h
 mv tempwp_police_large_pixmap.h.h wp_police_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_restricted_large.png .png`_pixbuf" --struct --extern wp_restricted_large.png > wp_restricted_large_pixmap.h
-mv tempwp_post_ofc_large_pixmap.h.h wp_post_ofc_large_pixmap.h
-cat wp_rbcn_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_rbcn_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_restroom_large.png .png`_pixbuf" --struct --extern wp_restroom_large.png > wp_restroom_large_pixmap.h
+cat wp_rbcn_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_rbcn_large_pixmap.h.h
+cat wp_post_ofc_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_post_ofc_large_pixmap.h.h
+cat wp_restroom_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_restroom_large_pixmap.h.h
 mv tempwp_rbcn_large_pixmap.h.h wp_rbcn_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_rv_park_large.png .png`_pixbuf" --struct --extern wp_rv_park_large.png > wp_rv_park_large_pixmap.h
 cat wp_restricted_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_restricted_large_pixmap.h.h
-cat wp_restroom_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_restroom_large_pixmap.h.h
-mv tempwp_restricted_large_pixmap.h.h wp_restricted_large_pixmap.h
-cat wp_rv_park_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_rv_park_large_pixmap.h.h
+mv tempwp_post_ofc_large_pixmap.h.h wp_post_ofc_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_rv_park_large.png .png`_pixbuf" --struct --extern wp_rv_park_large.png > wp_rv_park_large_pixmap.h
 mv tempwp_restroom_large_pixmap.h.h wp_restroom_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_scenic_large.png .png`_pixbuf" --struct --extern wp_scenic_large.png > wp_scenic_large_pixmap.h
+mv tempwp_restricted_large_pixmap.h.h wp_restricted_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_school_large.png .png`_pixbuf" --struct --extern wp_school_large.png > wp_school_large_pixmap.h
-mv tempwp_rv_park_large_pixmap.h.h wp_rv_park_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_shopping_large.png .png`_pixbuf" --struct --extern wp_shopping_large.png > wp_shopping_large_pixmap.h
+cat wp_rv_park_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_rv_park_large_pixmap.h.h
 cat wp_scenic_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_scenic_large_pixmap.h.h
 cat wp_school_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_school_large_pixmap.h.h
+cat wp_shopping_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_shopping_large_pixmap.h.h
+mv tempwp_rv_park_large_pixmap.h.h wp_rv_park_large_pixmap.h
 mv tempwp_scenic_large_pixmap.h.h wp_scenic_large_pixmap.h
 mv tempwp_school_large_pixmap.h.h wp_school_large_pixmap.h
-cat wp_shopping_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_shopping_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_short_tower_large.png .png`_pixbuf" --struct --extern wp_short_tower_large.png > wp_short_tower_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_shower_large.png .png`_pixbuf" --struct --extern wp_shower_large.png > wp_shower_large_pixmap.h
 mv tempwp_shopping_large_pixmap.h.h wp_shopping_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_shower_large.png .png`_pixbuf" --struct --extern wp_shower_large.png > wp_shower_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_skiing_large.png .png`_pixbuf" --struct --extern wp_skiing_large.png > wp_skiing_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_ski_resort_large.png .png`_pixbuf" --struct --extern wp_ski_resort_large.png > wp_ski_resort_large_pixmap.h
 cat wp_short_tower_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_short_tower_large_pixmap.h.h
 cat wp_shower_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_shower_large_pixmap.h.h
+cat wp_skiing_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_skiing_large_pixmap.h.h
+cat wp_ski_resort_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ski_resort_large_pixmap.h.h
 mv tempwp_short_tower_large_pixmap.h.h wp_short_tower_large_pixmap.h
 mv tempwp_shower_large_pixmap.h.h wp_shower_large_pixmap.h
-cat wp_skiing_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_skiing_large_pixmap.h.h
-gdk-pixbuf-csource --name="`basename wp_ski_resort_large.png .png`_pixbuf" --struct --extern wp_ski_resort_large.png > wp_ski_resort_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_skull_large.png .png`_pixbuf" --struct --extern wp_skull_large.png > wp_skull_large_pixmap.h
 mv tempwp_skiing_large_pixmap.h.h wp_skiing_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_small_game_large.png .png`_pixbuf" --struct --extern wp_small_game_large.png > wp_small_game_large_pixmap.h
-cat wp_ski_resort_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ski_resort_large_pixmap.h.h
-cat wp_skull_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_skull_large_pixmap.h.h
-mv tempwp_skull_large_pixmap.h.h wp_skull_large_pixmap.h
 mv tempwp_ski_resort_large_pixmap.h.h wp_ski_resort_large_pixmap.h
-cat wp_small_game_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_small_game_large_pixmap.h.h
+gdk-pixbuf-csource --name="`basename wp_small_game_large.png .png`_pixbuf" --struct --extern wp_small_game_large.png > wp_small_game_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_sml_cty_large.png .png`_pixbuf" --struct --extern wp_sml_cty_large.png > wp_sml_cty_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_stadium_large.png .png`_pixbuf" --struct --extern wp_stadium_large.png > wp_stadium_large_pixmap.h
-mv tempwp_small_game_large_pixmap.h.h wp_small_game_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_store_large.png .png`_pixbuf" --struct --extern wp_store_large.png > wp_store_large_pixmap.h
+cat wp_skull_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_skull_large_pixmap.h.h
+cat wp_small_game_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_small_game_large_pixmap.h.h
 cat wp_sml_cty_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_sml_cty_large_pixmap.h.h
 cat wp_stadium_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_stadium_large_pixmap.h.h
+mv tempwp_skull_large_pixmap.h.h wp_skull_large_pixmap.h
+mv tempwp_small_game_large_pixmap.h.h wp_small_game_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_store_large.png .png`_pixbuf" --struct --extern wp_store_large.png > wp_store_large_pixmap.h
 mv tempwp_sml_cty_large_pixmap.h.h wp_sml_cty_large_pixmap.h
 mv tempwp_stadium_large_pixmap.h.h wp_stadium_large_pixmap.h
-cat wp_store_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_store_large_pixmap.h.h
 gdk-pixbuf-csource --name="`basename wp_summit_large.png .png`_pixbuf" --struct --extern wp_summit_large.png > wp_summit_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_swimming_large.png .png`_pixbuf" --struct --extern wp_swimming_large.png > wp_swimming_large_pixmap.h
-mv tempwp_store_large_pixmap.h.h wp_store_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_tall_tower_large.png .png`_pixbuf" --struct --extern wp_tall_tower_large.png > wp_tall_tower_large_pixmap.h
+cat wp_store_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_store_large_pixmap.h.h
 cat wp_summit_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_summit_large_pixmap.h.h
 cat wp_swimming_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_swimming_large_pixmap.h.h
-mv tempwp_swimming_large_pixmap.h.h wp_swimming_large_pixmap.h
-mv tempwp_summit_large_pixmap.h.h wp_summit_large_pixmap.h
 cat wp_tall_tower_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_tall_tower_large_pixmap.h.h
+mv tempwp_store_large_pixmap.h.h wp_store_large_pixmap.h
+mv tempwp_swimming_large_pixmap.h.h wp_swimming_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_theater_large.png .png`_pixbuf" --struct --extern wp_theater_large.png > wp_theater_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_toll_booth_large.png .png`_pixbuf" --struct --extern wp_toll_booth_large.png > wp_toll_booth_large_pixmap.h
+mv tempwp_summit_large_pixmap.h.h wp_summit_large_pixmap.h
 mv tempwp_tall_tower_large_pixmap.h.h wp_tall_tower_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_toll_booth_large.png .png`_pixbuf" --struct --extern wp_toll_booth_large.png > wp_toll_booth_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_trail_head_large.png .png`_pixbuf" --struct --extern wp_trail_head_large.png > wp_trail_head_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_tree_stand_large.png .png`_pixbuf" --struct --extern wp_tree_stand_large.png > wp_tree_stand_large_pixmap.h
 cat wp_theater_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_theater_large_pixmap.h.h
 cat wp_toll_booth_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_toll_booth_large_pixmap.h.h
-mv tempwp_theater_large_pixmap.h.h wp_theater_large_pixmap.h
 cat wp_trail_head_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_trail_head_large_pixmap.h.h
-mv tempwp_toll_booth_large_pixmap.h.h wp_toll_booth_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_tree_stand_large.png .png`_pixbuf" --struct --extern wp_tree_stand_large.png > wp_tree_stand_large_pixmap.h
+mv tempwp_theater_large_pixmap.h.h wp_theater_large_pixmap.h
+cat wp_tree_stand_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_tree_stand_large_pixmap.h.h
 mv tempwp_trail_head_large_pixmap.h.h wp_trail_head_large_pixmap.h
+mv tempwp_toll_booth_large_pixmap.h.h wp_toll_booth_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_treed_quarry_large.png .png`_pixbuf" --struct --extern wp_treed_quarry_large.png > wp_treed_quarry_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_truck_large.png .png`_pixbuf" --struct --extern wp_truck_large.png > wp_truck_large_pixmap.h
-cat wp_tree_stand_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_tree_stand_large_pixmap.h.h
-cat wp_treed_quarry_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_treed_quarry_large_pixmap.h.h
-cat wp_truck_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_truck_large_pixmap.h.h
-mv tempwp_tree_stand_large_pixmap.h.h wp_tree_stand_large_pixmap.h
-mv tempwp_treed_quarry_large_pixmap.h.h wp_treed_quarry_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_truck_stop_large.png .png`_pixbuf" --struct --extern wp_truck_stop_large.png > wp_truck_stop_large_pixmap.h
-mv tempwp_truck_large_pixmap.h.h wp_truck_large_pixmap.h
+mv tempwp_tree_stand_large_pixmap.h.h wp_tree_stand_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_tunnel_large.png .png`_pixbuf" --struct --extern wp_tunnel_large.png > wp_tunnel_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_upland_game_large.png .png`_pixbuf" --struct --extern wp_upland_game_large.png > wp_upland_game_large_pixmap.h
+cat wp_treed_quarry_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_treed_quarry_large_pixmap.h.h
+cat wp_truck_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_truck_large_pixmap.h.h
 cat wp_truck_stop_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_truck_stop_large_pixmap.h.h
 cat wp_tunnel_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_tunnel_large_pixmap.h.h
-cat wp_upland_game_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_upland_game_large_pixmap.h.h
+mv tempwp_treed_quarry_large_pixmap.h.h wp_treed_quarry_large_pixmap.h
+mv tempwp_truck_large_pixmap.h.h wp_truck_large_pixmap.h
 mv tempwp_truck_stop_large_pixmap.h.h wp_truck_stop_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_upland_game_large.png .png`_pixbuf" --struct --extern wp_upland_game_large.png > wp_upland_game_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_ultralight_large.png .png`_pixbuf" --struct --extern wp_ultralight_large.png > wp_ultralight_large_pixmap.h
-mv tempwp_tunnel_large_pixmap.h.h wp_tunnel_large_pixmap.h
-mv tempwp_upland_game_large_pixmap.h.h wp_upland_game_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_water_source_large.png .png`_pixbuf" --struct --extern wp_water_source_large.png > wp_water_source_large_pixmap.h
+mv tempwp_tunnel_large_pixmap.h.h wp_tunnel_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_waterfowl_large.png .png`_pixbuf" --struct --extern wp_waterfowl_large.png > wp_waterfowl_large_pixmap.h
+cat wp_upland_game_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_upland_game_large_pixmap.h.h
 cat wp_ultralight_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_ultralight_large_pixmap.h.h
 cat wp_water_source_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_water_source_large_pixmap.h.h
 cat wp_waterfowl_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_waterfowl_large_pixmap.h.h
+mv tempwp_upland_game_large_pixmap.h.h wp_upland_game_large_pixmap.h
 mv tempwp_ultralight_large_pixmap.h.h wp_ultralight_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_wbuoy_large.png .png`_pixbuf" --struct --extern wp_wbuoy_large.png > wp_wbuoy_large_pixmap.h
-mv tempwp_waterfowl_large_pixmap.h.h wp_waterfowl_large_pixmap.h
 mv tempwp_water_source_large_pixmap.h.h wp_water_source_large_pixmap.h
+mv tempwp_waterfowl_large_pixmap.h.h wp_waterfowl_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_wbuoy_large.png .png`_pixbuf" --struct --extern wp_wbuoy_large.png > wp_wbuoy_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_weigh_station_large.png .png`_pixbuf" --struct --extern wp_weigh_station_large.png > wp_weigh_station_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_wrecker_large.png .png`_pixbuf" --struct --extern wp_wrecker_large.png > wp_wrecker_large_pixmap.h
+gdk-pixbuf-csource --name="`basename wp_wreck_large.png .png`_pixbuf" --struct --extern wp_wreck_large.png > wp_wreck_large_pixmap.h
 cat wp_wbuoy_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_wbuoy_large_pixmap.h.h
 cat wp_weigh_station_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_weigh_station_large_pixmap.h.h
 cat wp_wrecker_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_wrecker_large_pixmap.h.h
+cat wp_wreck_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_wreck_large_pixmap.h.h
 mv tempwp_wbuoy_large_pixmap.h.h wp_wbuoy_large_pixmap.h
-gdk-pixbuf-csource --name="`basename wp_wreck_large.png .png`_pixbuf" --struct --extern wp_wreck_large.png > wp_wreck_large_pixmap.h
 mv tempwp_weigh_station_large_pixmap.h.h wp_weigh_station_large_pixmap.h
-mv tempwp_wrecker_large_pixmap.h.h wp_wrecker_large_pixmap.h
 gdk-pixbuf-csource --name="`basename wp_zoo_large.png .png`_pixbuf" --struct --extern wp_zoo_large.png > wp_zoo_large_pixmap.h
-gdk-pixbuf-csource --name="`basename cursor_addtr.png .png`_pixbuf" --struct --extern cursor_addtr.png > cursor_addtr_pixmap.h
-cat wp_wreck_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_wreck_large_pixmap.h.h
-cat wp_zoo_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_zoo_large_pixmap.h.h
-cat cursor_addtr_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_addtr_pixmap.h.h
 mv tempwp_wreck_large_pixmap.h.h wp_wreck_large_pixmap.h
+mv tempwp_wrecker_large_pixmap.h.h wp_wrecker_large_pixmap.h
+gdk-pixbuf-csource --name="`basename cursor_addtr.png .png`_pixbuf" --struct --extern cursor_addtr.png > cursor_addtr_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_new_route.png .png`_pixbuf" --struct --extern cursor_new_route.png > cursor_new_route_pixmap.h
-mv tempwp_zoo_large_pixmap.h.h wp_zoo_large_pixmap.h
-mv tempcursor_addtr_pixmap.h.h cursor_addtr_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_edtr.png .png`_pixbuf" --struct --extern cursor_edtr.png > cursor_edtr_pixmap.h
-gdk-pixbuf-csource --name="`basename cursor_geozoom.png .png`_pixbuf" --struct --extern cursor_geozoom.png > cursor_geozoom_pixmap.h
+cat wp_zoo_large_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempwp_zoo_large_pixmap.h.h
+cat cursor_addtr_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_addtr_pixmap.h.h
 cat cursor_new_route_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_new_route_pixmap.h.h
 cat cursor_edtr_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_edtr_pixmap.h.h
-cat cursor_geozoom_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_geozoom_pixmap.h.h
+mv tempwp_zoo_large_pixmap.h.h wp_zoo_large_pixmap.h
+gdk-pixbuf-csource --name="`basename cursor_geozoom.png .png`_pixbuf" --struct --extern cursor_geozoom.png > cursor_geozoom_pixmap.h
+mv tempcursor_addtr_pixmap.h.h cursor_addtr_pixmap.h
 mv tempcursor_new_route_pixmap.h.h cursor_new_route_pixmap.h
-gdk-pixbuf-csource --name="`basename cursor_ruler.png .png`_pixbuf" --struct --extern cursor_ruler.png > cursor_ruler_pixmap.h
 mv tempcursor_edtr_pixmap.h.h cursor_edtr_pixmap.h
-mv tempcursor_geozoom_pixmap.h.h cursor_geozoom_pixmap.h
+gdk-pixbuf-csource --name="`basename cursor_ruler.png .png`_pixbuf" --struct --extern cursor_ruler.png > cursor_ruler_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_addwp.png .png`_pixbuf" --struct --extern cursor_addwp.png > cursor_addwp_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_edwp.png .png`_pixbuf" --struct --extern cursor_edwp.png > cursor_edwp_pixmap.h
+cat cursor_geozoom_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_geozoom_pixmap.h.h
 cat cursor_ruler_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_ruler_pixmap.h.h
 cat cursor_addwp_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_addwp_pixmap.h.h
 cat cursor_edwp_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_edwp_pixmap.h.h
+mv tempcursor_geozoom_pixmap.h.h cursor_geozoom_pixmap.h
 mv tempcursor_ruler_pixmap.h.h cursor_ruler_pixmap.h
-mv tempcursor_addwp_pixmap.h.h cursor_addwp_pixmap.h
-mv tempcursor_edwp_pixmap.h.h cursor_edwp_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_route_finder.png .png`_pixbuf" --struct --extern cursor_route_finder.png > cursor_route_finder_pixmap.h
+mv tempcursor_addwp_pixmap.h.h cursor_addwp_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_splitter.png .png`_pixbuf" --struct --extern cursor_splitter.png > cursor_splitter_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_showpic.png .png`_pixbuf" --struct --extern cursor_showpic.png > cursor_showpic_pixmap.h
+mv tempcursor_edwp_pixmap.h.h cursor_edwp_pixmap.h
+gdk-pixbuf-csource --name="`basename cursor_demdl.png .png`_pixbuf" --struct --extern cursor_demdl.png > cursor_demdl_pixmap.h
 cat cursor_route_finder_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_route_finder_pixmap.h.h
 cat cursor_splitter_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_splitter_pixmap.h.h
 cat cursor_showpic_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_showpic_pixmap.h.h
+cat cursor_demdl_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_demdl_pixmap.h.h
 mv tempcursor_route_finder_pixmap.h.h cursor_route_finder_pixmap.h
 mv tempcursor_splitter_pixmap.h.h cursor_splitter_pixmap.h
 mv tempcursor_showpic_pixmap.h.h cursor_showpic_pixmap.h
-gdk-pixbuf-csource --name="`basename cursor_demdl.png .png`_pixbuf" --struct --extern cursor_demdl.png > cursor_demdl_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_geomove.png .png`_pixbuf" --struct --extern cursor_geomove.png > cursor_geomove_pixmap.h
 gdk-pixbuf-csource --name="`basename cursor_mapdl.png .png`_pixbuf" --struct --extern cursor_mapdl.png > cursor_mapdl_pixmap.h
-cat cursor_demdl_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_demdl_pixmap.h.h
+mv tempcursor_demdl_pixmap.h.h cursor_demdl_pixmap.h
+gdk-pixbuf-csource --name="`basename cursor_zoom.png .png`_pixbuf" --struct --extern cursor_zoom.png > cursor_zoom_pixmap.h
 cat cursor_geomove_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_geomove_pixmap.h.h
 cat cursor_mapdl_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_mapdl_pixmap.h.h
-mv tempcursor_demdl_pixmap.h.h cursor_demdl_pixmap.h
+cat cursor_zoom_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_zoom_pixmap.h.h
 mv tempcursor_geomove_pixmap.h.h cursor_geomove_pixmap.h
 mv tempcursor_mapdl_pixmap.h.h cursor_mapdl_pixmap.h
-gdk-pixbuf-csource --name="`basename cursor_zoom.png .png`_pixbuf" --struct --extern cursor_zoom.png > cursor_zoom_pixmap.h
-cat cursor_zoom_pixmap.h | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > tempcursor_zoom_pixmap.h.h
 mv tempcursor_zoom_pixmap.h.h cursor_zoom_pixmap.h
 echo "/* Generated file */" > icons.c
 echo "/* Generated file */" > icons.h
@@ -3665,6 +3699,12 @@
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o main.o main.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o modules.o modules.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o curl_download.o curl_download.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o compression.o compression.c
+compression.c: In function 'unzip_file':
+compression.c:102:2: warning: 'gcc_struct' attribute directive ignored [-Wattributes]
+  }  __attribute__ ((gcc_struct,__packed__)) *local_file_header = NULL;
+  ^
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o degrees_converters.o degrees_converters.c
 main.c: In function 'main':
 main.c:230:3: warning: 'gdk_pixbuf_from_pixdata' is deprecated [-Wdeprecated-declarations]
    main_icon = gdk_pixbuf_from_pixdata(&viking_pixbuf, FALSE, NULL);
@@ -3674,17 +3714,12 @@
 /usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h:119:12: note: declared here
  GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
             ^~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o compression.o compression.c
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o degrees_converters.o degrees_converters.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o globals.o globals.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viktrwlayer.o viktrwlayer.c
-compression.c: In function 'unzip_file':
-compression.c:102:2: warning: 'gcc_struct' attribute directive ignored [-Wattributes]
-  }  __attribute__ ((gcc_struct,__packed__)) *local_file_header = NULL;
-  ^
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vik_compat.o vik_compat.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viktrack.o viktrack.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwaypoint.o vikwaypoint.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o clipboard.o clipboard.c
 viktrwlayer.c: In function 'trw_update_layer_icon':
 viktrwlayer.c:11831:3: warning: 'gdk_pixbuf_from_pixdata' is deprecated [-Wdeprecated-declarations]
    GdkPixbuf *buf = gdk_pixbuf_from_pixdata ( data, FALSE, NULL );
@@ -3694,7 +3729,6 @@
 /usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h:119:12: note: declared here
  GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
             ^~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o clipboard.o clipboard.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o coords.o coords.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o gpsmapper.o gpsmapper.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o gpspoint.o gpspoint.c
@@ -3711,6 +3745,7 @@
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikenumtypes.o vikenumtypes.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viktreeview.o viktreeview.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viklayer.o viklayer.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viklayerspanel.o viklayerspanel.c
 viklayer.c: In function 'vik_layer_load_icon':
 viklayer.c:536:5: warning: 'gdk_pixbuf_from_pixdata' is deprecated [-Wdeprecated-declarations]
      return gdk_pixbuf_from_pixdata ( vik_layer_interfaces[type]->icon, FALSE, NULL );
@@ -3720,7 +3755,6 @@
 /usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h:119:12: note: declared here
  GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
             ^~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viklayerspanel.o viklayerspanel.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikcoordlayer.o vikcoordlayer.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikstatus.o vikstatus.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwindow.o vikwindow.c
@@ -3745,8 +3779,8 @@
  GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
             ^~~~~~~~~~~~~~~~~~~~~~~
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikgobjectbuilder.o vikgobjectbuilder.c
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikgpslayer.o vikgpslayer.c
 vikgobjectbuilder.c: In function '_end_element':
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikgpslayer.o vikgpslayer.c
 vikgobjectbuilder.c:141:3: warning: 'g_object_newv' is deprecated: Use 'g_object_new_with_properties' instead [-Wdeprecated-declarations]
    object = g_object_newv(gtype, nb_parameters, parameters);
    ^~~~~~
@@ -3766,6 +3800,7 @@
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikfileentry.o vikfileentry.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikgototool.o vikgototool.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikgotoxmltool.o vikgotoxmltool.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikgoto.o vikgoto.c
 vikgototool.c: In function 'vik_goto_tool_class_init':
 vikgototool.c:153:3: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
    g_type_class_add_private (klass, sizeof (VikGotoToolPrivate));
@@ -3779,7 +3814,6 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikgoto.o vikgoto.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viktrwlayer_export.o viktrwlayer_export.c
 vikgotoxmltool.c: In function 'vik_goto_xml_tool_class_init':
 vikgotoxmltool.c:313:3: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
@@ -3808,6 +3842,7 @@
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikrouting.o vikrouting.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikroutingengine.o vikroutingengine.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikroutingwebengine.o vikroutingwebengine.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikutils.o vikutils.c
 vikroutingengine.c: In function 'vik_routing_engine_class_init':
 vikroutingengine.c:172:3: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
    g_type_class_add_private (klass, sizeof (VikRoutingPrivate));
@@ -3828,7 +3863,7 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikutils.o vikutils.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o toolbar.o toolbar.c
 vikroutingwebengine.c: In function 'vik_routing_web_engine_class_init':
 vikroutingwebengine.c:345:3: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
    g_type_class_add_private (klass, sizeof (VikRoutingWebEnginePrivate));
@@ -3849,8 +3884,8 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o toolbar.o toolbar.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o thumbnails.o thumbnails.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o md5_hash.o md5_hash.c
 thumbnails.c: In function 'a_thumbnails_get_default':
 thumbnails.c:93:3: warning: 'gdk_pixbuf_from_pixdata' is deprecated [-Wdeprecated-declarations]
    return gdk_pixbuf_from_pixdata ( &thumbnails_pixbuf, FALSE, NULL );
@@ -3860,7 +3895,6 @@
 /usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h:119:12: note: declared here
  GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
             ^~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o md5_hash.o md5_hash.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o background.o background.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikradiogroup.o vikradiogroup.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikcoord.o vikcoord.c
@@ -3883,6 +3917,8 @@
           ^~~~~~~~~~~~~~~~~~~~~~~~
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikmapslayer_compat.o vikmapslayer_compat.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikmaptype.o vikmaptype.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikslippymapsource.o vikslippymapsource.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwmscmapsource.o vikwmscmapsource.c
 vikmaptype.c: In function 'vik_map_type_class_init':
 vikmaptype.c:108:2: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
   g_type_class_add_private (klass, sizeof (VikMapTypePrivate));
@@ -3895,8 +3931,6 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikslippymapsource.o vikslippymapsource.c
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwmscmapsource.o vikwmscmapsource.c
 vikslippymapsource.c: In function 'vik_slippy_map_source_class_init':
 vikslippymapsource.c:486:2: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
   g_type_class_add_private (klass, sizeof (VikSlippyMapSourcePrivate));
@@ -3910,6 +3944,7 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viktmsmapsource.o viktmsmapsource.c
 vikwmscmapsource.c: In function 'vik_wmsc_map_source_class_init':
 vikwmscmapsource.c:383:2: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
   g_type_class_add_private (klass, sizeof (VikWmscMapSourcePrivate));
@@ -3923,7 +3958,6 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viktmsmapsource.o viktmsmapsource.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o metatile.o metatile.c
 metatile.c: In function 'metatile_read':
 metatile.c:133:51: warning: '%s' directive output may be truncated writing up to 4095 bytes into a region of size 4085 [-Wformat-truncation=]
@@ -3997,6 +4031,7 @@
         __bos (__s), __fmt, __va_arg_pack ());
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o gpx.o gpx.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o garminsymbols.o garminsymbols.c
 viktmsmapsource.c: In function 'vik_tms_map_source_class_init':
 viktmsmapsource.c:390:2: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
   g_type_class_add_private (klass, sizeof (VikTmsMapSourcePrivate));
@@ -4010,7 +4045,6 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o garminsymbols.o garminsymbols.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o acquire.o acquire.c
 garminsymbols.c: In function 'get_wp_sym_from_index':
 garminsymbols.c:395:2: warning: 'gdk_pixbuf_from_pixdata' is deprecated [-Wdeprecated-declarations]
@@ -4078,6 +4112,7 @@
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwebtool.o vikwebtool.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwebtoolcenter.o vikwebtoolcenter.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwebtoolbounds.o vikwebtoolbounds.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwebtoolformat.o vikwebtoolformat.c
 vikwebtoolcenter.c: In function 'vik_webtool_center_class_init':
 vikwebtoolcenter.c:141:3: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
    g_type_class_add_private (klass, sizeof (VikWebtoolCenterPrivate));
@@ -4092,8 +4127,8 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwebtoolformat.o vikwebtoolformat.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikexttool_datasources.o vikexttool_datasources.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwebtool_datasource.o vikwebtool_datasource.c
 vikwebtoolbounds.c: In function 'vik_webtool_bounds_class_init':
 vikwebtoolbounds.c:136:3: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
    g_type_class_add_private (klass, sizeof (VikWebtoolBoundsPrivate));
@@ -4108,7 +4143,6 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikwebtool_datasource.o vikwebtool_datasource.c
 vikwebtoolformat.c: In function 'vik_webtool_format_class_init':
 vikwebtoolformat.c:158:2: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
   g_type_class_add_private (klass, sizeof (VikWebtoolFormatPrivate));
@@ -4124,6 +4158,8 @@
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o dems.o dems.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o srtm_continent.o srtm_continent.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o uibuilder.o uibuilder.c
 vikwebtool_datasource.c: In function 'vik_webtool_datasource_class_init':
 vikwebtool_datasource.c:367:2: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
   g_type_class_add_private (klass, sizeof (VikWebtoolDatasourcePrivate));
@@ -4138,8 +4174,6 @@
 /usr/include/glib-2.0/gobject/gtype.h:1303:10: note: declared here
  void     g_type_class_add_private       (gpointer                    g_class,
           ^~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o srtm_continent.o srtm_continent.c
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o uibuilder.o uibuilder.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o print-preview.o print-preview.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o print.o print.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o kmz.o kmz.c
@@ -4148,6 +4182,7 @@
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o preferences.o preferences.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bingmapsource.o bingmapsource.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o bing.o bing.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o google.o google.c
 bingmapsource.c: In function 'bing_map_source_class_init':
 bingmapsource.c:232:2: warning: 'g_type_class_add_private' is deprecated [-Wdeprecated-declarations]
   g_type_class_add_private (klass, sizeof (BingMapSourcePrivate));
@@ -4168,7 +4203,6 @@
 /usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h:119:12: note: declared here
  GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
             ^~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o google.o google.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o osm.o osm.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o osm-traces.o osm-traces.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o datasource_osm_my_traces.o datasource_osm_my_traces.c
@@ -4181,15 +4215,7 @@
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o viktrwlayer_geotag.o viktrwlayer_geotag.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o vikmapniklayer.o vikmapniklayer.c
 g++ -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2  -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -std=c++11 -c -o mapnik_interface.o mapnik_interface.cpp
-vikmapniklayer.c: In function 'render':
-vikmapniklayer.c:675:3: warning: 'gdk_pixbuf_from_pixdata' is deprecated [-Wdeprecated-declarations]
-   pixbuf = gdk_pixbuf_scale_simple ( gdk_pixbuf_from_pixdata(&vikmapniklayer_pixbuf, FALSE, NULL), vml->tile_size_x, vml->tile_size_x, GDK_INTERP_BILINEAR );
-   ^~~~~~
-In file included from viking.h:26,
-                 from vikmapniklayer.c:26:
-/usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h:119:12: note: declared here
- GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
-            ^~~~~~~~~~~~~~~~~~~~~~~
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o libgeoclue.o libgeoclue.c
 viktrwlayer_geotag.c: In function 'trw_layer_geotag_dialog':
 viktrwlayer_geotag.c:671:34: warning: '%02d' directive output may be truncated writing between 2 and 10 bytes into a region of size between 0 and 4 [-Wformat-truncation=]
   snprintf (tmp_string, 7, "%+02d:%02d", default_values.TimeZoneHours, abs (default_values.TimeZoneMins) );
@@ -4211,14 +4237,22 @@
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         __bos (__s), __fmt, __va_arg_pack ());
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o libgeoclue.o libgeoclue.c
+vikmapniklayer.c: In function 'render':
+vikmapniklayer.c:675:3: warning: 'gdk_pixbuf_from_pixdata' is deprecated [-Wdeprecated-declarations]
+   pixbuf = gdk_pixbuf_scale_simple ( gdk_pixbuf_from_pixdata(&vikmapniklayer_pixbuf, FALSE, NULL), vml->tile_size_x, vml->tile_size_x, GDK_INTERP_BILINEAR );
+   ^~~~~~
+In file included from viking.h:26,
+                 from vikmapniklayer.c:26:
+/usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h:119:12: note: declared here
+ GdkPixbuf* gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata,
+            ^~~~~~~~~~~~~~~~~~~~~~~
 LC_ALL=C /usr/bin/intltool-merge  -d -u -c ../po/.intltool-merge-cache ../po viking.desktop.in viking.desktop
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o misc/fpconv.o misc/fpconv.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o misc/strtod.o misc/strtod.c
 gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o misc/kdtree.o misc/kdtree.c
+gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o misc/gtkhtml.o misc/gtkhtml.c
 Generating and caching the translation database
 Merging translations into viking.desktop.
-gcc -DHAVE_CONFIG_H -I.  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DVIKING_DATADIR=\""/usr/share/viking"\" -DVIKING_SYSCONFDIR=\""/etc/viking"\" -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -D_GNU_SOURCE -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabihf/gtk-2.0/include -I/usr/include/gio-unix-2.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/libgeoclue-2.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -g -O2 -ffile-prefix-map=/build/viking-1.7=. -fstack-protector-strong -Wformat -Werror=format-security -c -o misc/gtkhtml.o misc/gtkhtml.c
 rm -f libviking.a
 ar cru libviking.a modules.o curl_download.o compression.o degrees_converters.o globals.o viktrwlayer.o vik_compat.o viktrack.o vikwaypoint.o clipboard.o coords.o gpsmapper.o gpspoint.o geojson.o dir.o file.o fileutils.o file_magic.o dialog.o util.o ui_util.o download.o jpg.o vikenumtypes.o viktreeview.o viklayer.o viklayerspanel.o vikcoordlayer.o vikstatus.o vikwindow.o vikviewport.o vikaggregatelayer.o vikgobjectbuilder.o vikgpslayer.o vikgeoreflayer.o vikfileentry.o vikgototool.o vikgotoxmltool.o vikgoto.o viktrwlayer_export.o viktrwlayer_tpwin.o viktrwlayer_wpwin.o viktrwlayer_propwin.o viktrwlayer_analysis.o viktrwlayer_tracklist.o viktrwlayer_waypointlist.o vikrouting.o vikroutingengine.o vikroutingwebengine.o vikutils.o toolbar.o thumbnails.o md5_hash.o background.o vikradiogroup.o vikcoord.o mapcache.o maputils.o vikmapsource.o vikmapsourcedefault.o vikmapslayer.o vikmapslayer_compat.o vikmaptype.o vikslippymapsource.o vikwmscmapsource.o viktmsmapsource.o metatile.o gpx.o garminsymbols.o acquire.o babel.o babel_ui.o datasource_file.o datasource_geojson.o datasource_gps.o datasource_routing.o datasource_gc.o datasource_bfilter.o datasource_wikipedia.o datasource_url.o googlesearch.o dem.o vikdemlayer.o vikdatetime_edit_dialog.o vikfilelist.o vikexttool.o vikexttools.o vikwebtool.o vikwebtoolcenter.o vikwebtoolbounds.o vikwebtoolformat.o vikexttool_datasources.o vikwebtool_datasource.o dems.o srtm_continent.o uibuilder.o print-preview.o print.o kmz.o viklayer_defaults.o settings.o preferences.o misc/fpconv.o misc/strtod.o misc/kdtree.o misc/gtkhtml.o bingmapsource.o bing.o google.o   osm.o osm-traces.o datasource_osm_my_traces.o datasource_osm.o bluemarble.o geonames.o geonamessearch.o datasource_geotag.o geotag_exif.o viktrwlayer_geotag.o  vikmapniklayer.o mapnik_interface.o libgeoclue.o 
 ar: `u' modifier ignored since `D' is the default (see `U')
@@ -4339,7 +4373,7 @@
    debian/rules override_dh_auto_test
 make[1]: Entering directory '/build/viking-1.7'
 dh_auto_test
-	make -j3 check VERBOSE=1
+	make -j4 check VERBOSE=1
 make[2]: Entering directory '/build/viking-1.7'
 Making check in src
 make[3]: Entering directory '/build/viking-1.7/src'
@@ -4395,8 +4429,8 @@
 PASS: check_babel.sh
 PASS: check_gpx.sh
 PASS: check_metatile.sh
-PASS: check_degrees_conversions.sh
 PASS: check_md5_hash.sh
+PASS: check_degrees_conversions.sh
 PASS: check_geotag.sh
 PASS: check_decimal_output.sh
 ============================================================================
@@ -4465,7 +4499,7 @@
    dh_testroot
    dh_prep
    dh_auto_install
-	make -j3 install DESTDIR=/build/viking-1.7/debian/viking AM_UPDATE_INFO_DIR=no
+	make -j4 install DESTDIR=/build/viking-1.7/debian/viking AM_UPDATE_INFO_DIR=no
 make[1]: Entering directory '/build/viking-1.7'
 Making install in src
 make[2]: Entering directory '/build/viking-1.7/src'
@@ -4517,7 +4551,7 @@
 linguas="ast ca cs da de el en_GB es eu fi fr he hu id it ja jv ko ku lt lv nb nl pl pt_BR ru sk sl sv tr uk zh_CN zh_TW "; \
 for lang in $linguas; do \
   dir=/build/viking-1.7/debian/viking/usr/share/locale/$lang/LC_MESSAGES; \
-  /bin/bash /build/viking-1.7/install-sh -d $dir; \
+  /bin/sh /build/viking-1.7/install-sh -d $dir; \
   if test -r $lang.gmo; then \
     /usr/bin/install -c -m 644 $lang.gmo $dir/viking.mo; \
     echo "installing $lang.gmo as $dir/viking.mo"; \
@@ -4633,39 +4667,39 @@
    dh_perl
    dh_link
    dh_strip_nondeterminism
-	Normalized debian/viking/usr/share/locale/en_GB/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/sl/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/pl/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/zh_TW/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/ja/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/ko/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/cs/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/uk/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/lv/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/nl/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/he/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/id/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/zh_TW/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/en_GB/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/es/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/cs/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/tr/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/pt_BR/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/ja/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/ru/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/jv/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/sk/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/lt/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/fi/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/sv/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/eu/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/ku/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/pl/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/zh_CN/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/fr/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/ru/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/sv/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/fi/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/he/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/jv/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/da/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/de/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/lv/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/el/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/tr/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/id/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/ku/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/lt/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/it/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/zh_CN/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/nb/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/el/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/ca/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/nl/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/da/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/ast/LC_MESSAGES/viking.mo
 	Normalized debian/viking/usr/share/locale/hu/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/uk/LC_MESSAGES/viking.mo
-	Normalized debian/viking/usr/share/locale/pt_BR/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/de/LC_MESSAGES/viking.mo
+	Normalized debian/viking/usr/share/locale/sl/LC_MESSAGES/viking.mo
    dh_compress
    dh_fixperms
    dh_missing
@@ -4673,31 +4707,33 @@
    dh_makeshlibs
    dh_shlibdeps
 dpkg-shlibdeps: warning: debian/viking/usr/bin/viking contains an unresolvable reference to symbol __aeabi_atexit@CXXABI_ARM_1.3.3: it's probably a plugin
-dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libfreetype.so.6 (it uses none of the library's symbols)
-dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libgthread-2.0.so.0 (it uses none of the library's symbols)
-dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libatk-1.0.so.0 (it uses none of the library's symbols)
+dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libicuuc.so.63 (it uses none of the library's symbols)
 dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libpangocairo-1.0.so.0 (it uses none of the library's symbols)
+dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libgthread-2.0.so.0 (it uses none of the library's symbols)
 dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libfontconfig.so.1 (it uses none of the library's symbols)
+dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libfreetype.so.6 (it uses none of the library's symbols)
+dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libatk-1.0.so.0 (it uses none of the library's symbols)
 dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libpangoft2-1.0.so.0 (it uses none of the library's symbols)
-dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/viking/usr/bin/viking was not linked against libicuuc.so.63 (it uses none of the library's symbols)
    dh_installdeb
    dh_gencontrol
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'viking-dbgsym' in '../viking-dbgsym_1.7-1_armhf.deb'.
 dpkg-deb: building package 'viking' in '../viking_1.7-1_armhf.deb'.
+dpkg-deb: building package 'viking-dbgsym' in '../viking-dbgsym_1.7-1_armhf.deb'.
  dpkg-genbuildinfo --build=binary
  dpkg-genchanges --build=binary >../viking_1.7-1_armhf.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
  dpkg-source --after-build .
 dpkg-buildpackage: info: binary-only upload (no source included)
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/24028/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/24028/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/24516 and its subdirectories
-I: Current time: Sat Jul 11 19:33:19 -12 2020
-I: pbuilder-time-stamp: 1594539199
+I: removing directory /srv/workspace/pbuilder/24028 and its subdirectories
+I: Current time: Sun Jul 12 21:58:39 +14 2020
+I: pbuilder-time-stamp: 1594540720