|
From: | Jan Djärv |
Subject: | bug#6863: 24.0.50; ld: duplicate symbol _QPRIMARY in nsselect.o and keyboard.o |
Date: | Mon, 16 Aug 2010 17:09:49 +0200 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100713 Thunderbird/3.0.6 |
2010-08-16 16:33, Peter Dyballa skrev:
Am 16.08.2010 um 10:10 schrieb Jan Djärv:I checked in a fix.Sorry, I was too fast in reporting! >>>>>>> There are unresolved conflicts in this file <<<<<<< One is: <<<<<<< TREE Lisp_Object QCLIPBOARD, QPRIMARY, QSECONDARY, QTEXT, QFILE_NAME; ======= Lisp_Object QSECONDARY, QTEXT, QFILE_NAME; >>>>>>> MERGE-SOURCE Is the manual action to remove the "QCLIPBOARD, QPRIMARY, " text? The "first line" should substitute the "second one"?
It looks like you have applied a local patch. QPRIMARY shall be removed here. If you wan't to keep your patch, keep the TREE line but remove QPRIMARY.
The second case is: <<<<<<< TREE QCLIPBOARD = intern ("CLIPBOARD"); staticpro (&QCLIPBOARD); QPRIMARY = intern ("PRIMARY"); staticpro (&QPRIMARY); ======= >>>>>>> MERGE-SOURCE QSECONDARY = intern ("SECONDARY"); staticpro (&QSECONDARY); QTEXT = intern ("TEXT"); staticpro (&QTEXT); QFILE_NAME = intern ("FILE_NAME"); staticpro (&QFILE_NAME); The manual action is to remove two lines? Or adding them?
Keep MERGE-SOURCE but add the QCLIPBOARD = ... line to it. It is from your local patch.
Jan D.
[Prev in Thread] | Current Thread | [Next in Thread] |