From 6ed0347be76345f928ba47b6ac2831643bdc9e7b 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, 22 Nov 2020 09:25:09 +0700
Subject: [PATCH] kadu: remove noarch

---
 srcpkgs/kadu-data     |  1 -
 srcpkgs/kadu/template | 21 +++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/kadu-data

diff --git a/srcpkgs/kadu-data b/srcpkgs/kadu-data
deleted file mode 120000
index c6b22664110..00000000000
--- a/srcpkgs/kadu-data
+++ /dev/null
@@ -1 +0,0 @@
-kadu
\ No newline at end of file
diff --git a/srcpkgs/kadu/template b/srcpkgs/kadu/template
index da8c8c086ff..8587198ae71 100644
--- a/srcpkgs/kadu/template
+++ b/srcpkgs/kadu/template
@@ -1,7 +1,7 @@
 # Template file for 'kadu'
 pkgname=kadu
 version=4.3
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
  -DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -19,7 +19,7 @@ makedepends="libao-devel libsndfile-devel libarchive-devel
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
  libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
  libX11-devel libXfixes-devel libXScrnSaver-devel"
-depends="${pkgname}-data-${version}_${revision} hicolor-icon-theme qca-qt5-ossl
+depends="hicolor-icon-theme qca-qt5-ossl
  $(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
  $(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)
  $(vopt_if tds qt5-plugin-tds)"
@@ -29,6 +29,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://sourceforge.net/projects/kadu/"
 distfiles="${SOURCEFORGE_SITE}/kadu/${version}/kadu-${version}.tar.bz2"
 checksum=ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e
+replaces="kadu-data>=0"
 
 build_options="mysql odbc pgsql sqlite tds"
 build_options_default="sqlite"
@@ -53,22 +54,6 @@ pre_configure() {
 		-e "s;word_fix$;;"
 }
 
-kadu-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/icons
-		vmove "usr/share/kadu/configuration/*.ui"
-		vmove usr/share/kadu/themes
-		vmove usr/share/kadu/scripts
-		vmove usr/share/kadu/syntax
-		vmove "usr/share/kadu/plugins/*.desc"
-		vmove "usr/share/kadu/plugins/configuration/*.ui"
-		vmove usr/share/kadu/translations
-		vmove usr/share/kadu/plugins/data
-		vmove usr/share/kadu/plugins/translations
-	}
-}
 kadu-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"