diff options
| author | madpilot <madpilot@FreeBSD.org> | 2013-09-12 19:34:39 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2013-09-12 19:34:39 +0800 |
| commit | 5200286b04335d417a82498b41eab8e713bcc58d (patch) | |
| tree | 4e8cbfc1bed925addde70b69dd1d8c8441cacc72 /x11-toolkits/scintilla/files | |
| parent | 03cb19884e0d5be413e8926de9023578c1aa7a4a (diff) | |
| download | freebsd-ports-gnome-5200286b04335d417a82498b41eab8e713bcc58d.tar.gz freebsd-ports-gnome-5200286b04335d417a82498b41eab8e713bcc58d.tar.zst freebsd-ports-gnome-5200286b04335d417a82498b41eab8e713bcc58d.zip | |
- Update scintilla and scite to 3.3.5
- The update fixes build on recent head
PR: ports/182014
Submitted by: me
Approved by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
Diffstat (limited to 'x11-toolkits/scintilla/files')
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index 0bf57df19ec4..cd5b51477d0c 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -1,11 +1,11 @@ ---- makefile.orig 2013-02-18 02:20:43.000000000 -0500 -+++ makefile 2013-02-26 18:16:54.000000000 -0500 +--- makefile.orig 2013-08-31 05:20:24.000000000 +0200 ++++ makefile 2013-09-11 13:10:02.007909736 +0200 @@ -7,14 +7,7 @@ # Also works with ming32-make on Windows. .SUFFIXES: .cxx .c .o .h .a -ifdef CLANG --CC = clang --std=c++0x +-CC = clang -CCOMP = clang -else -CC = g++ @@ -26,8 +26,8 @@ endif vpath %.h ../src ../include ../lexlib -@@ -63,16 +57,17 @@ - CFLAGS:=$(CXXTFLAGS) +@@ -68,16 +62,17 @@ + CXXTFLAGS:=--std=c++0x $(CTFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) +CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION)) @@ -46,9 +46,9 @@ clean: $(DEL) *.o $(COMPLIB) *.plist -@@ -88,9 +83,11 @@ +@@ -93,9 +88,11 @@ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatGTK.o \ - KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ + KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ - $(MARSHALLER) $(LEXOBJS) - $(AR) rc $@ $^ |