Attachment 145445 Details for Bug 190754 – scintilla-3.4.4.patch

[patch] scintilla-3.4.4.patch

scintilla-3.4.4.patch (text/plain), 4.01 KB, created by Naram Qashat on 2014-08-07 12:45:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2014-08-07 12:45:28 UTC

Size: 4.01 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 364265)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	scintilla
>-PORTVERSION=	3.4.1
>+PORTVERSION=	3.4.4
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	scite${PORTVERSION:S/.//g}
>@@ -12,7 +12,7 @@
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
> 
>-USES=		compiler gmake iconv pkgconfig tar:tgz
>+USES=		gmake iconv pkgconfig tar:tgz
> MAKEFILE=	makefile
> USE_LDCONFIG=	yes
> USE_GNOME=	gtk20
>@@ -27,17 +27,6 @@
> PICFLAG?=	-fpic
> .endif
> 
>-.if ! ${COMPILER_TYPE:Mclang}
>-CPPSTDRE=	-e 's|--std=c++0x||'
>-.else
>-CPPSTDRE=	
>-.endif
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(CC)|g' \
>-		${CPPSTDRE} \
>-		${WRKSRC}/makefile
>-
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
> 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla
>Index: distinfo
>===================================================================
>--- distinfo	(revision 364265)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (scite341.tgz) = ab2940ba6ad3f1c7c33aea233dd5b44efc75319062fe0b3625db04c747bf3341
>-SIZE (scite341.tgz) = 2237159
>+SHA256 (scite344.tgz) = 89602ea4c245928caac07bc5192d57f98b968e578efaf0748e3dd832a724c499
>+SIZE (scite344.tgz) = 2245870
>Index: files/patch-makefile
>===================================================================
>--- files/patch-makefile	(revision 364265)
>+++ files/patch-makefile	(working copy)
>@@ -1,22 +1,21 @@
>---- makefile.orig	2013-08-31 05:20:24.000000000 +0200
>-+++ makefile	2013-09-11 13:10:02.007909736 +0200
>-@@ -7,14 +7,7 @@
>+--- ./makefile.orig	2014-07-25 06:59:40.000000000 -0400
>++++ ./makefile	2014-08-07 08:31:47.000000000 -0400
>+@@ -7,14 +7,6 @@
>  # Also works with ming32-make on Windows.
>  
>  .SUFFIXES: .cxx .c .o .h .a
> -ifdef CLANG
>+-CXX = clang++
> -CC = clang
>--CCOMP = clang
>--else
>--CC = g++
>--CCOMP = gcc
>+-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
>+-# thread also need to create Position Independent Executable -> search online documentation
>+-SANITIZE = address
>+-#SANITIZE = undefined
> -endif
>--AR = ar
>-+AR = $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
>  RANLIB = touch
>  
>  ifdef GTK3
>-@@ -36,7 +29,8 @@
>+@@ -36,7 +28,8 @@
>  COMPLIB=..\bin\scintilla.a
>  else
>  DEL = rm -f
>@@ -26,18 +25,22 @@
>  endif
>  
>  vpath %.h ../src ../include ../lexlib
>-@@ -68,16 +62,17 @@
>- CXXTFLAGS:=--std=c++0x $(CTFLAGS)
>+@@ -64,8 +57,7 @@
>+ CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
>+ endif
>  
>+-CFLAGS:=$(CTFLAGS)
>+-CXXTFLAGS:=--std=c++0x $(CTFLAGS)
>++CXXTFLAGS:=$(CTFLAGS)
>+ 
>  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
>-+CONFIGLIBS:=$(shell pkg-config --libs $(GTKVERSION))
>  MARSHALLER=scintilla-marshal.o
>- 
>+@@ -73,11 +65,11 @@
>  .cxx.o:
>- 	$(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
>+ 	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
>  .c.o:
>--	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
>-+	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) $(CXXFLAGS) -w -c $<
>+-	$(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
>++	$(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
>  
>  LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
>  
>@@ -46,7 +49,7 @@
>  
>  clean:
>  	$(DEL) *.o $(COMPLIB) *.plist
>-@@ -93,9 +88,11 @@
>+@@ -93,9 +85,11 @@
>  	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o 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 \
>@@ -54,10 +57,10 @@
> -	$(AR) rc $@ $^
> -	$(RANLIB) $@
> +	$(MARSHALLER)
>-+	$(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
>++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
> +
> +$(LEXRLIB): $(LEXOBJS)
>-+	$(AR) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
>++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
>  
>  # Automatically generate header dependencies with "make deps"
>  include deps.mak

Flags:

cyberbotx: maintainer-approval+

Actions: View | Diff

Attachments on bug 190754: 143492 | 143493 | 143494 | 144639 | 144640 | 145445 | 145498