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

Update to gnome-session-3.16.0.

Browse Source
This commit is contained in:
ajacoutot 2015-04-03 12:43:19 +00:00
parent 932a3e20da
commit 29e39db295
4 changed files with 41 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
x11/gnome/session/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.246 2015/03/27 08:16:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.247 2015/04/03 12:43:19 ajacoutot Exp $
COMMENT= GNOME session
GNOME_PROJECT= gnome-session
GNOME_VERSION= 3.14.0
REVISION= 2
GNOME_VERSION= 3.16.0
CATEGORIES= x11
@ -14,43 +13,44 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xtst Xxf86vm
WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
WANTLIB += dbus-1 dbus-glib-1 drm execinfo expat ffi fontconfig
WANTLIB += dbus-1 dbus-glib-1 drm epoxy execinfo expat ffi fontconfig
WANTLIB += freetype gconf-2 gdk-3 gdk_pixbuf-2.0 gio-2.0 glapi
WANTLIB += glib-2.0 gmodule-2.0 gnome-desktop-3 gobject-2.0 graphite2
WANTLIB += gthread-2.0 gtk-3 harfbuzz json-glib-1.0 m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs stdc++ xcb xcb-dri2 xcb-glx
WANTLIB += xcb-render xcb-shm z
WANTLIB += pthread-stubs stdc++ xcb xcb-dri2 xcb-glx xcb-render
WANTLIB += xcb-shm z
MODULES= devel/dconf \
devel/gettext \
x11/gnome
MODULES= devel/dconf \
devel/gettext \
x11/gnome
BUILD_DEPENDS= textproc/xmlto \
x11/gnome/settings-daemon
BUILD_DEPENDS= textproc/xmlto \
x11/gnome/settings-daemon
LIB_DEPENDS= devel/libexecinfo \
x11/gtk+3 \
devel/gconf2 \
devel/json-glib
LIB_DEPENDS= devel/gconf2 \
devel/json-glib \
devel/libexecinfo \
x11/gtk+3
# polkit(8) almost always needs to know the "active" session
RUN_DEPENDS += sysutils/consolekit
RUN_DEPENDS += sysutils/consolekit
# gnome.session RequiredComponents
RUN_DEPENDS+= x11/gnome/settings-daemon \
x11/gnome/shell
RUN_DEPENDS+= x11/gnome/settings-daemon \
x11/gnome/shell
# use for init errors, gnome-session/gsm-util.c
RUN_DEPENDS += x11/gnome/zenity
RUN_DEPENDS += x11/gnome/zenity
RUN_DEPENDS+= devel/gsettings-desktop-schemas
RUN_DEPENDS+= devel/gsettings-desktop-schemas
MODGNOME_TOOLS= gtk-update-icon-cache
MODGNOME_TOOLS= gtk-update-icon-cache
MODGNOME_CPPFLAGS=-I${X11BASE}/include
MODGNOME_LDFLAGS=-L${X11BASE}/lib
MODGNOME_CPPFLAGS= -I${X11BASE}/include
MODGNOME_LDFLAGS= -L${X11BASE}/lib
CONFIGURE_ARGS= --disable-systemd
CONFIGURE_ARGS= --disable-systemd \
--enable-consolekit
.include <bsd.port.mk>

4
x11/gnome/session/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-session-3.14.0.tar.xz) = seboBUeLhj7aWOYezQ4Tlh9j3Xbi1JaSr/xaHQDywYQ=
SIZE (gnome/gnome-session-3.14.0.tar.xz) = 736128
SHA256 (gnome/gnome-session-3.16.0.tar.xz) = m1RtRV7dnWgQcKYcmKQWRVf4nrvWY2eiqlKNgH3+qZ0=
SIZE (gnome/gnome-session-3.16.0.tar.xz) = 764808

61
x11/gnome/session/patches/patch-gnome-session_gsm-autostart-app_c
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-gnome-session_gsm-autostart-app_c,v 1.1 2015/02/16 08:57:42 ajacoutot Exp $
From 3442740ad4808f91fb857fb2dda3c24992f0bbdf Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 14 Nov 2014 09:49:21 -0500
Subject: autostart: validate autostart condition gsettings key
--- gnome-session/gsm-autostart-app.c.orig Fri Jul 18 22:50:42 2014
+++ gnome-session/gsm-autostart-app.c Mon Feb 16 09:41:33 2015
@@ -337,12 +337,16 @@ setup_gsettings_condition_monitor (GsmAutostartApp *ap
GSettingsSchemaSource *source;
GSettingsSchema *schema;
GSettings *settings;
+ GSettingsSchemaKey *schema_key;
+ const GVariantType *key_type;
char **elems;
gboolean retval = FALSE;
char *signal;
retval = FALSE;
+ schema = NULL;
+
elems = g_strsplit (key, " ", 2);
if (elems == NULL)
@@ -358,9 +362,24 @@ setup_gsettings_condition_monitor (GsmAutostartApp *ap
if (schema == NULL)
goto out;
+ if (!g_settings_schema_has_key (schema, elems[1]))
+ goto out;
+
+ schema_key = g_settings_schema_get_key (schema, elems[1]);
+
+ g_assert (schema_key != NULL);
+
+ key_type = g_settings_schema_key_get_value_type (schema_key);
+
+ g_settings_schema_key_unref (schema_key);
+
+ g_assert (key_type != NULL);
+
+ if (!g_variant_type_equal (key_type, G_VARIANT_TYPE_BOOLEAN))
+ goto out;
+
settings = g_settings_new_full (schema, NULL, NULL);
retval = g_settings_get_boolean (settings, elems[1]);
- g_settings_schema_unref (schema);
signal = g_strdup_printf ("changed::%s", elems[1]);
g_signal_connect (G_OBJECT (settings), signal,
@@ -370,6 +389,8 @@ setup_gsettings_condition_monitor (GsmAutostartApp *ap
app->priv->condition_settings = settings;
out:
+ if (schema)
+ g_settings_schema_unref (schema);
g_strfreev (elems);
return retval;

15
x11/gnome/session/patches/patch-gnome-session_main_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-gnome-session_main_c,v 1.13 2015/04/03 12:43:19 ajacoutot Exp $
XXX no rpmatch(3) on OpenBSD
--- gnome-session/main.c.orig Fri Apr 3 14:18:31 2015
+++ gnome-session/main.c Fri Apr 3 14:19:42 2015
@@ -260,7 +260,7 @@ main (int argc, char **argv)
debug_string = g_getenv ("GNOME_SESSION_DEBUG");
if (debug_string != NULL) {
- debug = rpmatch (debug_string) == TRUE || atoi (debug_string) == 1;
+ debug = atoi (debug_string) == 1;
}
error = NULL;