Update to 0.42.2

6 files changed, 5 insertions, 150 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a498db6c8d4c..ae655dcd28de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-pixman
 	pkgdesc = The pixel-manipulation library for X and cairo (mingw-w64)
-	pkgver = 0.42.0
+	pkgver = 0.42.2
 	pkgrel = 1
 	url = http://xorg.freedesktop.org
 	arch = any
@@ -11,7 +11,7 @@ pkgbase = mingw-w64-pixman
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = http://xorg.freedesktop.org/releases/individual/lib/pixman-0.42.0.tar.xz
-	sha512sums = 43d43d1aef9b8a6167098ab68ce2cfd8c0429c4825d40a4fb468b5b51dc1a2035f8bd1b70413e4ecd77deb469b5d558f42171b423e348d5ddd8604c466ffc7d9
+	source = http://xorg.freedesktop.org/releases/individual/lib/pixman-0.42.2.tar.xz
+	sha512sums = 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8
 
 pkgname = mingw-w64-pixman
diff --git a/4851d4e20f66f540cd61fb69851df17671fc90d2.patch b/4851d4e20f66f540cd61fb69851df17671fc90d2.patch
deleted file mode 100644
index 75660036f42a..000000000000
--- a/4851d4e20f66f540cd61fb69851df17671fc90d2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4851d4e20f66f540cd61fb69851df17671fc90d2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 11 May 2019 11:18:35 +0200
-Subject: [PATCH] meson: allow building a static library
-
-So that passing "-Ddefault_library=both" also creates a static lib.
-
-Note that Libs.private in the .pc file will still be wrong because of
-https://github.com/mesonbuild/meson/issues/3934 (it contains things like
--lpixman-mmx)
----
- pixman/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pixman/meson.build b/pixman/meson.build
-index 6ce87e7..7b66827 100644
---- a/pixman/meson.build
-+++ b/pixman/meson.build
-@@ -97,7 +97,7 @@ pixman_files = files(
-   'pixman-utils.c',
- )
- 
--libpixman = shared_library(
-+libpixman = library(
-   'pixman-1',
-   [pixman_files, config_h, version_h],
-   link_with : [pixman_simd_libs],
--- 
-2.24.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 2e0fcf2ca872..a0512b87a9fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
 pkgname=mingw-w64-pixman
-pkgver=0.42.0
+pkgver=0.42.2
 pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo (mingw-w64)"
 arch=(any)
@@ -10,7 +10,7 @@ makedepends=(mingw-w64-meson mingw-w64-libpng)
 depends=(mingw-w64-gcc)
 options=(staticlibs !strip !buildflags)
 source=("http://xorg.freedesktop.org/releases/individual/lib/pixman-${pkgver}.tar.xz")
-sha512sums=('43d43d1aef9b8a6167098ab68ce2cfd8c0429c4825d40a4fb468b5b51dc1a2035f8bd1b70413e4ecd77deb469b5d558f42171b423e348d5ddd8604c466ffc7d9')
+sha512sums=('3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/afc6c935f1b52ca74d96f1ea2cbfb3e47ffb7fd4.patch b/afc6c935f1b52ca74d96f1ea2cbfb3e47ffb7fd4.patch
deleted file mode 100644
index 311db2252eb4..000000000000
--- a/afc6c935f1b52ca74d96f1ea2cbfb3e47ffb7fd4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From afc6c935f1b52ca74d96f1ea2cbfb3e47ffb7fd4 Mon Sep 17 00:00:00 2001
-From: Dylan Baker <dylan@pnwbakers.com>
-Date: Mon, 9 Sep 2019 16:00:56 -0700
-Subject: [PATCH] meson: don't use link_with for library()
-
-Meson doesn't do the expected thing when library() creates a static
-library. Instead of combining the libraries together into a single
-archive it effectively discards them, resulting in missing symbols.
-
-To work around this we manually unpack the archives and shove the .o
-files into the final library. This doesn't affect the shared library at
-all, but makes the static library have the necessary symbols
-
-Fixes #33
----
- pixman/meson.build | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/pixman/meson.build b/pixman/meson.build
-index 7b66827..31be9d2 100644
---- a/pixman/meson.build
-+++ b/pixman/meson.build
-@@ -97,10 +97,17 @@ pixman_files = files(
-   'pixman-utils.c',
- )
- 
-+# We cannot use 'link_with' or 'link_whole' because meson wont do the right
-+# thing for static archives.
-+_obs = []
-+foreach l : pixman_simd_libs
-+  _obs += l.extract_all_objects()
-+endforeach
-+
- libpixman = library(
-   'pixman-1',
-   [pixman_files, config_h, version_h],
--  link_with : [pixman_simd_libs],
-+  objects: _obs,
-   dependencies : [dep_m, dep_threads],
-   version : meson.project_version(),
-   install : true,
--- 
-2.24.1
-
diff --git a/be0d3e699401f8230fa88c28c52d73c57f13f327.patch b/be0d3e699401f8230fa88c28c52d73c57f13f327.patch
deleted file mode 100644
index 375a06dbdc68..000000000000
--- a/be0d3e699401f8230fa88c28c52d73c57f13f327.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From be0d3e699401f8230fa88c28c52d73c57f13f327 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 11 May 2019 10:17:36 +0200
-Subject: [PATCH] meson: define SIZEOF_LONG  and use -Wundef
-
-meson builds defaulted to SIZEOF_LONG=0 in various places
----
- meson.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 1a11587..3a1a4c2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -36,6 +36,7 @@ add_project_arguments(
-     '-Wdeclaration-after-statement',
-     '-fno-strict-aliasing',
-     '-fvisibility=hidden',
-+    '-Wundef',
-   ]),
-   language : ['c']
- )
-@@ -445,6 +446,8 @@ if host_machine.endian() == 'big'
-   config.set('WORDS_BIGENDIAN', 1)
- endif
- 
-+config.set('SIZEOF_LONG', cc.sizeof('long'))
-+
- # Required to make pixman-private.h
- config.set('PACKAGE', 'foo')
- 
--- 
-2.24.1
-
diff --git a/fd5c0da57985a430912907d4a898ed1ddb854ead.patch b/fd5c0da57985a430912907d4a898ed1ddb854ead.patch
deleted file mode 100644
index d624712eec0f..000000000000
--- a/fd5c0da57985a430912907d4a898ed1ddb854ead.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From fd5c0da57985a430912907d4a898ed1ddb854ead Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 11 May 2019 10:23:08 +0200
-Subject: [PATCH] meson: fix TLS support under mingw
-
-GCC on Windows complains that "__declspec(thread)" doesn't work, but still
-compiles it, so the meson check doesn't work. The warning printed by gcc:
-"warning: 'thread' attribute directive ignored [-Wattributes]"
-
-Pass -Werror=attributes to make the check fail instead.
-
-This fixes the test suite (minus gtk tests) on Windows with mingw.
----
- meson.build | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 3a1a4c2..2118abf 100644
---- a/meson.build
-+++ b/meson.build
-@@ -408,8 +408,12 @@ foreach h : ['sys/mman.h', 'fenv.h', 'unistd.h']
-   endif
- endforeach
- 
-+# gcc on Windows only warns that __declspec(thread) isn't supported,
-+# passing -Werror=attributes makes it fail.
- if (host_machine.system() == 'windows' and
--    cc.compiles('int __declspec(thread) foo;', name : 'TLS via __declspec(thread)'))
-+    cc.compiles('int __declspec(thread) foo;',
-+                args : cc.get_supported_arguments(['-Werror=attributes']),
-+                name : 'TLS via __declspec(thread)'))
-   config.set('TLS', '__declspec(thread)')
- elif cc.compiles('int __thread foo;', name : 'TLS via __thread')
-   config.set('TLS', '__thread')
--- 
-2.24.1
-