Skip to content

librsvg - update to version 2.61.3 #23566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndWac merged 1 commit into from
Jan 5, 2026
Merged

librsvg - update to version 2.61.3 #23566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions components/library/librsvg/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,21 @@
#
# Copyright 2014 Alexander Pyhalov. All rights reserved.
# Copyright 2018 Michal Nowak
# Copyright 2023,2024 Friedrich Kink
# Copyright 2023,2026 Friedrich Kink
#

USE_DEFAULT_TEST_TRANSFORMS= yes
BUILD_STYLE= meson
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= librsvg
COMPONENT_VERSION= 2.59.2
COMPONENT_REVISION= 1
COMPONENT_VERSION= 2.61.3
COMPONENT_MAJOR_VERSION=$(basename $(COMPONENT_VERSION))
COMPONENT_SUMMARY= Library for SVG support for GNOME
COMPONENT_PROJECT_URL= https://wiki.gnome.org/Projects/LibRsvg
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= sha256:ecd293fb0cc338c170171bbc7bcfbea6725d041c95f31385dc935409933e4597
COMPONENT_ARCHIVE_HASH= sha256:a56d2c80d744ad2f2718f85df466fe71d24ff1f9bc3e5ef588bde4d7e87815f2
COMPONENT_ARCHIVE_URL= https://download.gnome.org/sources/$(COMPONENT_NAME)/$(COMPONENT_MAJOR_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI= image/library/librsvg
COMPONENT_CLASSIFICATION=System/Multimedia Libraries
Expand All @@ -41,6 +40,8 @@ CARGO_HOME= $(@D)/.cargo
# if -z ignore is added to LD_OPTIONS the build will fail
LD_OPTIONS=-M /usr/lib/ld/map.noexstk -M /usr/lib/ld/map.noexdata -M /usr/lib/ld/map.pagealign -Bdirect

COMPONENT_PRE_CONFIGURE_ACTION = $(GSED) -i -e 's/= .*version-script.*$$/= []/' $(SOURCE_DIR)/rsvg/meson.build

PATH= $(PATH.gnu)

LDFLAGS= -lsocket
Expand All @@ -55,11 +56,12 @@ PYTHON_REQUIRED_PACKAGES += library/python/docutils

# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += library/c++/harfbuzz
REQUIRED_PACKAGES += library/desktop/cairo
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += library/libxml2
REQUIRED_PACKAGES += service/gnome/desktop-cache
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/fontconfig
REQUIRED_PACKAGES += system/library/math
15 changes: 1 addition & 14 deletions components/library/librsvg/librsvg.p5m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#
# Copyright 2014 Alexander Pyhalov. All rights reserved.
# Copyright 2018 Michal Nowak
# Copyright 2023 Friedrich Kink
# Copyright 2023-2026 Friedrich Kink
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
Expand All @@ -25,28 +25,16 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

<transform file path=usr/lib/.*/loaders/.* -> default refresh_fmri svc:/application/desktop-cache/pixbuf-loaders-installer:default>

# This hack allows us to run pixbuf-loaders refresh on each package republish despite file changes.
# See https://www.illumos.org/issues/12329 for details.
<transform set name=userland.info.git-rev -> default refresh_fmri svc:/application/desktop-cache/pixbuf-loaders-installer:default>

depend type=require fmri=pkg:/service/gnome/desktop-cache

