Please merge xterm 266-1 (main) from debian unstable (main)

It hasn't been synced because it doesn't build on natty, our delta can be dropped now otherwise. Do you have a patch to fix the linker problem by any chance?

On Fri, 19 Nov 2010, Robert Hooker wrote:

> It hasn't been synced because it doesn't build on natty, our delta can
> be dropped now otherwise. Do you have a patch to fix the linker problem
> by any chance?

what was the linker problem?

--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net

On Fri, Nov 19, 2010 at 00:11:02 -0000, Thomas Dickey wrote:

> On Fri, 19 Nov 2010, Robert Hooker wrote:
>
> > It hasn't been synced because it doesn't build on natty, our delta can
> > be dropped now otherwise. Do you have a patch to fix the linker problem
> > by any chance?
>
> what was the linker problem?
>
the compiler in Ubuntu's development version passes --no-add-needed to
the linker, which results in build failure because -lfontconfig and
-lX11 aren't passed when linking xterm. I reproduced the failure on
Debian by setting LDFLAGS="-Wl,--no-add-needed", and got a working build
with LDFLAGS="-Wl,--no-add-needed -lfontconfig -lX11".

The errors were:

/usr/bin/ld: fontutils.o: undefined reference to symbol 'FcCharSetHasChar'
/usr/bin/ld: note: 'FcCharSetHasChar' is defined in DSO /usr/lib64/libfontconfig.so.1 so try adding it to the linker command line

and

/usr/bin/ld: main.o: undefined reference to symbol 'XGeometry'
/usr/bin/ld: note: 'XGeometry' is defined in DSO /usr/lib64/libX11.so.6 so try adding it to the linker command line

Initially the libs used were -lXft -lXaw7 -lXt -lXmu -lXt -lSM -lICE
-lutempter -ltermcap.

The natty toolchain switched to these standards coming soon to a wheezy near you

http://wiki.debian.org/ToolChain/DSOLinking

/bin/sh ../plink.sh gcc -g -Wall -O2 -DDEF_ALLOW_FONT=False -DDEF_ALLOW_TCAP=False -DDEF_DISALLOWED_WINDOW=\"1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\" -Wl,-Bsymbolic-functions -o xterm button.o cachedGCs.o charproc.o charsets.o cursor.o data.o doublechr.o fontutils.o input.o linedata.o main.o menu.o misc.o print.o ptydata.o scrollback.o screen.o scrollbar.o tabs.o util.o xstrings.o xtermcap.o VTPrsTbl.o xutf8.o TekPrsTbl.o Tekproc.o charclass.o precompose.o wcwidth.o -lXft -lXaw7 -lXt -lXt -lSM -lICE -lutempter -ltermcap
testing if -lXft is needed
...yes
testing if -lXaw7 is needed
...yes
testing if -lXt is needed
...yes
testing if -lXt is needed
...yes
testing if -lSM is needed
...yes
testing if -lICE is needed
...yes
testing if -lutempter is needed
...yes
testing if -ltermcap is needed
...yes
/usr/bin/ld: fontutils.o: undefined reference to symbol 'FcCharSetHasChar'
/usr/bin/ld: note: 'FcCharSetHasChar' is defined in DSO /usr/lib/libfontconfig.so.1 so try adding it to the linker command line
/usr/lib/libfontconfig.so.1: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
make[1]: *** [xterm] Error 1

It used to build ok with this, until gcc was also changed to default to --as-needed

--- debian/rules.orig 2010-11-09 18:30:53.504000472 -0500
+++ debian/rules 2010-11-09 18:29:48.584000473 -0500
@@ -66,6 +66,7 @@
   $(confflags) \
   DESKTOP_FLAGS="$(DESKTOP_FLAGS)" \
   CFLAGS="$(CFLAGS)" \
+ LDFLAGS="-lfontconfig -lX11 -lXmu" \
   LUIT=/usr/bin/luit
  touch $@

That fails like this:

