diff --git a/gnome-shell-3.4.1.tar.xz b/gnome-shell-3.4.1.tar.xz deleted file mode 100644 index ba4dd4b..0000000 --- a/gnome-shell-3.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9 -size 1254596 diff --git a/gnome-shell-3.4.2.tar.xz b/gnome-shell-3.4.2.tar.xz new file mode 100644 index 0000000..c264549 --- /dev/null +++ b/gnome-shell-3.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720 +size 1257612 diff --git a/gnome-shell-load-ext.patch b/gnome-shell-load-ext.patch deleted file mode 100644 index 6b7e90e..0000000 --- a/gnome-shell-load-ext.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 73f565d27166420bbf4a7bb49a30ea5bf5d98566 Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" -Date: Wed, 4 Apr 2012 17:48:47 -0400 -Subject: [PATCH] Link the gnome-shell binary to libgnome-shell-js.so - -Depending on the exact linker options and versions, rpath's written -into the binary may, or may not, be honored by dlopen(). Work around -this by simply linking the gnome-shell binary to gnome-shell-js, since -then dlopen() doesn't need to search paths. - -https://bugzilla.gnome.org/show_bug.cgi?id=670477 ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 95f1a41..7bafb6a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -187,7 +187,7 @@ libgnome_shell_la_gir_sources = \ - gnome_shell_real_SOURCES = \ - main.c - gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags) --gnome_shell_real_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD) -+gnome_shell_real_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD) - gnome_shell_real_DEPENDENCIES = libgnome-shell.la - - EXTRA_DIST += test-gapplication.js --- -1.7.9.3 - -From 4d33ab1a50fa0a61554f4715fc035ea441db8350 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Fri, 6 Apr 2012 14:00:48 -0400 -Subject: [PATCH] Prevent the link to libgnome-shell-js.so from being removed - -Add a dummy call to shell_js_add_extension_importer() to ensure that the -link to libgnome-shell-js.so is not removed when using -Wl,--as-needed, -which is the default on many distros. ---- - src/main.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -diff --git a/src/main.c b/src/main.c -index bac9524..a6fb8f6 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -24,6 +24,7 @@ - #include "shell-a11y.h" - #include "shell-global.h" - #include "shell-global-private.h" -+#include "shell-js.h" - #include "shell-perf-log.h" - #include "st.h" - -@@ -342,3 +343,17 @@ main (int argc, char **argv) - - return ecode; - } -+ -+/* HACK: -+ Add a dummy function that calls into libgnome-shell-js.so to ensure it's -+ linked to /usr/bin/gnome-shell even when linking with --as-needed. -+ This function is never actually called. -+ https://bugzilla.gnome.org/show_bug.cgi?id=670477 -+*/ -+ -+void -+_shell_link_to_shell_js (void) -+{ -+ shell_js_add_extension_importer (NULL, NULL, NULL, NULL); -+} -+ --- -1.7.8.5 - - diff --git a/gnome-shell.changes b/gnome-shell.changes index d1218e0..16474bb 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sat Jul 21 11:23:03 UTC 2012 - badshah400@gmail.com + +- Update to version 3.4.2: + + Mirror Evolution calendar settings into our own schema + [bgo#674424] + + gdm: don't fail if fprintd unavailable [bgo#675006] + + Fix broken extension loading [bgo#670477] + + Fix filtering of Empathy notifications [bgo#675370] + + telepathyClient: Ignore invalidated channels [bgo#677457] + + popupMenu: Fix freeze when appMenu is not populated in one go + [bgo#676447] + + mount-operation: fix exceptions when showing password entry + [bgo#678428] + + Misc. fixes [bgo#677441, bgo#676175] +- Drop gnome-shell-load-ext.patch: fixed upstream. +- Drop gnome-shell-chat-notifications-fix.patch: fixed upstream. + +------------------------------------------------------------------- +Thu Jul 19 17:53:07 UTC 2012 - badshah400@gmail.com + +- Add gnome-shell-chat-notifications-fix.patch to fix several + issues with chat notifications in gnome-shell including a + regression introduced in the 3.4.x series [bgo#677457, + bgo#676175, bgo#675370]; all patches came from upstream git + commits. + ------------------------------------------------------------------- Sat Jul 14 07:44:17 UTC 2012 - badshah400@gmail.com diff --git a/gnome-shell.spec b/gnome-shell.spec index b834d33..4362179 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -17,15 +17,13 @@ Name: gnome-shell -Version: 3.4.1 +Version: 3.4.2 Release: 0 Summary: GNOME Shell License: GPL-2.0+ Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeShell Source: http://download.gnome.org/sources/gnome-shell/3.4/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE gnome-shell-load-ext.patch bnc#755862 bgo#670477 dimstar@opensuse.org - Ensure libgnome-shell-js.so is linked to gnome-shell. Upstream considers this not a bug. -Patch0: gnome-shell-load-ext.patch # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch # PATCH-FIX-UPSTREAM gnome-shell-fix-memory-leaks.patch bnc#771565 bgo#678079 bgo#678406 badshah400@gmail.com -- Fix several memory leaks in gnome-shell; all patches came from upstream git @@ -132,7 +130,6 @@ to enable, disable and install them. %lang_package %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 translation-update-upstream @@ -190,6 +187,7 @@ rm -rf %{buildroot} %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service %{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.shell.evolution.calendar.gschema.xml %{_datadir}/gnome-shell/ %dir %{_datadir}/gnome-shell/extensions %dir %{_datadir}/gnome-shell/search-providers