svn commit: r506375 - in head: editors/scite editors/scite/files x11-toolkits/scintilla x11-toolkits/scintilla/files
Kurt Jaeger
pi at FreeBSD.org
Wed Jul 10 17:47:57 UTC 2019
Author: pi
Date: Wed Jul 10 17:47:54 2019
New Revision: 506375
URL: https://svnweb.freebsd.org/changeset/ports/506375
Log:
x11-toolkits/scintilla: update 4.1.0 -> 4.2.0
editors/scite: update 4.1.0 -> 4.2.0
PR: 238505
Submitted by: Naram Qashat <cyberbotx at cyberbotx.com> (maintainer)
Relnotes: https://www.scintilla.org/ScintillaHistory.html
Deleted:
head/editors/scite/files/patch-src_EditorConfig.cxx
Modified:
head/editors/scite/Makefile
head/editors/scite/distinfo
head/editors/scite/files/patch-gtk_makefile
head/x11-toolkits/scintilla/Makefile
head/x11-toolkits/scintilla/distinfo
head/x11-toolkits/scintilla/files/patch-makefile
Modified: head/editors/scite/Makefile
==============================================================================
--- head/editors/scite/Makefile Wed Jul 10 17:01:25 2019 (r506374)
+++ head/editors/scite/Makefile Wed Jul 10 17:47:54 2019 (r506375)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= scite
-DISTVERSION= 4.1.0
+DISTVERSION= 4.2.0
CATEGORIES= editors gnome
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
@@ -18,7 +18,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se
LIB_DEPENDS= libscintilla.so:x11-toolkits/scintilla
RUN_DEPENDS= xdg-open:devel/xdg-utils
-USES= compiler:c++17-lang desktop-file-utils gmake pkgconfig tar:tgz
+USES= compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig tar:tgz
OPTIONS_DEFINE= DOCS
Modified: head/editors/scite/distinfo
==============================================================================
--- head/editors/scite/distinfo Wed Jul 10 17:01:25 2019 (r506374)
+++ head/editors/scite/distinfo Wed Jul 10 17:47:54 2019 (r506375)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529613535
-SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7
-SIZE (scite410.tgz) = 2493701
+TIMESTAMP = 1562690433
+SHA256 (scite420.tgz) = 2e0b95842bbc875a9224416fad3a9179ec329b3af2ca1abdd8e64c008068bb99
+SIZE (scite420.tgz) = 2629884
Modified: head/editors/scite/files/patch-gtk_makefile
==============================================================================
--- head/editors/scite/files/patch-gtk_makefile Wed Jul 10 17:01:25 2019 (r506374)
+++ head/editors/scite/files/patch-gtk_makefile Wed Jul 10 17:47:54 2019 (r506375)
@@ -1,17 +1,17 @@
---- gtk/makefile.orig 2018-05-06 22:32:10 UTC
+--- gtk/makefile.orig 2019-06-07 22:35:09 UTC
+++ gtk/makefile
@@ -12,8 +12,8 @@ ifdef CLANG
# thread also need to create Position Independent Executable -> search online documentation
SANITIZE = address
#SANITIZE = undefined
-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
--CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
+-CC = clang -fsanitize=$(SANITIZE)
+CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register
-+CC = $(CC) -fsanitize=$(SANITIZE) -Wno-empty-body
++CC = $(CC) -fsanitize=$(SANITIZE)
+ CCWARNINGS = -Wno-empty-body -Wno-string-plus-int
else
MISLEADING=-Wno-misleading-indentation
- endif
-@@ -28,7 +28,7 @@ endif
+@@ -29,7 +29,7 @@ endif
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
CONFIGTHREADS:=
@@ -20,7 +20,7 @@
ifndef prefix
ifdef gnomeprefix
prefix=$(gnomeprefix)
-@@ -122,8 +122,9 @@ FilePath.o EditorConfig.o SciTEBase.o Fi
+@@ -125,8 +125,9 @@ FilePath.o EditorConfig.o SciTEBase.o FileWorker.o Coo
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 \
Modified: head/x11-toolkits/scintilla/Makefile
==============================================================================
--- head/x11-toolkits/scintilla/Makefile Wed Jul 10 17:01:25 2019 (r506374)
+++ head/x11-toolkits/scintilla/Makefile Wed Jul 10 17:47:54 2019 (r506375)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= scintilla
-DISTVERSION= 4.1.0
+DISTVERSION= 4.2.0
CATEGORIES= x11-toolkits
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= scite${PORTVERSION:S/.//g}
@@ -15,7 +15,7 @@ LICENSE_NAME= License for Scintilla and SciTE
LICENSE_FILE= ${WRKSRC}/../License.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= compiler:c++17-lang gmake iconv pkgconfig tar:tgz
+USES= compiler:c++17-lang gmake gnome iconv pkgconfig tar:tgz
WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
MAKEFILE= makefile
Modified: head/x11-toolkits/scintilla/distinfo
==============================================================================
--- head/x11-toolkits/scintilla/distinfo Wed Jul 10 17:01:25 2019 (r506374)
+++ head/x11-toolkits/scintilla/distinfo Wed Jul 10 17:47:54 2019 (r506375)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529613442
-SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7
-SIZE (scite410.tgz) = 2493701
+TIMESTAMP = 1562690306
+SHA256 (scite420.tgz) = 2e0b95842bbc875a9224416fad3a9179ec329b3af2ca1abdd8e64c008068bb99
+SIZE (scite420.tgz) = 2629884
Modified: head/x11-toolkits/scintilla/files/patch-makefile
==============================================================================
--- head/x11-toolkits/scintilla/files/patch-makefile Wed Jul 10 17:01:25 2019 (r506374)
+++ head/x11-toolkits/scintilla/files/patch-makefile Wed Jul 10 17:47:54 2019 (r506375)
@@ -1,4 +1,4 @@
---- makefile.orig 2018-04-10 01:38:39 UTC
+--- makefile.orig 2019-04-16 20:34:45 UTC
+++ makefile
@@ -11,9 +11,7 @@
srcdir ?= .
@@ -24,7 +24,7 @@
endif
vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
-@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(RE
+@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS)
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
MARSHALLER=scintilla-marshal.o
@@ -33,10 +33,10 @@
clean:
$(DEL) *.o $(COMPLIB) *.plist
-@@ -123,9 +126,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De
+@@ -119,9 +122,11 @@ $(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.o L
PropSetSimple.o PlatGTK.o \
KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
- RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
+ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o UniqueString.o XPM.o \
- $(MARSHALLER) $(LEXOBJS)
- $(AR) $(ARFLAGS) $@ $^
- $(RANLIB) $@
More information about the svn-ports-head
mailing list