Commits April 2012

commits@lists.geany.org

1 participants
44 discussions

[geany/geany] ac34a1: Show SGML entity completion on first typing '&' again
by Nick Treleaven 16 Apr '12

16 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 16 Apr 2012 11:05:18 Commit: ac34a19abe60def11a821d54fe2fbb0b9b6ca845 https://github.com/geany/geany/commit/ac34a19abe60def11a821d54fe2fbb0b9b6ca… Log Message: ----------- Show SGML entity completion on first typing '&' again Modified Paths: -------------- src/editor.c Modified: src/editor.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -2188,6 +2188,7 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc return FALSE; autocomplete_scope(editor); + ret = autocomplete_check_html(editor, style, pos); if (ft->id == GEANY_FILETYPES_LATEX) wordchars = GEANY_WORDCHARS"\\"; /* add \ to word chars if we are in a LaTeX file */ @@ -2198,13 +2199,12 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc root = cword; rootlen = strlen(root); - if (rootlen > 0) + if (!ret && rootlen > 0) { - ret = autocomplete_check_html(editor, style, pos); - if (ret || (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && + if (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && rootlen == 3 && strcmp(root, "php") == 0 && pos >= 5 && sci_get_char_at(sci, pos - 5) == '<' && - sci_get_char_at(sci, pos - 4) == '?')) + sci_get_char_at(sci, pos - 4) == '?') { /* nothing, don't complete PHP open tags */ } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] f2a93d: Don't autocomplete XML entities when outside of XML style range
by Nick Treleaven 16 Apr '12

16 Apr '12

1 0

[geany/geany] 9ddeed: Enable entity completion for XML documents
by Nick Treleaven 13 Apr '12

13 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 13 Apr 2012 16:41:52 Commit: 9ddeed5254dbb2b23a18c2685d4f2e2d2b224eed https://github.com/geany/geany/commit/9ddeed5254dbb2b23a18c2685d4f2e2d2b224… Log Message: ----------- Enable entity completion for XML documents Modified Paths: -------------- src/editor.c src/highlighting.c Modified: src/editor.c 21 files changed, 11 insertions(+), 10 deletions(-) =================================================================== @@ -2031,8 +2031,7 @@ gboolean editor_show_calltip(GeanyEditor *editor, gint pos) } -static gboolean autocomplete_check_html(GeanyEditor *editor, gint style, - const gchar *root, gint rootlen) +static gboolean autocomplete_check_html(GeanyEditor *editor, gint style, gint pos) { GeanyFiletype *ft = editor->document->file_type; gboolean try = FALSE; @@ -2041,6 +2040,8 @@ static gboolean autocomplete_check_html(GeanyEditor *editor, gint style, * (everything after SCE_HJ_START is for embedded scripting languages) */ if (ft->id == GEANY_FILETYPES_HTML && style < SCE_HJ_START) try = TRUE; + else if (sci_get_lexer(editor->sci) == SCLEX_XML) + try = TRUE; else if (ft->id == GEANY_FILETYPES_PHP) { /* use entity completion when style is outside of PHP styles */ @@ -2049,15 +2050,17 @@ static gboolean autocomplete_check_html(GeanyEditor *editor, gint style, } if (try) { + gchar root[GEANY_MAX_WORD_LENGTH]; + gchar *tmp; + + read_current_word(editor, pos, root, sizeof(root), GEANY_WORDCHARS"&", TRUE); + /* Allow something like ""some text"". * for entity completion we want to have completion for '&' within words. */ - gchar *tmp = strchr(root, '&'); - + tmp = strchr(root, '&'); if (tmp != NULL) { - root = tmp; - rootlen = strlen(tmp); - return autocomplete_html(editor->sci, root, rootlen); + return autocomplete_html(editor->sci, tmp, strlen(tmp)); } } return FALSE; @@ -2188,8 +2191,6 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc if (ft->id == GEANY_FILETYPES_LATEX) wordchars = GEANY_WORDCHARS"\\"; /* add \ to word chars if we are in a LaTeX file */ - else if (ft->id == GEANY_FILETYPES_HTML || ft->id == GEANY_FILETYPES_PHP) - wordchars = GEANY_WORDCHARS"&"; /* add & to word chars if we are in a PHP or HTML file */ else wordchars = GEANY_WORDCHARS; @@ -2199,7 +2200,7 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc if (rootlen > 0) { - ret = autocomplete_check_html(editor, style, root, rootlen); + ret = autocomplete_check_html(editor, style, pos); if (ret || (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && rootlen == 3 && strcmp(root, "php") == 0 && pos >= 5 && sci_get_char_at(sci, pos - 5) == '<' && Modified: src/highlighting.c 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1479,6 +1479,7 @@ gboolean highlighting_is_string_style(gint lexer, gint style) return (style == SCE_MATLAB_STRING || style == SCE_MATLAB_DOUBLEQUOTESTRING); + case SCLEX_XML: case SCLEX_HTML: return ( style == SCE_HBA_STRING || @@ -1631,6 +1632,7 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) case SCLEX_YAML: return (style == SCE_YAML_COMMENT); + case SCLEX_XML: case SCLEX_HTML: return ( style == SCE_HBA_COMMENTLINE || @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 9db124: Cleanup HTML entity checks and fix HTML/PHP autocompletion
by Nick Treleaven 13 Apr '12

