Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Tue, 24 Mar 2020 19:25:37 UTC Commit: 3da4356a1a253a3a625c1f1eaa18410eefddd716 https://github.com/geany/geany-osx/commit/3da4356a1a253a3a625c1f1eaa18410eef...
Log Message: ----------- Update modules
Modified Paths: -------------- README.md geany.modules patches/04-vte_2.91_bsymbolic.patch
Modified: README.md 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -230,4 +230,4 @@ have to be performed during normal bundle/installer creation:
---
-Jiri Techet, 2019 +Jiri Techet, 2020
Modified: geany.modules 10 lines changed, 4 insertions(+), 6 deletions(-) =================================================================== @@ -36,16 +36,14 @@ autogenargs="--enable-jit --enable-pcre2-8"> <branch repo="pcre" module="pcre2-${version}.tar.bz2" - version="10.33"/> + version="10.34"/> </autotools>
<meson id="vte291" mesonargs="-Dgnutls=false -Dvapi=false -D_b_symbolic_functions=false"> - <branch module="vte/0.58/vte-${version}.tar.xz" - version="0.58.2"> + <branch module="vte/0.60/vte-${version}.tar.xz" + version="0.60.0"> <!-- 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" /> - <!-- allow -D_b_symbolic_functions=false - TODO: remove once upstream --> - <patch file="https://github.com/geany/geany-osx/raw/master/patches/04-vte_2.91_bsymbolic.patch" strip="1" /> </branch> <dependencies> <dep package="pcre2" /> @@ -58,7 +56,7 @@ <branch repo="download.github.com" module="libgit2/libgit2/archive/v${version}.tar.gz" checkoutdir="libgit2-${version}" - version="0.28.3"/> + version="0.28.4"/> </cmake>
<!-- The mac integration library with a fix for radio menu items -->
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).