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

Don't be mad and dump a big core if evolution is not installed.

Browse Source 
From upstream.
This commit is contained in:
ajacoutot 2012-07-09 18:01:16 +00:00
parent ed0363ea1f
commit 8144deee1a
5 changed files with 84 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/shell/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2012/07/08 15:45:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2012/07/09 18:01:16 ajacoutot Exp $
COMMENT= next generation GNOME shell
GNOME_PROJECT= gnome-shell
GNOME_VERSION= 3.4.1
REVISION= 1
REVISION= 2
HOMEPAGE= http://live.gnome.org/GnomeShell

28
x11/gnome/shell/patches/patch-data_Makefile_in Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-data_Makefile_in,v 1.1 2012/07/09 18:01:16 ajacoutot Exp $
From 3d95e7bb111ca72d59e6ab81c007d3ccb2cf838d Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Fri, 20 Apr 2012 14:51:32 +0000
Subject: Mirror Evolution calendar settings into our own schema
--- data/Makefile.in.orig Mon Jul 9 19:47:23 2012
+++ data/Makefile.in Mon Jul 9 19:47:47 2012
@@ -349,7 +349,7 @@ dist_theme_DATA = \
theme/ws-switch-arrow-up.svg \
theme/ws-switch-arrow-down.svg
-gsettings_SCHEMAS = org.gnome.shell.gschema.xml
+gsettings_SCHEMAS = org.gnome.shell.gschema.xml org.gnome.shell.evolution.calendar.gschema.xml
convertdir = $(datadir)/GConf/gsettings
convert_DATA = gnome-shell-overrides.convert
shadersdir = $(pkgdatadir)/shaders
@@ -363,7 +363,8 @@ EXTRA_DIST = \
$(menu_DATA) \
$(shaders_DATA) \
$(convert_DATA) \
- org.gnome.shell.gschema.xml.in
+ org.gnome.shell.gschema.xml.in \
+ org.gnome.shell.evolution.calendar.gschema.xml
CLEANFILES = \
gnome-shell.desktop.in \

31
x11/gnome/shell/patches/patch-data_org_gnome_shell_evolution_calendar_gschema_xml_in Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-data_org_gnome_shell_evolution_calendar_gschema_xml_in,v 1.1 2012/07/09 18:01:16 ajacoutot Exp $
From 3d95e7bb111ca72d59e6ab81c007d3ccb2cf838d Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Fri, 20 Apr 2012 14:51:32 +0000
Subject: Mirror Evolution calendar settings into our own schema
--- data/org.gnome.shell.evolution.calendar.gschema.xml.in.orig Mon Jul 9 19:49:05 2012
+++ data/org.gnome.shell.evolution.calendar.gschema.xml.in Mon Jul 9 19:48:27 2012
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- NOTE: This schema is a GNOME 3.4 workaround - it uses the same path
+ as org.gnome.evolution.calendar, but avoids us requiring Evolution
+ be installed. In GNOME 3.6 the selected state will become a flag
+ on the calendar. Because the translations are in Evolution,
+ this is untranslated and in POTFILES.skip.
+ -->
+<schemalist>
+ <schema path="/org/gnome/evolution/calendar/" id="org.gnome.shell.evolution.calendar" gettext-domain="evolution">
+ <key type="as" name="selected-calendars">
+ <default>[]</default>
+ <summary>List of selected calendars</summary>
+ <description>List of calendars to load</description>
+ </key>
+ <key type="as" name="selected-tasks">
+ <default>[]</default>
+ <summary>List of selected task lists</summary>
+ <description>List of task lists to load</description>
+ </key>
+ </schema>
+</schemalist>

21
x11/gnome/shell/patches/patch-src_calendar-server_calendar-sources_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_calendar-server_calendar-sources_c,v 1.1 2012/07/09 18:01:16 ajacoutot Exp $
From 3d95e7bb111ca72d59e6ab81c007d3ccb2cf838d Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Fri, 20 Apr 2012 14:51:32 +0000
Subject: Mirror Evolution calendar settings into our own schema
--- src/calendar-server/calendar-sources.c.orig Mon Apr 16 18:41:48 2012
+++ src/calendar-server/calendar-sources.c Mon Jul 9 19:48:50 2012
@@ -52,7 +52,10 @@
#define CALENDAR_SOURCES_APPOINTMENT_SOURCES_KEY CALENDAR_SOURCES_EVO_DIR "/calendar/sources"
#define CALENDAR_SOURCES_TASK_SOURCES_KEY CALENDAR_SOURCES_EVO_DIR "/tasks/sources"
-#define CALENDAR_SELECTED_SOURCES_SCHEMA "org.gnome.evolution.calendar"
+/* org.gnome.shell.evolution.calendar has the same data behind it
+ * as org.gnome.evolution.calendar, but is a small schema we install
+ * ourselves */
+#define CALENDAR_SELECTED_SOURCES_SCHEMA "org.gnome.shell.evolution.calendar"
#define CALENDAR_SOURCES_SELECTED_APPOINTMENT_SOURCES_KEY "selected-calendars"
#define CALENDAR_SOURCES_SELECTED_TASK_SOURCES_KEY "selected-tasks"

3
x11/gnome/shell/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2012/07/08 15:39:11 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.3 2012/07/09 18:01:16 ajacoutot Exp $
@bin bin/gnome-shell
bin/gnome-shell-extension-prefs
bin/gnome-shell-extension-tool
@ -25,6 +25,7 @@ share/applications/gnome-shell.desktop
share/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
share/dbus-1/services/org.gnome.Shell.CalendarServer.service
share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
share/glib-2.0/schemas/org.gnome.shell.evolution.calendar.gschema.xml
share/glib-2.0/schemas/org.gnome.shell.gschema.xml
share/gnome-shell/
share/gnome-shell/js/