Date: Fri, 30 Oct 2020 05:30:02 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553664 - head/x11-toolkits/scintilla/files Message-ID: <202010300530.09U5U2Q1041401@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Fri Oct 30 05:30:02 2020 New Revision: 553664 URL: https://svnweb.freebsd.org/changeset/ports/553664 Log: x11-toolkits/scintilla: Add/delete files under files/ PR: 250663 Added: head/x11-toolkits/scintilla/files/patch-gtk_makefile (contents, props changed) head/x11-toolkits/scintilla/files/patch-lexilla_src_makefile (contents, props changed) head/x11-toolkits/scintilla/files/patch-src_PositionCache.h (contents, props changed) head/x11-toolkits/scintilla/files/patch-src_Style.cxx (contents, props changed) head/x11-toolkits/scintilla/files/patch-src_Style.h (contents, props changed) Deleted: head/x11-toolkits/scintilla/files/patch-makefile Added: head/x11-toolkits/scintilla/files/patch-gtk_makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/scintilla/files/patch-gtk_makefile Fri Oct 30 05:30:02 2020 (r553664) @@ -0,0 +1,39 @@ +--- 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 +@@ -35,7 +33,7 @@ endif + # thread also need to create Position Independent Executable -> search online documentation + SANITIZE = address + #SANITIZE = undefined +-BASE_FLAGS += -fsanitize=$(SANITIZE) ++#BASE_FLAGS += -fsanitize=$(SANITIZE) + endif + ARFLAGS = rc + RANLIB ?= ranlib +@@ -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 $@ Added: head/x11-toolkits/scintilla/files/patch-lexilla_src_makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/scintilla/files/patch-lexilla_src_makefile Fri Oct 30 05:30:02 2020 (r553664) @@ -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 $@ $^ Added: head/x11-toolkits/scintilla/files/patch-src_PositionCache.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/scintilla/files/patch-src_PositionCache.h Fri Oct 30 05:30:02 2020 (r553664) @@ -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(); Added: head/x11-toolkits/scintilla/files/patch-src_Style.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/scintilla/files/patch-src_Style.cxx Fri Oct 30 05:30:02 2020 (r553664) @@ -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 Added: head/x11-toolkits/scintilla/files/patch-src_Style.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/scintilla/files/patch-src_Style.h Fri Oct 30 05:30:02 2020 (r553664) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010300530.09U5U2Q1041401>