From 52de70b04b86afe22dac672e5bb94287c1e1d168 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Tue, 21 Dec 2010 10:29:48 +0000 Subject: [PATCH] Update to fbpanel-6.1. The new battery plugin is disabled as it's not fully functional yet (even on linux). Fix WANTLIB while here. --- x11/fbpanel/Makefile | 18 ++++++++-------- x11/fbpanel/distinfo | 10 ++++----- x11/fbpanel/patches/patch-configure | 12 +++++------ .../patches/patch-data_config_default_in | 17 ++++++++++----- x11/fbpanel/patches/patch-panel_misc_c | 8 +++---- x11/fbpanel/patches/patch-plugins_Makefile_in | 12 ++++++----- x11/fbpanel/pkg/PLIST | 21 ++++++++++++++++++- 7 files changed, 63 insertions(+), 35 deletions(-) diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile index 7eedc6bb30e..10b00a0937b 100644 --- a/x11/fbpanel/Makefile +++ b/x11/fbpanel/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.12 2010/11/22 08:36:56 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2010/12/21 10:29:48 dcoppa Exp $ SHARED_ONLY= Yes COMMENT= lightweight NETWM compliant desktop panel -DISTNAME= fbpanel-6.0 -REVISION= 1 +DISTNAME= fbpanel-6.1 CATEGORIES= x11 EXTRACT_SUFX= .tbz2 @@ -31,12 +30,13 @@ CONFIGURE_STYLE=simple BUILD_DEPENDS= shells/bash LIB_DEPENDS= x11/gtk+2 -WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ - Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \ - fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \ - gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pixman-1 png pthread-stubs xcb xcb-render \ - xcb-render-util z gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 +WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo drm \ + expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \ + gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ + gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ + pixman-1 png pthread pthread-stubs xcb xcb-render \ + xcb-shm z DATADIR = ${PREFIX}/share/fbpanel EXECDIR = ${PREFIX}/libexec/fbpanel diff --git a/x11/fbpanel/distinfo b/x11/fbpanel/distinfo index 38ef5dc19fd..7b1bfbd7f11 100644 --- a/x11/fbpanel/distinfo +++ b/x11/fbpanel/distinfo @@ -1,5 +1,5 @@ -MD5 (fbpanel-6.0.tbz2) = tYQAyu56gwFG7FpPkVA1Iw== -RMD160 (fbpanel-6.0.tbz2) = Qyj2ufxlY56tp/YtJ6w7VgJYXYY= -SHA1 (fbpanel-6.0.tbz2) = SS1bgXsdM6NzWRuoSAe+ldOPZjU= -SHA256 (fbpanel-6.0.tbz2) = rvDYU3N+P45WnWizIZzpfmpbsvuG2zy1YE9AO617IS8= -SIZE (fbpanel-6.0.tbz2) = 105702 +MD5 (fbpanel-6.1.tbz2) = gMoMZBlbMFh8/LjCzZiHoA== +RMD160 (fbpanel-6.1.tbz2) = SlqnCjLQq3ohseY2NzjojX61DbA= +SHA1 (fbpanel-6.1.tbz2) = TrsuDiPNaK7wI48QeBu/QidNMvg= +SHA256 (fbpanel-6.1.tbz2) = 4UVCzIHqBuZN1HCFRvX9P14BiEw+RheIXH7yKvjPOWU= +SIZE (fbpanel-6.1.tbz2) = 190266 diff --git a/x11/fbpanel/patches/patch-configure b/x11/fbpanel/patches/patch-configure index 27f55fcf333..62a29b290c7 100644 --- a/x11/fbpanel/patches/patch-configure +++ b/x11/fbpanel/patches/patch-configure @@ -1,16 +1,16 @@ -$OpenBSD: patch-configure,v 1.1 2010/04/13 16:28:44 dcoppa Exp $ +$OpenBSD: patch-configure,v 1.2 2010/12/21 10:29:48 dcoppa Exp $ fix bash and system directory paths ---- configure.orig Sun Feb 21 11:05:12 2010 -+++ configure Thu Apr 8 11:10:43 2010 +--- configure.orig Sun Apr 4 11:02:40 2010 ++++ configure Tue Dec 21 06:56:28 2010 @@ -1,4 +1,4 @@ -#!/bin/bash +#!${LOCALBASE}/bin/bash + PID=$$ - export LANG="POSIX" - -@@ -312,18 +312,18 @@ add_var host "stab: configure for arch" "" + # NLS nuisances. +@@ -324,18 +324,18 @@ add_var host "stab: configure for arch" "" add_var target "stab: configure for arch" "" # N.B. order is important diff --git a/x11/fbpanel/patches/patch-data_config_default_in b/x11/fbpanel/patches/patch-data_config_default_in index 65a0f0f4067..e6ecff9382c 100644 --- a/x11/fbpanel/patches/patch-data_config_default_in +++ b/x11/fbpanel/patches/patch-data_config_default_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-data_config_default_in,v 1.1 2010/04/13 16:28:44 dcoppa Exp $ +$OpenBSD: patch-data_config_default_in,v 1.2 2010/12/21 10:29:48 dcoppa Exp $ remove linux-only plugins from default config file use xlock (it's in base) instead of slock ---- data/config/default.in.orig Mon Mar 22 08:57:30 2010 -+++ data/config/default.in Thu Apr 8 11:41:05 2010 -@@ -157,7 +157,7 @@ Plugin { +--- data/config/default.in.orig Wed May 12 20:30:00 2010 ++++ data/config/default.in Tue Dec 21 07:02:26 2010 +@@ -159,7 +159,7 @@ Plugin { item { name = Lock Display icon = gnome-lockscreen @@ -14,7 +14,7 @@ use xlock (it's in base) instead of slock } separator { } -@@ -271,46 +271,6 @@ Plugin { +@@ -273,53 +273,6 @@ Plugin { size = 10 } } @@ -58,6 +58,13 @@ use xlock (it's in base) instead of slock - } -} - +-plugin { +- type = volume +-} +- +-#plugin { +-# type = battery +-#} Plugin { type = tray diff --git a/x11/fbpanel/patches/patch-panel_misc_c b/x11/fbpanel/patches/patch-panel_misc_c index dc59c205710..dfcadac7376 100644 --- a/x11/fbpanel/patches/patch-panel_misc_c +++ b/x11/fbpanel/patches/patch-panel_misc_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-panel_misc_c,v 1.1 2010/04/13 16:28:44 dcoppa Exp $ +$OpenBSD: patch-panel_misc_c,v 1.2 2010/12/21 10:29:48 dcoppa Exp $ use g_snprintf instead of g_sprintf ---- panel/misc.c.orig Tue Apr 6 16:23:27 2010 -+++ panel/misc.c Tue Apr 6 16:23:47 2010 -@@ -678,7 +678,7 @@ gchar * +--- panel/misc.c.orig Wed Apr 28 13:39:31 2010 ++++ panel/misc.c Tue Dec 21 06:56:28 2010 +@@ -687,7 +687,7 @@ gchar * gdk_color_to_RRGGBB(GdkColor *color) { static gchar str[10]; // #RRGGBB + \0 diff --git a/x11/fbpanel/patches/patch-plugins_Makefile_in b/x11/fbpanel/patches/patch-plugins_Makefile_in index 5ce745f31c6..3472682ea39 100644 --- a/x11/fbpanel/patches/patch-plugins_Makefile_in +++ b/x11/fbpanel/patches/patch-plugins_Makefile_in @@ -1,14 +1,16 @@ -$OpenBSD: patch-plugins_Makefile_in,v 1.1 2010/04/13 16:28:44 dcoppa Exp $ +$OpenBSD: patch-plugins_Makefile_in,v 1.2 2010/12/21 10:29:48 dcoppa Exp $ remove linux-only plugins ---- plugins/Makefile.in.orig Tue Apr 6 13:34:55 2010 -+++ plugins/Makefile.in Tue Apr 6 13:35:13 2010 -@@ -1,6 +1,6 @@ +--- plugins/Makefile.in.orig Wed Mar 31 14:44:34 2010 ++++ plugins/Makefile.in Tue Dec 21 06:58:36 2010 +@@ -1,7 +1,7 @@ include %%topdir%%/config.mk -SUBDIRS = taskbar launchbar space menu pager mem chart cpu net +SUBDIRS = taskbar launchbar space menu pager SUBDIRS += systray dclock wincmd icons separator image - SUBDIRS += deskno tclock genmon deskno2 +-SUBDIRS += deskno tclock genmon deskno2 meter volume battery ++SUBDIRS += deskno tclock genmon deskno2 + include %%topdir%%/rules.mk diff --git a/x11/fbpanel/pkg/PLIST b/x11/fbpanel/pkg/PLIST index 3f32656b0ef..8619144c96f 100644 --- a/x11/fbpanel/pkg/PLIST +++ b/x11/fbpanel/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2010/04/13 16:28:44 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.3 2010/12/21 10:29:48 dcoppa Exp $ @bin bin/fbpanel lib/fbpanel/ lib/fbpanel/dclock.so @@ -23,6 +23,25 @@ share/examples/fbpanel/ share/examples/fbpanel/default share/fbpanel/ share/fbpanel/images/ +@comment share/fbpanel/images/battery_0.png +@comment share/fbpanel/images/battery_1.png +@comment share/fbpanel/images/battery_2.png +@comment share/fbpanel/images/battery_3.png +@comment share/fbpanel/images/battery_4.png +@comment share/fbpanel/images/battery_5.png +@comment share/fbpanel/images/battery_6.png +@comment share/fbpanel/images/battery_7.png +@comment share/fbpanel/images/battery_8.png +@comment share/fbpanel/images/battery_charging_0.png +@comment share/fbpanel/images/battery_charging_1.png +@comment share/fbpanel/images/battery_charging_2.png +@comment share/fbpanel/images/battery_charging_3.png +@comment share/fbpanel/images/battery_charging_4.png +@comment share/fbpanel/images/battery_charging_5.png +@comment share/fbpanel/images/battery_charging_6.png +@comment share/fbpanel/images/battery_charging_7.png +@comment share/fbpanel/images/battery_charging_8.png +@comment share/fbpanel/images/battery_na.png share/fbpanel/images/dclock_glyphs.png share/fbpanel/images/default.xpm share/fbpanel/images/gnome-session-halt.png