13 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 13 Apr 2012 16:41:50 Commit: 9db1247b96d3815ff470cb02f40eb71eb881c0b6 https://github.com/geany/geany/commit/9db1247b96d3815ff470cb02f40eb71eb881c… Log Message: ----------- Cleanup HTML entity checks and fix HTML/PHP autocompletion Modified Paths: -------------- src/editor.c Modified: src/editor.c 56 files changed, 29 insertions(+), 27 deletions(-) =================================================================== @@ -1976,7 +1976,7 @@ gboolean editor_show_calltip(GeanyEditor *editor, gint pos) static gboolean autocomplete_html(ScintillaObject *sci, const gchar *root, gsize rootlen) { - guint i, j = 0; + guint i; gboolean found = FALSE; GString *words; const gchar **entities = symbols_get_html_entities(); @@ -1994,8 +1994,9 @@ gboolean editor_show_calltip(GeanyEditor *editor, gint pos) if (! strncmp(entities[i], root, rootlen)) { - if (j++ > 0) + if (words->len) g_string_append_c(words, '\n'); + g_string_append(words, entities[i]); found = TRUE; } @@ -2030,23 +2031,35 @@ gboolean editor_show_calltip(GeanyEditor *editor, gint pos) } -/* Check whether to use entity autocompletion: - * - always in a HTML file except when inside embedded JavaScript, Python, ASP, ... - * - in a PHP file only when we are outside of <? ?> */ -static gboolean autocomplete_check_for_html(gint ft_id, gint style) +static gboolean autocomplete_check_html(GeanyEditor *editor, gint style, + const gchar *root, gint rootlen) { + GeanyFiletype *ft = editor->document->file_type; + gboolean try = FALSE; + /* use entity completion when style is not JavaScript, ASP, Python, PHP, ... * (everything after SCE_HJ_START is for embedded scripting languages) */ - if (ft_id == GEANY_FILETYPES_HTML && style < SCE_HJ_START) - return TRUE; - - if (ft_id == GEANY_FILETYPES_PHP) + if (ft->id == GEANY_FILETYPES_HTML && style < SCE_HJ_START) + try = TRUE; + else if (ft->id == GEANY_FILETYPES_PHP) { /* use entity completion when style is outside of PHP styles */ if (! is_style_php(style)) - return TRUE; + try = TRUE; } + if (try) + { + /* Allow something like ""some text"". + * for entity completion we want to have completion for '&' within words. */ + gchar *tmp = strchr(root, '&'); + if (tmp != NULL) + { + root = tmp; + rootlen = strlen(tmp); + return autocomplete_html(editor->sci, root, rootlen); + } + } return FALSE; } @@ -2186,22 +2199,11 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean forc if (rootlen > 0) { - if (autocomplete_check_for_html(ft->id, style)) - { - /* Allow something like ""some text"". The above startword calculation - * only works on words but for HTML entity completion we also want to have completion - * based on '&' within words. */ - gchar *tmp = strchr(root, '&'); - if (tmp != NULL) - { - root = tmp; - rootlen = strlen(tmp); - } - ret = autocomplete_html(sci, root, rootlen); - } - else if (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && - rootlen == 3 && strcmp(root, "php") == 0 && pos >= 5 && - sci_get_char_at(sci, pos - 5) == '<' && sci_get_char_at(sci, pos - 4) == '?') + ret = autocomplete_check_html(editor, style, root, rootlen); + if (ret || (ft->id == GEANY_FILETYPES_PHP && style == SCE_HPHP_DEFAULT && + rootlen == 3 && strcmp(root, "php") == 0 && pos >= 5 && + sci_get_char_at(sci, pos - 5) == '<' && + sci_get_char_at(sci, pos - 4) == '?')) { /* nothing, don't complete PHP open tags */ } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 3ecfe9: Update of Slovenian translation provided by Jože Klepec
by Frank Lanitz 13 Apr '12

