[gnome-shell] Revert "Revert annotation updates"
Florian Müllner
fmuellner at fedoraproject.org
Fri Jun 27 09:40:44 UTC 2014
commit e53f98248fd2017b04eaa6356791e220368f54af
Author: Florian Müllner <fmuellner at gnome.org>
Date: Fri Jun 27 11:38:15 2014 +0200
Revert "Revert annotation updates"
We now have a new gobject-introspection build, so drop the last patch.
0001-Revert-Update-allow-none-annotations.patch | 463 -----------------------
gnome-shell.spec | 7 +-
2 files changed, 4 insertions(+), 466 deletions(-)
---
diff --git a/gnome-shell.spec b/gnome-shell.spec
index fbb954d..cf73a0c 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -12,11 +12,10 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.13/%{name}-%{ver
# Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch
-Patch2: 0001-Revert-Update-allow-none-annotations.patch
%define clutter_version 1.15.90
%define gnome_bluetooth_version 1:3.9.0
-%define gobject_introspection_version 0.10.1
+%define gobject_introspection_version 1.41.0
%define gjs_version 1.39.0
%define mutter_version 3.13.2
%define eds_version 3.5.3
@@ -117,7 +116,6 @@ easy to use experience.
%prep
%setup -q
%patch1 -p1 -b .firefox
-%patch2 -p1 -b .revert-nullable-annotations
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -176,6 +174,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
%exclude %{_datadir}/gtk-doc
%changelog
+* Fri Jun 27 2014 Florian Müllner <fmuellner at redhat.com> - 3.13.3-1
+- New gobject-introspection has been built, drop the last patch again
+
* Wed Jun 25 2014 Florian Müllner <fmuellner at redhat.com> - 3.13.3-1
- Revert annotation updates until we get a new gobject-introspection build
More information about the scm-commits
mailing list