Updated to 4.2

4 files changed, 14 insertions, 158 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff2bcf71d072..e5eded8ee642 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
-# Generated by mksrcinfo v8
-# Sun Apr 10 22:31:30 UTC 2016
 pkgbase = tzclock-gtk2
 	pkgdesc = Cairo clock to display the time around the world
-	pkgver = 2.8.1
+	pkgver = 4.2
 	pkgrel = 2
 	url = http://tzclock.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = libgnomeui
-	conflicts = tzclock-gtk3
+	depends = gtk2
+	depends = libnotify
+	depends = libdial
 	conflicts = tzclock
-	source = http://www.theknight.co.uk/releases/GTK2/tzclock-2.8.1.tar.bz2
-	md5sums = 28657d101d2c2a4df619e959d7d78196
+	source = https://theknight.co.uk/releases/Source/tzclock-4.2.tar.bz2
+	sha512sums = 0bf7eeb70fd41c0c69b024f13ced91eb0e35918ff509c31ec64f19c31b0b4e721f889e8779b4679fdd81c2d42cce06d2bd62289d5c66466af4a8cbb25eb554ab
 
 pkgname = tzclock-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index ac53cdd4f80c..8bc81308e2a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,26 @@
 
 _pkgname=tzclock
 pkgname=${_pkgname}-gtk2
-pkgver=2.8.1
+pkgver=4.2
 pkgrel=2
 pkgdesc="Cairo clock to display the time around the world"
 arch=('i686' 'x86_64')
 url="http://tzclock.org/"
 license=("GPL")