13 Apr '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 13 Apr 2012 07:34:50 Commit: 3ecfe90ad775ae297aa36a98ac78b6b13a745b11 https://github.com/geany/geany/commit/3ecfe90ad775ae297aa36a98ac78b6b13a745… Log Message: ----------- Update of Slovenian translation provided by Jože Klepec Modified Paths: -------------- po/sl.po Modified: po/sl.po 1765 files changed, 803 insertions(+), 962 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 3eb8e2: Code style cleanup
by Enrico Tröger 13 Apr '12

13 Apr '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 12 Apr 2012 21:07:33 Commit: 3eb8e23ecccaed54c70597fc95990db98fff70c6 https://github.com/geany/geany/commit/3eb8e23ecccaed54c70597fc95990db98fff7… Log Message: ----------- Code style cleanup Several small fixes to be more PEP8 compliant (while not completely on purpose). There are no functional changes. Modified Paths: -------------- wscript Modified: wscript 33 files changed, 13 insertions(+), 20 deletions(-) =================================================================== @@ -44,7 +44,7 @@ import os import tempfile from waflib import Logs, Options, Scripting, Utils from waflib.Configure import ConfigurationContext -from waflib.Errors import ConfigurationError, WafError +from waflib.Errors import WafError from waflib.TaskGen import feature @@ -93,7 +93,6 @@ geany_sources = set([ 'src/ui_utils.c', 'src/utils.c']) - def configure(conf): conf.check_waf_version(mini='1.6.1') @@ -107,9 +106,9 @@ def configure(conf): conf.check_cc(header_name='sys/time.h', mandatory=False) conf.check_cc(header_name='sys/types.h', mandatory=False) conf.check_cc(header_name='sys/stat.h', mandatory=False) - conf.define('HAVE_STDLIB_H', 1) # are there systems without stdlib.h? - conf.define('STDC_HEADERS', 1) # an optimistic guess ;-) - _add_to_env_and_define(conf, 'HAVE_REGCOMP', 1) # needed for CTags + conf.define('HAVE_STDLIB_H', 1) # are there systems without stdlib.h? + conf.define('STDC_HEADERS', 1) # an optimistic guess ;-) + _add_to_env_and_define(conf, 'HAVE_REGCOMP', 1) # needed for CTags conf.check_cc(function_name='fgetpos', header_name='stdio.h', mandatory=False) conf.check_cc(function_name='ftruncate', header_name='unistd.h', mandatory=False) @@ -262,7 +261,6 @@ def build(bld): uselib = ['GTK', 'GLIB', 'GMODULE'], install_path = instpath) - # Tagmanager bld.new_task_gen( features = ['c', 'cstlib'], @@ -272,8 +270,7 @@ def build(bld): includes = ['.', 'tagmanager', 'tagmanager/include'], defines = 'G_LOG_DOMAIN="Tagmanager"', uselib = ['GTK', 'GLIB'], - install_path = None) # do not install this library - + install_path = None) # do not install this library # MIO bld.new_task_gen( @@ -284,8 +281,7 @@ def build(bld): includes = ['.', 'tagmanager/mio/'], defines = 'G_LOG_DOMAIN="MIO"', uselib = ['GTK', 'GLIB'], - install_path = None) # do not install this library - + install_path = None) # do not install this library # Scintilla files = bld.srcnode.ant_glob('scintilla/**/*.cxx', src=True, dir=False) @@ -297,8 +293,7 @@ def build(bld): source = scintilla_sources, includes = ['.', 'scintilla/include', 'scintilla/src', 'scintilla/lexlib'], uselib = ['GTK', 'GLIB', 'GMODULE'], - install_path = None) # do not install this library - + install_path = None) # do not install this library # Geany if bld.env['HAVE_VTE'] == 1: @@ -347,7 +342,7 @@ def build(bld): # geany.pc bld.new_task_gen( source = 'geany.pc.in', - dct = {'VERSION' : VERSION, + dct = {'VERSION': VERSION, 'DEPENDENCIES': 'gtk+-2.0 >= %s glib-2.0 >= %s' % \ (MINIMUM_GTK_VERSION, MINIMUM_GLIB_VERSION), 'prefix': bld.env['PREFIX'], @@ -364,7 +359,7 @@ def build(bld): bld.new_task_gen( features = 'intltool_in', source = 'geany.desktop.in', - flags = [ '-d', '-q', '-u', '-c' ], + flags = ['-d', '-q', '-u', '-c'], install_path = '${DATADIR}/applications') # geany.1 @@ -372,7 +367,7 @@ def build(bld): features = 'subst', source = 'doc/geany.1.in', target = 'geany.1', - dct = {'VERSION' : VERSION, + dct = {'VERSION': VERSION, 'GEANY_DATA_DIR': bld.env['DATADIR'] + '/geany'}, install_path = '${MANDIR}/man1') @@ -382,7 +377,7 @@ def build(bld): source = 'geany.spec.in', target = 'geany.spec', install_path = None, - dct = {'VERSION' : VERSION}) + dct = {'VERSION': VERSION}) # Doxyfile bld.new_task_gen( @@ -390,7 +385,7 @@ def build(bld): source = 'doc/Doxyfile.in', target = 'doc/Doxyfile', install_path = None, - dct = {'VERSION' : VERSION}) + dct = {'VERSION': VERSION}) ### # Install files @@ -480,7 +475,7 @@ def write_linguas_file(self): if 'LINGUAS' in self.env: files = self.env['LINGUAS'] for po_filename in files.split(' '): - if os.path.exists ('po/%s.po' % po_filename): + if os.path.exists('po/%s.po' % po_filename): linguas += '%s ' % po_filename else: files = os.listdir('%s/po' % self.path.abspath()) @@ -652,5 +647,3 @@ def _uc_first(string, ctx): if _target_is_win32(ctx): return string.title() return string - - @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 012a90: Define minimum GTK and Glib versions globally to be reused later
by Enrico Tröger 13 Apr '12

