From 0e1abc96fea41c994e56391bd01c5c9298236783 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Apr 2023 00:06:15 +0100 Subject: gentoo auto-resync : 23:04:2023 - 00:06:15 --- net-misc/rdesktop/Manifest | 3 +- .../files/rdesktop-1.9.0-configure-clang16.patch | 28 ++++++++ net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild | 79 --------------------- net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild | 80 ++++++++++++++++++++++ 4 files changed, 110 insertions(+), 80 deletions(-) create mode 100644 net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch delete mode 100644 net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild create mode 100644 net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild (limited to 'net-misc/rdesktop') diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest index e811ba7374a0..e95143b6778b 100644 --- a/net-misc/rdesktop/Manifest +++ b/net-misc/rdesktop/Manifest @@ -1,8 +1,9 @@ AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d +AUX rdesktop-1.9.0-configure-clang16.patch 897 BLAKE2B fa1fc01810a466ed855c1c7b3acf0cd7a15b5991494efcb01c85d58fcc04bff0d623e0f3ad1b9480fb3e9272b9cd5c260ef52d104c14e7932637f31cede16d6f SHA512 398373fbc2f60fe47ed2a6cb1c629b228765c82e7d4deb7fc23d3a11f3a17e752f3fa19565afcd7fb80a24c227bb8112413c006685ff4c517bfa7ebae7ac1205 AUX rdesktop-1.9.0-gssapi-check.patch 332 BLAKE2B 618723ba40cd536556eafdebd44a4f9bf867d1890a16a027015390c8402f9da98513ec5fa5fdc2fee754d4e6c436cfd20d61cf830e3f9a8d7111bac37cbeed06 SHA512 85308d3230fa71a2381f35c20c02e3316a8b1b98bbe3f507d9f14fc8f7e703ffd7a6a45907e0799d3f7a243da52571e3c07b7adb1f68a4123133d8ea3eb31451 AUX rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch 783 BLAKE2B 0bb5f27486f31ed7150271cebb5e901e013b05d22106304304d5bac0e3d5344265779152cf74878dee7d3f7cd30f3e6e47356598eea94ee4a8fc7d3c8490c9bd SHA512 d408c0cd4ab31edd6246e41d173426993ec046810c83753eef005eaa018d72dbaea8de8738a099527a08e7248904e18ed29a8eb04e9a37a0e8939699e247f485 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5 -EBUILD rdesktop-1.9.0-r2.ebuild 1795 BLAKE2B 0b27ac660fb99ea8417d3daf3ab4788c82b4b6bd7a1767b137130ba39449f7f2eefd57fd30450c64f4458467fa0eb04c2ddec5b7ceac2a6cce153cd2e384d6ff SHA512 6c258cdcd7d14da85449aa1c40dd29acab05359456cd6e861164b9f3d40f1dc60a4de2c8d6ebf12add9f5c42ee787b47e15a1bd741692bae5ddaf24ca0abd812 +EBUILD rdesktop-1.9.0-r3.ebuild 1839 BLAKE2B 6f597fac08df830aca219e47065c54bbbc8b795d0b8a0ce1bbb0c70b09c87cbdc74566d799dacbb227282e7a93388ecffe6d38735c9a32763eaa96928dc5377c SHA512 892b4d7c95f26bd37cc220e8754f596784803afb252dca781153e0d73bc606050fe35b19045586c0d1ae0b09a60ee20037a232a62f6121ae7902522bd38eb78e EBUILD rdesktop-1.9.0.ebuild 1694 BLAKE2B 643d0eb4f1aa7d86ebed2fea56d07c7d17f6610c4b6adaa2b3c502c0bc1821e2bb95b4b07f27f09e2b4592beadd29f6ffcf9d788a5a64b4deaec0888748dbe29 SHA512 7922b7ffc4cf08ba3c96faa43dfba382e573abfec39ab61d0bccbd63fed6b130fd536eec0bbe18996c519cf6a13935c8ced073632d62275c1829444aa4b2a84c MISC metadata.xml 941 BLAKE2B 966b0157d9829250ad1c8e31ddba5033d48ce9fa7991b380ac62f085d28ab1d5a8359b0f085fdb2cc6eb4f449fb1eaabfc2007852b33935104287d3ede542642 SHA512 6fcf246ef6bd5379935099046d6a760f339714ce05ed78aaf92d4c0467fcca29e4580d19e2fb168916251d936f94d34cfd3a86734f2b45028f0dc4f441d3bf4e diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch new file mode 100644 index 000000000000..7222fdbb1e46 --- /dev/null +++ b/net-misc/rdesktop/files/rdesktop-1.9.0-configure-clang16.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/900310 +https://github.com/rdesktop/rdesktop/pull/407 + +From 0a38f855c2f6bb197539fbb9ec0ce5a97775a178 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 18 Apr 2023 09:55:39 +0200 +Subject: [PATCH] configure.ac: Fix statvfs64 check for C99 compatibility + +C99 does not support implicit ints and implicit function declarations +(such as exit here). Avoid them, so that the configure check does +not fail unconditionally with such compilers. +--- a/configure.ac ++++ b/configure.ac +@@ -668,12 +668,13 @@ if test $space = no; then + # SVR4 + AC_CACHE_CHECK([statvfs64 function (SVR4)], fu_cv_sys_stat_statvfs64, + [AC_TRY_RUN([ ++#include + #if defined(HAVE_UNISTD_H) + #include + #endif + #include + #include +- main () ++ int main (void) + { + struct statvfs64 fsd; + exit (statvfs64 (".", &fsd)); diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild deleted file mode 100644 index 4d21768aeb01..000000000000 --- a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_PV=${PV/_/-} - -DESCRIPTION="A Remote Desktop Protocol Client" -HOMEPAGE="http://www.rdesktop.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr" - -S=${WORKDIR}/${PN}-${MY_PV} - -RDEPEND=" - dev-libs/nettle:0= - >=net-libs/gnutls-3.2.0:0= - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - alsa? ( - media-libs/alsa-lib - media-libs/libsamplerate - ) - ao? ( - >=media-libs/libao-0.8.6 - media-libs/libsamplerate - ) - kerberos? ( virtual/krb5 ) - pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) - oss? ( media-libs/libsamplerate ) - pulseaudio? ( - media-libs/libsamplerate - media-sound/pulseaudio - ) - xrandr? ( x11-libs/libXrandr )" -DEPEND="${RDEPEND} - x11-libs/libXt" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.3-no_strip.patch - "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch - "${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch - "${FILESDIR}"/${P}-gssapi-check.patch -) - -DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - if use pulseaudio; then - sound_conf="--with-sound=pulse" - elif use ao; then - sound_conf="--with-sound=libao" - elif use alsa; then - sound_conf="--with-sound=alsa" - else - sound_conf=$(use_with oss sound oss) - fi - - econf \ - $(use_with ipv6) \ - $(use_with xrandr) \ - $(use_enable kerberos credssp) \ - $(use_enable pcsc-lite smartcard) \ - ${sound_conf} -} diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild new file mode 100644 index 000000000000..c62a294dd291 --- /dev/null +++ b/net-misc/rdesktop/rdesktop-1.9.0-r3.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +MY_PV=${PV/_/-} + +DESCRIPTION="A Remote Desktop Protocol Client" +HOMEPAGE="http://www.rdesktop.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr" + +S=${WORKDIR}/${PN}-${MY_PV} + +RDEPEND=" + dev-libs/nettle:0= + >=net-libs/gnutls-3.2.0:0= + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXau + x11-libs/libXdmcp + alsa? ( + media-libs/alsa-lib + media-libs/libsamplerate + ) + ao? ( + >=media-libs/libao-0.8.6 + media-libs/libsamplerate + ) + kerberos? ( virtual/krb5 ) + pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) + oss? ( media-libs/libsamplerate ) + pulseaudio? ( + media-libs/libsamplerate + media-sound/pulseaudio + ) + xrandr? ( x11-libs/libXrandr )" +DEPEND="${RDEPEND} + x11-libs/libXt" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.3-no_strip.patch + "${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch + "${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch + "${FILESDIR}"/${P}-gssapi-check.patch + "${FILESDIR}"/${P}-configure-clang16.patch +) + +DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + if use pulseaudio; then + sound_conf="--with-sound=pulse" + elif use ao; then + sound_conf="--with-sound=libao" + elif use alsa; then + sound_conf="--with-sound=alsa" + else + sound_conf=$(use_with oss sound oss) + fi + + econf \ + $(use_with ipv6) \ + $(use_with xrandr) \ + $(use_enable kerberos credssp) \ + $(use_enable pcsc-lite smartcard) \ + ${sound_conf} +} -- cgit v1.2.3