diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-06 20:25:23 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-10-06 20:25:23 +0000 |
| commit | 86fcaa13a79da39967e224ec6d4f671c3a11583d (patch) | |
| tree | 3c57eeb1fab05eac53d5ee7c310a65d17eb29c0f /x11-toolkits/scintilla | |
| parent | - Update to 0.38 (diff) | |
Link scintilla against libgthread and friends to prevent undefined symbols
in moleskine.
PR: 57666
Submitted by: Jens Rehsack <rehsack@liwing.de>
Notes
Notes:
svn path=/head/; revision=90468
Diffstat (limited to 'x11-toolkits/scintilla')
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 26 |
2 files changed, 18 insertions, 9 deletions
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index b3b52dd6512d..338ab73ae037 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -7,6 +7,7 @@ PORTNAME= scintilla PORTVERSION= 1.55 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index 6ddc8b3705dd..24f549a32a64 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -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 |