From b418a63ece8621d385d20e20c29b85295412665c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 23 Aug 2008 05:21:25 +0000 Subject: [PATCH] fix patches --- gnome-system-monitor-2.23.90-polkit.patch | 48 +++++++++++------------ 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/gnome-system-monitor-2.23.90-polkit.patch b/gnome-system-monitor-2.23.90-polkit.patch index 198869c..8ba0b8d 100644 --- a/gnome-system-monitor-2.23.90-polkit.patch +++ b/gnome-system-monitor-2.23.90-polkit.patch @@ -1,6 +1,6 @@ diff -up gnome-system-monitor-2.23.90/configure.in.polkit gnome-system-monitor-2.23.90/configure.in --- gnome-system-monitor-2.23.90/configure.in.polkit 2008-08-18 11:25:22.000000000 -0400 -+++ gnome-system-monitor-2.23.90/configure.in 2008-08-22 23:58:35.000000000 -0400 ++++ gnome-system-monitor-2.23.90/configure.in 2008-08-23 01:19:36.000000000 -0400 @@ -35,10 +35,41 @@ GIOMM_REQUIRED=2.16.0 GLIBMM_REQUIRED=2.14 LIBXML_REQUIRED=2.0 @@ -56,7 +56,7 @@ diff -up gnome-system-monitor-2.23.90/configure.in.polkit gnome-system-monitor-2 " diff -up gnome-system-monitor-2.23.90/po/POTFILES.in.polkit gnome-system-monitor-2.23.90/po/POTFILES.in --- gnome-system-monitor-2.23.90/po/POTFILES.in.polkit 2008-08-18 12:15:12.000000000 -0400 -+++ gnome-system-monitor-2.23.90/po/POTFILES.in 2008-08-22 23:57:57.000000000 -0400 ++++ gnome-system-monitor-2.23.90/po/POTFILES.in 2008-08-23 01:19:36.000000000 -0400 @@ -8,6 +8,7 @@ src/callbacks.cpp src/defaulttable.h src/disks.cpp @@ -67,7 +67,7 @@ diff -up gnome-system-monitor-2.23.90/po/POTFILES.in.polkit gnome-system-monitor src/interface.cpp diff -up gnome-system-monitor-2.23.90/src/callbacks.cpp.polkit gnome-system-monitor-2.23.90/src/callbacks.cpp --- gnome-system-monitor-2.23.90/src/callbacks.cpp.polkit 2008-04-22 17:55:31.000000000 -0400 -+++ gnome-system-monitor-2.23.90/src/callbacks.cpp 2008-08-22 23:57:57.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/callbacks.cpp 2008-08-23 01:19:36.000000000 -0400 @@ -37,25 +37,21 @@ #include "disks.h" #include "lsof.h" @@ -111,8 +111,8 @@ diff -up gnome-system-monitor-2.23.90/src/callbacks.cpp.polkit gnome-system-moni static void change_gconf_color(GConfClient *client, const char *key, diff -up /dev/null gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.c ---- /dev/null 2008-08-22 21:13:59.064267460 -0400 -+++ gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.c 2008-08-22 23:57:57.000000000 -0400 +--- /dev/null 2008-08-23 00:44:06.022255656 -0400 ++++ gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.c 2008-08-23 01:19:36.000000000 -0400 @@ -0,0 +1,640 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -755,8 +755,8 @@ diff -up /dev/null gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechani + return ret; +} diff -up /dev/null gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.xml ---- /dev/null 2008-08-22 21:13:59.064267460 -0400 -+++ gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.xml 2008-08-22 23:57:57.000000000 -0400 +--- /dev/null 2008-08-23 00:44:06.022255656 -0400 ++++ gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechanism.xml 2008-08-23 01:19:36.000000000 -0400 @@ -0,0 +1,15 @@ + + @@ -775,7 +775,7 @@ diff -up /dev/null gnome-system-monitor-2.23.90/src/gnome-system-monitor-mechani + diff -up gnome-system-monitor-2.23.90/src/interface.cpp.polkit gnome-system-monitor-2.23.90/src/interface.cpp --- gnome-system-monitor-2.23.90/src/interface.cpp.polkit 2008-02-25 14:30:29.000000000 -0500 -+++ gnome-system-monitor-2.23.90/src/interface.cpp 2008-08-22 23:57:57.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/interface.cpp 2008-08-23 01:19:36.000000000 -0400 @@ -30,6 +30,10 @@ #include #include @@ -931,7 +931,7 @@ diff -up gnome-system-monitor-2.23.90/src/interface.cpp.polkit gnome-system-moni static void diff -up gnome-system-monitor-2.23.90/src/Makefile.am.polkit gnome-system-monitor-2.23.90/src/Makefile.am --- gnome-system-monitor-2.23.90/src/Makefile.am.polkit 2008-08-08 15:55:59.000000000 -0400 -+++ gnome-system-monitor-2.23.90/src/Makefile.am 2008-08-22 23:57:57.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/Makefile.am 2008-08-23 01:19:51.000000000 -0400 @@ -4,7 +4,9 @@ INCLUDES = \ -DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ @@ -943,13 +943,9 @@ diff -up gnome-system-monitor-2.23.90/src/Makefile.am.polkit gnome-system-monito bin_PROGRAMS = gnome-system-monitor -@@ -33,10 +35,14 @@ gnome_system_monitor_SOURCES = \ - gconf-keys.cpp gconf-keys.h \ - iconthemewrapper.cpp iconthemewrapper.h \ +@@ -35,8 +37,11 @@ gnome_system_monitor_SOURCES = \ e_date.c e_date.h \ -- gsm_color_button.c gsm_color_button.h -+ gsm_color_button.c gsm_color_button.h \ -+ gsm-session-manager.c gsm-session-manager.h + gsm_color_button.c gsm_color_button.h +if HAVE_POLKIT +gnome_system_monitor_SOURCES += gnome-system-monitor-mechanism-client-glue.h @@ -960,7 +956,7 @@ diff -up gnome-system-monitor-2.23.90/src/Makefile.am.polkit gnome-system-monito noinst_LTLIBRARIES = libbacon.la -@@ -52,8 +58,44 @@ schema_ins = gnome-system-monitor.schem +@@ -52,8 +57,44 @@ schema_ins = gnome-system-monitor.schem schema_DATA = $(schema_ins:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ @@ -1007,8 +1003,8 @@ diff -up gnome-system-monitor-2.23.90/src/Makefile.am.polkit gnome-system-monito CLEANFILES = \ $(schema_DATA) diff -up /dev/null gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.conf ---- /dev/null 2008-08-22 21:13:59.064267460 -0400 -+++ gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.conf 2008-08-22 23:57:57.000000000 -0400 +--- /dev/null 2008-08-23 00:44:06.022255656 -0400 ++++ gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.conf 2008-08-23 01:19:36.000000000 -0400 @@ -0,0 +1,11 @@ + + @@ -1022,16 +1018,16 @@ diff -up /dev/null gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mech + + diff -up /dev/null gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.service.in ---- /dev/null 2008-08-22 21:13:59.064267460 -0400 -+++ gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.service.in 2008-08-22 23:57:57.000000000 -0400 +--- /dev/null 2008-08-23 00:44:06.022255656 -0400 ++++ gnome-system-monitor-2.23.90/src/org.gnome.SystemMonitor.Mechanism.service.in 2008-08-23 01:19:36.000000000 -0400 @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.gnome.SystemMonitor.Mechanism +Exec=libexecdir/gnome-system-monitor-mechanism +User=root diff -up /dev/null gnome-system-monitor-2.23.90/src/org.gnome.system-monitor.policy.in ---- /dev/null 2008-08-22 21:13:59.064267460 -0400 -+++ gnome-system-monitor-2.23.90/src/org.gnome.system-monitor.policy.in 2008-08-22 23:57:57.000000000 -0400 +--- /dev/null 2008-08-23 00:44:06.022255656 -0400 ++++ gnome-system-monitor-2.23.90/src/org.gnome.system-monitor.policy.in 2008-08-23 01:19:36.000000000 -0400 @@ -0,0 +1,50 @@ + + @@ -1085,7 +1081,7 @@ diff -up /dev/null gnome-system-monitor-2.23.90/src/org.gnome.system-monitor.pol + diff -up gnome-system-monitor-2.23.90/src/procactions.cpp.polkit gnome-system-monitor-2.23.90/src/procactions.cpp --- gnome-system-monitor-2.23.90/src/procactions.cpp.polkit 2007-01-02 17:15:36.000000000 -0500 -+++ gnome-system-monitor-2.23.90/src/procactions.cpp 2008-08-22 23:57:57.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/procactions.cpp 2008-08-23 01:19:36.000000000 -0400 @@ -31,6 +31,10 @@ #include "procdialogs.h" #include "callbacks.h" @@ -1200,7 +1196,7 @@ diff -up gnome-system-monitor-2.23.90/src/procactions.cpp.polkit gnome-system-mo + diff -up gnome-system-monitor-2.23.90/src/procdialogs.cpp.polkit gnome-system-monitor-2.23.90/src/procdialogs.cpp --- gnome-system-monitor-2.23.90/src/procdialogs.cpp.polkit 2008-05-23 17:44:00.000000000 -0400 -+++ gnome-system-monitor-2.23.90/src/procdialogs.cpp 2008-08-22 23:57:57.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/procdialogs.cpp 2008-08-23 01:19:36.000000000 -0400 @@ -35,6 +35,11 @@ #include "procman_gnomesu.h" #include "procman_gksu.h" @@ -1396,7 +1392,7 @@ diff -up gnome-system-monitor-2.23.90/src/procdialogs.cpp.polkit gnome-system-mo static void diff -up gnome-system-monitor-2.23.90/src/procman.cpp.polkit gnome-system-monitor-2.23.90/src/procman.cpp --- gnome-system-monitor-2.23.90/src/procman.cpp.polkit 2008-07-21 12:18:47.000000000 -0400 -+++ gnome-system-monitor-2.23.90/src/procman.cpp 2008-08-22 23:57:57.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/procman.cpp 2008-08-23 01:19:36.000000000 -0400 @@ -34,6 +34,10 @@ #include #include @@ -1446,7 +1442,7 @@ diff -up gnome-system-monitor-2.23.90/src/procman.cpp.polkit gnome-system-monito ProcData* ProcData::get_instance() diff -up gnome-system-monitor-2.23.90/src/procman.h.polkit gnome-system-monitor-2.23.90/src/procman.h --- gnome-system-monitor-2.23.90/src/procman.h.polkit 2008-05-24 17:58:27.000000000 -0400 -+++ gnome-system-monitor-2.23.90/src/procman.h 2008-08-22 23:57:57.000000000 -0400 ++++ gnome-system-monitor-2.23.90/src/procman.h 2008-08-23 01:19:36.000000000 -0400 @@ -33,6 +33,11 @@ #include #include