Hello community, here is the log from the commit of package mate-menu for openSUSE:Factory checked in at 2016-01-21 23:43:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-menu (Old) and /work/SRC/openSUSE:Factory/.mate-menu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-menu" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-menu/mate-menu.changes 2016-01-13 22:46:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-menu.new/mate-menu.changes 2016-01-22 01:09:29.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Jan 18 14:08:33 UTC 2016 - [email protected] + +- Update to 5.6.7: + * Fix intends in mate-menu execute.py. + * Do not use mate-folder.png that doesn't exist in freedesktop + specification. + * Fix configurator crash due to changes in Gtk 2.24.29. + * Do not crash if lsb_release is not available (boo#959024). +- Remove 0001-execute-fix.patch, 0001-recent-icon.patch, + 0003-fix-configurator-crash.patch: fixed upstream. +- Add 0001-fix-path-find.patch. +- Only recommend lsb-release. + +------------------------------------------------------------------- Old: ---- 0001-execute-fix.patch 0001-recent-icon.patch 0003-fix-configurator-crash.patch mate-menu-5.6.6.tar.gz New: ---- 0001-fix-path-find.patch mate-menu-5.6.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-menu.spec ++++++ --- /var/tmp/diff_new_pack.QFVbAc/_old 2016-01-22 01:09:31.000000000 +0100 +++ /var/tmp/diff_new_pack.QFVbAc/_new 2016-01-22 01:09:31.000000000 +0100 @@ -17,25 +17,21 @@ %define _name mate_menu -%define _rev 37bbd306cb0c +%define _rev cb3ee3ec1f8e Name: mate-menu -Version: 5.6.6 +Version: 5.6.7 Release: 0 Summary: Advanced MATE menu License: GPL-2.0+ Group: System/GUI/Other -Url: https://bitbucket.org/ubuntu-mate/mate-tweak +Url: https://bitbucket.org/ubuntu-mate/mate-menu Source: https://bitbucket.org/ubuntu-mate/%{name}/get/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM 0001-execute-fix.patch [email protected] -- Fix intends in mate-menu execute.py. -Patch0: 0001-execute-fix.patch -# PATCH-FIX-UPSTREAM 0001-recent-icon.patch [email protected] -- mate-folder.png icon doesn't exist in icon themes, use folder.png. -Patch1: 0001-recent-icon.patch +# PATCH-FIX-UPSTREAM 0001-fix-path-find.patch [email protected] +Patch0: 0001-fix-path-find.patch # PATCH-FIX-OPENSUSE 0002-xterm-no-symlink-dep.patch [email protected] -- Remove dependency on x-terminal-emulator Debian's symlink. -Patch2: 0002-xterm-no-symlink-dep.patch +Patch1: 0002-xterm-no-symlink-dep.patch # PATCH-FEATURE-OPENSUSE 0002-yast2-software.patch [email protected] -- Use YaST2 and GNOME PackageKit package managers. -Patch3: 0002-yast2-software.patch -# PATCH-FIX-UPSTREAM 0003-fix-configurator-crash.patch [email protected] -- Fix crash in mate-menu configurator. -Patch4: 0003-fix-configurator-crash.patch +Patch2: 0002-yast2-software.patch BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: python >= 2.4 @@ -46,7 +42,6 @@ Requires: gvfs Requires: libmate-desktop-2-17 Requires: libmate-panel-applet-4-1 -Requires: lsb-release Requires: mate-menus Requires: mozo Requires: python-configobj @@ -56,6 +51,7 @@ Requires: python-xlib Requires: xdg-utils Recommends: %{name}-lang +Recommends: lsb-release BuildArch: noarch %glib2_gsettings_schema_requires @@ -74,8 +70,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 sed -i 's/su-to-root/xdg-su/g' %{_name}/execute.py %build ++++++ 0001-fix-path-find.patch ++++++ diff -paur a/lib/mate-menu.py b/lib/mate-menu.py --- a/lib/mate-menu.py 2016-01-18 16:59:19.000000000 +0300 +++ b/lib/mate-menu.py 2016-01-19 12:52:23.395199920 +0300 @@ -73,19 +73,6 @@ xdg.Config.setWindowManager('MATE') from mate_menu.execute import * -def find_on_path(self, command): - """Is command on the executable search path?""" - if 'PATH' not in os.environ: - return False - path = os.environ['PATH'] - for element in path.split(os.pathsep): - if not element: - continue - filename = os.path.join(element, command) - if os.path.isfile(filename) and os.access(filename, os.X_OK): - return True - return False - class MainWindow( object ): """This is the main class for the application""" @@ -576,12 +563,14 @@ class MenuWin( object ): def createPanelButton( self ): self.button_icon = Gtk.Image.new_from_file( self.buttonIcon ) self.systemlabel = Gtk.Label(label= "%s " % self.buttonText ) - if find_on_path('lsb_release'): + try: 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) + except FileNotFoundError: + pass if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: self.button_box = Gtk.HBox() ++++++ mate-menu-5.6.6.tar.gz -> mate-menu-5.6.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu-config.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu-config.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu-config.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu-config.py 2016-01-18 14:59:19.000000000 +0100 @@ -383,18 +383,27 @@ self.headingColorLabel.set_sensitive( widget.get_active() ) def getBackgroundColor( self ): - color = Gdk.Color(0,0,0) - self.backgroundColor.get_color(color) + try: + color = self.backgroundColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.backgroundColor.get_color(color) return self.gdkColorToString( color ) def getBorderColor( self ): - color = Gdk.Color(0,0,0) - self.borderColor.get_color(color) + try: + color = self.borderColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.borderColor.get_color(color) return self.gdkColorToString( color ) def getHeadingColor( self ): - color = Gdk.Color(0,0,0) - self.headingColor.get_color(color) + try: + color = self.borderColor.get_color() + except TypeError: + color = Gdk.Color(0, 0, 0) + self.borderColor.get_color(color) return self.gdkColorToString( color ) def gdkColorToString( self, gdkColor ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/lib/mate-menu.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/lib/mate-menu.py 2016-01-18 14:59:19.000000000 +0100 @@ -19,7 +19,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__='5.6.6' +__VERSION__='5.6.7' import ctypes import gc @@ -73,6 +73,19 @@ from mate_menu.execute import * +def find_on_path(self, command): + """Is command on the executable search path?""" + if 'PATH' not in os.environ: + return False + path = os.environ['PATH'] + for element in path.split(os.pathsep): + if not element: + continue + filename = os.path.join(element, command) + if os.path.isfile(filename) and os.access(filename, os.X_OK): + return True + return False + class MainWindow( object ): """This is the main class for the application""" @@ -563,11 +576,13 @@ 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 find_on_path('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 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/execute.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/execute.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/execute.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/execute.py 2016-01-18 14:59:19.000000000 +0100 @@ -50,7 +50,7 @@ except Exception, detail: print detail return False - cmd = cmd.split() + cmd = cmd.split() cmd = RemoveArgs(cmd) try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/applications.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/applications.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/applications.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/applications.py 2016-01-18 14:59:19.000000000 +0100 @@ -879,6 +879,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/recent.py new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/recent.py --- old/ubuntu-mate-mate-menu-37bbd306cb0c/mate_menu/plugins/recent.py 2015-12-15 00:47:17.000000000 +0100 +++ new/ubuntu-mate-mate-menu-cb3ee3ec1f8e/mate_menu/plugins/recent.py 2016-01-18 14:59:19.000000000 +0100 @@ -57,7 +57,7 @@ self.width = 250 #Plugin icon - self.icon = 'mate-folder.png' + self.icon = 'folder.png' self.settings = EasyGSettings ("org.mate.mate-menu.plugins.recent")
