From c9de82492f1d8764dad614bcf9b437f2de0fee77 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 28 Jan 2024 18:15:40 +0000
Subject: [PATCH] extra/pixman to 0.43.2-1

---
 extra/pixman/.SRCINFO                         | 10 ++--
 .../0001-Drop-automatic-DEBUG-define.patch    | 52 -------------------
 extra/pixman/PKGBUILD                         | 18 ++-----
 3 files changed, 8 insertions(+), 72 deletions(-)
 delete mode 100644 extra/pixman/0001-Drop-automatic-DEBUG-define.patch

diff --git a/extra/pixman/.SRCINFO b/extra/pixman/.SRCINFO
index 8892a91de..cf6b82e6f 100644
--- a/extra/pixman/.SRCINFO
+++ b/extra/pixman/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pixman
 	pkgdesc = The pixel-manipulation library for X and cairo
-	pkgver = 0.43.0
-	pkgrel = 2
+	pkgver = 0.43.2
+	pkgrel = 1
 	url = https://cgit.freedesktop.org/pixman/
 	arch = x86_64
 	license = MIT
@@ -9,9 +9,7 @@ pkgbase = pixman
 	makedepends = libpng
 	depends = glibc
 	provides = libpixman-1.so
-	source = https://xorg.freedesktop.org/releases/individual/lib/pixman-0.43.0.tar.xz
-	source = 0001-Drop-automatic-DEBUG-define.patch
-	sha512sums = a90399b8c6aec218abb2f419fb5d6894acf9f4c7acb4fd3893b0b7c805ba47c82ee7efb363be59bb1a15b6997b2dddb7dba062a165503b035e1124fff1b271c9
-	sha512sums = 6d3f81f5d48f19d54db5ad37f911dba4c6c928bc1b5744b81c3aed10ba68166f2b240329e4a4164a75664f2ff76030697ba22e603197e5fe270ee7a3757f9fe4
+	source = https://xorg.freedesktop.org/releases/individual/lib/pixman-0.43.2.tar.xz
+	sha512sums = 1a1d21b86b3c6784c4c2606b7069723b4dbb747eac9fce95bca86516787840379ffd49abc42d11e7143e85c32c85496f33c2562c7a910ca6f963599affdc3224
 
 pkgname = pixman
diff --git a/extra/pixman/0001-Drop-automatic-DEBUG-define.patch b/extra/pixman/0001-Drop-automatic-DEBUG-define.patch
deleted file mode 100644
index 0943fbacb..000000000
--- a/extra/pixman/0001-Drop-automatic-DEBUG-define.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8c39ce243708c3a3fe290154c5b85b093fadca5f Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sat, 27 Jan 2024 13:14:04 +0100
-Subject: [PATCH] Drop automatic DEBUG define
-
-We don't use the historical odd stable release numbering scheme
-anymore.
-
-Developers can still enable this debugging code via CFLAGS=-DDEBUG.
-
-Signed-off-by: Simon Ser <contact@emersion.fr>
-Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/87
----
- pixman/pixman-private.h | 19 -------------------
- 1 file changed, 19 deletions(-)
-
-diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
-index f43e87f..34fb69b 100644
---- a/pixman/pixman-private.h
-+++ b/pixman/pixman-private.h
-@@ -1050,28 +1050,9 @@ float pixman_unorm_to_float (uint16_t u, int n_bits);
-  * Various debugging code
-  */
- 
--#undef DEBUG
--
- #define COMPILE_TIME_ASSERT(x)						\
-     do { typedef int compile_time_assertion [(x)?1:-1]; } while (0)
- 
--/* Turn on debugging depending on what type of release this is
-- */
--#if (((PIXMAN_VERSION_MICRO % 2) == 0) && ((PIXMAN_VERSION_MINOR % 2) == 1))
--
--/* Debugging gets turned on for development releases because these
-- * are the things that end up in bleeding edge distributions such
-- * as Rawhide etc.
-- *
-- * For performance reasons we don't turn it on for stable releases or
-- * random git checkouts. (Random git checkouts are often used for
-- * performance work).
-- */
--
--#    define DEBUG
--
--#endif
--
- void
- _pixman_log_error (const char *function, const char *message);
- 
--- 
-GitLab
-
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 3ee6e61eb..bbe87ffb7 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -6,8 +6,8 @@
 #  - disable x86 extensions (mmx, sse2, ssse3)
 
 pkgname=pixman
-pkgver=0.43.0
-pkgrel=2
+pkgver=0.43.2
+pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo"
 arch=(x86_64)
 url="https://cgit.freedesktop.org/pixman/"
@@ -15,20 +15,10 @@ license=('MIT')
 depends=('glibc')
 makedepends=('meson' 'libpng')
 provides=('libpixman-1.so')
-source=(https://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.xz
-        0001-Drop-automatic-DEBUG-define.patch)
-sha512sums=('a90399b8c6aec218abb2f419fb5d6894acf9f4c7acb4fd3893b0b7c805ba47c82ee7efb363be59bb1a15b6997b2dddb7dba062a165503b035e1124fff1b271c9'
-            '6d3f81f5d48f19d54db5ad37f911dba4c6c928bc1b5744b81c3aed10ba68166f2b240329e4a4164a75664f2ff76030697ba22e603197e5fe270ee7a3757f9fe4')
+source=(https://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.xz)
+sha512sums=('1a1d21b86b3c6784c4c2606b7069723b4dbb747eac9fce95bca86516787840379ffd49abc42d11e7143e85c32c85496f33c2562c7a910ca6f963599affdc3224')
 #validpgpkeys=('') # Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 
-prepare() {
-  cd $pkgname-$pkgver
-  # disable DEBUG
-  # https://gitlab.archlinux.org/archlinux/packaging/packages/pixman/-/issues/1
-  # https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/91
-  patch -Np1 -i ../0001-Drop-automatic-DEBUG-define.patch
-}
-
 build() {
   arch-meson $pkgname-$pkgver build \
     -D loongson-mmi=disabled \