diff --git a/srcpkgs/geda/patches/snarf_cpp_opts.patch b/srcpkgs/geda/patches/snarf_cpp_opts.patch
new file mode 100644
index 0000000000..1eec9b6f6d
--- /dev/null
+++ b/srcpkgs/geda/patches/snarf_cpp_opts.patch
@@ -0,0 +1,17 @@
+--- gschem/src/Makefile.orig	2019-10-08 20:33:14.000000000 +0200
++++ gschem/src/Makefile.in	2019-10-12 15:49:39.966600662 +0200
+@@ -2693,12 +2693,12 @@
+ 	$(AM_V_SNARF)CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
+ 
+ actions.decl.x: actions.decl.h actions.c Makefile
+-	$(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \
++	$(AM_V_GEN)$(CPP) -I$(srcdir) $< | \
+ 	  sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \
+ 	mv $@.tmp $@
+ 
+ actions.init.x: actions.init.c actions.c Makefile
+-	$(AM_V_GEN)$(CPP) -I$(srcdir) -c $< | \
++	$(AM_V_GEN)$(CPP) -I$(srcdir) $< | \
+ 	  sed -e '/^.*KEEP_LINE /!d' -e 's/^.*KEEP_LINE //' > $@.tmp && \
+ 	mv $@.tmp $@
+ 
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index 23d895d138..db74437e90 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -1,12 +1,12 @@
 # Template file for 'geda'
 pkgname=geda
-version=1.8.2
-revision=7
+version=1.10.0
+revision=1
 wrksrc="${pkgname}-gaf-${version}"
 build_style=gnu-configure
-configure_args="--with-sysroot=/${XBPS_CROSS_BASE}"
-hostmakedepends="pkg-config guile desktop-file-utils shared-mime-info"
-makedepends="gc-devel gtk+-devel guile-devel"
+make_build_args="V=1"
+hostmakedepends="pkg-config guile python desktop-file-utils shared-mime-info"
+makedepends="gamin-devel gc-devel gtk+-devel guile-devel python-devel libatomic_ops-devel"
 depends="guile geda-data"
 checkdepends="perl"
 short_desc="Electronic Design Automation tool"
@@ -14,12 +14,19 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
 homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
-checksum=bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721
+checksum=5eb7a619f9d9cbcfa895468d6eae888d7e1d519dfff717b9f8f22fbeb37a3b1a
 
-if [ "${XBPS_ARCH}" = "x86_64" ]; then
-	hostmakedepends+=" glibc-devel-32bit"
+if [ "$CROSS_BUILD" ]; then
+	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+		broken="The host ($XBPS_WORDSIZE) and target ($XBPS_TARGET_WORDSIZE) word sizes need to be the same for cross building."
+	fi
 fi
 
+pre_configure() {
+	mkdir -p gnu
+	touch gnu/stubs-32.h
+}
+
 geda-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"