- update to 3.4.2

This commit is contained in:
jasper 2012-08-29 12:20:22 +00:00
parent 7b771fd145
commit 7006be6a9d
5 changed files with 5 additions and 76 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2012/08/29 11:56:27 jasper Exp $
# $OpenBSD: Makefile,v 1.9 2012/08/29 12:20:22 jasper Exp $
COMMENT= next generation GNOME shell
GNOME_PROJECT= gnome-shell
GNOME_VERSION= 3.4.1
REVISION= 5
GNOME_VERSION= 3.4.2
HOMEPAGE= http://live.gnome.org/GnomeShell
@ -66,7 +65,7 @@ CONFIGURE_ARGS= --disable-static \
--with-ca-certificates=/etc/ssl/cert.pem \
--without-systemd
AUTOCONF_VERSION= 2.68
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.11
BUILD_DEPENDS += devel/autoconf/${AUTOCONF_VERSION} \
devel/automake/${AUTOMAKE_VERSION} \

View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-shell-3.4.1.tar.xz) = ar/S/KEEquZM6dAn3SM/whili4YRdqZIMbaOP5CrVqk=
SIZE (gnome/gnome-shell-3.4.1.tar.xz) = 1254596
SHA256 (gnome/gnome-shell-3.4.2.tar.xz) = OAf3iClo0DL49cZLDgr1HA0Bby4cT9FXYgPJNQ5BJyA=
SIZE (gnome/gnome-shell-3.4.2.tar.xz) = 1257612

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-data_Makefile_am,v 1.1 2012/08/29 11:56:27 jasper 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.am.orig Sat Jul 14 10:46:42 2012
+++ data/Makefile.am Sat Jul 14 10:46:52 2012
@@ -53,7 +53,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
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@

View File

@ -1,31 +0,0 @@
$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>

View File

@ -1,21 +0,0 @@
$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"