gentoo resync : 12.05.2022

3 files changed, 62 insertions, 3 deletions

diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index aca7b05f0f49..5d3b298ef5a5 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,3 +1,4 @@
+AUX turbovnc-2.2.7-fix-musl-compilation.patch 1535 BLAKE2B d0a95f7bffef46da41bb1faf3de3b3c3651890e3653ccb2d961e11921bb25c6910f9d4a049e9b6d867d214e1e0310de22ec3c423424acbebe7be2437d2ffb2ab SHA512 94ba2b53e02e9b2e32f70f2cfb4dd0cfb733726bb31383462113681c95afff4823dc82302641773947ab5e71fe6547a9f233b25146d9cd292f08da66faf8f786
 DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788
-EBUILD turbovnc-2.2.7-r2.ebuild 2521 BLAKE2B 20eef8401e0309d888febf26f36129df9d056309849eeffdaadf3f060de60ac5f1ec7b372229a74976bf3c8c882e817d4dfc93476ea5e9c256611c06e0970d32 SHA512 1380c77cf9471add17046b57a1b6a72b141a8ba88eba07b9f81cb69ca71c397626dbd7d92ba73400ea262a7b620b9e49da7d4f364887c0810231b8e79739293f
+EBUILD turbovnc-2.2.7-r2.ebuild 2696 BLAKE2B a03f3d8f43871bdaedf3010b914e05580827a45579bca9c400a7bb533514956c920cde88fd67b9e0211a9df1b0c28f149791021e5854e0a913c5cdd7413cec59 SHA512 7b04acfbcb3e34c12c11baa36d11ed5de8a05a42bac8fc3068a1fde118999d0850fad349b7db92b6de3e44759f83bfc7e31e57c699b5460018979c8964ab86bb
 MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9
diff --git a/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch b/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch
new file mode 100644
index 000000000000..c9f5f0397b4c
--- /dev/null
+++ b/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch
@@ -0,0 +1,51 @@
+See bug https://bugs.gentoo.org/836723
+
+There are 2 compilation errors:
+
+/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c: In function 'GetLocalClientCreds':
+/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/os/access.c:1178:18: error: storage size of 'peercred' isn't known
+ 1178 |     struct ucred peercred;
+      |                  ^~~~~~~~
+
+/var/tmp/portage/net-misc/turbovnc-2.2.7-r2/work/turbovnc-2.2.7/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c:48:10: fatal error: asm/page.h: No such file or directory
+   48 | #include <asm/page.h>
+      |          ^~~~~~~~~~~~
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,6 +69,8 @@
+ boolean_number(TVNC_BUILDSERVER)
+ report_option(TVNC_BUILDSERVER "TurboVNC Server")
+ 
++option(BUILDING_ON_MUSL "Define GNU macros on musl" 0)
++
+ if(TVNC_BUILDNATIVE OR TVNC_BUILDSERVER)
+ 	set(USEC 1)
+ endif()
+--- a/unix/Xvnc/programs/Xserver/os/CMakeLists.txt
++++ b/unix/Xvnc/programs/Xserver/os/CMakeLists.txt
+@@ -13,6 +13,10 @@
+ 	add_definitions(-DBSD44SOCKETS)
+ endif()
+ 
++if(BUILDING_ON_MUSL)
++	add_definitions(-D_GNU_SOURCE)
++endif()
++
+ set(EXTRASRCS "")
+ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+ 	add_definitions(-DSECURE_RPC)
+--- a/unix/Xvnc/programs/Xserver/Xext/CMakeLists.txt
++++ b/unix/Xvnc/programs/Xserver/Xext/CMakeLists.txt
+@@ -8,6 +8,10 @@
+ 	endif()
+ endforeach()
+ 
++if(BUILDING_ON_MUSL)
++	add_definitions(-D__GNU_LIBRARY__=2)
++endif()
++
+ disable_compiler_warnings()
+ handle_type_puns()
+ 
diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
index 5b1a5561d896..1764dc4c265b 100644
--- a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
+++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gnutls +ssl"
 
-DEPEND="
+COMMON_DEPEND="
 	app-arch/bzip2
 	media-libs/freetype
 	>=media-libs/libjpeg-turbo-2.0.0:=[java?]
@@ -40,9 +40,15 @@ DEPEND="
 	!net-misc/tigervnc
 "
 RDEPEND="
-	${DEPEND}
+	${COMMON_DEPEND}
 	x11-apps/xkbcomp
 "
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/xtrans
+"
+
+PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch )
 
 src_prepare() {
 	use java && java-pkg-opt-2_src_prepare
@@ -57,6 +63,7 @@ src_configure() {
 		-DTVNC_BUILDNATIVE=$(usex java)
 		-DXKB_BIN_DIRECTORY=/usr/bin
 		-DXKB_DFLT_RULES=base
+		-DBUILDING_ON_MUSL=$(usex elibc_musl)	# bug #836723
 	)
 
 	if use ssl ; then