86291 - Xprint duplicates symbols from some widgets

Status: VERIFIED FIXED

(Core Graveyard :: Printing: Xprint, defect)

Description

[cls]

I attempted to create a static build from the STATIC_BUILD_20010612_BRANCH tag
and the final link of mozilla-bin failed with the following error:

../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o): In function
`nsFontStretch::SortSizes(void)':
nsFontMetricsGTK.o(.text+0x2f54): multiple definition of
`nsFontStretch::SortSizes(void)'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXP.o)(.text+0x2bcc): first
defined here
../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o): In function
`nsFontWeight::FillStretchHoles(void)':
nsFontMetricsGTK.o(.text+0x2f78): multiple definition of
`nsFontWeight::FillStretchHoles(void)'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXP.o)(.text+0x2bf0): first
defined here
/usr/bin/ld: Warning: size of symbol `nsFontWeight::FillStretchHoles(void)'
changed from 467 to 463 in nsFontMetricsGTK.o
../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o): In function
`nsFontStyle::FillWeightHoles(void)':
nsFontMetricsGTK.o(.text+0x3148): multiple definition of
`nsFontStyle::FillWeightHoles(void)'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXP.o)(.text+0x2dc4): first
defined here
../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o): In function
`nsFontNode::FillStyleHoles(void)':
nsFontMetricsGTK.o(.text+0x3328): multiple definition of
`nsFontNode::FillStyleHoles(void)'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXP.o)(.text+0x2fa4): first
defined here
collect2: ld returned 1 exit status
make[1]: *** [mozilla-bin] Error 1
make[1]: Leaving directory `/usr/cls/moz/static-20010612/obj-bigball/xpfe/bootstrap'
make: *** [install] Error 2

Comment 1

[cls]

Attachment: Rename some internal xprint font classes

Comment 2

[cls]

Attachment: Rename some internal xprint font classes

Comment 3

[Roland Mainz]

cls:
1. I am going to reuse nsFontMetricsXlib.cpp in the near future.
nsFontMetricsXP.cpp is more or less obsolete. Both sources are ~98% identical
except s/Xp/Xlib/ and some minor other things(=~2% ... :-)
2. Is there no way except renaming all classes ?
3. If [2] is unavoidable the same changes should be "made" to the
nsFontMetrics(GTK|Xlib).(cpp|h) files, too - to keep class naming consistently
(hi pocemit/timecop !)...

Swapping QA<-->bug owner as usual...

Comment 4

[cls]

No, there is no other way except renaming all of the classes.  How you do it is
up to you, however.  You can either copy the file and duplicate the classes line
for line and change the name of the class that way.  Or you can modify the
original file to use macros that will automatically change the name of the class
if a certain define is used.  You'll have to run the latter situation by the
Xlib owner.  Either way, this needs to be done ASAP as the static build code is
going to land tomorrow.

Comment 5

[Roland Mainz]

OK OK... as a quick&dirty solution I suggest a #define for these classes as a
workaround - otherwise my current patches in work are for --> trashcan...

Comment 6

[Roland Mainz]

1. Accepting bug
2. ToDo:
bug 83242 has a comment about a build issue, fix:
-- snip --
add " $(srcdir)/../xlib " to VPATH and remove the ../xlib/ from the files in
CPPSRCS
-- snip --

Comment 7

[Roland Mainz]

ToDo:
Somehow something changed which breaks linking of Xlib-toolkit-based mozilla-bin
(see bug 84482):
-- snip --
BUILD_OFFICIAL=1 ./configure --prefix=%{_prefix} --enable-optimize \
        --disable-debug \
        --with-default-mozilla-five-home=/usr/lib/mozilla \
        --enable-strip-libs --disable-tests --disable-short-wchar \
        --enable-nspr-autoconf --with-extensions --without-mng \
        --enable-crypto \
        --enable-toolkit=xlib

