diff options
| -rw-r--r-- | meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch | 58 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb | 5 |
2 files changed, 3 insertions, 60 deletions
diff --git a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch deleted file mode 100644 index 21c623ea5b..0000000000 --- a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d058e6eb6c9ebf5f4fff89ec0ac93323fc64c1ba Mon Sep 17 00:00:00 2001 -From: Tim Orling <ticotimo@gmail.com> -Date: Mon, 18 Oct 2021 08:42:35 -0700 -Subject: [PATCH] Update rest requirement to rest-1.0 - -librest 0.8.1 declares rest-1.0 and was released four years ago. - -https://gitlab.gnome.org/GNOME/librest/-/commit/2971b3b92701f70fc368ad64bd25cefaea043f87 - -Upstream-Status: Submitted -[https://gitlab.gnome.org/GNOME/libgfbgraph/-/merge_requests/6] - -Signed-off-by: Tim Orling <ticotimo@gmail.com> - ---- - configure.ac | 2 +- - gfbgraph/Makefile.am | 2 +- - libgfbgraph.pc.in | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fd1231f..9b49f3f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,7 +40,7 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], false) - - GOBJECT_INTROSPECTION_CHECK([1.30.0]) - --PKG_CHECK_MODULES(LIBGFBGRAPH, [glib-2.0 gio-2.0 gobject-2.0 rest-0.7 json-glib-1.0]) -+PKG_CHECK_MODULES(LIBGFBGRAPH, [glib-2.0 gio-2.0 gobject-2.0 rest-1.0 json-glib-1.0]) - - PKG_CHECK_MODULES(SOUP, [libsoup-2.4]) - SOUP_UNSTABLE_CPPFLAGS=-DLIBSOUP_USE_UNSTABLE_REQUEST_API -diff --git a/gfbgraph/Makefile.am b/gfbgraph/Makefile.am -index d07b90d..b993ab7 100644 ---- a/gfbgraph/Makefile.am -+++ b/gfbgraph/Makefile.am -@@ -60,7 +60,7 @@ GFBGraph_@API_MAJOR@_@API_MINOR@_gir_INCLUDES = \ - GLib-2.0 \ - Gio-2.0 \ - GObject-2.0 \ -- Rest-0.7 \ -+ Rest-1.0 \ - Json-1.0 \ - Soup-2.4 - -diff --git a/libgfbgraph.pc.in b/libgfbgraph.pc.in -index f87073e..d4f4e3a 100644 ---- a/libgfbgraph.pc.in -+++ b/libgfbgraph.pc.in -@@ -9,6 +9,6 @@ apiversion=@API_VERSION@ - Name: libgfbgraph - Description: GObject library for Facebook Graph API - Version: @VERSION@ --Requires: gio-2.0 glib-2.0 goa-1.0 json-glib-1.0 libsoup-2.4 rest-0.7 -+Requires: gio-2.0 glib-2.0 goa-1.0 json-glib-1.0 libsoup-2.4 rest-1.0 - Libs: -L${libdir} -lgfbgraph-${apiversion} - Cflags: -I${includedir}/gfbgraph-@API_VERSION@ diff --git a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb index f3b54e7d05..faeaa8ccb9 100644 --- a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb +++ b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a" DEPENDS = " \ glib-2.0 \ json-glib \ - rest \ + librest \ + libsoup-2.4 \ gnome-online-accounts \ " @@ -15,7 +16,7 @@ inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check # for gnome-online-accounts REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" +#SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" SRC_URI[archive.sha256sum] = "9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3" do_install:append() { |