gentoo resync : 22.12.2021

4 files changed, 95 insertions, 3 deletions

diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index b4e27f42c2f6..659a536ce974 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -1,6 +1,7 @@
 AUX xplanet-1.3.1-freetype_pkgconfig.patch 1226 BLAKE2B 36a63ea973ecc20cf04fe9444cf48601478aee18cdb74effbc9e40984209df32a94c0b091c112ab618e43ea1169c3f79d4b36720ad8a193bbade3f3e8749367e SHA512 924c1fbe5851be9619eb77fdce35314a4efa5f65cb09961f03b3af7478764a745a7344031881fc5eeaad206c05a6c554bfb0e4d69d1373b07f019297591cde10
 AUX xplanet-1.3.1-giflib.patch 1232 BLAKE2B 6f7e5a1c9388ed1d9cb13e6ec38ee53b0b5a1d2e3aeddab414cb24322582cab457850bfa75c2ef4d7575d9166be2a8f2303a7fb674d155d6ea00786575d471ff SHA512 56547a679361b7adf47191dfa5c011f93f1de288857f93a981c1bcdab6b4bc78c81b568748586f41fe0c49b634e5d7373875c579c0dfc05a5e256200889d7384
+AUX xplanet-1.3.1-narrowing_conversion.patch 3297 BLAKE2B fc3be555b908c858383c6b2d4bb7d937d01e542729ce6ad0836fe20b555c255794250940496610a3b3e2ec843c8c51fcbbd3661d8786401fa82ad6032231d4e9 SHA512 49ac3b55f7950d327cbc0bef630ff6b3375c3b4501a0b960ce3df13d03daae821db4dfa7c3fb6920376fd3846f175669ba457fe95ae9a51ef532f957fbef1d2a
 AUX xplanet-1.3.1-remove-null-comparison.patch 6773 BLAKE2B 580f2275f40e9c182bcd201906565debd644843ea592f23c62283fb9c9f974ea1bf11e94c793dce24c042b048843165392f065cee37bcea2353527026b29de17 SHA512 a3ac916070eadd2b0dbd33fbe584f5d5d2f621556389f8d0542d591d5b384eb75bfd9e9bd7411b335bfa1e530f638c1c348063a90ebf5ae62ae65995ccb3949d
 DIST xplanet-1.3.1.tar.gz 1236035 BLAKE2B 71a5f856476e11333f5b97b4f7829c4376c570a44433b5a5ba1cfdf7cc425b1c9b89588cac3e0763e0c641a8b93c43bfc5f724fc3b9e3b5b418cabfa7193e0da SHA512 06ce3187fbd364f4ccee768fceca559690c905c870e2fb25ca32453ce09c564ba3455ec539f1e3da177de23a0611f767b375efe2e10b601d09313c0d068e35e0
-EBUILD xplanet-1.3.1-r2.ebuild 1566 BLAKE2B 76a39af13814e165a89180997b3ee273ce1a2044dd6fd46c6d57d28630de2e417a92cf7fae1bc0738a6c7275b17a0fc3e4593d73c4b208651689e40d0faab909 SHA512 821fd70b70cc9e8b23a1515bf6860d67094ea731efdd5a92151ddfba6a0e8d6619713bad20f63765d9a8951326687e53421528e06cf3f19ef12b3ea4826044e4
-MISC metadata.xml 245 BLAKE2B c14c4c3c1101a8f71a85690e80341bb363c24403444dcb38449ee93f1496ab09e7c26f25ad0985ebff40823b3e411aeeabeeed4d3c8436c524c65a719213d649 SHA512 c0f9e3997502fe212d454e801730227b323abe3d5555b1913e8599f619d40be3fb3662ed5a602b6aced64c04afa2b39d6d52fa732f706adf08bbfd1bcd8eb7f2
+EBUILD xplanet-1.3.1-r2.ebuild 1613 BLAKE2B 97974be4ded7281cf455ac51b2d36f11f7c23e486848cfc8141091ae7e43f53f37b1248ca3c36d2910bf2b25b97ba6ac2f208118d6d3f9112ed25a503d65b6b0 SHA512 7afc961c96dda7d72b60a937e5c83a42973cdcaf6461a86100a8824e008daf1f43ff41ffcad2de6e1ab7a47bd37617da35fef615b37348e37ec25f9890352bb2
+MISC metadata.xml 330 BLAKE2B 1e8b369bc4399644cf0ead5e59b8dec5d44e3f8e4d9b0bde0aae62d00d08f905dd3add788beae6f239788ade51afb148ed692c7e1f7366013c7fed90e2ab2a02 SHA512 2d7b9ac8f23a3454f909049e7940b55656ab7fc89fdda521f24cf64f92859ac5ea08b972c2f8d09dabed0a322e21221c20807d64b0ae491d5d640da0145b7a61
diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch b/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch
new file mode 100644
index 000000000000..ebf090f30bcd
--- /dev/null
+++ b/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch
@@ -0,0 +1,87 @@
+diff -Naur xplanet-1.3.1.orig/src/readConfig.cpp xplanet-1.3.1/src/readConfig.cpp
+--- xplanet-1.3.1.orig/src/readConfig.cpp	2013-02-16 20:37:47.000000000 +0100
++++ xplanet-1.3.1/src/readConfig.cpp	2021-12-21 10:06:22.434195435 +0100
+@@ -46,10 +46,10 @@
+         {
+         case ARC_COLOR:
+         {
+-            int r, g, b;
+-            if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
++            unsigned char r, g, b;
++            if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++                unsigned char color[3] = { r, g, b };
+                 currentProperties->ArcColor(color);
+             }
+             else
+@@ -176,10 +176,10 @@
+         break;
+         case COLOR:
+         {
+-            int r, g, b;
+-            if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
++            unsigned char r, g, b;
++            if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++                unsigned char color[3] = { r, g, b };
+                 currentProperties->Color(color);
+             }
+             else
+@@ -241,10 +241,10 @@
+         break;
+         case GRID_COLOR:
+         {
+-            int r, g, b;
+-            if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
++            unsigned char r, g, b;
++            if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++                unsigned char color[3] = { r, g, b };
+                 currentProperties->GridColor(color);
+             }
+             else
+@@ -293,10 +293,10 @@
+         break;
+         case MARKER_COLOR:
+         {
+-            int r, g, b;
+-            if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
++            unsigned char r, g, b;
++            if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++                unsigned char color[3] = { r, g, b };
+                 currentProperties->MarkerColor(color);
+             }
+             else
+@@ -400,10 +400,10 @@
+         break;
+         case ORBIT_COLOR:
+         {
+-            int r, g, b;
+-            if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
++            unsigned char r, g, b;
++            if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++                unsigned char color[3] = { r, g, b };
+                 currentProperties->OrbitColor(color);
+             }
+             else
+@@ -470,10 +470,10 @@
+             break;
+         case TEXT_COLOR:
+         {
+-            int r, g, b;
+-            if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
++            unsigned char r, g, b;
++            if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3)
+             {
+-                unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff };
++                unsigned char color[3] = { r, g, b };
+                 currentProperties->TextColor(color);
+             }
+             else
diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml
index 15e6d93ab404..002d6c176524 100644
--- a/x11-misc/xplanet/metadata.xml
+++ b/x11-misc/xplanet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xplanet</remote-id>
 	</upstream>
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
index ac79390deb72..581d092126e2 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-giflib.patch
+	"${FILESDIR}"/${P}-narrowing_conversion.patch
 	"${FILESDIR}"/${P}-remove-null-comparison.patch
 	"${FILESDIR}"/${P}-freetype_pkgconfig.patch #788136
 )