From 9e299adf1d7cdf52b5fdbfd18b29e9a36085ad23 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: Sat, 12 Sep 2020 20:59:21 +0700
Subject: [PATCH] backintime-qt: merge into backintime, drop noarch

---
 srcpkgs/backintime-qt          |  1 +
 srcpkgs/backintime-qt/template | 19 --------------
 srcpkgs/backintime/template    | 47 ++++++++++++++++++++++++++++++----
 3 files changed, 43 insertions(+), 24 deletions(-)
 create mode 120000 srcpkgs/backintime-qt
 delete mode 100644 srcpkgs/backintime-qt/template

diff --git a/srcpkgs/backintime-qt b/srcpkgs/backintime-qt
new file mode 120000
index 00000000000..7d448d8b48e
--- /dev/null
+++ b/srcpkgs/backintime-qt
@@ -0,0 +1 @@
+backintime
\ No newline at end of file
diff --git a/srcpkgs/backintime-qt/template b/srcpkgs/backintime-qt/template
deleted file mode 100644
index 8453da9bafb..00000000000
--- a/srcpkgs/backintime-qt/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'backintime-qt'
-pkgname=backintime-qt
-version=1.2.1
-revision=1
-archs=noarch
-wrksrc=backintime-${version}
-build_wrksrc="qt"
-build_style=configure
-configure_args="--python3"
-pycompile_dirs="/usr/share/backintime"
-hostmakedepends="python3"
-depends="backintime python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
-short_desc="Qt Gui for backintime"
-maintainer="Alpicoid <alpicoid@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/bit-team/backintime"
-distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
-checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644
-python_version=3
diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template
index 2dfc98051f7..92813476381 100644
--- a/srcpkgs/backintime/template
+++ b/srcpkgs/backintime/template
@@ -1,18 +1,55 @@
 # Template file for 'backintime'
 pkgname=backintime
 version=1.2.1
-revision=1
-archs=noarch
-build_wrksrc="common"
-build_style=configure
+revision=2
 configure_args="--python3"
 pycompile_dirs="/usr/share/backintime"
 hostmakedepends="gettext python3"
 depends="python3 rsync python3-dbus python3-keyring"
 short_desc="Simple backup tool for Linux"
 maintainer="Alpicoid <alpicoid@tuta.io>"
-license="GPL-2.0-only"
+license="GPL-2.0-or-later"
 homepage="https://github.com/bit-team/backintime"
 distfiles="https://github.com/bit-team/backintime/releases/download/v${version}/backintime-${version}.tar.gz"
 checksum=eef2aa4f43ac23fb0d45239a4bb2f7e5025afdca2ae4e6d6d9d6e722e8b17644
 python_version=3
+
+do_configure() {
+	cd $wrksrc/common
+	./configure $configure_args
+	cd $wrksrc/qt
+	./configure $configure_args
+}
+
+do_build() {
+	cd $wrksrc/common
+	make ${makejobs}
+	cd $wrksrc/qt
+	make ${makejobs}
+}
+
+do_install() {
+	cd $wrksrc/common
+	make install DESTDIR=$DESTDIR
+	cd $wrksrc/qt
+	make install DESTDIR=$DESTDIR
+}
+
+backintime-qt_package() {
+	short_desc+=" - Qt GUI"
+	depends="backintime-${version}_${revision}
+	 python3-PyQt5 python3-PyQt5-dbus libnotify xdpyinfo"
+	pkg_install() {
+		vmove etc/dbus-1
+		vmove "usr/bin/backintime-qt*"
+		vmove usr/share/applications
+		vmove usr/share/backintime/qt
+		vmove usr/share/bash-completion/completions/backintime-qt
+		vmove usr/share/dbus-1
+		vmove usr/share/doc/backintime-qt
+		vmove usr/share/doc/qt
+		vmove usr/share/icons
+		vmove "usr/share/man/man1/backintime-qt*"
+		vmove usr/share/polkit-1
+	}
+}