Update to 3.1.3
This commit is contained in:
		
							parent
							
								
									c7f67ac34f
								
							
						
					
					
						commit
						d0f2a202df
					
				
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -8,3 +8,4 @@ gnome-system-monitor-2.28.1.tar.bz2
 | 
				
			|||||||
/gnome-system-monitor-3.1.1.tar.bz2
 | 
					/gnome-system-monitor-3.1.1.tar.bz2
 | 
				
			||||||
/gnome-system-monitor-3.1.1.1.tar.bz2
 | 
					/gnome-system-monitor-3.1.1.1.tar.bz2
 | 
				
			||||||
/gnome-system-monitor-3.1.2.tar.xz
 | 
					/gnome-system-monitor-3.1.2.tar.xz
 | 
				
			||||||
 | 
					/gnome-system-monitor-3.1.3.tar.xz
 | 
				
			||||||
 | 
				
			|||||||
@ -1,82 +0,0 @@
 | 
				
			|||||||
[Desktop Entry] 
 | 
					 | 
				
			||||||
Name=About this Computer
 | 
					 | 
				
			||||||
Name[en] =About this Computer
 | 
					 | 
				
			||||||
Name[as] =এই কম্পিউটাৰৰ বিষয়ে
 | 
					 | 
				
			||||||
Name[bn_IN] =কম্পিউটার পরিচিতি
 | 
					 | 
				
			||||||
Name[cs] =O tomto počítači
 | 
					 | 
				
			||||||
Name[de] =Über diesen Computer
 | 
					 | 
				
			||||||
Name[el] =Περί υπολογιστή
 | 
					 | 
				
			||||||
Name[es] =Acerca de esta Computadora
 | 
					 | 
				
			||||||
Name[fi] =Tietoja tästä tietokoneesta
 | 
					 | 
				
			||||||
Name[fr] =À propos de cet ordinateur
 | 
					 | 
				
			||||||
Name[gu] =આ કમ્પ્યૂટર વિશે
 | 
					 | 
				
			||||||
Name[he] =אודות מחשב זה
 | 
					 | 
				
			||||||
Name[hi] =इस कंप्यूटर के बारे में
 | 
					 | 
				
			||||||
Name[id] =Mengenai Komputer Ini
 | 
					 | 
				
			||||||
Name[it] =Informazioni sul computer
 | 
					 | 
				
			||||||
Name[ja] =このコンピュータについて
 | 
					 | 
				
			||||||
Name[kn] =ಈ ಗಣಕದ ಬಗ್ಗೆ
 | 
					 | 
				
			||||||
Name[ko] =컴퓨터에 관하여
 | 
					 | 
				
			||||||
Name[ml] =ഈ കമ്പ്യൂട്ടറിനെ സംബന്ധിച്ചു്
 | 
					 | 
				
			||||||
Name[mr] =या संगणक विषयी
 | 
					 | 
				
			||||||
Name[nb] =Om denne datamaskinen
 | 
					 | 
				
			||||||
Name[nl] =Over Deze Computer
 | 
					 | 
				
			||||||
Name[or] =ଏହି କମ୍ପୁଟର ବିଷୟରେ
 | 
					 | 
				
			||||||
Name[pa] =ਇਸ ਕੰਪਿਊਟਰ ਬਾਰੇ
 | 
					 | 
				
			||||||
Name[pl] =Informacje o komputerze
 | 
					 | 
				
			||||||
Name[pt_BR] = Sobre este computador
 | 
					 | 
				
			||||||
Name[ro] =Despre acest calculator
 | 
					 | 
				
			||||||
Name[ru] =О системе
 | 
					 | 
				
			||||||
Name[sk] =O tomto počítači
 | 
					 | 
				
			||||||
Name[sr] =О овом рачунару
 | 
					 | 
				
			||||||
Name[sr@latin] =O ovom računaru
 | 
					 | 
				
			||||||
Name[sv] =Om den här datorn
 | 
					 | 
				
			||||||
Name[ta] =இந்தக் கணினிப் பற்றி
 | 
					 | 
				
			||||||
Name[te] =ఈ కంప్యూటర్ గురించి
 | 
					 | 
				
			||||||
Name[zh_CN] =关于本计算机
 | 
					 | 
				
			||||||
Name[zh_TW] =關於這部電腦
 | 
					 | 
				
			||||||
Comment =Get some basic information about this computer
 | 
					 | 
				
			||||||
Comment[en] =Get some basic information about this computer
 | 
					 | 
				
			||||||
Comment[as] =এই কম্পিউটাৰৰ বিষয়ে কিছু মূল তথ্য লাভ কৰক
 | 
					 | 
				
			||||||
Comment[bn_IN] =এই কম্পিউটার সম্বন্ধে কিছু মৌলিক তথ্য জেনে নিন
 | 
					 | 
				
			||||||
Comment[cs] =Základní informace o tomto počítači
 | 
					 | 
				
			||||||