but it tailed at the end with:nsWindowCreator.cpp
nsSigHandlers.cpp
showOSAlert.cpp
nsAppRunner.o: In function `InitializeProfileService(nsICmdLineService *)':
nsAppRunner.o(.text+0x1fe6): undefined reference to
`nsMPFileLocProvider::nsMPFileLocProvider(void)'
../../dist/bin/libxlibrgb.so: undefined reference to `NS_ERROR'
collect2: ld returned 1 exit status
make[1]: *** [mozilla-bin] Error 1
make: *** [install] Error 2
-- snip --

Seems I am blind, I do not see why it fails... I'll disable the NS_ERROR stuff
in xlibrgb.c for now as a workaround - maybe this works... ;-(

Comment 8

[Roland Mainz]

Attachment: Prototype patch for 2001-06-19-08-trunk + bug 83242

Comment 9

[Roland Mainz]

Filed prototype patch to adress the issues lited here. Patch requires checkin of
patch in bug 83242 first.
I have used #define to rename the classes - this is a _hack_ solution to keep
the patch small for now.

cls:
1. Wanna test this patch and check if the all duplicate symbols in Xprint module
land are "gone" ?
2. change to mozilla/gfx/src/Makefile.in contains a small flaw: xlibrgb is added
twice to DIRS when Mozilla is build with Xlib-toolkit... any idea how to fix
this more cleanly ?

I'll file a final patch (where classes have been renamed itself, no #define
hack) if it works for StaticBuild stuff...

It would be nice if we could rename classes in GTK+ toolkit, too - for
consistency&correctness...

Comment 10

[Roland Mainz]

Attachment: Better patch for 2001-06-19-08-trunk + bug 83242

Comment 11

[Roland Mainz]

Filed new patch.

After looking a 3rd time over the patch I see two issues:

1. Bad blank:
-- snip --
 # Build xlibrgb only for X toolkits
-ifneq (,$(filter motif xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB))
+ifneq (,$(filter motif xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)
$(MOZ_ENABLE_XPRINT))
-- snip --

2. Unneccesary VPATH stuff (Xlib-toolkit _links_ against xlibrgb.so instead of
importing sources (I wasn't aware that this has been changed recently... ;-( )):
-- snip --
diff -r -u mozilla_original/gfx/src/xlib/Makefile.in
mozilla/gfx/src/xlib/Makefile.in
--- mozilla_original/gfx/src/xlib/Makefile.in   Wed Jun 20 19:21:26 2001
+++ mozilla/gfx/src/xlib/Makefile.in    Wed Jun 20 17:24:22 2001
@@ -22,13 +22,13 @@
 DEPTH          = ../../..
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
-VPATH          = @srcdir@
+VPATH          = @srcdir@:@srcdir@/../xlibrgb
 
 include $(DEPTH)/config/autoconf.mk
-- snip --

Dauphin/cls - do you see more issues ?

Comment 12

[cls]

Patch was checked in with the exception of the changes that rely upon bug 83242
as they are independent.

Comment 13

[Roland Mainz]

Does that mean that patch in bug 83242 is busted ?

Comment 14

[Roland Mainz]

cls:
This patch is useless without patch in bug 83242.
Requesting backout of that patch, please.

Current StaticBuild stuff works with patched nsFontMetricsXP.(cpp|h), patching
nsFontMetricsXlib.(cpp|h) is _only_ neccesary _after_ patch in bug 83242 has
been checked-in...

Comment 15

[cls]

Why back it out so that you can reapply it after 83242 is checked in?  Applying
the patch in 83242 to the current tree has one small easily fixed conflict in
nsFontMetricsXlib.cpp and 3 easily fixed conflicts in xprint/Makefile.in . 
Backing out this patch doesn't make any sense unless you're not going to check
in 83242 at all.

Comment 16

[Roland Mainz]

No, wrong. You are patching the sources in the wrong order. This bug has a
explicit dependicy on bug 83242... see "view bug activity"... see "attachment
comments", see comments in "description" of this bug... I marked the dependicy
_everywhere_...

Comment 17

[Roland Mainz]

More ToDo stuff:
Rename class |nsGCCache| to |nsGCCacheXlib|

Comment 18

[cls]

static build errors after applying patch from 83242

../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o)(.data+0xc34):
multiple definition of `FLG_WESTERN'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXlib.o)(.data+0x4cc):
first defined here
../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o)(.data+0xc3c):
multiple definition of `FLG_ZHCN'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXlib.o)(.data+0x4d4):
first defined here
../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o)(.data+0xc44):
multiple definition of `FLG_ZHTW'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXlib.o)(.data+0x4dc):
first defined here
../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o)(.data+0xc4c):
multiple definition of `FLG_JA'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXlib.o)(.data+0x4e4):
first defined here
../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o)(.data+0xc54):
multiple definition of `FLG_KO'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXlib.o)(.data+0x4ec):
first defined here
../../dist/lib/components/libgfx_gtk.a(nsFontMetricsGTK.o)(.data+0xc5c):
multiple definition of `FLG_NONE'
../../dist/lib/components/libgfxxprint.a(nsFontMetricsXlib.o)(.data+0x4f4):
first defined here
../../dist/lib/components/libgfx_gtk.a(nsGCCache.o)(.data+0x0): multiple
definition of `nsGCCache::copyRegion'
../../dist/lib/components/libgfxxprint.a(nsGCCache.o)(.data+0x0): first defined here
../../dist/lib/components/libgfx_gtk.a(nsGCCache.o): In function
`nsGCCache::nsGCCache(void)':
nsGCCache.o(.text+0x0): multiple definition of `nsGCCache::nsGCCache(void)'
../../dist/lib/components/libgfxxprint.a(nsGCCache.o)(.text+0x0): first defined here
../../dist/lib/components/libgfx_gtk.a(nsGCCache.o): In function
`nsGCCache::move_cache_entry(PRCListStr *)':
nsGCCache.o(.text+0x58): multiple definition of
`nsGCCache::move_cache_entry(PRCListStr *)'
../../dist/lib/components/libgfxxprint.a(nsGCCache.o)(.text+0x58): first defined
here
../../dist/lib/components/libgfx_gtk.a(nsGCCache.o): In function
`nsGCCache::free_cache_entry(PRCListStr *)':
nsGCCache.o(.text+0x88): multiple definition of
`nsGCCache::free_cache_entry(PRCListStr *)'
../../dist/lib/components/libgfxxprint.a(nsGCCache.o)(.text+0x88): first defined
here
/usr/bin/ld: Warning: size of symbol `nsGCCache::free_cache_entry(PRCListStr *)'
changed from 127 to 107 in nsGCCache.o
../../dist/lib/components/libgfx_gtk.a(nsGCCache.o): In function
`nsGCCache::~nsGCCache(void)':
nsGCCache.o(.text+0xf4): multiple definition of `nsGCCache::~nsGCCache(void)'
../../dist/lib/components/libgfxxprint.a(nsGCCache.o)(.text+0x108): first
defined here
/usr/bin/ld: Warning: size of symbol `nsGCCache::~nsGCCache(void)' changed from
134 to 138 in nsGCCache.o
../../dist/lib/components/libgfx_gtk.a(nsGCCache.o): In function
`nsGCCache::ReportStats(void)':
nsGCCache.o(.text+0x180): multiple definition of `nsGCCache::ReportStats(void)'
../../dist/lib/components/libgfxxprint.a(nsGCCache.o)(.text+0x190): first
defined here
../../dist/lib/components/libgfx_gtk.a(nsGCCache.o): In function `nsGCCache::Flu

Comment 19

[Roland Mainz]

cls:
Thanks for fixing these issues. 
AFAIK we can close this bug now (and file a new one to replace the hack in
nsGCCache.(cpp|h) with a real s/nsGCCache/nsGCCacheXlib/-thingie...)...

Is that OK for you ?

Comment 20

[Martin Macok]

Is this related?

Red Hat Linux release 20010619 (Rawhide) (XFree86-4.1.0)
20010622xx (nigthly whithout any patches)

BUILD_OFFICIAL=1 ./configure --prefix=%{_prefix} --enable-optimize \
        --disable-debug \
        --with-default-mozilla-five-home=/usr/lib/mozilla \
        --enable-strip-libs --disable-tests --disable-short-wchar \
        --enable-nspr-autoconf --with-extensions --without-mng \
        --enable-crypto \
        --enable-toolkit=xlib

...

nsGCCache.cpp
xprintutil.c
xprintutil.c: In function `XpuGetPrinter2':
xprintutil.c:99: warning: comparison between pointer and integer
xprintutil.c: In function `XpuGetPrinter':
xprintutil.c:134: warning: assignment makes integer from pointer without a cast
.deps/xprintutil.pp: no such file or directory
xprintutil.c: In function `XpuSetContentOrientation':
xprintutil.c:313: warning: control reaches end of non-void function

