Attachment 150182 Details for Bug 195675 – Proposed patch for x11-toolkits/scintilla (since 370597 revision)

[patch] Proposed patch for x11-toolkits/scintilla (since 370597 revision)

scintilla_3.5.1-3.5.2.diff (text/plain), 2.81 KB, created by lightside on 2014-12-04 12:53:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2014-12-04 12:53:39 UTC

Size: 2.81 KB

patch

obsolete

>diff -ruN scintilla.orig/Makefile scintilla/Makefile
>--- scintilla.orig/Makefile	2014-10-10 20:24:00.000000000 +0400
>+++ scintilla/Makefile	2014-12-04 15:35:51.000000000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/x11-toolkits/scintilla/Makefile 370597 2014-10-10 16:24:00Z madpilot $
> 
> PORTNAME=	scintilla
>-PORTVERSION=	3.5.1
>+PORTVERSION=	3.5.2
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	scite${PORTVERSION:S/.//g}
>@@ -10,6 +10,11 @@
> MAINTAINER=	cyberbotx@cyberbotx.com
> COMMENT=	Full-featured free source code editing component for GTK+
> 
>+LICENSE=	SCINTILLA
>+LICENSE_NAME=	License for Scintilla and SciTE
>+LICENSE_FILE=	${WRKSRC}/../License.txt
>+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+
> WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
> 
> USES=		gmake iconv pkgconfig tar:tgz
>@@ -27,6 +32,9 @@
> PICFLAG?=	-fpic
> .endif
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
>+
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
> 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla
>diff -ruN scintilla.orig/distinfo scintilla/distinfo
>--- scintilla.orig/distinfo	2014-10-10 20:24:00.000000000 +0400
>+++ scintilla/distinfo	2014-12-04 14:17:53.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581
>-SIZE (scite351.tgz) = 2272014
>+SHA256 (scite352.tgz) = d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836
>+SIZE (scite352.tgz) = 2277393
>diff -ruN scintilla.orig/files/patch-makefile scintilla/files/patch-makefile
>--- scintilla.orig/files/patch-makefile	2014-10-10 20:24:00.000000000 +0400
>+++ scintilla/files/patch-makefile	2014-12-04 14:46:57.000000000 +0400
>@@ -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 \

Actions: View | Diff

Attachments on bug 195675: 150182 | 150183 | 150184 | 150185 | 150190 | 150220 | 150221 | 150222