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

Update to xfce4-panel 4.6.2, bugfix release, backported patches integrated.

Browse Source 
See http://foo-projects.org/pipermail/xfce/2009-October/026052.html.
This commit is contained in:
landry 2009-10-19 19:55:54 +00:00
parent 032a5f6054
commit 2dcb838bfa
6 changed files with 20 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/xfce4/xfce4-panel/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2009/08/11 08:38:41 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.27 2009/10/19 19:55:54 landry Exp $
COMMENT= Xfce4 desktop panel
XFCE_VERSION= 4.6.2
XFCE_PROJECT= xfce4-panel
PKGNAME= ${DISTNAME}p2
SHARED_LIBS= xfce4panel 2.3 #2.2
@ -25,7 +25,9 @@ WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png \
startup-notification-1 xfce4util z pthread-stubs xcb
startup-notification-1 xfce4util z pthread-stubs xcb \
execinfo xcb-atom xcb-aux xcb-event
FAKE_FLAGS= confdir=${PREFIX}/share/examples/xfce4-panel

10
x11/xfce4/xfce4-panel/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xfce4/xfce4-panel-4.6.1.tar.bz2) = c6NmuYkhUiZrRl19nDW+9A==
RMD160 (xfce4/xfce4-panel-4.6.1.tar.bz2) = R84XAzBudCfTALs2deLo3NE8RZ4=
SHA1 (xfce4/xfce4-panel-4.6.1.tar.bz2) = YTxm9kAv66eYOn7/sAjwkRgjUNI=
SHA256 (xfce4/xfce4-panel-4.6.1.tar.bz2) = swjdyW/LJ7PxjtL6IK6zoS+3POx2dtdZFKWNGycSS4M=
SIZE (xfce4/xfce4-panel-4.6.1.tar.bz2) = 868225
MD5 (xfce4/xfce4-panel-4.6.2.tar.bz2) = iDUoFshMvqVxIbDEeJdpdg==
RMD160 (xfce4/xfce4-panel-4.6.2.tar.bz2) = XZger/xaqyJ6PbZvjTnQSS0CoW0=
SHA1 (xfce4/xfce4-panel-4.6.2.tar.bz2) = MqXluei5PCFnB3synPTS/LQyPJ4=
SHA256 (xfce4/xfce4-panel-4.6.2.tar.bz2) = HYqxNUxzk1pdEvDX0ibSauG5D90jVGC9tX/VZRIpvIs=
SIZE (xfce4/xfce4-panel-4.6.2.tar.bz2) = 876456

17
x11/xfce4/xfce4-panel/patches/patch-panel_panel-app_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-panel_panel-app_c,v 1.1 2009/06/29 15:11:43 landry Exp $
fix http://bugzilla.xfce.org/show_bug.cgi?id=5454
--- panel/panel-app.c.orig Mon Jun 29 10:49:50 2009
+++ panel/panel-app.c Mon Jun 29 10:50:17 2009
@@ -710,10 +710,9 @@ panel_app_run (gchar *client_id)
TRUE);
/* session management */
- restart_command = g_new (gchar *, 3);
+ restart_command = g_new (gchar *, 2);
restart_command[0] = g_strdup ("xfce4-panel");
- restart_command[1] = g_strdup ("-r");
- restart_command[2] = NULL;
+ restart_command[1] = NULL;
panel_app.session_client =
client_session_new_full (NULL,

39
x11/xfce4/xfce4-panel/patches/patch-plugins_launcher_launcher-exec_c
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-plugins_launcher_launcher-exec_c,v 1.1 2009/05/11 20:49:44 landry Exp $
--- plugins/launcher/launcher-exec.c.orig Sat Apr 18 16:40:09 2009
+++ plugins/launcher/launcher-exec.c Mon May 11 22:13:33 2009
@@ -264,6 +264,9 @@ launcher_exec_parse_argv (LauncherEntry *entry,
GSList *li;
gchar **argv = NULL;
+ if (entry->terminal)
+ g_string_append (command_line, "exo-open --launch TerminalEmulator ");
+
/* build the full command */
for (p = entry->exec; *p != '\0'; ++p)
{
@@ -378,24 +381,7 @@ launcher_exec_parse_argv (LauncherEntry *entry,
DBG ("Execute: %s", command_line->str);
/* create the argv */
- if (G_LIKELY (command_line->str != NULL))
- {
- if (entry->terminal == FALSE)
- {
- /* use glib to parge the argv */
- g_shell_parse_argv (command_line->str, NULL, &argv, error);
- }
- else
- {
- /* we parse our own argv here so exo-open will handle all attributes without problems */
- argv = g_new (gchar *, 5);
- argv[0] = g_strdup ("exo-open");
- argv[1] = g_strdup ("--launch");
- argv[2] = g_strdup ("TerminalEmulator");
- argv[3] = g_strdup (command_line->str);
- argv[4] = NULL;
- }
- }
+ g_shell_parse_argv (command_line->str, NULL, &argv, error);
/* cleanup */
g_string_free (command_line, TRUE);

15
x11/xfce4/xfce4-panel/patches/patch-plugins_tasklist_tasklist_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-plugins_tasklist_tasklist_c,v 1.1 2009/05/11 20:49:44 landry Exp $
--- plugins/tasklist/tasklist.c.orig Mon Jan 12 22:35:30 2009
+++ plugins/tasklist/tasklist.c Mon Apr 13 13:42:46 2009
@@ -105,7 +105,10 @@ tasklist_handle_exposed (GtkWidget *widget,
gtk_paint_handle (widget->style, widget->window,
GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
&(event->area), widget, "handlebox",
- x, y, w, h, orientation);
+ x, y, w, h,
+ (orientation == GTK_ORIENTATION_HORIZONTAL ?
+ GTK_ORIENTATION_VERTICAL :
+ GTK_ORIENTATION_HORIZONTAL));
return TRUE;
}

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2009/04/28 19:49:31 landry Exp $
@comment $OpenBSD: PLIST,v 1.13 2009/10/19 19:55:54 landry Exp $
@conflict xfce4-datetime-*
@conflict xfce4-iconbox-*
@conflict xfce4-showdesktop-*
@ -129,6 +129,9 @@ share/locale/am/LC_MESSAGES/xfce4-panel.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/xfce4-panel.mo
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/xfce4-panel.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/xfce4-panel.mo
@ -178,6 +181,9 @@ share/locale/ja/LC_MESSAGES/xfce4-panel.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/xfce4-panel.mo
share/locale/kk/
share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/xfce4-panel.mo
share/locale/ko/LC_MESSAGES/xfce4-panel.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
@ -221,6 +227,9 @@ share/locale/uk/LC_MESSAGES/xfce4-panel.mo
share/locale/ur/
share/locale/ur/LC_MESSAGES/
share/locale/ur/LC_MESSAGES/xfce4-panel.mo
share/locale/ur_PK/
share/locale/ur_PK/LC_MESSAGES/
share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo
share/locale/vi/LC_MESSAGES/xfce4-panel.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo