rpm/gnome-software
SHA256
1
0
Fork 0
forked from pool/gnome-software
Code Pull Requests Activity

Accepting request 396752 from GNOME:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/396752
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-software?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2016-05-20 09:56:02 +00:00 committed by Git OBS Bridge
commit 6b54709246
5 changed files with 108 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnome-software.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed May 18 16:46:03 UTC 2016 - zaitor@opensuse.org
- Add commits from upstream fixing various issues:
+ gs-Fix-underlinking.patch: Fix underlinking in the
packagekit-origin plugin.
+ gs-Fix-xdg-app-build.patch: Fix the xdg-app build.
+ gs-Fix-a-possible-crasher.patch: Fix a possible crash in review
ratings.
- Add gnome-common BuildRequires, and pass autoreconf since two of
the above patches touch the buildsystem.
-------------------------------------------------------------------
Mon Apr 25 14:25:43 UTC 2016 - zaitor@opensuse.org

14
gnome-software.spec
View File

@ -31,6 +31,15 @@ Patch0: gnome-software-add-default-yast-appfolder.patch
Patch1: gnome-software-icon-crash.patch
# PATCH-FIX-UPSTREAM gs-compile-against-old-appstream-glib.patch zaitor@opensuse.org -- Support compiling against old versions of appstream-glib
Patch2: gs-compile-against-old-appstream-glib.patch
# PATCH-FIX-UPSTREAM gs-Fix-underlinking-.patch zaitor@opensuse.org -- Fix underlinking in the packagekit-origin plugin.
Patch3: gs-Fix-underlinking.patch
# PATCH-FIX-UPSTREAM gs-Fix-xdg-app-build.patch zaitor@opensuse.org -- Fix build of the xdg-app plugin.
Patch4: gs-Fix-xdg-app-build.patch
# PATCH-FIX-UPSTREAM gs-Fix-a-possible-crasher.patch zaitor@opensuse.org -- Fix a possible crasher in Fix a possible crash in review ratings.
Patch5: gs-Fix-a-possible-crasher.patch
# Needed for patch3 and patch4
BuildRequires: gnome-common
#
BuildRequires: intltool >= 0.35.0
BuildRequires: suse-xsl-stylesheets
BuildRequires: update-desktop-files
@ -64,8 +73,13 @@ AppStore like management of Applications for your GNOME Desktop.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
# Needed for patch3 and patch4
autoreconf -fiv
%configure \
--disable-static \
--disable-firmware

25
gs-Fix-a-possible-crasher.patch Normal file
View File

@ -0,0 +1,25 @@
From d4730427508740f70b89f8417fc2db01a3918736 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 22 Apr 2016 18:25:34 +0100
Subject: trivial: Fix a possible crash spotted by clang
---
src/gs-shell-details.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c
index 7e1982f..57e0aa9 100644
--- a/src/gs-shell-details.c
+++ b/src/gs-shell-details.c
@@ -996,7 +996,7 @@ gs_shell_details_review_button_clicked_cb (GsReviewRow *row,
static void
gs_shell_details_refresh_reviews (GsShellDetails *self)
{
- GArray *review_ratings;
+ GArray *review_ratings = NULL;
GPtrArray *reviews;
gboolean show_review_button = TRUE;
gboolean show_reviews = FALSE;
--
cgit v0.12

28
gs-Fix-underlinking.patch Normal file
View File

@ -0,0 +1,28 @@
From bcc8ea09e46d2b27872f8a917941421ca79da6c8 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 13 May 2016 16:47:30 +0100
Subject: trivial: Fix underlinking in the packagekit-origin plugin
---
src/plugins/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index a256cec..71b78b0 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -229,7 +229,10 @@ libgs_plugin_packagekit_offline_la_LIBADD = $(GS_PLUGIN_LIBS)
libgs_plugin_packagekit_offline_la_LDFLAGS = -module -avoid-version
libgs_plugin_packagekit_offline_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
-libgs_plugin_packagekit_origin_la_SOURCES = gs-plugin-packagekit-origin.c
+libgs_plugin_packagekit_origin_la_SOURCES = \
+ gs-plugin-packagekit-origin.c \
+ packagekit-common.c \
+ packagekit-common.h
libgs_plugin_packagekit_origin_la_LIBADD = $(GS_PLUGIN_LIBS)
libgs_plugin_packagekit_origin_la_LDFLAGS = -module -avoid-version
libgs_plugin_packagekit_origin_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
--
cgit v0.12

29
gs-Fix-xdg-app-build.patch Normal file
View File

@ -0,0 +1,29 @@
From 38852511096d51ced50fddb862a48e43caf64bbf Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 7 Apr 2016 17:13:45 +0100
Subject: trivial: Fix the xdg-app build
---
src/plugins/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 32d2605..fe5ad94 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -147,7 +147,10 @@ libgs_plugin_limba_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
endif
if HAVE_XDG_APP
-libgs_plugin_xdg_app_la_SOURCES = gs-plugin-xdg-app.c
+libgs_plugin_xdg_app_la_SOURCES = \
+ gs-appstream.c \
+ gs-appstream.h \
+ gs-plugin-xdg-app.c
libgs_plugin_xdg_app_la_LIBADD = $(GS_PLUGIN_LIBS) $(XDG_APP_LIBS)
libgs_plugin_xdg_app_la_LDFLAGS = -module -avoid-version
libgs_plugin_xdg_app_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
--
cgit v0.12