public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/
@ 2023-01-11  5:56 Viorel Munteanu
  0 siblings, 0 replies; only message in thread
From: Viorel Munteanu @ 2023-01-11  5:56 UTC (permalink / raw
  To: gentoo-commits

commit:     520d7e6c78bef4d3d1fc769574eb29141525272b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jan 10 16:29:47 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 05:51:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520d7e6c

net-misc/turbovnc: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29047
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 .../turbovnc-2.2.7-fix-musl-compilation.patch      | 51 ----------------------
 1 file changed, 51 deletions(-)

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 <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()
- 


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2023-01-11  5:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-11  5:56 [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/files/ Viorel Munteanu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox