upgpkg: mate-tweak 3.5.7-1

Update to new version

3 files changed, 13 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a5277246865..8ad2ba20aecc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Feb 26 04:31:06 UTC 2016
+# Mon Mar 14 19:18:32 UTC 2016
 pkgbase = mate-tweak
 	pkgdesc = Tweak tool for MATE, a fork of mintDesktop
-	pkgver = 3.5.6
-	pkgrel = 2
+	pkgver = 3.5.7
+	pkgrel = 1
 	url = https://bitbucket.org/ubuntu-mate/mate-tweak
 	arch = any
 	license = GPL
@@ -21,13 +21,11 @@ pkgbase = mate-tweak
 	optdepends = mate-menu: to enable advanced menu
 	optdepends = plank: for Cupertino panel layout
 	optdepends = topmenu-gtk: for Mutiny panel layout
-	source = mate-tweak-3.5.6::git+https://bitbucket.org/ubuntu-mate/mate-tweak.git#tag=3.5.6
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_16.04.2.tar.xz
-	source = 0001-Fix-checking-available-features.patch
+	source = mate-tweak-3.5.7::git+https://bitbucket.org/ubuntu-mate/mate-tweak.git#tag=3.5.7
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_16.04.3.tar.xz
 	source = fix-mutiny-fresh.patch
 	md5sums = SKIP
-	md5sums = 9003c6af0c1851c6e7a5926fe061d258
-	md5sums = 1717e0df056603a840b1f1daa52cdb13
+	md5sums = 97fa25906e39bcd09114e79b6f462f76
 	md5sums = e389460b0f34dc6da6622830efa05273
 
 pkgname = mate-tweak
diff --git a/0001-Fix-checking-available-features.patch b/0001-Fix-checking-available-features.patch
deleted file mode 100644
index 7887263ad743..000000000000
--- a/0001-Fix-checking-available-features.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c69c3105073a534015ca3d9edf9b6902836dc02d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
-Date: Fri, 26 Feb 2016 04:39:33 +0100
-Subject: [PATCH] Fix checking available features
-
-Indicators and advanced menu are need to be checked in the update_panel_layout_features function, othervise it's always enabled if the layouts files are availabe.
----
- mate-tweak | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/mate-tweak b/mate-tweak
-index a31622b..7d8f058 100755
---- a/mate-tweak
-+++ b/mate-tweak
-@@ -409,8 +409,14 @@ class MateTweak:
-         if self.panel_layout_exists(panel_layout + '-fresh') and \
-            self.panel_layout_exists(panel_layout + '-indicators') and \
-            self.panel_layout_exists(panel_layout + '-indicators-fresh'):
--            self.builder.get_object('checkbutton_indicators').props.sensitive = True
--            self.builder.get_object('checkbutton_advanced_menu').props.sensitive = True
-+            if not self.indicators_available:
-+                self.builder.get_object('checkbutton_indicators').props.sensitive = False
-+            else:
-+                self.builder.get_object('checkbutton_indicators').props.sensitive = True
-+            if not self.mate_menu_available:
-+                self.builder.get_object('checkbutton_advanced_menu').props.sensitive = False
-+            else:
-+                self.builder.get_object('checkbutton_advanced_menu').props.sensitive = True
-         else:
-             self.builder.get_object('checkbutton_indicators').props.sensitive = False
-             self.builder.get_object('checkbutton_advanced_menu').props.sensitive = False
-@@ -664,15 +670,6 @@ class MateTweak:
- 
- 
-     def make_list_of_panel_layouts(self):
--        if not self.indicators_available:
--            self.builder.get_object('checkbutton_indicators').props.sensitive = False
--        else:
--            self.builder.get_object('checkbutton_indicators').props.sensitive = True
--        if not self.mate_menu_available:
--            self.builder.get_object('checkbutton_advanced_menu').props.sensitive = False
--        else:
--            self.builder.get_object('checkbutton_advanced_menu').props.sensitive = True
--
-         # Panel layouts
-         panels = Gtk.ListStore(str, str)
- 
--- 
-2.7.1
-
diff --git a/PKGBUILD b/PKGBUILD
index dd3154280133..102030bd4607 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,10 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=mate-tweak
-pkgver=3.5.6
-_umsver=16.04.2
-pkgrel=2
+pkgver=3.5.7
+_umsver=16.04.3
+_umsver2=16.04.2
+pkgrel=1
 pkgdesc="Tweak tool for MATE, a fork of mintDesktop"
 arch=('any')
 url="https://bitbucket.org/ubuntu-mate/mate-tweak"
@@ -18,23 +19,20 @@ optdepends=('gnome-main-menu: for openSUSE panel layout'
             'topmenu-gtk: for Mutiny panel layout')
 source=("$pkgname-$pkgver::git+https://bitbucket.org/ubuntu-mate/$pkgname.git#tag=$pkgver"
         "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_$_umsver.tar.xz"
-        "0001-Fix-checking-available-features.patch"
         "fix-mutiny-fresh.patch")
 md5sums=('SKIP'
-         '9003c6af0c1851c6e7a5926fe061d258'
-         '1717e0df056603a840b1f1daa52cdb13'
+         '97fa25906e39bcd09114e79b6f462f76'
          'e389460b0f34dc6da6622830efa05273')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../0001-Fix-checking-available-features.patch
   sed -i 's|/usr/lib/mate-applets/topmenu-mate-panel-applet|/usr/lib/topmenu-gtk/topmenu-mate-panel-applet|' mate-tweak
-  cd ../ubuntu-mate-settings-16.04.1
+  cd ../ubuntu-mate-settings-$_umsver2
   patch -Np1 -i ../fix-mutiny-fresh.patch
 }
 
 package() {
   cd $pkgname-$pkgver
   python3 setup.py install --root="$pkgdir" --optimize=1
-  cp -r "$srcdir/ubuntu-mate-settings-16.04.1/usr/share/mate-panel" "$pkgdir/usr/share"
+  cp -r "$srcdir/ubuntu-mate-settings-$_umsver2/usr/share/mate-panel" "$pkgdir/usr/share"
 }