From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jan =?UTF-8?Q?Dj=C3=A4rv?= Newsgroups: gmane.emacs.bugs 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 Message-ID: <4C6954BD.7090805@swipnet.se> References: <3089FF44-8D9B-47FD-8424-BB07924284B7@Freenet.DE> <4C68DCC2.8000507@swipnet.se> <27B5F678-2614-431D-A860-BA12732260DE@Freenet.DE> <4C68F25F.1090807@swipnet.se> <96AA5306-E58D-4E91-929D-BFE9CCD63928@Freenet.DE> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1281974477 1290 80.91.229.12 (16 Aug 2010 16:01:17 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 16 Aug 2010 16:01:17 +0000 (UTC) Cc: 6863@debbugs.gnu.org To: Peter Dyballa Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Aug 16 18:01:14 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ol27a-0006Nh-2R for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Aug 2010 18:01:10 +0200 Original-Received: from localhost ([127.0.0.1]:35854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ol1mx-0002XP-Eg for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 Aug 2010 11:39:51 -0400 Original-Received: from [140.186.70.92] (port=51052 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ol1m2-00020C-TK for bug-gnu-emacs@gnu.org; Mon, 16 Aug 2010 11:38:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ol1lz-00081X-Ob for bug-gnu-emacs@gnu.org; Mon, 16 Aug 2010 11:38:53 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52835) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ol1lz-00081S-LP for bug-gnu-emacs@gnu.org; Mon, 16 Aug 2010 11:38:51 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Ol1J8-0003ia-5o; Mon, 16 Aug 2010 11:09:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jan =?UTF-8?Q?Dj=C3=A4rv?= Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 Aug 2010 15:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6863 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 6863-submit@debbugs.gnu.org id=B6863.128197133314286 (code B ref 6863); Mon, 16 Aug 2010 15:09:02 +0000 Original-Received: (at 6863) by debbugs.gnu.org; 16 Aug 2010 15:08:53 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ol1Iz-0003iN-Lf for submit@debbugs.gnu.org; Mon, 16 Aug 2010 11:08:53 -0400 Original-Received: from smtprelay-h22.telenor.se ([195.54.99.197]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ol1Iw-0003iI-VI for 6863@debbugs.gnu.org; Mon, 16 Aug 2010 11:08:51 -0400 Original-Received: from ipb2.telenor.se (ipb2.telenor.se [195.54.127.165]) by smtprelay-h22.telenor.se (Postfix) with ESMTP id A7239EA041 for <6863@debbugs.gnu.org>; Mon, 16 Aug 2010 17:09:49 +0200 (CEST) X-SENDER-IP: [85.225.45.35] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvcyAKbxaExV4S0jPGdsb2JhbACHZ5haDAEBAQE1LbxQhTsE X-IronPort-AV: E=Sophos;i="4.55,376,1278280800"; d="scan'208";a="119000235" Original-Received: from c-232de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.35]) by ipb2.telenor.se with ESMTP; 16 Aug 2010 17:09:49 +0200 Original-Received: from [172.20.199.2] (gaffa [172.20.199.2]) by coolsville.localdomain (Postfix) with ESMTP id 7DBC07FA05A; Mon, 16 Aug 2010 17:09:48 +0200 (CEST) User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100713 Thunderbird/3.0.6 In-Reply-To: <96AA5306-E58D-4E91-929D-BFE9CCD63928@Freenet.DE> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Mon, 16 Aug 2010 11:09:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:39543 Archived-At: 2010-08-16 16:33, Peter Dyballa skrev: > > Am 16.08.2010 um 10:10 schrieb Jan Dj=E4rv: > >> 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; > =3D=3D=3D=3D=3D=3D=3D > 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.=20 If you wan't to keep your patch, keep the TREE line but remove QPRIMARY= . > > The second case is: > > <<<<<<< TREE > QCLIPBOARD =3D intern ("CLIPBOARD"); staticpro (&QCLIPBOARD); > QPRIMARY =3D intern ("PRIMARY"); staticpro (&QPRIMARY); > =3D=3D=3D=3D=3D=3D=3D > >>>>>>> MERGE-SOURCE > QSECONDARY =3D intern ("SECONDARY"); staticpro (&QSECONDARY); > QTEXT =3D intern ("TEXT"); staticpro (&QTEXT); > QFILE_NAME =3D intern ("FILE_NAME"); staticpro (&QFILE_NAME); > > The manual action is to remove two lines? Or adding them? > Keep MERGE-SOURCE but add the QCLIPBOARD =3D ... line to it. It is from = your=20 local patch. Jan D.