From 644f4f84b1f02f340fc5e93118a6ba6307d4326e Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 8 Feb 2016 13:42:27 +0000 Subject: [PATCH 1/9] Update to 0.4.9 --- .gitignore | 1 + sources | 2 +- xdg-app.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3a22321..5259006 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /xdg-app-0.4.6.tar.xz /xdg-app-0.4.7.tar.xz /xdg-app-0.4.8.tar.xz +/xdg-app-0.4.9.tar.xz diff --git a/sources b/sources index d61d436..9e6ad91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bca0c40827c556578e24cabe1295da47 xdg-app-0.4.8.tar.xz +0c49347bdeb69a761c99722bfeb12cd9 xdg-app-0.4.9.tar.xz diff --git a/xdg-app.spec b/xdg-app.spec index 10ad85a..5bc145a 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -1,5 +1,5 @@ Name: xdg-app -Version: 0.4.8 +Version: 0.4.9 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libxdg-app.la %changelog +* Mon Feb 08 2016 David King - 0.4.9-1 +- Update to 0.4.9 + * Fri Jan 29 2016 David King - 0.4.8-1 - Update to 0.4.8 From 93579397ec57a2d9f628f8384e84f5bbb5b381e6 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 9 Feb 2016 10:02:22 +0000 Subject: [PATCH 2/9] Update to 0.4.10 --- .gitignore | 1 + sources | 2 +- xdg-app.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5259006..0db8907 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /xdg-app-0.4.7.tar.xz /xdg-app-0.4.8.tar.xz /xdg-app-0.4.9.tar.xz +/xdg-app-0.4.10.tar.xz diff --git a/sources b/sources index 9e6ad91..9e7af05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c49347bdeb69a761c99722bfeb12cd9 xdg-app-0.4.9.tar.xz +2effb11427ebd657e41e72daf525d7fb xdg-app-0.4.10.tar.xz diff --git a/xdg-app.spec b/xdg-app.spec index 5bc145a..4bcb010 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -1,5 +1,5 @@ Name: xdg-app -Version: 0.4.9 +Version: 0.4.10 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libxdg-app.la %changelog +* Tue Feb 09 2016 David King - 0.4.10-1 +- Update to 0.4.10 + * Mon Feb 08 2016 David King - 0.4.9-1 - Update to 0.4.9 From f9766bf7ff6d7ce9a546c14bcbea08f017785357 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 9 Feb 2016 10:57:04 +0000 Subject: [PATCH 3/9] Update to 0.4.11 --- .gitignore | 1 + sources | 2 +- xdg-app.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0db8907..c5bf278 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /xdg-app-0.4.8.tar.xz /xdg-app-0.4.9.tar.xz /xdg-app-0.4.10.tar.xz +/xdg-app-0.4.11.tar.xz diff --git a/sources b/sources index 9e7af05..8386894 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2effb11427ebd657e41e72daf525d7fb xdg-app-0.4.10.tar.xz +1650aff85c9ea12903ba8217d779d8fd xdg-app-0.4.11.tar.xz diff --git a/xdg-app.spec b/xdg-app.spec index 4bcb010..3aaeada 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -1,5 +1,5 @@ Name: xdg-app -Version: 0.4.10 +Version: 0.4.11 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libxdg-app.la %changelog +* Tue Feb 09 2016 David King - 0.4.11-1 +- Update to 0.4.11 + * Tue Feb 09 2016 David King - 0.4.10-1 - Update to 0.4.10 From b2895c2df75893d90b18e1189da152cf320e0e46 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 19 Feb 2016 12:12:36 +0000 Subject: [PATCH 4/9] Update to 0.4.12 --- .gitignore | 1 + sources | 2 +- xdg-app.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c5bf278..23c992d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /xdg-app-0.4.9.tar.xz /xdg-app-0.4.10.tar.xz /xdg-app-0.4.11.tar.xz +/xdg-app-0.4.12.tar.xz diff --git a/sources b/sources index 8386894..7d98c70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1650aff85c9ea12903ba8217d779d8fd xdg-app-0.4.11.tar.xz +3e42e6c777eb67da8410549941be2243 xdg-app-0.4.12.tar.xz diff --git a/xdg-app.spec b/xdg-app.spec index 3aaeada..f1cf036 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -1,5 +1,5 @@ Name: xdg-app -Version: 0.4.11 +Version: 0.4.12 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -136,6 +136,9 @@ rm -f %{buildroot}%{_libdir}/libxdg-app.la %changelog +* Fri Feb 19 2016 David King - 0.4.12-1 +- Update to 0.4.12 + * Tue Feb 09 2016 David King - 0.4.11-1 - Update to 0.4.11 From 3e6ed22cfd44cd345ee3a714aba3575289b58699 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 26 Feb 2016 14:20:07 +0000 Subject: [PATCH 5/9] Update to 0.4.13 --- .gitignore | 1 + sources | 2 +- xdg-app-0.4.13-function-rename.patch | 108 +++++++++++++++++++++++++++ xdg-app-0.4.13-libdwarf-check.patch | 48 ++++++++++++ xdg-app.spec | 17 ++++- 5 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 xdg-app-0.4.13-function-rename.patch create mode 100644 xdg-app-0.4.13-libdwarf-check.patch diff --git a/.gitignore b/.gitignore index 23c992d..4967fb7 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /xdg-app-0.4.10.tar.xz /xdg-app-0.4.11.tar.xz /xdg-app-0.4.12.tar.xz +/xdg-app-0.4.13.tar.xz diff --git a/sources b/sources index 7d98c70..03de03a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e42e6c777eb67da8410549941be2243 xdg-app-0.4.12.tar.xz +8e1507f09c3234b603d6698b8cc39026 xdg-app-0.4.13.tar.xz diff --git a/xdg-app-0.4.13-function-rename.patch b/xdg-app-0.4.13-function-rename.patch new file mode 100644 index 0000000..73ad997 --- /dev/null +++ b/xdg-app-0.4.13-function-rename.patch @@ -0,0 +1,108 @@ +From d43d8cd8c8ce6c8748e628669db6cc9c5dea9253 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Fri, 26 Feb 2016 12:52:38 +0100 +Subject: Change xdg_app_bundle_ref_get_appdata to + xdg_app_bundle_ref_get_appstream + +This is technically an ABI break, but nothing is using this yet. + +diff --git a/lib/xdg-app-bundle-ref.c b/lib/xdg-app-bundle-ref.c +index 69e1743..39df95e 100644 +--- a/lib/xdg-app-bundle-ref.c ++++ b/lib/xdg-app-bundle-ref.c +@@ -32,7 +32,7 @@ struct _XdgAppBundleRefPrivate + { + GFile *file; + GBytes *metadata; +- GBytes *appdata; ++ GBytes *appstream; + GBytes *icon_64; + GBytes *icon_128; + guint64 installed_size; +@@ -157,20 +157,20 @@ xdg_app_bundle_ref_get_metadata (XdgAppBundleRef *self) + } + + /** +- * xdg_app_bundle_ref_get_appdata: ++ * xdg_app_bundle_ref_get_appstream: + * @self: a #XdgAppInstallation + * +- * Get the compressed appdata for the app/runtime ++ * Get the compressed appstream for the app/runtime + * +- * Returns: (transfer full) : an #GBytes with the appdata contents, or %NULL ++ * Returns: (transfer full) : an #GBytes with the appstream contents, or %NULL + */ + GBytes * +-xdg_app_bundle_ref_get_appdata (XdgAppBundleRef *self) ++xdg_app_bundle_ref_get_appstream (XdgAppBundleRef *self) + { + XdgAppBundleRefPrivate *priv = xdg_app_bundle_ref_get_instance_private (self); + +- if (priv->appdata) +- return g_bytes_ref (priv->appdata); ++ if (priv->appstream) ++ return g_bytes_ref (priv->appstream); + return NULL; + } + +@@ -219,7 +219,7 @@ xdg_app_bundle_ref_new (GFile *file, + g_autofree char *commit = NULL; + g_autofree char *full_ref = NULL; + g_autofree char *metadata_contents = NULL; +- g_autoptr(GVariant) appdata = NULL; ++ g_autoptr(GVariant) appstream = NULL; + g_autoptr(GVariant) icon_64 = NULL; + g_autoptr(GVariant) icon_128 = NULL; + guint64 installed_size; +@@ -254,9 +254,9 @@ xdg_app_bundle_ref_new (GFile *file, + strlen (metadata_contents)); + metadata_contents = NULL; /* Stolen */ + +- appdata = g_variant_lookup_value (metadata, "appdata", G_VARIANT_TYPE_BYTESTRING); +- if (appdata) +- priv->appdata = g_variant_get_data_as_bytes (appdata); ++ appstream = g_variant_lookup_value (metadata, "appdata", G_VARIANT_TYPE_BYTESTRING); ++ if (appstream) ++ priv->appstream = g_variant_get_data_as_bytes (appstream); + + icon_64 = g_variant_lookup_value (metadata, "icon-64", G_VARIANT_TYPE_BYTESTRING); + if (icon_64) +diff --git a/lib/xdg-app-bundle-ref.h b/lib/xdg-app-bundle-ref.h +index 0c51200..a74e026 100644 +--- a/lib/xdg-app-bundle-ref.h ++++ b/lib/xdg-app-bundle-ref.h +@@ -48,7 +48,7 @@ XDG_APP_EXTERN XdgAppBundleRef *xdg_app_bundle_ref_new (GFile *file, + GError **error); + XDG_APP_EXTERN GFile *xdg_app_bundle_ref_get_file (XdgAppBundleRef *self); + XDG_APP_EXTERN GBytes *xdg_app_bundle_ref_get_metadata (XdgAppBundleRef *self); +-XDG_APP_EXTERN GBytes *xdg_app_bundle_ref_get_appdata (XdgAppBundleRef *self); ++XDG_APP_EXTERN GBytes *xdg_app_bundle_ref_get_appstream (XdgAppBundleRef *self); + XDG_APP_EXTERN GBytes *xdg_app_bundle_ref_get_icon (XdgAppBundleRef *self, + int size); + XDG_APP_EXTERN guint64 xdg_app_bundle_ref_get_installed_size (XdgAppBundleRef *self); +-- +cgit v0.10.2 + +From 38c24d536a08ee81c61a0a61b8f4ed1aa21bcaaa Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Fri, 26 Feb 2016 12:53:47 +0100 +Subject: Update test-lib.c with the appstream api change + + +diff --git a/lib/test-lib.c b/lib/test-lib.c +index de90392..6032ee9 100644 +--- a/lib/test-lib.c ++++ b/lib/test-lib.c +@@ -102,7 +102,7 @@ main (int argc, char *argv[]) + { + g_autofree char *path = g_file_get_path (xdg_app_bundle_ref_get_file (bundle)); + g_autoptr(GBytes) metadata = xdg_app_bundle_ref_get_metadata (bundle); +- g_autoptr(GBytes) appdata = xdg_app_bundle_ref_get_appdata (bundle); ++ g_autoptr(GBytes) appdata = xdg_app_bundle_ref_get_appstream (bundle); + g_print ("%d %s %s %s %s %s %"G_GUINT64_FORMAT"\n%s\n", + xdg_app_ref_get_kind (XDG_APP_REF(bundle)), + xdg_app_ref_get_name (XDG_APP_REF(bundle)), +-- +cgit v0.10.2 + diff --git a/xdg-app-0.4.13-libdwarf-check.patch b/xdg-app-0.4.13-libdwarf-check.patch new file mode 100644 index 0000000..0541e4f --- /dev/null +++ b/xdg-app-0.4.13-libdwarf-check.patch @@ -0,0 +1,48 @@ +From be8d71d70bbbd12036b4b9b0e8b08e591c8167aa Mon Sep 17 00:00:00 2001 +From: David King +Date: Fri, 26 Feb 2016 10:43:04 +0000 +Subject: [PATCH] Search for dwarf.h in configure + +Add a --with-dwarf-header argument for supplying the path containing the +dwarf.h header from libdwarf. Either a path must be provided, or a fallback +location of $includedir/libdwarf will be tested. + +https://bugs.freedesktop.org/show_bug.cgi?id=94308 +--- + configure.ac | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 57cf968..66e1cab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,6 +206,26 @@ AS_IF([ test $have_libelf = maybe ], [ + if test x$have_libelf != xyes; then + AC_MSG_ERROR([libelf not found]) + fi ++ ++dnl This only checks for the header, not the library. ++AC_ARG_WITH([dwarf-header], ++ [AS_HELP_STRING([--with-dwarf-header], ++ [path containing dwarf.h])], ++ [AS_IF([test "x$with_dwarf_header" = "xno"], ++ [AC_MSG_WARN([either a path containing dwarf.h must be ++provided, or it will be searched for in includedir])])], ++ [with_dwarf_header=yes]) ++ ++AS_IF([test "x$with_dwarf_header" = "xyes"], ++ [CPPFLAGS="$CPPFLAGS -I$(eval echo \"$includedir\")/libdwarf" ++ AC_CHECK_HEADER([dwarf.h]) ++ AS_IF([test "x$ac_cv_header_dwarf_h" != "xyes"], ++ [AC_MSG_ERROR([dwarf.h is required but was not found; locate it using --with-dwarf-header=/path/containing/header])])], ++ [CPPFLAGS="$CPPFLAGS -I$with_dwarf_header" ++ AC_CHECK_HEADER([dwarf.h]) ++ AS_IF([test "x$ac_cv_header_dwarf_h" != "xyes"], ++ [AC_MSG_ERROR([dwarf.h is required but was not found])])]) ++ + AC_ARG_ENABLE(documentation, + AC_HELP_STRING([--enable-documentation], [Build documentation]),, + enable_documentation=yes) +-- +2.7.1 + diff --git a/xdg-app.spec b/xdg-app.spec index f1cf036..e3d49a6 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -1,5 +1,5 @@ Name: xdg-app -Version: 0.4.12 +Version: 0.4.13 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -7,6 +7,10 @@ Group: Development/Tools License: LGPLv2+ URL: https://github.com/alexlarsson/xdg-app Source0: http://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz +# Taken from upstream. +Patch0: xdg-app-0.4.13-libdwarf-check.patch +# Taken from upstream, and added to avoid an ABI break. +Patch1: xdg-app-0.4.13-function-rename.patch BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(gio-unix-2.0) @@ -24,8 +28,11 @@ BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl BuildRequires: libattr-devel BuildRequires: libcap-devel +BuildRequires: libdwarf-devel BuildRequires: systemd BuildRequires: /usr/bin/xsltproc +# Required for patch0. +BuildRequires: autoconf automake gtk-doc libtool # Crashes with older kernels (the bug being introduced in 4.0.2), without the # upstream fixes in this version. @@ -73,6 +80,9 @@ This package contains libxdg-app. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +autoreconf --force --install %build @@ -80,7 +90,7 @@ This package contains libxdg-app. %ifarch %{power64} %configure --with-priv-mode=none --disable-seccomp %else -%configure --with-priv-mode=none +%configure --with-dwarf-header=%{_includedir}/libdwarf --with-priv-mode=none %endif %make_build @@ -136,6 +146,9 @@ rm -f %{buildroot}%{_libdir}/libxdg-app.la %changelog +* Fri Feb 26 2016 David King - 0.4.13-1 +- Update to 0.4.13 + * Fri Feb 19 2016 David King - 0.4.12-1 - Update to 0.4.12 From 21e87c830915a2c75635cb842962c3c9b88c528b Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 16 Mar 2016 11:22:22 +0000 Subject: [PATCH 6/9] Update to 0.5.0 --- .gitignore | 1 + sources | 2 +- xdg-app-0.4.13-function-rename.patch | 108 --------------------------- xdg-app-0.4.13-libdwarf-check.patch | 48 ------------ xdg-app.spec | 12 +-- 5 files changed, 6 insertions(+), 165 deletions(-) delete mode 100644 xdg-app-0.4.13-function-rename.patch delete mode 100644 xdg-app-0.4.13-libdwarf-check.patch diff --git a/.gitignore b/.gitignore index 4967fb7..8731781 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /xdg-app-0.4.11.tar.xz /xdg-app-0.4.12.tar.xz /xdg-app-0.4.13.tar.xz +/xdg-app-0.5.0.tar.xz diff --git a/sources b/sources index 03de03a..7d8ab2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e1507f09c3234b603d6698b8cc39026 xdg-app-0.4.13.tar.xz +57fab8d702f36d99faa0cef90e810e52 xdg-app-0.5.0.tar.xz diff --git a/xdg-app-0.4.13-function-rename.patch b/xdg-app-0.4.13-function-rename.patch deleted file mode 100644 index 73ad997..0000000 --- a/xdg-app-0.4.13-function-rename.patch +++ /dev/null @@ -1,108 +0,0 @@ -From d43d8cd8c8ce6c8748e628669db6cc9c5dea9253 Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Fri, 26 Feb 2016 12:52:38 +0100 -Subject: Change xdg_app_bundle_ref_get_appdata to - xdg_app_bundle_ref_get_appstream - -This is technically an ABI break, but nothing is using this yet. - -diff --git a/lib/xdg-app-bundle-ref.c b/lib/xdg-app-bundle-ref.c -index 69e1743..39df95e 100644 ---- a/lib/xdg-app-bundle-ref.c -+++ b/lib/xdg-app-bundle-ref.c -@@ -32,7 +32,7 @@ struct _XdgAppBundleRefPrivate - { - GFile *file; - GBytes *metadata; -- GBytes *appdata; -+ GBytes *appstream; - GBytes *icon_64; - GBytes *icon_128; - guint64 installed_size; -@@ -157,20 +157,20 @@ xdg_app_bundle_ref_get_metadata (XdgAppBundleRef *self) - } - - /** -- * xdg_app_bundle_ref_get_appdata: -+ * xdg_app_bundle_ref_get_appstream: - * @self: a #XdgAppInstallation - * -- * Get the compressed appdata for the app/runtime -+ * Get the compressed appstream for the app/runtime - * -- * Returns: (transfer full) : an #GBytes with the appdata contents, or %NULL -+ * Returns: (transfer full) : an #GBytes with the appstream contents, or %NULL - */ - GBytes * --xdg_app_bundle_ref_get_appdata (XdgAppBundleRef *self) -+xdg_app_bundle_ref_get_appstream (XdgAppBundleRef *self) - { - XdgAppBundleRefPrivate *priv = xdg_app_bundle_ref_get_instance_private (self); - -- if (priv->appdata) -- return g_bytes_ref (priv->appdata); -+ if (priv->appstream) -+ return g_bytes_ref (priv->appstream); - return NULL; - } - -@@ -219,7 +219,7 @@ xdg_app_bundle_ref_new (GFile *file, - g_autofree char *commit = NULL; - g_autofree char *full_ref = NULL; - g_autofree char *metadata_contents = NULL; -- g_autoptr(GVariant) appdata = NULL; -+ g_autoptr(GVariant) appstream = NULL; - g_autoptr(GVariant) icon_64 = NULL; - g_autoptr(GVariant) icon_128 = NULL; - guint64 installed_size; -@@ -254,9 +254,9 @@ xdg_app_bundle_ref_new (GFile *file, - strlen (metadata_contents)); - metadata_contents = NULL; /* Stolen */ - -- appdata = g_variant_lookup_value (metadata, "appdata", G_VARIANT_TYPE_BYTESTRING); -- if (appdata) -- priv->appdata = g_variant_get_data_as_bytes (appdata); -+ appstream = g_variant_lookup_value (metadata, "appdata", G_VARIANT_TYPE_BYTESTRING); -+ if (appstream) -+ priv->appstream = g_variant_get_data_as_bytes (appstream); - - icon_64 = g_variant_lookup_value (metadata, "icon-64", G_VARIANT_TYPE_BYTESTRING); - if (icon_64) -diff --git a/lib/xdg-app-bundle-ref.h b/lib/xdg-app-bundle-ref.h -index 0c51200..a74e026 100644 ---- a/lib/xdg-app-bundle-ref.h -+++ b/lib/xdg-app-bundle-ref.h -@@ -48,7 +48,7 @@ XDG_APP_EXTERN XdgAppBundleRef *xdg_app_bundle_ref_new (GFile *file, - GError **error); - XDG_APP_EXTERN GFile *xdg_app_bundle_ref_get_file (XdgAppBundleRef *self); - XDG_APP_EXTERN GBytes *xdg_app_bundle_ref_get_metadata (XdgAppBundleRef *self); --XDG_APP_EXTERN GBytes *xdg_app_bundle_ref_get_appdata (XdgAppBundleRef *self); -+XDG_APP_EXTERN GBytes *xdg_app_bundle_ref_get_appstream (XdgAppBundleRef *self); - XDG_APP_EXTERN GBytes *xdg_app_bundle_ref_get_icon (XdgAppBundleRef *self, - int size); - XDG_APP_EXTERN guint64 xdg_app_bundle_ref_get_installed_size (XdgAppBundleRef *self); --- -cgit v0.10.2 - -From 38c24d536a08ee81c61a0a61b8f4ed1aa21bcaaa Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Fri, 26 Feb 2016 12:53:47 +0100 -Subject: Update test-lib.c with the appstream api change - - -diff --git a/lib/test-lib.c b/lib/test-lib.c -index de90392..6032ee9 100644 ---- a/lib/test-lib.c -+++ b/lib/test-lib.c -@@ -102,7 +102,7 @@ main (int argc, char *argv[]) - { - g_autofree char *path = g_file_get_path (xdg_app_bundle_ref_get_file (bundle)); - g_autoptr(GBytes) metadata = xdg_app_bundle_ref_get_metadata (bundle); -- g_autoptr(GBytes) appdata = xdg_app_bundle_ref_get_appdata (bundle); -+ g_autoptr(GBytes) appdata = xdg_app_bundle_ref_get_appstream (bundle); - g_print ("%d %s %s %s %s %s %"G_GUINT64_FORMAT"\n%s\n", - xdg_app_ref_get_kind (XDG_APP_REF(bundle)), - xdg_app_ref_get_name (XDG_APP_REF(bundle)), --- -cgit v0.10.2 - diff --git a/xdg-app-0.4.13-libdwarf-check.patch b/xdg-app-0.4.13-libdwarf-check.patch deleted file mode 100644 index 0541e4f..0000000 --- a/xdg-app-0.4.13-libdwarf-check.patch +++ /dev/null @@ -1,48 +0,0 @@ -From be8d71d70bbbd12036b4b9b0e8b08e591c8167aa Mon Sep 17 00:00:00 2001 -From: David King -Date: Fri, 26 Feb 2016 10:43:04 +0000 -Subject: [PATCH] Search for dwarf.h in configure - -Add a --with-dwarf-header argument for supplying the path containing the -dwarf.h header from libdwarf. Either a path must be provided, or a fallback -location of $includedir/libdwarf will be tested. - -https://bugs.freedesktop.org/show_bug.cgi?id=94308 ---- - configure.ac | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 57cf968..66e1cab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -206,6 +206,26 @@ AS_IF([ test $have_libelf = maybe ], [ - if test x$have_libelf != xyes; then - AC_MSG_ERROR([libelf not found]) - fi -+ -+dnl This only checks for the header, not the library. -+AC_ARG_WITH([dwarf-header], -+ [AS_HELP_STRING([--with-dwarf-header], -+ [path containing dwarf.h])], -+ [AS_IF([test "x$with_dwarf_header" = "xno"], -+ [AC_MSG_WARN([either a path containing dwarf.h must be -+provided, or it will be searched for in includedir])])], -+ [with_dwarf_header=yes]) -+ -+AS_IF([test "x$with_dwarf_header" = "xyes"], -+ [CPPFLAGS="$CPPFLAGS -I$(eval echo \"$includedir\")/libdwarf" -+ AC_CHECK_HEADER([dwarf.h]) -+ AS_IF([test "x$ac_cv_header_dwarf_h" != "xyes"], -+ [AC_MSG_ERROR([dwarf.h is required but was not found; locate it using --with-dwarf-header=/path/containing/header])])], -+ [CPPFLAGS="$CPPFLAGS -I$with_dwarf_header" -+ AC_CHECK_HEADER([dwarf.h]) -+ AS_IF([test "x$ac_cv_header_dwarf_h" != "xyes"], -+ [AC_MSG_ERROR([dwarf.h is required but was not found])])]) -+ - AC_ARG_ENABLE(documentation, - AC_HELP_STRING([--enable-documentation], [Build documentation]),, - enable_documentation=yes) --- -2.7.1 - diff --git a/xdg-app.spec b/xdg-app.spec index e3d49a6..537b010 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -1,5 +1,5 @@ Name: xdg-app -Version: 0.4.13 +Version: 0.5.0 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -7,10 +7,6 @@ Group: Development/Tools License: LGPLv2+ URL: https://github.com/alexlarsson/xdg-app Source0: http://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.xz -# Taken from upstream. -Patch0: xdg-app-0.4.13-libdwarf-check.patch -# Taken from upstream, and added to avoid an ABI break. -Patch1: xdg-app-0.4.13-function-rename.patch BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(gio-unix-2.0) @@ -80,9 +76,6 @@ This package contains libxdg-app. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -autoreconf --force --install %build @@ -146,6 +139,9 @@ rm -f %{buildroot}%{_libdir}/libxdg-app.la %changelog +* Wed Mar 16 2016 David King - 0.5.0-1 +- Update to 0.5.0 + * Fri Feb 26 2016 David King - 0.4.13-1 - Update to 0.4.13 From 6a884391fa333c836e14e08e84ee4d6f50efca8e Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 24 Mar 2016 16:30:53 +0000 Subject: [PATCH 7/9] Add fuse as a Require for the doc portal --- xdg-app.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xdg-app.spec b/xdg-app.spec index 537b010..d6a0501 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -34,6 +34,9 @@ BuildRequires: autoconf automake gtk-doc libtool # upstream fixes in this version. Requires: kernel >= 4.0.4-202 +# We need fusermount for the document portal +Requires: fuse + %description xdg-app is a system for building, distributing and running sandboxed desktop applications on Linux. See https://wiki.gnome.org/Projects/SandboxedApps for From 08e0ed0bd39828a1ac3cb7a61cdc49b452a52616 Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 30 Mar 2016 19:07:59 +0100 Subject: [PATCH 8/9] Update to 0.5.1 --- .gitignore | 1 + sources | 2 +- xdg-app.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8731781..1701e78 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /xdg-app-0.4.12.tar.xz /xdg-app-0.4.13.tar.xz /xdg-app-0.5.0.tar.xz +/xdg-app-0.5.1.tar.xz diff --git a/sources b/sources index 7d8ab2d..8e6054e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -57fab8d702f36d99faa0cef90e810e52 xdg-app-0.5.0.tar.xz +bad577912fdd70c193e7e82bbab16222 xdg-app-0.5.1.tar.xz diff --git a/xdg-app.spec b/xdg-app.spec index d6a0501..f74a841 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -1,5 +1,5 @@ Name: xdg-app -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -142,6 +142,9 @@ rm -f %{buildroot}%{_libdir}/libxdg-app.la %changelog +* Wed Mar 30 2016 David King - 0.5.1-1 +- Update to 0.5.1 + * Wed Mar 16 2016 David King - 0.5.0-1 - Update to 0.5.0 From bfca3b91fc86e896bf0428fc0387ca346a17c287 Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 20 Apr 2016 10:04:41 +0530 Subject: [PATCH 9/9] Update to 0.5.2 --- .gitignore | 1 + sources | 2 +- xdg-app.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1701e78..70e6202 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /xdg-app-0.4.13.tar.xz /xdg-app-0.5.0.tar.xz /xdg-app-0.5.1.tar.xz +/xdg-app-0.5.2.tar.xz diff --git a/sources b/sources index 8e6054e..02a521c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bad577912fdd70c193e7e82bbab16222 xdg-app-0.5.1.tar.xz +9bfd57d4ec404b76f03a378912c40774 xdg-app-0.5.2.tar.xz diff --git a/xdg-app.spec b/xdg-app.spec index f74a841..dea3116 100644 --- a/xdg-app.spec +++ b/xdg-app.spec @@ -1,5 +1,5 @@ Name: xdg-app -Version: 0.5.1 +Version: 0.5.2 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -142,6 +142,9 @@ rm -f %{buildroot}%{_libdir}/libxdg-app.la %changelog +* Wed Apr 20 2016 David King - 0.5.2-1 +- Update to 0.5.2 + * Wed Mar 30 2016 David King - 0.5.1-1 - Update to 0.5.1