From nobody Sun Jun 30 16:46:08 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WBw6T27d2z5Q3ws; Sun, 30 Jun 2024 16:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WBw6T1Dvtz4Qgh; Sun, 30 Jun 2024 16:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719765969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9rhuFZ3RY6nIg9sAGcbkiUc2t9MIx3lg5NBJCCS3YQ=; b=CeJaQHdiGCwqsowak834MNgfNxE0ZY8DTWpQYzT0gqzJLj+qylWf22isCc2T0nILKc+T+b 6I2vBeIaAaDm4RluBtgLu1W0erp42XQSswdipeW70dOp4b+nFbZhF9C+6VRK3CdP6rWkVt q5mrWmCbS/cDnhTKt/Ck5EZozeHvyRJJ4WGO4jVP44+OuLTBi48LbucSsTYElaHz2Tv9lI 0Sn6O4cr2uR3vNyIoGjtglTC6UHGnDju2H6U063TRYAKOK3w/ZG73pBvqMC3AHM1GtEXRd X7Z7QvoHGcLwurdw+tTBiVhqexkjAe9z+RImY1d19UETsiEwxIU2L817x1Np4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719765969; a=rsa-sha256; cv=none; b=uPgJfGImZEaNglyhDF0ymV+4nBgHamkdmfmvZx1l6sZxPeFRLMY0uUkyupfCKN2MMKt2ne WGLCTaNDxQFozz74iS9lbMwWavpV++ckoYcFVQiKsAW6RocgiyZ3Xwg7jnmFX1VQiaII9g y6bdMyP3hAF6NVTLcedZbjkII5BoFGpG2eRASQYircCq5g5NZ1grgfI7fatZSenFM8eVjg AWGVdLUDROMi+e55gIfUfcFbCqw0xxedTS73VbBKLKMz2ndop3vNY90Jo4mQ6TsA0Euf6r D4l7hz6aedrrYLTUrSPGUbKpMHEUGiv55JBZuT84WkHdzd+pzjjt/CWCQdIlVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719765969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9rhuFZ3RY6nIg9sAGcbkiUc2t9MIx3lg5NBJCCS3YQ=; b=bvTW0xg2oDadx0Svid7eDS3ivGpf5qWibNQLhZKTTH9LLiqXG2R1og3bZdksqaPdOf+Njo Y77Q9iq4J3fyI6oPfqQzZJrEl/JmdNJb/WN67KQDYB+7OHr3nxGjQEeVJ90yJqWSrC2Jrt kP0BTn7DC0cLt/VSPqsLJXlAdJe+9YMJAec2ZNGz8NwR+jPEi6wIwXQxAKVsL5tNsS8+16 cxNXNWYn51lpqiBMXp6R1Xwf6WWOvNwmaZLfeVPYYoc6Z0vHUT8ymC8NGE3agU9vxrYEl/ 7HqtEsFh+vxNM+8iHtjxK9youNM6SXJXAaLpIjMcFEO+nwGXS+Dt1SjjfdIUMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WBw6T0jqxzVCy; Sun, 30 Jun 2024 16:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 45UGk9vn099534; Sun, 30 Jun 2024 16:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 45UGk8rG099531; Sun, 30 Jun 2024 16:46:08 GMT (envelope-from git) Date: Sun, 30 Jun 2024 16:46:08 GMT Message-Id: <202406301646.45UGk8rG099531@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 25371002abc4 - main - x11-toolkits/scintilla: Update to 5.5.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25371002abc40224f4cf915015827b904cb6e51b Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=25371002abc40224f4cf915015827b904cb6e51b commit 25371002abc40224f4cf915015827b904cb6e51b Author: Naram Qashat AuthorDate: 2024-06-29 19:11:34 +0000 Commit: Fernando Apesteguía CommitDate: 2024-06-30 16:45:27 +0000 x11-toolkits/scintilla: Update to 5.5.0 Also update at the same time editors/scite to keep them in sync. PR: 279995 --- editors/scite/Makefile | 41 +++++++++++++--------- editors/scite/distinfo | 6 ++-- editors/scite/files/patch-gtk_makefile | 22 ++++++------ x11-toolkits/scintilla/Makefile | 26 +++++++------- x11-toolkits/scintilla/distinfo | 6 ++-- x11-toolkits/scintilla/files/patch-gtk_makefile | 20 +++++------ .../patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 | 33 ----------------- .../scintilla/files/patch-lexilla_src_makefile | 27 -------------- .../scintilla/files/patch-src_PositionCache.h | 12 ------- x11-toolkits/scintilla/files/patch-src_Style.cxx | 14 -------- x11-toolkits/scintilla/files/patch-src_Style.h | 23 ------------ x11-toolkits/scintilla/pkg-descr | 3 +- x11-toolkits/scintilla/pkg-plist | 7 ++-- 13 files changed, 70 insertions(+), 170 deletions(-) diff --git a/editors/scite/Makefile b/editors/scite/Makefile index 9985982abcce..fc8a7cc3cdf9 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -1,8 +1,7 @@ PORTNAME= scite -DISTVERSION= 4.4.5 -PORTREVISION= 3 +DISTVERSION= 5.5.0 CATEGORIES= editors gnome -MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} +MASTER_SITES= https://www.scintilla.org/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} MAINTAINER= cyberbotx@cyberbotx.com @@ -10,19 +9,16 @@ COMMENT= Full-featured SCIntilla based text editor for GTK/GNOME WWW= https://www.scintilla.org/SciTE.html LICENSE= SCINTILLA -LICENSE_NAME= License for Scintilla and SciTE +LICENSE_NAME= License for Lexilla, Scintilla and SciTE LICENSE_FILE= ${WRKSRC}/../License.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libscintilla.so:x11-toolkits/scintilla +LIB_DEPENDS= liblexilla.so:textproc/lexilla \ + libscintilla.so:x11-toolkits/scintilla RUN_DEPENDS= xdg-open:devel/xdg-utils -USES= compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig tar:tgz - -OPTIONS_DEFINE= DOCS - -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME} -WRKSRC= ${WRKDIR}/${PORTNAME}/gtk +USES= compiler:c++20-lang desktop-file-utils gmake gnome pkgconfig \ + tar:tgz USE_GNOME= cairo gdkpixbuf2 gtk30 MAKEFILE= makefile @@ -31,9 +27,14 @@ MAKE_ARGS= GTK3=1 MAKE_ARGS+= DEBUG=1 .endif +PATCH_WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}/gtk + PORTDATA= *.properties PORTDOCS= *.html *.jpg *.png +OPTIONS_DEFINE= DOCS + .include .if ${CHOSEN_COMPILER_TYPE} == clang @@ -45,12 +46,18 @@ post-patch: ${WRKSRC}/../src/SciTEGlobal.properties do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE \ + ${STAGEDIR}${PREFIX}/bin ${LN} -sf SciTE ${STAGEDIR}${PREFIX}/bin/scite - ${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${PREFIX}/share/man/man1 - ${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${STAGEDIR}${PREFIX}/share/pixmaps - (cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}) - (cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) + ${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 \ + ${STAGEDIR}${PREFIX}/share/man/man1 + ${INSTALL_DATA} ${WRKSRC}/SciTE.desktop \ + ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/Sci48M.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps + (cd ${WRKSRC}/../src && \ + ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC}/../doc && \ + ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include diff --git a/editors/scite/distinfo b/editors/scite/distinfo index d9ae763baa70..dbe2f170c3fe 100644 --- a/editors/scite/distinfo +++ b/editors/scite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601836826 -SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1 -SIZE (scite445.tgz) = 2777899 +TIMESTAMP = 1719371126 +SHA256 (scite550.tgz) = f7726a57be521f71c81b4fcc6d171fbf4a62e08c1c1840f5a74e014f3607ee11 +SIZE (scite550.tgz) = 4784815 diff --git a/editors/scite/files/patch-gtk_makefile b/editors/scite/files/patch-gtk_makefile index 7396cbe55e23..7bb9535a50b6 100644 --- a/editors/scite/files/patch-gtk_makefile +++ b/editors/scite/files/patch-gtk_makefile @@ -1,6 +1,6 @@ ---- gtk/makefile.orig 2020-09-11 10:44:44 UTC +--- gtk/makefile.orig 2024-03-19 04:36:42 UTC +++ gtk/makefile -@@ -18,9 +18,7 @@ ifdef CLANG +@@ -19,9 +19,7 @@ SANITIZE = address # thread also need to create Position Independent Executable -> search online documentation SANITIZE = address #SANITIZE = undefined @@ -11,23 +11,23 @@ WARNINGS += -Wno-deprecated-register WARNINGS += -Wno-empty-body else -@@ -59,7 +57,7 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a +@@ -60,7 +58,7 @@ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION) COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION) LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION) -all: $(PROG) $(COMPONENT) $(LEXILLA) +all: $(PROG) - vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include - vpath %.cxx $(srcdir) $(srcdir)/../src -@@ -151,7 +149,9 @@ SRC_OBJS = \ + vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_DIR)/include + vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../../lexilla/access $(SCINTILLA_DIR)/call +@@ -156,7 +154,9 @@ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o Directo Utf8_16.o - $(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS) + $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS) - $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS) -+ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic \ -+ -Wl,--version-script $(srcdir)/lua.vers $^ -o $@ -lscintilla \ -+ -Wl,--as-needed $(CONFIGLIB) ++ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--undefined-version \ ++ -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers \ ++ $^ -o $@ $(CONFIGLIB) $(LIBS) -lscintilla -llexilla $(LDLIBS) - # Automatically generate header dependencies with "make deps" + # Automatically generate header dependencies with "make depend" include deps.mak diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index 82d23da17b02..2b5ee6cf1842 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -1,33 +1,34 @@ PORTNAME= scintilla -DISTVERSION= 4.4.5 -PORTREVISION= 2 +DISTVERSION= 5.5.0 CATEGORIES= x11-toolkits -MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION} -DISTNAME= scite${PORTVERSION:S/.//g} +MASTER_SITES= https://www.scintilla.org/ +DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Full-featured free source code editing component for GTK WWW= https://www.scintilla.org/ LICENSE= SCINTILLA -LICENSE_NAME= License for Scintilla and SciTE +LICENSE_NAME= License for Lexilla, 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 cpe gmake gnome iconv pkgconfig tar:tgz -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME} -WRKSRC= ${WRKDIR}/${PORTNAME}/gtk -MAKEFILE= makefile -USE_LDCONFIG= yes USE_GNOME= cairo gdkpixbuf2 gtk30 -MAKE_ENV= LDFLAGS="${LDFLAGS}" -CFLAGS+= -DPIC -fpic +USE_LDCONFIG= yes +MAKEFILE= makefile MAKE_ARGS= GTK3=1 .if defined(WITH_DEBUG) MAKE_ARGS+= DEBUG=1 .endif +MAKE_ENV= LDFLAGS="${LDFLAGS}" + +CFLAGS+= -DPIC -fpic + +PATCH_WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}/gtk .include @@ -39,6 +40,7 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla ${INSTALL_DATA} ${WRKSRC}/../include/*.h \ ${STAGEDIR}${PREFIX}/include/scintilla - ${INSTALL_LIB} ${WRKSRC}/../bin/*.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/../bin/*.so \ + ${STAGEDIR}${PREFIX}/lib .include diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo index 53a72cda383c..5b0fdd7b615a 100644 --- a/x11-toolkits/scintilla/distinfo +++ b/x11-toolkits/scintilla/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601836808 -SHA256 (scite445.tgz) = 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1 -SIZE (scite445.tgz) = 2777899 +TIMESTAMP = 1719352619 +SHA256 (scintilla550.tgz) = e553e95509f01f92aa157fa02d06a712642e13d69a11ec1a02a7ddf22c406231 +SIZE (scintilla550.tgz) = 1784060 diff --git a/x11-toolkits/scintilla/files/patch-gtk_makefile b/x11-toolkits/scintilla/files/patch-gtk_makefile index d569907be131..dd9bed49cca9 100644 --- a/x11-toolkits/scintilla/files/patch-gtk_makefile +++ b/x11-toolkits/scintilla/files/patch-gtk_makefile @@ -1,6 +1,6 @@ ---- gtk/makefile.orig 2020-09-11 10:44:28 UTC +--- gtk/makefile.orig 2024-03-19 04:36:37 UTC +++ gtk/makefile -@@ -16,8 +16,6 @@ basedir = $(srcdir)/.. +@@ -16,8 +16,6 @@ ifdef CLANG WARNINGS = -Wpedantic -Wall ifdef CLANG @@ -9,7 +9,7 @@ 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 +@@ -34,7 +32,7 @@ SANITIZE = address # thread also need to create Position Independent Executable -> search online documentation SANITIZE = address #SANITIZE = undefined @@ -18,22 +18,22 @@ endif ARFLAGS = rc RANLIB ?= ranlib -@@ -69,7 +67,8 @@ DEL = rm -f - LEXILLA = liblexilla.so +@@ -68,7 +66,8 @@ COMPLIB=$(basedir)/bin/scintilla.a + DEL = rm -f 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 %.h $(srcdir) $(basedir)/src $(basedir)/include vpath %.c $(srcdir) -@@ -185,7 +184,7 @@ $(COMPLIB): $(SRC_OBJS) $(LEXLIBL_OBJS) $(GTK_OBJS) $( +@@ -166,7 +165,7 @@ $(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER) $(RANLIB) $@ - $(COMPONENT): $(SRC_OBJS) $(LEXLIBS_OBJS) $(GTK_OBJS) $(MARSHALLER) + $(COMPONENT): $(SRC_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 $@ + # Automatically generate header dependencies with "make depend" + include deps.mak diff --git a/x11-toolkits/scintilla/files/patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 b/x11-toolkits/scintilla/files/patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 deleted file mode 100644 index 9615fc336296..000000000000 --- a/x11-toolkits/scintilla/files/patch-hg_8719-790bfd4c0747_fix-glib_2.68.3 +++ /dev/null @@ -1,33 +0,0 @@ -# HG changeset patch -# User Neil Hodgson -# Date 1619159850 -36000 -# Fri Apr 23 16:37:30 2021 +1000 -# Node ID 790bfd4c0747eb5e0bc4d627a101298207a8421e -# Parent bf180d712ff771fe40a2d5dc178fa0a15cf14b2d -Remove volatile qualifiers as they cause an error with Clang 12. -The glib documentation shows use without volatile and mentions that - - While location has a volatile qualifier, this is a historical artifact and - the pointer passed to it should not be volatile. -https://developer.gnome.org/glib/stable/glib-Threads.html#g-once-init-enter - -diff -r bf180d712ff7 -r 790bfd4c0747 gtk/ScintillaGTKAccessible.cxx ---- gtk/ScintillaGTKAccessible.cxx Fri Apr 23 16:05:55 2021 +1000 -+++ gtk/ScintillaGTKAccessible.cxx Fri Apr 23 16:37:30 2021 +1000 -@@ -1008,7 +1008,7 @@ - - // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call - static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) { -- static volatile gsize type_id_result = 0; -+ static gsize type_id_result = 0; - - if (g_once_init_enter(&type_id_result)) { - GTypeInfo tinfo = { -@@ -1099,7 +1099,7 @@ - #if HAVE_GTK_A11Y_H // just instantiate the accessible - *cache = scintilla_object_accessible_new(0, G_OBJECT(widget)); - #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate -- static volatile gsize registered = 0; -+ static gsize registered = 0; - - if (g_once_init_enter(®istered)) { - // Figure out whether accessibility is enabled by looking at the type of the accessible diff --git a/x11-toolkits/scintilla/files/patch-lexilla_src_makefile b/x11-toolkits/scintilla/files/patch-lexilla_src_makefile deleted file mode 100644 index 23b16e320df7..000000000000 --- a/x11-toolkits/scintilla/files/patch-lexilla_src_makefile +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 $@ $^ diff --git a/x11-toolkits/scintilla/files/patch-src_PositionCache.h b/x11-toolkits/scintilla/files/patch-src_PositionCache.h deleted file mode 100644 index bd0ed01f438f..000000000000 --- a/x11-toolkits/scintilla/files/patch-src_PositionCache.h +++ /dev/null @@ -1,12 +0,0 @@ ---- 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(); diff --git a/x11-toolkits/scintilla/files/patch-src_Style.cxx b/x11-toolkits/scintilla/files/patch-src_Style.cxx deleted file mode 100644 index 0a4dba0d9482..000000000000 --- a/x11-toolkits/scintilla/files/patch-src_Style.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 diff --git a/x11-toolkits/scintilla/files/patch-src_Style.h b/x11-toolkits/scintilla/files/patch-src_Style.h deleted file mode 100644 index 668308df5673..000000000000 --- a/x11-toolkits/scintilla/files/patch-src_Style.h +++ /dev/null @@ -1,23 +0,0 @@ ---- 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; diff --git a/x11-toolkits/scintilla/pkg-descr b/x11-toolkits/scintilla/pkg-descr index af69203dea2c..0f212642f60b 100644 --- a/x11-toolkits/scintilla/pkg-descr +++ b/x11-toolkits/scintilla/pkg-descr @@ -5,5 +5,4 @@ styling, error indicators, code completion and call tips. The selection margin can contain markers like those used in debuggers to indicate breakpoints and the current line. Styling choices are more open than with many editors, allowing the use of proportional fonts, bold and italics, multiple foreground and background -colours and multiple fonts. It comes with complete source code and may be used -in any free project or commercial product. +colours and multiple fonts. diff --git a/x11-toolkits/scintilla/pkg-plist b/x11-toolkits/scintilla/pkg-plist index f234c6aaee8d..357bbb5c1ef4 100644 --- a/x11-toolkits/scintilla/pkg-plist +++ b/x11-toolkits/scintilla/pkg-plist @@ -1,9 +1,10 @@ include/scintilla/ILexer.h include/scintilla/ILoader.h -include/scintilla/Platform.h include/scintilla/Sci_Position.h -include/scintilla/SciLexer.h include/scintilla/Scintilla.h +include/scintilla/ScintillaCall.h +include/scintilla/ScintillaMessages.h +include/scintilla/ScintillaStructures.h +include/scintilla/ScintillaTypes.h include/scintilla/ScintillaWidget.h -lib/liblexilla.so lib/libscintilla.so