svn commit: r434478 - in head/x11/xfce4-taskmanager: . files
Olivier Duchateau
olivierd at FreeBSD.org
Mon Feb 20 17:59:03 UTC 2017
Author: olivierd
Date: Mon Feb 20 17:59:01 2017
New Revision: 434478
URL: https://svnweb.freebsd.org/changeset/ports/434478
Log:
- Switch to Gtk2 (otherwise xfce4-taskmanager crashes when it kills
an application)
- Fix memory usage [1]
- Remove unneeded patch
- Bump PORTREVISION
PR: 217241
Submitted by: <rozhuk.im at gmail.com> [1]
Added:
head/x11/xfce4-taskmanager/files/patch-src__task-manager-freebsd.c (contents, props changed)
Deleted:
head/x11/xfce4-taskmanager/files/patch-src_process-window.c
Modified:
head/x11/xfce4-taskmanager/Makefile
Modified: head/x11/xfce4-taskmanager/Makefile
==============================================================================
--- head/x11/xfce4-taskmanager/Makefile Mon Feb 20 17:51:19 2017 (r434477)
+++ head/x11/xfce4-taskmanager/Makefile Mon Feb 20 17:59:01 2017 (r434478)
@@ -3,6 +3,7 @@
PORTNAME= xfce4-taskmanager
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
@@ -13,13 +14,16 @@ COMMENT= Task manager for the Xfce deskt
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
+
GNU_CONFIGURE= yes
USES= gettext gmake localbase pkgconfig tar:bzip2
-USE_GNOME= gtk20 gtk30 glib20 cairo gdkpixbuf2 intltool libwnck3
+USE_GNOME= gtk20 glib20 cairo gdkpixbuf2 intltool libwnck
USE_XORG= ice sm x11 xmu xt
CONFIGURE_ARGS+= --disable-gksu \
- --enable-gtk3 --enable-wnck3 \
- --disable-wnck
+ --disable-gtk3 --disable-wnck3 \
+ --enable-wnck
.include <bsd.port.mk>
Added: head/x11/xfce4-taskmanager/files/patch-src__task-manager-freebsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xfce4-taskmanager/files/patch-src__task-manager-freebsd.c Mon Feb 20 17:59:01 2017 (r434478)
@@ -0,0 +1,49 @@
+--- patch-src_task-manager-freebsd.c.orig 2017-02-20 17:11:50 UTC
++++ patch-src_task-manager-freebsd.c
+@@ -0,0 +1,46 @@
++--- src/task-manager-freebsd.c.orig 2017-01-23 06:53:01 UTC
+++++ src/task-manager-freebsd.c
++@@ -26,11 +26,11 @@
++
++ #include "task-manager.h"
++
++-gulong
+++guint64
++ get_mem_by_bytes (const gchar *name)
++ {
++- gulong buf;
++- gsize len = sizeof (gulong);
+++ guint64 buf = 0;
+++ gsize len = sizeof (buf);
++
++ if (sysctlbyname (name, &buf, &len, NULL, 0) < 0)
++ return 0;
++@@ -41,13 +41,13 @@ get_mem_by_bytes (const gchar *name)
++ guint64
++ get_mem_by_pages (const gchar *name)
++ {
++- gulong res;
+++ guint64 res;
++
++ res = get_mem_by_bytes (name);
++ if (res > 0)
++ res = res * getpagesize ();
++
++- return (guint64) res;
+++ return res;
++ }
++
++ gboolean
++@@ -55,10 +55,10 @@ get_memory_usage (guint64 *memory_total,
++ {
++ /* Get memory usage */
++ {
++- *memory_total = (guint64) get_mem_by_bytes ("hw.physmem");;
+++ *memory_total = get_mem_by_bytes ("hw.physmem");;
++ *memory_free = get_mem_by_pages ("vm.stats.vm.v_free_count");
++ *memory_cache = get_mem_by_pages ("vm.stats.vm.v_inactive_count");
++- *memory_buffers = (guint64) get_mem_by_bytes ("vfs.bufspace");
+++ *memory_buffers = get_mem_by_bytes ("vfs.bufspace");
++ }
++
++ /* Get swap usage */
More information about the svn-ports-head
mailing list