Index: Makefile =================================================================== --- Makefile (revision 551438) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= scintilla -DISTVERSION= 4.3.2 +DISTVERSION= 4.4.5 CATEGORIES= x11-toolkits MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} DISTNAME= scite${PORTVERSION:S/.//g} @@ -17,18 +17,18 @@ USES= compiler:c++17-lang gmake gnome iconv pkgconfig tar:tgz +PATCH_WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}/gtk MAKEFILE= makefile USE_LDCONFIG= yes -USE_GNOME= gtk30 +USE_GNOME= cairo gdkpixbuf2 gtk30 MAKE_ENV= LDFLAGS="${LDFLAGS}" CFLAGS+= -DPIC ${PICFLAG} -MAJOR= 3 -AGE= 0 -REVISION= 0 -MAKE_ARGS= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}" GTK3=1 -PLIST_SUB= MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}" +MAKE_ARGS= GTK3=1 +.if defined(WITH_DEBUG) +MAKE_ARGS+= DEBUG=1 +.endif .include @@ -42,18 +42,10 @@ PICFLAG?= -fpic .endif -post-patch: - @${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla - ${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla -.for f in libscintilla.so libscintilla_lexers.so - ${INSTALL_LIB} ${WRKSRC}/${f}.${MAJOR}.${AGE}.${REVISION} \ - ${STAGEDIR}${PREFIX}/lib - (cd ${STAGEDIR}${PREFIX}/lib && \ - ${LN} -sf ${f}.${MAJOR}.${AGE}.${REVISION} ${f}.${MAJOR} && \ - ${LN} -sf ${f}.${MAJOR} ${f}) -.endfor + ${INSTALL_DATA} ${WRKSRC}/../include/*.h \ + ${STAGEDIR}${PREFIX}/include/scintilla + ${INSTALL_LIB} ${WRKSRC}/../bin/*.so ${STAGEDIR}${PREFIX}/lib .include Index: distinfo =================================================================== --- distinfo (revision 551438) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584222036 -SHA256 (scite432.tgz) = fb7d9d2899b9559b31beca6a695d5b271cc7a6461b218e4a961b4fcd320a798f -SIZE (scite432.tgz) = 2710026 +TIMESTAMP = 1601836808 +SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1 +SIZE (scite445.tgz) = 2777899 Index: files/patch-gtk_makefile =================================================================== --- files/patch-gtk_makefile (nonexistent) +++ files/patch-gtk_makefile (working copy) @@ -0,0 +1,30 @@ +--- gtk/makefile.orig 2020-09-11 10:44:28 UTC ++++ gtk/makefile +@@ -16,8 +16,6 @@ basedir = $(srcdir)/.. + + WARNINGS = -Wpedantic -Wall + ifdef CLANG +-CXX = clang++ +-CC = clang + WARNINGS += -Wno-deprecated-register + ifdef windir + # Turn off some warnings that occur when Clang is being used on Windows where it +@@ -69,7 +67,8 @@ DEL = rm -f + LEXILLA = liblexilla.so + endif + COMPLIB=$(basedir)/bin/scintilla.a +-COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION) ++SONAME=libscintilla.$(SHAREDEXTENSION) ++COMPONENT=$(basedir)/bin/$(SONAME) + + vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib + vpath %.c $(srcdir) +@@ -185,7 +184,7 @@ $(COMPLIB): $(SRC_OBJS) $(LEXLIBL_OBJS) $(GTK_OBJS) $( + $(RANLIB) $@ + + $(COMPONENT): $(SRC_OBJS) $(LEXLIBS_OBJS) $(GTK_OBJS) $(MARSHALLER) +- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB) ++ $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@ $(CONFIGLIB) + + Catalogue.o: Catalogue.cxx + $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@ Property changes on: files/patch-gtk_makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-lexilla_src_makefile =================================================================== --- files/patch-lexilla_src_makefile (nonexistent) +++ files/patch-lexilla_src_makefile (working copy) @@ -0,0 +1,27 @@ +--- lexilla/src/makefile.orig 2020-05-31 23:08:11 UTC ++++ lexilla/src/makefile +@@ -35,13 +35,13 @@ else + BASE_FLAGS += -fvisibility=hidden + endif + +-LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION) ++SONAME=$(SHARED_NAME).$(SHAREDEXTENSION) ++LEXILLA=$(DIR_BIN)/$(SONAME) + LIBLEXILLA=$(DIR_BIN)/liblexilla.a + + BASE_FLAGS += --std=c++17 + + ifdef CLANG +-CXX = clang++ + ifdef windir + # Clang on Win32 uses MSVC headers so will complain about strcpy without this + DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1 +@@ -119,7 +119,7 @@ LEXILLA_OBJS=\ + $(LEXERS:.cxx=.o) + + $(LEXILLA): $(LEXILLA_OBJS) $(VERSION_RESOURCE) +- $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@ + + $(LIBLEXILLA): $(LEXILLA_OBJS) + $(AR) rc $@ $^ Property changes on: files/patch-lexilla_src_makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-makefile =================================================================== --- files/patch-makefile (revision 551438) +++ files/patch-makefile (nonexistent) @@ -1,49 +0,0 @@ ---- makefile.orig 2020-01-02 00:45:04 UTC -+++ makefile -@@ -16,8 +16,6 @@ basedir = $(srcdir)/.. - - WARNINGS = -Wpedantic -Wall - ifdef CLANG --CXX = clang++ --CC = clang - WARNINGS += -Wno-deprecated-register - ifdef windir - # Turn off some warnings that occur when Clang is being used on Windows where it -@@ -58,7 +56,12 @@ DEL = del /q - else - DEL = rm -f - endif --COMPLIB=$(basedir)/bin/scintilla.a -+COMPLIB_NAME=libscintilla.so -+COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR) -+COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION) -+LEXRLIB_NAME=libscintilla_lexers.so -+LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR) -+LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION) - - vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib - vpath %.c $(srcdir) -@@ -81,7 +84,7 @@ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS - CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION)) - MARSHALLER=scintilla-marshal.o - --all: $(COMPLIB) -+all: $(COMPLIB) $(LEXRLIB) - - clean: - $(DEL) *.o $(call normalize,$(COMPLIB)) *.plist -@@ -158,9 +161,11 @@ GTK_OBJS = \ - ScintillaGTK.o \ - ScintillaGTKAccessible.o - --$(COMPLIB): $(SRC_OBJS) $(LEXLIB_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS) -- $(AR) $(ARFLAGS) $@ $^ -- $(RANLIB) $@ -+$(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) -+ -+$(LEXRLIB): $(LEXLIB_OBJS) $(LEX_OBJS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS) - - # Automatically generate header dependencies with "make deps" - include deps.mak Property changes on: files/patch-makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_PositionCache.h =================================================================== --- files/patch-src_PositionCache.h (nonexistent) +++ files/patch-src_PositionCache.h (working copy) @@ -0,0 +1,12 @@ +--- src/PositionCache.h.orig 2020-07-18 05:40:22 UTC ++++ src/PositionCache.h +@@ -187,8 +187,8 @@ class PositionCacheEntry { (public) + PositionCacheEntry() noexcept; + // Copy constructor not currently used, but needed for being element in std::vector. + PositionCacheEntry(const PositionCacheEntry &); ++ PositionCacheEntry(PositionCacheEntry &&) noexcept = default; + // Deleted so PositionCacheEntry objects can not be assigned. +- PositionCacheEntry(PositionCacheEntry &&) = delete; + void operator=(const PositionCacheEntry &) = delete; + void operator=(PositionCacheEntry &&) = delete; + ~PositionCacheEntry(); Property changes on: files/patch-src_PositionCache.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_Style.cxx =================================================================== --- files/patch-src_Style.cxx (nonexistent) +++ files/patch-src_Style.cxx (working copy) @@ -0,0 +1,14 @@ +--- src/Style.cxx.orig 2020-04-23 01:50:17 UTC ++++ src/Style.cxx +@@ -24,6 +24,11 @@ FontAlias::FontAlias(const FontAlias &other) noexcept + SetID(other.fid); + } + ++FontAlias::FontAlias(FontAlias &&other) noexcept : Font() { ++ SetID(other.fid); ++ other.ClearFont(); ++} ++ + FontAlias::~FontAlias() { + SetID(FontID{}); + // ~Font will not release the actual font resource since it is now 0 Property changes on: files/patch-src_Style.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_Style.h =================================================================== --- files/patch-src_Style.h (nonexistent) +++ files/patch-src_Style.h (working copy) @@ -0,0 +1,23 @@ +--- src/Style.h.orig 2020-04-23 01:50:17 UTC ++++ src/Style.h +@@ -33,9 +33,9 @@ struct FontSpecification { + class FontAlias : public Font { + public: + FontAlias() noexcept; +- // FontAlias objects can not be assigned except for initialization ++ // FontAlias objects can be copy or move constructed but not be assigned + FontAlias(const FontAlias &) noexcept; +- FontAlias(FontAlias &&) = delete; ++ FontAlias(FontAlias &&) noexcept; + FontAlias &operator=(const FontAlias &) = delete; + FontAlias &operator=(FontAlias &&) = delete; + ~FontAlias() override; +@@ -72,7 +72,7 @@ class Style : public FontSpecification, public FontMea + + Style(); + Style(const Style &source) noexcept; +- Style(Style &&) = delete; ++ Style(Style &&) noexcept = default; + ~Style(); + Style &operator=(const Style &source) noexcept; + Style &operator=(Style &&) = delete; Property changes on: files/patch-src_Style.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-descr =================================================================== --- pkg-descr (revision 551438) +++ pkg-descr (working copy) @@ -8,4 +8,4 @@ colours and multiple fonts. It comes with complete source code and may be used in any free project or commercial product. -WWW: http://www.scintilla.org/ +WWW: https://www.scintilla.org/ Index: pkg-plist =================================================================== --- pkg-plist (revision 551438) +++ pkg-plist (working copy) @@ -5,9 +5,5 @@ include/scintilla/SciLexer.h include/scintilla/Scintilla.h include/scintilla/ScintillaWidget.h +lib/liblexilla.so lib/libscintilla.so -lib/libscintilla.so.%%MAJOR%% -lib/libscintilla.so.%%MAJOR%%.%%AGE%%.%%REVISION%% -lib/libscintilla_lexers.so -lib/libscintilla_lexers.so.%%MAJOR%% -lib/libscintilla_lexers.so.%%MAJOR%%.%%AGE%%.%%REVISION%%