Attachment 172277 Details for Bug 210940 – Proposed patch for x11-toolkits/scintilla (since 415182 revision)

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

scintilla_3.6.5-3.6.6.diff (text/plain), 3.07 KB, created by lightside on 2016-07-09 09:30:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-07-09 09:30:59 UTC

Size: 3.07 KB

patch

obsolete

>diff -ruN scintilla.orig/Makefile scintilla/Makefile
>--- scintilla.orig/Makefile	2016-05-14 12:54:49.000000000 +0400
>+++ scintilla/Makefile	2016-07-09 11:56:36.374717000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/x11-toolkits/scintilla/Makefile 415182 2016-05-14 08:54:49Z madpilot $
> 
> PORTNAME=	scintilla
>-PORTVERSION=	3.6.5
>+PORTVERSION=	3.6.6
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	scite${PORTVERSION:S/.//g}
>@@ -17,7 +17,7 @@
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
> 
>-USES=		gmake iconv pkgconfig tar:tgz
>+USES=		compiler:c++11-lib gmake iconv pkgconfig tar:tgz
> MAKEFILE=	makefile
> USE_LDCONFIG=	yes
> USE_GNOME=	gtk20
>diff -ruN scintilla.orig/distinfo scintilla/distinfo
>--- scintilla.orig/distinfo	2016-05-14 12:54:49.000000000 +0400
>+++ scintilla/distinfo	2016-07-09 11:48:39.296645000 +0400
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1463151644
>-SHA256 (scite365.tgz) = dde62ebebbd4c36afd81ab0e745ff04839f4cfc911496f2d0463aade1374b9d1
>-SIZE (scite365.tgz) = 2391190
>+TIMESTAMP = 1464048149
>+SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa
>+SIZE (scite366.tgz) = 2371062
>diff -ruN scintilla.orig/files/patch-makefile scintilla/files/patch-makefile
>--- scintilla.orig/files/patch-makefile	2016-03-27 09:02:51.000000000 +0400
>+++ scintilla/files/patch-makefile	2016-07-09 11:37:58.493166000 +0400
>@@ -1,9 +1,9 @@
>---- makefile.orig	2014-11-27 20:47:24 UTC
>+--- makefile.orig	2016-05-17 23:50:39 UTC
> +++ makefile
> @@ -7,14 +7,6 @@
>  # Also works with ming32-make on Windows.
>  
>- .SUFFIXES: .cxx .c .o .h .a
>+ .SUFFIXES: .cxx .c .o .h .a .list
> -ifdef CLANG
> -CXX = clang++ -Wno-deprecated-register
> -CC = clang
>@@ -15,7 +15,7 @@
>  RANLIB = touch
>  
>  ifdef GTK3
>-@@ -36,7 +28,8 @@
>+@@ -42,7 +34,8 @@ DEL = del /q
>  COMPLIB=..\bin\scintilla.a
>  else
>  DEL = rm -f
>@@ -25,23 +25,25 @@
>  endif
>  
>  vpath %.h ../src ../include ../lexlib
>-@@ -77,8 +70,7 @@
>+@@ -74,7 +67,6 @@ else
>  CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
>  endif
>  
> -CFLAGS:=$(CTFLAGS)
>--CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
>-+CXXTFLAGS:=$(CTFLAGS) $(REFLAGS)
>+ CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
>  
>  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
>- MARSHALLER=scintilla-marshal.o
>-@@ -77,11 +69,11 @@
>+@@ -83,7 +75,7 @@ MARSHALLER=scintilla-marshal.o
>  .cxx.o:
>  	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
>  .c.o:
> -	$(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
> +	$(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
>  
>+ GLIB_GENMARSHAL = glib-genmarshal
>+ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
>+@@ -95,7 +87,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
>+ 
>  LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
>  
> -all: $(COMPLIB)
>@@ -49,7 +51,7 @@
>  
>  clean:
>  	$(DEL) *.o $(COMPLIB) *.plist
>-@@ -98,9 +90,11 @@
>+@@ -112,9 +104,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le
>  	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 \

Flags:

cyberbotx: maintainer-approval+

Actions: View | Diff

Attachments on bug 210940: 172277 | 172278