From df26c7469c1f2af2e643d43e2e32a6c9142e4885 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Jan 2023 11:44:03 +0000 Subject: gentoo auto-resync : 11:01:2023 - 11:44:03 --- net-misc/turbovnc/Manifest | 1 - .../turbovnc-2.2.7-fix-musl-compilation.patch | 51 ---------------------- 2 files changed, 52 deletions(-) delete mode 100644 net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch (limited to 'net-misc/turbovnc') diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 95941916a8ea..2a65b77b0c93 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,4 +1,3 @@ -AUX turbovnc-2.2.7-fix-musl-compilation.patch 1535 BLAKE2B d0a95f7bffef46da41bb1faf3de3b3c3651890e3653ccb2d961e11921bb25c6910f9d4a049e9b6d867d214e1e0310de22ec3c423424acbebe7be2437d2ffb2ab SHA512 94ba2b53e02e9b2e32f70f2cfb4dd0cfb733726bb31383462113681c95afff4823dc82302641773947ab5e71fe6547a9f233b25146d9cd292f08da66faf8f786 AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517 DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11 DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c 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 deleted file mode 100644 index c9f5f0397b4c..000000000000 --- a/net-misc/turbovnc/files/turbovnc-2.2.7-fix-musl-compilation.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 - | ^~~~~~~~~~~~ - - ---- 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() - -- cgit v1.2.3