-depends=('libgnomeui')
-conflicts=("${_pkgname}-gtk3" "${_pkgname}")
-source=("http://www.theknight.co.uk/releases/GTK2/${_pkgname}-$pkgver.tar.bz2")
-md5sums=('28657d101d2c2a4df619e959d7d78196')
-DLAGENTS=('http::/usr/bin/wget -O %o %u')
+depends=('gtk2' 'libnotify' 'libdial')
+conflicts=("${_pkgname}")
+source=("https://theknight.co.uk/releases/Source/$_pkgname-$pkgver.tar.bz2")
+sha512sums=('0bf7eeb70fd41c0c69b024f13ced91eb0e35918ff509c31ec64f19c31b0b4e721f889e8779b4679fdd81c2d42cce06d2bd62289d5c66466af4a8cbb25eb554ab')
 
 build() {
   cd $srcdir/${_pkgname}-$pkgver/
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
   cd $srcdir/${_pkgname}-$pkgver/
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 
   install -dm755 $pkgdir/usr/share/licenses/$pkgname/
   install -Dpm644 COPYING $pkgdir/usr/share/licenses/$pkgname/
diff --git a/makepkg.log b/makepkg.log
deleted file mode 100644
index d3a8d3f9e63a..000000000000
--- a/makepkg.log
+++ /dev/null
@@ -1,142 +0,0 @@
-==> Creando el paquete: tzclock-gtk2 2.8.1-2 (mar jun  9 10:44:06 ART 2015)
-==> Comprobando dependencias mientras se ejecuta...
-==> Comprobando dependencias mientras se compila...
-==> Recibiendo las fuentes...
-  -> Descargando tzclock-2.8.1.tar.bz2...
---2015-06-09 10:44:06--  http://www.theknight.co.uk/releases/GTK2/tzclock-2.8.1.tar.bz2
-Resolviendo www.theknight.co.uk (www.theknight.co.uk)... 91.103.217.39
-Conectando con www.theknight.co.uk (www.theknight.co.uk)[91.103.217.39]:80... conectado.
-Petición HTTP enviada, esperando respuesta... 200 OK
-Longitud: 174372 (170K) [application/x-tar]
-Grabando a: “tzclock-2.8.1.tar.bz2.part”
-
-     0K .......... .......... .......... .......... .......... 29% 97,2K 1s
-    50K .......... .......... .......... .......... .......... 58% 98,4K 1s
-   100K .......... .......... .......... .......... .......... 88%  190K 0s
-   150K .......... ..........                                 100% 89,4K=1,5s
-
-2015-06-09 10:44:09 (113 KB/s) - “tzclock-2.8.1.tar.bz2.part” guardado [174372/174372]
-
-==> Validando las fuentes con md5sums...
-    tzclock-2.8.1.tar.bz2 ... Aprobado
-==> Extrayendo las fuentes...
-  -> Extrayendo tzclock-2.8.1.tar.bz2 con bsdtar
-==> Iniciando build()...
-checking for a BSD-compatible install... /usr/bin/install -c
-checking whether build environment is sane... yes
-checking for a thread-safe mkdir -p... /usr/bin/mkdir -p
-checking for gawk... gawk
-checking whether make sets $(MAKE)... yes
-checking for gcc... gcc
-checking for C compiler default output file name... a.out
-checking whether the C compiler works... yes
-checking whether we are cross compiling... no
-checking for suffix of executables... 
-checking for suffix of object files... o
-checking whether we are using the GNU C compiler... yes
-checking whether gcc accepts -g... yes
-checking for gcc option to accept ISO C89... none needed
-checking for style of include used by make... GNU
-checking dependency style of gcc... gcc3
-checking whether gcc and cc understand -c and -o together... yes
-checking for pkg-config... /usr/bin/pkg-config
-checking pkg-config is at least version 0.9.0... yes
-checking for DEPS... yes
-checking for lrint in -lm... yes
-checking how to run the C preprocessor... gcc -E
-checking for grep that handles long lines and -e... /usr/bin/grep
-checking for egrep... /usr/bin/grep -E
-checking for ANSI C header files... yes
-checking for sys/types.h... yes
-checking for sys/stat.h... yes
-checking for stdlib.h... yes
-checking for string.h... yes
-checking for memory.h... yes
-checking for strings.h... yes
-checking for inttypes.h... yes
-checking for stdint.h... yes
-checking for unistd.h... yes
-checking langinfo.h usability... yes
-checking langinfo.h presence... yes
-checking for langinfo.h... yes
-checking ctype.h usability... yes
-checking ctype.h presence... yes
-checking for ctype.h... yes
-checking math.h usability... yes
-checking math.h presence... yes
-checking for math.h... yes
-checking stdarg.h usability... yes
-checking stdarg.h presence... yes
-checking for stdarg.h... yes
-checking stdbool.h usability... yes
-checking stdbool.h presence... yes
-checking for stdbool.h... yes
-checking for stdint.h... (cached) yes
-checking stdio.h usability... yes
-checking stdio.h presence... yes
-checking for stdio.h... yes
-checking for stdlib.h... (cached) yes
-checking for string.h... (cached) yes
-checking time.h usability... yes
-checking time.h presence... yes
-checking for time.h... yes
-checking for an ANSI C-conforming const... yes
-checking whether struct tm is in sys/time.h or time.h... time.h
-checking for vprintf... yes
-checking for _doprnt... no
-checking for nl_langinfo... yes
-configure: creating ./config.status
-config.status: creating Makefile
-config.status: creating tzclock.spec
-config.status: creating debian/control
-config.status: creating debian/changelog
-config.status: creating buildrpm.sh
-config.status: creating debian/rules
-config.status: creating debian/copyright
-config.status: creating config.h
-config.status: executing depfiles commands
-make  all-am
-make[1]: se entra en el directorio '/home/share/pkgbuild/arch/aur4/tzclock-gtk2/src/tzclock-2.8.1'
-gcc -DHAVE_CONFIG_H -I. -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz  -DBUILDCAIRO -D_FORTIFY_SOURCE=2  -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4 -MT TzClock-TzClock.o -MD -MP -MF .deps/TzClock-TzClock.Tpo -c -o TzClock-TzClock.o `test -f 'src/TzClock.c' || echo './'`src/TzClock.c
-mv -f .deps/TzClock-TzClock.Tpo .deps/TzClock-TzClock.Po
-gcc -DHAVE_CONFIG_H -I. -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz  -DBUILDCAIRO -D_FORTIFY_SOURCE=2  -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4 -MT TzClock-TzClockCairo.o -MD -MP -MF .deps/TzClock-TzClockCairo.Tpo -c -o TzClock-TzClockCairo.o `test -f 'src/TzClockCairo.c' || echo './'`src/TzClockCairo.c
-mv -f .deps/TzClock-TzClockCairo.Tpo .deps/TzClock-TzClockCairo.Po
-gcc -DHAVE_CONFIG_H -I. -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz  -DBUILDCAIRO -D_FORTIFY_SOURCE=2  -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4 -MT TzClock-ParseZone.o -MD -MP -MF .deps/TzClock-ParseZone.Tpo -c -o TzClock-ParseZone.o `test -f 'src/ParseZone.c' || echo './'`src/ParseZone.c
-mv -f .deps/TzClock-ParseZone.Tpo .deps/TzClock-ParseZone.Po
-gcc -DHAVE_CONFIG_H -I. -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz  -DBUILDCAIRO -D_FORTIFY_SOURCE=2  -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4 -MT TzClock-TzClockConfig.o -MD -MP -MF .deps/TzClock-TzClockConfig.Tpo -c -o TzClock-TzClockConfig.o `test -f 'src/TzClockConfig.c' || echo './'`src/TzClockConfig.c
-src/TzClockConfig.c: En la función ‘configLoad’:
-src/TzClockConfig.c:137:3: aviso: declaración implícita de la función ‘configSetValue’ [-Wimplicit-function-declaration]
-   configSetValue (configName, configValue);
-   ^
-mv -f .deps/TzClock-TzClockConfig.Tpo .deps/TzClock-TzClockConfig.Po
-gcc -DHAVE_CONFIG_H -I. -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz  -DBUILDCAIRO -D_FORTIFY_SOURCE=2  -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4 -MT TzClock-list.o -MD -MP -MF .deps/TzClock-list.Tpo -c -o TzClock-list.o `test -f 'src/list.c' || echo './'`src/list.c
-mv -f .deps/TzClock-list.Tpo .deps/TzClock-list.Po
-gcc  -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4  -Wl,-O1,--sort-common,--as-needed,-z,relro -o TzClock TzClock-TzClock.o TzClock-TzClockCairo.o TzClock-ParseZone.o TzClock-TzClockConfig.o TzClock-list.o  -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lgnomecanvas-2 -lart_lgpl_2 -lgnomevfs-2 -lgconf-2 -lgthread-2.0 -pthread -lgmodule-2.0 -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype  -lm
-gcc -DHAVE_CONFIG_H -I. -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz   -D_FORTIFY_SOURCE=2  -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4 -MT screenSize.o -MD -MP -MF .deps/screenSize.Tpo -c -o screenSize.o `test -f 'src/screenSize.c' || echo './'`src/screenSize.c
-mv -f .deps/screenSize.Tpo .deps/screenSize.Po
-gcc  -march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4  -Wl,-O1,--sort-common,--as-needed,-z,relro -o screenSize screenSize.o  -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lgnomecanvas-2 -lart_lgpl_2 -lgnomevfs-2 -lgconf-2 -lgthread-2.0 -pthread -lgmodule-2.0 -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lfontconfig -lfreetype  -lm
-make[1]: se sale del directorio '/home/share/pkgbuild/arch/aur4/tzclock-gtk2/src/tzclock-2.8.1'
-==> Entrando en entorno fakeroot...
-==> Iniciando package()...
-make[1]: se entra en el directorio '/home/share/pkgbuild/arch/aur4/tzclock-gtk2/src/tzclock-2.8.1'
-test -z "/usr/bin" || /usr/bin/mkdir -p "/chelqo/Paquetes/make/arch/aur4/tzclock-gtk2/pkg/tzclock-gtk2/usr/bin"
-  /usr/bin/install -c TzClock screenSize '/chelqo/Paquetes/make/arch/aur4/tzclock-gtk2/pkg/tzclock-gtk2/usr/bin'
-test -z "/usr/share/applications" || /usr/bin/mkdir -p "/chelqo/Paquetes/make/arch/aur4/tzclock-gtk2/pkg/tzclock-gtk2/usr/share/applications"
- /usr/bin/install -c -m 644 TzClock.desktop '/chelqo/Paquetes/make/arch/aur4/tzclock-gtk2/pkg/tzclock-gtk2/usr/share/applications'
-test -z "/usr/share/pixmaps" || /usr/bin/mkdir -p "/chelqo/Paquetes/make/arch/aur4/tzclock-gtk2/pkg/tzclock-gtk2/usr/share/pixmaps"
- /usr/bin/install -c -m 644 TzClock.svg '/chelqo/Paquetes/make/arch/aur4/tzclock-gtk2/pkg/tzclock-gtk2/usr/share/pixmaps'
-test -z "/usr/share/man/man1" || /usr/bin/mkdir -p "/chelqo/Paquetes/make/arch/aur4/tzclock-gtk2/pkg/tzclock-gtk2/usr/share/man/man1"
- /usr/bin/install -c -m 644 'TzClock.man' '/chelqo/Paquetes/make/arch/aur4/tzclock-gtk2/pkg/tzclock-gtk2/usr/share/man/man1/TzClock.1'
-make[1]: se sale del directorio '/home/share/pkgbuild/arch/aur4/tzclock-gtk2/src/tzclock-2.8.1'
-==> Depurando la instalación...
-  -> Purgando los archivos innecesarios...
-  -> Quitando los archivos libtool...
-  -> Quitando los archivos de bibliotecas estáticas...
-  -> Comprimiendo las páginas man e info...
-  -> Despojando los símbolos innecesarios de los binarios y de las bibliotecas...
-==> Creando el paquete «tzclock-gtk2»...
-  -> Generando el archivo .PKGINFO...
-  -> Generando el archivo .MTREE...
-  -> Comprimiendo el paquete...
-==> Abandonando el entorno fakeroot.
-==> Compilación terminada: tzclock-gtk2 2.8.1-2 (mar jun  9 10:44:25 ART 2015)
diff --git a/tzclock-2.8.1.tar.bz2 b/tzclock-2.8.1.tar.bz2
deleted file mode 100644
index bc80f780550c..000000000000
--- a/tzclock-2.8.1.tar.bz2
+++ /dev/null