[patch] gimp-2.99_revert_for_librvg-2.40.21.patch

gimp-2.99_revert_for_librvg-2.40.21.patch (text/plain), 2.01 KB, created by Sergey Torokhov on 2024-03-02 22:45:06 UTC

Gentoo issue: https://bugs.gentoo.org/920531

This patch is proposed by Francois Chenier <[e-mail]>
and is revert compilation of upstream patches to build >gimp-2.99.10
against =gnome-base/librsvg-2.40.21:
https://gitlab.gnome.org/GNOME/gimp/-/commit/8e32da988928f89bd5c4a2756267090c3d854a2a
https://gitlab.gnome.org/GNOME/gimp/-/commit/41b47d1dde16a74e003f6b4a69647c55025fece7

--- gimp-2.99.16/tools/colorsvg2png.c.old	2023-07-06 00:00:47.000000000 +1000
+++ gimp-2.99.16/tools/colorsvg2png.c	2023-12-22 21:40:37.708428011 +1000
@@ -25,12 +25,11 @@
   RsvgHandle        *handle;
   cairo_surface_t   *surface;
   cairo_t           *cr;
-  RsvgRectangle      target_rect;
+  RsvgDimensionData  original_dim;
 
   gchar             *input;
   gchar             *output;
   gint               dim;
-  gint               retval = 0;
 
   if (argc != 4)
     {
@@ -59,30 +58,28 @@
 
   surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, dim, dim);
   cr = cairo_create (surface);
+  rsvg_handle_get_dimensions (handle, &original_dim);
+  cairo_surface_destroy (surface);
+  cairo_scale (cr,
+               (gdouble) dim / (gdouble) original_dim.width,
+               (gdouble) dim / (gdouble) original_dim.height);
 
-  target_rect.x = target_rect.y = 0;
-  target_rect.width = target_rect.height = dim;
-
-  if (! rsvg_handle_render_document (handle, cr, &target_rect, NULL))
+  if (! rsvg_handle_render_cairo (handle, cr))
     {
       g_fprintf (stderr,
                  "Error: failed to render '%s'\n",
                  input);
-      retval = 1;
+      return 1;
     }
 
-  if (retval == 0 &&
-      cairo_surface_write_to_png (surface, output) != CAIRO_STATUS_SUCCESS)
+  if (cairo_surface_write_to_png (surface, output) != CAIRO_STATUS_SUCCESS)
     {
       g_fprintf (stderr,
                  "Error: failed to write '%s'\n",
                  output);
-      retval = 1;
+      return 1;
     }
-
-  cairo_surface_destroy (surface);
   cairo_destroy (cr);
-  g_object_unref (handle);
 
-  return retval;
+  return 0;
 }