In the directory  /usr/src/redhat/BUILD/mozilla/gfx/src/xprint
The following command failed to execute properly:
gcc -o xprintutil.o -c -DOSTYPE="Linux2.4.5-0" -DOSARCH="Linux" -DOJI
-D_IMPL_NS_GFXONXP -DUSE_MOZILLA_TYPES -DUSE_XPRINT -D_IMPL_NS_XPRINT
-D_BSD_SOURCE -I../../../dist/include -I../../../dist/include
-I/usr/src/redhat/BUILD/mozilla/dist/include/nspr -I./../gtk -I./../xlib
-I./../xlibrgb -I./../xprint -I/usr/X11R6/include -fPIC -I/usr/X11R6/include
-Wall -W -Wno-unused -Wpointer-arith -Wcast-align -pedantic -Wno-long-long -pipe
-fshort-wchar -pthread -O -DNDEBUG -DTRIMMED -I/usr/X11R6/include
-I/usr/X11R6/include -include ../../../config-defs.h -DMOZILLA_CLIENT
-Wp,-MD,.deps/xprintutil.pp xprintutil.c
make[3]: *** [xprintutil.o] Error 1
make[2]: *** [install] Error 2
make[1]: *** [install] Error 2
make: *** [install] Error 2

Comment 21

[pocemit]

the issue with broken dependencies (comment above) is in bug 87422

Comment 22

[Roland Mainz]

Marking bug as "FIXED"... AFAIK all StaticBuild issues in Xprint module have
been fixed for now... :-)

Comment 23

[Masaki Katakai]

I'm now verifying the Xprt bugs, however, I'm not sure how to
verify this bug.

Roland,

could you give the exact instruction how to verify this problem.
Is it OK when I can compile with the following?

BUILD_OFFICIAL=1 ./configure --prefix=%{_prefix} --enable-optimize \
        --disable-debug \
        --with-default-mozilla-five-home=/usr/lib/mozilla \
        --enable-strip-libs --disable-tests --disable-short-wchar \
        --enable-nspr-autoconf --with-extensions --without-mng \
        --enable-crypto \
        --enable-toolkit=xlib

Comment 24

[Roland Mainz]

katakai:
"StaticBuild" means that all components are put into one single monster binary
You have to add the options "--enable-static --disable-shared" to "configure" to
get a static build (but be prepared that this needs more compilation time - and
the final link step may need insane abouts of swap) ...

cls:
Can you VERIFY this one for us, please ?

Comment 25

[hacker formerly known as [e-mail]]

verified.

Comment 26

[Masaki Katakai]

cls,

Thank you for veritication.