Attachment 166538 Details for Bug 206910 – Proposed patch for x11-toolkits/scintilla (since 402317 revision)

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

scintilla_3.6.2-3.6.3.diff (text/plain), 2.34 KB, created by lightside on 2016-02-04 08:44:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-02-04 08:44:21 UTC

Size: 2.34 KB

patch

obsolete

>diff -ruN scintilla.orig/Makefile scintilla/Makefile
>--- scintilla.orig/Makefile	2015-11-23 23:35:18.000000000 +0400
>+++ scintilla/Makefile	2016-02-04 08:29:10.487163000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/x11-toolkits/scintilla/Makefile 402317 2015-11-23 19:35:18Z amdmi3 $
> 
> PORTNAME=	scintilla
>-PORTVERSION=	3.6.2
>+PORTVERSION=	3.6.3
> CATEGORIES=	x11-toolkits
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	scite${PORTVERSION:S/.//g}
>@@ -33,7 +33,7 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
>+	@${REINPLACE_CMD} -e 's| -Os||g ; s| $$(PICFLAGS)||' ${WRKSRC}/makefile
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
>diff -ruN scintilla.orig/distinfo scintilla/distinfo
>--- scintilla.orig/distinfo	2015-11-23 23:35:18.000000000 +0400
>+++ scintilla/distinfo	2016-02-04 07:16:29.574302000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (scite362.tgz) = 6530d0d86c72485b815663e3b2c2987d59779340a71632ed8bb97a43530737a3
>-SIZE (scite362.tgz) = 2368491
>+SHA256 (scite363.tgz) = f7308c2bcce34720d856af2dde022b29cde6f6a4d808a7ccaae40899115a86f4
>+SIZE (scite363.tgz) = 2385888
>diff -ruN scintilla.orig/files/patch-makefile scintilla/files/patch-makefile
>--- scintilla.orig/files/patch-makefile	2015-05-04 15:17:39.000000000 +0400
>+++ scintilla/files/patch-makefile	2016-02-04 09:31:11.356971000 +0400
>@@ -1,4 +1,4 @@
>---- makefile.orig	2014-11-27 20:47:24 UTC
>+--- makefile.orig	2016-01-17 22:34:04 UTC
> +++ makefile
> @@ -7,14 +7,6 @@
>  # Also works with ming32-make on Windows.
>@@ -15,7 +15,7 @@
>  RANLIB = touch
>  
>  ifdef GTK3
>-@@ -36,7 +28,8 @@
>+@@ -41,7 +33,8 @@
>  COMPLIB=..\bin\scintilla.a
>  else
>  DEL = rm -f
>@@ -25,7 +25,7 @@
>  endif
>  
>  vpath %.h ../src ../include ../lexlib
>-@@ -68,8 +61,7 @@
>+@@ -73,8 +66,7 @@
>  CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
>  endif
>  
>@@ -35,7 +35,7 @@
>  
>  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
>  MARSHALLER=scintilla-marshal.o
>-@@ -77,11 +69,11 @@
>+@@ -82,11 +74,11 @@
>  .cxx.o:
>  	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
>  .c.o:
>@@ -49,7 +49,7 @@
>  
>  clean:
>  	$(DEL) *.o $(COMPLIB) *.plist
>-@@ -98,9 +90,11 @@
>+@@ -103,9 +95,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 \

Flags:

koobs: maintainer-approval? (cyberbotx)

Actions: View | Diff

Attachments on bug 206910: 166538 | 166539 | 166540 | 166541