[113308] trunk/dports/gnome/gnome-system-monitor
devans at macports.org
devans at macports.org
Wed Nov 13 05:39:39 PST 2013
Revision: 113308
https://trac.macports.org/changeset/113308
Author: devans at macports.org
Date: 2013-11-13 05:39:39 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
gnome-system-monitor: merge version 3.8.2.1 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/gnome-system-monitor/Portfile
trunk/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff
Added Paths:
-----------
trunk/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff
Property Changed:
----------------
trunk/dports/gnome/gnome-system-monitor/
Property changes on: trunk/dports/gnome/gnome-system-monitor
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnome-system-monitor:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor:108276-113174
/users/rmstonecipher/gnome/gnome-system-monitor:102363-103172
Modified: trunk/dports/gnome/gnome-system-monitor/Portfile
===================================================================
--- trunk/dports/gnome/gnome-system-monitor/Portfile 2013-11-13 13:28:55 UTC (rev 113307)
+++ trunk/dports/gnome/gnome-system-monitor/Portfile 2013-11-13 13:39:39 UTC (rev 113308)
@@ -4,8 +4,7 @@
PortSystem 1.0
name gnome-system-monitor
-version 2.28.2
-revision 1
+version 3.8.2.1
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description A system monitor.
@@ -19,37 +18,41 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-checksums md5 3f0bca9b0ebc7a365466851cd580d167 \
- sha1 5fab2473914663320cf961c2bbe1a13f019edef3 \
- rmd160 f2a31f4eae60a6d344cb74e6f235fb27082aecb7
+use_xz yes
+checksums rmd160 a78be85803d9d7d3caa6ad98f9003d86d23bb927 \
+ sha256 df4d2c4dbb4f3408b621140732efb3e38853658addd6aae73613027856f6bb44
+
depends_build port:pkgconfig \
port:intltool \
- port:gnome-doc-utils
+ port:itstool
depends_lib port:desktop-file-utils \
- port:rarian \
- port:gconf \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gtkmm3 \
port:libgtop \
- port:libwnck \
- port:gnome-icon-theme \
- port:gtkmm \
- port:librsvg
+ port:librsvg \
+ port:libwnck3 \
+ port:libxml2
-depends_run port:yelp
+depends_run port:gnome-settings-daemon \
+ port:yelp
-use_bzip2 yes
+pre-patch {
+ copy ${worksrcpath}/src/procproperties.cpp ${worksrcpath}/src/procproperties.cpp.orig
+}
-patchfiles patch-src_openfiles.cpp.diff
+patchfiles patch-src_openfiles.cpp.diff \
+ patch-src-procproperties.cpp.diff
-configure.args --disable-scrollkeeper \
- --disable-schemas-install
+configure.args --disable-silent-rules \
+ --disable-systemd \
+ --disable-schemas-compile
post-activate {
- system "${prefix}/bin/scrollkeeper-update"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Copied: trunk/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff)
===================================================================
--- trunk/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff (rev 0)
+++ trunk/dports/gnome/gnome-system-monitor/files/patch-src-procproperties.cpp.diff 2013-11-13 13:39:39 UTC (rev 113308)
@@ -0,0 +1,21 @@
+--- src/procproperties.cpp.orig 2013-04-05 13:20:20.000000000 -0700
++++ src/procproperties.cpp 2013-09-19 14:01:51.000000000 -0700
+@@ -29,6 +29,9 @@
+ #elif defined (__OpenBSD__)
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
++#elif defined (__APPLE__)
++#include <sys/param.h>
++#include <sys/sysctl.h>
+ #endif
+
+ #include "procman-app.h"
+@@ -124,6 +127,8 @@
+ HZ = 100;
+ else
+ HZ = (cinf.stathz ? cinf.stathz : cinf.hz);
++#elif defined (__APPLE__)
++ int HZ = 100;
+ #endif
+ proc_arg proc_props[] = {
+ { N_("Process Name"), g_strdup_printf("%s", info->name)},
Modified: trunk/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff
===================================================================
--- trunk/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff 2013-11-13 13:28:55 UTC (rev 113307)
+++ trunk/dports/gnome/gnome-system-monitor/files/patch-src_openfiles.cpp.diff 2013-11-13 13:39:39 UTC (rev 113308)
@@ -1,7 +1,7 @@
---- src/openfiles.cpp.orig 2008-09-12 05:55:34.000000000 +1000
-+++ src/openfiles.cpp 2008-10-24 11:33:22.000000000 +1100
-@@ -45,7 +45,9 @@ get_type_name(enum glibtop_file_type t)
- }
+--- src/openfiles.cpp.orig 2013-04-05 13:20:20.000000000 -0700
++++ src/openfiles.cpp 2013-09-19 13:16:28.000000000 -0700
+@@ -49,7 +49,9 @@
+ }
}
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/5a4d77cb/attachment.html>
More information about the macports-changes
mailing list