diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2024-06-07 23:18:07 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2024-06-07 23:18:07 +0200 |
| commit | e958955640c4825c9ade717e86ccb351a0a572c6 (patch) | |
| tree | 94b140dd36dbd71e02b83561296fa01b8ef9ea43 /external | |
| parent | af7e419831af2d33fca759e56bf603ae08a6b44a (diff) | |
| parent | 51a6219feb6075d9a4c46691dcfe0cd9c4fff3c2 (diff) | |
Merge tag 'libreoffice-24.2.4.2' into HEAD
Tag libreoffice-24.2.4.2
Change-Id: Ic8eb6fa69fd24d643e67cda579025a295a5f49b0
Diffstat (limited to 'external')
| -rw-r--r-- | external/cairo/cairo/cairo.GL_RGBA.patch | 60 | ||||
| -rw-r--r-- | external/onlineupdate/lo.patch | 8 |
2 files changed, 67 insertions, 1 deletions
diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch index 648448e9de92..bad6a81ed541 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 35dfb2f80fb8..571cea560d3c 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 |