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

Update to gnome-session-2.32.0.

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2010-09-30 07:37:04 +00:00
parent 03b146eb28
commit edd0f41c1d
6 changed files with 79 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11/gnome/session/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.119 2010/09/28 07:19:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.120 2010/09/30 07:37:04 ajacoutot Exp $
COMMENT= GNOME session
GNOME_PROJECT= gnome-session
GNOME_VERSION= 2.30.2
REVISION= 8
GNOME_VERSION= 2.32.0
CATEGORIES= x11
@ -20,8 +19,7 @@ WANTLIB += c cairo dbus-1 dbus-glib-1 expat fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += startup-notification-1 xcb xcb-atom xcb-aux xcb-event
WANTLIB += z xcb-render xcb-render-util execinfo
WANTLIB += z xcb-render xcb-render-util execinfo xcb
MODULES= devel/gettext \
x11/gnome \
@ -46,7 +44,6 @@ DESKTOP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= gnome-session
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-splash \
--disable-rebuilds
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
@ -55,8 +52,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
# find the right path for gconftool-2
CONFIGURE_ENV+= GCONFTOOL=${LOCALBASE}/bin/gconftool-2
MAKE_FLAGS= XSLTPROC="${LOCALBASE}/bin/xsltproc -nonet" \
sysconfdir=${PREFIX}/share/examples/gnome-session
MAKE_FLAGS= XSLTPROC="${LOCALBASE}/bin/xsltproc -nonet"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnome-session

10
x11/gnome/session/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gnome-session-2.30.2.tar.bz2) = 2TotqTGsC5wNmPa2ihenMA==
RMD160 (gnome/gnome-session-2.30.2.tar.bz2) = aiafRiWvdr9qdK1EWuyRNIJ6cmw=
SHA1 (gnome/gnome-session-2.30.2.tar.bz2) = EzPSwevEuAoA7movLTQwnP1zxeo=
SHA256 (gnome/gnome-session-2.30.2.tar.bz2) = 6ntdiyVOug9O5fc37TaG/KT6c0rVSiDyBlNCQfau9Ow=
SIZE (gnome/gnome-session-2.30.2.tar.bz2) = 817580
MD5 (gnome/gnome-session-2.32.0.tar.bz2) = s0i9Ak+84mT3ShdOvN85Rw==
RMD160 (gnome/gnome-session-2.32.0.tar.bz2) = pItenuoUcoopLx/33TG+VjWFecs=
SHA1 (gnome/gnome-session-2.32.0.tar.bz2) = UYpwaVqL3HbRef8bw2+t95VFefU=
SHA256 (gnome/gnome-session-2.32.0.tar.bz2) = S3V1dDAwYsulYM/+ymVOzNTtDdFj7+eTpKPvtoIt6iU=
SIZE (gnome/gnome-session-2.32.0.tar.bz2) = 773010

54
x11/gnome/session/patches/patch-configure
View File

@ -1,70 +1,70 @@
$OpenBSD: patch-configure,v 1.3 2010/06/22 17:46:52 ajacoutot Exp $
--- configure.orig Tue Jun 22 04:06:47 2010
+++ configure Tue Jun 22 19:36:30 2010
@@ -12269,13 +12269,11 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
$OpenBSD: patch-configure,v 1.4 2010/09/30 07:37:05 ajacoutot Exp $
--- configure.orig Tue Sep 28 13:39:47 2010
+++ configure Tue Sep 28 13:40:02 2010
@@ -12292,13 +12292,11 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
gio-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
- upower-glib >= \$UPOWER_REQUIRED
\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
- upower-glib >= $UPOWER_REQUIRED
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -12284,7 +12282,6 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
@@ -12307,7 +12305,6 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
- upower-glib >= $UPOWER_REQUIRED
" 2>/dev/null`
else
pkg_failed=yes
@@ -12300,13 +12297,11 @@ if test -n "$GNOME_SESSION_LIBS"; then
@@ -12323,13 +12320,11 @@ if test -n "$GNOME_SESSION_LIBS"; then
gio-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
- upower-glib >= \$UPOWER_REQUIRED
\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
- upower-glib >= $UPOWER_REQUIRED
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -12315,7 +12310,6 @@ if test -n "$GNOME_SESSION_LIBS"; then
@@ -12338,7 +12333,6 @@ if test -n "$GNOME_SESSION_LIBS"; then
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
- upower-glib >= $UPOWER_REQUIRED
" 2>/dev/null`
else
pkg_failed=yes
@@ -12338,14 +12332,12 @@ fi
@@ -12363,14 +12357,12 @@ fi
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
- upower-glib >= $UPOWER_REQUIRED
" 2>&1`
else
GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
- upower-glib >= $UPOWER_REQUIRED
" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -12355,7 +12347,6 @@ fi
@@ -12380,7 +12372,6 @@ fi
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
- upower-glib >= $UPOWER_REQUIRED
) were not met:
$GNOME_SESSION_PKG_ERRORS

