On Mon, Jan 13 2020, Benjamin Baier <[email protected]> wrote:
> On Mon, 13 Jan 2020 20:45:04 +0100
> Jeremie Courreges-Anglas <[email protected]> wrote:
>
>> ... I think IP_ADDRESS should just go.
>> Upstream doesn't seem to care much about it:
>>
>> https://bugs.freedesktop.org/show_bug.cgi?id=7611
> I agree.
>
>> Index: src/CvtStdSel.c
>> ===================================================================
>> RCS file: /d/cvs/xenocara/lib/libXmu/src/CvtStdSel.c,v
>> retrieving revision 1.5
>> diff -u -p -p -u -r1.5 CvtStdSel.c
>> --- src/CvtStdSel.c 28 Sep 2013 17:31:53 -0000 1.5
>> +++ src/CvtStdSel.c 11 Jan 2020 19:58:07 -0000
>> @@ -219,7 +219,7 @@ XmuConvertStandardSelection(Widget w, Ti
>> *format = 8;
>> return True;
>> }
>> -#if defined(TCPCONN)
>> +#if defined(TCPCONN) //&& !defined(__OpenBSD__)
> ^^--???
Oops, that's a remnant from tests.
>> if (*target == XA_IP_ADDRESS(d)) {
>> char hostname[1024];
>> #ifdef XTHREADS_NEEDS_BYNAMEPARAMS
>> @@ -307,7 +307,7 @@ XmuConvertStandardSelection(Widget w, Ti
>> return True;
>> }
>> if (*target == XA_TARGETS(d)) {
>> -#if defined(unix)
>> +#if defined(unix) && !defined(__OpenBSD__)
>> # define NUM_TARGETS 8
>> #else
>> # define NUM_TARGETS 7
>> @@ -316,7 +316,9 @@ XmuConvertStandardSelection(Widget w, Ti
>> int i = 0;q
>> std_targets[i++] = XA_TIMESTAMP(d);
>> std_targets[i++] = XA_HOSTNAME(d);
>> +#if !defined(__OpenBSD__)
>> 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);
>
> But why not just this?
> It simply returns False if somebody asks for IP_ADDRESS.
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).
> 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 12 Jan 2020 13:28:28 -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} \
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
