Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Mon, 12 Oct 2020 20:15:21 UTC Commit: de4991d558b245bac3c2a4af203410daf84373c2 https://github.com/geany/geany-osx/commit/de4991d558b245bac3c2a4af203410daf8...
Log Message: ----------- Update geany.modules
Modified Paths: -------------- geany.modules patches/02-geany_scintilla_im_fix.patch patches/04-vte_2.91_bsymbolic.patch
Modified: geany.modules 23 lines changed, 8 insertions(+), 15 deletions(-) =================================================================== @@ -33,15 +33,15 @@
<!-- Needed by VTE 2.91 --> <autotools id="pcre2" - autogenargs="--enable-jit --enable-pcre2-8"> + autogenargs="--disable-jit --enable-pcre2-8"> <branch repo="pcre" module="pcre2-${version}.tar.bz2" - version="10.34"/> + version="10.35"/> </autotools>
- <meson id="vte291" mesonargs="-Dgnutls=false -Dvapi=false -D_b_symbolic_functions=false"> + <meson id="vte291" mesonargs="-Dgnutls=false -Dicu=false -Dvapi=false -D_b_symbolic_functions=false"> <branch module="vte/0.60/vte-${version}.tar.xz" - version="0.60.0"> + version="0.60.3"> <!-- Make paths relative to bundle (fallback to system paths if not found) --> <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_2.91_relpath.patch" strip="1" /> </branch> @@ -83,10 +83,7 @@ <metamodule id="geany-deps"> <dependencies> <dep package="vte291" /> - <!-- TODO: right now (March 2020), docutils fails to install (no idea why) - so let's use Geany online documentation instead <dep package="docutils" /> - --> <dep package="meta-gtk-osx-gtk3-core-themes" /> <dep package="gtk-mac-bundler" /> <dep package="gtk-mac-integration-fixed" /> @@ -97,16 +94,15 @@
<!-- Geany from git master --> <autotools id="geany-git" - autogenargs="--enable-mac-integration --enable-gtk3 --disable-html-docs"> + autogenargs="--enable-mac-integration" + supports-non-srcdir-builds="no"> <branch repo="github.com" module="geany/geany.git" checkoutdir="geany-git" revision="master" > <!-- This patch corresponds to https://github.com/geany/geany/pull/2363 --> <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-geany_config_shell.patch" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-geany_vte_login_shell.patch" strip="1" /> - <!-- TODO: remove once Geany updates to the latest Scintilla --> - <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-geany_scintilla_im_fix.patch" strip="1" /> </branch> <dependencies> <dep package="geany-deps" /> @@ -115,16 +111,15 @@
<!-- Geany tarball release --> <autotools id="geany-release" - autogenargs="--enable-mac-integration --enable-gtk3 --disable-html-docs"> + autogenargs="--enable-mac-integration" + supports-non-srcdir-builds="no"> <branch repo="download.geany.org" module="geany-${version}.tar.bz2" checkoutdir="geany-${version}" version="1.36"> <!-- This patch corresponds to https://github.com/geany/geany/pull/2363 --> <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-geany_config_shell.patch" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-geany_vte_login_shell.patch" strip="1" /> - <!-- TODO: remove once Geany updates to the latest Scintilla --> - <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-geany_scintilla_im_fix.patch" strip="1" /> </branch> <dependencies> <dep package="geany-deps" /> @@ -140,7 +135,6 @@ </metamodule>
<!-- Geany-plugins from git master --> - <!-- TODO: remove supports-non-srcdir-builds when fixed --> <autotools id="geany-plugins-git" supports-non-srcdir-builds="no"> <branch repo="github.com" @@ -154,7 +148,6 @@ </autotools>
<!-- Geany-plugins tarball release --> - <!-- TODO: remove supports-non-srcdir-builds when fixed --> <autotools id="geany-plugins-release" supports-non-srcdir-builds="no"> <branch repo="download.geany.org"
Modified: patches/02-geany_scintilla_im_fix.patch 76 lines changed, 0 insertions(+), 76 deletions(-) =================================================================== @@ -1,76 +0,0 @@ -# HG changeset patch -# User Zufu Liu -# Date 1578312404 -39600 -# Mon Jan 06 23:06:44 2020 +1100 -# Node ID 9d42a88f08cc4d336ecdb0c7f1587efdb00bddbe -# Parent 4dad3058a47731d1f90d09341e546465170fa40f -Bug [#2135]. Set candidate window position in windowed IME mode. - -diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx ---- a/gtk/ScintillaGTK.cxx -+++ b/gtk/ScintillaGTK.cxx -@@ -2432,6 +2432,8 @@ - try { - PreEditString pes(im_context); - if (strlen(pes.str) > 0) { -+ SetCandidateWindowPos(); -+ - PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), pes.str); - pango_layout_set_attributes(layout, pes.attrs); - -# HG changeset patch -# User Zufu Liu -# Date 1578312869 -39600 -# Mon Jan 06 23:14:29 2020 +1100 -# Node ID be67578909888e76e81421d32459ace2a59b9d1d -# Parent 9d42a88f08cc4d336ecdb0c7f1587efdb00bddbe -Bug [#2135]. Improve location of candidate window. - -diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx ---- a/gtk/ScintillaGTK.cxx -+++ b/gtk/ScintillaGTK.cxx -@@ -2315,8 +2315,10 @@ - // Composition box accompanies candidate box. - const Point pt = PointMainCaret(); - GdkRectangle imeBox = {0}; // No need to set width -- imeBox.x = static_cast<gint>(pt.x); // Only need positiion -- imeBox.y = static_cast<gint>(pt.y) + vs.lineHeight; // underneath the first charater -+ imeBox.x = static_cast<gint>(pt.x); -+ imeBox.y = static_cast<gint>(pt.y + std::max(4, vs.lineHeight/4)); -+ // prevent overlapping with current line -+ imeBox.height = vs.lineHeight; - gtk_im_context_set_cursor_location(im_context, &imeBox); - } - -# HG changeset patch -# User Zufu Liu -# Date 1578313229 -39600 -# Mon Jan 06 23:20:29 2020 +1100 -# Node ID 59f3c5ced2e22c4ab05082ada5cd356e13c16633 -# Parent be67578909888e76e81421d32459ace2a59b9d1d -Bug [#2135]. Prevent movement of candidate window while typing. - -diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx ---- a/gtk/ScintillaGTK.cxx -+++ b/gtk/ScintillaGTK.cxx -@@ -2388,8 +2388,11 @@ - return; - } - -- if (initialCompose) -+ if (initialCompose) { - ClearBeforeTentativeStart(); -+ } -+ -+ SetCandidateWindowPos(); - pdoc->TentativeStart(); // TentativeActive() from now on - - std::vector<int> indicator = MapImeIndicators(preeditStr.attrs, preeditStr.str); -@@ -2423,7 +2426,6 @@ - } - - EnsureCaretVisible(); -- SetCandidateWindowPos(); - ShowCaretAtCurrentPosition(); - } catch (...) { - errorStatus = SC_STATUS_FAILURE;
Modified: patches/04-vte_2.91_bsymbolic.patch 65 lines changed, 0 insertions(+), 65 deletions(-) =================================================================== @@ -1,65 +0,0 @@ -From 347f7dd9b1c11244156bfb593866306c735cb06a Mon Sep 17 00:00:00 2001 -From: Christian Persch chpe@src.gnome.org -Date: Sun, 13 Oct 2019 21:30:49 +0200 -Subject: [PATCH] build: Add option to disable -Bsymbolic-functions - -Fixes: https://gitlab.gnome.org/GNOME/vte/issues/184 ---- - meson.build | 16 +++++++++++----- - meson_options.txt | 9 +++++++++ - 2 files changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index a479f10f..06294595 100644 ---- a/meson.build -+++ b/meson.build -@@ -372,15 +372,21 @@ add_project_arguments(global_cxxflags, language: 'cpp') - # Linker flags - - linker_flags = [ -- '-Wl,-Bsymbolic-functions' -+ [ '-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),], - ] - - foreach flag: linker_flags -- assert(cc.has_link_argument(flag), flag + ' is required but not supported') -- add_project_link_arguments(flag, language: 'c') -+ if cc.has_link_argument(flag[0]) -+ add_project_link_arguments(flag[0], language: 'c') -+ elif flag[1] -+ assert(false, flag[0] + ' is required but not supported') -+ endif - -- assert(cxx.has_link_argument(flag), flag + ' is required but not supported') -- add_project_link_arguments(flag, language: 'cpp') -+ if cxx.has_link_argument(flag[0]) -+ add_project_link_arguments(flag[0], language: 'cpp') -+ elif flag[1] -+ assert(false, flag[0] + ' is required but not supported') -+ endif - endforeach - - # Dependencies -diff --git a/meson_options.txt b/meson_options.txt -index d29c66a3..5d8c8798 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,6 +13,15 @@ - # You should have received a copy of the GNU Lesser General Public License - # along with this library. If not, see https://www.gnu.org/licenses/. - -+# This option allows you to disable -Bsymbolic-functions if your linker -+# doesn't support it. -+option( -+ '_b_symbolic_functions', -+ type: 'boolean', -+ value: true, -+ description: 'Use -Bsymbolic-functions', -+) -+ - option( - 'debugg', # for some reason, 'debug' is "reserved" - type: 'boolean', --- -2.20.1 -
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).