Update for 18.04.11

3 files changed, 11 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 352fcc963e3a..86118b489e3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mate-tweak
 	pkgdesc = Tweak tool for MATE (fork of MintDesktop)
-	pkgver = 18.04.10
+	pkgver = 18.04.11
 	pkgrel = 1
 	url = https://github.com/ubuntu-mate/mate-tweak
 	arch = any
@@ -23,10 +23,10 @@ pkgbase = mate-tweak
 	optdepends = tilda: to enable pull-down terminal
 	optdepends = topmenu-gtk: for Mutiny panel layout
 	optdepends = vala-panel-appmenu-mate: for Mutiny,Cupertino
-	source = mate-tweak-18.04.10.tar.gz::https://github.com/ubuntu-mate/mate-tweak/archive/18.04.10.tar.gz
-	source = ubuntu-mate-settings-18.04.7.tar.gz::https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_18.04.7.tar.xz
-	sha256sums = a1e9873094011093dbe48f2c997ab078c5586305f58e761e48c7c72df1dae59c
-	sha256sums = 1cd12b2c32592ca72a6584d9b74ff98d8256c08c40957c2fb7f15db295c6bc8c
+	source = mate-tweak-18.04.11.tar.gz::https://github.com/ubuntu-mate/mate-tweak/archive/18.04.11.tar.gz
+	source = ubuntu-mate-settings-18.04.9.tar.gz::https://github.com/ubuntu-mate/ubuntu-mate-settings/archive/18.04.9.tar.gz
+	sha256sums = 331f7f4b31e7301612e7980ded3d7dad126007f88dcddd1f333a5ab61ff9eac6
+	sha256sums = d6cbd3bebbd57f0ff3f38275dc76f859c9a45bf3fbdaf59b3fbd4eb1170b69d5
 
 pkgname = mate-tweak
 
diff --git a/41.patch b/41.patch
deleted file mode 100644
index 5298a0ba3db2..000000000000
--- a/41.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 632cf9e907b3..33c1016776c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=mate-tweak
-pkgver=18.04.10
-_umsver=18.04.7
+pkgver=18.04.11
+_umsver=18.04.9
 pkgrel=1
 pkgdesc="Tweak tool for MATE (fork of MintDesktop)"
 arch=('any')
@@ -23,10 +23,9 @@ optdepends=('brisk-menu: for Manjaro 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"
-        "ubuntu-mate-settings-$_umsver.tar.gz::https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_$_umsver.tar.xz")
-sha256sums=('a1e9873094011093dbe48f2c997ab078c5586305f58e761e48c7c72df1dae59c'
-            '1cd12b2c32592ca72a6584d9b74ff98d8256c08c40957c2fb7f15db295c6bc8c')
+        "ubuntu-mate-settings-$_umsver.tar.gz::https://github.com/ubuntu-mate/ubuntu-mate-settings/archive/$_umsver.tar.gz")
+sha256sums=('331f7f4b31e7301612e7980ded3d7dad126007f88dcddd1f333a5ab61ff9eac6'
+            'd6cbd3bebbd57f0ff3f38275dc76f859c9a45bf3fbdaf59b3fbd4eb1170b69d5')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -36,6 +35,5 @@ prepare() {
 package() {
   cd "$pkgname-$pkgver"
   python setup.py install --root="$pkgdir" --optimize=1
-  #cp -r "$srcdir"/ubuntu-mate-settings-$_umsver/usr/share/mate-panel "$pkgdir/usr/share"
-  cp -r "$srcdir"/ubuntu-mate-settings/usr/share/mate-panel "$pkgdir/usr/share"
+  cp -r "$srcdir"/ubuntu-mate-settings-$_umsver/usr/share/mate-panel "$pkgdir/usr/share"
 }