/bin/sh ../plink.sh gcc -g -Wall -O2 -DDEF_ALLOW_FONT=False -DDEF_ALLOW_TCAP=False -DDEF_DISALLOWED_WINDOW=\"1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\" -lfontconfig -lX11 -lXmu -o xterm button.o cachedGCs.o charproc.o charsets.o cursor.o data.o doublechr.o fontutils.o input.o linedata.o main.o menu.o misc.o print.o ptydata.o scrollback.o screen.o scrollbar.o tabs.o util.o xstrings.o xtermcap.o VTPrsTbl.o xutf8.o TekPrsTbl.o Tekproc.o charclass.o precompose.o wcwidth.o -lXft -lXaw7 -lXt -lXt -lSM -lICE -lutempter -ltermcap
testing if -lfontconfig is needed
...yes
testing if -lX11 is needed
...yes
testing if -lXmu is needed
...yes
testing if -lXft is needed
...yes
testing if -lXaw7 is needed
...yes
testing if -lXt is needed
...yes
testing if -lXt is needed
...yes
testing if -lSM is needed
...yes
testing if -lICE is needed
...yes
testing if -lutempter is needed
...yes
testing if -ltermcap is needed
...yes
/usr/bin/ld: fontutils.o: undefined reference to symbol 'FcCharSetHasChar'
/usr/bin/ld: note: 'FcCharSetHasChar' is defined in DSO /usr/lib/gcc/i686-linux-gnu/4.5.2/../../../../lib/libfontconfig.so so try adding it to the linker command line
/usr/lib/gcc/i686-linux-gnu/4.5.2/../../../../lib/libfontconfig.so: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
make[1]: *** [xterm] Error 1

On Fri, 19 Nov 2010, Julien Cristau wrote:

> On Fri, Nov 19, 2010 at 00:11:02 -0000, Thomas Dickey wrote:
>
>> On Fri, 19 Nov 2010, Robert Hooker wrote:
>>
>>> It hasn't been synced because it doesn't build on natty, our delta can
>>> be dropped now otherwise. Do you have a patch to fix the linker problem
>>> by any chance?
>>
>> what was the linker problem?
>>
> the compiler in Ubuntu's development version passes --no-add-needed to
> the linker, which results in build failure because -lfontconfig and
> -lX11 aren't passed when linking xterm. I reproduced the failure on
> Debian by setting LDFLAGS="-Wl,--no-add-needed", and got a working build
> with LDFLAGS="-Wl,--no-add-needed -lfontconfig -lX11".
>
> The errors were:
>
> /usr/bin/ld: fontutils.o: undefined reference to symbol 'FcCharSetHasChar'
> /usr/bin/ld: note: 'FcCharSetHasChar' is defined in DSO /usr/lib64/libfontconfig.so.1 so try adding it to the linker command line
>
> and
>
> /usr/bin/ld: main.o: undefined reference to symbol 'XGeometry'
> /usr/bin/ld: note: 'XGeometry' is defined in DSO /usr/lib64/libX11.so.6 so try adding it to the linker command line
>
> Initially the libs used were -lXft -lXaw7 -lXt -lXmu -lXt -lSM -lICE
> -lutempter -ltermcap.

I've an interim patch for #267 in

ftp://invisible-island.net/temp (xterm-266a or xterm-266b)

