--- a/ChangeLog Tue Jul 12 21:40:49 2011 +0000
+++ b/ChangeLog Tue Jul 12 22:37:16 2011 +0000
@@ -1,3 +1,16 @@
+2010-07-12 Brian Cameron <[email protected]>
+
+ * SFEtelepathy-glib.spec: Now requires GTK3.
+ * base-specs/telepathy-glib.spec: Update to 0.15.2.
+ * patches/telepathy-glib-01-void.diff: Remove upstream patch.
+ * SFEgnome-shell.spec: Update to 3.1.3.
+ * patches/gnome-shell-01-compile.diff: New patch needed to compile.
+ * SFEmutter.spec: Update to 3.1.3.1.
+ * patches/mutter-01-suncc-xc99.diff: Rework.
+ * patches/mutter-03-compile.diff: Rework.
+ * SFEgjs.spec: Update to 0.7.14.
+ * patches/jds-01-solaris.diff: Rework.
+
2011-07-13 N.B.Prashanth <[email protected]>
* SFEliferea.spec: bump to 1.6.6
@@ -277,7 +290,6 @@
* SFExfce4-screenshooter.spec: Initial spec
* SFExfce4-dict.spec: Initial spec
-
2010-06-09 Brian Cameron <[email protected]>
* SFEpulseaudio: Bump from 0.9.5 to 0.9.22. Note that to build the
--- a/SFEgjs.spec Tue Jul 12 21:40:49 2011 +0000
+++ b/SFEgjs.spec Tue Jul 12 22:37:16 2011 +0000
@@ -6,7 +6,7 @@
%include Solaris.inc
Name: SFEgjs
Summary: GNOME JavaScript bindings
-Version: 0.7.4
+Version: 0.7.14
Source: http://ftp.gnome.org/pub/GNOME/sources/gjs/0.7/gjs-%{version}.tar.bz2
# see b.g.o 619721 and 595447
Patch1: gjs-01-solaris.diff
@@ -30,7 +30,7 @@
%patch1 -p1
%build
-export LDFLAGS="-L/usr/lib/firefox"
+export CFLAGS="%optflags -L/usr/lib/firefox"
export LD=cc
libtoolize -f
aclocal $ACLOCAL_FLAGS
@@ -40,6 +40,7 @@
make
%install
+export CFLAGS="-L/usr/lib/firefox -lxpcom"
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT/%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
@@ -69,6 +70,8 @@
%{_includedir}/*
%changelog
+* Tue Jul 05 2011 - Brian Cameron <[email protected]>
+- Bump to 0.7.14.
* Fri Oct 22 2010 - Brian Cameron <[email protected]>
- Bump to 0.7.4.
* Wed May 26 2010 - Erwann Cheneed <[email protected]>
--- a/SFEgnome-shell.spec Tue Jul 12 21:40:49 2011 +0000
+++ b/SFEgnome-shell.spec Tue Jul 12 22:37:16 2011 +0000
@@ -9,22 +9,25 @@
%include Solaris.inc
Name: SFEgnome-shell
Summary: GNOME Shell
-Version: 2.91.0
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.91/gnome-shell-%{version}.tar.bz2
+Version: 3.1.3
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.1/gnome-shell-%{version}.tar.bz2
+Patch1: gnome-shell-01-compile.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SUNWPython26-devel
BuildRequires: SUNWdbus-glib-devel
-BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWgtk3-devel
BuildRequires: SUNWgnome-media-devel
BuildRequires: SUNWgnome-panel-devel
BuildRequires: SUNWlibrsvg-devel
BuildRequires: SUNWclutter-devel
BuildRequires: SUNWgobject-introspection-devel
BuildRequires: SFEgjs-devel
+BuildRequires: SFElibtelepathy-devel
+BuildRequires: SFEtelepathy-logger-devel
Requires: SUNWPython26
Requires: SUNWdbus-glib
-Requires: SUNWgnome-base-libs
+Requires: SUNWgtk3
Requires: SUNWgnome-media
Requires: SUNWgnome-panel
Requires: SUNWlibrsvg
@@ -32,6 +35,8 @@
Requires: SUNWgobject-introspection
Requires: SFEgjs
Requires: SFEmutter
+Requires: SFElibtelepathy
+Requires: SFEtelepathy-logger
%include default-depend.inc
%package root
@@ -49,16 +54,22 @@
%prep
%setup -q -n gnome-shell-%version
+%patch1 -p1
%build
+
+# This is needed for the gobject-introspection compile to find libdrm.
+export LD_LIBRARY_PATH="/usr/lib/xorg:/usr/lib/firefox"
+
#export LDFLAGS="%_ldflags -lmalloc"
export PYTHON=/usr/bin/python%{pythonver}
+automake -a -c -f
+autoconf
./configure \
--prefix=%{_prefix} \
--libexecdir=%{_libexecdir} \
--mandir=%{_mandir} \
- --sysconfdir=%{_sysconfdir} \
- --with-clutter
+ --sysconfdir=%{_sysconfdir}
make
%install
@@ -89,16 +100,16 @@
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/gnome-shell
-%{_libdir}/mutter/plugins
+%{_libdir}/gnome-shell-perf-helper
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/*
+%{_datadir}/glib-2.0
%{_datadir}/gnome-shell
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
%{_mandir}/man1/*
-
%files root
%defattr(-, root, sys)
%attr(0755, root, sys) %dir %{_sysconfdir}
@@ -112,6 +123,8 @@
%endif
%changelog
+* Wed Jul 06 2011 - Brian Cameron <[email protected]>
+- Bump to 3.1.3.
* Fri Oct 22 2010 - Brian Cameron <[email protected]>
- Bump to 2.91.0.
* Wed Jun 23 2010 - Lin Ma <[email protected]>
--- a/SFEmutter.spec Tue Jul 12 21:40:49 2011 +0000
+++ b/SFEmutter.spec Tue Jul 12 22:37:16 2011 +0000
@@ -9,8 +9,8 @@
Name: SFEmutter
Summary: Clutter enabled metacity window manager
-Version: 2.91.0
-Source: http://ftp.gnome.org/pub/GNOME/sources/mutter/2.91/mutter-%{version}.tar.bz2
+Version: 3.1.3.1
+Source: http://ftp.gnome.org/pub/GNOME/sources/mutter/3.1/mutter-%{version}.tar.bz2
Patch1: mutter-01-suncc-xc99.diff
# Bug #612506.
Patch2: mutter-02-wait.diff
@@ -18,12 +18,12 @@
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SUNWPython26-devel
-BuildRequires: SUNWlibgtk3-devel
+BuildRequires: SUNWgtk3-devel
BuildRequires: SUNWclutter-devel
BuildRequires: SUNWgobject-introspection-devel
BuildRequires: SFEgjs-devel
Requires: SUNWPython26
-Requires: SUNWlibgtk3
+Requires: SUNWgtk3
Requires: SUNWclutter
Requires: SUNWgobject-introspection
Requires: SFEgjs
@@ -55,6 +55,7 @@
%build
export CFLAGS="%optflags"
+export LDFLAGS="%{_ldflags} -L/usr/lib/thunderbird"
export PYTHON=/usr/bin/python%{pythonver}
libtoolize --force
@@ -131,6 +132,8 @@
%endif
%changelog
+* Tue Jul 05 2011 - Brian Cameron <[email protected]>
+- Bump to 3.1.3.1.
* Fri Oct 22 2010 - Brian Cameron <[email protected]>
- Bump to 2.91.0.
* Tue Jun 01 2010 - Brian Cameron <[email protected]>
--- a/SFEtelepathy-glib.spec Tue Jul 12 21:40:49 2011 +0000
+++ b/SFEtelepathy-glib.spec Tue Jul 12 22:37:16 2011 +0000
@@ -26,8 +26,8 @@
%include default-depend.inc
BuildRequires: SUNWgnome-common-devel
-Requires: SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs-devel
+Requires: SUNWgtk3
+BuildRequires: SUNWgtk3-devel
Requires: SUNWgobject-introspection
BuildRequires: SUNWgobject-introspection-devel
--- a/base-specs/telepathy-glib.spec Tue Jul 12 21:40:49 2011 +0000
+++ b/base-specs/telepathy-glib.spec Tue Jul 12 22:37:16 2011 +0000
@@ -11,13 +11,12 @@
Name: telepathy-glib
License: GPL
Group: Applications/Internet
-Version: 0.13.1
+Version: 0.15.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: A GLib-based helper library for clients and connection managers
Source: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch1: telepathy-glib-01-void.diff
URL: http://telepathy.freedesktop.org/wiki/Telepathy%20GLib
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/telepathy-glib
@@ -38,7 +37,6 @@
%prep
%setup -q
-%patch1 -p1
%build
%ifos linux
@@ -94,6 +92,8 @@
%attr(755, root, root) %{_includedir}/telepathy-1.0/*
%changelog
+* Wed Jul 06 2011 - Brian Cameron <[email protected]>
+- Bump to 0.15.2.
* Sun Feb 13 2011 - Milan Jurik
- fix multiarch build
* Oct 09 2010 - [email protected]
--- a/patches/gjs-01-solaris.diff Tue Jul 12 21:40:49 2011 +0000
+++ b/patches/gjs-01-solaris.diff Tue Jul 12 22:37:16 2011 +0000
@@ -95,18 +95,21 @@
void
--- gjs-0.6/Makefile.am-orig 2010-04-27 05:04:19.043692872 -0500
+++ gjs-0.6/Makefile.am 2010-04-27 05:04:25.898641234 -0500
-@@ -64,7 +64,7 @@ libgjs_la_CFLAGS = \
+@@ -69,9 +69,9 @@ libgjs_la_CFLAGS = \
libgjs_la_LDFLAGS = \
-export-symbols-regex "^[^_]" -version-info 0:0:0 \
-no-undefined \
- -R $(FIREFOX_JS_LIBDIR) -rdynamic
+ -R $(FIREFOX_JS_LIBDIR)
libgjs_la_LIBADD = \
- $(GJS_LIBS)
+- $(GJS_LIBS)
++ $(GJS_LIBS) -lxpcom
-@@ -118,7 +118,7 @@ gjs_console_CFLAGS = \
+ libgjs_la_SOURCES = \
+ gjs/byteArray.c \
+@@ -123,7 +123,7 @@ gjs_console_CFLAGS = \
gjs_console_LDADD = \
- $(GJS_LIBS) \
+ $(GOBJECT_LIBS) \
libgjs.la
-gjs_console_LDFLAGS = -R $(FIREFOX_JS_LIBDIR) -rdynamic
+gjs_console_LDFLAGS = -R $(FIREFOX_JS_LIBDIR)
@@ -135,3 +138,51 @@
register_native_module (void) \
{ \
gjs_register_native_module(module_id_string, module_func, flags); \
+--- gjs-0.7/configure.ac-orig 2011-07-05 18:57:01.769551129 -0500
++++ gjs-0.7/configure.ac 2011-07-05 18:57:05.567325299 -0500
+@@ -155,23 +155,25 @@ else
+ AC_MSG_ERROR([$JS_PACKAGE >= 1.9.2 is required])
+ fi
+
+-AC_CHECK_LIB([mozjs], [JS_GetStringBytes], AC_DEFINE([HAVE_JS_GETSTRINGBYTES], [1], [Define if we still have JS_GetStringBytes]),, [$JS_LIBS])
+-AC_CHECK_LIB([mozjs], [JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], [1], [Define if we still have JS_GetFunctionName]),, [$JS_LIBS])
+-AC_CHECK_LIB([mozjs], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),, [$JS_LIBS])
+-AC_CHECK_LIB([mozjs], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS])
+-AC_CHECK_LIB([mozjs], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS])
++JS_LIBS="$JS_LIBS -lxpcom"
++
++AC_CHECK_LIB([xul], [JS_GetStringBytes], AC_DEFINE([HAVE_JS_GETSTRINGBYTES], [1], [Define if we still have JS_GetStringBytes]),, [$JS_LIBS])
++AC_CHECK_LIB([xul], [JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], [1], [Define if we still have JS_GetFunctionName]),, [$JS_LIBS])
++AC_CHECK_LIB([xul], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),, [$JS_LIBS])
++AC_CHECK_LIB([xul], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS])
++AC_CHECK_LIB([xul], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS])
+
+ AC_MSG_CHECKING([for mozilla-js >= 2 ])
+ if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_MOZJS_2, [1], [Define if mozilla-js is at least 2])
+- AC_CHECK_LIB([mozjs], [JS_FreezeObject], AC_DEFINE([HAVE_JS_FREEZEOBJECT], [1], [Define if we have JS_FreezeObject]),
++ AC_CHECK_LIB([xul], [JS_FreezeObject], AC_DEFINE([HAVE_JS_FREEZEOBJECT], [1], [Define if we have JS_FreezeObject]),
+ , [$JS_LIBS])
+- AC_CHECK_LIB([mozjs], [JS_IsScriptFrame], AC_DEFINE([HAVE_JS_ISSCRIPTFRAME], [1], [Define if we have JS_IsScriptFrame]),
++ AC_CHECK_LIB([xul], [JS_IsScriptFrame], AC_DEFINE([HAVE_JS_ISSCRIPTFRAME], [1], [Define if we have JS_IsScriptFrame]),
+ , [$JS_LIBS])
+- AC_CHECK_LIB([mozjs], [JS_EndPC], AC_DEFINE([HAVE_JS_ENDPC], [1], [Define if we have JS_EndPC]),
++ AC_CHECK_LIB([xul], [JS_EndPC], AC_DEFINE([HAVE_JS_ENDPC], [1], [Define if we have JS_EndPC]),
+ , [$JS_LIBS])
+- AC_CHECK_LIB([mozjs], [JS_NewCompartmentAndGlobalObject],
++ AC_CHECK_LIB([xul], [JS_NewCompartmentAndGlobalObject],
+ AC_DEFINE([HAVE_JS_NEWCOMPARTMENTANDGLOBALOBJECT], [1], [Define if we have JS_NewCompartmentAndGlobalObject]),
+ , [$JS_LIBS])
+
+--- gjs-0.7.14/gjs-internals-1.0.pc.in-orig 2011-07-06 23:06:46.816045989 -0500
++++ gjs-0.7.14/gjs-internals-1.0.pc.in 2011-07-06 23:07:09.373093173 -0500
+@@ -11,7 +11,7 @@ jsnativedir=@gjsnativedir@
+ mozjslibdir=@FIREFOX_JS_LIBDIR@
+
+ Cflags: -I${includedir}/gjs-1.0 @JS_EXTRA_CFLAGS@
+-Libs: -Wl,--rpath=${mozjslibdir}
++Libs:
+ Requires: gjs-1.0 gobject-introspection-1.0 @JS_PACKAGE@
+
+ Name: gjs-internals-1.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-shell-01-compile.diff Tue Jul 12 22:37:16 2011 +0000
@@ -0,0 +1,494 @@
+--- gnome-shell-3.1.3/src/Makefile-tray.am-orig 2011-07-06 22:43:50.738000081 -0500
++++ gnome-shell-3.1.3/src/Makefile-tray.am 2011-07-06 22:44:18.058648448 -0500
+@@ -1,6 +1,5 @@
+ tray_cflags = \
+ -I$(top_srcdir)/src \
+- -DG_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"notification_area\" \
+ $(TRAY_CFLAGS) \
+ $(NULL)
+--- gnome-shell-3.1.3/src/Makefile.am-orig 2011-07-06 22:43:50.738133098 -0500
++++ gnome-shell-3.1.3/src/Makefile.am 2011-07-06 23:02:30.734464290 -0500
+@@ -60,8 +60,12 @@ EXTRA_DIST += $(bin_SCRIPTS:=.in)
+ include Makefile-gdmuser.am
+ include Makefile-st.am
+ include Makefile-tray.am
++if HAVE_PULSE
+ include Makefile-gvc.am
++endif
++if HAVE_EVOLUTION
+ include Makefile-calendar-server.am
++endif
+
+ gnome_shell_cflags = \
+ $(GNOME_SHELL_CFLAGS) \
+--- gnome-shell-3.1.3/src/Makefile-gdmuser.am-orig 2011-07-06 22:43:50.737774770 -0500
++++ gnome-shell-3.1.3/src/Makefile-gdmuser.am 2011-07-06 22:44:11.128677643 -0500
+@@ -3,7 +3,6 @@ gdmuser_cflags = \
+ -DPREFIX=\""$(prefix)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"GdmUser\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ $(GDMUSER_CFLAGS) \
+--- gnome-shell-3.1.3/src/shell-polkit-authentication-agent.c-orig 2011-07-06 22:50:23.992487102 -0500
++++ gnome-shell-3.1.3/src/shell-polkit-authentication-agent.c 2011-07-06 23:50:04.653554254 -0500
+@@ -13,7 +13,11 @@
+ #include "shell-marshal.h"
+
+ #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
++#ifdef HAVE_POLKIT
+ #include <polkitagent/polkitagent.h>
++#else
++#include "gio/gio.h"
++#endif
+ #include "shell-polkit-authentication-agent.h"
+
+ #include <glib/gi18n.h>
+@@ -54,14 +58,22 @@ print_debug (const gchar *str, ...)
+
+ struct _ShellPolkitAuthenticationAgentClass
+ {
++#if HAVE_POLKIT
+ PolkitAgentListenerClass parent_class;
++#else
++ GObjectClass parent_class;
++#endif
+ };
+
+ struct _AuthRequest;
+ typedef struct _AuthRequest AuthRequest;
+
+ struct _ShellPolkitAuthenticationAgent {
++#if HAVE_POLKIT
+ PolkitAgentListener parent_instance;
++#else
++ GObject parent_instance;
++#endif
+
+ GList *scheduled_requests;
+
+@@ -78,8 +90,13 @@ enum
+
+ static guint signals[LAST_SIGNAL] = { 0 };
+
++#if HAVE_POLKIT
+ G_DEFINE_TYPE (ShellPolkitAuthenticationAgent, shell_polkit_authentication_agent, POLKIT_AGENT_TYPE_LISTENER);
++#else
++G_DEFINE_TYPE (ShellPolkitAuthenticationAgent, shell_polkit_authentication_agent, G_TYPE_OBJECT);
++#endif
+
++#if HAVE_POLKIT
+ static void initiate_authentication (PolkitAgentListener *listener,
+ const gchar *action_id,
+ const gchar *message,
+@@ -94,43 +111,57 @@ static void initiate_authentication (Pol
+ static gboolean initiate_authentication_finish (PolkitAgentListener *listener,
+ GAsyncResult *res,
+ GError **error);
++#endif
+
+ static void
+ shell_polkit_authentication_agent_init (ShellPolkitAuthenticationAgent *agent)
+ {
+- gpointer handle;
++ gpointer handle = NULL;
++#if HAVE_POLKIT
+ PolkitSubject *subject;
++#else
++ gpointer subject = NULL;
++#endif
+ GError *error;
+
+ subject = NULL;
+-
+ error = NULL;
++
++#ifdef HAVE_POLKIT
+ subject = polkit_unix_session_new_for_process_sync (getpid (),
+ NULL, /* GCancellable* */
+ &error);
++#endif
++
+ if (subject == NULL)
+ {
++#ifdef HAVE_POLKIT
+ g_warning ("Error getting session for the process we are in: %s (%s %d)",
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
+ g_error_free (error);
++#endif
+ goto out;
+ }
+
++#ifdef HAVE_POLKIT
+ handle = polkit_agent_listener_register (POLKIT_AGENT_LISTENER (agent),
+ POLKIT_AGENT_REGISTER_FLAGS_NONE,
+ subject,
+ NULL, /* use default object path */
+ NULL, /* GCancellable */
+ &error);
++#endif
+ if (handle == NULL)
+ {
++#ifdef HAVE_POLKIT
+ g_warning ("Error registering polkit authentication agent: %s (%s %d)",
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
+ g_error_free (error);
++#endif
+ goto out;
+ }
+
+@@ -157,14 +188,18 @@ static void
+ shell_polkit_authentication_agent_class_init (ShellPolkitAuthenticationAgentClass *klass)
+ {
+ GObjectClass *gobject_class;
++#if HAVE_POLKIT
+ PolkitAgentListenerClass *listener_class;
++#endif
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->finalize = shell_polkit_authentication_agent_finalize;
+
++#if HAVE_POLKIT
+ listener_class = POLKIT_AGENT_LISTENER_CLASS (klass);
+ listener_class->initiate_authentication = initiate_authentication;
+ listener_class->initiate_authentication_finish = initiate_authentication_finish;
++#endif
+
+ signals[INITIATE_SIGNAL] =
+ g_signal_new ("initiate",
+@@ -210,7 +245,9 @@ struct _AuthRequest {
+ gchar *action_id;
+ gchar *message;
+ gchar *icon_name;
++#if HAVE_POLKIT
+ PolkitDetails *details;
++#endif
+ gchar *cookie;
+ GList *identities;
+
+@@ -224,7 +261,9 @@ auth_request_free (AuthRequest *request)
+ g_free (request->action_id);
+ g_free (request->message);
+ g_free (request->icon_name);
++#if HAVE_POLKIT
+ g_object_unref (request->details);
++#endif
+ g_list_foreach (request->identities, (GFunc) g_object_unref, NULL);
+ g_list_free (request->identities);
+ g_object_unref (request->simple);
+@@ -234,6 +273,7 @@ auth_request_free (AuthRequest *request)
+ static void
+ auth_request_initiate (AuthRequest *request)
+ {
++#if HAVE_POLKIT
+ gchar **user_names;
+ GPtrArray *p;
+ GList *l;
+@@ -282,6 +322,7 @@ auth_request_initiate (AuthRequest *requ
+ request->cookie,
+ user_names);
+ g_strfreev (user_names);
++#endif
+ }
+
+ static void auth_request_complete (AuthRequest *request,
+@@ -327,11 +368,13 @@ auth_request_complete (AuthRequest *requ
+ {
+ ShellPolkitAuthenticationAgent *agent = request->agent;
+
++#if HAVE_POLKIT
+ if (dismissed)
+ g_simple_async_result_set_error (request->simple,
+ POLKIT_ERROR,
+ POLKIT_ERROR_CANCELLED,
+ _("Authentication dialog was dismissed by the user"));
++#endif
+
+ if (agent->current_request == request)
+ {
+@@ -372,6 +415,7 @@ maybe_process_next_request (ShellPolkitA
+ }
+ }
+
++#if HAVE_POLKIT
+ static void
+ initiate_authentication (PolkitAgentListener *listener,
+ const gchar *action_id,
+@@ -423,6 +467,7 @@ initiate_authentication_finish (PolkitAg
+ else
+ return TRUE;
+ }
++#endif
+
+ void
+ shell_polkit_authentication_agent_complete (ShellPolkitAuthenticationAgent *agent,
+@@ -433,3 +478,4 @@ shell_polkit_authentication_agent_comple
+
+ auth_request_complete (agent->current_request, dismissed);
+ }
++
+--- gnome-shell-3.1.3/src/Makefile-st.am-orig 2011-07-06 22:43:50.737896083 -0500
++++ gnome-shell-3.1.3/src/Makefile-st.am 2011-07-06 22:44:25.280025280 -0500
+@@ -2,7 +2,6 @@ st_cflags = \
+ -I$(top_srcdir)/src \
+ -DPREFIX=\""$(prefix)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"St\" \
+ -DST_COMPILATION \
+ -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+--- gnome-shell-3.1.3/src/Makefile-calendar-server.am-orig 2011-07-06 22:43:50.737635250 -0500
++++ gnome-shell-3.1.3/src/Makefile-calendar-server.am 2011-07-06 22:44:03.582148596 -0500
+@@ -22,7 +22,6 @@ gnome_shell_calendar_server_CFLAGS = \
+ -DPREFIX=\""$(prefix)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"ShellCalendarServer\" \
+ $(CALENDAR_SERVER_CFLAGS) \
+ $(NULL)
+--- gnome-shell-3.1.3/configure.ac-orig 2011-07-06 18:55:08.095037103 -0500
++++ gnome-shell-3.1.3/configure.ac 2011-07-06 22:30:38.573814283 -0500
+@@ -93,10 +93,22 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >
+ libcanberra
+ telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
+ telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
+- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
++ xfixes)
+
+ PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
+
++PKG_CHECK_MODULES(POLKIT,
++ polkit-agent-1 >= $POLKIT_MIN_VERSION,
++ have_polkit=yes,
++ have_polkit=no)
++if test "x$have_polkit" = "xyes" ; then
++ AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
++fi
++AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes)
++AC_SUBST(HAVE_POLKIT)
++AC_SUBST(POLKIT_CFLAGS)
++AC_SUBST(POLKIT_LIBS)
++
+ GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
+ AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
+ AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
+@@ -113,8 +125,8 @@ AC_SUBST(JHBUILD_TYPELIBDIR)
+
+ saved_CFLAGS=$CFLAGS
+ saved_LIBS=$LIBS
+-CFLAGS=$GNOME_SHELL_CFLAGS
+-LIBS=$GNOME_SHELL_LIBS
++CFLAGS=$GNOME_SHELL_CFLAGS $POLKIT_CFLAGS
++LIBS=$GNOME_SHELL_LIBS $POLKIT_LIBS
+ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
+ CFLAGS=$saved_CFLAGS
+ LIBS=$saved_LIBS
+@@ -122,9 +134,20 @@ LIBS=$saved_LIBS
+ PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
+ PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
+ PKG_CHECK_MODULES(TRAY, gtk+-3.0)
+-PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
+ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
+
++PKG_CHECK_MODULES(GVC,
++ libpulse libpulse-mainloop-glib gobject-2.0,
++ have_pulse=yes,
++ have_pulse=no)
++if test "x$have_pulse" = "xyes" ; then
++ AC_DEFINE(HAVE_PULSE, [], [Define if we have libpulse])
++fi
++AM_CONDITIONAL(HAVE_PULSE, test x$have_pulse = xyes)
++AC_SUBST(HAVE_PULSE)
++AC_SUBST(GVC_CFLAGS)
++AC_SUBST(GVC_LIBS)
++
+ AC_MSG_CHECKING([for bluetooth support])
+ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+ [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
+@@ -138,7 +161,15 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >=
+ AC_SUBST([HAVE_BLUETOOTH],[0])
+ AC_MSG_RESULT([no])])
+
+-PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
++PKG_CHECK_MODULES(CALENDAR_SERVER,
++ libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0,
++ have_evolution=yes,
++ have_evolution=no)
++if test "x$have_evolution" = "xyes" ; then
++ AC_DEFINE(HAVE_EVOLUTION, [], [Define if we have Evolution])
++fi
++AM_CONDITIONAL(HAVE_EVOLUTION, test x$have_evolution = xyes)
++AC_SUBST(HAVE_EVOLUTION)
+ AC_SUBST(CALENDAR_SERVER_CFLAGS)
+ AC_SUBST(CALENDAR_SERVER_LIBS)
+
+--- gnome-shell-3.1.3/js/ui/polkitAuthenticationAgent.js-orig 2011-07-08 01:53:25.834811079 -0500
++++ gnome-shell-3.1.3/js/ui/polkitAuthenticationAgent.js 2011-07-08 01:55:24.517310264 -0500
+@@ -29,8 +29,8 @@ const Pango = imports.gi.Pango;
+ const Gdm = imports.gi.Gdm;
+ const Gio = imports.gi.Gio;
+ const Mainloop = imports.mainloop;
+-const Polkit = imports.gi.Polkit;
+-const PolkitAgent = imports.gi.PolkitAgent;
++/* const Polkit = imports.gi.Polkit;
++const PolkitAgent = imports.gi.PolkitAgent; */
+
+ const ModalDialog = imports.ui.modalDialog;
+
+@@ -177,11 +177,15 @@ AuthenticationDialog.prototype = {
+
+ this._doneEmitted = false;
+
++/*
+ this._identityToAuth = Polkit.UnixUser.new_for_name(userName);
++*/
+ this._cookie = cookie;
+
++/*
+ this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
+ cookie: this._cookie });
++*/
+ this._session.connect('completed', Lang.bind(this, this._onSessionCompleted));
+ this._session.connect('request', Lang.bind(this, this._onSessionRequest));
+ this._session.connect('show-error', Lang.bind(this, this._onSessionShowError));
+--- gnome-shell-3.1.3/js/ui/statusMenu.js-orig 2011-07-08 01:53:35.018828475 -0500
++++ gnome-shell-3.1.3/js/ui/statusMenu.js 2011-07-08 01:55:11.760284464 -0500
+@@ -8,7 +8,9 @@ const Lang = imports.lang;
+ const Shell = imports.gi.Shell;
+ const St = imports.gi.St;
+ const Tp = imports.gi.TelepathyGLib;
++/*
+ const UPowerGlib = imports.gi.UPowerGlib;
++*/
+
+ const GnomeSession = imports.misc.gnomeSession;
+ const Main = imports.ui.main;
+@@ -62,6 +64,7 @@ StatusMenuButton.prototype = {
+
+ this._account_mgr = Tp.AccountManager.dup()
+
++/*
+ this._upClient = new UPowerGlib.Client();
+ this._screenSaverProxy = new ScreenSaverProxy(DBus.session, BUS_NAME, OBJECT_PATH);
+ this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+@@ -111,6 +114,7 @@ StatusMenuButton.prototype = {
+ Lang.bind(this, this._updateHaveShutdown));
+
+ this._upClient.connect('notify::can-suspend', Lang.bind(this, this._updateSuspendOrPowerOff));
++*/
+ },
+
+ _onDestroy: function() {
+@@ -185,6 +189,7 @@ StatusMenuButton.prototype = {
+ },
+
+ _updateSuspendOrPowerOff: function() {
++/*
+ this._haveSuspend = this._upClient.get_can_suspend();
+
+ if (!this._suspendOrPowerOffItem)
+@@ -205,6 +210,7 @@ StatusMenuButton.prototype = {
+ } else {
+ this._suspendOrPowerOffItem.updateText(_("Suspend"), _("Power Off..."));
+ }
++*/
+ },
+
+ _updatePresenceIcon: function(presence, status) {
+@@ -316,7 +322,9 @@ StatusMenuButton.prototype = {
+ if (this._haveSuspend &&
+ this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
+ this._screenSaverProxy.SetActiveRemote(true, Lang.bind(this, function() {
++/*
+ this._upClient.suspend_sync(null);
++*/
+ }));
+ } else {
+ this._session.ShutdownRemote();
+--- gnome-shell-3.1.3/js/ui/status/volume.js-orig 2011-07-08 01:53:46.540541789 -0500
++++ gnome-shell-3.1.3/js/ui/status/volume.js 2011-07-08 01:54:04.382799502 -0500
+@@ -5,7 +5,9 @@ const DBus = imports.dbus;
+ const Lang = imports.lang;
+ const Mainloop = imports.mainloop;
+ const Shell = imports.gi.Shell;
++/*
+ const Gvc = imports.gi.Gvc;
++*/
+ const Signals = imports.signals;
+ const St = imports.gi.St;
+
+@@ -28,6 +30,7 @@ Indicator.prototype = {
+ _init: function() {
+ PanelMenu.SystemStatusButton.prototype._init.call(this, 'audio-volume-muted', null);
+
++/*
+ this._control = new Gvc.MixerControl({ name: 'GNOME Shell Volume Control' });
+ this._control.connect('ready', Lang.bind(this, this._onControlReady));
+ this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
+@@ -69,6 +72,7 @@ Indicator.prototype = {
+
+ this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+ this._control.open();
++*/
+ },
+
+ _getMaxVolume: function(property) {
+--- gnome-shell-3.1.3/js/ui/status/network.js-orig 2011-07-08 01:53:42.325484711 -0500
++++ gnome-shell-3.1.3/js/ui/status/network.js 2011-07-08 01:53:59.046197223 -0500
+@@ -5,8 +5,10 @@ const GLib = imports.gi.GLib;
+ const GObject = imports.gi.GObject;
+ const Lang = imports.lang;
+ const Mainloop = imports.mainloop;
++/*
+ const NetworkManager = imports.gi.NetworkManager;
+ const NMClient = imports.gi.NMClient;
++*/
+ const Shell = imports.gi.Shell;
+ const Signals = imports.signals;
+ const St = imports.gi.St;
+@@ -37,9 +39,11 @@ const NMAccessPointSecurity = {
+ };
+
+ // small optimization, to avoid using [] all the time
++/*
+ const NM80211Mode = NetworkManager['80211Mode'];
+ const NM80211ApFlags = NetworkManager['80211ApFlags'];
+ const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
++*/
+
+ // number of wireless networks that should be visible
+ // (the remaining are placed into More...)
+@@ -1523,6 +1527,7 @@ NMApplet.prototype = {
+ _init: function() {
+ PanelMenu.SystemStatusButton.prototype._init.call(this, 'network-error');
+
++/*
+ this._client = NMClient.Client.new();
+
+ this._statusSection = new PopupMenu.PopupMenuSection();
+@@ -1636,6 +1641,7 @@ NMApplet.prototype = {
+ this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
+ }
+ }));
++*/
+ },
+
+ _ensureSource: function() {
+--- gnome-shell-3.1.3/js/ui/main.js-orig 2011-07-12 02:03:00.474373615 -0500
++++ gnome-shell-3.1.3/js/ui/main.js 2011-07-12 02:04:57.004857186 -0500
+@@ -87,7 +87,7 @@ function start() {
+
+ // Load the calendar server. Note that we are careful about
+ // not loading any events until the user presses the clock
+- global.launch_calendar_server();
++ // global.launch_calendar_server();
+
+ // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
+ // also initialize ShellAppSystem first. ShellAppSystem
--- a/patches/mutter-01-suncc-xc99.diff Tue Jul 12 21:40:49 2011 +0000
+++ b/patches/mutter-01-suncc-xc99.diff Tue Jul 12 22:37:16 2011 +0000
@@ -2,12 +2,12 @@
index b843a68..660c7fc 100644
--- a/configure.in
+++ b/configure.in
-@@ -127,6 +127,8 @@ if test "$enable_compile_warnings" != no
+@@ -504,6 +504,8 @@ if test "$enable_compile_warnings" != no
fi
changequote([,])dnl
+CFLAGS="$CFLAGS -xc99"
+
- AC_MSG_CHECKING([which gtk+ version to compile against])
- AC_ARG_WITH([gtk],
- AC_HELP_STRING([--with-gtk=2.0|3.0],
+ AC_CONFIG_FILES([
+ Makefile
+ doc/Makefile
--- a/patches/mutter-03-compile.diff Tue Jul 12 21:40:49 2011 +0000
+++ b/patches/mutter-03-compile.diff Tue Jul 12 22:37:16 2011 +0000
@@ -1,5 +1,16 @@
---- mutter-2.91.0/src/core/delete.c-orig 2010-10-22 20:15:34.860168118 -0500
-+++ mutter-2.91.0/src/core/delete.c 2010-10-22 20:17:19.897735691 -0500
+--- mutter-3.1.3/src/core/screen.c-orig 2011-07-06 16:42:08.909834885 -0500
++++ mutter-3.1.3/src/core/screen.c 2011-07-06 16:46:24.453517000 -0500
+@@ -2924,7 +2924,7 @@ meta_screen_resize (MetaScreen *screen,
+
+ g_slist_free (windows);
+
+- g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0, index);
++ g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0, 0);
+ }
+
+ void
+--- mutter-3.1.3/src/core/delete.c-orig 2011-07-06 16:40:48.193294716 -0500
++++ mutter-3.1.3/src/core/delete.c 2011-07-06 16:41:12.081819592 -0500
@@ -22,8 +22,6 @@
* 02111-1307, USA.
*/
@@ -7,5 +18,5 @@
-#define _XOPEN_SOURCE /* for kill() */
-
#include <config.h>
- #include "util.h"
+ #include <meta/util.h>
#include "window-private.h"
--- a/patches/telepathy-glib-01-void.diff Tue Jul 12 21:40:49 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- telepathy-glib-0.11.11/telepathy-glib/channel-manager.c-orig 2010-08-07 11:28:25.582615934 -0500
-+++ telepathy-glib-0.11.11/telepathy-glib/channel-manager.c 2010-08-07 11:28:45.798911479 -0500
-@@ -612,8 +612,9 @@ tp_channel_manager_foreach_channel_class
- {
- ForeachAdaptor adaptor = { manager, func, user_data };
-
-- return tp_channel_manager_type_foreach_channel_class (
-+ tp_channel_manager_type_foreach_channel_class (
- G_TYPE_FROM_INSTANCE (manager), foreach_adaptor, &adaptor);
-+ return;
- }
- }
-