From aa91a12277d6ded10aba2ae6cc5a60b8754fa9fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 13:27:57 -0600 Subject: [PATCH] AutoBuild: update-librsvg started at 2025-02-20-18UTC (#11384) * Librsvg 2.58.2-icu75.1 => 2.59.2-icu75.1 * Add build patch. Signed-off-by: Satadru Pramanik * Add built packages for linux/amd64 to update-librsvg * Add built packages for linux/arm/v7 to update-librsvg * Update librsvg.rb * Fix unrelated typo Signed-off-by: Satadru Pramanik --------- Signed-off-by: Satadru Pramanik Co-authored-by: Ed Reel Co-authored-by: Satadru Pramanik Co-authored-by: satmandu --- manifest/armv7l/l/librsvg.filelist | 13 ++++------ manifest/armv7l/p/py3_smartypants.filelist | 18 +++++++------- manifest/x86_64/l/librsvg.filelist | 13 ++++------ manifest/x86_64/p/py3_smartypants.filelist | 18 +++++++------- packages/librsvg.rb | 28 +++++++++++++++------- packages/python3.rb | 2 +- 6 files changed, 48 insertions(+), 44 deletions(-) diff --git a/manifest/armv7l/l/librsvg.filelist b/manifest/armv7l/l/librsvg.filelist index 13a967708..7474e9b16 100644 --- a/manifest/armv7l/l/librsvg.filelist +++ b/manifest/armv7l/l/librsvg.filelist @@ -1,20 +1,17 @@ /usr/local/bin/rsvg-convert /usr/local/include/librsvg-2.0/librsvg/rsvg-cairo.h /usr/local/include/librsvg-2.0/librsvg/rsvg-features.h +/usr/local/include/librsvg-2.0/librsvg/rsvg-pixbuf.h /usr/local/include/librsvg-2.0/librsvg/rsvg-version.h /usr/local/include/librsvg-2.0/librsvg/rsvg.h -/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.a -/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la -/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so +/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader_svg.so /usr/local/lib/girepository-1.0/Rsvg-2.0.typelib -/usr/local/lib/librsvg-2.a -/usr/local/lib/librsvg-2.la /usr/local/lib/librsvg-2.so /usr/local/lib/librsvg-2.so.2 -/usr/local/lib/librsvg-2.so.2.50.0 +/usr/local/lib/librsvg-2.so.2.59.2 /usr/local/lib/pkgconfig/librsvg-2.0.pc -/usr/local/share/doc/librsvg/README.md -/usr/local/share/doc/librsvg/code-of-conduct.md /usr/local/share/gir-1.0/Rsvg-2.0.gir +/usr/local/share/man/man1/rsvg-convert.1.zst /usr/local/share/thumbnailers/librsvg.thumbnailer +/usr/local/share/vala/vapi/librsvg-2.0.deps /usr/local/share/vala/vapi/librsvg-2.0.vapi diff --git a/manifest/armv7l/p/py3_smartypants.filelist b/manifest/armv7l/p/py3_smartypants.filelist index d71818bfd..5803c46ee 100644 --- a/manifest/armv7l/p/py3_smartypants.filelist +++ b/manifest/armv7l/p/py3_smartypants.filelist @@ -1,10 +1,10 @@ /usr/local/bin/smartypants -/usr/local/lib/python3.12/site-packages/__pycache__/smartypants.cpython-312.pyc -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/DESCRIPTION.rst -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/INSTALLER -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/METADATA -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/RECORD -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/REQUESTED -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/WHEEL -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/metadata.json -/usr/local/lib/python3.12/site-packages/smartypants.py +/usr/local/lib/python3.13/site-packages/__pycache__/smartypants.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/DESCRIPTION.rst +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/INSTALLER +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/METADATA +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/RECORD +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/REQUESTED +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/WHEEL +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/metadata.json +/usr/local/lib/python3.13/site-packages/smartypants.py diff --git a/manifest/x86_64/l/librsvg.filelist b/manifest/x86_64/l/librsvg.filelist index db6c90b60..e7d6ed31e 100644 --- a/manifest/x86_64/l/librsvg.filelist +++ b/manifest/x86_64/l/librsvg.filelist @@ -1,20 +1,17 @@ /usr/local/bin/rsvg-convert /usr/local/include/librsvg-2.0/librsvg/rsvg-cairo.h /usr/local/include/librsvg-2.0/librsvg/rsvg-features.h +/usr/local/include/librsvg-2.0/librsvg/rsvg-pixbuf.h /usr/local/include/librsvg-2.0/librsvg/rsvg-version.h /usr/local/include/librsvg-2.0/librsvg/rsvg.h -/usr/local/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.a -/usr/local/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la -/usr/local/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so +/usr/local/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader_svg.so /usr/local/lib64/girepository-1.0/Rsvg-2.0.typelib -/usr/local/lib64/librsvg-2.a -/usr/local/lib64/librsvg-2.la /usr/local/lib64/librsvg-2.so /usr/local/lib64/librsvg-2.so.2 -/usr/local/lib64/librsvg-2.so.2.50.0 +/usr/local/lib64/librsvg-2.so.2.59.2 /usr/local/lib64/pkgconfig/librsvg-2.0.pc -/usr/local/share/doc/librsvg/README.md -/usr/local/share/doc/librsvg/code-of-conduct.md /usr/local/share/gir-1.0/Rsvg-2.0.gir +/usr/local/share/man/man1/rsvg-convert.1.zst /usr/local/share/thumbnailers/librsvg.thumbnailer +/usr/local/share/vala/vapi/librsvg-2.0.deps /usr/local/share/vala/vapi/librsvg-2.0.vapi diff --git a/manifest/x86_64/p/py3_smartypants.filelist b/manifest/x86_64/p/py3_smartypants.filelist index d71818bfd..5803c46ee 100644 --- a/manifest/x86_64/p/py3_smartypants.filelist +++ b/manifest/x86_64/p/py3_smartypants.filelist @@ -1,10 +1,10 @@ /usr/local/bin/smartypants -/usr/local/lib/python3.12/site-packages/__pycache__/smartypants.cpython-312.pyc -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/DESCRIPTION.rst -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/INSTALLER -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/METADATA -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/RECORD -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/REQUESTED -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/WHEEL -/usr/local/lib/python3.12/site-packages/smartypants-2.0.1.dist-info/metadata.json -/usr/local/lib/python3.12/site-packages/smartypants.py +/usr/local/lib/python3.13/site-packages/__pycache__/smartypants.cpython-313.pyc +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/DESCRIPTION.rst +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/INSTALLER +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/METADATA +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/RECORD +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/REQUESTED +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/WHEEL +/usr/local/lib/python3.13/site-packages/smartypants-2.0.1.dist-info/metadata.json +/usr/local/lib/python3.13/site-packages/smartypants.py diff --git a/packages/librsvg.rb b/packages/librsvg.rb index e73c8b218..ad11fab54 100644 --- a/packages/librsvg.rb +++ b/packages/librsvg.rb @@ -1,9 +1,9 @@ -require 'buildsystems/autotools' +require 'buildsystems/meson' -class Librsvg < Autotools +class Librsvg < Meson description 'SVG library for GNOME' homepage 'https://wiki.gnome.org/Projects/LibRsvg' - version "2.58.2-#{CREW_ICU_VER}" + version "2.59.2-#{CREW_ICU_VER}" license 'LGPL-2+' compatibility 'aarch64 armv7l x86_64' source_url 'https://gitlab.gnome.org/GNOME/librsvg.git' @@ -11,12 +11,14 @@ class Librsvg < Autotools binary_compression 'tar.zst' binary_sha256({ - aarch64: '59dafc0bb05dafb25e81da2aad87b9f37f4da703503fac40efdcc4667937f018', - armv7l: '59dafc0bb05dafb25e81da2aad87b9f37f4da703503fac40efdcc4667937f018', - x86_64: '5301c32f54d047e3684bbd9b1aa3bb4555c700397ad129928112a8eeb7966736' + aarch64: '849b834e2d40a895894ca474876a96082c80178f535c96f2511a9e14c6c04fb8', + armv7l: '849b834e2d40a895894ca474876a96082c80178f535c96f2511a9e14c6c04fb8', + x86_64: '53c9762b60acf8558deced395176830befcf97976f5c8a6f697fa2e98babcc1c' }) depends_on 'cairo' # R + depends_on 'cargo_c' => :build + depends_on 'dav1d' # R depends_on 'expat' # R depends_on 'fontconfig' # R depends_on 'freetype' # R @@ -33,6 +35,7 @@ class Librsvg < Autotools depends_on 'libpng' # R depends_on 'libxml2' # R depends_on 'pango' # R + depends_on 'py3_meson' => :build depends_on 'py3_six' => :build depends_on 'py3_smartypants' => :build depends_on 'rust' => :build @@ -41,7 +44,14 @@ class Librsvg < Autotools gnome - configure_options '--enable-introspection=yes \ - --enable-vala=yes \ - --enable-pixbuf-loader' + ENV['CARGO_PROFILE_RELEASE_LTO'] = 'true' + + meson_options '-Dintrospection=enabled -Dvala=enabled' + + def self.patch + # As per https://gitlab.gnome.org/GNOME/librsvg/-/issues/1155#note_2356939 + # using the change that was merged into 2.59.90. + downloader 'https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1066.diff', '16b588b770066c983862a7b4e6cb5aa721f62a9b35b376ea8ea15a30dd2328c5' + system 'patch -Np1 -i 1066.diff' + end end diff --git a/packages/python3.rb b/packages/python3.rb index 3b5dd6818..73d7eff79 100644 --- a/packages/python3.rb +++ b/packages/python3.rb @@ -46,7 +46,7 @@ class Python3 < Package # https://github.com/python/cpython/issues/125117 # See https://github.com/python/cpython/issues/81765 system "sed -i '/test_sqlite3/d' Lib/test/libregrtest/pgo.py" unless %w[aarch64 armv7l].include?(ARCH) - # issue wirh sqlite3 3.49.x see https://github.com/python/cpython/issues/129870 + # Work around issue with sqlite3 3.49.x. See https://github.com/python/cpython/issues/129870 downloader 'https://github.com/python/cpython/commit/d26c2fe7a2833606b3fb8d9789149d8696978d86.diff', '4483a8b381254db3627889e7914bd167d8a7bbf7521217e6202103b58d3e5f33' system 'patch -Np1 -i d26c2fe7a2833606b3fb8d9789149d8696978d86.diff' end