file path=usr/bin/rsvg-convert
file path=usr/include/librsvg-2.0/librsvg/rsvg-cairo.h
file path=usr/include/librsvg-2.0/librsvg/rsvg-features.h
file path=usr/include/librsvg-2.0/librsvg/rsvg-pixbuf.h
file path=usr/include/librsvg-2.0/librsvg/rsvg-version.h
file path=usr/include/librsvg-2.0/librsvg/rsvg.h
file path=usr/lib/$(MACH64)/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader_svg.so
# Gimp doesn't find the lib with an underscore in its name. Thus, provide an alternative name
link path=usr/lib/$(MACH64)/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so target=libpixbufloader_svg.so
file path=usr/lib/$(MACH64)/girepository-1.0/Rsvg-2.0.typelib
link path=usr/lib/$(MACH64)/librsvg-2.so target=librsvg-2.so.2
file path=usr/lib/$(MACH64)/librsvg-2.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/librsvg-2.so.2 target=librsvg-2.so.$(HUMAN_VERSION)
file path=usr/lib/$(MACH64)/pkgconfig/librsvg-2.0.pc
file path=usr/share/doc/Rsvg-2.0/RedHatDisplay-Black.woff
file path=usr/share/doc/Rsvg-2.0/RedHatDisplay-Black.woff2
file path=usr/share/doc/Rsvg-2.0/RedHatDisplay-BlackItalic.woff
Expand Down Expand Up @@ -176,6 +164,5 @@ file path=usr/share/doc/Rsvg-2.0/type_func.Error.quark.html
file path=usr/share/doc/Rsvg-2.0/urlmap.js
file path=usr/share/gir-1.0/Rsvg-2.0.gir
file path=usr/share/man/man1/rsvg-convert.1
file path=usr/share/thumbnailers/librsvg.thumbnailer
file path=usr/share/vala/vapi/librsvg-2.0.deps
file path=usr/share/vala/vapi/librsvg-2.0.vapi
5 changes: 1 addition & 4 deletions components/library/librsvg/manifests/sample-manifest.p5m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#

#
# Copyright 2024 <contributor>
# Copyright 2026 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
Expand All @@ -29,12 +29,10 @@ file path=usr/include/librsvg-2.0/librsvg/rsvg-features.h
file path=usr/include/librsvg-2.0/librsvg/rsvg-pixbuf.h
file path=usr/include/librsvg-2.0/librsvg/rsvg-version.h
file path=usr/include/librsvg-2.0/librsvg/rsvg.h
file path=usr/lib/$(MACH64)/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader_svg.so
file path=usr/lib/$(MACH64)/girepository-1.0/Rsvg-2.0.typelib
link path=usr/lib/$(MACH64)/librsvg-2.so target=librsvg-2.so.2
file path=usr/lib/$(MACH64)/librsvg-2.so.$(HUMAN_VERSION)
link path=usr/lib/$(MACH64)/librsvg-2.so.2 target=librsvg-2.so.$(HUMAN_VERSION)
file path=usr/lib/$(MACH64)/pkgconfig/librsvg-2.0.pc
file path=usr/share/doc/Rsvg-2.0/RedHatDisplay-Black.woff
file path=usr/share/doc/Rsvg-2.0/RedHatDisplay-Black.woff2
file path=usr/share/doc/Rsvg-2.0/RedHatDisplay-BlackItalic.woff
Expand Down Expand Up @@ -164,6 +162,5 @@ file path=usr/share/doc/Rsvg-2.0/type_func.Error.quark.html
file path=usr/share/doc/Rsvg-2.0/urlmap.js
file path=usr/share/gir-1.0/Rsvg-2.0.gir
file path=usr/share/man/man1/rsvg-convert.1
file path=usr/share/thumbnailers/librsvg.thumbnailer
file path=usr/share/vala/vapi/librsvg-2.0.deps
file path=usr/share/vala/vapi/librsvg-2.0.vapi
4 changes: 2 additions & 2 deletions components/library/librsvg/pkg5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"dependencies": [
"developer/cargo-c",
"developer/vala",
"library/c++/harfbuzz",
"library/desktop/cairo",
"library/desktop/gdk-pixbuf",
"library/desktop/gobject/gobject-introspection",
"library/desktop/pango",
"library/glib2",
"library/libxml2",
"library/python/docutils-39",
"service/gnome/desktop-cache",
"system/library",
"system/library/fontconfig",
"system/library/gcc-13-runtime",
"system/library/gcc-14-runtime",
"system/library/math"
],
"fmris": [
Expand Down
3 changes: 1 addition & 2 deletions components/library/librsvg/test/results-all.master
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
C API tests OK
Rust tests (librsvg) OK
Rust tests (pixbufloader-svg) OK
Rust tests (rsvg) OK
Rust tests (rsvg_convert) OK

Ok: 5
Ok: 4
Expected Fail: 0
Fail: 0
Unexpected Pass: 0
Expand Down