Comment[de] =Erhalten Sie Basis-Informationen über dieses System
 | 
					 | 
				
			||||||
Comment[el] =Δείτε βασικές πληροφορίες για αυτόν τον υπολογιστή
 | 
					 | 
				
			||||||
Comment[es] =Obten información básica sobre esta computadora
 | 
					 | 
				
			||||||
Comment[fi] =Perustietoja tästä tietokoneesta
 | 
					 | 
				
			||||||
Comment[fr] =Obtenir des informations sommaires sur cet ordinateur
 | 
					 | 
				
			||||||
Comment[gu] =આ કમ્પ્યૂટર વિશે અમુક મૂળભૂત જાણકારી મેળવો
 | 
					 | 
				
			||||||
Comment[he] =הצגת מידע בסיסי אודות מחשב זה
 | 
					 | 
				
			||||||
Comment[hi] =इस कंप्यूटर के बारे में कुछ मौलिक जानकारी हासिल करें
 | 
					 | 
				
			||||||
Comment[id] =Lihat beberapa informasi umum mengenai komputer ini
 | 
					 | 
				
			||||||
Comment[it] =Alcune informazioni di base su questo computer
 | 
					 | 
				
			||||||
Comment[ja] =このコンピュータに関する基本的な情報
 | 
					 | 
				
			||||||
Comment[kn] =ಈ ಗಣಕದ ಬಗೆಗಿನ ಕೆಲವು ಮೂಲಭೂತ ಮಾಹಿತಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳಿ
 | 
					 | 
				
			||||||
Comment[ko] =컴퓨터에 관한 기본 정보 보기
 | 
					 | 
				
			||||||
Comment[ml] = ഈ കമ്പ്യൂട്ടറിനെ സംബന്ധിച്ചുള്ള ചില അടിസ്ഥാന വിവരങ്ങള്
 | 
					 | 
				
			||||||
Comment[mr] =या संगणक विषयी जराशी मुळ माहिती प्राप्त करा
 | 
					 | 
				
			||||||
Comment[nb] =Vis grunnleggende informasjon om denne datamaskinen
 | 
					 | 
				
			||||||
Comment[nl] =Geef basis informatie weer over deze computer
 | 
					 | 
				
			||||||
Comment[or] =ଏହି କମ୍ପୁଟର ବିଷୟରେ କିଛି ମୌଳିକ ସୂଚନା ହାସଲ କରନ୍ତୁ
 | 
					 | 
				
			||||||
Comment[pa] =ਇਸ ਕੰਪਿਊਟਰ ਬਾਰੇ ਕੁਝ ਮੁਢਲੀ ਜਾਣਕਾਰੀ ਲਵੋ
 | 
					 | 
				
			||||||
Comment[pl] =Więcej informacji o komputerze
 | 
					 | 
				
			||||||
Comment[pt_BR] =Obtenha informações básicas sobre este computador
 | 
					 | 
				
			||||||
Comment[ro] =Vedeți niște informații utile despre acest calculator
 | 
					 | 
				
			||||||
Comment[ru] =Основная информация об этом компьютере
 | 
					 | 
				
			||||||
Comment[sk] =Zobraziť základné informácie o tomto počítači
 | 
					 | 
				
			||||||
Comment[sr] =Сазнајте основне информације о овом рачунару
 | 
					 | 
				
			||||||
Comment[sr@latin] =Saznajte osnovne informacije o ovom računaru
 | 
					 | 
				
			||||||
Comment[sv] =Få grundläggande information om den här datorn
 | 
					 | 
				
			||||||
Comment[ta] =இந்தக் கணினிப் பற்றிய சில அடிப்படை தகவல்கள்
 | 
					 | 
				
			||||||
Comment[te] =ఈ కంప్యూటర్ గురించి కొంత ప్రాధమిక సమాచారం
 | 
					 | 
				
			||||||
Comment[zh_CN] =获取本计算机的一些基本信息
 | 
					 | 
				
			||||||
Comment[zh_TW] =取得關於這部電腦的一些基本訊息
 | 
					 | 
				
			||||||
Exec=gnome-system-monitor --show-system-tab
 | 
					 | 
				
			||||||
TryExec=gnome-system-monitor
 | 
					 | 
				
			||||||
Icon=computer
 | 
					 | 
				
			||||||
Terminal=false
 | 
					 | 
				
			||||||
Type=Application
 | 
					 | 
				
			||||||
Categories=X-System-About;
 | 
					 | 
				
			||||||
StartupNotify=true
 | 
					 | 
				
			||||||
# we don't want this in the regular menus at all
 | 
					 | 
				
			||||||
NotShowIn=GNOME;KDE;
 | 
					 | 
				
			||||||
							
								
								
									
										44
									
								
								format.patch
									
									
									
									
									
								
							
							
						
						
									
										44
									
								
								format.patch
									
									
									
									
									
								
							@ -1,44 +0,0 @@
 | 
				
			|||||||
