Date: Mon, 6 Oct 2003 11:10:10 -0700 (PDT) From: Jens Rehsack <rehsack@liwing.de> To: gnome@FreeBSD.org Subject: Re: ports/57663: [PATCH] x11-toolkits/scintilla misses gthread library Message-ID: <200310061810.h96IAAO7066969@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/57663; it has been noted by GNATS.
From: Jens Rehsack <rehsack@liwing.de>
To: freebsd-gnats-submit@FreeBSD.org, rehsack@liwing.de
Cc:
Subject: Re: ports/57663: [PATCH] x11-toolkits/scintilla misses gthread library
Date: Mon, 06 Oct 2003 18:08:00 +0000
This is a multi-part message in MIME format.
--------------040002020408030905000406
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Okay, I'm to stupid today. Here's the patch
--------------040002020408030905000406
Content-Type: text/plain;
name="patch-add-libgthread"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-add-libgthread"
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 18:03:06 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 18:02:43 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
++MORELIBS=pkg-config --libs gthread-2.0
else
ifdef GTK1
-CONFIGFLAGS=gtk-config --cflags
+CONFIGFLAGS=pkg-config --cflags gtk+
++MORELIBS=pkg-config --libs gthread
else
ifneq (,$(findstring /,$(shell whereis -b pkg-config)))
CONFIGFLAGS=pkg-config --cflags gtk+-2.0
-@@ -55,7 +56,7 @@
++MORELIBS=pkg-config --libs gthread-2.0
+ else
+ CONFIGFLAGS=gtk-config --cflags
++MORELIBS=pkg-config --libs gthread
+ 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)` `${MORELIBS}` -o $@ $^
+
+ $(LEXRLIB): $(LEXOBJS)
-+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
++ $(AR) `$(CONFIGFLAGS:cflags=libs)` `${MORELIBS}` -o $@ $^
# Automatically generate header dependencies with "make deps"
include deps.mak
--------------040002020408030905000406--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310061810.h96IAAO7066969>