13 Apr '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 12 Apr 2012 21:00:39 Commit: 012a904e7496699b792761c12385cd289d7b6f68 https://github.com/geany/geany/commit/012a904e7496699b792761c12385cd289d7b6… Log Message: ----------- Define minimum GTK and Glib versions globally to be reused later Modified Paths: -------------- wscript Modified: wscript 9 files changed, 6 insertions(+), 3 deletions(-) =================================================================== @@ -51,6 +51,8 @@ from waflib.TaskGen import feature APPNAME = 'geany' VERSION = '1.22' LINGUAS_FILE = 'po/LINGUAS' +MINIMUM_GTK_VERSION = '2.16.0' +MINIMUM_GLIB_VERSION = '2.20.0' top = '.' out = '_build_' @@ -128,9 +130,9 @@ def configure(conf): _load_intltool_if_available(conf) # GTK / GIO version check - conf.check_cfg(package='gtk+-2.0', atleast_version='2.16.0', uselib_store='GTK', + conf.check_cfg(package='gtk+-2.0', atleast_version=MINIMUM_GTK_VERSION, uselib_store='GTK', mandatory=True, args='--cflags --libs') - conf.check_cfg(package='glib-2.0', atleast_version='2.20.0', uselib_store='GLIB', + conf.check_cfg(package='glib-2.0', atleast_version=MINIMUM_GLIB_VERSION, uselib_store='GLIB', mandatory=True, args='--cflags --libs') conf.check_cfg(package='gmodule-2.0', uselib_store='GMODULE', mandatory=True, args='--cflags --libs') @@ -346,7 +348,8 @@ def build(bld): bld.new_task_gen( source = 'geany.pc.in', dct = {'VERSION' : VERSION, - 'DEPENDENCIES': 'gtk+-2.0 >= 2.16 glib-2.0 >= 2.20', + 'DEPENDENCIES': 'gtk+-2.0 >= %s glib-2.0 >= %s' % \ + (MINIMUM_GTK_VERSION, MINIMUM_GLIB_VERSION), 'prefix': bld.env['PREFIX'], 'exec_prefix': '${prefix}', 'libdir': '${exec_prefix}/lib', @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 0249d3: Don't warn about missing configure flags if configure shall be skipped
by Enrico Tröger 13 Apr '12

