head 1.6; access; symbols pkgsrc-2015Q1:1.5.0.68 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.66 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.64 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.62 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.60 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.58 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.56 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.54 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.52 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.50 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.48 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.46 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.44 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.42 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.40 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.38 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.36 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.34 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.32 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.30 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.28 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.26 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.24 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.22 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.20 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.18 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.16 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.14 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.12 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.10 pkgsrc-2008Q1:1.5.0.8 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.6 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.4 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.2 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.3.0.18 pkgsrc-2007Q1-base:1.3 XFCE-4_2_x:1.3 pkgsrc-2006Q4:1.3.0.16 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.14 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.12 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.10 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.8 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.6 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.4 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2; locks; strict; comment @# @; 1.6 date 2015.04.21.08.56.40; author jperkin; state dead; branches; next 1.5; commitid 7bC9eaQQq3KiZqiy; 1.5 date 2007.04.17.13.05.08; author joerg; state Exp; branches; next 1.4; 1.4 date 2007.04.12.09.55.13; author martti; state dead; branches; next 1.3; 1.3 date 2005.01.01.00.02.56; author kristerw; state Exp; branches; next 1.2; 1.2 date 2004.06.30.12.33.53; author martti; state Exp; branches; next 1.1; 1.1 date 2004.06.28.00.47.40; author kristerw; state Exp; branches; next ; desc @@ 1.6 log @Update Xfce to 4.12.0. This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major Xfce releases since 4.6.2, our previous pkgsrc release. For more information about the thousands of changes in each major release since then, please see: Xfce 4.12 announcement: http://www.xfce.org/about/news Xfce 4.12 tour: http://www.xfce.org/about/tour Xfce 4.10 announcement: http://www.xfce.org/about/news/?post=1335571200 Xfce 4.10 tour: http://www.xfce.org/about/tour410 Xfce 4.8 announcement: http://www.xfce.org/about/news/?post=1295136000 Xfce 4.8 tour: http://www.xfce.org/about/tour48 The pkgsrc changes since then are: New packages: archivers/xfce4-thunar-archive graphics/elementary-xfce-icon-theme mail/xfce4-mailwatch-plugin misc/xfce4-time-out-plugin multimedia/xfce4-thunar-media-tags sysutils/xfce4-mount-plugin sysutils/xfce4-taskmanager sysutils/xfce4-thunar-vcs sysutils/xfce4-verve-plugin x11/xfce4-garcon x11/xfce4-notifyd x11/xfce4-tumbler x11/xfce4-whiskermenu-plugin Renamed packages: devel/xfconf to devel/xfce4-conf x11/libxfce4menu to x11/libxfce4ui x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter Updated packages: audio/xfce4-mixer audio/xfce4-xmms-plugin devel/xfce4-dev-tools editors/xfce4-mousepad graphics/ristretto meta-pkgs/xfce4-extras meta-pkgs/xfce4 misc/xfce4-weather-plugin multimedia/xfce4-mpc-plugin net/xfce4-wavelan-plugin sysutils/xfce4-appfinder sysutils/xfce4-battery-plugin sysutils/xfce4-cpugraph-plugin sysutils/xfce4-diskperf-plugin sysutils/xfce4-fsguard-plugin sysutils/xfce4-genmon-plugin sysutils/xfce4-netload-plugin sysutils/xfce4-quicklauncher-plugin sysutils/xfce4-systemload-plugin sysutils/xfce4-thunar sysutils/xfce4-xarchiver sysutils/xfce4-xkb-plugin textproc/xfce4-dict-plugin time/xfce4-datetime-plugin time/xfce4-orage time/xfce4-timer-plugin wm/xfce4-wm-themes wm/xfce4-wm x11/libxfce4gui x11/libxfce4util x11/xfce4-clipman-plugin x11/xfce4-desktop x11/xfce4-exo x11/xfce4-eyes-plugin x11/xfce4-gtk2-engine x11/xfce4-notes-plugin x11/xfce4-panel x11/xfce4-places-plugin x11/xfce4-session x11/xfce4-settings x11/xfce4-terminal Removed packages: sysutils/xfce4-volman x11/xfce4-utils This is based on a huge amount of work by the NetBSDfr team and Youri Mouton, who takes over as MAINTAINER, and has been tested by Youri on a large number of platforms prior to commit. A massive thanks to them. Any issues with the import are mine alone as the committer-by-proxy. @ text @$NetBSD: patch-aa,v 1.5 2007/04/17 13:05:08 joerg Exp $ --- configure.ac.orig 2007-04-17 12:26:04.000000000 +0000 +++ configure.ac @@@@ -29,6 +29,9 @@@@ AC_PROG_INTLTOOL dnl Check for standard header files AC_HEADER_STDC +dnl *** Check for kinfo, needed for DragonFly *** +AC_CHECK_LIB([kinfo], [kinfo_get_sched_cputime]) + dnl configure the panel plugin XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) @ 1.5 log @Catch up with change in the plugin. Adjust configure.ac for the kinfo check and regen it for now using autoconf. Can't figure out how to produce a minimal diff. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Updated to Xfce 4.4.1 See http://www.xfce.org/documentation/changelogs/4.4.1 for details. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2005/01/01 00:02:56 kristerw Exp $ d3 11 a13 7 --- panel-plugin/cpu.c.orig Sat Jun 12 03:25:31 2004 +++ panel-plugin/cpu.c Sat Jan 1 00:58:45 2005 @@@@ -36,11 +36,12 @@@@ void ReadSettings (Control *control, xmlNode *node) { xmlChar *value; + CPUGraph *base; a14 137 if (node == NULL || node->children == NULL) return; - CPUGraph *base = (CPUGraph *)control->data; + base = (CPUGraph *)control->data; for (node = node->children; node; node = node->next) { @@@@ -48,10 +49,10 @@@@ { if ((value = xmlGetProp (node, (const xmlChar *)"UpdateInterval"))) { + int update = 1000; base->m_UpdateInterval = atoi ((const char *)value); if (base->m_TimeoutID) g_source_remove (base->m_TimeoutID); - int update = 1000; if (base->m_UpdateInterval == 0) update = 250; else if (base->m_UpdateInterval == 1) @@@@ -223,10 +224,10 @@@@ } gboolean CreateControl (Control *control) { + int update = 1000; CPUGraph *base = NewCPU (); gtk_container_add (GTK_CONTAINER (control->base), GTK_WIDGET (base->m_Parent)); - int update = 1000; if (base->m_UpdateInterval == 0) update = 250; else if (base->m_UpdateInterval == 1) @@@@ -254,6 +255,7 @@@@ } void SetOrientation (Control *control, int orientation) { + int update=1000; CPUGraph *base = (CPUGraph *)control->data; base->m_Orientation = orientation; SetRealGeometry (base); @@@@ -285,7 +287,6 @@@@ gtk_widget_show (base->m_Parent); g_signal_connect (base->m_DrawArea, "expose_event", G_CALLBACK (DrawAreaExposeEvent), control->data); - int update=1000; if (base->m_UpdateInterval == 0) update = 250; else if (base->m_UpdateInterval == 1) @@@@ -651,6 +652,8 @@@@ void DrawGraph (CPUGraph *base) { + int startx, starty; + float step; GdkGC *fg1, *fg2, *bg, *fc; GtkWidget *da = base->m_DrawArea; @@@@ -669,8 +672,8 @@@@ gdk_gc_set_rgb_fg_color (fc, &base->m_FrameColor); } - int startx = base->m_Frame ? 1 : 0; - int starty = base->m_Frame ? 1 : 0; + startx = base->m_Frame ? 1 : 0; + starty = base->m_Frame ? 1 : 0; gdk_draw_rectangle (da->window, bg, @@@@ -689,7 +692,7 @@@@ } - float step = base->m_Height/100.0; + step = base->m_Height/100.0; if (base->m_Mode == 0) { @@@@ -729,12 +732,14 @@@@ else if (base->m_Mode == 1) { GdkGC *gc; + int nrx, nry; + float tstep; + int x, y; if (base->m_ColorMode > 0) gc = gdk_gc_new (da->window); - int nrx = (base->m_Width+1)/3.0; - int nry = (base->m_Height+1)/2.0; - float tstep = nry/100.0; - int x, y; + nrx = (base->m_Width+1)/3.0; + nry = (base->m_Height+1)/2.0; + tstep = nry/100.0; for (x=nrx-1;x>=0;x--) { float usage = base->m_History[nrx - 1 - x]*tstep; @@@@ -772,12 +777,15 @@@@ else if (base->m_Mode == 2) { GdkGC *gc; + int y; + float usage; + int tmp; + int length; if (base->m_ColorMode > 0) gc = gdk_gc_new (da->window); - int y; - float usage = base->m_History[0]*step; - int tmp=0; - int length = base->m_Height - (base->m_Height - usage); + usage = base->m_History[0]*step; + tmp=0; + length = base->m_Height - (base->m_Height - usage); for (y=base->m_Height-1;y>=base->m_Height - usage;y--) { if (base->m_ColorMode > 0) @@@@ -831,9 +839,9 @@@@ void ApplyChanges (CPUGraph *base) { + int update=1000; if (base->m_TimeoutID) g_source_remove (base->m_TimeoutID); - int update=1000; if (base->m_UpdateInterval == 0) update = 250; else if (base->m_UpdateInterval == 1) @@@@ -946,8 +954,8 @@@@ void SetHistorySize (CPUGraph *base, int size) { - base->m_History = (long *)realloc (base->m_History, size*sizeof (long)); int i; + base->m_History = (long *)realloc (base->m_History, size*sizeof (long)); for (i=size-1;i>=base->m_Values;i--) base->m_History[i] = 0; base->m_Values = size; @ 1.3 log @Fix C99-isms to make this pkg build with gcc 2.95. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Updated xfce4-cpugraph-plugin to 0.2.2 * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2004/06/28 00:47:40 kristerw Exp $ d3 5 a7 3 --- panel-plugin/cpu.c.orig 2004-06-12 01:25:31.000000000 +0000 +++ panel-plugin/cpu.c 2004-06-30 15:18:42.000000000 +0000 @@@@ -38,2 +38,3 @@@@ d11 2 a12 1 @@@@ -42,3 +43,3 @@@@ d17 45 a61 1 @@@@ -653,2 +654,4 @@@@ d66 5 a70 1 @@@@ -671,4 +674,4 @@@@ d77 5 a81 1 @@@@ -691,3 +694,3 @@@@ d86 5 a90 1 @@@@ -731,8 +734,10 @@@@ d105 5 a109 1 @@@@ -774,8 +779,11 @@@@ d125 16 a140 1 @@@@ -948,4 +956,4 @@@@ d146 2 @ 1.1 log @Fix some C99 variable definitions, to make this build with gcc 2.95. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 5 --- panel-plugin/cpu.c.orig Mon Jun 28 02:38:06 2004 +++ panel-plugin/cpu.c Mon Jun 28 02:41:45 2004 @@@@ -36,11 +36,12 @@@@ void ReadSettings (Control *control, xmlNode *node) { d9 1 a9 2 if (node == NULL || node->children == NULL) return; d14 1 a14 5 for (node = node->children; node; node = node->next) { @@@@ -640,6 +641,8 @@@@ void DrawGraph (CPUGraph *base) d19 1 a19 5 GtkWidget *da = base->m_DrawArea; @@@@ -658,8 +661,8 @@@@ gdk_gc_set_rgb_fg_color (fc, &base->m_FrameColor); } d26 1 a26 5 gdk_draw_rectangle (da->window, bg, @@@@ -678,7 +681,7 @@@@ } d31 1 a31 5 if (base->m_Mode == 0) { @@@@ -718,12 +721,14 @@@@ else if (base->m_Mode == 1) { d33 3 a35 3 + int nrx, nry; + float tstep; + int x, y; d38 2 a39 2 - int nrx = base->m_Width/3.0; - int nry = base->m_Height/2.0; d42 2 a43 2 + nrx = base->m_Width/3.0; + nry = base->m_Height/2.0; d46 1 a46 5 { int usage = (int)(base->m_History[nrx - 1 - x]*tstep); @@@@ -761,12 +766,15 @@@@ else if (base->m_Mode == 2) { d49 1 a49 1 + int usage; d55 1 a55 1 - int usage = (int)(base->m_History[0]*step); d58 1 a58 1 + usage = (int)(base->m_History[0]*step); d62 1 a62 5 { if (base->m_ColorMode > 0) @@@@ -926,8 +934,8 @@@@ void SetHistorySize (CPUGraph *base, int size) a67 2 base->m_History[i] = 0; base->m_Values = size; @