Split qmltermwidget off into separate package; update icon handling

3 files changed, 24 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab63a5ea4dcf..7075b8e6d4a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = cool-retro-term-git
 	pkgdesc = A good looking terminal emulator which mimics the old cathode display
-	pkgver = 1.0.0RC1.r0.g9364aa3
+	pkgver = 1.0.0RC1.r39.g40eb51e
 	pkgrel = 1
 	url = https://github.com/Swordfish90/cool-retro-term
+	install = cool-retro-term.install
 	arch = i686
 	arch = x86_64
-	license = GPL
 	license = GPL3
 	makedepends = git
+	depends = qmltermwidget-git
 	depends = qt5-quickcontrols
 	depends = qt5-graphicaleffects
-	conflicts = cool-old-term-git
-	replaces = cool-old-term-git
+	depends = hicolor-icon-theme
 	source = git://github.com/Swordfish90/cool-retro-term.git
-	source = git://github.com/Swordfish90/qmltermwidget.git
-	md5sums = SKIP
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = cool-retro-term-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 74e44d263cba..a6989d6ad2f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,21 @@
 
 pkgname=cool-retro-term-git
 pkgrel=1
-pkgver=1.0.0RC1.r0.g9364aa3
+pkgver=1.0.0RC1.r39.g40eb51e
 pkgdesc='A good looking terminal emulator which mimics the old cathode display'
 arch=('i686' 'x86_64')
 url='https://github.com/Swordfish90/cool-retro-term'
-license=('GPL' 'GPL3')
-depends=('qt5-quickcontrols' 'qt5-graphicaleffects')
+license=('GPL3')
+depends=('qmltermwidget-git' 'qt5-quickcontrols' 'qt5-graphicaleffects' 'hicolor-icon-theme')
 makedepends=('git')
-replaces=('cool-old-term-git')
-conflicts=('cool-old-term-git')
-source=("git://github.com/Swordfish90/cool-retro-term.git"
-        "git://github.com/Swordfish90/qmltermwidget.git")
-md5sums=('SKIP'
-         'SKIP')
+install=${pkgname%-*}.install
+source=("git://github.com/Swordfish90/cool-retro-term.git")
+sha256sums=('SKIP')
 
 prepare() {
   cd "$srcdir/${pkgname%-*}"
 
-  git submodule init
-  git config submodule.qmltermwidget.url "$srcdir/qmltermwidget"
-  git submodule update
+  sed -i '/qmltermwidget/d' cool-retro-term.pro
 }
 
 pkgver () {
@@ -43,7 +38,4 @@ package() {
   cd "$srcdir/${pkgname%-*}"
 
   make INSTALL_ROOT="$pkgdir" install
-
-  install -d "$pkgdir/usr/lib/qt/qml/"
-  cp -a qmltermwidget/QMLTermWidget "$pkgdir/usr/lib/qt/qml/"
 }
diff --git a/cool-retro-term.install b/cool-retro-term.install
new file mode 100644
index 000000000000..2771fcd6557c
--- /dev/null
+++ b/cool-retro-term.install
@@ -0,0 +1,12 @@
+post_install() {
+  [[ -x /usr/bin/xdg-icon-resource ]] && xdg-icon-resource forceupdate --theme hicolor || \
+  ( [[ -x /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache )
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}