diff -up gnome-system-monitor-3.1.1/src/load-graph.cpp.format gnome-system-monitor-3.1.1/src/load-graph.cpp
 | 
					 | 
				
			||||||
--- gnome-system-monitor-3.1.1/src/load-graph.cpp.format	2011-05-09 17:45:06.000000000 -0400
 | 
					 | 
				
			||||||
+++ gnome-system-monitor-3.1.1/src/load-graph.cpp	2011-05-12 17:43:01.136470995 -0400
 | 
					 | 
				
			||||||
@@ -399,7 +399,7 @@ net_scale (LoadGraph *g, guint64 din, gu
 | 
					 | 
				
			||||||
 	  new_max = 1.1 * new_max;
 | 
					 | 
				
			||||||
 	  // make sure max is not 0 to avoid / 0
 | 
					 | 
				
			||||||
 	  // default to 125 bytes == 1kbit
 | 
					 | 
				
			||||||
-	  new_max = std::max(new_max, 125UL);
 | 
					 | 
				
			||||||
+	  new_max = std::max(new_max, G_GUINT64_CONSTANT(125));
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	} else {
 | 
					 | 
				
			||||||
 	  // round up to get some extra space
 | 
					 | 
				
			||||||
@@ -407,7 +407,7 @@ net_scale (LoadGraph *g, guint64 din, gu
 | 
					 | 
				
			||||||
 	  new_max = 1.1 * new_max;
 | 
					 | 
				
			||||||
 	  // make sure max is not 0 to avoid / 0
 | 
					 | 
				
			||||||
 	  // default to 1 KiB
 | 
					 | 
				
			||||||
-	  new_max = std::max(new_max, 1024UL);
 | 
					 | 
				
			||||||
+	  new_max = std::max(new_max, G_GUINT64_CONSTANT(1024));
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	  // decompose new_max = coef10 * 2**(base10 * 10)
 | 
					 | 
				
			||||||
 	  // where coef10 and base10 are integers and coef10 < 2**10
 | 
					 | 
				
			||||||
@@ -433,11 +433,11 @@ net_scale (LoadGraph *g, guint64 din, gu
 | 
					 | 
				
			||||||
 	  g_assert(coef10 % g->num_bars() == 0);
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	  new_max = coef10 * (1UL << guint64(base10 * 10));
 | 
					 | 
				
			||||||
-	  procman_debug("bak %lu new_max %lu pow2 %lu coef10 %lu", bak_max, new_max, pow2, coef10);
 | 
					 | 
				
			||||||
+	  procman_debug("bak %" G_GUINT64_FORMAT " new_max %" G_GUINT64_FORMAT " pow2 %" G_GUINT64_FORMAT " coef10 %" G_GUINT64_FORMAT, bak_max, new_max, pow2, coef10);
 | 
					 | 
				
			||||||
 	}
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	if (bak_max > new_max) {
 | 
					 | 
				
			||||||
-	  procman_debug("overflow detected: bak=%lu new=%lu", bak_max, new_max);
 | 
					 | 
				
			||||||
+	  procman_debug("overflow detected: bak=%" G_GUINT64_FORMAT " new=%" G_GUINT64_FORMAT, bak_max, new_max);
 | 
					 | 
				
			||||||
 	  new_max = bak_max;
 | 
					 | 
				
			||||||
 	}
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
@@ -455,7 +455,7 @@ net_scale (LoadGraph *g, guint64 din, gu
 | 
					 | 
				
			||||||
 		}
 | 
					 | 
				
			||||||
 	}
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-	procman_debug("rescale dmax = %lu max = %lu new_max = %lu", dmax, g->net.max, new_max);
 | 
					 | 
				
			||||||
+	procman_debug("rescale dmax = %" G_GUINT64_FORMAT " max = %" G_GUINT64_FORMAT " new_max = %" G_GUINT64_FORMAT, dmax, g->net.max, new_max);
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 	g->net.max = new_max;
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
@ -11,7 +11,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
Summary: Process and resource monitor
 | 
					Summary: Process and resource monitor
 | 
				
			||||||
Name: gnome-system-monitor
 | 
					Name: gnome-system-monitor
 | 
				
			||||||
Version: 3.1.2
 | 
					Version: 3.1.3
 | 
				
			||||||
Release: 1%{?dist}
 | 
					Release: 1%{?dist}
 | 
				
			||||||
License: GPLv2+
 | 
					License: GPLv2+
 | 
				
			||||||
Group: Applications/System
 | 
					Group: Applications/System
 | 
				
			||||||
@ -86,6 +86,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%changelog
 | 
					%changelog
 | 
				
			||||||
 | 
					* Tue Jul 05 2011 Bastien Nocera <bnocera@redhat.com> 3.1.3-1
 | 
				
			||||||
 | 
					- Update to 3.1.3
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* Wed Jun 15 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.1.2-1
 | 
					* Wed Jun 15 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.1.2-1
 | 
				
			||||||
- Update to 3.1.2
 | 
					- Update to 3.1.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user