[PR PATCH] pixman: update to 0.42.2.

[PR PATCH] pixman: update to 0.42.2.

[Clyybber]

[-- Attachment #1: Type: text/plain, Size: 1297 bytes --]

There is a new pull request by Clyybber against master on the void-packages repository

https://github.com/Clyybber/void-packages pixman
https://github.com/void-linux/void-packages/pull/40847

pixman: update to 0.42.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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, x86_64-glibc

I might be missing some issue here though, since https://github.com/void-linux/void-packages/commit/4d89e4a0d433a56769db45feca6fadd47a3929a8 backported a change from 0.42.2 instead of updating to it.

A patch file from https://github.com/void-linux/void-packages/pull/40847.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pixman-40847.patch --]
[-- Type: text/x-diff, Size: 2494 bytes --]

From be8209104f87d72094b3a0de35c29e0125d79935 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Tue, 29 Nov 2022 21:56:11 +0100
Subject: [PATCH] pixman: update to 0.42.2.

---
 srcpkgs/pixman/patches/backport-0.42.2.patch | 29 --------------------
 srcpkgs/pixman/template                      |  6 ++--
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/pixman/patches/backport-0.42.2.patch

diff --git a/srcpkgs/pixman/patches/backport-0.42.2.patch b/srcpkgs/pixman/patches/backport-0.42.2.patch
deleted file mode 100644
index 29804fca86e4..000000000000
--- a/srcpkgs/pixman/patches/backport-0.42.2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 2 Nov 2022 12:07:32 -0400
-Subject: [PATCH] Avoid integer overflow leading to out-of-bounds write
-
-Thanks to Maddie Stone and Google's Project Zero for discovering this
-issue, providing a proof-of-concept, and a great analysis.
-
-Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/63
----
- pixman/pixman-trap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c
-index 91766fd..7560405 100644
---- a/pixman/pixman-trap.c
-+++ b/pixman/pixman-trap.c
-@@ -74,7 +74,7 @@ pixman_sample_floor_y (pixman_fixed_t y,
- 
-     if (f < Y_FRAC_FIRST (n))
-     {
--	if (pixman_fixed_to_int (i) == 0x8000)
-+	if (pixman_fixed_to_int (i) == 0xffff8000)
- 	{
- 	    f = 0; /* saturate */
- 	}
--- 
-GitLab
-
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 8dd8cb63fa03..29f17803188e 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -1,7 +1,7 @@
 # Template file for 'pixman'
 pkgname=pixman
-version=0.40.0
-revision=2
+version=0.42.2
+revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
@@ -14,7 +14,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="http://pixman.org/"
 distfiles="https://www.cairographics.org/releases/${pkgname}-${version}.tar.gz"
-checksum=6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
+checksum=ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e
 
 # set stacksize for musl: https://gitlab.gnome.org/GNOME/librsvg/-/issues/595
 LDFLAGS="-Wl,-z,stack-size=2097152"

Re: pixman: update to 0.42.2.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/40847#issuecomment-1331886414

Comment:
I only backport the change because that change is a fix for CVE. And there's a python update right after that.
I wouldn't want to risk the revert for any unrelated change during Python rebuild.

Re: [PR REVIEW] pixman: update to 0.42.2.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40847#discussion_r1037726812

Comment:
```suggestion
distfiles="https://www.cairographics.org/releases/pixman-${version}.tar.gz"
```

Re: [PR PATCH] [Updated] pixman: update to 0.42.2.

[Clyybber]

[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]

There is an updated pull request by Clyybber against master on the void-packages repository

https://github.com/Clyybber/void-packages pixman
https://github.com/void-linux/void-packages/pull/40847

pixman: update to 0.42.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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, x86_64-glibc

I might be missing some issue here though, since https://github.com/void-linux/void-packages/commit/4d89e4a0d433a56769db45feca6fadd47a3929a8 backported a change from 0.42.2 instead of updating to it.

A patch file from https://github.com/void-linux/void-packages/pull/40847.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pixman-40847.patch --]
[-- Type: text/x-diff, Size: 2636 bytes --]

From b70a42ae13099a9a19622e6439799b8eae1c919a Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Tue, 29 Nov 2022 21:56:11 +0100
Subject: [PATCH] pixman: update to 0.42.2.

---
 srcpkgs/pixman/patches/backport-0.42.2.patch | 29 --------------------
 srcpkgs/pixman/template                      |  8 +++---
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/pixman/patches/backport-0.42.2.patch

diff --git a/srcpkgs/pixman/patches/backport-0.42.2.patch b/srcpkgs/pixman/patches/backport-0.42.2.patch
deleted file mode 100644
index 29804fca86e4..000000000000
--- a/srcpkgs/pixman/patches/backport-0.42.2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 2 Nov 2022 12:07:32 -0400
-Subject: [PATCH] Avoid integer overflow leading to out-of-bounds write
-
-Thanks to Maddie Stone and Google's Project Zero for discovering this
-issue, providing a proof-of-concept, and a great analysis.
-
-Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/63
----
- pixman/pixman-trap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c
-index 91766fd..7560405 100644
---- a/pixman/pixman-trap.c
-+++ b/pixman/pixman-trap.c
-@@ -74,7 +74,7 @@ pixman_sample_floor_y (pixman_fixed_t y,
- 
-     if (f < Y_FRAC_FIRST (n))
-     {
--	if (pixman_fixed_to_int (i) == 0x8000)
-+	if (pixman_fixed_to_int (i) == 0xffff8000)
- 	{
- 	    f = 0; /* saturate */
- 	}
--- 
-GitLab
-
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 8dd8cb63fa03..f223b9a9b957 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -1,7 +1,7 @@
 # Template file for 'pixman'
 pkgname=pixman
-version=0.40.0
-revision=2
+version=0.42.2
+revision=1
 build_style=meson
 # gtk is only necessary for demos, disabled to avoid dependency loop
 # openmp is only used in demos and tests, and things still test without it
@@ -13,8 +13,8 @@ short_desc="Library of low-level pixel manipulation routines"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="http://pixman.org/"
-distfiles="https://www.cairographics.org/releases/${pkgname}-${version}.tar.gz"
-checksum=6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
+distfiles="https://www.cairographics.org/releases/pixman-${version}.tar.gz"
+checksum=ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e
 
 # set stacksize for musl: https://gitlab.gnome.org/GNOME/librsvg/-/issues/595
 LDFLAGS="-Wl,-z,stack-size=2097152"

Re: pixman: update to 0.42.2.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/40847#issuecomment-1335599919

Comment:
I think this is fine, at least I run 0.42.2 for a while.

Re: [PR PATCH] [Merged]: pixman: update to 0.42.2.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]

There's a merged pull request on the void-packages repository

pixman: update to 0.42.2.
https://github.com/void-linux/void-packages/pull/40847

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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, x86_64-glibc

I might be missing some issue here though, since https://github.com/void-linux/void-packages/commit/4d89e4a0d433a56769db45feca6fadd47a3929a8 backported a change from 0.42.2 instead of updating to it.