diff options
-rw-r--r-- | meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch | 72 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb | 3 |
2 files changed, 74 insertions, 1 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 new file mode 100644 index 000000000..c24a9e569 --- /dev/null +++ b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph/0001-Update-rest-requirement-to-rest-1.0.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From d058e6eb6c9ebf5f4fff89ec0ac93323fc64c1ba Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <ticotimo@gmail.com> | ||
3 | Date: Mon, 18 Oct 2021 08:42:35 -0700 | ||
4 | Subject: [PATCH] Update rest requirement to rest-1.0 | ||
5 | |||
6 | librest 0.8.1 declares rest-1.0 and was released four years ago. | ||
7 | |||
8 | https://gitlab.gnome.org/GNOME/librest/-/commit/2971b3b92701f70fc368ad64bd25cefaea043f87 | ||
9 | |||
10 | Upstream-Status: Submitted | ||
11 | [https://gitlab.gnome.org/GNOME/libgfbgraph/-/merge_requests/6] | ||
12 | |||
13 | Signed-off-by: Tim Orling <ticotimo@gmail.com> | ||
14 | |||
15 | --- | ||
16 | .dir-locals.el | 2 +- | ||
17 | configure.ac | 2 +- | ||
18 | gfbgraph/Makefile.am | 2 +- | ||
19 | libgfbgraph.pc.in | 2 +- | ||
20 | 4 files changed, 4 insertions(+), 4 deletions(-) | ||
21 | |||
22 | diff --git a/.dir-locals.el b/.dir-locals.el | ||
23 | index 77abbf0..d39cdf2 100644 | ||
24 | --- a/.dir-locals.el | ||
25 | +++ b/.dir-locals.el | ||
26 | @@ -3,7 +3,7 @@ | ||
27 | "/usr/include/json-glib-1.0" | ||
28 | "/usr/include/goa-1.0" | ||
29 | "/usr/lib64/goa-1.0/include" | ||
30 | - "/usr/include/rest-0.7" | ||
31 | + "/usr/include/rest-1.0" | ||
32 | "/usr/include/dbus-1.0" | ||
33 | "/usr/lib64/dbus-1.0/include" | ||
34 | "/usr/include/gio-unix-2.0/" | ||
35 | diff --git a/configure.ac b/configure.ac | ||
36 | index fd1231f..9b49f3f 100644 | ||
37 | --- a/configure.ac | ||
38 | +++ b/configure.ac | ||
39 | @@ -40,7 +40,7 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], false) | ||
40 | |||
41 | GOBJECT_INTROSPECTION_CHECK([1.30.0]) | ||
42 | |||
43 | -PKG_CHECK_MODULES(LIBGFBGRAPH, [glib-2.0 gio-2.0 gobject-2.0 rest-0.7 json-glib-1.0]) | ||
44 | +PKG_CHECK_MODULES(LIBGFBGRAPH, [glib-2.0 gio-2.0 gobject-2.0 rest-1.0 json-glib-1.0]) | ||
45 | |||
46 | PKG_CHECK_MODULES(SOUP, [libsoup-2.4]) | ||
47 | SOUP_UNSTABLE_CPPFLAGS=-DLIBSOUP_USE_UNSTABLE_REQUEST_API | ||
48 | diff --git a/gfbgraph/Makefile.am b/gfbgraph/Makefile.am | ||
49 | index d07b90d..b993ab7 100644 | ||
50 | --- a/gfbgraph/Makefile.am | ||
51 | +++ b/gfbgraph/Makefile.am | ||
52 | @@ -60,7 +60,7 @@ GFBGraph_@API_MAJOR@_@API_MINOR@_gir_INCLUDES = \ | ||
53 | GLib-2.0 \ | ||
54 | Gio-2.0 \ | ||
55 | GObject-2.0 \ | ||
56 | - Rest-0.7 \ | ||
57 | + Rest-1.0 \ | ||
58 | Json-1.0 \ | ||
59 | Soup-2.4 | ||
60 | |||
61 | diff --git a/libgfbgraph.pc.in b/libgfbgraph.pc.in | ||
62 | index f87073e..d4f4e3a 100644 | ||
63 | --- a/libgfbgraph.pc.in | ||
64 | +++ b/libgfbgraph.pc.in | ||
65 | @@ -9,6 +9,6 @@ apiversion=@API_VERSION@ | ||
66 | Name: libgfbgraph | ||
67 | Description: GObject library for Facebook Graph API | ||
68 | Version: @VERSION@ | ||
69 | -Requires: gio-2.0 glib-2.0 goa-1.0 json-glib-1.0 libsoup-2.4 rest-0.7 | ||
70 | +Requires: gio-2.0 glib-2.0 goa-1.0 json-glib-1.0 libsoup-2.4 rest-1.0 | ||
71 | Libs: -L${libdir} -lgfbgraph-${apiversion} | ||
72 | Cflags: -I${includedir}/gfbgraph-@API_VERSION@ | ||
diff --git a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb index 1c5d90f6c..23b3bf63a 100644 --- a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb +++ b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb | |||
@@ -10,8 +10,9 @@ DEPENDS = " \ | |||
10 | gnome-online-accounts \ | 10 | gnome-online-accounts \ |
11 | " | 11 | " |
12 | 12 | ||
13 | inherit gnomebase gtk-doc gobject-introspection | 13 | inherit gnomebase gtk-doc gobject-introspection pkgconfig |
14 | 14 | ||
15 | SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" | ||
15 | SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba" | 16 | SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba" |
16 | SRC_URI[archive.sha256sum] = "6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379" | 17 | SRC_URI[archive.sha256sum] = "6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379" |
17 | 18 | ||