gfbgraph: patch to build with latest rest

librest 0.8.1 declares rest-1.0 and was released four years ago.

Also inherit pkgconfig so that dependencies can be found by pkg-config

References:
https://gitlab.gnome.org/GNOME/libgfbgraph/-/merge_requests/6

Signed-off-by: Tim Orling <ticotimo@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Tim Orling
2021-10-18 09:24:15 -07:00
committed by Khem Raj
parent 8de56ffd07
commit 1f5d21858e
2 changed files with 74 additions and 1 deletions
@@ -0,0 +1,72 @@
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>
---
.dir-locals.el | 2 +-
configure.ac | 2 +-
gfbgraph/Makefile.am | 2 +-
libgfbgraph.pc.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.dir-locals.el b/.dir-locals.el
index 77abbf0..d39cdf2 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -3,7 +3,7 @@
"/usr/include/json-glib-1.0"
"/usr/include/goa-1.0"
"/usr/lib64/goa-1.0/include"
- "/usr/include/rest-0.7"
+ "/usr/include/rest-1.0"
"/usr/include/dbus-1.0"
"/usr/lib64/dbus-1.0/include"
"/usr/include/gio-unix-2.0/"
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@
@@ -10,8 +10,9 @@ DEPENDS = " \
gnome-online-accounts \
"
inherit gnomebase gtk-doc gobject-introspection
inherit gnomebase gtk-doc gobject-introspection pkgconfig
SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch"
SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba"
SRC_URI[archive.sha256sum] = "6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379"