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

Various bugfixes and enhancements.

Browse Source 
Didn't touch this port for a long time...
This commit is contained in:
dcoppa 2015-10-20 13:38:35 +00:00
parent ef9c4107f3
commit d01090e1e3
7 changed files with 147 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11/fbpanel/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.20 2013/05/13 19:02:49 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2015/10/20 13:38:35 dcoppa Exp $
SHARED_ONLY= Yes
COMMENT= lightweight NETWM compliant desktop panel
DISTNAME= fbpanel-6.1
REVISION= 5
REVISION= 6
CATEGORIES= x11
EXTRACT_SUFX= .tbz2
@ -26,13 +26,12 @@ CONFIGURE_STYLE=simple
BUILD_DEPENDS= shells/bash
LIB_DEPENDS= x11/gtk+2
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
WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \
Xinerama Xrandr Xrender atk-1.0 c cairo \
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pthread z
DATADIR = ${PREFIX}/share/fbpanel
EXECDIR = ${PREFIX}/libexec/fbpanel
@ -43,6 +42,7 @@ pre-configure:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/panel/fbpanel ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/data/man/fbpanel.1 ${PREFIX}/man/man1/
${INSTALL_DATA_DIR} ${PREFIX}/lib/fbpanel
${INSTALL_DATA_DIR} ${DATADIR}/images
${INSTALL_DATA_DIR} ${EXAMPLEDIR}

94
x11/fbpanel/patches/patch-data_man_fbpanel_1_in Normal file
View File

@ -0,0 +1,94 @@
$OpenBSD: patch-data_man_fbpanel_1_in,v 1.1 2015/10/20 13:38:35 dcoppa Exp $
Fix some encoding issues and update documentation and paths
Author: Dererk <dererk@debian.org>
--- data/man/fbpanel.1.in.orig Mon Jun 1 16:55:30 2009
+++ data/man/fbpanel.1.in Tue Oct 20 15:17:16 2015
@@ -1,15 +1,16 @@
.\" man page originally for the Debian/GNU Linux system
-.TH FBPANEL "1" "May 2005" "fbpanel %%version%%" "User Commands"
+.TH FBPANEL "1" "2010-07-11" "fbpanel %%version%%" "User Commands"
.SH NAME
-fbpanel \- a NETWM compliant lightweight GTK2-based panel for UNIX desktop.
+fbpanel \- a NETWM compliant lightweight GTK2-based panel for the UNIX desktop.
.SH SYNOPSIS
.B fbpanel
[\fIOPTION\fR]
.br
.SH DESCRIPTION
.PP
-fbpanel is desktop panel which provides graphical information and feedback about
-desktop activity and allows interaction with the window manager.
+fbpanel is a desktop panel which provides graphical informations
+and feedback about desktop activity and allows interaction with the
+window manager.
It features:
.HP
\(bu taskbar \- shows a list of the managed windows (tasks)
@@ -26,7 +27,7 @@ It features:
.HP
\(bu system tray \- tray for XEMBED icons (aka docklets)
.PP
-fbpanel requires NETWM (www.freedesktop.org) compliant window manager.
+fbpanel requires a NETWM (www.freedesktop.org) compliant window manager.
You can run many instances of fbpanel each with its own configuration
(see \fBOPTIONS\fR below).
@@ -48,42 +49,36 @@ http://fbpanel.sf.net/
\-- open configuration dialog
.TP
\fB\--profile <name>\fR
-\-- use specified profile. The profile is loaded from the file ~/.fbpanel/<name>.
-If that fails, fbpanel will load @DATADIR@/<name>.
-No -p option is equivalent to -p default
+\-- use specified profile. The profile is loaded from the file ~/.config/fbpanel/<name>.
+No \-p option is equivalent to \-p default
.TP
\fB\-h\fR
-\-- same as --help
+\-- same as \-\-help
.TP
\fB\-p\fR
-\-- same as --profile
+\-- same as \-\-profile
.TP
\fB\-v\fR
-\-- same as --version
+\-- same as \-\-version
.TP
\fB\-C\fR
-\-- same as --configure
+\-- same as \-\-configure
.SH CUSTOMIZATION
-To change default settings, copy profile file to your home directory
-.br
- mkdir -p ~/.fbpanel
- cp @DATADIR@/default ~/.fbpanel
-.br
-and edit it. Default profile file contains comments and explanation inside,
-so it should be easy. For full list of options please visit fbpanel's home page.
+fbpanel will create a default profile file in case no one exists already.
+Default profile file contains comments and explanations inside,
+so it should be easy.
+
.SH FILES
.TP
-@DATADIR@/
-Directory with system-wide resources and default settings
-.TP
-~/.fbpanel/
+~/.config/fbpanel/
Directory with the user's private profiles
.TP
-~/.fbpanel/default
+~/.config/fbpanel/default
The user's default profile.
.SH AUTHOR
fbpanel was written by Anatoly Asviyan <aanatoly@users.sf.net>.
This manual page was originally written for the
-Debian GNU/Linux system by Shyamal Prasad <shyamal@member.fsf.org>.
+Debian GNU/Linux system by Shyamal Prasad <shyamal@member.fsf.org> and updated
+by Ulises Vitulli <dererk@debian.org>.

8
x11/fbpanel/patches/patch-exec_make_profile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-exec_make_profile_in,v 1.4 2012/01/14 22:14:10 dcoppa Exp $
$OpenBSD: patch-exec_make_profile_in,v 1.5 2015/10/20 13:38:35 dcoppa Exp $
remove bashism
fix default config file path
@ -33,21 +33,21 @@ task :-)
local browser terminal filer
- for browser in x-www-browser firefox opera; do
+ for browser in firefox firefox36 firefox35 chrome midori xxxterm epiphany opera; do
+ for browser in firefox chrome iridium midori epiphany xombrero ; do
if which $browser 2> /dev/null > /dev/null; then
opt="$opt -e s/x-www-browser/$browser/"
break
fi
done
- for terminal in x-terminal urxvt gnome-terminal; do
+ for terminal in urxvt gnome-terminal xfce4-terminal konsole roxterm xterm; do
+ for terminal in urxvt xfce4-terminal gnome-terminal konsole roxterm st xterm ; do
if which $terminal 2> /dev/null > /dev/null; then
opt="$opt -e s/x-terminal/$terminal/"
break
fi
done
- for filer in x-file-manager thunar pcmanfm rox; do
+ for filer in Thunar nautilus pcmanfm emelfm2 rox krusader konqueror; do
+ for filer in thunar nautilus dolphin pcmanfm xfe emelfm2 rox konqueror krusader ; do
if which $filer 2> /dev/null > /dev/null; then
opt="$opt -e s/x-file-manager/$filer/"
break

4
x11/fbpanel/patches/patch-exec_xlogout
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-exec_xlogout,v 1.1 2010/04/13 16:28:44 dcoppa Exp $
$OpenBSD: patch-exec_xlogout,v 1.2 2015/10/20 13:38:35 dcoppa Exp $
fix xlogout script on OpenBSD
use some sane defaults for X session names: that's a best effort
@ -12,7 +12,7 @@ task :-)
-# xlogout - logs user out of its X session
-# Linux specific since uses /proc
+XSESS=$(pgrep -U `id -u` -f '(Xsession|cwm|fvwm|gnome-session|startkde|xfce4-session|xinit|xinitrc|xsession)')
+XSESS=$(pgrep -U `id -u` -f '(Xsession|cwm|fvwm|gnome-session|openbox|openbox-session|startkde|xfce4-session|xinit|xinitrc|xsession)')
-# get display name without screen number
-[ -z "$DISPLAY" ] && exit 1

