From 0f49cc2518219de8d603ef1f696f5f5cecd1d8f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Thu, 20 Oct 2022 19:35:24 -0300 Subject: [PATCH] recipes: libs/librsvg: Upgraded to version 2.54.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Fonzo --- patches/librsvg/10_rsvg-gz.patch | 20 - patches/librsvg/hide-private-symbol.patch | 11 - patches/librsvg/remove-tests.patch | 1075 ----------------------------- recipes/libs/librsvg/recipe | 14 +- sources/SOURCELIST.txt | 2 +- sources/librsvg-2.40.21.tar.xz.sha256 | 1 - sources/librsvg-2.54.5.tar.xz.sha256 | 1 + 7 files changed, 8 insertions(+), 1116 deletions(-) delete mode 100644 patches/librsvg/10_rsvg-gz.patch delete mode 100644 patches/librsvg/hide-private-symbol.patch delete mode 100644 patches/librsvg/remove-tests.patch delete mode 100644 sources/librsvg-2.40.21.tar.xz.sha256 create mode 100644 sources/librsvg-2.54.5.tar.xz.sha256 diff --git a/patches/librsvg/10_rsvg-gz.patch b/patches/librsvg/10_rsvg-gz.patch deleted file mode 100644 index d5a15db0..00000000 --- a/patches/librsvg/10_rsvg-gz.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Revert ABI breakage - Provide the rsvg_handle_new_gz function. - Do not provide the C prototype to force - applications using it to use rsvg_handle_new instead. -Author: Josselin Mouette -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=348920 -Index: librsvg-2.40.0/rsvg-gobject.c -=================================================================== ---- librsvg-2.40.0.orig/rsvg-gobject.c 2013-10-14 23:15:46.004777056 +0200 -+++ librsvg-2.40.0/rsvg-gobject.c 2013-10-14 23:15:46.004777056 +0200 -@@ -377,3 +377,9 @@ - "flags", flags, - NULL); - } -+ -+RsvgHandle * -+rsvg_handle_new_gz (void) -+{ -+ return rsvg_handle_new (); -+} diff --git a/patches/librsvg/hide-private-symbol.patch b/patches/librsvg/hide-private-symbol.patch deleted file mode 100644 index b1cc657c..00000000 --- a/patches/librsvg/hide-private-symbol.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/rsvg-base.c -+++ b/rsvg-base.c -@@ -2203,7 +2203,7 @@ rsvg_push_discrete_layer (RsvgDrawingCtx - ctx->render->push_discrete_layer (ctx); - } - --void -+static void - rsvg_drawing_ctx_increase_num_elements_acquired (RsvgDrawingCtx *draw_ctx) - { - draw_ctx->num_elements_acquired++; diff --git a/patches/librsvg/remove-tests.patch b/patches/librsvg/remove-tests.patch deleted file mode 100644 index 9b4a48e6..00000000 --- a/patches/librsvg/remove-tests.patch +++ /dev/null @@ -1,1075 +0,0 @@ ---- a/tests/fixtures/reftests/svg1.1/masking-intro-01-f.svg -+++ /dev/null -@@ -1,81 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- --

-- The rules are different regarding the geometry of a shape when clipping and masking. -- For example, a clip-path does not take into account the stroke of the shape used for clipping. -- It is however, used when masking. --

-- -- --

-- Run the test. No interaction required. --

-- -- --

-- The test is passed if there are two identical darkblue circles at the top of the illustration, and -- below those two circles, two more circles should appear. They are of lighter appearance, -- the one on the left has a darker and thick stroke. --

-- -- -- $RCSfile: masking-intro-01-f.svg,v $ -- -- -- -- -- -- -- -- -- -- masking-mask-04-f.svg -- Tests the impact of strokes within clipPath and mask -- Testing stroke inclusion for 'clip-path' and 'mask' -- -- -- -- -- -- -- -- -- -- With a 'clip-path': -- -- -- -- -- -- -- -- -- -- With a 'mask': -- -- -- -- $Revision: 1.6 $ -- -- -- -- -- ---- a/tests/fixtures/reftests/svg1.1/masking-mask-01-b.svg -+++ /dev/null -@@ -1,131 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- --

-- Test to see if the masking features using the mask element and mask -- property are available. --

--

-- A red rectangle is displayed in the background to help view the result -- of transparency and masking. --

--

-- From top to bottom, the tests are as follows. --

--

-- In the top test, a linear gradient is used inside the mask to change the opacity -- of the rectangle from 1.0 (at the top) to 0.5 (at the bottom). --

--

-- In the second test, a simple 50% opaque rectangle is used as a mask. --

--

-- In the third test, no mask is used, but a rectangle is shown with 50% opacity. -- The second and third test should look the same. --

--

-- Lastly, a string of text has a mask applied to it. The mask only covers a partial -- area of the text, so the text should only be half visible. Also the mask consists -- of 4 rectangles with various levels of opacity. --

-- -- --

-- Run the test. No interaction required. --

-- -- --

-- The rendered picture should match the reference image, except -- variations are possible in the labelling text (per CSS2 rules). --

-- -- -- $RCSfile: masking-mask-01-b.svg,v $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Test for mask support -- -- -- -- -- -- -- -- -- -- -- -- -- -- Mask with linear gradient from -- opacity=1 to opactity=0.5 -- -- -- -- -- -- Mask with uniform opacity of 0.5 -- -- -- Rectangle with uniform opacity of 0.5 -- -- -- -- -- -- -- -- SVG -- Text with mask containing rectangles -- of various opacities -- -- -- -- $Revision: 1.8 $ -- -- -- -- -- ---- a/tests/fixtures/reftests/svg1.1/masking-mask-02-f.svg -+++ /dev/null -@@ -1,50 +0,0 @@ -- -- -- -- -- -- -- -- -- -- --

-- If the 'mask' property references a 'mask' element containing no children, the element referencing it is not rendered. --

-- -- --

Run the test. No interaction required.

-- -- --

-- Test passes if there is a single green rectangle, with no red visible on the page. --

-- -- -- $RCSfile: masking-mask-02-f.svg,v $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- $Revision: 1.3 $ -- -- -- -- -\ No newline at end of file ---- a/tests/fixtures/reftests/svg1.1/masking-opacity-01-b.svg -+++ /dev/null -@@ -1,125 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- --

-- Test to see the effect of applying an opacity property to a group. --

--

-- A blue rectangle with a green rectangle on top are contained in a -- group. This opacity of the group and the opacity of the rectangles are -- changed in this test. A red rectangle is provided in the background so -- that opacity changes are obvious visually. --

--

-- From top to bottom, the tests are as follows. --

--

-- In the top test, the opacities of the group and the individual rectangles are -- all set to 1. --

--

-- In the second test, the group is given an opacity of 0.5. --

--

-- In the third test, the group maintains a group opacity of 1 whereas each individual -- rectangle is given an opacity of 0.5 in the group. --

--

-- Lastly, the group and individual rectangles are all given an opacity of 0.5. --

-- -- -- -- --

-- Run the test. No interaction required. --

-- -- --

-- In the top test, the green rectangle should appear on top of the blue -- rectangle. --

--

-- In the second test, the blue -- rectangle should not show through in the region where the green and blue overlap. --

--

-- In the third test, the blue rectangle -- should show through in the overlap region. --

--

-- Lastly, the -- result should be similar to the previous test only fainter (because the opacity) is -- resulting in less contribution. --

--

-- The rendered picture should match the reference image exactly, except for possible -- variations in the labelling text (per CSS2 rules). --

-- -- -- $RCSfile: masking-opacity-01-b.svg,v $ -- -- -- -- -- -- -- -- -- Test for opacity property on a group. -- -- -- -- -- -- Group opacity: 1 -- Blue rectangle opacity: 1 -- Green rectangle opacity: 1 -- -- -- -- -- Group opacity: 0.5 -- Blue rectangle opacity: 1 -- Green rectangle opacity: 1 -- -- -- -- -- Group opacity: 1 -- Blue rectangle opacity: 0.5 -- Green rectangle opacity: 0.5 -- -- -- -- -- Group opacity: 0.5 -- Blue rectangle opacity: 0.5 -- Green rectangle opacity: 0.5 -- -- -- $Revision: 1.6 $ -- -- -- -- -- ---- a/tests/fixtures/reftests/svg1.1/masking-path-01-b.svg -+++ /dev/null -@@ -1,95 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- --

-- Test to see if the basic clipping works using the clipPath element -- and the clip-path property. --

--

-- This test uses the following elements : <clipPath> and the following -- properties : clip-path. --

-- -- --

-- Run the test. No interaction required. --

-- -- --

-- The test at the top shows an orange rectangle (with black stroke) being clipped by another rectangle. -- So only the middle portion of the orange rectangle should be visible. Also the black stroke should -- only be visible along the top and bottom edge of the rectangle. --

--

-- The example at the bottom has a group containing a text string and two rectangles. The group -- has a clipping path defined using two overlapping rectangles. Of concern is the overlapping area -- shared by the two rectangles. There should not be holes in this overlapping area, the -- clip region is the union of the two rectangles. For clarity, -- guide rectangles in grey show the position of the clipping rectangles. --

--

-- The rendered picture should match the reference image exactly, except for possible -- variations in the labelling text (per CSS2 rules). --

-- -- -- $RCSfile: masking-path-01-b.svg,v $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- Rectangle being clipped -- -- -- -- Line of text to be clipped -- -- Group being clipped -- -- -- -- -- -- -- -- -- $Revision: 1.7 $ -- -- -- -- -- ---- a/tests/fixtures/reftests/svg1.1/masking-path-02-b.svg -+++ /dev/null -@@ -1,84 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- --

-- Test to see if clipPathUnits attribute is handled properly on a -- clipPath element. Only tests the userSpaceOnUse and -- objectBoundingBox items of the clipPathUnits. userSpace has been -- tested by the previous test as it is the default. --

--

-- The test at the top shows a pink rectangle that has been clipped by a -- rectangular clipping path. The clipping path is defined using clipPathUnits=objectBoundingBox. -- --

--

-- The example at the bottom a rotated blue rectangle that has been clipped by a -- rectangular clipping path. The clipping path is defined using clipPathUnits=userSpaceOnUse. -- --

--

-- The rendered picture should match the reference image exactly, except for possible -- variations in the labelling text (per CSS2 rules). --

-- -- --

-- Run the test. No interaction required. --

-- -- --

-- The test passes if the pink rectangle and blue diamond do not have any -- color painted outside of their black borders. --

-- -- -- $RCSfile: masking-path-02-b.svg,v $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- clipPathUnits=objectBoundingBox -- -- -- -- -- -- clipPathUnits=userSpaceOnUse -- -- -- -- $Revision: 1.8 $ -- -- -- -- -- ---- a/tests/fixtures/reftests/svg1.1/masking-path-03-b.svg -+++ /dev/null -@@ -1,134 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- --

-- Test 'overflow'/'clip' on outermost and inner 'svg' elements. --

--

-- There are two parts to the test. The first part tests viewport clipping -- on outermost 'svg' elements. The second part tests viewport clipping -- on inner 'svg' elements. --

--

-- The test case also tests the initial value of the 'overflow' property -- to ensure that it is set to 'hidden' for all 'svg' elements. -- Tester should zoom out and/or pan to check this. --

--

-- To test clipping to the outermost 'svg' element, -- a rectangle with a light blue interior, a light red border and a black -- string that says "Clip to outer 'svg'" is painted four times such that -- it will overflow each of the top, left, right and bottom -- sides of the bounds of the outermost 'svg' element, respectively. --

--

-- To test clipping to inner 'svg' elements, a rectangle with a light red -- interior, a light blue border and a black string that says "Clip to -- inner 'svg'" is painted four times such that it will overflow each of -- the top, left, right and bottom sides of the bounds of an inner 'svg' -- element, respectively. --

--

-- Note that minor text layout differences, as are permissible under CSS2 -- rules, can lead to slightly different visual results regarding where -- the text strings get clipped. --

-- -- --

-- Run the test. No interaction required. --

-- -- --

The test passes if:

--
    --
  • The four "Outer Clip" boxed strings must not render outside the -- outermost 'svg' element (the 480x360 rectangular viewport) and -- must continue to be clipped to this viewport if the image is zoomed in or out, -- or panned.
    • --
  • The four "Inner Clip" boxed strings must not render outside the -- bounds of the green rectangle.
    • --
-- -- -- $RCSfile: masking-path-03-b.svg,v $ -- -- -- -- -- -- -- -- -- -- -- Test 'overflow'/'clip' on outermost and inner 'svg' elements -- -- -- -- -- Outer Clip -- -- -- -- Outer Clip -- -- -- -- Outer Clip -- -- -- -- Outer Clip -- -- -- -- -- -- -- -- -- Inner Clip -- -- -- -- Inner Clip -- -- -- -- Inner Clip -- -- -- -- Inner Clip -- -- -- -- -- -- -- $Revision: 1.7 $ -- -- -- -- -- ---- a/tests/fixtures/reftests/svg1.1/masking-path-04-b.svg -+++ /dev/null -@@ -1,79 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- --

-- This test exercises basic user-specified clip paths, using a text -- string (i.e., content of a 'text' element) as the clip path. --

--

-- There is a rectangular image of a swirly blue pattern with large -- yellow text, "Clip Test" superimposed. The image is a PNG file, -- imported into the picture via the 'image' element. --

--

-- The test uses the 'rect' element, as well as basic fill (solid primary -- colors), stroke (black 1-pixel lines), font-family (Arial and -- Impact) and font-size properties. --

-- -- --

-- Run the test. No interaction required. --

-- -- --

-- The rendered picture should match the reference image, except for -- possible variations in the labelling text (per CSS2 rules). --

-- -- -- $RCSfile: masking-path-04-b.svg,v $ -- -- -- -- -- -- -- -- -- -- -- -- Clip Test -- -- -- -- -- -- Clip Test -- -- -- -- -- -- -- -- $Revision: 1.5 $ -- -- -- -- -- ---- a/tests/fixtures/reftests/svg1.1/struct-cond-03-t.svg -+++ /dev/null -@@ -1,83 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- --

-- Tests the <switch> element with requiredFeatures. --

-- -- --

-- Run the test. No interaction required. --

-- -- --

-- On the bottom half of the test, there is a first switch. -- Because SVG Tiny does not support DOM, an SVG Tiny implementation -- which does not support other SVG Profiles should show a green -- rectangle. If the application supports the DOM, meaning that -- it does more than just SVG Tiny, it should show a turquoise rectangle. --

--

-- On the bottom half of the test, there is another switch. -- The first child has a requiredFeatures set to -- http://www.w3.org/TR/SVG11/feature#BasicText which all -- SVG Tiny implementations should support. If the application -- does, another green rectangle is displayed. Otherwise, -- a red rectangle shows. --

-- -- -- $RCSfile: struct-cond-03-t.svg,v $ -- -- -- -- -- -- -- -- -- -- -- -- This viewer does more than SVG Tiny -- -- -- -- -- -- -- -- -- -- -- -- -- This is not an SVG Tiny Viewer -- -- -- -- -- $Revision: 1.7 $ -- -- -- -- -- ---- a/tests/fixtures/reftests/bugs/340047.svg -+++ /dev/null -@@ -1,43 +0,0 @@ -- -- -- -- -- -- -- -- -- e = mc -- -- 2 -- -- -- -- T -- -- i+2 -- -- =T -- -- i -- -- + T -- -- i+1 -- -- -- -- -- ---- a/tests/fixtures/reftests/bugs/587721-text-transform.svg -+++ /dev/null -@@ -1,13 +0,0 @@ -- -- -- -- -- -- Frenchtown -- -- -- ---- a/tests/fixtures/reftests/bugs/749415.svg -+++ /dev/null -@@ -1,38 +0,0 @@ -- -- -- -- -- -- 1 -- 6 -- 5 -- 4 -- 3 -- 2 -- -- -- -- -- Tip mass 0.5 kg -- -- Liquid crystal device -- -- Membrane 7.5 um thick -- -- Solar cells 25 um thick -- -- -- -- -- Tethers -- -- -- -- -- -- Main body -- Instruments -- 7 -- -- -- -\ No newline at end of file ---- a/tests/fixtures/reftests/bugs/777834-empty-text-children.svg -+++ /dev/null -@@ -1,78 +0,0 @@ -- -- --]> -- -- -- -- -- -- -- -- -- -- -- -- --Hello World! -- -- -- --Hello World! -- -- -- --Hello World! -- -- diff --git a/recipes/libs/librsvg/recipe b/recipes/libs/librsvg/recipe index 393fb94f..75b3bf54 100644 --- a/recipes/libs/librsvg/recipe +++ b/recipes/libs/librsvg/recipe @@ -19,7 +19,7 @@ set -e program=librsvg -version=2.40.21 +version=2.54.5 release=1 # Define a category for the output of the package name @@ -41,7 +41,7 @@ homepage=https://wiki.gnome.org/Projects/LibRsvg license="GPLv2+, LGPLv2+" # Source documentation -docs="AUTHORS COPYING* NEWS README" +docs="AUTHORS CONTRIBUTING.md COPYING* NEWS README.md code-of-conduct.md" docsdir="${docdir}/${program}-${version}" build() @@ -50,16 +50,12 @@ build() cd "$srcdir" - # Apply patches from Debian (Thanks!) - patch -Np1 -i "${worktree}/patches/librsvg/10_rsvg-gz.patch" - patch -Np1 -i "${worktree}/patches/librsvg/remove-tests.patch" - patch -Np1 -i "${worktree}/patches/librsvg/hide-private-symbol.patch" - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" \ LDFLAGS="$QILDFLAGS -Wl,--no-keep-memory,-z,defs -Wl,-O1 -Wl,--as-needed" \ $configure_args \ - --mandir=$mandir \ --libdir=/usr/lib${libSuffix} \ + --mandir=$mandir \ + --docdir=$docsdir \ --enable-static=no \ --enable-shared=yes \ --enable-pixbuf-loader \ @@ -88,5 +84,7 @@ build() # Copy documentation mkdir -p "${destdir}/$docsdir" cp -p $docs "${destdir}/$docsdir" + rm "${destdir}/${docsdir}"/COMPILING.md; # Unnecessary here. + } diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt index c9fa04a3..b551fc94 100644 --- a/sources/SOURCELIST.txt +++ b/sources/SOURCELIST.txt @@ -79,7 +79,7 @@ https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.33.tar.xz https://download.gnome.org/sources/json-glib/1.6/json-glib-1.6.6.tar.xz https://download.gnome.org/sources/libglade/2.6/libglade-2.6.4.tar.bz2 https://download.gnome.org/sources/libgudev/237/libgudev-237.tar.xz -https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.21.tar.xz +https://download.gnome.org/sources/librsvg/2.54/librsvg-2.54.5.tar.xz https://download.gnome.org/sources/libwnck/3.36/libwnck-3.36.0.tar.xz https://download.gnome.org/sources/pango/1.50/pango-1.50.3.tar.xz https://download.gnome.org/sources/vala/0.54/vala-0.54.6.tar.xz diff --git a/sources/librsvg-2.40.21.tar.xz.sha256 b/sources/librsvg-2.40.21.tar.xz.sha256 deleted file mode 100644 index 059a637f..00000000 --- a/sources/librsvg-2.40.21.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -f7628905f1cada84e87e2b14883ed57d8094dca3281d5bcb24ece4279e9a92ba librsvg-2.40.21.tar.xz diff --git a/sources/librsvg-2.54.5.tar.xz.sha256 b/sources/librsvg-2.54.5.tar.xz.sha256 new file mode 100644 index 00000000..d6eeb027 --- /dev/null +++ b/sources/librsvg-2.54.5.tar.xz.sha256 @@ -0,0 +1 @@ +4f03190f45324d1fa1f52a79dfcded1f64eaf49b3ae2f88eedab0c07617cae6e librsvg-2.54.5.tar.xz -- 2.11.4.GIT