<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/93302c0cfacaba3eee78e724d04d4fa56b86ab3b">https://github.com/macports/macports-ports/commit/93302c0cfacaba3eee78e724d04d4fa56b86ab3b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 93302c0cfac scite: update to 4.4.5, fix the port
</span>93302c0cfac is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 93302c0cfacaba3eee78e724d04d4fa56b86ab3b
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Jun 15 12:00:06 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> scite: update to 4.4.5, fix the port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60378
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/70147
</span>---
editors/scite/Portfile | 128 +++++++++---
editors/scite/files/patch-SciTEBase.cxx.diff | 10 +
.../files/patch-ScintillaGTKAccessible.cxx.diff | 11 +
editors/scite/files/patch-compile-error.diff | 35 ----
editors/scite/files/patch-legacy-support.diff | 13 ++
editors/scite/files/patch-scite-makefile.diff | 228 ++++++++++++++++++---
6 files changed, 338 insertions(+), 87 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/scite/Portfile b/editors/scite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b007042f27..002e4d59684 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/scite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/scite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +1,88 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span> PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span>
name scite
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.4.5
</span> categories editors
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span> license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description SciTE is a SCIntilla based Text Editor.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description SciTE is a SCIntilla-based text editor
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Originally built to demonstrate Scintilla, it has grown to be a generally \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- useful editor with facilities for building and running programs. It is best \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- used for jobs with simple configurations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Originally built to demonstrate Scintilla, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it has grown to be a generally useful editor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with facilities for building and running programs. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It is best used for jobs with simple configurations.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://scintilla.sourceforge.net/SciTE.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/scintilla/SciTE/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.scintilla.org/SciTE.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:scintilla/SciTE/${version}
</span> distname ${name}[strsed ${version} {g/\.//}]
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:atk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dbus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fc2bac0f7bc8f6d308ce1fa902f72659f7acb1b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9d74bde5e4ee18d767b6add5a6b95d7ffcedbcfd017c3df59e16b0785e3521a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2777899
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-scite-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gatomic.h: error: argument 2 of '__atomic_load' must not be a pointer to a 'volatile' type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ScintillaGTKAccessible.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SciTEBase.cxx: error: 'system_error' in namespace 'std' does not name a type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-SciTEBase.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Setting LDFAGS via build.args breaks linking on aarch64 and powerpc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# _main is not being found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-legacy-support.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@PREFIX@,${prefix}," ${workpath}/scintilla/lexilla/src/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@CXX_ABI_FLAG@,-D_GLIBCXX_USE_CXX11_ABI=0,g" ${workpath}/scite/gtk/makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/scintilla/gtk/makefile ${workpath}/scintilla/lexilla/src/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@CXX_ABI_FLAG@,,g" ${workpath}/scite/gtk/makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/scintilla/gtk/makefile ${workpath}/scintilla/lexilla/src/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0e0e79eee0dca1ee3f2d391f1a6e006763aa48ba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9f17fe2a5dc294bd1077bf64f713bb06733eec271bab770841e55474e6c781c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Niether Clang builds it:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uninitialized_algorithms.h: error: static assertion failed due to requirement
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# '__is_cpp17_move_insertable<std::allocator<Scintilla::PositionCacheEntry>, void>::value':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The specified type does not meet the requirements of Cpp17MoveInsertable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {clang} macports-clang-*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.fallback macports-gcc-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span>
worksrcdir ${name}
patch.dir ${workpath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-scite-makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-compile-error.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # tidy's platform.h shadows scintilla's Platform.h on case-insensitive filesystems; see #28230
if {[file exists ${prefix}/include/Platform.h]} {
conflicts_build tidy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,11 +99,21 @@ if {${configure.sdkroot} != ""} {
</span>
build.dir ${worksrcpath}/gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CCOMP="${configure.cc} ${sysrootflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cxx} ${sysrootflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Yes, we need to set the compiler explicitly here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Otherwise g++ is picked, and this happens:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cc1plus: error: unrecognized command line option "-std=c++17"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Notice, adding LDFLAGS here breaks linking, at least on aarch64 and powerpc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append CC="${configure.cc} ${sysrootflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx} ${sysrootflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GTK3=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_LUA=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLANG=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
pre-build {
ui_debug "Building scintilla"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,13 +122,34 @@ pre-build {
</span> system -W ${workpath}/scintilla/gtk ${cmd}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir prefix=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Several ports use scintilla libs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid dumping these into ${prefix}/lib as unsafe.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set scite_root ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d 755 ${destroot}${scite_root}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/bin/SciTE ${destroot}${scite_root}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ${scite_root}/SciTE ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {liblexilla.a liblexilla.dylib libscintilla.dylib scintilla.a} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/scintilla/bin/${lib} ${destroot}${scite_root}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d 755 ${destroot}${prefix}/share/applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/gtk/SciTE.desktop ${destroot}${prefix}/share/applications/
</span> xinstall -m 444 ${worksrcpath}/doc/scite.1 ${destroot}${prefix}/share/man/man1
set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 {*}[glob ${worksrcpath}/src/*.properties] ${destroot}${docdir}
</span> xinstall -m 644 -W ${workpath}/scite License.txt README ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${scite_root}/liblexilla.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${scite_root}/liblexilla.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${scite_root}/libscintilla.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${scite_root}/libscintilla.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change ../bin/libscintilla.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${scite_root}/libscintilla.dylib ${destroot}${scite_root}/SciTE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span> }
livecheck.distname SciTE
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/scite/files/patch-SciTEBase.cxx.diff b/editors/scite/files/patch-SciTEBase.cxx.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d84cbdeaeba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/scite/files/patch-SciTEBase.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scite/src/SciTEBase.cxx 2020-09-11 18:44:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scite/src/SciTEBase.cxx 2024-06-14 23:55:41.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <atomic>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mutex>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <thread>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <system_error>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/scite/files/patch-ScintillaGTKAccessible.cxx.diff b/editors/scite/files/patch-ScintillaGTKAccessible.cxx.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..71437ea460a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/scite/files/patch-ScintillaGTKAccessible.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scintilla/gtk/ScintillaGTKAccessible.cxx 2020-04-23 09:50:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scintilla/gtk/ScintillaGTKAccessible.cxx 2024-06-14 22:24:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1005,7 +1005,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static volatile gsize type_id_result = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static gsize type_id_result = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_once_init_enter(&type_id_result)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GTypeInfo tinfo = {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/scite/files/patch-compile-error.diff b/editors/scite/files/patch-compile-error.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 78f71418757..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/scite/files/patch-compile-error.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur scintilla.orig/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scintilla.orig/gtk/ScintillaGTK.cxx 2012-06-01 10:26:24.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scintilla/gtk/ScintillaGTK.cxx 2019-02-23 17:31:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1612,7 +1612,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NotifyURIDropped(ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete []ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (TypeOfGSD(selection_data) > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (LengthOfGSD(selection_data) > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SelectionText selText;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetGtkSelectionText(selection_data, selText);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DropAt(posDrop, selText.s, false, selText.rectangular);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ur scintilla.orig/src/Editor.cxx scintilla/src/Editor.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scintilla.orig/src/Editor.cxx 2012-08-31 08:26:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scintilla/src/Editor.cxx 2019-02-23 17:33:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cmath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <map>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5868,9 +5869,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool Close(Point pt1, Point pt2) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (abs(pt1.x - pt2.x) > 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (std::abs(pt1.x - pt2.x) > 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (abs(pt1.y - pt2.y) > 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (std::abs(pt1.y - pt2.y) > 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/scite/files/patch-legacy-support.diff b/editors/scite/files/patch-legacy-support.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1ac05451105
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/scite/files/patch-legacy-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scintilla/lexilla/src/makefile 2020-06-01 07:08:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scintilla/lexilla/src/makefile 2024-06-15 11:26:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,6 +16,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIR_BIN=../../bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS += -L@PREFIX@/lib -lMacportsLegacySupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNINGS = -Wpedantic -Wall -Wextra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef windir
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/scite/files/patch-scite-makefile.diff b/editors/scite/files/patch-scite-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 89e02593568..ecbe940d55d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/scite/files/patch-scite-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/scite/files/patch-scite-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +1,203 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scintilla/gtk/makefile.orig 2012-08-31 01:26:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scintilla/gtk/makefile 2012-09-01 16:39:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef CHECK_DEPRECATED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -D__unix__ -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef NOTHREADS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- THREADFLAGS=-DG_THREADS_IMPL_NONE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scite/gtk/makefile.orig 2012-06-01 03:26:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scite/gtk/makefile 2012-09-01 16:39:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef CHECK_DEPRECATED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -D__unix__ -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXTFLAGS=-DDEBUG -g $(CXXFLAGS) $(CXXBASEFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,7 +108,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) `$(CONFIGTHREADS)` -rdynamic -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scite/gtk/makefile 2020-09-11 18:44:44.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scite/gtk/makefile 2024-06-14 21:44:14.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,14 +16,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CLANG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # thread also need to create Position Independent Executable -> search online documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SANITIZE = address
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#SANITIZE = address
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #SANITIZE = undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BASE_FLAGS += -fsanitize=$(SANITIZE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#BASE_FLAGS += -fsanitize=$(SANITIZE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNINGS += -Wno-deprecated-register
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNINGS += -Wno-empty-body
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += @CXX_ABI_FLAG@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNINGS += -Wno-misleading-indentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG ?= pkg-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef gnomeprefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=$(gnomeprefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- prefix=/usr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prefix=$(prefix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ datadir=$(prefix)/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,18 +55,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROG = $(srcdir)/../bin/SciTE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make should be run in ../../scintilla/gtk to compile all the lexers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SHAREDEXTENSION = $(if $(windir),dll,so)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifdef windir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHAREDEXTENSION = dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHAREDEXTENSION = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHAREDEXTENSION = so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all: $(PROG) $(COMPONENT) $(LEXILLA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: $(PROG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vpath %.h $(srcdir) $(srcdir)/../src $(SCINTILLA_DIR)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vpath %.cxx $(srcdir) $(srcdir)/../src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDES=-I $(SCINTILLA_DIR)/include -I $(srcdir)/../src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFINES += -DGTK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFINES += -D__unix__ -DGTK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += -DNO_LUA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS += -lm -lstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS += -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNAME:=$(shell uname -s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(UNAME), Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,13 +113,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %.o: %.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) $(CPPFLAGS) --std=c++17 $(DEFINES) $(INCLUDES) $(WARNINGS) $(CONFIGFLAGS) $(BASE_FLAGS) $(CXXFLAGS) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(CPPFLAGS) -std=c++17 $(DEFINES) $(INCLUDES) $(WARNINGS) $(CONFIGFLAGS) $(BASE_FLAGS) $(CXXFLAGS) -c $< -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f *.o *.plist $(PROG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ analyze:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- clang --analyze --std=c++17 $(DEFINES) $(INCLUDES) $(WARNINGS) $(CONFIGFLAGS) $(BASE_FLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ clang --analyze -std=c++17 $(DEFINES) $(INCLUDES) $(WARNINGS) $(CONFIGFLAGS) $(BASE_FLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depend deps.mak:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(PYTHON) AppDepGen.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,7 +160,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Utf8_16.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(PROG): SciTEGTK.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(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)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
</span>
# Automatically generate header dependencies with "make deps"
include deps.mak
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scintilla/gtk/makefile 2020-09-11 18:44:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scintilla/gtk/makefile 2024-06-14 21:45:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,8 +16,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNINGS = -Wpedantic -Wall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CLANG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CC = clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARNINGS += -Wno-deprecated-register
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef windir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Turn off some warnings that occur when Clang is being used on Windows where it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,9 +33,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # thread also need to create Position Independent Executable -> search online documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SANITIZE = address
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# SANITIZE = address
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #SANITIZE = undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BASE_FLAGS += -fsanitize=$(SANITIZE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# BASE_FLAGS += -fsanitize=$(SANITIZE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += @CXX_ABI_FLAG@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARFLAGS = rc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RANLIB ?= ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +60,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON = $(if $(windir),pyw,python3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SHAREDEXTENSION = $(if $(windir),dll,so)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifdef windir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHAREDEXTENSION = dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDFLAGS += -dynamiclib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHAREDEXTENSION = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHAREDEXTENSION = so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef windir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC = gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LEXILLA = lexilla.dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEL = rm -f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LEXILLA = liblexilla.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LEXILLA = liblexilla.$(SHAREDEXTENSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPLIB=$(basedir)/bin/scintilla.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,8 +87,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vpath %.c $(srcdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vpath %.cxx $(srcdir) $(basedir)/src $(basedir)/lexlib $(basedir)/lexers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDES=-I $(basedir)/include -I $(basedir)/src -I $(basedir)/lexlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFINES += -DGTK -DSCI_LEXER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDES = -I $(basedir)/include -I $(basedir)/src -I $(basedir)/lexlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFINES += -D__unix__ -DGTK -DSCI_LEXER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASE_FLAGS += $(WARNINGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef NO_CXX11_REGEX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,8 +98,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASE_FLAGS += $(if $(DEBUG),-g,-Os)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX_BASE_FLAGS = -std=c++17 $(BASE_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX_ALL_FLAGS = $(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG_FLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gmodule-no-export-2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scintilla/lexilla/src/makefile 2020-06-01 07:08:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scintilla/lexilla/src/makefile 2024-06-14 22:13:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHARED_NAME = liblexilla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(shell uname),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CLANG := 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS += -dynamiclib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHAREDEXTENSION = dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,14 +37,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBLEXILLA=$(DIR_BIN)/liblexilla.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BASE_FLAGS += --std=c++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BASE_FLAGS += -std=c++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CLANG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CXX = clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef windir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Clang on Win32 uses MSVC headers so will complain about strcpy without this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += @CXX_ABI_FLAG@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef windir
</span></pre><pre style='margin:0'>
</pre>