mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

librsvg: update 2.54.0 -> 2.54.1

Browse Source 
Drop patch as issue addressed upstream.

Restore doc generation, as it is now possible to disable/enable.

(From OE-Core rev: 9fb6450a71578a8399eeccf41d2c515543b4aae7)

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>
This commit is contained in:
Alexander Kanavin
2022-05-05 07:05:41 +02:00
committed by Richard Purdie
parent b66f69b0a4
commit 1519626b3a
2 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch
View File

@@ -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 =

9
meta/recipes-gnome/librsvg/librsvg_2.54.0.bb → meta/recipes-gnome/librsvg/librsvg_2.54.1.bb
View File

@@ -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