42
x11/gnome/session/patches/patch-gnome-session_gsm-logout-dialog_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-gnome-session_gsm-logout-dialog_c,v 1.3 2010/07/23 09:28:05 ajacoutot Exp $
$OpenBSD: patch-gnome-session_gsm-logout-dialog_c,v 1.4 2010/09/30 07:37:05 ajacoutot Exp $
OpenBSD does not have DeviceKit/uPower.
OpenBSD does not support uPower.
--- gnome-session/gsm-logout-dialog.c.orig Tue Feb 9 14:22:01 2010
+++ gnome-session/gsm-logout-dialog.c Fri Jul 23 11:13:20 2010
--- gnome-session/gsm-logout-dialog.c.orig Thu Jul 15 14:53:08 2010
+++ gnome-session/gsm-logout-dialog.c Tue Sep 28 13:50:55 2010
@@ -27,7 +27,9 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#ifndef __OpenBSD__
#include <devkit-power-gobject/devicekit-power.h>
#include <upower.h>
+#endif
#include "gsm-logout-dialog.h"
@ -19,7 +19,7 @@ OpenBSD does not have DeviceKit/uPower.
GsmDialogLogoutType type;
+#ifndef __OpenBSD__
DkpClient *dkp_client;
UpClient *up_client;
+#endif
GsmConsolekit *consolekit;
@ -29,7 +29,7 @@ OpenBSD does not have DeviceKit/uPower.
gtk_window_stick (GTK_WINDOW (logout_dialog));
+#ifndef __OpenBSD__
logout_dialog->priv->dkp_client = dkp_client_new ();
logout_dialog->priv->up_client = up_client_new ();
+#endif
logout_dialog->priv->consolekit = gsm_get_consolekit ();
@ -39,39 +39,33 @@ OpenBSD does not have DeviceKit/uPower.
}
+#ifndef __OpenBSD__
if (logout_dialog->priv->dkp_client) {
g_object_unref (logout_dialog->priv->dkp_client);
logout_dialog->priv->dkp_client = NULL;
if (logout_dialog->priv->up_client) {
g_object_unref (logout_dialog->priv->up_client);
logout_dialog->priv->up_client = NULL;
}
+#endif
if (logout_dialog->priv->consolekit) {
g_object_unref (logout_dialog->priv->consolekit);
@@ -183,9 +191,13 @@ static gboolean
@@ -182,13 +190,21 @@ gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dia
static gboolean
gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
{
gboolean ret;
+#ifndef __OpenBSD__
g_object_get (logout_dialog->priv->dkp_client,
"can-suspend", &ret,
NULL);
return up_client_get_can_suspend (logout_dialog->priv->up_client);
+#else
+ ret = 0;
+ return FALSE;
+#endif
return ret;
}
@@ -193,9 +205,13 @@ static gboolean
static gboolean
gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
{
gboolean ret;
+#ifndef __OpenBSD__
g_object_get (logout_dialog->priv->dkp_client,
"can-hibernate", &ret,
NULL);
return up_client_get_can_hibernate (logout_dialog->priv->up_client);
+#else
+ ret = 0;
+ return FALSE;
+#endif
return ret;
}
static gboolean

37
x11/gnome/session/patches/patch-gnome-session_gsm-manager_c
View File

@ -1,26 +1,25 @@
$OpenBSD: patch-gnome-session_gsm-manager_c,v 1.5 2010/07/01 18:26:53 ajacoutot Exp $
$OpenBSD: patch-gnome-session_gsm-manager_c,v 1.6 2010/09/30 07:37:05 ajacoutot Exp $
OpenBSD does not have DeviceKit/uPower.
OpenBSD does not support uPower.
--- gnome-session/gsm-manager.c.orig Thu Mar 4 17:50:11 2010
+++ gnome-session/gsm-manager.c Fri Apr 30 12:12:11 2010
--- gnome-session/gsm-manager.c.orig Thu Jul 15 14:53:08 2010
+++ gnome-session/gsm-manager.c Tue Sep 28 13:53:51 2010
@@ -38,7 +38,9 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
+#ifndef __OpenBSD__
#include <devkit-power-gobject/devicekit-power.h>
#include <upower.h>
+#endif
#include <gtk/gtk.h> /* for logout dialog */
#include <gconf/gconf-client.h>
@@ -134,8 +136,10 @@ struct GsmManagerPrivate
DBusGProxy *bus_proxy;
@@ -135,7 +137,9 @@ struct GsmManagerPrivate
DBusGConnection *connection;
+#ifndef __OpenBSD__
/* Interface with other parts of the system */
DkpClient *dkp_client;
+#ifndef __OpenBSD__
UpClient *up_client;
+#endif
};
@ -33,7 +32,7 @@ OpenBSD does not have DeviceKit/uPower.
gboolean can_hibernate;
GError *error;
gboolean ret;
@@ -1004,11 +1009,13 @@ manager_attempt_hibernate (GsmManager *manager)
@@ -1001,11 +1006,13 @@ manager_attempt_hibernate (GsmManager *manager)
g_error_free (error);
}
}
@ -47,7 +46,7 @@ OpenBSD does not have DeviceKit/uPower.
gboolean can_suspend;
GError *error;
gboolean ret;
@@ -1030,6 +1037,7 @@ manager_attempt_suspend (GsmManager *manager)
@@ -1024,6 +1031,7 @@ manager_attempt_suspend (GsmManager *manager)
g_error_free (error);
}
}
@ -55,35 +54,35 @@ OpenBSD does not have DeviceKit/uPower.
}
static void
@@ -2202,10 +2210,12 @@ gsm_manager_dispose (GObject *object)
@@ -2196,10 +2204,12 @@ gsm_manager_dispose (GObject *object)
manager->priv->gconf_client = NULL;
}
+#ifndef __OpenBSD__
if (manager->priv->dkp_client != NULL) {
g_object_unref (manager->priv->dkp_client);
manager->priv->dkp_client = NULL;
if (manager->priv->up_client != NULL) {
g_object_unref (manager->priv->up_client);
manager->priv->up_client = NULL;
}
+#endif
G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
}
@@ -2435,7 +2445,9 @@ gsm_manager_init (GsmManager *manager)
@@ -2429,7 +2439,9 @@ gsm_manager_init (GsmManager *manager)
G_CALLBACK (on_presence_status_changed),
manager);
+#ifndef __OpenBSD__
manager->priv->dkp_client = dkp_client_new ();
manager->priv->up_client = up_client_new ();
+#endif
/* GConf setup */
gconf_client_add_dir (manager->priv->gconf_client,
@@ -2959,10 +2971,12 @@ gsm_manager_can_shutdown (GsmManager *manager,
@@ -2953,10 +2965,12 @@ gsm_manager_can_shutdown (GsmManager *manager,
gboolean can_suspend;
gboolean can_hibernate;
+#ifndef __OpenBSD__
g_object_get (manager->priv->dkp_client,
g_object_get (manager->priv->up_client,
"can-suspend", &can_suspend,
"can-hibernate", &can_hibernate,
NULL);

26
x11/gnome/session/pkg/PLIST
View File

@ -1,12 +1,8 @@
@comment $OpenBSD: PLIST,v 1.27 2010/04/30 11:24:12 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.28 2010/09/30 07:37:05 ajacoutot Exp $
@bin bin/gnome-session
@bin bin/gnome-session-properties
@bin bin/gnome-session-save
bin/gnome-wm
libexec/gnome-session/
libexec/gnome-session/helpers/
@bin libexec/gnome-session/helpers/gnome-session-splash
@bin libexec/gnome-session/helpers/gnome-settings-daemon-helper
@man man/man1/gnome-session-properties.1
@man man/man1/gnome-session-save.1
@man man/man1/gnome-session.1
@ -16,15 +12,6 @@ share/doc/gnome-session/
share/doc/gnome-session/README.OpenBSD
share/doc/gnome-session/dbus/
share/doc/gnome-session/dbus/gnome-session.html
share/examples/gnome-session/
share/examples/gnome-session/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/gnome-session/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/gnome-session/xdg/autostart/gnome-session-splash.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-session-splash.desktop
share/examples/gnome-session/xdg/autostart/gnome-settings-daemon-helper.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gnome-settings-daemon-helper.desktop
share/gnome-session/
share/gnome-session/gsm-inhibit-dialog.ui
share/gnome-session/session-properties.ui
@ -71,6 +58,9 @@ share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fur/
share/locale/fur/LC_MESSAGES/
share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fy/
share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
@ -81,8 +71,6 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hy/
share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ig/
@ -139,6 +127,9 @@ share/locale/tk/
share/locale/tk/LC_MESSAGES/
share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ug/
share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/gnome-session-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/uz/
share/locale/uz/LC_MESSAGES/
@ -156,9 +147,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
share/pixmaps/
share/pixmaps/splash/
share/pixmaps/splash/gnome-splash.png
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/gnome-session.schemas