Hello community, here is the log from the commit of package fusion-icon for openSUSE:Factory checked in at 2016-03-11 12:29:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fusion-icon (Old) and /work/SRC/openSUSE:Factory/.fusion-icon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fusion-icon" Changes: -------- --- /work/SRC/openSUSE:Factory/fusion-icon/fusion-icon.changes 2016-03-07 13:24:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fusion-icon.new/fusion-icon.changes 2016-03-11 12:29:46.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 9 18:09:32 UTC 2016 - [email protected] + +- Update to 0.2.2: + * Fix a crash in some cases caused by an error in DE detection. + * Acknowledge fusion-icon-panel icon in Qt backend. + * Some minor fixes. + +------------------------------------------------------------------- Old: ---- fusion-icon-0.2.1.tar.xz New: ---- fusion-icon-0.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fusion-icon.spec ++++++ --- /var/tmp/diff_new_pack.jks3RL/_old 2016-03-11 12:29:47.000000000 +0100 +++ /var/tmp/diff_new_pack.jks3RL/_new 2016-03-11 12:29:47.000000000 +0100 @@ -17,13 +17,13 @@ Name: fusion-icon -Version: 0.2.1 +Version: 0.2.2 Release: 0 Summary: Tray icon to manage Compiz License: GPL-2.0+ Group: System/GUI/Other -Url: https://github.com/raveit65/fusion-icon -Source: https://github.com/raveit65/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Url: https://github.com/compiz-reloaded/fusion-icon +Source: https://github.com/compiz-reloaded/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz Source1: %{name}.1 BuildRequires: fdupes BuildRequires: gobject-introspection-devel ++++++ fusion-icon-0.2.1.tar.xz -> fusion-icon-0.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.1/FusionIcon/environment.py new/fusion-icon-0.2.2/FusionIcon/environment.py --- old/fusion-icon-0.2.1/FusionIcon/environment.py 2016-02-21 17:27:01.000000000 +0100 +++ new/fusion-icon-0.2.2/FusionIcon/environment.py 2016-03-09 19:24:55.000000000 +0100 @@ -48,16 +48,16 @@ self.desktop = 'mate' elif os.getenv('XDG_CURRENT_DESKTOP') == 'XFCE' or os.getenv('DESKTOP_SESSION') in ('xfce', 'xfce4', 'Xfce Session'): self.desktop = 'xfce' - elif os.getenv('XDG_CURRENT_DESKTOP').endswith('GNOME') or os.getenv('GNOME_DESKTOP_SESSION_ID') is not None: + elif os.getenv('XDG_CURRENT_DESKTOP', '').endswith('GNOME') or os.getenv('GNOME_DESKTOP_SESSION_ID') is not None: self.desktop = 'gnome' elif os.getenv('XDG_CURRENT_DESKTOP') == 'KDE' or os.getenv('KDE_FULL_SESSION') is not None: self.desktop = 'kde' elif os.getenv('XDG_CURRENT_DESKTOP') == 'LXQt': self.desktop = 'lxqt' elif os.getenv("XDG_CURRENT_DESKTOP") is not None: - self.desktop = os.environ.get('XDG_CURRENT_DESKTOP', 'unknown').lower() + self.desktop = os.getenv('XDG_CURRENT_DESKTOP', 'unknown').lower() else: - self.desktop = os.environ.get('DESKTOP_SESSION', 'unknown').lower() + self.desktop = os.getenv('DESKTOP_SESSION', 'unknown').lower() print(' * Detected Session: ' + self.desktop) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.1/FusionIcon/interface_gtk/main.py.in new/fusion-icon-0.2.2/FusionIcon/interface_gtk/main.py.in --- old/fusion-icon-0.2.1/FusionIcon/interface_gtk/main.py.in 2016-02-21 17:27:01.000000000 +0100 +++ new/fusion-icon-0.2.2/FusionIcon/interface_gtk/main.py.in 2016-03-09 19:24:55.000000000 +0100 @@ -23,6 +23,7 @@ import os, time, gi gi.require_version('Gtk', '@gtkver@') +gi.require_version('AppIndicator@aiver@', '0.1') from gi.repository import Gtk from gi.repository import AppIndicator@aiver@ as AppIndicator from FusionIcon.start import wms, apps, options, decorators, init @@ -52,7 +53,7 @@ self.append(item) #Reload - item = Gtk.ImageMenuItem('Reload Window Manager') + item = Gtk.ImageMenuItem(label='Reload Window Manager') item.connect('activate', self.reload_activate) item.set_image(Gtk.Image.new_from_icon_name('view-refresh', Gtk.IconSize.MENU)) if not wms: @@ -60,7 +61,7 @@ self.append(item) #Window Manager - item = Gtk.ImageMenuItem('Select Window Manager') + item = Gtk.ImageMenuItem(label='Select Window Manager') item.set_image(Gtk.Image.new_from_icon_name('view-restore', Gtk.IconSize.MENU)) submenu = WindowManagerMenu() item.set_submenu(submenu) @@ -69,7 +70,7 @@ self.append(item) #Compiz Options - item = Gtk.ImageMenuItem('Compiz Options') + item = Gtk.ImageMenuItem(label='Compiz Options') item.set_image(Gtk.Image.new_from_icon_name('document-properties', Gtk.IconSize.MENU)) submenu = CompizOptionMenu() item.set_submenu(submenu) @@ -79,7 +80,7 @@ self.append(item) #Window Decorator - item = Gtk.ImageMenuItem('Select Window Decorator') + item = Gtk.ImageMenuItem(label='Select Window Decorator') item.set_image(Gtk.Image.new_from_icon_name('window-new', Gtk.IconSize.MENU)) submenu = CompizDecoratorMenu() item.set_submenu(submenu) @@ -103,7 +104,7 @@ class ApplicationItem(Gtk.ImageMenuItem): def __init__(self, app): - Gtk.ImageMenuItem.__init__(self, apps[app].label) + Gtk.ImageMenuItem.__init__(self, label=apps[app].label) self.app = app if app not in apps: @@ -190,7 +191,7 @@ self.append(item) prev = item -icon = AppIndicator.Indicator.new('Compiz Icon', 'fusion-icon', AppIndicator.IndicatorCategory.APPLICATION_STATUS) +icon = AppIndicator.Indicator.new('Fusion Icon', 'fusion-icon', AppIndicator.IndicatorCategory.APPLICATION_STATUS) icon.set_status(AppIndicator.IndicatorStatus.ACTIVE) menu = TrayMenu() icon.set_menu(menu) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.1/FusionIcon/interface_qt/main.py.in new/fusion-icon-0.2.2/FusionIcon/interface_qt/main.py.in --- old/fusion-icon-0.2.1/FusionIcon/interface_qt/main.py.in 2016-02-21 17:45:39.000000000 +0100 +++ new/fusion-icon-0.2.2/FusionIcon/interface_qt/main.py.in 2016-03-09 19:28:28.000000000 +0100 @@ -17,18 +17,17 @@ # Author(s): xsacha, XRevan86, raveit65 import sys, os, time -if '@qtver@' != '4.0': - from PyQt5 import QtWidgets, QtGui, QtCore - from PyQt5.QtWidgets import QApplication, QMenu, QActionGroup, QSystemTrayIcon -else: - from PyQt4 import QtGui, QtCore - from PyQt4.QtGui import QApplication, QMenu, QActionGroup, QSystemTrayIcon - if tuple(map(int, (QtCore.QT_VERSION_STR.split('.')))) < (4, 6, 0): - raise ImportError('Qt 4.6.x or later required') +from PyQt@qtver@ import QtCore, QtGui +if tuple(map(int, (QtCore.QT_VERSION_STR.split('.')))) < (4, 6, 0): + raise ImportError('Qt 4.6.x or later required') +try: + from PyQt@qtver@ import QtWidgets +except ImportError: + from PyQt@qtver@ import QtGui as QtWidgets from FusionIcon.start import wms, apps, options, decorators, init from FusionIcon.execute import run -class Build(QApplication): +class Build(QtWidgets.QApplication): def reload_wm(self): wms.restart() @@ -47,19 +46,18 @@ def __init__(self, parent=None): QtCore.QObject.__init__(self, parent) - if not QSystemTrayIcon.isSystemTrayAvailable(): - raise SystemExit('Notification area is not available.') - if QtGui.QIcon.hasThemeIcon('fusion-icon'): - image = QtGui.QIcon.fromTheme('fusion-icon') - else: - image = QtGui.QIcon.fromTheme('image-missing') - self.Tray = QSystemTrayIcon(image) - self.Tray.setToolTip('Compiz Icon') - self.Tray.managerMenu = QMenu() - self.Tray.optionsMenu = QMenu() - self.Tray.decoratorMenu = QMenu() - self.groupManager = QActionGroup(self.Tray.managerMenu) - self.groupDecorator = QActionGroup(self.Tray.decoratorMenu) + image = QtGui.QIcon() + for iconName in ('fusion-icon-panel', 'fusion-icon', 'image-missing'): + if QtGui.QIcon.hasThemeIcon(iconName): + image = QtGui.QIcon.fromTheme(iconName) + break + self.Tray = QtWidgets.QSystemTrayIcon(image) + self.Tray.setToolTip('Fusion Icon') + self.Tray.managerMenu = QtWidgets.QMenu() + self.Tray.optionsMenu = QtWidgets.QMenu() + self.Tray.decoratorMenu = QtWidgets.QMenu() + self.groupManager = QtWidgets.QActionGroup(self.Tray.managerMenu) + self.groupDecorator = QtWidgets.QActionGroup(self.Tray.decoratorMenu) for wm in wms.ordered_list: actionWM = self.groupManager.addAction(self.Tray.managerMenu.addAction(wms[wm].label, lambda val=wm : self.toggleWM(val))) @@ -80,7 +78,7 @@ if decorators.active == decorator: actionWD.setChecked(True) - self.Tray.menu = QMenu() + self.Tray.menu = QtWidgets.QMenu() if 'ccsm' in apps: self.Tray.menu.addAction(QtGui.QIcon.fromTheme('preferences-system'), apps['ccsm'].label, lambda: run(['ccsm'])) @@ -95,7 +93,7 @@ self.Tray.menu.addAction(QtGui.QIcon.fromTheme('document-properties'), 'Compiz Options').setMenu(self.Tray.optionsMenu) self.Tray.menu.addAction(QtGui.QIcon.fromTheme('window-new'), 'Select Window Decorator').setMenu(self.Tray.decoratorMenu) self.Tray.menu.addSeparator() - self.Tray.menu.addAction(QtGui.QIcon.fromTheme('application-exit'), 'Quit', self.quit) + self.Tray.menu.addAction(QtGui.QIcon.fromTheme('application-exit'), 'Quit', self.exit) self.Tray.setContextMenu(self.Tray.menu) self.Tray.show() self.Tray.activated.connect(self.showMenu) @@ -103,7 +101,7 @@ def showMenu(self, reason): # Show menu on left click as well. - if reason == QSystemTrayIcon.Trigger: + if reason == QtWidgets.QSystemTrayIcon.Trigger and self.Tray.geometry().isValid(): rect = self.Tray.geometry() self.Tray.contextMenu().popup(QtCore.QPoint(rect.left() + (rect.width() / 2), self.Tray.geometry().bottom() + 1)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.1/NEWS new/fusion-icon-0.2.2/NEWS --- old/fusion-icon-0.2.1/NEWS 2016-02-21 17:50:32.000000000 +0100 +++ new/fusion-icon-0.2.2/NEWS 2016-03-09 19:29:46.000000000 +0100 @@ -1,3 +1,12 @@ +Release 0.2.2 (2016-03-09 Sorokin Alexei <[email protected]>) +=============================================================== + +Fix a crash in some cases caused by an error in DE detection. + +Acknowledge fusion-icon-panel icon in Qt backend. + +Some minor fixes. + Release 0.2.1 (2016-02-21 Sorokin Alexei <[email protected]>) =============================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.1/PKG-INFO new/fusion-icon-0.2.2/PKG-INFO --- old/fusion-icon-0.2.1/PKG-INFO 2016-02-21 17:52:14.000000000 +0100 +++ new/fusion-icon-0.2.2/PKG-INFO 2016-03-09 19:32:04.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: fusion-icon -Version: 0.2.1 +Version: 0.2.2 Summary: User-friendly tray icon for launching and managing Compiz Home-page: https://github.com/raveit65/fusion-icon Author: Wolfgang Ulbrich diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.1/VERSION new/fusion-icon-0.2.2/VERSION --- old/fusion-icon-0.2.1/VERSION 2016-02-21 17:49:00.000000000 +0100 +++ new/fusion-icon-0.2.2/VERSION 2016-03-09 19:29:09.000000000 +0100 @@ -1 +1 @@ -0.2.1 +0.2.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fusion-icon-0.2.1/setup.py new/fusion-icon-0.2.2/setup.py --- old/fusion-icon-0.2.1/setup.py 2016-02-21 17:27:01.000000000 +0100 +++ new/fusion-icon-0.2.2/setup.py 2016-03-09 19:24:55.000000000 +0100 @@ -74,7 +74,7 @@ f = open(os.path.join ('FusionIcon/interface_qt/main.py.in'), 'rt') data = f.read() f.close() - data = data.replace('@qtver@', qtver) + data = data.replace('@qtver@', qtver.split('.')[0]) f = open(os.path.join('FusionIcon/interface_qt/main.py'), 'wt') f.write(data) f.close() @@ -113,6 +113,7 @@ data_files = [ ('share/icons/hicolor/22x22/apps',['images/22x22/fusion-icon.png']), ('share/icons/hicolor/24x24/apps',['images/24x24/fusion-icon.png']), + ('share/icons/hicolor/32x32/apps',['images/32x32/fusion-icon.png']), ('share/icons/hicolor/48x48/apps',['images/48x48/fusion-icon.png']), ('share/icons/hicolor/scalable/apps',['images/scalable/fusion-icon.svg']), ('share/applications',['fusion-icon.desktop']),
