rpms/gnome-software
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.17.1

Browse Source
This commit is contained in:
Kalev Lember 2015-05-26 00:17:03 +02:00
parent e0edb350bd
commit f2a349086d
6 changed files with 32 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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.17.1.tar.xz

50
0001-Fix-a-crash-under-Wayland.patch
View File

@ -1,50 +0,0 @@
From c482e11e1237514ce5a367f4a9768d0d4ba45321 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@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

16
gnome-software-adapt-to-gnome-terminal-rename.patch
View File

@ -1,6 +1,6 @@
From 098ce8b99ac3fe4ed6707a04d493f5b8fd39ad20 Mon Sep 17 00:00:00 2001
From be22ea45da51abe5000e92dbbebeb3701b316fef Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Mon, 16 Mar 2015 13:34:35 +0100
Date: Mon, 25 May 2015 23:13:44 +0200
Subject: [PATCH] Adapt to gnome-terminal desktop file rename
The upstream desktop file is gnome-terminal.desktop, but it's renamed to
@ -11,18 +11,18 @@ org.gnome.Terminal.desktop in Fedora.
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/modulesets/gnome.xml b/data/modulesets/gnome.xml
index e3e1ed7..a19f4c6 100644
index ddba283..d77d145 100644
--- a/data/modulesets/gnome.xml
+++ b/data/modulesets/gnome.xml
@@ -28,7 +28,6 @@
<module type="application">gnome-calculator.desktop</module>
@@ -63,7 +63,6 @@
<module type="application">gnome-control-center.desktop</module>
<module type="application">gnome-disks.desktop</module>
<module type="application">gnome-system-monitor.desktop</module>
- <module type="application">gnome-terminal.desktop</module>
<module type="application">gucharmap.desktop</module>
<module type="application">org.gnome.baobab.desktop</module>
<module type="application">org.gnome.Contacts.desktop</module>
@@ -37,6 +36,7 @@
@@ -72,6 +71,7 @@
<module type="application">org.gnome.Nautilus.desktop</module>
<module type="application">org.gnome.Screenshot.desktop</module>
<module type="application">org.gnome.Software.desktop</module>
@ -31,7 +31,7 @@ index e3e1ed7..a19f4c6 100644
<module type="application">yelp.desktop</module>
</moduleset>
diff --git a/src/gs-folders.c b/src/gs-folders.c
index 0a15c90..06089c3 100644
index ebb7ca2..5bd5fd1 100644
--- a/src/gs-folders.c
+++ b/src/gs-folders.c
@@ -558,7 +558,7 @@ gs_folders_convert (void)
@ -44,5 +44,5 @@ index 0a15c90..06089c3 100644
"gucharmap.desktop",
"seahorse.desktop",
--
2.3.2
2.4.0

18
gnome-software-system-apps.patch
View File

@ -1,6 +1,6 @@
From 8c3d531e9d8e4e4930fe34c3d1eaa9325f914762 Mon Sep 17 00:00:00 2001
From d3c50dd3511aa8f82b60b5bfe77fda2f158260df Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Tue, 16 Sep 2014 15:30:39 +0200
Date: Mon, 25 May 2015 23:11:03 +0200
Subject: [PATCH] Downstream patch to the list of unremovable system apps
Replace Epiphany with Firefox, and drop gnome-dictionary and
@ -11,10 +11,10 @@ install.
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/data/modulesets/gnome.xml b/data/modulesets/gnome.xml
index 7fe8cce..e3e1ed7 100644
index 62d5171..ddba283 100644
--- a/data/modulesets/gnome.xml
+++ b/data/modulesets/gnome.xml
@@ -23,12 +23,10 @@
@@ -57,18 +57,16 @@
<moduleset name="system">
<module type="application">empathy.desktop</module>
<module type="application">eog.desktop</module>
@ -22,12 +22,18 @@ index 7fe8cce..e3e1ed7 100644
<module type="application">evince.desktop</module>
+ <module type="application">firefox.desktop</module>
<module type="application">gnome-calculator.desktop</module>
- <module type="application">gnome-dictionary.desktop</module>
<module type="application">gnome-control-center.desktop</module>
<module type="application">gnome-disks.desktop</module>
- <module type="application">gnome-system-log.desktop</module>
<module type="application">gnome-system-monitor.desktop</module>
<module type="application">gnome-terminal.desktop</module>
<module type="application">gucharmap.desktop</module>
<module type="application">org.gnome.baobab.desktop</module>
<module type="application">org.gnome.Contacts.desktop</module>
- <module type="application">org.gnome.Dictionary.desktop</module>
<module type="application">org.gnome.font-viewer.desktop</module>
<module type="application">org.gnome.gedit.desktop</module>
<module type="application">org.gnome.Nautilus.desktop</module>
--
2.1.0
2.4.0

17
gnome-software.spec
View File

@ -6,19 +6,17 @@
Summary: A software center for GNOME
Name: gnome-software
Version: 3.16.2
Release: 2%{?dist}
Version: 3.17.1
Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
URL: https://wiki.gnome.org/Apps/Software
Source0: http://download.gnome.org/sources/gnome-software/3.16/%{name}-%{version}.tar.xz
Source0: http://download.gnome.org/sources/gnome-software/3.17/%{name}-%{version}.tar.xz
# Downstream patch to the list of unremovable system apps
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}
@ -37,6 +36,7 @@ BuildRequires: intltool
BuildRequires: libxslt
BuildRequires: docbook-style-xsl
BuildRequires: desktop-file-utils
BuildRequires: fwupd-devel
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gnome-desktop3-devel
BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
@ -46,7 +46,7 @@ BuildRequires: libsoup-devel
BuildRequires: PackageKit-glib-devel >= %{packagekit_version}
# this is not a library version
%define gs_plugin_version 7
%define gs_plugin_version 8
%description
gnome-software is an application that makes it easy to add, remove
@ -56,7 +56,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
@ -104,6 +103,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%dir %{_libdir}/gs-plugins-%{gs_plugin_version}
%{_libdir}/gs-plugins-%{gs_plugin_version}/*.so
%{_sysconfdir}/xdg/autostart/gnome-software-service.desktop
%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
%{_datadir}/dbus-1/services/org.gnome.Software.service
%{_datadir}/gnome-shell/search-providers/gnome-software-search-provider.ini
%{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml
@ -111,6 +111,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/gnome-software/modulesets.d/*.xml
%changelog
* Mon May 25 2015 Kalev Lember <kalevlember@gmail.com> - 3.17.1-1
- Update to 3.17.1
* Fri May 15 2015 Kalev Lember <kalevlember@gmail.com> - 3.16.2-2
- Fix a crash under Wayland (#1221968)

2
sources
View File

@ -1 +1 @@
1f3762d123ea088d65e99542cc5bbe12 gnome-software-3.16.2.tar.xz
5c6f21d0736a55bac4176767d7f9b9e9 gnome-software-3.17.1.tar.xz