summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/librsvg
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-05-05 07:05:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-05 21:17:38 +0100
commit1519626b3a2ea1203ffe03d65e9199fc8c1bfd12 (patch)
tree52ebada0bfad3757de3bb6d35509e8d1bd00ebc8 /meta/recipes-gnome/librsvg
parentb66f69b0a4c7dc41d8ce8d1fd939fa11c6508e2f (diff)
downloadpoky-1519626b3a2ea1203ffe03d65e9199fc8c1bfd12.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. (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>
Diffstat (limited to 'meta/recipes-gnome/librsvg')
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch24
-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 @@
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.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 \
11 " 11 "
12 12
13SECTION = "x11/utils" 13SECTION = "x11/utils"
14# Note: docutils/gi-docgen should be made optional when upstream enables that 14DEPENDS = "cairo gdk-pixbuf glib-2.0 libcroco libxml2 pango python3-docutils-native"
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"
17BBCLASSEXTEND = "native nativesdk" 15BBCLASSEXTEND = "native nativesdk"
18 16
19inherit gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala 17inherit gnomebase pixbufcache upstream-version-is-even gobject-introspection rust vala gi-docgen
20 18
21SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ 19SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \
22 file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ 20 file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \
23 file://0001-Disable-docs.patch \
24 " 21 "
25 22
26SRC_URI[archive.sha256sum] = "baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085" 23SRC_URI[archive.sha256sum] = "d5557efbdcc415a4180e1116b7f736cb711b253d110d95fa86ec830f70026625"
27 24
28# librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles 25# librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles
29# so we cannot use cargo class directly, but still need bits and pieces from it 26# so we cannot use cargo class directly, but still need bits and pieces from it