which probably fixes that. (I'm in the middle of a long documentation
change, which I intended to put into #267).

--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net

Thanks Thomas, that did fix a part of it, with xterm-266b:

/bin/sh ../plink.sh gcc -g -Wall -O2 -DDEF_ALLOW_FONT=False -DDEF_ALLOW_TCAP=False -DDEF_DISALLOWED_WINDOW=\"1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\" -Wl,-Bsymbolic-functions -o xterm button.o cachedGCs.o charproc.o charsets.o cursor.o data.o doublechr.o fontutils.o input.o linedata.o main.o menu.o misc.o print.o ptydata.o scrollback.o screen.o scrollbar.o tabs.o util.o xstrings.o xtermcap.o VTPrsTbl.o xutf8.o TekPrsTbl.o Tekproc.o charclass.o precompose.o wcwidth.o -lfontconfig -lXft -lXmu -lXaw7 -lXt -lSM -lICE -lXt -lutempter -ltermcap
testing if -lfontconfig is needed
...yes
testing if -lXft is needed
...yes
testing if -lXmu is needed
...yes
testing if -lXaw7 is needed
...yes
testing if -lXt is needed
...yes
testing if -lSM is needed
...yes
testing if -lICE is needed
...yes
testing if -lXt is needed
...yes
testing if -lutempter is needed
...yes
testing if -ltermcap is needed
...yes
/usr/bin/ld: main.o: undefined reference to symbol 'XGeometry'
/usr/bin/ld: note: 'XGeometry' is defined in DSO /usr/lib/libX11.so.6 so try adding it to the linker command line
/usr/lib/libX11.so.6: could not read symbols: Invalid operation

passing EXTRA_LOADFLAGS="-lX11" to make succeeds though

On Fri, 19 Nov 2010, Robert Hooker wrote:

> Thanks Thomas, that did fix a part of it, with xterm-266b:

thanks - I'll add a check for the x11 package, and email when that's
available (early morning - I'm near the end of my day, prone to error).

--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net

On Fri, 19 Nov 2010, Robert Hooker wrote:

> Thanks Thomas, that did fix a part of it, with xterm-266b:

I put an updated patch

xterm-266e.patch.gz

in

ftp://invisible-island.net/temp

which seems to work (given that I have to stub out pieces to reproduce the
configuration you're describing).

--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net

I was sure I attached the debdiff. Attaching now, sorry.

The debdiff has this comment in its patch for UXTerm.ad:

+ ! This includes "XTerm-color" which includes "XTerm", which defines fonts.
+ ! Why set them here?

The reason for setting fonts in UXTerm.ad is that they're different from the
ones in "XTerm", and override those values.

Thanks for the xterm merge! I have two questions:

1. xterm-266/debian/gbp.conf is modified but that is not documented in the changelog

2. The debian/changelog file also mentions:
 "Remove setgid bit from the xterm binary (LP: #616100)"
but I can not find in the debdiff where that is done.
(the original debdiff is here for this bug is here: http://launchpadlibrarian.net/53489120/xterm_261-1ubuntu3.debdiff)

Could you please check if these questions ? In the meantime I will unsubscribe ubuntu-sponsors as I would like to
clarify this before a new version is uploaded. Please just re-subscribe when the open questions are answered :)

Thanks,
 Michael

By the way, I release #267 last night, which has the above-mentioned configure-script
changes.

xterm's makefile will automatically suppress the setgid-bit if (as in the debdiff)
it is using utempter.

Hello Michael,

> 1. xterm-266/debian/gbp.conf is modified but that is not documented in the changelog

Seems this change was applied but never documented in the changelog

> 2. The debian/changelog file also mentions:
> "Remove setgid bit from the xterm binary (LP: #616100)"
> but I can not find in the debdiff where that is done.
> (the original debdiff is here for this bug is here: http://launchpadlibrarian.net/53489120/xterm_261-1ubuntu3.debdiff)

I can't find this change neither, I looked at the debdiff of the last merge.

However I'm waiting for the Debian maintainer of xterm to release the 267 version, alternatively we can release the version 267-0ubuntu1 in Ubuntu.

This bug was fixed in the package xterm - 267-0ubuntu1

---------------
xterm (267-0ubuntu1) natty; urgency=low

  * New upstream release (LP: #677129):
    + Minor formatting changes to ctlseqs.ms to simplify a script which
      extracts the feature information
    + Add docs-clean makefile rule
    + Add copy-selection action (request by Timo Juhani Lindfors,
      Debian #588785)
    + Trim leading/trailing blanks from string used for "Selection" font-menu
      data
    + Trim leading/trailing blanks from color resource values
    + Configure script improvements:
      + Add workaround for removal of X11 dependency from Xt's package file
        (report by Robert Hooker)
      + Add workaround for removal of fontconfig dependency from Xft's package
        file (report by Jeremy Huddleston)
      + Add workaround for removal of Xmu dependency from Xaw's package file
        (report by Jeremy Huddleston)
      + Improve workaround in CF_X_TOOLKIT macro, checking for other possible
        packages where Xt's dependencies may be given
      + Prefer ${name:=value} to ${name-value}, since recent bash changes
        break legacy support for that feature
 -- Lorenzo De Liso <email address hidden> Wed, 24 Nov 2010 22:54:46 +0100

Hey Thomas, thanks for explaining this about the xterm setgid bit.

On Wed, 1 Dec 2010, Michael Vogt wrote:

> Hey Thomas, thanks for explaining this about the xterm setgid bit.

no problem

--
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net