13 Apr '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Thu, 12 Apr 2012 20:41:47 Commit: 0249d3e90652b1aebabe32cfc7a9518596eb7fef https://github.com/geany/geany/commit/0249d3e90652b1aebabe32cfc7a9518596eb7… Log Message: ----------- Don't warn about missing configure flags if configure shall be skipped Modified Paths: -------------- autogen.sh Modified: autogen.sh 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -74,7 +74,7 @@ if test "$DIE" -eq 1; then exit 1 fi -if test -z "$*"; then +if test -z "$*" -a "$NOCONFIGURE" != 1; then echo "**Warning**: I am going to run \`configure' with no arguments." echo "If you wish to pass any to it, please specify them on the" echo \`$0\'" command line." @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 9fad7a: Hide autocompletion when the only entry has been typed
by Nick Treleaven 12 Apr '12

12 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Thu, 12 Apr 2012 16:51:16 Commit: 9fad7aaa55bbe4eeef6e4fd89ea6767c0325d846 https://github.com/geany/geany/commit/9fad7aaa55bbe4eeef6e4fd89ea6767c0325d… Log Message: ----------- Hide autocompletion when the only entry has been typed Fixes #3516212. Modified Paths: -------------- src/editor.c Modified: src/editor.c 17 files changed, 12 insertions(+), 5 deletions(-) =================================================================== @@ -594,11 +594,18 @@ static void check_line_breaking(GeanyEditor *editor, gint pos, gchar c) } -static void show_autocomplete(ScintillaObject *sci, gsize rootlen, const gchar *words) +static void show_autocomplete(ScintillaObject *sci, gsize rootlen, GString *words) { + /* hide autocompletion if only option is already typed */ + if (rootlen >= words->len || + (words->str[rootlen] == '?' && rootlen >= words->len - 2)) + { + sci_send_command(sci, SCI_AUTOCCANCEL); + return; + } /* store whether a calltip is showing, so we can reshow it after autocompletion */ calltip.set = (gboolean) SSM(sci, SCI_CALLTIPACTIVE, 0, 0); - SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words); + SSM(sci, SCI_AUTOCSHOW, rootlen, (sptr_t) words->str); } @@ -633,7 +640,7 @@ static void show_tags_list(GeanyEditor *editor, const GPtrArray *tags, gsize roo else g_string_append(words, "?1"); } - show_autocomplete(sci, rootlen, words->str); + show_autocomplete(sci, rootlen, words); g_string_free(words, TRUE); } } @@ -1994,7 +2001,7 @@ gboolean editor_show_calltip(GeanyEditor *editor, gint pos) } } if (found) - show_autocomplete(sci, rootlen, words->str); + show_autocomplete(sci, rootlen, words); g_string_free(words, TRUE); return found; @@ -2128,7 +2135,7 @@ static gboolean autocomplete_doc_word(GeanyEditor *editor, gchar *root, gsize ro g_slist_free(words); - show_autocomplete(sci, rootlen, str->str); + show_autocomplete(sci, rootlen, str); g_string_free(str, TRUE); return TRUE; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 5f0963: List package dependencies only in configure.ac
by Colomban Wendling 12 Apr '12

12 Apr '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 12 Apr 2012 16:41:53 Commit: 5f0963d4706d40d6beefd844d2c7e7b25847a191 https://github.com/geany/geany/commit/5f0963d4706d40d6beefd844d2c7e7b25847a… Log Message: ----------- List package dependencies only in configure.ac This prevents from having to update both configure.ac and geany.pc.in every time our dependencies (e.g. GTK version) change. Modified Paths: -------------- configure.ac geany.pc.in wscript Modified: configure.ac 6 files changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -57,8 +57,10 @@ GEANY_CHECK_REVISION([dnl force debug mode for a SVN working copy # GTK/GLib/GIO checks -gtk_modules="gtk+-2.0 >= 2.16 glib-2.0 >= 2.20 gio-2.0 >= 2.20 gmodule-2.0" -PKG_CHECK_MODULES([GTK], [$gtk_modules]) +gtk_modules="gtk+-2.0 >= 2.16 glib-2.0 >= 2.20" +gtk_modules_private="gio-2.0 >= 2.20 gmodule-2.0" +PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private]) +AC_SUBST([DEPENDENCIES], [$gtk_modules]) AC_SUBST([GTK_CFLAGS]) AC_SUBST([GTK_LIBS]) GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` Modified: geany.pc.in 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,7 @@ localedir=@localedir@ Name: Geany Description: A fast and lightweight IDE using GTK2 -Requires: gtk+-2.0 >= 2.16.0 +Requires: @DEPENDENCIES@ Version: @VERSION@ Libs: -L${libdir} Cflags: -DGTK -I${includedir}/geany -I${includedir}/geany/tagmanager -I${includedir}/geany/scintilla Modified: wscript 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -346,6 +346,7 @@ def build(bld): bld.new_task_gen( source = 'geany.pc.in', dct = {'VERSION' : VERSION, + 'DEPENDENCIES': 'gtk+-2.0 >= 2.16 glib-2.0 >= 2.20', 'prefix': bld.env['PREFIX'], 'exec_prefix': '${prefix}', 'libdir': '${exec_prefix}/lib', @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012