17
x11/fbpanel/patches/patch-panel_gconf_panel_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-panel_gconf_panel_c,v 1.1 2015/10/20 13:38:35 dcoppa Exp $
Fix typo in the GUI
Bug-Debian: http://bugs.debian.org/590727
Author: Dererk <dererk@debian.org>
--- panel/gconf_panel.c.orig Tue Oct 20 13:40:56 2015
+++ panel/gconf_panel.c Tue Oct 20 13:42:01 2015
@@ -233,7 +233,7 @@ mk_geom_block(xconf *xc)
w = gconf_edit_enum(geom_block, xconf_get(xc, "allign"),
allign_enum);
- gconf_block_add(geom_block, gtk_label_new("Allignment"), TRUE);
+ gconf_block_add(geom_block, gtk_label_new("Alignment"), TRUE);
gconf_block_add(geom_block, w, FALSE);
allign_opt = w;

19
x11/fbpanel/patches/patch-scripts_custom_sh Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-scripts_custom_sh,v 1.1 2015/10/20 13:38:35 dcoppa Exp $
https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch
--- scripts/custom.sh.orig Tue Oct 20 13:43:52 2015
+++ scripts/custom.sh Tue Oct 20 13:45:07 2015
@@ -18,10 +18,10 @@
add_feature dependency "disable dependency tracking" disabled
add_var glib_cflags "glib cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags glib-2.0`'
-add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0`'
+add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0 x11`'
add_var glib_libs "glib libs" '`RFS=$rfs scripts/rfs-pkg-config --libs glib-2.0`'
-add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0`'
+add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0` -lm'
add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags -fPIC'
add_var ldflagsx "linker flags" '$glib_libs $gtk_libs'

3
x11/fbpanel/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2010/12/21 10:29:48 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.4 2015/10/20 13:38:35 dcoppa Exp $
@bin bin/fbpanel
lib/fbpanel/
lib/fbpanel/dclock.so
@ -19,6 +19,7 @@ lib/fbpanel/wincmd.so
libexec/fbpanel/
libexec/fbpanel/make_profile
libexec/fbpanel/xlogout
@man man/man1/fbpanel.1
share/examples/fbpanel/
share/examples/fbpanel/default
share/fbpanel/