Update for 18.04.9. Add patch to fix starting on MATE 1.20.

3 files changed, 51 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38ab59435fa9..9cd5139fa3ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = mate-tweak
 	pkgdesc = Tweak tool for MATE (fork of MintDesktop)
-	pkgver = 18.04.7
+	pkgver = 18.04.9
 	pkgrel = 1
 	url = https://github.com/ubuntu-mate/mate-tweak
 	arch = any
 	license = GPL
 	makedepends = python-distutils-extra
 	makedepends = python-setuptools
+	depends = gtk3
 	depends = libnotify
 	depends = mate-applets
 	depends = python-configobj
 	depends = python-gobject
 	depends = python-psutil
 	depends = python-setproctitle
+	optdepends = brisk-menu: for Manjaro panel layout
 	optdepends = mate-applet-dock: for Mutiny panel layout
 	optdepends = mate-menu: to enable advanced menu
 	optdepends = mate-netbook: for Netbook panel layout
@@ -20,10 +22,13 @@ pkgbase = mate-tweak
 	optdepends = synapse: to enable launcher
 	optdepends = tilda: to enable pull-down terminal
 	optdepends = topmenu-gtk: for Mutiny panel layout
-	source = mate-tweak-18.04.7.tar.gz::https://github.com/ubuntu-mate/mate-tweak/archive/18.04.7.tar.gz
-	source = ubuntu-mate-settings-18.04.4.tar.gz::https://github.com/ubuntu-mate/ubuntu-mate-settings/archive/18.04.4.tar.gz
-	sha256sums = f58cdb03f77afd231efec159a21f33e712c48bb4b23cc73ef69c0ddc5b3cb4c4
-	sha256sums = 4fc738e151d880fd87bf6c62ee573090855a04df6ba43542d048852d5edd68eb
+	optdepends = vala-panel-appmenu-mate: for Mutiny,Cupertino
+	source = mate-tweak-18.04.9.tar.gz::https://github.com/ubuntu-mate/mate-tweak/archive/18.04.9.tar.gz
+	source = ubuntu-mate-settings-18.04.6.tar.gz::https://github.com/ubuntu-mate/ubuntu-mate-settings/archive/18.04.6.tar.gz
+	source = 41.patch
+	sha256sums = 52d67bb8b52b08a1027677ee671da507977d2db299d40c77eb164c8419e529ae
+	sha256sums = a4e65836a5c5820607e9b948aa02e77deb493f72c29145f46ddb19dc50e019ba
+	sha256sums = c1657e08eb517a040a6209eebb0e67b477f3e65010cbc800f62f3712e048b617
 
 pkgname = mate-tweak
 
diff --git a/41.patch b/41.patch
new file mode 100644
index 000000000000..5298a0ba3db2
--- /dev/null
+++ b/41.patch
@@ -0,0 +1,26 @@
+From 723d70174a431bc0a427733161bfb7f26db3e660 Mon Sep 17 00:00:00 2001
+From: Ikey Doherty <ikey@solus-project.com>
+Date: Thu, 8 Feb 2018 15:34:27 +0000
+Subject: [PATCH] Do not use uninitialised properties on startup
+
+This alleviates a crash on startup when the appmenu module isn't actually
+installed.
+
+Signed-off-by: Ikey Doherty <ikey@solus-project.com>
+---
+ mate-tweak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mate-tweak b/mate-tweak
+index c9e6216..4f9745c 100755
+--- a/mate-tweak
++++ b/mate-tweak
+@@ -1513,7 +1513,7 @@ class MateTweak:
+         self.builder.get_object("checkbox_localmenu").set_tooltip_text(_("Display application menus in the application window. When local menus are disabled, add the Global Menu applet to a panel to see them."))
+ 
+         # Locally integrated menus
+-        if self.schema_has_key('org.mate.interface', 'gtk-shell-shows-menubar'):
++        if self.schema_has_key('org.mate.interface', 'gtk-shell-shows-menubar') and self.appmenu_available:
+             self.builder.get_object("checkbox_localmenu").connect("toggled", self.toggle_localmenu)
+             self.builder.get_object("checkbox_localmenu").set_active(self.show_localmenu)
+         else:
diff --git a/PKGBUILD b/PKGBUILD
index bcec8f127ab0..36acb108204b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,30 +4,37 @@
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=mate-tweak
-pkgver=18.04.7
-_umsver=18.04.4
+pkgver=18.04.9
+_umsver=18.04.6
 pkgrel=1
 pkgdesc="Tweak tool for MATE (fork of MintDesktop)"
 arch=('any')
 url="https://github.com/ubuntu-mate/mate-tweak"
 license=('GPL')
-depends=('libnotify' 'mate-applets' 'python-configobj' 'python-gobject' 'python-psutil' 'python-setproctitle')
+depends=('gtk3' 'libnotify' 'mate-applets' 'python-configobj' 'python-gobject' 'python-psutil' 'python-setproctitle')
 makedepends=('python-distutils-extra' 'python-setuptools')
-optdepends=('mate-applet-dock: for Mutiny panel layout'
+optdepends=('brisk-menu: for Manjaro panel layout'
+            'mate-applet-dock: for Mutiny panel layout'
             'mate-menu: to enable advanced menu'
             'mate-netbook: for Netbook panel layout'
             'plank: for Cupertino panel layout'
             'synapse: to enable launcher'
             'tilda: to enable pull-down terminal'
-            'topmenu-gtk: for Mutiny panel layout')
+            'topmenu-gtk: for Mutiny panel layout'
+            'vala-panel-appmenu-mate: for Mutiny,Cupertino')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/ubuntu-mate/$pkgname/archive/$pkgver.tar.gz"
-        "ubuntu-mate-settings-$_umsver.tar.gz::https://github.com/ubuntu-mate/ubuntu-mate-settings/archive/$_umsver.tar.gz")
-sha256sums=('f58cdb03f77afd231efec159a21f33e712c48bb4b23cc73ef69c0ddc5b3cb4c4'
-            '4fc738e151d880fd87bf6c62ee573090855a04df6ba43542d048852d5edd68eb')
+        "ubuntu-mate-settings-$_umsver.tar.gz::https://github.com/ubuntu-mate/ubuntu-mate-settings/archive/$_umsver.tar.gz"
+        '41.patch')
+sha256sums=('52d67bb8b52b08a1027677ee671da507977d2db299d40c77eb164c8419e529ae'
+            'a4e65836a5c5820607e9b948aa02e77deb493f72c29145f46ddb19dc50e019ba'
+            'c1657e08eb517a040a6209eebb0e67b477f3e65010cbc800f62f3712e048b617')
 
 prepare() {
   cd "$pkgname-$pkgver"
   sed -i 's|/usr/lib/mate-applets/topmenu-mate-panel-applet|/usr/lib/topmenu-gtk/topmenu-mate-panel-applet|' mate-tweak
+
+  # Patch to fix starting on MATE 1.20, https://github.com/ubuntu-mate/mate-tweak/pull/41
+  patch -Np1 < ../41.patch
 }
 
 package() {