diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-04-07 19:00:28 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-19 14:14:01 +0100 |
| commit | f6c9614397e71751675ca45f8211e66ce76c2b93 (patch) | |
| tree | d905f22f0c726c8f450a161ce78763aebadc07f3 /meta/recipes-gnome | |
| parent | d8398c88c6d950781709a112446d6a320e624346 (diff) | |
| download | openembedded-core-f6c9614397e71751675ca45f8211e66ce76c2b93.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
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.patch | 24 | ||||
| -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 @@ +From e62887dfa36812d5b8bc1c2c2fec69ba985309d8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Tue, 5 Apr 2022 09:21:14 +0200 +Subject: [PATCH] Disable docs + +Upstream has replaced gtk-doc with rst2man and gi-docgen in a way +that is not possible to disable and requires g-i. There's a +pull request to address this, until then let's patch it out: +https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/687 + +Upstream-Status: Inappropriate [see above] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + +diff --git a/Makefile.am b/Makefile.am +index e380bc9..5b3fbb5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = . gdk-pixbuf-loader tests doc win32 ++SUBDIRS = . gdk-pixbuf-loader tests win32 + + NULL = + 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 \ " SECTION = "x11/utils" -DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango" +# Note: docutils/gi-docgen should be made optional when upstream enables that +# https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/687 +DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango python3-docutils-native gi-docgen-native" BBCLASSEXTEND = "native nativesdk" -inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspection rust vala +inherit gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ + file://0001-Disable-docs.patch \ " -SRC_URI[archive.sha256sum] = "057c1eeeaf85c84e254bdb707459207f5840da5b4d52b4711c03140ed09e6887" +SRC_URI[archive.sha256sum] = "baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085" # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles # so we cannot use cargo class directly, but still need bits and pieces from it |