* [PR PATCH] cairo: update to 1.18.0.
@ 2023-10-01 19:42 mhmdanas
2023-10-10 22:12 ` chrysos349
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: mhmdanas @ 2023-10-01 19:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1402 bytes --]
There is a new pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cairo-1.18.0
https://github.com/void-linux/void-packages/pull/46356
cairo: update to 1.18.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Cross is failing because of https://gitlab.freedesktop.org/cairo/cairo/-/issues/613, which can be worked around by modifying meson's crossfile, but I'm not sure how to do that.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cairo-1.18.0-46356.patch --]
[-- Type: text/x-diff, Size: 7913 bytes --]
From 8c891d5229004b320c16bdc3040e2e015d768140 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Sun, 1 Oct 2023 20:34:20 +0100
Subject: [PATCH] cairo: update to 1.18.0.
---
srcpkgs/cairo/patches/CVE-2018-19876.patch | 29 ------------
srcpkgs/cairo/patches/freetype.patch | 55 ----------------------
srcpkgs/cairo/patches/memory-leak.patch | 55 ----------------------
srcpkgs/cairo/template | 33 ++++---------
4 files changed, 9 insertions(+), 163 deletions(-)
delete mode 100644 srcpkgs/cairo/patches/CVE-2018-19876.patch
delete mode 100644 srcpkgs/cairo/patches/freetype.patch
delete mode 100644 srcpkgs/cairo/patches/memory-leak.patch
diff --git a/srcpkgs/cairo/patches/CVE-2018-19876.patch b/srcpkgs/cairo/patches/CVE-2018-19876.patch
deleted file mode 100644
index 94be1992d9f22..0000000000000
--- a/srcpkgs/cairo/patches/CVE-2018-19876.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Mon, 19 Nov 2018 12:33:07 +0100
-Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
- cairo_ft_apply_variations
-
-Fixes a crash when using freetype >= 2.9
----
- src/cairo-ft-font.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 325dd61b4..981973f78 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -2393,7 +2393,11 @@ skip:
- done:
- free (coords);
- free (current_coords);
-+#if HAVE_FT_DONE_MM_VAR
-+ FT_Done_MM_Var (face->glyph->library, ft_mm_var);
-+#else
- free (ft_mm_var);
-+#endif
- }
- }
-
---
-2.18.1
diff --git a/srcpkgs/cairo/patches/freetype.patch b/srcpkgs/cairo/patches/freetype.patch
deleted file mode 100644
index a97daffa9da52..0000000000000
--- a/srcpkgs/cairo/patches/freetype.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 12a5b7384f35d9a3f4c6b151fac4857444db3d6a Mon Sep 17 00:00:00 2001
-From: Nikolaus Waxweiler <madigens@gmail.com>
-Date: Sat, 10 Nov 2018 16:44:23 +0000
-Subject: [PATCH] Set default LCD filter to FreeType's default
-
----
- src/cairo-ft-font.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 325dd61b4..3c47dc12e 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -1404,7 +1404,7 @@ _render_glyph_outline (FT_Face face,
- cairo_image_surface_t **surface)
- {
- int rgba = FC_RGBA_UNKNOWN;
-- int lcd_filter = FT_LCD_FILTER_LEGACY;
-+ int lcd_filter = FT_LCD_FILTER_DEFAULT;
- FT_GlyphSlot glyphslot = face->glyph;
- FT_Outline *outline = &glyphslot->outline;
- FT_Bitmap bitmap;
-@@ -1439,13 +1439,13 @@ _render_glyph_outline (FT_Face face,
- case CAIRO_LCD_FILTER_NONE:
- lcd_filter = FT_LCD_FILTER_NONE;
- break;
-- case CAIRO_LCD_FILTER_DEFAULT:
- case CAIRO_LCD_FILTER_INTRA_PIXEL:
- lcd_filter = FT_LCD_FILTER_LEGACY;
- break;
- case CAIRO_LCD_FILTER_FIR3:
- lcd_filter = FT_LCD_FILTER_LIGHT;
- break;
-+ case CAIRO_LCD_FILTER_DEFAULT:
- case CAIRO_LCD_FILTER_FIR5:
- lcd_filter = FT_LCD_FILTER_DEFAULT;
- break;
-@@ -3416,7 +3416,6 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
- case CAIRO_LCD_FILTER_NONE:
- lcd_filter = FT_LCD_FILTER_NONE;
- break;
-- case CAIRO_LCD_FILTER_DEFAULT:
- case CAIRO_LCD_FILTER_INTRA_PIXEL:
- lcd_filter = FT_LCD_FILTER_LEGACY;
- break;
-@@ -3424,6 +3423,7 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
- lcd_filter = FT_LCD_FILTER_LIGHT;
- break;
- default:
-+ case CAIRO_LCD_FILTER_DEFAULT:
- case CAIRO_LCD_FILTER_FIR5:
- lcd_filter = FT_LCD_FILTER_DEFAULT;
- break;
---
-2.19.1
diff --git a/srcpkgs/cairo/patches/memory-leak.patch b/srcpkgs/cairo/patches/memory-leak.patch
deleted file mode 100644
index 589abeee91cd7..0000000000000
--- a/srcpkgs/cairo/patches/memory-leak.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 79ad01724161502e8d9d2bd384ff1f0174e5df6e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 30 May 2019 07:30:55 -0400
-Subject: [PATCH] Fix a thinko in composite_color_glyphs
-
-We can't just move around the contents of the
-passed-in string, we need to make a copy. This
-was showing up as memory corruption in pango.
-
-See https://gitlab.gnome.org/GNOME/pango/issues/346
----
- src/cairo-surface.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/cairo-surface.c b/src/cairo-surface.c
-index c30f84087..e112b660a 100644
---- a/src/cairo-surface.c
-+++ b/src/cairo-surface.c
-@@ -2820,6 +2820,7 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
- const cairo_clip_t *clip)
- {
- cairo_int_status_t status;
-+ char *utf8_copy = NULL;
-
- TRACE ((stderr, "%s\n", __FUNCTION__));
- if (unlikely (surface->status))
-@@ -2847,6 +2848,10 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
- status = CAIRO_INT_STATUS_UNSUPPORTED;
-
- if (_cairo_scaled_font_has_color_glyphs (scaled_font)) {
-+ utf8_copy = malloc (sizeof (char) * utf8_len);
-+ memcpy (utf8_copy, utf8, sizeof (char) * utf8_len);
-+ utf8 = utf8_copy;
-+
- status = composite_color_glyphs (surface, op,
- source,
- (char *)utf8, &utf8_len,
-@@ -2861,6 +2866,8 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
- if (num_glyphs == 0)
- goto DONE;
- }
-+ else
-+ utf8_copy = NULL;
-
- /* The logic here is duplicated in _cairo_analysis_surface show_glyphs and
- * show_text_glyphs. Keep in synch. */
-@@ -2918,6 +2925,9 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
- surface->serial++;
- }
-
-+ if (utf8_copy)
-+ free (utf8_copy);
-+
- return _cairo_surface_set_error (surface, status);
- }
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 3af5d9914cb29..194e1226571cc 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,41 +1,26 @@
# Template file for 'cairo'
pkgname=cairo
-version=1.16.0
-revision=2
-build_style=gnu-configure
-configure_args="--disable-static --enable-tee
- $(vopt_if opengl '--enable-gl --enable-egl')
- $(vopt_if gles2 '--enable-egl --enable-glesv2')"
+version=1.18.0
+revision=1
+build_style=meson
+# Tests get stuck.
+configure_args="-Dtests=disabled"
hostmakedepends="pkg-config"
makedepends="fontconfig-devel freetype-devel libglib-devel libpng-devel libX11-devel
- libxcb-devel libXext-devel libXrender-devel lzo-devel pixman-devel zlib-devel
- $(vopt_if opengl MesaLib-devel) $(vopt_if gles2 MesaLib-devel)"
+ libxcb-devel libXext-devel libXrender-devel lzo-devel pixman-devel zlib-devel"
short_desc="Vector graphics library with cross-device output support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://cairographics.org"
distfiles="https://cairographics.org/releases/cairo-${version}.tar.xz"
-checksum=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
-
-# Package build options
-build_options="gles2 opengl"
-
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc*) build_options_default+=" opengl";;
-esac
-
-do_check() {
- # tests get stuck at check-TESTS
- :
-}
+checksum=243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64
cairo-devel_package() {
- depends="${makedepends} cairo>=${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/share
vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: cairo: update to 1.18.0.
2023-10-01 19:42 [PR PATCH] cairo: update to 1.18.0 mhmdanas
@ 2023-10-10 22:12 ` chrysos349
2023-10-11 10:38 ` [PR PATCH] [Updated] " mhmdanas
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: chrysos349 @ 2023-10-10 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/46356#issuecomment-1756340371
Comment:
@mhmdanas
add `build_helper=qemu` in the template, and everything will compile.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] cairo: update to 1.18.0.
2023-10-01 19:42 [PR PATCH] cairo: update to 1.18.0 mhmdanas
2023-10-10 22:12 ` chrysos349
@ 2023-10-11 10:38 ` mhmdanas
2023-10-11 10:38 ` mhmdanas
2023-10-24 13:21 ` [PR PATCH] [Merged]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: mhmdanas @ 2023-10-11 10:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1407 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cairo-1.18.0
https://github.com/void-linux/void-packages/pull/46356
cairo: update to 1.18.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Cross is failing because of https://gitlab.freedesktop.org/cairo/cairo/-/issues/613, which can be worked around by modifying meson's crossfile, but I'm not sure how to do that.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cairo-1.18.0-46356.patch --]
[-- Type: text/x-diff, Size: 7935 bytes --]
From 38ac6f0a768f06299eeadf55d3df12b344af3a64 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Sun, 1 Oct 2023 20:34:20 +0100
Subject: [PATCH] cairo: update to 1.18.0.
---
srcpkgs/cairo/patches/CVE-2018-19876.patch | 29 ------------
srcpkgs/cairo/patches/freetype.patch | 55 ----------------------
srcpkgs/cairo/patches/memory-leak.patch | 55 ----------------------
srcpkgs/cairo/template | 34 ++++---------
4 files changed, 10 insertions(+), 163 deletions(-)
delete mode 100644 srcpkgs/cairo/patches/CVE-2018-19876.patch
delete mode 100644 srcpkgs/cairo/patches/freetype.patch
delete mode 100644 srcpkgs/cairo/patches/memory-leak.patch
diff --git a/srcpkgs/cairo/patches/CVE-2018-19876.patch b/srcpkgs/cairo/patches/CVE-2018-19876.patch
deleted file mode 100644
index 94be1992d9f22..0000000000000
--- a/srcpkgs/cairo/patches/CVE-2018-19876.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Mon, 19 Nov 2018 12:33:07 +0100
-Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
- cairo_ft_apply_variations
-
-Fixes a crash when using freetype >= 2.9
----
- src/cairo-ft-font.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 325dd61b4..981973f78 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -2393,7 +2393,11 @@ skip:
- done:
- free (coords);
- free (current_coords);
-+#if HAVE_FT_DONE_MM_VAR
-+ FT_Done_MM_Var (face->glyph->library, ft_mm_var);
-+#else
- free (ft_mm_var);
-+#endif
- }
- }
-
---
-2.18.1
diff --git a/srcpkgs/cairo/patches/freetype.patch b/srcpkgs/cairo/patches/freetype.patch
deleted file mode 100644
index a97daffa9da52..0000000000000
--- a/srcpkgs/cairo/patches/freetype.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 12a5b7384f35d9a3f4c6b151fac4857444db3d6a Mon Sep 17 00:00:00 2001
-From: Nikolaus Waxweiler <madigens@gmail.com>
-Date: Sat, 10 Nov 2018 16:44:23 +0000
-Subject: [PATCH] Set default LCD filter to FreeType's default
-
----
- src/cairo-ft-font.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 325dd61b4..3c47dc12e 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -1404,7 +1404,7 @@ _render_glyph_outline (FT_Face face,
- cairo_image_surface_t **surface)
- {
- int rgba = FC_RGBA_UNKNOWN;
-- int lcd_filter = FT_LCD_FILTER_LEGACY;
-+ int lcd_filter = FT_LCD_FILTER_DEFAULT;
- FT_GlyphSlot glyphslot = face->glyph;
- FT_Outline *outline = &glyphslot->outline;
- FT_Bitmap bitmap;
-@@ -1439,13 +1439,13 @@ _render_glyph_outline (FT_Face face,
- case CAIRO_LCD_FILTER_NONE:
- lcd_filter = FT_LCD_FILTER_NONE;
- break;
-- case CAIRO_LCD_FILTER_DEFAULT:
- case CAIRO_LCD_FILTER_INTRA_PIXEL:
- lcd_filter = FT_LCD_FILTER_LEGACY;
- break;
- case CAIRO_LCD_FILTER_FIR3:
- lcd_filter = FT_LCD_FILTER_LIGHT;
- break;
-+ case CAIRO_LCD_FILTER_DEFAULT:
- case CAIRO_LCD_FILTER_FIR5:
- lcd_filter = FT_LCD_FILTER_DEFAULT;
- break;
-@@ -3416,7 +3416,6 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
- case CAIRO_LCD_FILTER_NONE:
- lcd_filter = FT_LCD_FILTER_NONE;
- break;
-- case CAIRO_LCD_FILTER_DEFAULT:
- case CAIRO_LCD_FILTER_INTRA_PIXEL:
- lcd_filter = FT_LCD_FILTER_LEGACY;
- break;
-@@ -3424,6 +3423,7 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
- lcd_filter = FT_LCD_FILTER_LIGHT;
- break;
- default:
-+ case CAIRO_LCD_FILTER_DEFAULT:
- case CAIRO_LCD_FILTER_FIR5:
- lcd_filter = FT_LCD_FILTER_DEFAULT;
- break;
---
-2.19.1
diff --git a/srcpkgs/cairo/patches/memory-leak.patch b/srcpkgs/cairo/patches/memory-leak.patch
deleted file mode 100644
index 589abeee91cd7..0000000000000
--- a/srcpkgs/cairo/patches/memory-leak.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 79ad01724161502e8d9d2bd384ff1f0174e5df6e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 30 May 2019 07:30:55 -0400
-Subject: [PATCH] Fix a thinko in composite_color_glyphs
-
-We can't just move around the contents of the
-passed-in string, we need to make a copy. This
-was showing up as memory corruption in pango.
-
-See https://gitlab.gnome.org/GNOME/pango/issues/346
----
- src/cairo-surface.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/cairo-surface.c b/src/cairo-surface.c
-index c30f84087..e112b660a 100644
---- a/src/cairo-surface.c
-+++ b/src/cairo-surface.c
-@@ -2820,6 +2820,7 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
- const cairo_clip_t *clip)
- {
- cairo_int_status_t status;
-+ char *utf8_copy = NULL;
-
- TRACE ((stderr, "%s\n", __FUNCTION__));
- if (unlikely (surface->status))
-@@ -2847,6 +2848,10 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
- status = CAIRO_INT_STATUS_UNSUPPORTED;
-
- if (_cairo_scaled_font_has_color_glyphs (scaled_font)) {
-+ utf8_copy = malloc (sizeof (char) * utf8_len);
-+ memcpy (utf8_copy, utf8, sizeof (char) * utf8_len);
-+ utf8 = utf8_copy;
-+
- status = composite_color_glyphs (surface, op,
- source,
- (char *)utf8, &utf8_len,
-@@ -2861,6 +2866,8 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
- if (num_glyphs == 0)
- goto DONE;
- }
-+ else
-+ utf8_copy = NULL;
-
- /* The logic here is duplicated in _cairo_analysis_surface show_glyphs and
- * show_text_glyphs. Keep in synch. */
-@@ -2918,6 +2925,9 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
- surface->serial++;
- }
-
-+ if (utf8_copy)
-+ free (utf8_copy);
-+
- return _cairo_surface_set_error (surface, status);
- }
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 3af5d9914cb29..076dc1bcb709c 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,41 +1,27 @@
# Template file for 'cairo'
pkgname=cairo
-version=1.16.0
-revision=2
-build_style=gnu-configure
-configure_args="--disable-static --enable-tee
- $(vopt_if opengl '--enable-gl --enable-egl')
- $(vopt_if gles2 '--enable-egl --enable-glesv2')"
+version=1.18.0
+revision=1
+build_style=meson
+build_helper="qemu"
+# Tests get stuck.
+configure_args="-Dtests=disabled"
hostmakedepends="pkg-config"
makedepends="fontconfig-devel freetype-devel libglib-devel libpng-devel libX11-devel
- libxcb-devel libXext-devel libXrender-devel lzo-devel pixman-devel zlib-devel
- $(vopt_if opengl MesaLib-devel) $(vopt_if gles2 MesaLib-devel)"
+ libxcb-devel libXext-devel libXrender-devel lzo-devel pixman-devel zlib-devel"
short_desc="Vector graphics library with cross-device output support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://cairographics.org"
distfiles="https://cairographics.org/releases/cairo-${version}.tar.xz"
-checksum=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
-
-# Package build options
-build_options="gles2 opengl"
-
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc*) build_options_default+=" opengl";;
-esac
-
-do_check() {
- # tests get stuck at check-TESTS
- :
-}
+checksum=243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64
cairo-devel_package() {
- depends="${makedepends} cairo>=${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/share
vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: cairo: update to 1.18.0.
2023-10-01 19:42 [PR PATCH] cairo: update to 1.18.0 mhmdanas
2023-10-10 22:12 ` chrysos349
2023-10-11 10:38 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-10-11 10:38 ` mhmdanas
2023-10-24 13:21 ` [PR PATCH] [Merged]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: mhmdanas @ 2023-10-11 10:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/46356#issuecomment-1757376746
Comment:
@chrysos349 thanks, pushed the fix.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: cairo: update to 1.18.0.
2023-10-01 19:42 [PR PATCH] cairo: update to 1.18.0 mhmdanas
` (2 preceding siblings ...)
2023-10-11 10:38 ` mhmdanas
@ 2023-10-24 13:21 ` classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2023-10-24 13:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]
There's a merged pull request on the void-packages repository
cairo: update to 1.18.0.
https://github.com/void-linux/void-packages/pull/46356
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
~~Cross is failing because of https://gitlab.freedesktop.org/cairo/cairo/-/issues/613, which can be worked around by modifying meson's crossfile, but I'm not sure how to do that.~~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-24 13:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-01 19:42 [PR PATCH] cairo: update to 1.18.0 mhmdanas
2023-10-10 22:12 ` chrysos349
2023-10-11 10:38 ` [PR PATCH] [Updated] " mhmdanas
2023-10-11 10:38 ` mhmdanas
2023-10-24 13:21 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).