diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:05:41 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:13 +0100 |
| commit | 9fb6450a71578a8399eeccf41d2c515543b4aae7 (patch) | |
| tree | 42524eb6c4470a1443b11787dfc72f404ec2d2dc | |
| parent | b6b3ff25ee3bf22d9b3d873924afb53d3fb59ddc (diff) | |
| download | openembedded-core-contrib-9fb6450a71578a8399eeccf41d2c515543b4aae7.tar.gz | |
librsvg: update 2.54.0 -> 2.54.1
Drop patch as issue addressed upstream.
Restore doc generation, as it is now possible to disable/enable.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.54.1.bb (renamed from meta/recipes-gnome/librsvg/librsvg_2.54.0.bb) | 9 |
2 files changed, 3 insertions, 30 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch b/meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch deleted file mode 100644 index 13d25d4f08..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch +++ /dev/null @@ -1,24 +0,0 @@ -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.54.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.1.bb index 96c54f16d6..7bad2ed816 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.0.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.54.1.bb @@ -11,19 +11,16 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " SECTION = "x11/utils" -# 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" +DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango python3-docutils-native" BBCLASSEXTEND = "native nativesdk" -inherit gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala +inherit gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala gi-docgen 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] = "baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085" +SRC_URI[archive.sha256sum] = "d5557efbdcc415a4180e1116b7f736cb711b253d110d95fa86ec830f70026625" # 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 |