From 9c0049cfae49c8e4ddef9125a69db2ad134c10c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 7 Jun 2024 13:48:25 +0200
Subject: Merging upstream version 4:24.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 external/cairo/cairo/cairo.GL_RGBA.patch | 60 ++++++++++++++++++++++++++++++++
 external/onlineupdate/lo.patch           |  8 ++++-
 2 files changed, 67 insertions(+), 1 deletion(-)

(limited to 'external')

diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch
index 648448e9de..bad6a81ed5 100644
--- a/external/cairo/cairo/cairo.GL_RGBA.patch
+++ b/external/cairo/cairo/cairo.GL_RGBA.patch
@@ -58,3 +58,63 @@
  	break;
      }
      return ret;
+--- misc/cairo-1.10.2/src/cairo-ft-font.c
++++ misc/cairo-1.10.2/src/cairo-ft-font.c
+@@ -1318,6 +1321,19 @@
+ 	    memcpy (data, bitmap->buffer, (size_t)stride * height);
+ 	}
+ 
++	{
++	    /* swizzle to rgba */
++	    unsigned int i, count = height * width;
++	    unsigned char *p = data;
++	    for (i = 0; i < count; i++)
++	    {
++		unsigned char tmp = p[0];
++		p[0] = p[2];
++		p[2] = tmp;
++		p+=4;
++	    }
++	}
++
+ 	if (!_cairo_is_little_endian ())
+ 	{
+ 	    /* Byteswap. */
+@@ -2573,7 +2589,7 @@
+     if (unlikely (status))
+ 	return status;
+ 
+-    if (pixman_image_get_format (surface->pixman_image) == PIXMAN_a8r8g8b8 &&
++    if (pixman_image_get_format (surface->pixman_image) == PIXMAN_a8b8g8r8 &&
+ 	!pixman_image_get_component_alpha (surface->pixman_image)) {
+ 	_cairo_scaled_glyph_set_color_surface (scaled_glyph,
+ 					       &scaled_font->base,
+--- misc/cairo-1.10.2/src/cairo-image-compositor.c
++++ misc/cairo-1.10.2/src/cairo-image-compositor.c
+@@ -1074,7 +1074,7 @@
+     format = PIXMAN_a8;
+     i = (info->extents.width + 3) & ~3;
+     if (scaled_glyph->surface->base.content & CAIRO_CONTENT_COLOR) {
+-	format = PIXMAN_a8r8g8b8;
++	format = PIXMAN_a8b8g8r8;
+ 	i = info->extents.width * 4;
+     }
+ 
+@@ -1126,7 +1126,7 @@
+ 		format == PIXMAN_a8) {
+ 		pixman_image_t *ca_mask;
+ 
+-		format = PIXMAN_a8r8g8b8;
++		format = PIXMAN_a8b8g8r8;
+ 		ca_mask = pixman_image_create_bits (format,
+ 						    info->extents.width,
+ 						    info->extents.height,
+@@ -1175,7 +1175,7 @@
+ 	}
+     }
+ 
+-    if (format == PIXMAN_a8r8g8b8)
++    if (format == PIXMAN_a8b8g8r8)
+ 	pixman_image_set_component_alpha (mask, TRUE);
+ 
+     pixman_image_composite32 (_pixman_operator (op),
diff --git a/external/onlineupdate/lo.patch b/external/onlineupdate/lo.patch
index 35dfb2f80f..571cea560d 100644
--- a/external/onlineupdate/lo.patch
+++ b/external/onlineupdate/lo.patch
@@ -372,7 +372,13 @@
        fi
      fi
    else
-@@ -270,7 +270,7 @@
+@@ -266,11 +266,12 @@
+   if check_for_add_if_not_update "$f"; then
+     make_add_if_not_instruction "$f" "$updatemanifestv3"
+   else
+-    make_add_instruction "$f" "$updatemanifestv3"
++    verbose_notice "     add \"$f\""
++    echo "add \"$f\"" >> "$updatemanifestv3"
    fi
  
  
-- 
cgit v1.2.3