From 7fe98c5937f629cb83ba2fb687560dc28e29149d935dd869684488c7e9b22c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 19 May 2016 10:20:11 +0000 Subject: [PATCH] Accepting request 396734 from home:Zaitor Final one - I give up :-) OBS-URL: https://build.opensuse.org/request/show/396734 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=83 --- gnome-software.changes | 12 ++++++++++++ gnome-software.spec | 14 ++++++++++++++ gs-Fix-a-possible-crasher.patch | 25 +++++++++++++++++++++++++ gs-Fix-underlinking.patch | 28 ++++++++++++++++++++++++++++ gs-Fix-xdg-app-build.patch | 29 +++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 gs-Fix-a-possible-crasher.patch create mode 100644 gs-Fix-underlinking.patch create mode 100644 gs-Fix-xdg-app-build.patch diff --git a/gnome-software.changes b/gnome-software.changes index 9af8a1f..346a2e9 100644 --- a/gnome-software.changes +++ b/gnome-software.changes @@ -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 diff --git a/gnome-software.spec b/gnome-software.spec index 8df30e0..5a61735 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -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 diff --git a/gs-Fix-a-possible-crasher.patch b/gs-Fix-a-possible-crasher.patch new file mode 100644 index 0000000..9ed5354 --- /dev/null +++ b/gs-Fix-a-possible-crasher.patch @@ -0,0 +1,25 @@ +From d4730427508740f70b89f8417fc2db01a3918736 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +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 + diff --git a/gs-Fix-underlinking.patch b/gs-Fix-underlinking.patch new file mode 100644 index 0000000..d5f9805 --- /dev/null +++ b/gs-Fix-underlinking.patch @@ -0,0 +1,28 @@ +From bcc8ea09e46d2b27872f8a917941421ca79da6c8 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +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 + diff --git a/gs-Fix-xdg-app-build.patch b/gs-Fix-xdg-app-build.patch new file mode 100644 index 0000000..b87c7c8 --- /dev/null +++ b/gs-Fix-xdg-app-build.patch @@ -0,0 +1,29 @@ +From 38852511096d51ced50fddb862a48e43caf64bbf Mon Sep 17 00:00:00 2001 +From: Richard Hughes +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 + +