kalev pushed to gnome-software (f22). "Update to 3.16.3"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Jun 5 19:31:20 UTC 2015


From af527cb39c4416d0e9213c1146effb2f8791fde5 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Fri, 5 Jun 2015 21:29:32 +0200
Subject: Update to 3.16.3


diff --git a/.gitignore b/.gitignore
index b1305f2..ed46a5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /gnome-software-3.16.0.tar.xz
 /gnome-software-3.16.1.tar.xz
 /gnome-software-3.16.2.tar.xz
+/gnome-software-3.16.3.tar.xz
diff --git a/0001-Fix-a-crash-under-Wayland.patch b/0001-Fix-a-crash-under-Wayland.patch
deleted file mode 100644
index 1fe3756..0000000
--- a/0001-Fix-a-crash-under-Wayland.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c482e11e1237514ce5a367f4a9768d0d4ba45321 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember at gmail.com>
-Date: Fri, 15 May 2015 12:51:12 +0200
-Subject: [PATCH] Fix a crash under Wayland
-
-We were crashing under the Wayland session when gnome-software was
-activated through the PK session interface.
-
-This commit fixes the crash and adds a runtime check to see if we're
-running the gtk+ X11 backend before calling X11 functions.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1221968
----
- src/gs-application.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/gs-application.c b/src/gs-application.c
-index de7ba3a..51fd8d5 100644
---- a/src/gs-application.c
-+++ b/src/gs-application.c
-@@ -450,6 +450,9 @@ install_resources_activated (GSimpleAction *action,
-                              gpointer       data)
- {
- 	GsApplication *app = GS_APPLICATION (data);
-+#ifdef GDK_WINDOWING_X11
-+	GdkDisplay *display;
-+#endif
- 	GList *windows;
- 	GtkWindow *window = NULL;
- 	const gchar *mode;
-@@ -459,9 +462,13 @@ install_resources_activated (GSimpleAction *action,
- 	g_variant_get (parameter, "(&s^as&s)", &mode, &resources, &startup_id);
- 
- #ifdef GDK_WINDOWING_X11
--	if (startup_id != NULL && startup_id[0] != '\0')
--		gdk_x11_display_set_startup_notification_id (gdk_display_get_default (),
--		                                             startup_id);
-+	display = gdk_display_get_default ();
-+
-+	if (GDK_IS_X11_DISPLAY (display)) {
-+		if (startup_id != NULL && startup_id[0] != '\0')
-+			gdk_x11_display_set_startup_notification_id (display,
-+			                                             startup_id);
-+	}
- #endif
- 
- 	windows = gtk_application_get_windows (GTK_APPLICATION (app));
--- 
-2.4.0
-
diff --git a/gnome-software.spec b/gnome-software.spec
index 5ca6435..a5b2ccf 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -1,13 +1,13 @@
 %global glib2_version 2.39.1
-%global gtk3_version 3.14.1
+%global gtk3_version 3.16
 %global packagekit_version 1.0.0
 %global appstream_glib_version 0.3.4
 %global gsettings_desktop_schemas_version 3.11.5
 
 Summary:   A software center for GNOME
 Name:      gnome-software
-Version:   3.16.2
-Release:   2%{?dist}
+Version:   3.16.3
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       https://wiki.gnome.org/Apps/Software
@@ -17,8 +17,6 @@ Source0:   http://download.gnome.org/sources/gnome-software/3.16/%{name}-%{versi
 Patch0:    gnome-software-system-apps.patch
 # Downstream patch to adapt to gnome-terminal desktop file rename
 Patch1:    gnome-software-adapt-to-gnome-terminal-rename.patch
-# Backported upstream patch for https://bugzilla.redhat.com/show_bug.cgi?id=1221968
-Patch2:    0001-Fix-a-crash-under-Wayland.patch
 
 Requires:  appstream-data
 %if 0%{?fedora}
@@ -29,6 +27,7 @@ Requires:  glib2%{?_isa} >= %{glib2_version}
 Requires:  gnome-menus%{?_isa}
 Requires:  gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
 Requires:  gtk3%{?_isa} >= %{gtk3_version}
+Requires:  iso-codes
 Requires:  libappstream-glib%{?_isa} >= %{appstream_glib_version}
 Requires:  PackageKit%{?_isa} >= %{packagekit_version}
 
@@ -56,7 +55,6 @@ and update software in the GNOME desktop.
 %setup -q
 %patch0 -p1 -b .system-apps
 %patch1 -p1 -b .gnome-terminal
-%patch2 -p1
 
 %build
 %configure --disable-static
@@ -111,6 +109,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-software/modulesets.d/*.xml
 
 %changelog
+* Fri Jun 05 2015 Kalev Lember <kalevlember at gmail.com> - 3.16.3-1
+- Update to 3.16.3
+
 * Fri May 15 2015 Kalev Lember <kalevlember at gmail.com> - 3.16.2-2
 - Fix a crash under Wayland (#1221968)
 
diff --git a/sources b/sources
index 3639c38..499afa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f3762d123ea088d65e99542cc5bbe12  gnome-software-3.16.2.tar.xz
+f7afeacf6c509aaab52d54821f89aeb6  gnome-software-3.16.3.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gnome-software.git/commit/?h=f22&id=af527cb39c4416d0e9213c1146effb2f8791fde5


More information about the scm-commits mailing list