commit: d97eb7668e05cf59cbbdfe4bebd48832dfd12b8f Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Aug 28 16:50:05 2020 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Sep 20 14:38:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97eb766
sys-power/nut: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/17299 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> sys-power/nut/files/NUT-Monitor-1.3-paths.patch | 48 ------------------------- 1 file changed, 48 deletions(-) diff --git a/sys-power/nut/files/NUT-Monitor-1.3-paths.patch b/sys-power/nut/files/NUT-Monitor-1.3-paths.patch deleted file mode 100644 index 17bedaead72..00000000000 --- a/sys-power/nut/files/NUT-Monitor-1.3-paths.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/scripts/python/app/NUT-Monitor -+++ b/scripts/python/app/NUT-Monitor -@@ -70,7 +70,7 @@ - ( cmd_opts, args ) = opt_parser.parse_args() - - -- self.__glade_file = os.path.join( os.path.dirname( sys.argv[0] ), "gui-1.3.glade" ) -+ self.__glade_file = '/usr/share/nut/gui-1.3.glade' - - self.__widgets["interface"] = gtk.glade.XML( self.__glade_file, "window1", APP ) - self.__widgets["main_window"] = self.__widgets["interface"].get_widget("window1") -@@ -103,11 +103,11 @@ - - # Create the tray icon and connect it to the show/hide method... - self.__widgets["status_icon"] = gtk.StatusIcon() -- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) ) -+ self.__widgets["status_icon"].set_from_file( "/usr/share/nut/pixmaps/on_line.png" ) - self.__widgets["status_icon"].set_visible( True ) - self.__widgets["status_icon"].connect( "activate", self.tray_activated ) - -- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) ) -+ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut/pixmaps/on_line.png" ) - - # Define interface callbacks actions - self.__callbacks = { "on_window1_destroy" : self.quit, -@@ -265,8 +265,8 @@ - #------------------------------------------------------------------- - # Change the status icon and tray icon - def change_status_icon( self, icon="on_line", blink=False ) : -- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) ) -- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) ) -+ self.__widgets["status_icon"].set_from_file( "/usr/share/nut/pixmaps/%s.png" % icon ) -+ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut/pixmaps/%s.png" % icon ) - self.__widgets["status_icon"].set_blinking( blink ) - - #------------------------------------------------------------------- -@@ -719,9 +719,9 @@ - - for k,v in vars.iteritems() : - if ( rwvars.has_key( k ) ) : -- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-rw.png" ) -+ icon_file = "/usr/share/nut/pixmaps/var-rw.png" - else : -- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-ro.png" ) -+ icon_file = "/usr/share/nut/pixmaps/var-ro.png" - - icon = gtk.gdk.pixbuf_new_from_file( icon_file ) - self.__widgets["ups_vars_tree_store"].append( [ icon, k, v ] )
