From deb682fd393abe3d035f0d4327938cdbe2c907c1 Mon Sep 17 00:00:00 2001 From: Piraty Date: Mon, 4 May 2020 18:29:49 +0200 Subject: [PATCH 01/16] nettle: update to 3.6. --- common/shlibs | 4 ++-- srcpkgs/nettle/template | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7693053e46b..580a12d9c87 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1222,8 +1222,8 @@ libHX.so.28 libHX-3.14_1 libxkbcommon.so.0 libxkbcommon-0.2.0_1 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1 libgee-0.8.so.2 libgee08-0.8.2_1 -libnettle.so.7 nettle-3.5.1_1 -libhogweed.so.5 nettle-3.5.1_1 +libnettle.so.8 nettle-3.6_1 +libhogweed.so.6 nettle-3.6_1 libgtkspell.so.0 gtkspell-2.0.16_1 libgtkspell3-3.so.0 gtkspell3-3.0.9_1 libpurple.so.0 libpurple-2.10.6_1 diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template index 2b2716179e7..a9409e1b782 100644 --- a/srcpkgs/nettle/template +++ b/srcpkgs/nettle/template @@ -1,18 +1,17 @@ # Template file for 'nettle' pkgname=nettle -version=3.5.1 +version=3.6 revision=1 build_style=gnu-configure configure_args="--enable-shared" hostmakedepends="m4 texinfo" makedepends="gmp-devel" -short_desc="A low-level cryptographic library" +short_desc="Low-level cryptographic library" maintainer="Orphaned " license="GPL-2.0-or-later, GPL-3.0-or-later" -homepage="http://www.lysator.liu.se/~nisse/nettle/" +homepage="https://www.lysator.liu.se/~nisse/nettle/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419 - +checksum=d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1 nettle-devel_package() { depends="gmp-devel ${sourcepkg}>=${version}_${revision}" From 29e656dcb06361f46a3f78111fbff8c82d484523 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:09 +0200 Subject: [PATCH 02/16] claws-mail: rebuild against nettle-3.6 --- srcpkgs/claws-mail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template index b20a954f8c9..fba1389cb9a 100644 --- a/srcpkgs/claws-mail/template +++ b/srcpkgs/claws-mail/template @@ -1,7 +1,7 @@ # Template file for 'claws-mail' pkgname=claws-mail version=3.17.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-python-plugin --disable-perl-plugin --enable-enchant --enable-gnutls" From e3b3e36a161c8116e4d88528391791a47c46ee45 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:09 +0200 Subject: [PATCH 03/16] filezilla: rebuild against nettle-3.6 --- srcpkgs/filezilla/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index 9579feefad9..745400bacd1 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,7 +1,7 @@ # Template file for 'filezilla' pkgname=filezilla version=3.48.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck --with-wx-config=wx-config-gtk3" From 02ba1fac706a64e310adc26891bc2d2640c00a75 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:10 +0200 Subject: [PATCH 04/16] gnutls: rebuild against nettle-3.6 --- .../patches/tests-certtool-no-prompt.patch | 22 +++++++++++++++++++ srcpkgs/gnutls/template | 15 ++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch diff --git a/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch b/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch new file mode 100644 index 00000000000..6625c25ff58 --- /dev/null +++ b/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch @@ -0,0 +1,22 @@ +upstream: no +reason: don't prompt for password, don't assume it has been asked for + +--- tests/cert-tests/certtool ++++ tests/cert-tests/certtool +@@ -26,6 +26,7 @@ + TMPFILE1=certtool-file1.$$.tmp + TMPFILE2=certtool-file2.$$.tmp + PASS="1234" ++export GNUTLS_PIN="1234" + + if test -n "$DISABLE_BASH_TESTS"; then + exit 77 +@@ -66,7 +67,7 @@ + fi + + grep "Enter password" ${TMPFILE2} >/dev/null 2>&1 +- if test $? != 0;then ++ if test $? != 0 && test -z "$GNUTLS_PIN" ; then + cat ${TMPFILE2} + echo "No password was asked" + exit 1 diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index dc5c58da50e..95bfab6a3f2 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -1,17 +1,17 @@ # Template file for 'gnutls' pkgname=gnutls version=3.6.13 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-zlib --disable-guile --disable-static --disable-valgrind-tests --disable-rpath --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib" -hostmakedepends="which gettext-devel pkg-config libtool" -# add autogen when #6550 is solved +hostmakedepends="automake gettext-devel libtool pkg-config which" makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel libunistring-devel unbound-devel trousers-devel" +checkdepends="iproute2" short_desc="GNU Transport Layer Security library" maintainer="Orphaned " license="GPL-3.0-only, LGPL-2.1-or-later" @@ -19,6 +19,15 @@ homepage="https://gnutls.org" distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" checksum=32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38 +pre_configure() { + autoreconf -vfi +} + +pre_check() { + # same as $PASS in tests/cert-tests/certtool + export GNUTLS_PIN=1234 +} + gnutls-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 45d8d268cc6fbf0b1e0e3b6cffa685b627854f6e Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:10 +0200 Subject: [PATCH 05/16] libfilezilla: rebuild against nettle-3.6 --- srcpkgs/libfilezilla/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template index f0d2daf3e0d..c6589222fd5 100644 --- a/srcpkgs/libfilezilla/template +++ b/srcpkgs/libfilezilla/template @@ -2,7 +2,7 @@ # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable pkgname=libfilezilla version=0.21.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="gettext pkg-config" From c91a328f0bc43978a0aec0780b76813409fa0071 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:10 +0200 Subject: [PATCH 06/16] pijul: rebuild against nettle-3.6 --- srcpkgs/pijul/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index d46ca14e242..95aea9ce678 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -1,7 +1,7 @@ # Template file for 'pijul' pkgname=pijul version=0.12.2 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config clang" makedepends="libsodium-devel libressl-devel nettle-devel" From 7fbd606b51bef30fb4db0b5471c7d881d8a0dc39 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:11 +0200 Subject: [PATCH 07/16] qemu: rebuild against nettle-3.6 --- srcpkgs/qemu/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 82563bf381b..5a32c5c1dd3 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,7 +1,7 @@ # Template file for 'qemu' pkgname=qemu version=5.0.0 -revision=1 +revision=2 short_desc="Open Source Processor Emulator" maintainer="Helmut Pozimski " license="GPL-2.0-or-later, LGPL-2.1-or-later" @@ -37,15 +37,13 @@ case "$XBPS_TARGET_MACHINE" in aarch64-musl) CFLAGS+=" -D_LINUX_SYSINFO_H";; esac -post_extract() { - sed -i 's/__u64/unsigned long/' linux-user/host/aarch64/hostdep.h +pre_configure() { + vsed -i 's/__u64/unsigned long/' linux-user/host/aarch64/hostdep.h } do_configure() { local args= - sed -e 's,-rpath /usr/local/lib,,g' -i configure - if [ "$CROSS_BUILD" ]; then args+=" --cross-prefix=${XBPS_CROSS_TRIPLET}-" export LIBTOOL=libtool From 1ea597b4912512a3015b535301f553e6263f478c Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:11 +0200 Subject: [PATCH 08/16] rdesktop: rebuild against nettle-3.6 --- srcpkgs/rdesktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template index aabd36b701c..bb28a0490e3 100644 --- a/srcpkgs/rdesktop/template +++ b/srcpkgs/rdesktop/template @@ -1,7 +1,7 @@ # Template file for 'rdesktop' pkgname=rdesktop version=1.9.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config automake" From b2414597e43b300952fb14f92486d227a126c09f Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:12 +0200 Subject: [PATCH 09/16] rdfind: rebuild against nettle-3.6 --- srcpkgs/rdfind/template | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rdfind/template b/srcpkgs/rdfind/template index 510e46839ba..53a34e68ded 100644 --- a/srcpkgs/rdfind/template +++ b/srcpkgs/rdfind/template @@ -1,16 +1,24 @@ # Template file for 'rdfind' pkgname=rdfind version=1.4.1 -revision=2 +revision=3 build_style=gnu-configure makedepends="nettle-devel" -short_desc="A program that finds duplicate files" +checkdepends="tar which" +short_desc="Program that finds duplicate files" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://rdfind.pauldreik.se" distfiles="https://rdfind.pauldreik.se/rdfind-${version}.tar.gz" checksum=30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c +pre_configure() { + # skip tests that don't work as expected in the chroot + vsed -i Makefile.in \ + -e 's:testcases/hardlink_fails.sh \\:\\:' \ + -e 's:testcases/symlinking_action.sh \\:\\:' +} + case "${XBPS_TARGET_MACHINE}" in aarch64) LDFLAGS="-Wl,-znotext";; esac From bbc9f1dd9549ebd0a044d1c607dec5d91be72e1c Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:12 +0200 Subject: [PATCH 10/16] rdup: rebuild against nettle-3.6 --- srcpkgs/rdup/patches/release-1.1.15.patch | 43 +++++++++++++++++++++++ srcpkgs/rdup/template | 6 ++-- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/rdup/patches/release-1.1.15.patch diff --git a/srcpkgs/rdup/patches/release-1.1.15.patch b/srcpkgs/rdup/patches/release-1.1.15.patch new file mode 100644 index 00000000000..c467a736fc2 --- /dev/null +++ b/srcpkgs/rdup/patches/release-1.1.15.patch @@ -0,0 +1,43 @@ +upstream: yes + +From 02eb963f11de11a1115e815625ae38f6dad6b276 Mon Sep 17 00:00:00 2001 +From: Miek Gieben +Date: Wed, 2 Mar 2016 15:51:45 +0000 +Subject: [PATCH] Release 1.1.15 + +--- + ChangeLog | 3 ++- + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 1c79ba6..5a6812a 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,4 +1,4 @@ +-xx Yyy 2013: 1.1.15 Miek Gieben ++02 Mar 2016: 1.1.15 Miek Gieben + * [rdup] Change -P so any arguments are executed with 'sh -c', + this removes the 7 option limit (Alexander Neumann) + * [rdup-tr] Fix crashes with filename encryption and symlinks (reported by +@@ -6,6 +6,7 @@ xx Yyy 2013: 1.1.15 Miek Gieben + * [rdup-tr] Fix memory leak + * [rdup] Fix the linked list that tracks the child's PIDs. + * [rdup] Drop -a option, it's racy and must proper or not at all. ++ * [rdup] Compilation fixed for Mac OS X + + + 19 Jan 2013: 1.1.14 Miek Gieben +diff --git a/configure.ac b/configure.ac +index 5b77cfe..bc3ada5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.57) +-AC_INIT(rdup, 1.1.14, miek@miek.nl, rdup) ++AC_INIT(rdup, 1.1.15, miek@miek.nl, rdup) + AC_CONFIG_SRCDIR([rdup.c]) + AC_PREFIX_DEFAULT(/usr/local) + diff --git a/srcpkgs/rdup/template b/srcpkgs/rdup/template index ccc818e6892..82877b9bec5 100644 --- a/srcpkgs/rdup/template +++ b/srcpkgs/rdup/template @@ -1,16 +1,18 @@ # Template file for 'rdup' pkgname=rdup version=1.1.15 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake pkg-config" makedepends="glib-devel libarchive-devel nettle-devel" +checkdepends="bsdtar dejagnu" short_desc="The only backup program that doesn't make backups" maintainer="Rui Abreu Ferreira " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://github.com/miekg/rdup" distfiles="https://github.com/miekg/rdup/archive/${version}.tar.gz" checksum=787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb +patch_args="-Np1" pre_configure() { vsed -e 's/-Werror//' -i GNUmakefile.in From b021cd5e3b4acdc9f4ab60cbd9f8d3b9a0c73f5e Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:12 +0200 Subject: [PATCH 11/16] stoken: rebuild against nettle-3.6 --- srcpkgs/stoken/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/stoken/template b/srcpkgs/stoken/template index 3be790f616b..98293c153c1 100644 --- a/srcpkgs/stoken/template +++ b/srcpkgs/stoken/template @@ -1,7 +1,7 @@ # Template file for 'stoken' pkgname=stoken version=0.92 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkgconf" makedepends="libxml2-devel nettle-devel gtk+3-devel" From 1068d33563ae4f4d05e9b86b84064629cea73448 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:13 +0200 Subject: [PATCH 12/16] tigervnc: rebuild against nettle-3.6 --- srcpkgs/tigervnc/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template index 98b981ecc39..ab30995a2be 100644 --- a/srcpkgs/tigervnc/template +++ b/srcpkgs/tigervnc/template @@ -1,29 +1,29 @@ # Template file for 'tigervnc' pkgname=tigervnc version=1.10.1 -revision=1 +revision=2 _xorg_version=1.20.0 build_style=cmake -short_desc="VNC client forked from TightVNC" -maintainer="Evan Deaubl " -license="GPL-2.0-or-later" hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans" makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel - xorgproto libxkbfile-devel libXfont2-devel gnutls-devel libdrm-devel" + xorgproto libxkbfile-devel libXrandr-devel libXfont2-devel gnutls-devel libdrm-devel" depends="perl xauth xkeyboard-config" -conflicts="turbovnc>=0" +short_desc="VNC client forked from TightVNC" +maintainer="Evan Deaubl " +license="GPL-2.0-or-later" homepage="https://www.tigervnc.org" distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz ${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2" checksum="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4 9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6" +conflicts="turbovnc>=0" post_configure() { cd ${wrksrc}/unix/xserver cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* . patch -p1 <../xserver120.patch # glvnd changed versioning - sed -i '/LIBGL/s/[79]\..\.0/1.2/' configure.ac + vsed -i configure.ac -e '/LIBGL/s/[79]\..\.0/1.2/' autoreconf -fi ./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \ --with-pic --without-dtrace --disable-static \ @@ -36,7 +36,7 @@ post_configure() { # Hardcodes TIGERVNC_BUILDDIR which we have to set later on because # we do out of source builds - sed "s/TIGERVNC_BUILDDIR =/TIGERVNC_BUILDDIR :=/" -i hw/vnc/Makefile + vsed -i hw/vnc/Makefile -e "s/TIGERVNC_BUILDDIR =/TIGERVNC_BUILDDIR :=/" } post_build() { From a0a92bc5c80ca4d1e246a5997358c1ce4c5dd57f Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:13 +0200 Subject: [PATCH 13/16] xen: rebuild against nettle-3.6 --- srcpkgs/xen/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index 6a7f8a73719..ae8f5e246fc 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,7 +1,7 @@ # Template file for 'xen' pkgname=xen version=4.10.4 -revision=2 +revision=3 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot _git_tag_ipxe=356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d archs="x86_64*" @@ -93,7 +93,6 @@ nostrip_files=" palcode-clipper s390-ccw.img s390-netboot.img" -pycompile_module="xen grub" CFLAGS="-fno-pie -Wno-format-truncation" @@ -122,7 +121,7 @@ post_extract() { pre_configure() { find \( -name "Makefile*" -o -name "*.mk" -o -name "common.make" \) \ -exec sed -i "{}" -e "s; *-Werror *; ;g" \; - sed -i tools/python/setup.py -e 's;, "-Werror";;g' + vsed -i tools/python/setup.py -e 's;, "-Werror";;g' } do_configure() { From 92a9a024392d261bed7dd543c0524212608be68d Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:14 +0200 Subject: [PATCH 14/16] xorg-server: rebuild against nettle-3.6 --- srcpkgs/xorg-server/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index de2eefdb851..aa832c25a08 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=1.20.8 -revision=2 +revision=3 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb @@ -19,6 +19,7 @@ makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')" # See hw/xfree86/common/xf86Module.h. Only care for the major version. depends="xkeyboard-config $(vopt_if elogind 'elogind')" +checkdepends="xkeyboard-config" short_desc="X11 server from X.org" maintainer="Juan RP " license="MIT, BSD-3-Clause" From 8aa06ac1947db580afd453d784cb3ef5b1827f0d Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:09 +0200 Subject: [PATCH 15/16] epiphany: update to 3.36.1. --- srcpkgs/epiphany/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index f0be325d6fd..ffe8aa3671e 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,14 +1,14 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.32.4 -revision=2 +version=3.36.1 +revision=1 build_helper="gir" build_style=meson configure_args="-Ddistributor_name=VoidLinux -Dunit_tests=disabled" hostmakedepends="gettext glib-devel itstool pkg-config" makedepends="NetworkManager-devel avahi-glib-libs-devel gcr-devel - gnome-desktop-devel json-glib-devel libdazzle-devel libnotify-devel - libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel + gnome-desktop-devel json-glib-devel libdazzle-devel libhandy-devel + libnotify-devel libsecret-devel libsoup-gnome-devel libwnck-devel libxslt-devel nettle-devel nss-devel webkit2gtk-devel" depends="desktop-file-utils hicolor-icon-theme iso-codes webkit2gtk" short_desc="Intuitive GNOME web browser" @@ -16,4 +16,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Web" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c9a828578301af77ac9f3d3ce253b02f9f3a1561840cc8d74dd5645f92d0a995 +checksum=f6f233fb43c6318476d4594707b3fdd5b4127b5e35263e73fbcad8895db8efb6 From e9fe9a79907430507b803812c2f895464ffe9dc3 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:13 +0200 Subject: [PATCH 16/16] viking: update to 1.8. [ci skip] --- ...14f554825b1350a0ad349ffc0b7920a528c6.patch | 25 +++++++++++++++++++ ...97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch | 24 ++++++++++++++++++ srcpkgs/viking/template | 9 ++++--- 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch create mode 100644 srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch diff --git a/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch b/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch new file mode 100644 index 00000000000..b7159a98b76 --- /dev/null +++ b/srcpkgs/viking/patches/7ff014f554825b1350a0ad349ffc0b7920a528c6.patch @@ -0,0 +1,25 @@ +upstream: yes + +From 7ff014f554825b1350a0ad349ffc0b7920a528c6 Mon Sep 17 00:00:00 2001 +From: Nikolay Korotkiy +Date: Tue, 4 Feb 2020 21:12:47 +0000 +Subject: [PATCH] Fix build without mapnik + +Signed-off-by: Rob Norris +--- + src/viklayer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/viklayer.c b/src/viklayer.c +index dc0ab1ff..3070157f 100644 +--- a/src/viklayer.c ++++ b/src/viklayer.c +@@ -36,7 +36,7 @@ extern VikLayerInterface vik_dem_layer_interface; + #ifdef HAVE_LIBMAPNIK + extern VikLayerInterface vik_mapnik_layer_interface; + #endif +-#ifdef HAVE_LIBMAPNIK ++#ifdef HAVE_LIBGEOCLUE_2 + extern VikLayerInterface vik_geoclue_layer_interface; + #endif + diff --git a/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch b/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch new file mode 100644 index 00000000000..2ef4c0589bb --- /dev/null +++ b/srcpkgs/viking/patches/da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f.patch @@ -0,0 +1,24 @@ +upstream: yes + +From da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f Mon Sep 17 00:00:00 2001 +From: Rob Norris +Date: Sun, 9 Feb 2020 11:28:30 +0000 +Subject: [PATCH] Github #80: Fix build with '--with-libexif' + +--- + src/geotag_exif.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/geotag_exif.c b/src/geotag_exif.c +index 0e879a39..6e9514a7 100644 +--- a/src/geotag_exif.c ++++ b/src/geotag_exif.c +@@ -362,7 +362,7 @@ VikWaypoint* a_geotag_create_waypoint_from_file ( const gchar *filename, VikCoor + // Not worried if none of the other fields exist, as can default the values to something + // + +- gdouble alt = VIK_DEFAULT_ALTITUDE; ++ gdouble alt = NAN; + ee = exif_content_get_entry (ed->ifd[EXIF_IFD_GPS], EXIF_TAG_GPS_ALTITUDE); + if ( ee && ee->components == 1 && ee->format == EXIF_FORMAT_RATIONAL ) { + alt = Rational2Double ( ee->data, diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template index c860fe5eecc..64cbe578689 100644 --- a/srcpkgs/viking/template +++ b/srcpkgs/viking/template @@ -1,12 +1,12 @@ # Template file for 'viking' pkgname=viking -version=1.7 -revision=2 +version=1.8 +revision=1 build_style=gnu-configure configure_args="--disable-realtime-gps-tracking --disable-bluemarble --disable-bing --disable-terraserver --disable-spotmaps --disable-expedia --disable-mapnik --enable-magic --enable-bzip2 - --enable-mbtiles" + --enable-mbtiles --with-libexif" hostmakedepends="gdk-pixbuf-devel intltool pkg-config" makedepends="file-devel gnome-doc-utils gtk+-devel libcurl-devel libexif-devel libgexiv2-devel sqlite-devel bzip2-devel geoclue2-devel liboauth-devel @@ -16,4 +16,5 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/viking" distfiles="${SOURCEFORGE_SITE}/viking/viking-${version}.tar.bz2" -checksum=7c791e8cdb62dbf4776e37f95fdb2825ac48550e3f6829a015e1b30c76135824 +checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8 +patch_args="-Np1"