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

Update to xfce4-session 4.6.2

Browse Source
This commit is contained in:
landry 2010-06-05 15:26:33 +00:00
parent b38f810865
commit ae678e2b53
5 changed files with 25 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/xfce4/xfce4-session/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.34 2010/04/04 10:48:59 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2010/06/05 15:26:33 landry Exp $
COMMENT= Xfce4 session manager
XFCE_PROJECT= xfce4-session
PKGNAME= ${DISTNAME}p4
SHARED_LIBS += xfsm-4.6 0.0 # .0.0
@ -28,7 +27,8 @@ WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
gio-2.0 glade-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 pthread startup-notification-1 xfce4util xml2 z \
pthread-stubs xcb execinfo xcb-atom xcb-aux xcb-event
pthread-stubs xcb execinfo xcb-atom xcb-aux xcb-event \
gthread-2.0 xcb-render xcb-render-util
FAKE_FLAGS= settingsdir=${PREFIX}/share/examples/xfce4-session

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

@ -1,5 +1,5 @@
MD5 (xfce4/xfce4-session-4.6.1.tar.bz2) = dii+Qe01EaIM/1Zz2dOYWA==
RMD160 (xfce4/xfce4-session-4.6.1.tar.bz2) = DKtKDKKw13GM3lRtmLrByHp7pPA=
SHA1 (xfce4/xfce4-session-4.6.1.tar.bz2) = dg4Fv3N4NSGzzjTpGqGHx0AYq4w=
SHA256 (xfce4/xfce4-session-4.6.1.tar.bz2) = /u0/kFO4MjNpciOiD5XKCtbv6f7f/MCY5JNaQl6Pnw4=
SIZE (xfce4/xfce4-session-4.6.1.tar.bz2) = 1365247
MD5 (xfce4/xfce4-session-4.6.2.tar.bz2) = nZiQEw5F4OlHZZHtm6LJ1Q==
RMD160 (xfce4/xfce4-session-4.6.2.tar.bz2) = PEUCjVeu5ZUKSF12B5nQx0rac14=
SHA1 (xfce4/xfce4-session-4.6.2.tar.bz2) = Kld4oVQ/l4RfEYoYbi27io6j/0s=
SHA256 (xfce4/xfce4-session-4.6.2.tar.bz2) = cl4mklTDTFMKy2cPXM0P1ptXy+nyF2q9hJn8XW3NMKg=
SIZE (xfce4/xfce4-session-4.6.2.tar.bz2) = 1385541

35
x11/xfce4/xfce4-session/patches/patch-xfce4-session_xfsm-shutdown-helper_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-xfce4-session_xfsm-shutdown-helper_c,v 1.1 2009/09/26 11:16:05 landry Exp $
ultimate fix for http://bugzilla.xfce.org/show_bug.cgi?id=4849
--- xfce4-session/xfsm-shutdown-helper.c.orig Thu Sep 24 23:24:10 2009
+++ xfce4-session/xfsm-shutdown-helper.c Thu Sep 24 23:25:34 2009
@@ -554,8 +554,14 @@ xfsm_shutdown_helper_send_command (XfsmShutdownHelper
if (ferror (helper->outfile))
{
- if (error && errno != EINTR)
+ if (errno == EINTR)
{
+ /* probably succeeded but the helper got killed */
+ return TRUE;
+ }
+
+ if (error)
+ {
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
_("Error sending command to shutdown helper: %s"),
strerror (errno));
@@ -565,7 +571,13 @@ xfsm_shutdown_helper_send_command (XfsmShutdownHelper
if (fgets (response, 256, helper->infile) == NULL)
{
- if (error && errno != EINTR)
+ if (errno == EINTR)
+ {
+ /* probably succeeded but the helper got killed */
+ return TRUE;
+ }
+
+ if (error)
{
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
_("Error receiving response from shutdown helper: %s"),

8
x11/xfce4/xfce4-session/patches/patch-xfce4-tips_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xfce4-tips_Makefile_in,v 1.1 2009/03/08 17:16:53 landry Exp $
--- xfce4-tips/Makefile.in.orig Mon Jan 12 22:18:46 2009
+++ xfce4-tips/Makefile.in Mon Jan 19 22:11:56 2009
@@ -309,7 +309,7 @@ xfce4_tips_CFLAGS = \
$OpenBSD: patch-xfce4-tips_Makefile_in,v 1.2 2010/06/05 15:26:33 landry Exp $
--- xfce4-tips/Makefile.in.orig Fri May 21 18:58:41 2010
+++ xfce4-tips/Makefile.in Wed Jun 2 20:43:04 2010
@@ -338,7 +338,7 @@ xfce4_tips_CFLAGS = \
xfce4_tips_LDADD = \
@LIBXFCEGUI4_LIBS@

14
x11/xfce4/xfce4-session/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2009/12/21 16:07:45 landry Exp $
@comment $OpenBSD: PLIST,v 1.16 2010/06/05 15:26:33 landry Exp $
@conflict xfce4-toys-*
%%SHARED%%
@bin bin/xfce4-session
@ -70,6 +70,9 @@ share/locale/am/LC_MESSAGES/xfce4-session.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/xfce4-session.mo
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/xfce4-session.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/xfce4-session.mo
@ -115,6 +118,9 @@ share/locale/ja/LC_MESSAGES/xfce4-session.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/xfce4-session.mo
share/locale/kk/
share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/xfce4-session.mo
share/locale/ko/LC_MESSAGES/xfce4-session.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
@ -151,10 +157,16 @@ share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/xfce4-session.mo
share/locale/tr/LC_MESSAGES/xfce4-session.mo
share/locale/ug/
share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/xfce4-session.mo
share/locale/uk/LC_MESSAGES/xfce4-session.mo
share/locale/ur/
share/locale/ur/LC_MESSAGES/
share/locale/ur/LC_MESSAGES/xfce4-session.mo
share/locale/ur_PK/
share/locale/ur_PK/LC_MESSAGES/
share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo
share/locale/vi/LC_MESSAGES/xfce4-session.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo