gentoo auto-resync : 14:11:2024 - 03:02:32

7 files changed, 89 insertions, 35 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index c54c39f01151..ae46de256461 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index 7e37b7486bf8..bb1e7d6ce292 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -13,14 +13,14 @@ AUX 2.5-r3/0012-Avoid-pixel-artifacts-when-compositing.patch 1084 BLAKE2B 5f48f9
 AUX 2.5-r3/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch 3534 BLAKE2B 5333d7e8cec192be5d4943ff50b893d74cb39338b19f928dd51578c8b1fd218c662227d6defa14c220305f759b5d3653f343ead9cdf247c3130c3f8b27490e19 SHA512 85eff63dabcc9f357933db7ffe9d9f87bd652de475859b80205e2661d6158842b6848caf52917c6401063f86a53f668a0ee311f31b17999474043943273304ca
 AUX 2.5-r3/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch 973 BLAKE2B 4ac032b962331a4e11282937759056e5a44b7edda936214484e97e553ccba55bc11f9db3eabe68cde47c18c45050dd437a5904347384945ee655ab04301a51b6 SHA512 4dcb65e3e1561e43d7a1250529830f23b8d0a928a927dde60fe7cfe8fe89c69e535ef6e79a884311ede4396530f9e4c2de3e6188ed7ce860b74a55d580400c5b
 AUX 2.5-r3/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch 662 BLAKE2B 41933541711439e285516aaadc675899614f75ee030eea32aff54fd8559a54f27968e2f02cfb4e89e421d61524f6f992ce38da0cfdc2d6b438d91a44fdfa2f0c SHA512 f67185083382823d1e00bee5065943be467b4ad2b5b155efe4cdb472142276e9215545bce62bacbeefc2f69142463726fbcbcfee82ac4b6db72d9fe645a29777
-AUX 2.5/02_maintainer_mode.patch 590 BLAKE2B 61804fbb72b05975b1bf4470e466ae39eac18aaebb899426b41505cfba8030db3542dd900d5f866b6c32e2c743e89f009985871cf37500b9c43b28f0c9822404 SHA512 150640e2eaa1ef764071759b09f25adaf2653d9f97b8a938e47e1cc0d221d441054d460d48819995ebea7d311c97b480caf83f135c3da188733230405cc9bf9e
-AUX 2.5/04_no_rpath.patch 359 BLAKE2B c78f3555f371203c8355a2b8e6ac3c300b9757a1d74e14f3bfdbe58abc1332ed76f8486963b0b484a50ffd8fb48deea315a09b5cf7b44ac0156488a8b7fb251b SHA512 f44a98258cef2bdb1ed86a2614162d749f7d191ac3e7c642fe8055bdc757e65d8b7a26ad44ea3f7b760776b308dd9d07af3100826504c5547c8a111a3dbdbc8e
 AUX agg-2.4-depends.patch 2154 BLAKE2B ecea231011d0779bd3fa42f8364cd31ac9d2dc17f9de2aff98045abcde5e562b04ca5da295d35ac2aef8924eb65a4bbcd42b54ce8da4453383f5b0bcac2e85e3 SHA512 22b15f495c313417e05431516239bd04889d26b05c559b4905f0ad0aac3b8e4053a6bdc19e1c8e0c192f3b65c200cf5e3074db15011e01e4deaa4c13070418ef
 AUX agg-2.5-autotools.patch 277 BLAKE2B 9579b23d043b151f5404cd6f97586c3f1b1098b23d3aacfc1c287431c3b52b654c1c4057859f5708afc5fdfe0fd57e24538d6865f156b345c87240cf48a2ba3f SHA512 facfb36e8de3987153d988d4ff4227da6531a1508c2263d85364809b5dc3b564e76469a134084b2d020709fc32cfd319141126653b700dc38e266b68528c8f47
+AUX agg-2.5-char-ptr-cast.patch 442 BLAKE2B 211d54cf7dd15888bf1e9003e71a5b940c9ef1f627bea20c6e06c31315f16606e5b123644cfb8e6ffcdb91647a2fab08727bdfc0e33079272b6c2d0f29f86068 SHA512 315b9197acc3377471308e039020ffb750b6e48cdfcf06104c20d92b631cad8131eb1895f56cf4fbd3194aefb7c0ee3f7aeca0079a3086367ce2426e0e2766f0
 AUX agg-2.5-gcc8.patch 816 BLAKE2B b959d281e57111ca74fd981a9d0a06f2ab9d0e05ef69fd2e7cd15c5385d860141400aebf2b89124022468f9c21633bc449b7802084112be68c078818503dbb0e SHA512 92cb8742068e839143094dccf77b81b37484d7a521c45d8bdb6653f2dc9055ed0b65fc2554234e1f635221f6624d4259dd86b7b3bbc5fc9edf29cc86cc58e360
 AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d933a11399c10d7c8ad63a419e44a1f8430acdcdfef5268600e088664cc8bbbc9a5513b3170f62cba86f07d4b SHA512 113ac9deb4d0992ef4bdaeb1654f5c1ab199d3865b525c573926b73b2351e9c551f2a7b77082f87fd78bcdab3036621b72bba9502028c35b28dc8f18acf11f53
+AUX agg-2.5-register-keyword.patch 2366 BLAKE2B 2ccf9cec92fa6705a3b0cef385147022179d285f623191912c151ec1325591e82cc1664bda99153b15f6c968e103b9dcfad1973ce6607fe1cedebdb108ef6780 SHA512 c631478007e8312c547f28cf61a59582a6147be928bded208e4462835a1b521cf182c1517b19290e43c7e29af70fac7474337bb00273fcb4f10b7cf57f460fff
 AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557b11e369bcb5e351b4b7d814d92a52bc13cd9a1b85487ce9d3d42b897712e93fdb17fa191e0f8850160402acaa415 SHA512 11166f6b8ca9cdaef2e510c7752c643ee6c7a56051c6214111e56dd0274f2e0023be073014a806ecf9ffc086b1436adefd04b563fc82cdd53f9910d281fe2b8e
 AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
 DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
-EBUILD agg-2.5-r3.ebuild 1336 BLAKE2B 9a6dbce63fb498b36516e000cea20aa1fb5cd2e46a1b7925b2df9875a45d0dce26d35b0c3acf124c3f5b212d69a5d2f70f684e07243e8f7dab9f5e5c662e68b5 SHA512 ac79cbc876ec25d1b06b8a771622bb09f4f792982c826fdf5e4dfbf82581a496e8707ddd944a91cd062b40becd1b74aa0ec4bf04e6a0d975fa6262985ad73591
+EBUILD agg-2.5-r3.ebuild 1419 BLAKE2B 447d011f9e5cf365334ee33f0f0bc64da42489a126ef882334c75e76c9e3971ac2bba102a3c96cc20cbb9e40e1cac5ea233b79118b937510010cf1b5155e1dd9 SHA512 2a8bd0ef7264846e121524d09e4613775d412f04d51eb9d9bdc511b82836e19547a3b16775ee5dd7a4495bdbad349822dd175ba02e0808f2e4a8077f24f5b922
 MISC metadata.xml 336 BLAKE2B 3edd19d4d4c044be6ffe40717135d5800a8c10ed31e52cee361d2b7c0ddbc963e4e14c287852b608e25c2b2e479ccc701f8f25c0a1a800964eb135c27de83f72 SHA512 54d63b066a3b1e1d1f9a9397f8dff5194b5bc463ac8055ca6316e4f2764a522c3d76aaa81c747c24661c4d3d5f5c3b2a3c8810c3e0909ca48095d1d799b7506a
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index 78e303ff492b..b4dbb7fd7b19 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-sdl-automagic.patch
 	"${FILESDIR}"/${P}-gcc8.patch
 	"${FILESDIR}"/${PVR}
+	"${FILESDIR}"/${P}-char-ptr-cast.patch
+	"${FILESDIR}"/${P}-register-keyword.patch
 )
 
 src_prepare() {
diff --git a/x11-libs/agg/files/2.5/02_maintainer_mode.patch b/x11-libs/agg/files/2.5/02_maintainer_mode.patch
deleted file mode 100644
index 4c65c9723e34..000000000000
--- a/x11-libs/agg/files/2.5/02_maintainer_mode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_maintainer_mode.dpatch by  <rodrigo@nul-unu.com>
-##
-## DP: Use AM_MAINTAINER_MODE, to avoid re-running autotools
-## DP: except when explicitely called in debian/rules
-
-@DPATCH@
-diff -urNad agg-2.5+dfsg~/configure.in agg-2.5+dfsg/configure.in
---- agg-2.5+dfsg~/configure.in 2007-07-21 19:58:06.966030999 -0500
-+++ agg-2.5+dfsg/configure.in  2007-07-21 19:58:33.595695250 -0500
-@@ -2,7 +2,7 @@
- AC_CANONICAL_TARGET
- AC_CONFIG_HEADERS(include/config.h)
- AM_INIT_AUTOMAKE(agg, 2.5.0)
--
-+AM_MAINTAINER_MODE
- 
- dnl Checks for programs.
- AC_PROG_CC
-
diff --git a/x11-libs/agg/files/2.5/04_no_rpath.patch b/x11-libs/agg/files/2.5/04_no_rpath.patch
deleted file mode 100644
index 76582e332738..000000000000
--- a/x11-libs/agg/files/2.5/04_no_rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- agg-2.5.orig/libagg.pc.in	2006-07-10 11:27:16.000000000 +0200
-+++ agg-2.5/libagg.pc.in	2006-07-10 11:28:51.000000000 +0200
-@@ -6,5 +6,5 @@
- Name: libagg
- Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
- Version: @VERSION@
--Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
-+Libs: -L${libdir} -lagg
- Cflags: -I${includedir}
-
diff --git a/x11-libs/agg/files/agg-2.5-char-ptr-cast.patch b/x11-libs/agg/files/agg-2.5-char-ptr-cast.patch
new file mode 100644
index 000000000000..043ebf056b22
--- /dev/null
+++ b/x11-libs/agg/files/agg-2.5-char-ptr-cast.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/937853
+
+--- a/font_freetype/agg_font_freetype.cpp
++++ b/font_freetype/agg_font_freetype.cpp
+@@ -186,7 +186,7 @@
+             v_control = v_start;
+ 
+             point = outline.points + first;
+-            tags  = outline.tags  + first;
++            tags  = reinterpret_cast<char*>(outline.tags) + first;
+             tag   = FT_CURVE_TAG(tags[0]);
+ 
+             // A contour cannot start with a cubic control point!
diff --git a/x11-libs/agg/files/agg-2.5-register-keyword.patch b/x11-libs/agg/files/agg-2.5-register-keyword.patch
new file mode 100644
index 000000000000..b3e7cf138b78
--- /dev/null
+++ b/x11-libs/agg/files/agg-2.5-register-keyword.patch
@@ -0,0 +1,70 @@
+https://bugs.gentoo.org/894708
+
+--- a/include/agg_basics.h
++++ b/include/agg_basics.h
+@@ -212,7 +212,7 @@
+     {
+         AGG_INLINE static unsigned mul(unsigned a, unsigned b)
+         {
+-            register unsigned q = a * b + (1 << (Shift-1));
++            unsigned q = a * b + (1 << (Shift-1));
+             return (q + (q >> Shift)) >> Shift;
+         }
+     };
+--- a/include/agg_image_accessors.h
++++ b/include/agg_image_accessors.h
+@@ -183,8 +183,8 @@
+     private:
+         AGG_INLINE const int8u* pixel() const
+         {
+-            register int x = m_x;
+-            register int y = m_y;
++            int x = m_x;
++            int y = m_y;
+             if(x < 0) x = 0;
+             if(y < 0) y = 0;
+             if(x >= (int)m_pixf->width())  x = m_pixf->width() - 1;
+--- a/include/agg_trans_affine.h
++++ b/include/agg_trans_affine.h
+@@ -299,7 +299,7 @@
+     //------------------------------------------------------------------------
+     inline void trans_affine::transform(double* x, double* y) const
+     {
+-        register double tmp = *x;
++        double tmp = *x;
+         *x = tmp * sx  + *y * shx + tx;
+         *y = tmp * shy + *y * sy  + ty;
+     }
+@@ -307,7 +307,7 @@
+     //------------------------------------------------------------------------
+     inline void trans_affine::transform_2x2(double* x, double* y) const
+     {
+-        register double tmp = *x;
++        double tmp = *x;
+         *x = tmp * sx  + *y * shx;
+         *y = tmp * shy + *y * sy;
+     }
+@@ -315,9 +315,9 @@
+     //------------------------------------------------------------------------
+     inline void trans_affine::inverse_transform(double* x, double* y) const
+     {
+-        register double d = determinant_reciprocal();
+-        register double a = (*x - tx) * d;
+-        register double b = (*y - ty) * d;
++        double d = determinant_reciprocal();
++        double a = (*x - tx) * d;
++        double b = (*y - ty) * d;
+         *x = a * sy - b * shx;
+         *y = b * sx - a * shy;
+     }
+--- a/src/platform/win32/agg_platform_support.cpp
++++ b/src/platform/win32/agg_platform_support.cpp
+@@ -1303,7 +1303,7 @@
+         tok.len = 0;
+         if(m_src_string == 0 || m_start == -1) return tok;
+ 
+-        register const char *pstr = m_src_string + m_start;
++        const char *pstr = m_src_string + m_start;
+ 
+         if(*pstr == 0) 
+         {