Attachment 174407 Details for Bug 212404 – Proposed patch for x11-toolkits/scintilla (since 418359 revision)

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

scintilla.diff (text/plain), 5.32 KB, created by lightside on 2016-09-06 06:06:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-09-06 06:06:48 UTC

Size: 5.32 KB

patch

obsolete

>--- scintilla.orig/Makefile	2016-07-11 08:58:51 UTC
>+++ scintilla/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/x11-toolkits/scintilla/Makefile 418359 2016-07-11 08:58:51Z madpilot $
> 
> PORTNAME=	scintilla
>-PORTVERSION=	3.6.6
>+PORTVERSION=	3.6.7
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	scite${PORTVERSION:S/.//g}
>@@ -24,6 +24,12 @@
> MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
> CFLAGS+=	-DPIC ${PICFLAG}
> 
>+MAJOR=	2
>+AGE=	0
>+REVISION=	0
>+MAKE_ARGS+=	MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
>+PLIST_SUB+=	MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
>+
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "sparc64"
>@@ -36,11 +42,14 @@
> 	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
> 
> do-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
> 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla
>-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${STAGEDIR}${PREFIX}/lib
>-	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla.so.2 libscintilla.so)
>-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${STAGEDIR}${PREFIX}/lib
>-	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla_lexers.so.2 libscintilla_lexers.so)
>+.for f in libscintilla.so libscintilla_lexers.so
>+	${INSTALL_LIB} ${WRKSRC}/${f}.${MAJOR}.${AGE}.${REVISION} \
>+		${STAGEDIR}${PREFIX}/lib
>+	(cd ${STAGEDIR}${PREFIX}/lib && \
>+		${LN} -sf ${f}.${MAJOR}.${AGE}.${REVISION} ${f}.${MAJOR} && \
>+		${LN} -sf ${f}.${MAJOR} ${f})
>+.endfor
> 
> .include <bsd.port.post.mk>
>--- scintilla.orig/distinfo	2016-07-11 08:58:51 UTC
>+++ scintilla/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1464048149
>-SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa
>-SIZE (scite366.tgz) = 2371062
>+TIMESTAMP = 1472947347
>+SHA256 (scite367.tgz) = 851a681d2fefe02770d318c4c25401f423b6ea686f6cae3eed5257e27c86c49f
>+SIZE (scite367.tgz) = 2331985
>--- scintilla.orig/files/patch-makefile	2016-07-11 08:58:51 UTC
>+++ scintilla/files/patch-makefile
>@@ -1,7 +1,7 @@
>---- makefile.orig	2016-05-17 23:50:39 UTC
>+--- makefile.orig	2016-08-30 04:39:06 UTC
> +++ makefile
>-@@ -7,14 +7,6 @@
>- # Also works with ming32-make on Windows.
>+@@ -9,14 +9,6 @@
>+ srcdir ?= .
>  
>  .SUFFIXES: .cxx .c .o .h .a .list
> -ifdef CLANG
>@@ -12,57 +12,44 @@
> -SANITIZE = address
> -#SANITIZE = undefined
> -endif
>+ ARFLAGS = rc
>  RANLIB = touch
>  
>- ifdef GTK3
>-@@ -42,7 +34,8 @@ DEL = del /q
>- COMPLIB=..\bin\scintilla.a
>+@@ -45,7 +37,12 @@ DEL = del /q
>+ COMPLIB=$(srcdir)\..\bin\scintilla.a
>  else
>  DEL = rm -f
>--COMPLIB=../bin/scintilla.a
>-+COMPLIB=../bin/libscintilla.so.2
>-+LEXRLIB=../bin/libscintilla_lexers.so.2
>- endif
>- 
>- vpath %.h ../src ../include ../lexlib
>-@@ -74,7 +67,6 @@ else
>- CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
>+-COMPLIB=$(srcdir)/../bin/scintilla.a
>++COMPLIB_NAME=libscintilla.so
>++COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR)
>++COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION)
>++LEXRLIB_NAME=libscintilla_lexers.so
>++LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR)
>++LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION)
>  endif
>  
>--CFLAGS:=$(CTFLAGS)
>- CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
>- 
>- CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
>-@@ -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
>+ vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
>+@@ -98,7 +95,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil
>  
>- LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
>+ LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))
>  
> -all: $(COMPLIB)
> +all: $(COMPLIB) $(LEXRLIB)
>  
>  clean:
>  	$(DEL) *.o $(COMPLIB) *.plist
>-@@ -112,9 +104,11 @@ $(COMPLIB): Accessor.o CharacterSet.o Le
>+@@ -116,9 +113,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 \
> -	$(MARSHALLER) $(LEXOBJS)
>--	$(AR) rc $@ $^
>+-	$(AR) $(ARFLAGS) $@ $^
> -	$(RANLIB) $@
> +	$(MARSHALLER)
>-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
>++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
> +
> +$(LEXRLIB): $(LEXOBJS)
>-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
>++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
>  
>  # Automatically generate header dependencies with "make deps"
>  include deps.mak
>--- scintilla.orig/pkg-plist	2015-08-29 16:42:31 UTC
>+++ scintilla/pkg-plist
>@@ -5,6 +5,8 @@
> include/scintilla/Scintilla.h
> include/scintilla/ScintillaWidget.h
> lib/libscintilla.so
>-lib/libscintilla.so.2
>+lib/libscintilla.so.%%MAJOR%%
>+lib/libscintilla.so.%%MAJOR%%.%%AGE%%.%%REVISION%%
> lib/libscintilla_lexers.so
>-lib/libscintilla_lexers.so.2
>+lib/libscintilla_lexers.so.%%MAJOR%%
>+lib/libscintilla_lexers.so.%%MAJOR%%.%%AGE%%.%%REVISION%%

Flags:

cyberbotx: maintainer-approval+

Actions: View | Diff

Attachments on bug 212404: 174407 | 174408