upgpkg: mate-menu 5.6.6-2

Apply a workaround

3 files changed, 21 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b18be92235c6..3c46895f8969 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Dec 16 14:59:11 UTC 2015
+# Thu Dec 17 01:38:11 UTC 2015
 pkgbase = mate-menu
 	pkgdesc = Advanced menu for MATE Panel, a fork of MintMenu
 	pkgver = 5.6.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://bitbucket.org/ubuntu-mate/mate-menu
 	install = mate-menu.install
 	arch = any
@@ -21,9 +21,11 @@ pkgbase = mate-menu
 	source = mate-menu-5.6.6::git+https://bitbucket.org/ubuntu-mate/mate-menu.git#tag=5.6.6
 	source = fix-crash.patch
 	source = optional-lsb_release.patch
+	source = workaround.patch
 	md5sums = SKIP
 	md5sums = 4c48e1b70b8b17257cacb0755ca23595
 	md5sums = ba78ee5386cab68e55a3f0f5ca0c53f6
+	md5sums = af1ed157067e941ad3be9a7ea3f50ae1
 
 pkgname = mate-menu
 
diff --git a/PKGBUILD b/PKGBUILD
index 18f9f60d85e0..427adc661bcb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mate-menu
 pkgver=5.6.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced menu for MATE Panel, a fork of MintMenu"
 arch=('any')
 url="https://bitbucket.org/ubuntu-mate/mate-menu"
@@ -13,15 +13,18 @@ makedepends=('git' 'python2-distutils-extra' 'python2-setuptools')
 install=$pkgname.install
 source=("$pkgname-$pkgver::git+https://bitbucket.org/ubuntu-mate/$pkgname.git#tag=$pkgver"
         fix-crash.patch
-        optional-lsb_release.patch)
+        optional-lsb_release.patch
+        workaround.patch)
 md5sums=('SKIP'
          '4c48e1b70b8b17257cacb0755ca23595'
-         'ba78ee5386cab68e55a3f0f5ca0c53f6')
+         'ba78ee5386cab68e55a3f0f5ca0c53f6'
+         'af1ed157067e941ad3be9a7ea3f50ae1')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../fix-crash.patch
   patch -Np1 -i ../optional-lsb_release.patch
+  patch -Np1 -i ../workaround.patch
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' lib/*.py
 }
 
diff --git a/workaround.patch b/workaround.patch
new file mode 100644
index 000000000000..4bf9f5856cb0
--- /dev/null
+++ b/workaround.patch
@@ -0,0 +1,11 @@
+diff -Naur mate-menu-5.6.6.orig/lib/mate-menu-config.py mate-menu-5.6.6/lib/mate-menu-config.py
+--- mate-menu-5.6.6.orig/lib/mate-menu-config.py	2015-12-17 02:33:58.891764000 +0100
++++ mate-menu-5.6.6/lib/mate-menu-config.py	2015-12-17 02:35:01.542250580 +0100
+@@ -297,7 +297,6 @@
+ 
+         self.toggleUseCustomColors(self.useCustomColors)
+         self.mainWindow.present()
+-        self.getBackgroundColor()
+ 
+     def set_theme(self, widget):
+         model = widget.get_model()