gentoo auto-resync : 22:11:2022 - 13:06:24

5 files changed, 97 insertions, 3 deletions

diff --git a/app-misc/bb/Manifest b/app-misc/bb/Manifest
index 20a69b913023..678772cf2c51 100644
--- a/app-misc/bb/Manifest
+++ b/app-misc/bb/Manifest
@@ -1,5 +1,8 @@
 AUX bb-1.3.0_rc1-disable-pulse.patch 744 BLAKE2B 0ded7bea285b29ec81bd8b35ca409bf48bed3092098e160d57c41a57d99e9900afd397853ba5bb06f629dc7ded90e7a842fa6b575c9af6614f469683f6ba5ebc SHA512 d43eea0c7088fd3e172b5794eeeef092f97edd5e5e1556e5b936031ab9f81d79cf91c5394d82e16f4752864e0b5aa9d72418ab80239d34a1e256c843b6d54fc1
+AUX bb-1.3.0_rc1-fix-build-for-clang16.patch 829 BLAKE2B cf2c7fb72dc64db741767d50a00e4f3114636f065b46c06c704d9ee408e08f2a959d29d83a6dffb5711e99bc87658bee19d1281ac569f1171b09ca42f34e3315 SHA512 91641b3e990313137a8a5b141f34d7fd5a0b90563acd97c321b14a61077d740e2902c86c9d9600e73252b32a586d66242124acaeb13f50a54ce1c9bb16134775
+AUX bb-1.3.0_rc1-fix-lto-type-mismatch.patch 562 BLAKE2B 63a71b50f8a97405adada97d42d2355deb7650cdfcfcb4411d12b161682c78d9975db0153fffe2a4175f5f8c9a734a54e4de20fd09f08aad281303ab618116c6 SHA512 56609aa431279cd8abb25fa5f8785dbce44aa73ebedbc2c7ef853b016012fa8748639258fcfeaca02026b7554cb281cf9950d08c7dc132f0f46c1a61795986ff
 AUX bb-1.3.0_rc1-fix-protos.patch 310 BLAKE2B be8d5cb30a20c082d0ed7ea8193a58faa48834b3efa2eb0c5ef453e765afc2f3443ab516db2e39e00f3d5eded7bbca909bea6aa7754c08728849fd9c0c75417d SHA512 60b4e05648c53669f901da762691859810ee1c8644b9d9fe6d49995547eef1b0564ce2151a1882630527af553112bbbfa2c81ecd865a832887903d09901597c7
+AUX bb-1.3.0_rc1-fix-return-type-and-QA.patch 1332 BLAKE2B 9a5f4528d333137fe494cfd3174740317a564719be5a5d5478a1d8a7e969af0ce1540cd903689207146b2c0d5cac44a5a10799e2a273c6bb509a4069e3c626bc SHA512 0f7ff8141c2c734a93f400ffc781c09afde3e23e5e57ab16cdd71cc14ab9019c5e22897de911923ec71c143f46286ea5ce4532dc0f801b9f70df1c1b25e8404d
 AUX bb-1.3.0_rc1-m4-stuff.patch 16196 BLAKE2B 368d88965a43390c1d6258d2b6829b4f675ec10a9c9ceb415c0f444fdd9d1fe7a04b1c8beec6b1eaf81158c092e9cd5dd65e0ff0c7839472035ed55fb1c4a221 SHA512 a35862306c65ff20e90812a53d842b7715c880e8866267b95249107c0f0479ab4a0c032116e7971f5000206e14356098375d127a7cb96fd995999615df645a0e
 AUX bb-1.3.0_rc1-messager-overlap.patch 1556 BLAKE2B 8b4aa3efdc8990025f93128dcc2b58a20077d78a12d1e8a65d69803401fcb2f6b6366132e42b4e1e8c9b3d817bf193a25c3b0e6b8477ebe4dfd322ccc230af0f SHA512 516657e3a937d1a05bfda9abb3ef784119fe6d365901fc852b2a2feeeb9884e4f7ebd8c72d2ca9f4ce995f67b9c312ed7a0e1245cc2a42f37bacaf5bc514b8c2
 AUX bb-1.3.0_rc1-noattr.patch 513 BLAKE2B 6c41a98aa03ebaf1014524f04715a8165a3e31a8089859ea4d79a109152ad942d9e1d2d3affcab56f20e01240b7404a981752407af7f606d41d0dbf18d6d7eda SHA512 2f35394e6d6a197797c11fee787c26bee5be71545079aa6d8b948363e01b0b1500ab2834e77fa10b05cc722ed1a025869e8fbf77d0ab6b4f274b6473c366f854
@@ -7,5 +10,5 @@ AUX bb-1.3.0_rc1-printf-cleanup.patch 2826 BLAKE2B 26ccbf74ba95f2d695d56a788f340
 AUX bb-1.3.0_rc1-protos.patch 183 BLAKE2B 61112802cba379eda21b293270b2bf61e6be892f8cd36ce494f31284ff7a92ab5e6c828f5cd7365868128d40f2711aa099f3148989151875025ddbb7f24fb0b4 SHA512 bcccae0c1838ee89a62581c25a4896e468cd1fcd5dd4bf98bbe2395aa40d15a39ea8408bfad31517ff57385d8d0b2e65ced8c7a93fd17cc7f9039390805229c5
 AUX bb-1.3.0_rc1-zbuff-fault.patch 1048 BLAKE2B bf8729e1654bb44bfc32ff9bb857e5aef082d7e2ba40494304696f399fe43bc82540f1f323504a24afc003c408e6b73d8decabb1599dd5ffbfa186cc3a19e89d SHA512 bce66400732270b9b4957cbcfe83d97baa9ff011876517ce292949c1fe23945fb02768542c8b4b59b350403a0a3f8b1dae998800b64d84f34b8c37e5e3ba0cc2
 DIST bb-1.3rc1.tar.gz 1416292 BLAKE2B 342a11002a94f160de23739c5578acf685ff886ae66e182b33cd971b74b258bae6ecd7e9e795f1e6a53a062a4c0ba5296bdbb6f41dd8cca6be4550bb49943023 SHA512 f05eb741f1189038a5a63016437f8eaeb25eb001307561bfe8827701bc246873fec14462e586d5966dcd1c74cddaf346f4670254b712713625e139300817c0a9
-EBUILD bb-1.3.0_rc1-r5.ebuild 1912 BLAKE2B 3bc5dfdf8ed7ef3640f5ce592577788e4c613bbb29f22c975fecb6ff082127a7411540a6e4e9ad383d398d6117549bca603a6a0ae2e0d6b4731ab17ad2ed270a SHA512 cc45699fb29a09b117e450a32d6a4e8ff7f8bd973a345f0db8062f78e5032a90d3a36d6edff8d09de6cd1ece956254afef7363f14c384a09099b8416296f3fa3
+EBUILD bb-1.3.0_rc1-r6.ebuild 2057 BLAKE2B 913cf68e427d46b70e73699e0ad3c5b9b1da4d4f84d30f365e75006368af5ec430a5dec9dee4b477955637541a824095438b154a089db171d53d3dca5fe86763 SHA512 dcbd9471d1ef0a0902d2d1b24af46f03a23d6bdff1c23ac1f5fadf6c6af05ce02f27c34230915de07b9b5511b571452da9a52cbf0195575e8eeed2586b0d6cd7
 MISC metadata.xml 248 BLAKE2B b8dceef6470332781bec2164b91ef9025e088c052fb5df0116460fbe97f5c72dc760e940f20897f2262f4c5a565d30142ad77a182b531f3fe07fd760764ff161 SHA512 fecc0bb3d7321c47bfea890b67859c9378e7720c36d62890958584ad0f771c10bf512e9d59e6628399acd49745030db48cf7bf09b675db3cb06360818ffe67a0
diff --git a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild b/app-misc/bb/bb-1.3.0_rc1-r6.ebuild
index f1111fd96715..2a3d4e24f6b5 100644
--- a/app-misc/bb/bb-1.3.0_rc1-r5.ebuild
+++ b/app-misc/bb/bb-1.3.0_rc1-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -34,6 +34,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-m4-stuff.patch
 	"${FILESDIR}"/${P}-protos.patch
 	"${FILESDIR}"/${P}-disable-pulse.patch
+	"${FILESDIR}"/${P}-fix-build-for-clang16.patch
+	"${FILESDIR}"/${P}-fix-lto-type-mismatch.patch
+	"${FILESDIR}"/${P}-fix-return-type-and-QA.patch
 )
 
 src_prepare() {
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch
new file mode 100644
index 000000000000..77b06874760b
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-build-for-clang16.patch
@@ -0,0 +1,23 @@
+The two functions that are assigned to the formulas structs secnod field
+`int (*calculate)(number_t number_t number_t number_t)`
+(without the REGISTERS(3) which is just a macro to GCC regparm)
+
+However, clang16 has -Wincompatible-function-pointer-types by default, and it
+does not like that and complains, that assigning these functions into the
+structs fields is a problem due to incompatible types. 
+
+Bug: https://bugs.gentoo.org/880385
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/formulas.h
++++ b/formulas.h
+@@ -50,7 +50,7 @@ struct symetryinfo {
+ #define FORMULAMAGIC 1121
+ struct formula {
+     int magic;
+-    int (*calculate) (number_t, number_t, number_t, number_t) REGISTERS(3);
++    int (*calculate) (number_t, number_t, number_t, number_t);
+     char *name[2];
+     vinfo v;
+     int mandelbrot;
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch
new file mode 100644
index 000000000000..6442a9c9fd29
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-lto-type-mismatch.patch
@@ -0,0 +1,18 @@
+In tex.c these variables are initialized as unsigned longs, so they should
+be declared as unsigned longs. I have scanned the code base for any usage
+of them in the negatives - nothing. 
+
+Bug: https://bugs.gentoo.org/854720
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/tex.h
++++ b/tex.h
+@@ -28,5 +28,6 @@ extern void disp3d(void);
+ extern void set_zbuff(void);
+ extern void unset_zbuff(void);
+ 
+-extern int alfa,beta,gama,centerx,centery,centerz;
++extern unsigned long alfa,beta,gama;
++extern int centerx,centery,centerz;
+ extern float zoom;
diff --git a/app-misc/bb/files/bb-1.3.0_rc1-fix-return-type-and-QA.patch b/app-misc/bb/files/bb-1.3.0_rc1-fix-return-type-and-QA.patch
new file mode 100644
index 000000000000..b1c8f8115605
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-fix-return-type-and-QA.patch
@@ -0,0 +1,47 @@
+diff --git a/ctrl87.c b/ctrl87.c
+index 05f1e6d..8789d92 100644
+--- a/ctrl87.c
++++ b/ctrl87.c
+@@ -43,8 +43,7 @@ unsigned short _control87(unsigned short newcw, unsigned short mask)
+ 		      : /* registers */ "ax", "bx", "dx"
+ 	);
+     }
+-    return cw;
+ #endif
+ #endif
+-
++return cw;
+ }				/* _control87 */
+diff --git a/main.c b/main.c
+index a9fac57..41b56d1 100644
+--- a/main.c
++++ b/main.c
+@@ -73,8 +73,8 @@ load_song (char *name)
+ 	  sleep (1);
+ 	}
+     }
+-  return 0;
+ #endif
++return 0;
+ }
+ 
+ void
+diff --git a/scene4.c b/scene4.c
+index 12b640c..b2f69f3 100644
+--- a/scene4.c
++++ b/scene4.c
+@@ -231,10 +231,10 @@ void scene4(void)
+     draw();
+     bbflushwait(0.1 * 1000000);
+     for (i = 20; i < aa_imgwidth(context) - 20; i++)
+-	aa_putpixel(context, i, aa_imgheight(context) - 10, 255),
+-	    aa_putpixel(context, i, aa_imgheight(context) - 11, 255),
+-	    aa_putpixel(context, i, aa_imgheight(context) - 12, 255),
+-	    aa_putpixel(context, i, aa_imgheight(context) - 13, 255),
++        aa_putpixel(context, i, aa_imgheight(context) - 10, 255);
++	    aa_putpixel(context, i, aa_imgheight(context) - 11, 255);
++	    aa_putpixel(context, i, aa_imgheight(context) - 12, 255);
++	    aa_putpixel(context, i, aa_imgheight(context) - 13, 255);
+ 	    gentable();
+     timestuff(-25, drawfire, mydraw, 7 * 1000000);
+     free(table);