Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sun, 22 Oct 2023 19:44:03 UTC
Commit: 215271b02dbfa13e54bee77b6d3a8a76ec1fad68
https://github.com/geany/geany/commit/215271b02dbfa13e54bee77b6d3a8a76ec1fa…
Log Message:
-----------
meson: Use only a single type for a given configuration data item
When a value could either be defined or not, we used to call either
`set(varname, 1)` or `set(varname, false)` respectively. This however
leads to the value type of `varname` to be conditional, making it
virtually unusable for testing its value.
Instead, just do not emit anything when we used to emit `false`.
The only difference is that it will not generate any entry for the
disabled values, but that is what Autotools do already anyway --
although Autotools emit a comment.
This fixes build if either `HAVE_FNMATCH` or `HAVE_REGCOMP` is `false`
(that is, if either `fmatch()` or `regcomp()` functions are not found
on the system).
Fixes #3618.
Modified Paths:
--------------
meson.build
Modified: meson.build
14 lines changed, 4 insertions(+), 10 deletions(-)
===================================================================
@@ -94,8 +94,6 @@ foreach h : check_headers
define = 'HAVE_' + h.underscorify().to_upper()
if cc.has_header(h)
cdata.set(define, 1)
- else
- cdata.set(define, false)
endif
endforeach
@@ -104,8 +102,6 @@ foreach f : check_functions
ccprefix = '\n'.join([gnu_source ? '#define _GNU_SOURCE' : '', f.get(1)])
if cc.has_function(f.get(0), prefix: ccprefix, dependencies: deps)
cdata.set(define, 1)
- else
- cdata.set(define, false)
endif
endforeach
@@ -127,10 +123,8 @@ cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
cdata.set('GETTEXT_PACKAGE', 'PACKAGE')
cdata.set('VERSION', meson.project_version())
cdata.set('ENABLE_NLS', 1)
-if (host_machine.system() == 'windows')
- cdata.set('HAVE_VTE', false)
-else
- cdata.set('HAVE_VTE', get_option('vte'))
+if (host_machine.system() != 'windows' and get_option('vte'))
+ cdata.set('HAVE_VTE', 1)
endif
cdata.set('HAVE_PLUGINS', get_option('plugins'))
cdata.set('HAVE_SOCKET', get_option('socket'))
@@ -443,7 +437,7 @@ dep_scintilla = declare_dependency(
include_directories: include_directories('scintilla/include')
)
-if cdata.get('HAVE_FNMATCH') == 1
+if cdata.get('HAVE_FNMATCH', 0) == 1
dep_fnmatch = dependency('', required: false)
else
# use fnmatch bundled with ctags
@@ -456,7 +450,7 @@ else
dep_fnmatch = declare_dependency(link_with: [fnmatch], include_directories: [ifnmatch])
endif
-if cdata.get('HAVE_REGCOMP') == 1
+if cdata.get('HAVE_REGCOMP', 0) == 1
dep_regex = dependency('', required: false)
else
# use regcomp bundled with ctags
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: GitHub <noreply(a)github.com>
Date: Thu, 02 Nov 2023 19:15:04 UTC
Commit: 949c11b6d7f3299c87ff7e1b3206c9b37a24f201
https://github.com/geany/geany/commit/949c11b6d7f3299c87ff7e1b3206c9b37a24f…
Log Message:
-----------
Merge pull request #3670 from techee/hacking_fix2
HACKING: use the correct function name to be updated for highlighting
Modified Paths:
--------------
HACKING
Modified: HACKING
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -647,7 +647,7 @@ For brace indentation, update lexer_has_braces() in editor.c;
indentation after ':' is done from on_new_line_added().
If the Scintilla lexer supports user type keyword highlighting (e.g.
-SCLEX_CPP), update document_update_tags() in document.c.
+SCLEX_CPP), update document_highlight_tags() in document.c.
Adding a CTags parser
^^^^^^^^^^^^^^^^^^^^^
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Wed, 01 Nov 2023 22:07:59 UTC
Commit: 4b791b27bb182b17fe11cc9f511206bb683f4307
https://github.com/geany/geany/commit/4b791b27bb182b17fe11cc9f511206bb683f4…
Log Message:
-----------
HACKING: use the correct function name to be updated for highlighting
Modified Paths:
--------------
HACKING
Modified: HACKING
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -647,7 +647,7 @@ For brace indentation, update lexer_has_braces() in editor.c;
indentation after ':' is done from on_new_line_added().
If the Scintilla lexer supports user type keyword highlighting (e.g.
-SCLEX_CPP), update document_update_tags() in document.c.
+SCLEX_CPP), update document_highlight_tags() in document.c.
Adding a CTags parser
^^^^^^^^^^^^^^^^^^^^^
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).