summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-04-07 19:00:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-19 14:14:10 +0100
commit0225e594766aa5fa42ca510f29ec46a5e1590f1c (patch)
treefda67ebe46f90b64a05296dcc68f44513631e888 /meta/recipes-gnome
parentd61e29347b84711d726ae69f09307ff7bc5b1d80 (diff)
downloadpoky-0225e594766aa5fa42ca510f29ec46a5e1590f1c.tar.gz
librsvg: upgrade 2.52.7 -> 2.54.0
Upstream has replaced gtk-doc with gi-docgen however it is not possible to configure. So it's disabled until the merge request to do so lands: https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/687 (From OE-Core rev: f6c9614397e71751675ca45f8211e66ce76c2b93) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch24
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.54.0.bb (renamed from meta/recipes-gnome/librsvg/librsvg_2.52.7.bb)9
2 files changed, 30 insertions, 3 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch b/meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch
new file mode 100644
index 0000000000..13d25d4f08
--- /dev/null
+++ b/meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch
@@ -0,0 +1,24 @@
1From e62887dfa36812d5b8bc1c2c2fec69ba985309d8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 5 Apr 2022 09:21:14 +0200
4Subject: [PATCH] Disable docs
5
6Upstream has replaced gtk-doc with rst2man and gi-docgen in a way
7that is not possible to disable and requires g-i. There's a
8pull request to address this, until then let's patch it out:
9https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/687
10
11Upstream-Status: Inappropriate [see above]
12Signed-off-by: Alexander Kanavin <alex@linutronix.de>
13---
14
15diff --git a/Makefile.am b/Makefile.am
16index e380bc9..5b3fbb5 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -1,4 +1,4 @@
20-SUBDIRS = . gdk-pixbuf-loader tests doc win32
21+SUBDIRS = . gdk-pixbuf-loader tests win32
22
23 NULL =
24
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.52.7.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.0.bb
index 78eb93c635..96c54f16d6 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.52.7.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.54.0.bb
@@ -11,16 +11,19 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
11 " 11 "
12 12
13SECTION = "x11/utils" 13SECTION = "x11/utils"
14DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" 14# Note: docutils/gi-docgen should be made optional when upstream enables that
15# https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/687
16DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango python3-docutils-native gi-docgen-native"
15BBCLASSEXTEND = "native nativesdk" 17BBCLASSEXTEND = "native nativesdk"
16 18
17inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspection rust vala 19inherit gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala
18 20
19SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ 21SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \
20 file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ 22 file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \
23 file://0001-Disable-docs.patch \
21 " 24 "
22 25
23SRC_URI[archive.sha256sum] = "057c1eeeaf85c84e254bdb707459207f5840da5b4d52b4711c03140ed09e6887" 26SRC_URI[archive.sha256sum] = "baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085"
24 27
25# librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles 28# librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles
26# so we cannot use cargo class directly, but still need bits and pieces from it 29# so we cannot use cargo class directly, but still need bits and pieces from it