From 9fb6450a71578a8399eeccf41d2c515543b4aae7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 May 2022 07:05:41 +0200 Subject: 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 Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../librsvg/librsvg/0001-Disable-docs.patch | 24 ------- meta/recipes-gnome/librsvg/librsvg_2.54.0.bb | 78 ---------------------- meta/recipes-gnome/librsvg/librsvg_2.54.1.bb | 75 +++++++++++++++++++++ 3 files changed, 75 insertions(+), 102 deletions(-) delete mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-Disable-docs.patch delete mode 100644 meta/recipes-gnome/librsvg/librsvg_2.54.0.bb create mode 100644 meta/recipes-gnome/librsvg/librsvg_2.54.1.bb 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 -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 ---- - -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.0.bb deleted file mode 100644 index 96c54f16d6..0000000000 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.0.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "Library for rendering SVG files" -DESCRIPTION = "A small library to render Scalable Vector Graphics (SVG), \ -associated with the GNOME Project. It renders SVG files to Cairo surfaces. \ -Cairo is the 2D, antialiased drawing library that GNOME uses to draw things to \ -the screen or to generate output for printing." -HOMEPAGE = "https://gitlab.gnome.org/GNOME/librsvg" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/librsvg/issues" - -LICENSE = "LGPL-2.1-or-later" -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" -BBCLASSEXTEND = "native nativesdk" - -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] = "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 -# for cargo to be happy -BASEDEPENDS:append = " cargo-native" - -export RUST_BACKTRACE = "full" -export RUSTFLAGS -export RUST_TARGET_PATH - -export RUST_TARGET = "${HOST_SYS}" - -RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" -RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" -RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" -RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" - -# rust-cross writes the target linker binary into target json definition without any flags. -# This breaks here because the linker isn't going to work without at least knowing where -# the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class -# which supplies the needed flags. -do_compile:prepend() { - cp ${STAGING_LIBDIR_NATIVE}/rustlib/${HOST_SYS}.json ${WORKDIR} - cp ${STAGING_LIBDIR_NATIVE}/rustlib/${BUILD_SYS}.json ${WORKDIR} - sed -ie 's,"linker": ".*","linker": "${RUST_TARGET_CC}",g' ${WORKDIR}/${HOST_SYS}.json - RUST_TARGET_PATH="${WORKDIR}" - export RUST_TARGET_PATH -} - -# Issue only on windows -CVE_CHECK_IGNORE += "CVE-2018-1000041" - -CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" - -PACKAGECONFIG ??= "gdkpixbuf" -# The gdk-pixbuf loader -PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-pixbuf-native" - -do_install:append() { - # Loadable modules don't need .a or .la on Linux - rm -f ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.a ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.la -} - -PACKAGES =+ "librsvg-gtk rsvg" -FILES:rsvg = "${bindir}/rsvg* \ - ${datadir}/pixmaps/svg-viewer.svg \ - ${datadir}/themes" -FILES:librsvg-gtk = "${libdir}/gdk-pixbuf-2.0/*/*/*.so \ - ${datadir}/thumbnailers/librsvg.thumbnailer" -RRECOMMENDS:librsvg-gtk = "gdk-pixbuf-bin" - -PIXBUF_PACKAGES = "librsvg-gtk" diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.1.bb new file mode 100644 index 0000000000..7bad2ed816 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg_2.54.1.bb @@ -0,0 +1,75 @@ +SUMMARY = "Library for rendering SVG files" +DESCRIPTION = "A small library to render Scalable Vector Graphics (SVG), \ +associated with the GNOME Project. It renders SVG files to Cairo surfaces. \ +Cairo is the 2D, antialiased drawing library that GNOME uses to draw things to \ +the screen or to generate output for printing." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/librsvg" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/librsvg/issues" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + " + +SECTION = "x11/utils" +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 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 \ + " + +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 +# for cargo to be happy +BASEDEPENDS:append = " cargo-native" + +export RUST_BACKTRACE = "full" +export RUSTFLAGS +export RUST_TARGET_PATH + +export RUST_TARGET = "${HOST_SYS}" + +RUSTFLAGS:append:mips = " --cfg crossbeam_no_atomic_64" +RUSTFLAGS:append:mipsel = " --cfg crossbeam_no_atomic_64" +RUSTFLAGS:append:powerpc = " --cfg crossbeam_no_atomic_64" +RUSTFLAGS:append:riscv32 = " --cfg crossbeam_no_atomic_64" + +# rust-cross writes the target linker binary into target json definition without any flags. +# This breaks here because the linker isn't going to work without at least knowing where +# the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class +# which supplies the needed flags. +do_compile:prepend() { + cp ${STAGING_LIBDIR_NATIVE}/rustlib/${HOST_SYS}.json ${WORKDIR} + cp ${STAGING_LIBDIR_NATIVE}/rustlib/${BUILD_SYS}.json ${WORKDIR} + sed -ie 's,"linker": ".*","linker": "${RUST_TARGET_CC}",g' ${WORKDIR}/${HOST_SYS}.json + RUST_TARGET_PATH="${WORKDIR}" + export RUST_TARGET_PATH +} + +# Issue only on windows +CVE_CHECK_IGNORE += "CVE-2018-1000041" + +CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" + +PACKAGECONFIG ??= "gdkpixbuf" +# The gdk-pixbuf loader +PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-pixbuf-native" + +do_install:append() { + # Loadable modules don't need .a or .la on Linux + rm -f ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.a ${D}${libdir}/gdk-pixbuf-2.0/*/loaders/*.la +} + +PACKAGES =+ "librsvg-gtk rsvg" +FILES:rsvg = "${bindir}/rsvg* \ + ${datadir}/pixmaps/svg-viewer.svg \ + ${datadir}/themes" +FILES:librsvg-gtk = "${libdir}/gdk-pixbuf-2.0/*/*/*.so \ + ${datadir}/thumbnailers/librsvg.thumbnailer" +RRECOMMENDS:librsvg-gtk = "gdk-pixbuf-bin" + +PIXBUF_PACKAGES = "librsvg-gtk" -- cgit 1.2.3-korg