From: Benjamin Otte <otte@redhat.com>
Date: Tue, 9 Nov 2021 19:28:53 +0000 (+0100)
Subject: gtk-demo: Don't use deprecated librsvg API
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~5^2~156^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=061026f21f61882441f28d6797565a181671e7a9;p=gtk4.git

gtk-demo: Don't use deprecated librsvg API

New API requires a newer librsvg version, so require that one.
---

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 2248b60b19..94f2f45415 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -140,7 +140,7 @@ if os_unix
   demos += files('pagesetup.c')
 endif
 
-librsvg_dep = dependency('librsvg-2.0', version: '>= 2.46.0', required: false)
+librsvg_dep = dependency('librsvg-2.0', version: '>= 2.52.0', required: false)
 
 if librsvg_dep.found()
   demos += files('paintable_svg.c')
diff --git a/demos/gtk-demo/svgpaintable.c b/demos/gtk-demo/svgpaintable.c
index 21879ed0d9..2779ac63e6 100644
--- a/demos/gtk-demo/svgpaintable.c
+++ b/demos/gtk-demo/svgpaintable.c
@@ -47,22 +47,24 @@ static int
 svg_paintable_get_intrinsic_width (GdkPaintable *paintable)
 {
   SvgPaintable *self = SVG_PAINTABLE (paintable);
-  RsvgDimensionData data;
+  double width;
 
-  rsvg_handle_get_dimensions (self->handle, &data);
+  if (!rsvg_handle_get_intrinsic_size_in_pixels (self->handle, &width, NULL))
+    return 0;
 
-  return data.width;
+  return ceil (width);
 }
 
 static int
 svg_paintable_get_intrinsic_height (GdkPaintable *paintable)
 {
   SvgPaintable *self = SVG_PAINTABLE (paintable);
-  RsvgDimensionData data;
+  double height;
 
-  rsvg_handle_get_dimensions (self->handle, &data);
+  if (!rsvg_handle_get_intrinsic_size_in_pixels (self->handle, NULL, &height))
+    return 0;
 
-  return data.height;
+  return ceil (height);
 }
 
 static void