On Tue, Jan 14, 2020 at 04:16:46PM +0100, Benjamin Baier wrote:
> On Tue, 14 Jan 2020 01:47:48 +0100
> Jeremie Courreges-Anglas <[email protected]> wrote:
> > Advertizing support for IP_ADDRESS makes little sense if we know we
> > won't implement it. Maybe the use of #ifdef TCPCONN should be extended,
> > but I don't even know what's the deal between IP_ADDRESS and TCPCONN
> > (somehow related to xtrans).
> In this library TCPCONN == IP_ADDRESS, or better yet
> --disable-tcp-transport --> #undef TCPCONN --> no IP_ADDRESS support
>
> Okay, we should not advertise IP_ADDRESS if we don't support it.
>
I'm removing support completely and also making a patch for upstreams.
>
> Index: Makefile.bsd-wrapper
> ===================================================================
> RCS file: /cvs/xenocara/lib/libXmu/Makefile.bsd-wrapper,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile.bsd-wrapper
> --- Makefile.bsd-wrapper 10 May 2019 11:44:39 -0000 1.7
> +++ Makefile.bsd-wrapper 14 Jan 2020 15:01:32 -0000
> @@ -3,6 +3,7 @@
> SHARED_LIBS= Xmu 11.0 Xmuu 6.0
>
> CONFIGURE_ARGS+= --without-xsltproc --without-fop --without-xmlto
> +CONFIGURE_ARGS+= --disable-tcp-transport
>
> beforeinstall:
> ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
> Index: src/CvtStdSel.c
> ===================================================================
> RCS file: /cvs/xenocara/lib/libXmu/src/CvtStdSel.c,v
> retrieving revision 1.5
> diff -u -p -r1.5 CvtStdSel.c
> --- src/CvtStdSel.c 28 Sep 2013 17:31:53 -0000 1.5
> +++ src/CvtStdSel.c 14 Jan 2020 14:51:00 -0000
> @@ -307,16 +307,20 @@ XmuConvertStandardSelection(Widget w, Ti
> return True;
> }
> if (*target == XA_TARGETS(d)) {
> -#if defined(unix)
> +#if defined(TCPCONN) && defined(unix)
> # define NUM_TARGETS 8
> -#else
> +#elif defined(TCPCONN) || defined(unix)
> # define NUM_TARGETS 7
> +#else
> +# define NUM_TARGETS 6
> #endif
> Atom* std_targets = (Atom*)XtMalloc(NUM_TARGETS*sizeof(Atom));
> int i = 0;
> std_targets[i++] = XA_TIMESTAMP(d);
> std_targets[i++] = XA_HOSTNAME(d);
> +#ifdef TCPCONN
> std_targets[i++] = XA_IP_ADDRESS(d);
> +#endif
> std_targets[i++] = XA_USER(d);
> std_targets[i++] = XA_CLASS(d);
> std_targets[i++] = XA_NAME(d);
--
Matthieu Herrb
