Attachment 174408 Details for Bug 212404 – Proposed patch for editors/scite (since 418359 revision)

[patch] Proposed patch for editors/scite (since 418359 revision)

scite.diff (text/plain), 2.63 KB, created by lightside on 2016-09-06 06:08:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-09-06 06:08:17 UTC

Size: 2.63 KB

patch

obsolete

>--- scite.orig/Makefile	2016-07-11 08:58:51 UTC
>+++ scite/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/editors/scite/Makefile 418359 2016-07-11 08:58:51Z madpilot $
> 
> PORTNAME=	scite
>-PORTVERSION=	3.6.6
>+PORTVERSION=	3.6.7
> CATEGORIES=	editors gnome
> MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
> DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
>--- scite.orig/distinfo	2016-07-11 08:58:51 UTC
>+++ scite/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
>--- scite.orig/files/patch-makefile	2015-11-23 19:35:50 UTC
>+++ scite/files/patch-makefile
>@@ -1,7 +1,7 @@
>---- makefile.orig	2015-09-22 01:37:15 UTC
>+--- makefile.orig	2016-08-30 04:39:12 UTC
> +++ makefile
>-@@ -5,14 +5,6 @@
>- # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
>+@@ -7,16 +7,6 @@
>+ srcdir ?= .
>  
>  .SUFFIXES: .cxx .o .h .a .c
> -ifdef CLANG
>@@ -11,11 +11,13 @@
> -#SANITIZE = undefined
> -CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
> -CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
>+-else
>+-MISLEADING=-Wno-misleading-indentation
> -endif
>  
>  ifdef GTK3
>  GTKVERSION=gtk+-3.0
>-@@ -24,7 +16,7 @@ endif
>+@@ -28,7 +18,7 @@ endif
>  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
>  CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
>  CONFIGTHREADS:=
>@@ -24,14 +26,14 @@
>  ifndef prefix
>  ifdef gnomeprefix
>    prefix=$(gnomeprefix)
>-@@ -114,8 +106,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook
>+@@ -119,8 +109,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook
>  ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
>  MatchMarker.o StringHelpers.o \
>  PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
> -	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
>--	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
>+-	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
> +	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
>-+	$(CXX) -rdynamic -Wl,--version-script lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
>++	$(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
> +	$(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
>  
>  # Automatically generate header dependencies with "make deps"

Flags:

cyberbotx: maintainer-approval+

Actions: View | Diff

Attachments on bug 212404: 174407 | 174408