summaryrefslogtreecommitdiff
path: root/x11-toolkits/scintilla/files/patch-makefile
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2014-12-05 12:36:04 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2014-12-05 12:36:04 +0000
commitc704b8c1719b299fdf5940dd2e30dbdec6e868d3 (patch)
tree52aa1bab91b88a3d3d84d900ae3499add23b9cc4 /x11-toolkits/scintilla/files/patch-makefile
parent- Update to 3.5.2 (diff)
- Update to 3.5.2
- Add license information PR: 195675 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer)
Notes
Notes: svn path=/head/; revision=374012
Diffstat (limited to 'x11-toolkits/scintilla/files/patch-makefile')
-rw-r--r--x11-toolkits/scintilla/files/patch-makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/x11-toolkits/scintilla/files/patch-makefile b/x11-toolkits/scintilla/files/patch-makefile
index e70955f6267b..ca276f4f22dd 100644
--- a/x11-toolkits/scintilla/files/patch-makefile
+++ b/x11-toolkits/scintilla/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig 2014-08-09 23:52:02 UTC
-+++ makefile
+--- makefile.orig 2014-11-28 00:47:24.000000000 +0400
++++ makefile 2014-12-04 14:28:51.000000000 +0400
@@ -7,14 +7,6 @@
# Also works with ming32-make on Windows.
@@ -25,17 +25,17 @@
endif
vpath %.h ../src ../include ../lexlib
-@@ -64,8 +57,7 @@
+@@ -68,8 +61,7 @@
CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
endif
-CFLAGS:=$(CTFLAGS)
--CXXTFLAGS:=--std=c++0x $(CTFLAGS)
-+CXXTFLAGS:=$(CTFLAGS)
+-CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
++CXXTFLAGS:=$(CTFLAGS) $(REFLAGS)
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
MARSHALLER=scintilla-marshal.o
-@@ -73,11 +65,11 @@
+@@ -77,11 +69,11 @@
.cxx.o:
$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
.c.o:
@@ -49,7 +49,7 @@
clean:
$(DEL) *.o $(COMPLIB) *.plist
-@@ -94,9 +86,11 @@
+@@ -98,9 +90,11 @@
PropSetSimple.o PlatGTK.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 \