upgpkg: mate-menu 5.6.6-2

Apply a proper fix

4 files changed, 30 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c46895f8969..e5454605d4bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Dec 17 01:38:11 UTC 2015
+# Thu Dec 17 01:47:30 UTC 2015
 pkgbase = mate-menu
 	pkgdesc = Advanced menu for MATE Panel, a fork of MintMenu
 	pkgver = 5.6.6
@@ -21,11 +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
+	source = fix-get_color.patch
 	md5sums = SKIP
 	md5sums = 4c48e1b70b8b17257cacb0755ca23595
 	md5sums = ba78ee5386cab68e55a3f0f5ca0c53f6
-	md5sums = af1ed157067e941ad3be9a7ea3f50ae1
+	md5sums = e6fc15dc21908234139e24f4875e5c89
 
 pkgname = mate-menu
 
diff --git a/PKGBUILD b/PKGBUILD
index 427adc661bcb..bb71e9de40f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,17 +14,17 @@ install=$pkgname.install
 source=("$pkgname-$pkgver::git+https://bitbucket.org/ubuntu-mate/$pkgname.git#tag=$pkgver"
         fix-crash.patch
         optional-lsb_release.patch
-        workaround.patch)
+        fix-get_color.patch)
 md5sums=('SKIP'
          '4c48e1b70b8b17257cacb0755ca23595'
          'ba78ee5386cab68e55a3f0f5ca0c53f6'
-         'af1ed157067e941ad3be9a7ea3f50ae1')
+         'e6fc15dc21908234139e24f4875e5c89')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../fix-crash.patch
   patch -Np1 -i ../optional-lsb_release.patch
-  patch -Np1 -i ../workaround.patch
+  patch -Np1 -i ../fix-get_color.patch
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' lib/*.py
 }
 
diff --git a/fix-get_color.patch b/fix-get_color.patch
new file mode 100644
index 000000000000..3336b966f09a
--- /dev/null
+++ b/fix-get_color.patch
@@ -0,0 +1,24 @@
+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:45:06.730681243 +0100
+@@ -384,17 +384,17 @@
+ 
+     def getBackgroundColor( self ):
+         color = Gdk.Color(0,0,0)
+-        self.backgroundColor.get_color(color)
++        color = self.backgroundColor.get_color()
+         return self.gdkColorToString( color )
+ 
+     def getBorderColor( self ):
+         color = Gdk.Color(0,0,0)
+-        self.borderColor.get_color(color)
++        color = self.borderColor.get_color()
+         return self.gdkColorToString( color )
+ 
+     def getHeadingColor( self ):
+         color = Gdk.Color(0,0,0)
+-        self.headingColor.get_color(color)
++        color = self.headingColor.get_color()
+         return self.gdkColorToString( color )
+ 
+     def gdkColorToString( self, gdkColor ):
diff --git a/workaround.patch b/workaround.patch
deleted file mode 100644
index 4bf9f5856cb0..000000000000
--- a/workaround.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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()