View | Details | Raw Unified | Return to bug 238505 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	scite
4
PORTNAME=	scite
5
DISTVERSION=	4.1.0
5
DISTVERSION=	4.1.6
6
CATEGORIES=	editors gnome
6
CATEGORIES=	editors gnome
7
MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
7
MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
8
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
8
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
Lines 18-24 Link Here
18
LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
18
LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
19
RUN_DEPENDS=	xdg-open:devel/xdg-utils
19
RUN_DEPENDS=	xdg-open:devel/xdg-utils
20
20
21
USES=		compiler:c++17-lang desktop-file-utils gmake pkgconfig tar:tgz
21
USES=		compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig tar:tgz
22
22
23
OPTIONS_DEFINE=	DOCS
23
OPTIONS_DEFINE=	DOCS
24
24
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1529613535
1
TIMESTAMP = 1560266811
2
SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7
2
SHA256 (scite416.tgz) = de3bba3725304b44741c806e834b072e2a9f6cf84da7d12aed358040a3c4204c
3
SIZE (scite410.tgz) = 2493701
3
SIZE (scite416.tgz) = 2624672
(-)files/patch-gtk_makefile (-6 / +6 lines)
Lines 1-4 Link Here
1
--- gtk/makefile.orig	2018-05-06 22:32:10 UTC
1
--- gtk/makefile.orig	2019-06-07 22:35:09 UTC
2
+++ gtk/makefile
2
+++ gtk/makefile
3
@@ -12,8 +12,8 @@ ifdef CLANG
3
@@ -12,8 +12,8 @@ ifdef CLANG
4
 # thread also need to create Position Independent Executable -> search online documentation
4
 # thread also need to create Position Independent Executable -> search online documentation
Lines 5-17 Link Here
5
 SANITIZE = address
5
 SANITIZE = address
6
 #SANITIZE = undefined
6
 #SANITIZE = undefined
7
-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
7
-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
8
-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
8
-CC = clang -fsanitize=$(SANITIZE)
9
+CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register
9
+CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register
10
+CC = $(CC) -fsanitize=$(SANITIZE) -Wno-empty-body
10
+CC = $(CC) -fsanitize=$(SANITIZE)
11
 CCWARNINGS = -Wno-empty-body -Wno-string-plus-int
11
 else
12
 else
12
 MISLEADING=-Wno-misleading-indentation
13
 MISLEADING=-Wno-misleading-indentation
13
 endif
14
@@ -29,7 +29,7 @@ endif
14
@@ -28,7 +28,7 @@ endif
15
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
15
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
16
 CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
16
 CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
17
 CONFIGTHREADS:=
17
 CONFIGTHREADS:=
Lines 20-26 Link Here
20
 ifndef prefix
20
 ifndef prefix
21
 ifdef gnomeprefix
21
 ifdef gnomeprefix
22
   prefix=$(gnomeprefix)
22
   prefix=$(gnomeprefix)
23
@@ -122,8 +122,9 @@ FilePath.o EditorConfig.o SciTEBase.o Fi
23
@@ -125,8 +125,9 @@ FilePath.o EditorConfig.o SciTEBase.o FileWorker.o Coo
24
 ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
24
 ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
25
 MatchMarker.o StringHelpers.o \
25
 MatchMarker.o StringHelpers.o \
26
 PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
26
 PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
(-)files/patch-src_EditorConfig.cxx (-10 lines)
Lines 1-10 Link Here
1
--- src/EditorConfig.cxx.orig	2018-05-06 22:32:10 UTC
2
+++ src/EditorConfig.cxx
3
@@ -13,6 +13,7 @@
4
 #include <map>
5
 #include <algorithm>
6
 #include <memory>
7
+#include <sys/time.h>
8
 
9
 #include "Scintilla.h"
10
 

Return to bug 238505