cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix/translation update to xfce4-systemload 1.1.2.

Browse Source 
Removed merged patches.
This commit is contained in:
landry 2014-11-21 09:11:22 +00:00
parent cb0332511a
commit 340aafb53c
5 changed files with 19 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/xfce4/xfce4-systemload/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2014/04/14 19:52:45 matthieu Exp $
# $OpenBSD: Makefile,v 1.32 2014/11/21 09:11:22 landry Exp $
COMMENT= Xfce4 cpu/memory/swap/uptime monitor panel plugin
XFCE_VERSION= 1.1.1
XFCE_VERSION= 1.1.2
XFCE_PLUGIN= systemload
REVISION = 2
# BSD
PERMIT_PACKAGE_CDROM= Yes
@ -12,14 +11,14 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= x11/xfce4
CONFIGURE_ARGS= --disable-upower
WANTLIB += GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 cairo drm expat ffi fontconfig freetype gdk-x11-2.0
WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += atk-1.0 cairo expat ffi fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-x11-2.0 kvm m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs stdc++
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs
WANTLIB += startup-notification-1 xcb xcb-util xcb-render xcb-shm
WANTLIB += xfce4util xfce4ui-1 z
WANTLIB += harfbuzz pthread
WANTLIB += harfbuzz pthread graphite2
.include <bsd.port.mk>

7
x11/xfce4/xfce4-systemload/distinfo
View File

@ -1,5 +1,2 @@
MD5 (xfce4/xfce4-systemload-plugin-1.1.1.tar.bz2) = ItSMCIP51Zi84k6B2T5pLg==
RMD160 (xfce4/xfce4-systemload-plugin-1.1.1.tar.bz2) = qb7TPWZKUGRCCrte84lF+OcI/cw=
SHA1 (xfce4/xfce4-systemload-plugin-1.1.1.tar.bz2) = qkiwFj3Zc3kKVd3MOiJIeKPxTGk=
SHA256 (xfce4/xfce4-systemload-plugin-1.1.1.tar.bz2) = GsE+++nldsnv/V4GdVdKV8j9RM/uYNbjGetNA8HI2a4=
SIZE (xfce4/xfce4-systemload-plugin-1.1.1.tar.bz2) = 299695
SHA256 (xfce4/xfce4-systemload-plugin-1.1.2.tar.bz2) = tGm2s6COwpuQYRUZUNh202vyWjEG7HclaSP91rXRinw=
SIZE (xfce4/xfce4-systemload-plugin-1.1.2.tar.bz2) = 305948

12
x11/xfce4/xfce4-systemload/patches/patch-panel-plugin_cpu_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-panel-plugin_cpu_c,v 1.1 2014/09/17 14:48:30 espie Exp $
--- panel-plugin/cpu.c.orig Wed Sep 17 08:44:06 2014
+++ panel-plugin/cpu.c Wed Sep 17 08:44:39 2014
@@ -213,7 +213,7 @@ gulong read_cpuload(void)
#include <sys/param.h>
#include <sys/sched.h>
#include <sys/sysctl.h>
-#include <sys/dkstat.h>
+#include <sys/sched.h>
#include <fcntl.h>
#include <nlist.h>

29
x11/xfce4/xfce4-systemload/patches/patch-panel-plugin_memswap_c
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-panel-plugin_memswap_c,v 1.4 2014/09/17 14:48:30 espie Exp $
--- panel-plugin/memswap.c.orig Wed Apr 18 13:01:19 2012
+++ panel-plugin/memswap.c Wed Sep 17 03:12:44 2014
@@ -289,20 +289,11 @@ gint read_memswap(gulong *mem, gulong *swap, gulong *M
#define ARRLEN(X) (sizeof(X)/sizeof(X[0]))
{
- static int mib[2];
- /* 64-bit datatype */
- if(sizeof(size_t) == 8) {
- mib[0] = CTL_HW;
- mib[1] = HW_PHYSMEM64;
- }
- /* assume 32-bit datatype */
- else {
- mib[0] = CTL_HW;
- mib[1] = HW_PHYSMEM;
- }
- len = sizeof(MTotal);
- sysctl(mib, ARRLEN(mib), &MTotal, &len, NULL, 0);
- MTotal >>= 10;
+ static int mib[] = { CTL_HW, HW_PHYSMEM64 };
+ int64_t x;
+ len = sizeof(x);
+ sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0);
+ MTotal = x >> 10;
}
{

11
x11/xfce4/xfce4-systemload/pkg/PLIST
View File

@ -1,34 +1,43 @@
@comment $OpenBSD: PLIST,v 1.8 2013/01/02 17:12:23 landry Exp $
@comment $OpenBSD: PLIST,v 1.9 2014/11/21 09:11:22 landry Exp $
lib/xfce4/panel/plugins/libsystemload.so
share/locale/ar/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/ast/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/bg/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/ca/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/cs/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/da/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/de/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/el/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/en_AU/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/en_GB/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/es/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/eu/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/fi/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/fr/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/gl/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/hr/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/hu/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/id/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/is/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/it/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/ja/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/ko/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/lt/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/lv/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/ms/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/nb/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/nl/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/oc/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/pl/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/pt/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/pt_BR/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/ru/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/sk/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/sl/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/sq/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/sr/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/sv/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/th/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/tr/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/ug/LC_MESSAGES/xfce4-systemload-plugin.mo
share/locale/uk/LC_MESSAGES/xfce4-systemload-plugin.mo