mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

librsvg: upgrade 2.52.7 -> 2.54.0

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2022-04-07 19:00:28 +02:00
committed by Richard Purdie
parent d61e29347b
commit 0225e59476
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -11,16 +11,19 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
" "
SECTION = "x11/utils" 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" 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 \ 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-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 # 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 # so we cannot use cargo class directly, but still need bits and pieces from it