Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions srcpkgs/viking/patches/0001-test-remove-ubsan-from-AM_CFLAGS.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/test/Makefile.in b/test/Makefile.in
index fbe2801..3714842 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -659,7 +659,7 @@ top_srcdir = @top_srcdir@

# Ideally want to use -fsanitize=address and/or -fsanitize=leak too;
# but either bugs in Viking or GTK libs not auto cleaning up - means can't use
-AM_CFLAGS = -Wall -fsanitize=undefined -fstack-protector-all \
+AM_CFLAGS = -Wall -fstack-protector-all \
-I$(top_srcdir)/src \
$(PACKAGE_CFLAGS) $(GTK_CFLAGS)

11 changes: 0 additions & 11 deletions srcpkgs/viking/patches/32bit-test.patch

This file was deleted.

18 changes: 6 additions & 12 deletions srcpkgs/viking/template
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
# Template file for 'viking'
pkgname=viking
version=1.9
revision=3
version=1.11
revision=1
build_style=gnu-configure
configure_args="--disable-mapnik"
hostmakedepends="glib-devel pkg-config gettext intltool itstool libxslt docbook-xsl"
configure_args="--disable-mapnik --disable-ubsan"
hostmakedepends="glib-devel pkg-config gettext intltool itstool libxslt docbook-xsl xxd"
makedepends="gtk+3-devel libcurl-devel geoclue2-devel sqlite-devel file-devel
libgexiv2-devel liboauth-devel gpsd-devel libzip-devel nettle-devel"
libgexiv2-devel liboauth-devel gpsd-devel libzip-devel nettle-devel libnova-devel"
checkdepends="yelp-tools"
short_desc="Open/source GPS data editor and analyzer"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/viking"
distfiles="${SOURCEFORGE_SITE}/viking/viking-${version}.tar.bz2"
checksum=fe4acf3d24121d6f3097d17ea704b42c0336a8f693151886b8b26e308dbfcb3b
checksum=fe21d5c111ef20877d1cd95b1a4bc34faae9dd3a17bac923f418e1271a3cfc91

CFLAGS="-fcommon"

post_patch() {
vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
configure
}