From owner-freebsd-gnome@FreeBSD.ORG Mon Oct 6 10:59:04 2003 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DFEFB16A4BF; Mon, 6 Oct 2003 10:59:04 -0700 (PDT) Received: from ms-smtp-02.southeast.rr.com (ms-smtp-02.southeast.rr.com [24.93.67.83]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0135343FB1; Mon, 6 Oct 2003 10:59:03 -0700 (PDT) (envelope-from marcus@marcuscom.com) Received: from creme-brulee.marcuscom.com (rdu74-159-108.nc.rr.com [24.74.159.108])h96Ht1kt024500; Mon, 6 Oct 2003 13:55:02 -0400 (EDT) Received: from [10.2.1.4] (vpn-client-4.marcuscom.com [10.2.1.4]) h96Hwn1v016012; Mon, 6 Oct 2003 13:58:49 -0400 (EDT) (envelope-from marcus@marcuscom.com) From: Joe Marcus Clarke To: Jens Rehsack In-Reply-To: <200310061745.h96Hjwr4037843@helo.liwing.de> References: <200310061745.h96Hjwr4037843@helo.liwing.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-EjnrzqmxdLnfUMR80brx" Organization: MarcusCom, Inc. Message-Id: <1065463144.748.58.camel@gyros> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 Date: Mon, 06 Oct 2003 13:59:04 -0400 X-Spam-Status: No, hits=-4.9 required=5.0 tests=BAYES_00 autolearn=ham version=2.60 X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on creme-brulee.marcuscom.com cc: FreeBSD GNOME Users cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: [PATCH] x11-toolkits/scintilla misses gthread library X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Oct 2003 17:59:05 -0000 --=-EjnrzqmxdLnfUMR80brx Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Mon, 2003-10-06 at 13:45, Jens Rehsack wrote: > =09 > >Description: > Thanks to Joe Markus Clarke this patch adds the missed gthread library t= o > the build of the scintilla-libs. This is required for editors like > moleskine. > Of course, this is a workaround. Better would, adding the required libra= ry > to the pkg-config information. I don't think your patch is correct. Simply linking in gthread will not work as it will leave unresolved symbols to pthread*. You might want to add a call to pkg-config --libs gthread instead of linking in the libraries explicitly. Joe > >How-To-Repeat: > =09 > >Fix: > =09 > =09 > =09 > --- patch-add-libgthread begins here --- > Index: x11-toolkits/scintilla/files/patch-aa > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > diff -u x11-toolkits/scintilla/files/patch-aa.orig x11-toolkits/scintilla= /files/patch-aa > --- x11-toolkits/scintilla/files/patch-aa.orig Mon Oct 6 17:21:45 2003 > +++ x11-toolkits/scintilla/files/patch-aa Mon Oct 6 17:25:37 2003 > @@ -1,5 +1,5 @@ > ---- makefile.orig Sun Sep 21 11:19:30 2003 > -+++ makefile Sun Sep 28 11:48:04 2003 > +--- makefile.orig Sun Sep 21 02:19:30 2003 > ++++ makefile Mon Oct 6 17:25:24 2003 > @@ -8,8 +8,8 @@ > # To force GTK+ 1 build, define GTK1 on the make command line. > =20 > @@ -21,7 +21,7 @@ > =20 > vpath %.h ../src ../include > vpath %.cxx ../src > -@@ -33,9 +34,9 @@ > +@@ -33,29 +34,33 @@ > endif > =20 > ifdef DEBUG > @@ -33,16 +33,24 @@ > endif > =20 > # If explicit setting of GTK1 or GTK2 then use that else look for > -@@ -44,7 +45,7 @@ > + # pkg-config which is an OK indication that GTK2 is available > + ifdef GTK2 > CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0 > ++LIBS=3D-lgthread2.0 > else > ifdef GTK1 > -CONFIGFLAGS=3Dgtk-config --cflags > +CONFIGFLAGS=3Dpkg-config --cflags gtk+ > ++LIBS=3D-lgthread12 > else > ifneq (,$(findstring /,$(shell whereis -b pkg-config))) > CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0 > -@@ -55,7 +56,7 @@ > ++LIBS=3D-lgthread2.0 > + else > + CONFIGFLAGS=3Dgtk-config --cflags > ++LIBS=3D-lgthread12 > + endif > + endif > endif > =20 > .cxx.o: > @@ -51,7 +59,7 @@ > =20 > #++Autogenerated -- run src/LexGen.py to regenerate > #**LEXOBJS=3D\\\n\(\*.o \) > -@@ -69,7 +70,7 @@ > +@@ -69,7 +74,7 @@ > =20 > # The LEXOBJS have to be treated specially as the functions in them are= not called from external code > =20 > @@ -60,16 +68,16 @@ > =20 > clean: > rm -f *.o $(COMPLIB) > -@@ -81,8 +82,10 @@ > +@@ -81,8 +86,10 @@ > ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o = PlatGTK.o \ > KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ > RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o > - $(AR) rc $@ $^ > - $(RANLIB) $@ > -+ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` -o $@ $^ > ++ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` ${LIBS} -o $@ $^ > + > + $(LEXRLIB): $(LEXOBJS) > -+ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` -o $@ $^ > ++ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` ${LIBS} -o $@ $^ > =20 > # Automatically generate header dependencies with "make deps" > include deps.mak > --- patch-add-libgthread ends here --- >=20 >=20 > _______________________________________________ > freebsd-gnome@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-gnome > To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org" --=20 PGP Key : http://www.marcuscom.com/pgp.asc --=-EjnrzqmxdLnfUMR80brx Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (FreeBSD) iD4DBQA/ga1ob2iPiv4Uz4cRApY5AJ9m2T24P5O6pN+Bh9mJiXiz5G0QOwCYgCFa ZCAfP6veS/qE/GBxi/3ivw== =nA8b -----END PGP SIGNATURE----- --=-EjnrzqmxdLnfUMR80brx--