[PATCH] x11-toolkits/scintilla misses gthread library

[Joe Marcus Clarke]

On Mon, 2003-10-06 at 13:45, Jens Rehsack wrote:
> 	
> >Description:
> 	Thanks to Joe Markus Clarke this patch adds the missed gthread library to
> 	the build of the scintilla-libs. This is required for editors like
> 	moleskine.
> 	Of course, this is a workaround. Better would, adding the required library
> 	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:
> 	
> >Fix:
> 	
> 	
> 	
> --- patch-add-libgthread begins here ---
> Index: x11-toolkits/scintilla/files/patch-aa
> ===================================================================
> 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.
>   
> @@ -21,7 +21,7 @@
>   
>   vpath %.h ../src ../include
>   vpath %.cxx ../src
> -@@ -33,9 +34,9 @@
> +@@ -33,29 +34,33 @@
>   endif
>   
>   ifdef DEBUG
> @@ -33,16 +33,24 @@
>   endif
>   
>   # 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=pkg-config --cflags gtk+-2.0
> ++LIBS=-lgthread2.0
>   else
>   ifdef GTK1
>  -CONFIGFLAGS=gtk-config --cflags
>  +CONFIGFLAGS=pkg-config --cflags gtk+
> ++LIBS=-lgthread12
>   else
>   ifneq (,$(findstring /,$(shell whereis -b pkg-config)))
>   CONFIGFLAGS=pkg-config --cflags gtk+-2.0
> -@@ -55,7 +56,7 @@
> ++LIBS=-lgthread2.0
> + else
> + CONFIGFLAGS=gtk-config --cflags
> ++LIBS=-lgthread12
> + endif
> + endif
>   endif
>   
>   .cxx.o:
> @@ -51,7 +59,7 @@
>   
>   #++Autogenerated -- run src/LexGen.py to regenerate
>   #**LEXOBJS=\\\n\(\*.o \)
> -@@ -69,7 +70,7 @@
> +@@ -69,7 +74,7 @@
>   
>   # The LEXOBJS have to be treated specially as the functions in them are not called from external code
>   
> @@ -60,16 +68,16 @@
>   
>   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=libs)` -o $@ $^
> ++	$(AR) `$(CONFIGFLAGS:cflags=libs)` ${LIBS} -o $@ $^
>  +
>  + $(LEXRLIB): $(LEXOBJS)
> -+	$(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
> ++	$(AR) `$(CONFIGFLAGS:cflags=libs)` ${LIBS} -o $@ $^
>   
>   # Automatically generate header dependencies with "make deps"
>   include deps.mak
> --- patch-add-libgthread ends here ---
> 
> 
> _______________________________________________
> freebsd-gnome at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe at freebsd.org"
-- 
PGP Key : http://www.marcuscom.com/pgp.asc


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/freebsd-gnome/attachments/20031006/fe5ded84/attachment.bin