Attachment 232586 Details for Bug 262669 – v1.1 (apply via "git am")

[patch] v1.1 (apply via "git am")

bug262669.diff (text/plain), 10.14 KB, created by Jan Beich on 2022-03-20 00:06:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2022-03-20 00:06:39 UTC

Size: 10.14 KB

patch

obsolete

>From cc42f5e411b06ae64507f78e4f15686330142afc Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Wed, 16 Mar 2022 22:38:59 +0000
>Subject: [PATCH] graphics/librsvg2-rust: update to 2.54.0
>
>Changes:	https://gitlab.gnome.org/GNOME/librsvg/-/blob/2.54.0/NEWS
>PR:		262669
>Reported by:	Repology
>Exp-run by:	antoine
>Approved by:	tcberner
>---
> graphics/librsvg2-rust/Makefile               |   6 +-
> graphics/librsvg2-rust/distinfo               |   6 +-
> .../files/patch-include_librsvg_rsvg.h        |  16 ++
> graphics/librsvg2-rust/pkg-plist              | 146 ++++++++++++++----
> 4 files changed, 141 insertions(+), 33 deletions(-)
> create mode 100644 graphics/librsvg2-rust/files/patch-include_librsvg_rsvg.h
>
>diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile
>index c9c25c2e1106..e26c1e61cf84 100644
>--- a/graphics/librsvg2-rust/Makefile
>+++ b/graphics/librsvg2-rust/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Ade Lovett <ade@FreeBSD.org>
> 
> PORTNAME=	librsvg
>-PORTVERSION=	2.52.8
>+PORTVERSION=	2.54.0
> CATEGORIES=	graphics gnome
> MASTER_SITES=	GNOME
> PKGNAMESUFFIX=	2-rust
>@@ -13,7 +13,9 @@ COMMENT=	Library for parsing and rendering SVG vector-graphic files
> LICENSE=	LGPL20
> 
> BUILD_DEPENDS=	${RUST_DEFAULT}>=1.39.0:lang/${RUST_DEFAULT} \
>-		valac:lang/vala
>+		valac:lang/vala \
>+		gi-docgen:textproc/py-gi-docgen \
>+		rst2man:textproc/py-docutils
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
> 		libharfbuzz.so:print/harfbuzz \
>diff --git a/graphics/librsvg2-rust/distinfo b/graphics/librsvg2-rust/distinfo
>index 32a5142a88e6..2151510ca4f0 100644
>--- a/graphics/librsvg2-rust/distinfo
>+++ b/graphics/librsvg2-rust/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1647555577
>-SHA256 (gnome2/librsvg-2.52.8.tar.xz) = bade8eda74f2d7efb414e9bae53004806e1fa7dc05f04cad59b74eb1a5756962
>-SIZE (gnome2/librsvg-2.52.8.tar.xz) = 23704984
>+TIMESTAMP = 1647470339
>+SHA256 (gnome2/librsvg-2.54.0.tar.xz) = baf8ebc147f146b4261bb3d0cd0fac944bf8dbb4b1f2347d23341f974dcc3085
>+SIZE (gnome2/librsvg-2.54.0.tar.xz) = 23489972
>diff --git a/graphics/librsvg2-rust/files/patch-include_librsvg_rsvg.h b/graphics/librsvg2-rust/files/patch-include_librsvg_rsvg.h
>new file mode 100644
>index 000000000000..1d2fb0ae5c79
>--- /dev/null
>+++ b/graphics/librsvg2-rust/files/patch-include_librsvg_rsvg.h
>@@ -0,0 +1,16 @@
>+https://gitlab.gnome.org/GNOME/librsvg/-/issues/856
>+
>+C-style comments (`/* something */`) cannot be nested. Rephrase to
>+unbreak at least x11/fuzzel.
>+
>+--- include/librsvg/rsvg.h.orig	2022-03-16 22:38:59 UTC
>++++ include/librsvg/rsvg.h
>+@@ -122,7 +122,7 @@ GType rsvg_error_get_type (void);
>+  * if the base file is `/foo/bar/baz.svg`, then librsvg will
>+  * only try to load referenced files (from SVG's
>+  * `<image>` element, for example, or from content
>+- * included through XML entities) if those files are in `/foo/bar/*` or in `/foo/bar/*\/.../*`.
>++ * included through XML entities) if those files are under `/foo/bar/` or `/foo/bar/.../`.
>+  * This is so that malicious SVG files cannot include files that are in a directory above.
>+  *
>+  * The full set of rules for deciding which URLs may be loaded is as follows;
>diff --git a/graphics/librsvg2-rust/pkg-plist b/graphics/librsvg2-rust/pkg-plist
>index a3e0f508e379..eac007058524 100644
>--- a/graphics/librsvg2-rust/pkg-plist
>+++ b/graphics/librsvg2-rust/pkg-plist
>@@ -10,34 +10,124 @@ lib/librsvg-2.so.2
> lib/librsvg-2.so.2.48.0
> libdata/pkgconfig/librsvg-2.0.pc
> man/man1/rsvg-convert.1.gz
>-share/doc/rsvg-2.0/RsvgHandle.html
>-share/doc/rsvg-2.0/annotation-glossary.html
>-share/doc/rsvg-2.0/api-index-full.html
>-share/doc/rsvg-2.0/ch01.html
>-share/doc/rsvg-2.0/ch01s02.html
>-share/doc/rsvg-2.0/ch01s03.html
>-share/doc/rsvg-2.0/ch02.html
>-share/doc/rsvg-2.0/ch03.html
>-share/doc/rsvg-2.0/home.png
>-share/doc/rsvg-2.0/index.html
>-share/doc/rsvg-2.0/left-insensitive.png
>-share/doc/rsvg-2.0/left.png
>-share/doc/rsvg-2.0/licence.html
>-share/doc/rsvg-2.0/migrating-to-geometry-apis.html
>-share/doc/rsvg-2.0/object-tree.html
>-share/doc/rsvg-2.0/recommendations-assets.html
>-share/doc/rsvg-2.0/right-insensitive.png
>-share/doc/rsvg-2.0/right.png
>-share/doc/rsvg-2.0/rsvg-2.0.devhelp2
>-share/doc/rsvg-2.0/rsvg-Deprecated-functions-to-render-to-GdkPixbuf.html
>-share/doc/rsvg-2.0/rsvg-Deprecated-functions-to-render-with-Cairo.html
>-share/doc/rsvg-2.0/rsvg-Using-RSVG-with-Cairo.html
>-share/doc/rsvg-2.0/rsvg-Using-RSVG-with-GIO.html
>-share/doc/rsvg-2.0/rsvg-Version-checks.html
>-share/doc/rsvg-2.0/rsvg.html
>-share/doc/rsvg-2.0/style.css
>-share/doc/rsvg-2.0/up-insensitive.png
>-share/doc/rsvg-2.0/up.png
>+%%DOCSDIR%%/COMPILING.md
>+%%DOCSDIR%%/CONTRIBUTING.md
>+%%DOCSDIR%%/README.md
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-Black.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-Black.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-BlackItalic.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-BlackItalic.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-Bold.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-Bold.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-BoldItalic.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-BoldItalic.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-Medium.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-Medium.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-MediumItalic.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-MediumItalic.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-Regular.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatDisplay-Regular.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-Bold.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-Bold.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-BoldItalic.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-BoldItalic.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-Italic.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-Italic.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-Medium.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-Medium.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-MediumItalic.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-MediumItalic.woff2
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-Regular.woff
>+%%DOCSDIR%%/Rsvg-2.0/RedHatText-Regular.woff2
>+%%DOCSDIR%%/Rsvg-2.0/Rsvg-2.0.devhelp2
>+%%DOCSDIR%%/Rsvg-2.0/callback.SizeFunc.html
>+%%DOCSDIR%%/Rsvg-2.0/class.Handle.html
>+%%DOCSDIR%%/Rsvg-2.0/classes_hierarchy.html
>+%%DOCSDIR%%/Rsvg-2.0/const.MAJOR_VERSION.html
>+%%DOCSDIR%%/Rsvg-2.0/const.MICRO_VERSION.html
>+%%DOCSDIR%%/Rsvg-2.0/const.MINOR_VERSION.html
>+%%DOCSDIR%%/Rsvg-2.0/const.VERSION.html
>+%%DOCSDIR%%/Rsvg-2.0/ctor.Handle.new.html
>+%%DOCSDIR%%/Rsvg-2.0/ctor.Handle.new_from_data.html
>+%%DOCSDIR%%/Rsvg-2.0/ctor.Handle.new_from_file.html
>+%%DOCSDIR%%/Rsvg-2.0/ctor.Handle.new_from_gfile_sync.html
>+%%DOCSDIR%%/Rsvg-2.0/ctor.Handle.new_from_stream_sync.html
>+%%DOCSDIR%%/Rsvg-2.0/ctor.Handle.new_with_flags.html
>+%%DOCSDIR%%/Rsvg-2.0/enum.Unit.html
>+%%DOCSDIR%%/Rsvg-2.0/error.Error.html
>+%%DOCSDIR%%/Rsvg-2.0/flags.HandleFlags.html
>+%%DOCSDIR%%/Rsvg-2.0/fonts.css
>+%%DOCSDIR%%/Rsvg-2.0/func.CHECK_VERSION.html
>+%%DOCSDIR%%/Rsvg-2.0/func.DEPRECATED_FOR.html
>+%%DOCSDIR%%/Rsvg-2.0/func.cleanup.html
>+%%DOCSDIR%%/Rsvg-2.0/func.init.html
>+%%DOCSDIR%%/Rsvg-2.0/func.pixbuf_from_file.html
>+%%DOCSDIR%%/Rsvg-2.0/func.pixbuf_from_file_at_max_size.html
>+%%DOCSDIR%%/Rsvg-2.0/func.pixbuf_from_file_at_size.html
>+%%DOCSDIR%%/Rsvg-2.0/func.pixbuf_from_file_at_zoom.html
>+%%DOCSDIR%%/Rsvg-2.0/func.pixbuf_from_file_at_zoom_with_max.html
>+%%DOCSDIR%%/Rsvg-2.0/func.set_default_dpi.html
>+%%DOCSDIR%%/Rsvg-2.0/func.set_default_dpi_x_y.html
>+%%DOCSDIR%%/Rsvg-2.0/func.term.html
>+%%DOCSDIR%%/Rsvg-2.0/fzy.js
>+%%DOCSDIR%%/Rsvg-2.0/go-up-symbolic.png
>+%%DOCSDIR%%/Rsvg-2.0/index.html
>+%%DOCSDIR%%/Rsvg-2.0/index.json
>+%%DOCSDIR%%/Rsvg-2.0/main.js
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.close.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.free.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_base_uri.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_desc.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_dimensions.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_dimensions_sub.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_geometry_for_element.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_geometry_for_layer.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_intrinsic_dimensions.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_intrinsic_size_in_pixels.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_metadata.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_pixbuf.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_pixbuf_sub.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_position_sub.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.get_title.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.has_sub.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.internal_set_testing.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.read_stream_sync.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.render_cairo.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.render_cairo_sub.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.render_document.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.render_element.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.render_layer.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.set_base_gfile.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.set_base_uri.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.set_dpi.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.set_dpi_x_y.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.set_size_callback.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.set_stylesheet.html
>+%%DOCSDIR%%/Rsvg-2.0/method.Handle.write.html
>+%%DOCSDIR%%/Rsvg-2.0/migrating.html
>+%%DOCSDIR%%/Rsvg-2.0/overview.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.base-uri.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.desc.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.dpi-x.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.dpi-y.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.em.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.ex.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.flags.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.height.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.metadata.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.title.html
>+%%DOCSDIR%%/Rsvg-2.0/property.Handle.width.html
>+%%DOCSDIR%%/Rsvg-2.0/pygment.css
>+%%DOCSDIR%%/Rsvg-2.0/recommendations.html
>+%%DOCSDIR%%/Rsvg-2.0/search.js
>+%%DOCSDIR%%/Rsvg-2.0/struct.DimensionData.html
>+%%DOCSDIR%%/Rsvg-2.0/struct.Length.html
>+%%DOCSDIR%%/Rsvg-2.0/struct.PositionData.html
>+%%DOCSDIR%%/Rsvg-2.0/struct.Rectangle.html
>+%%DOCSDIR%%/Rsvg-2.0/style.css
>+%%DOCSDIR%%/Rsvg-2.0/type_func.Error.quark.html
>+%%DOCSDIR%%/Rsvg-2.0/urlmap.js
>+%%DOCSDIR%%/code-of-conduct.md
> share/gir-1.0/Rsvg-2.0.gir
> share/thumbnailers/librsvg.thumbnailer
> share/vala/vapi/librsvg-2.0.vapi

Actions: View | Diff

Attachments on bug 262669: 232580 | 232586