diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | fix-crash.patch | 11 | ||||
| -rw-r--r-- | fix-get_color.patch | 24 | ||||
| -rw-r--r-- | optional-lsb_release.patch | 21 |
5 files changed, 8 insertions, 79 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Dec 17 01:47:39 UTC 2015 +# Sun Jan 31 21:08:04 UTC 2016 pkgbase = mate-menu pkgdesc = Advanced menu for MATE Panel, a fork of MintMenu - pkgver = 5.6.6 - pkgrel = 2 + pkgver = 5.6.8 + pkgrel = 1 url = https://bitbucket.org/ubuntu-mate/mate-menu install = mate-menu.install arch = any @@ -18,14 +18,8 @@ pkgbase = mate-menu depends = python2-xdg depends = python2-xlib depends = xdg-utils - 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 = fix-get_color.patch + source = mate-menu-5.6.8::git+https://bitbucket.org/ubuntu-mate/mate-menu.git#tag=5.6.8 md5sums = SKIP - md5sums = 4c48e1b70b8b17257cacb0755ca23595 - md5sums = ba78ee5386cab68e55a3f0f5ca0c53f6 - md5sums = e6fc15dc21908234139e24f4875e5c89 pkgname = mate-menu @@ -2,8 +2,8 @@ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=mate-menu -pkgver=5.6.6 -pkgrel=2 +pkgver=5.6.8 +pkgrel=1 pkgdesc="Advanced menu for MATE Panel, a fork of MintMenu" arch=('any') url="https://bitbucket.org/ubuntu-mate/mate-menu" @@ -11,20 +11,11 @@ license=('GPL') depends=('mate-panel' 'python2-configobj' 'python2-gobject' 'python2-pyinotify' 'python2-xdg' 'python2-xlib' 'xdg-utils') 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 - fix-get_color.patch) -md5sums=('SKIP' - '4c48e1b70b8b17257cacb0755ca23595' - 'ba78ee5386cab68e55a3f0f5ca0c53f6' - 'e6fc15dc21908234139e24f4875e5c89') +source=("$pkgname-$pkgver::git+https://bitbucket.org/ubuntu-mate/$pkgname.git#tag=$pkgver") +md5sums=('SKIP') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../fix-crash.patch - patch -Np1 -i ../optional-lsb_release.patch - patch -Np1 -i ../fix-get_color.patch sed -i 's@^#!.*python$@#!/usr/bin/python2@' lib/*.py } diff --git a/fix-crash.patch b/fix-crash.patch deleted file mode 100644 index 2aa7d69c40ac..000000000000 --- a/fix-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur mate-menu.orig/mate_menu/plugins/applications.py mate-menu/mate_menu/plugins/applications.py ---- mate-menu.orig/mate_menu/plugins/applications.py 2015-11-07 02:12:28.374273614 +0100 -+++ mate-menu/mate_menu/plugins/applications.py 2015-11-07 02:11:53.753309742 +0100 -@@ -879,6 +884,7 @@ - startupMenuItem.connect( "toggled", self.onAddToStartup, widget ) - - self.mateMenuWin.stopHiding() -+ gtk.gtk_menu_popup.argtypes = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_uint, c_uint] - gtk.gtk_menu_popup(hash(mTree), None, None, None, None, event.button, event.time) - - def searchPopup( self, widget=None, event=None ): diff --git a/fix-get_color.patch b/fix-get_color.patch deleted file mode 100644 index 3336b966f09a..000000000000 --- a/fix-get_color.patch +++ /dev/null @@ -1,24 +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: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/optional-lsb_release.patch b/optional-lsb_release.patch deleted file mode 100644 index 0fdb6c0d10c7..000000000000 --- a/optional-lsb_release.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur mate-menu.orig/lib/mate-menu.py mate-menu/lib/mate-menu.py ---- mate-menu.orig/lib/mate-menu.py 2015-11-07 05:57:34.444720000 +0100 -+++ mate-menu/lib/mate-menu.py 2015-11-07 06:04:03.221247132 +0100 -@@ -563,11 +563,12 @@ - def createPanelButton( self ): - self.button_icon = Gtk.Image.new_from_file( self.buttonIcon ) - self.systemlabel = Gtk.Label(label= "%s " % self.buttonText ) -- process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) -- out, err = process.communicate() -- tooltip = out.replace('Description:', '').strip() -- self.systemlabel.set_tooltip_text(tooltip) -- self.button_icon.set_tooltip_text(tooltip) -+ if os.path.exists("/usr/bin/lsb_release"): -+ process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE) -+ out, err = process.communicate() -+ tooltip = out.replace('Description:', '').strip() -+ self.systemlabel.set_tooltip_text(tooltip) -+ self.button_icon.set_tooltip_text(tooltip) - if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: - self.button_box = Gtk.HBox() - self.button_box.pack_start( self.button_icon, False, False, 0 ) |