Replaced gnome-desktop dep with cinnamon-desktop

3 files changed, 13 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbd0c6c7a605..05fa244fa2cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Sun Dec 10 19:17:40 UTC 2017
 pkgbase = xviewer
 	pkgdesc = A simple and easy to use image viewer. X-Apps Project.
 	pkgver = 1.6.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/linuxmint/xviewer
-	install = xviewer.install
 	arch = i686
 	arch = x86_64
 	arch = armv7h
@@ -15,13 +12,13 @@ pkgbase = xviewer
 	makedepends = gobject-introspection
 	depends = gtk3
 	depends = glib2
-	depends = gnome-desktop
+	depends = cinnamon-desktop
 	depends = libpeas
 	optdepends = xviewer-plugins: Extra plugins
 	provides = xviewer
 	conflicts = xviewer-git
-	source = xviewer-1.6.1.tar.gz::https://github.com/linuxmint/xviewer/archive/1.6.1.tar.gz
-	md5sums = 583cba9c604f3f48b4bf36c18bdc885b
+	source = xviewer-1.6.1-3.tar.gz::https://github.com/linuxmint/xviewer/archive/master.mint19.tar.gz
+	md5sums = 43df95793771b6ba65b7e0e650994591
 
 pkgname = xviewer
 
diff --git a/PKGBUILD b/PKGBUILD
index ac08447cb23d..e16d794711a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,25 @@
 
 pkgname=xviewer
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple and easy to use image viewer. X-Apps Project."
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
-depends=('gtk3' 'glib2' 'gnome-desktop' 'libpeas')
+depends=('gtk3' 'glib2' 'cinnamon-desktop' 'libpeas')
 makedepends=('gnome-common' 'libglade' 'gobject-introspection')
 optdepends=('xviewer-plugins: Extra plugins')
 provides=($pkgname)
 conflicts=('xviewer-git')
 url='https://github.com/linuxmint/xviewer'
-install=xviewer.install
 
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/${pkgname}/archive/${pkgver}.tar.gz")
-md5sums=('583cba9c604f3f48b4bf36c18bdc885b')
+_upstreamversion='master.mint19'  # Hmmm...
+
+source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::https://github.com/linuxmint/${pkgname}/archive/${_upstreamversion}.tar.gz")
+md5sums=('43df95793771b6ba65b7e0e650994591')
 
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd ${srcdir}/${pkgname}-${_upstreamversion}
+
     gnome-autogen.sh --prefix="/usr" \
         --localstatedir="/var" \
          --libexecdir="/usr/lib/${pkgname}"
@@ -26,6 +28,6 @@ build() {
 }
 
 package(){
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd ${srcdir}/${pkgname}-${_upstreamversion}
     make DESTDIR="$pkgdir/" install
 }
diff --git a/xviewer.install b/xviewer.install
deleted file mode 100644
index 04122f560408..000000000000
--- a/xviewer.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install(){
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-}
-
-post_upgrade(){
-    post_install
-}
-
-post_remove(){
-    post_install
-}