sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 01:09:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

editors/scite: update to 4.1.0

Browse source 
PR:		228909
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
This commit is contained in:
Steve Wills 2019-01-27 23:57:42 +00:00
parent 944b178372
commit 310a03182f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=491445
4 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editors/scite/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= scite PORTNAME= scite
DISTVERSION= 4.0.2 DISTVERSION= 4.1.0
PORTREVISION= 1
CATEGORIES= editors gnome CATEGORIES= editors gnome
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
@ -19,11 +18,14 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libscintilla.so:x11-toolkits/scintilla LIB_DEPENDS= libscintilla.so:x11-toolkits/scintilla
RUN_DEPENDS= xdg-open:devel/xdg-utils RUN_DEPENDS= xdg-open:devel/xdg-utils
USES= compiler:c++17-lang desktop-file-utils gmake pkgconfig tar:tgz
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}
WRKSRC= ${WRKDIR}/${PORTNAME}/gtk WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
USES= compiler:c++14-lang desktop-file-utils gmake pkgconfig tar:tgz CXXSTD= c++17
USE_GNOME= cairo gdkpixbuf2 gtk20 USE_GNOME= cairo gdkpixbuf2 gtk20
MAKEFILE= makefile MAKEFILE= makefile

6
editors/scite/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1516108933 TIMESTAMP = 1529613535
SHA256 (scite402.tgz) = 1f9bb8eccbaed77c110c30c0e6dbaac04b3f62b751a930192b133a7b6f0f29fb SHA256 (scite410.tgz) = d1f9cf27b8d44b3d6bab179173a58cdfe76b44f84c8e74aeb85bf16c50148cf7
SIZE (scite402.tgz) = 2424648 SIZE (scite410.tgz) = 2493701

34
editors/scite/files/patch-makefile → editors/scite/files/patch-gtk_makefile
View file

@ -1,23 +1,17 @@
--- makefile.orig 2016-08-30 04:39:12 UTC --- gtk/makefile.orig 2018-05-06 22:32:10 UTC
+++ makefile +++ gtk/makefile
@@ -7,16 +7,6 @@ @@ -12,8 +12,8 @@ ifdef CLANG
srcdir ?= . # thread also need to create Position Independent Executable -> search online documentation
SANITIZE = address
.SUFFIXES: .cxx .o .h .a .c #SANITIZE = undefined
-ifdef CLANG
-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
-# thread also need to create Position Independent Executable -> search online documentation
-SANITIZE = address
-#SANITIZE = undefined
-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register -CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body -CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
-else +CXX = $(CXX) -fsanitize=$(SANITIZE) -Wno-deprecated-register
-MISLEADING=-Wno-misleading-indentation +CC = $(CC) -fsanitize=$(SANITIZE) -Wno-empty-body
-endif else
MISLEADING=-Wno-misleading-indentation
ifdef GTK3 endif
GTKVERSION=gtk+-3.0 @@ -28,7 +28,7 @@ endif
@@ -28,7 +18,7 @@ endif
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0) CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
CONFIGTHREADS:= CONFIGTHREADS:=
@ -26,12 +20,12 @@
ifndef prefix ifndef prefix
ifdef gnomeprefix ifdef gnomeprefix
prefix=$(gnomeprefix) prefix=$(gnomeprefix)
@@ -119,8 +109,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook @@ -122,8 +122,9 @@ FilePath.o EditorConfig.o SciTEBase.o Fi
ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
MatchMarker.o StringHelpers.o \ MatchMarker.o StringHelpers.o \
PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.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) - JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ - $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) $(LDLIBS) -lm -lstdc++
+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
+ $(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \ + $(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
+ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB) + $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)

10
editors/scite/files/patch-src_EditorConfig.cxx Normal file
View file

@ -0,0 +1,10 @@
--- src/EditorConfig.cxx.orig 2018-05-06 22:32:10 UTC
+++ src/EditorConfig.cxx
@@ -13,6 +13,7 @@
#include <map>
#include <algorithm>
#include <memory>
+#include <sys/time.h>
#include "Scintilla.h"