From 10337def2275160d053caab1dfdea798edaaad2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 29 Nov 2020 11:31:21 +0700
Subject: [PATCH] geda: remove noarch

---
 srcpkgs/geda-data     |  1 -
 srcpkgs/geda/template | 15 ++++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/geda-data

diff --git a/srcpkgs/geda-data b/srcpkgs/geda-data
deleted file mode 120000
index bae9ec91442..00000000000
--- a/srcpkgs/geda-data
+++ /dev/null
@@ -1 +0,0 @@
-geda
\ No newline at end of file
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index fbce8bbf734..3bdf38abe85 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -1,13 +1,13 @@
 # Template file for 'geda'
 pkgname=geda
 version=1.10.0
-revision=3
+revision=4
 wrksrc="${pkgname}-gaf-${version}"
 build_style=gnu-configure
 configure_args="--disable-update-xdg-database"
 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"
+depends="guile"
 checkdepends="perl"
 short_desc="Electronic Design Automation tool"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@@ -15,8 +15,9 @@ 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=5eb7a619f9d9cbcfa895468d6eae888d7e1d519dfff717b9f8f22fbeb37a3b1a
-CFLAGS="-Wno-deprecated-declarations"
+CFLAGS="-Wno-deprecated-declarations -fcommon"
 python_version=2
+replaces="geda-data>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
@@ -43,17 +44,9 @@ geda-devel_package() {
 	}
 }
 geda-doc_package() {
-	archs=noarch
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - documentation and exmaple files"
 	pkg_install() {
 		vmove usr/share/doc
 	}
 }
-geda-data_package() {
-	archs=noarch
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/gEDA
-	}
-}