Plugins-Commits April 2014

plugins-commits@lists.geany.org

1 participants
53 discussions

[geany/geany-plugins] 106662: scope: fix building on GNU/Hurd (PR #146)
by Dimitar Zhekov 27 Apr '14

27 Apr '14

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Date: Sun, 27 Apr 2014 12:30:48 UTC Commit: 10666292f7bd0ceaee299a568ce5fe06b3bce254 https://github.com/geany/geany-plugins/commit/10666292f7bd0ceaee299a568ce5f… Log Message: ----------- scope: fix building on GNU/Hurd (PR #146) Modified Paths: -------------- scope/ChangeLog scope/src/conterm.c scope/src/program.c Modified: scope/ChangeLog 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,12 @@ +2014-04-27 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/conterm.c: + Declare unlockpt() and grantpt() prototypes instead of detecting + N kinds of *nix. Taken from the debugger plugin. + * src/program.c: + Define PATH_MAX if none (for example GNU/Hurd), by Evgeni Golov. + + 2014-02-17 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/store/scptreestore.c: Modified: scope/src/conterm.c 15 lines changed, 4 insertions(+), 11 deletions(-) =================================================================== @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define _XOPEN_SOURCE 500 /* for openpty, grantpt and unlockpt */ - #include <errno.h> #include <stdlib.h> #include <string.h> @@ -30,16 +28,11 @@ #define DS_COPY (DS_BASICS | DS_EXTRA_1) #ifdef G_OS_UNIX -#if (defined(__unix__) || defined(unix)) && !defined(USG) -#include <sys/param.h> -#endif -#ifdef BSD -#include <termios.h> -#include <libutil.h> -#else -#include <pty.h> -#endif #include <vte/vte.h> +/* instead of detecting N kinds of *nix */ +#include <pty.h> +int grantpt(int fd); +int unlockpt(int fd); static GtkWidget *program_window; static VteTerminal *program_terminal; Modified: scope/src/program.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -23,6 +23,10 @@ #include "common.h" +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + static StashGroup *program_group; static StashGroup *options_group; static StashGroup *thread_group; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c172ff: Merge pull request #147 from evgeni/typos
by Frank Lanitz 23 Apr '14

23 Apr '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 23 Apr 2014 07:36:29 UTC Commit: c172ff202190fbda3a3dc515dd4d442d7c4ab703 https://github.com/geany/geany-plugins/commit/c172ff202190fbda3a3dc515dd4d4… Log Message: ----------- Merge pull request #147 from evgeni/typos fix a couple of typos Modified Paths: -------------- multiterm/src/defconf.vala treebrowser/src/treebrowser.c Modified: multiterm/src/defconf.vala 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -35,12 +35,12 @@ namespace MultiTerm #======================================================================# # # # You can configure the behaviour of the MultiTerm plugin by adjusting # -# the values in this file. Lines begining with a # are considered # +# the values in this file. Lines beginning with a # are considered # # comments and are left as is. Group/section names go in [] and keys # # and values are separated by an = symbol. Where more than one value # # can be supplied, as in a list, separate the values with the ; symbol.# # # -# Groups/section names begining with 'shell=' denote a type of # +# Groups/section names beginning with 'shell=' denote a type of # # terminal/shell that can be opened. The name of the shell follows # # the = symbol. Each shell can have it's own specific VTE # # configuration and can run it's own child command. As an example, if # Modified: treebrowser/src/treebrowser.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1157,8 +1157,8 @@ on_menu_close_children(GtkMenuItem *menuitem, gchar *uri) { if (documents[i]->is_valid) { - /* the docuemnt filename shoudl always be longer than the uri when closing children - * Compare the beginingin of the filename string to see if it matchs the uri*/ + /* the document filename should always be longer than the uri when closing children + * Compare the beginning of the filename string to see if it matchs the uri*/ if (strlen(documents[i]->file_name) > uri_len) { if (strncmp(uri, documents[i]->file_name, uri_len)==0) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 635829: fix a couple of typos
by Evgeni Golov 23 Apr '14

23 Apr '14

Branch: refs/heads/master Author: Evgeni Golov <evgeni(a)debian.org> Committer: Evgeni Golov <evgeni(a)debian.org> Date: Wed, 23 Apr 2014 06:24:24 UTC Commit: 635829c24e9a684b7403d5170358d722f7205579 https://github.com/geany/geany-plugins/commit/635829c24e9a684b7403d5170358d… Log Message: ----------- fix a couple of typos some of them were spotted by Debian's lintian, thanks for that! Modified Paths: -------------- multiterm/src/defconf.vala treebrowser/src/treebrowser.c Modified: multiterm/src/defconf.vala 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -35,12 +35,12 @@ namespace MultiTerm #======================================================================# # # # You can configure the behaviour of the MultiTerm plugin by adjusting # -# the values in this file. Lines begining with a # are considered # +# the values in this file. Lines beginning with a # are considered # # comments and are left as is. Group/section names go in [] and keys # # and values are separated by an = symbol. Where more than one value # # can be supplied, as in a list, separate the values with the ; symbol.# # # -# Groups/section names begining with 'shell=' denote a type of # +# Groups/section names beginning with 'shell=' denote a type of # # terminal/shell that can be opened. The name of the shell follows # # the = symbol. Each shell can have it's own specific VTE # # configuration and can run it's own child command. As an example, if # Modified: treebrowser/src/treebrowser.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1157,8 +1157,8 @@ on_menu_close_children(GtkMenuItem *menuitem, gchar *uri) { if (documents[i]->is_valid) { - /* the docuemnt filename shoudl always be longer than the uri when closing children - * Compare the beginingin of the filename string to see if it matchs the uri*/ + /* the document filename should always be longer than the uri when closing children + * Compare the beginning of the filename string to see if it matchs the uri*/ if (strlen(documents[i]->file_name) > uri_len) { if (strncmp(uri, documents[i]->file_name, uri_len)==0) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cbfe19: Merge pull request #145 from b4n/spellcheck/no-embedded-default-styles
by Enrico Tröger 20 Apr '14

20 Apr '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 20 Apr 2014 15:55:38 UTC Commit: cbfe198c0dfdd1a5823d1990c9428babea457feb https://github.com/geany/geany-plugins/commit/cbfe198c0dfdd1a5823d1990c9428… Log Message: ----------- Merge pull request #145 from b4n/spellcheck/no-embedded-default-styles spellcheck: Don't check default styles of embedded HTML scripts Modified Paths: -------------- spellcheck/src/speller.c Modified: spellcheck/src/speller.c 7 lines changed, 0 insertions(+), 7 deletions(-) =================================================================== @@ -845,41 +845,34 @@ gboolean sc_speller_is_text(GeanyDocument *doc, gint pos) case SCE_H_SGML_DOUBLESTRING: case SCE_H_SGML_SIMPLESTRING: case SCE_H_SGML_1ST_PARAM_COMMENT: - case SCE_HJ_DEFAULT: case SCE_HJ_COMMENT: case SCE_HJ_COMMENTLINE: case SCE_HJ_COMMENTDOC: case SCE_HJ_DOUBLESTRING: case SCE_HJ_SINGLESTRING: case SCE_HJ_STRINGEOL: - case SCE_HB_DEFAULT: case SCE_HB_COMMENTLINE: case SCE_HB_STRING: case SCE_HB_STRINGEOL: - case SCE_HBA_DEFAULT: case SCE_HBA_COMMENTLINE: case SCE_HBA_STRING: case SCE_HBA_STRINGEOL: - case SCE_HJA_DEFAULT: case SCE_HJA_COMMENT: case SCE_HJA_COMMENTLINE: case SCE_HJA_COMMENTDOC: case SCE_HJA_DOUBLESTRING: case SCE_HJA_SINGLESTRING: case SCE_HJA_STRINGEOL: - case SCE_HP_DEFAULT: case SCE_HP_COMMENTLINE: case SCE_HP_STRING: case SCE_HP_CHARACTER: case SCE_HP_TRIPLE: case SCE_HP_TRIPLEDOUBLE: - case SCE_HPA_DEFAULT: case SCE_HPA_COMMENTLINE: case SCE_HPA_STRING: case SCE_HPA_CHARACTER: case SCE_HPA_TRIPLE: case SCE_HPA_TRIPLEDOUBLE: - case SCE_HPHP_DEFAULT: case SCE_HPHP_SIMPLESTRING: case SCE_HPHP_HSTRING: case SCE_HPHP_COMMENT: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f51547: geanypy: Add missing linking against gmodule (Waf)
by Enrico Tröger 20 Apr '14

20 Apr '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 20 Apr 2014 15:42:06 UTC Commit: f5154762cca48499691bc88796e012197dfd6c06 https://github.com/geany/geany-plugins/commit/f5154762cca48499691bc88796e01… Log Message: ----------- geanypy: Add missing linking against gmodule (Waf) Modified Paths: -------------- geanypy/wscript_build geanypy/wscript_configure Modified: geanypy/wscript_build 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -24,7 +24,7 @@ from build.wafutils import build_plugin, target_is_win32 # plugin config name = 'GeanyPy' includes = ['geanypy/src'] -libraries = ['PYGTK', 'PYEXT'] +libraries = ['GMODULE', 'PYGTK', 'PYEXT'] build_plugin(bld, name, includes=includes, libraries=libraries) Modified: geanypy/wscript_configure 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -52,6 +52,12 @@ check_cfg_cached(conf, uselib_store="PYGTK", mandatory=True, args='--cflags --libs') +# GModule +check_cfg_cached(conf, + package='gmodule-2.0', + uselib_store="GMODULE", + mandatory=True, + args='--cflags --libs') # try to find the Python DSO path, for details see geanypy/m4/ax_python_library.m4 conf.start_msg('Checking for python DSO path') -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 87f4b4: Do not hardcode LIBDIR when building on Windows
by Enrico Tröger 20 Apr '14

20 Apr '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 20 Apr 2014 15:39:53 UTC Commit: 87f4b402965a079da1c1b2aac793c517a221518e https://github.com/geany/geany-plugins/commit/87f4b402965a079da1c1b2aac793c… Log Message: ----------- Do not hardcode LIBDIR when building on Windows Modified Paths: -------------- build/wafutils.py geanylua/wscript_build multiterm/wscript_build wscript Modified: build/wafutils.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -121,7 +121,7 @@ def build_plugin(ctx, name, sources=None, includes=None, defines=None, libraries defines = defines, target = plugin_name, use = libraries, - install_path = '${G_PREFIX}/lib' if is_win32 else '${LIBDIR}/geany/') + install_path = '${G_PREFIX}/${LIBDIR}' if is_win32 else '${LIBDIR}/geany/') install_docs(ctx, plugin_name, 'AUTHORS ChangeLog COPYING NEWS README THANKS TODO'.split()) return task Modified: geanylua/wscript_build 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,7 @@ build_plugin(bld, name, sources=sources, libraries=libraries) is_win32 = target_is_win32(bld) if is_win32: - install_path = '${G_PREFIX}/lib/geany-plugins/geanylua' + install_path = '${G_PREFIX}/${LIBDIR}/geany-plugins/geanylua' else: install_path = '${LIBDIR}/geany-plugins/geanylua' Modified: multiterm/wscript_build 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -38,7 +38,7 @@ def build_vala_plugin(ctx, name, sources, vapi_dirs=None, packages=None, libraries.extend(['GTK', 'GEANY']) features.extend(['c', 'cshlib']) - install_path = '${G_PREFIX}/lib' if target_is_win32(ctx) else '${LIBDIR}/geany/' + install_path = '${G_PREFIX}/${LIBDIR}' if target_is_win32(ctx) else '${LIBDIR}/geany/' task = ctx.shlib(packages = packages, features = features, Modified: wscript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -151,7 +151,7 @@ def setup_configuration_env(conf): conf.env['G_PREFIX'] = conf.env['PREFIX'] # paths add_to_env_and_define(conf, 'PREFIX', '', quote=True) - add_to_env_and_define(conf, 'LIBDIR', '', quote=True) + add_to_env_and_define(conf, 'LIBDIR', 'lib', quote=True) add_to_env_and_define(conf, 'LIBEXECDIR', '', quote=True) add_to_env_and_define(conf, 'DOCDIR', 'doc', quote=True) conf.define('LOCALEDIR', 'share/locale', 1) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3325a0: Add support to build GeanyPy on Windows
by Enrico Tröger 20 Apr '14

20 Apr '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 20 Apr 2014 15:35:03 UTC Commit: 3325a0db66c67406c35d692994ce89744eb7f1e2 https://github.com/geany/geany-plugins/commit/3325a0db66c67406c35d692994ce8… Log Message: ----------- Add support to build GeanyPy on Windows Modified Paths: -------------- geanypy/wscript_build geanypy/wscript_configure Modified: geanypy/wscript_build 10 lines changed, 8 insertions(+), 2 deletions(-) =================================================================== @@ -30,6 +30,9 @@ build_plugin(bld, name, includes=includes, libraries=libraries) # install Python modules (they will be byte-compiled on install) +lib_dst = '%s/geany' % bld.env['GEANYPY_PYTHON_DIR'] +if target_is_win32(bld): + lib_dst = '${G_PREFIX}/%s' % lib_dst py_sources = ['geany/__init__.py', 'geany/console.py', 'geany/manager.py', @@ -39,9 +42,12 @@ py_sources = ['geany/__init__.py', bld.new_task_gen( features = 'py', source = py_sources, - install_path = '%s/geany' % bld.env['GEANYPY_PYTHON_DIR']) + install_path = lib_dst) # install plugins start_dir = bld.path.find_dir('plugins') -bld.install_files(bld.env['GEANYPY_PLUGIN_DIR'], start_dir.ant_glob('*.py'), cwd=start_dir) +plugin_dst = bld.env['GEANYPY_PLUGIN_DIR'] +if target_is_win32(bld): + plugin_dst = '${G_PREFIX}/%s' % plugin_dst +bld.install_files(plugin_dst, start_dir.ant_glob('*.py'), cwd=start_dir) Modified: geanypy/wscript_configure 25 lines changed, 16 insertions(+), 9 deletions(-) =================================================================== @@ -22,14 +22,20 @@ from build.wafutils import add_to_env_and_define, check_cfg_cached, target_is_wi from waflib.Errors import ConfigurationError PYTHON_DETECT_DSO_CODE = """ +import sys +from ctypes.util import find_library from distutils.sysconfig import get_config_vars from os.path import join as path_join -cvars = get_config_vars() -# support multiarch-enabled distributions like Ubuntu -if not 'MULTIARCH' in cvars.keys(): - cvars['MULTIARCH'] = '' -print(path_join(cvars['LIBDIR'], cvars['MULTIARCH'], cvars['LDLIBRARY'])) +if sys.platform == 'win32': + pyver = get_config_vars()['VERSION'] + print(find_library('python%s.dll' % pyver)) +else: + cvars = get_config_vars() + # support multiarch-enabled distributions like Ubuntu + if not 'MULTIARCH' in cvars.keys(): + cvars['MULTIARCH'] = '' + print(path_join(cvars['LIBDIR'], cvars['MULTIARCH'], cvars['LDLIBRARY'])) """ # Python @@ -57,7 +63,9 @@ except: conf.end_msg(False) conf.fatal('Could not find the python DSO path') else: - dso_path = dso_path.strip() + # dso_path on Windows looks like c:\windows\system32\python27.dll, to avoid quoting problems + # of backslashes from Python to config.h to C code, simply use forward slashes (lazy workaround) + dso_path = dso_path.strip().replace('\\', '/') add_to_env_and_define(conf, 'GEANYPY_PYTHON_LIBRARY', dso_path, quote=True) conf.end_msg(dso_path) @@ -69,9 +77,8 @@ if not 'LIB_PYEXT' in conf.env: # dirs is_win32 = target_is_win32(conf) if is_win32: - geanypy_lib_path = '%s/lib/geany-plugins/geanypy' % conf.env['G_PREFIX'] - geanypy_data_path = '%s/%s/geany-plugins/geanypy' % ( - conf.env['G_PREFIX'], conf.env['GEANYPLUGINS_DATADIR']) + geanypy_lib_path = '%s/geany-plugins/geanypy' % conf.env['LIBDIR'] + geanypy_data_path = '%s/geany-plugins/geanypy' % conf.env['GEANYPLUGINS_DATADIR'] else: geanypy_lib_path = '%s/geany-plugins/geanypy' % conf.env['LIBDIR'] geanypy_data_path = '%s/geany-plugins/geanypy' % conf.env['GEANYPLUGINS_DATADIR'] -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 136362: spellcheck: Don't check default styles of embedded HTML scripts
by Colomban Wendling 20 Apr '14

20 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 20 Apr 2014 15:33:15 UTC Commit: 136362dd0b05127e7ccefe29c538fd2057f0ed7e https://github.com/geany/geany-plugins/commit/136362dd0b05127e7ccefe29c538f… Log Message: ----------- spellcheck: Don't check default styles of embedded HTML scripts Don't check the spelling for the default styles used by embedded scripting languages inside HTML. While spellchecking the default HTML and SGML styles makes sense since it includes most text, it doesn't make sense to do so for default style of embedded scripting languages (such as PHP, Python, etc.), as those "default" styles are the bare identifiers of the language (classes, functions, etc.). This doesn't affect HTML or SGML embedded in scripting languages, as the default style for the scripting languages have a different value than the ones for the markup languages. Modified Paths: -------------- spellcheck/src/speller.c Modified: spellcheck/src/speller.c 7 lines changed, 0 insertions(+), 7 deletions(-) =================================================================== @@ -845,41 +845,34 @@ gboolean sc_speller_is_text(GeanyDocument *doc, gint pos) case SCE_H_SGML_DOUBLESTRING: case SCE_H_SGML_SIMPLESTRING: case SCE_H_SGML_1ST_PARAM_COMMENT: - case SCE_HJ_DEFAULT: case SCE_HJ_COMMENT: case SCE_HJ_COMMENTLINE: case SCE_HJ_COMMENTDOC: case SCE_HJ_DOUBLESTRING: case SCE_HJ_SINGLESTRING: case SCE_HJ_STRINGEOL: - case SCE_HB_DEFAULT: case SCE_HB_COMMENTLINE: case SCE_HB_STRING: case SCE_HB_STRINGEOL: - case SCE_HBA_DEFAULT: case SCE_HBA_COMMENTLINE: case SCE_HBA_STRING: case SCE_HBA_STRINGEOL: - case SCE_HJA_DEFAULT: case SCE_HJA_COMMENT: case SCE_HJA_COMMENTLINE: case SCE_HJA_COMMENTDOC: case SCE_HJA_DOUBLESTRING: case SCE_HJA_SINGLESTRING: case SCE_HJA_STRINGEOL: - case SCE_HP_DEFAULT: case SCE_HP_COMMENTLINE: case SCE_HP_STRING: case SCE_HP_CHARACTER: case SCE_HP_TRIPLE: case SCE_HP_TRIPLEDOUBLE: - case SCE_HPA_DEFAULT: case SCE_HPA_COMMENTLINE: case SCE_HPA_STRING: case SCE_HPA_CHARACTER: case SCE_HPA_TRIPLE: case SCE_HPA_TRIPLEDOUBLE: - case SCE_HPHP_DEFAULT: case SCE_HPHP_SIMPLESTRING: case SCE_HPHP_HSTRING: case SCE_HPHP_COMMENT: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 390f00: geanypy: Try to disable C compiler warnings about long long usage
by Colomban Wendling 20 Apr '14

20 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 20 Apr 2014 12:14:12 UTC Commit: 390f005a9ea03787dbb19aabeec59dcabf3b6f84 https://github.com/geany/geany-plugins/commit/390f005a9ea03787dbb19aabeec59… Log Message: ----------- geanypy: Try to disable C compiler warnings about long long usage Enable the -Wno-long-long flag if the compiler understands it, because Python uses it. No need to do a proper check for whether the compiler has a long long type since it's not our code that uses it anyway. Modified Paths: -------------- build/geanypy.m4 Modified: build/geanypy.m4 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -21,7 +21,10 @@ AC_DEFUN([GP_CHECK_GEANYPY], dnl check for C flags we wish to use GEANYPY_CFLAGS= - for flag in -fno-strict-aliasing -Wno-write-strings; do + for flag in -fno-strict-aliasing \ + -Wno-write-strings \ + -Wno-long-long + do GP_CHECK_CFLAG([$flag], [GEANYPY_CFLAGS="${GEANYPY_CFLAGS} $flag"]) done AC_SUBST([GEANYPY_CFLAGS]) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d1e920: geanypy: Add missing linking against gmodule
by Colomban Wendling 20 Apr '14

20 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 20 Apr 2014 12:06:14 UTC Commit: d1e9203fd5b0eb7c14bc537b7a918555bb9ba91e https://github.com/geany/geany-plugins/commit/d1e9203fd5b0eb7c14bc537b7a918… Log Message: ----------- geanypy: Add missing linking against gmodule Modified Paths: -------------- build/geanypy.m4 geanypy/src/Makefile.am Modified: build/geanypy.m4 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -3,6 +3,7 @@ AC_DEFUN([GP_CHECK_GEANYPY], GP_ARG_DISABLE([Geanypy], [auto]) GP_CHECK_PLUGIN_GTK2_ONLY([Geanypy]) GP_CHECK_PLUGIN_DEPS([Geanypy], [PYGTK], [pygtk-2.0]) + GP_CHECK_PLUGIN_DEPS([Geanypy], [GMODULE], [gmodule-2.0]) dnl FIXME: Checks for Python below should gracefully disable the plugin dnl if they don't succeed and enable_geanypy is set to `auto`. dnl However, since these macros don't seem to gracefully handle Modified: geanypy/src/Makefile.am 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -8,9 +8,10 @@ geanypy_la_CPPFLAGS = @GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \ -DGEANYPY_PYTHON_DIR="\"$(libdir)/geany/geanypy\"" \ -DGEANYPY_PLUGIN_DIR="\"$(datadir)/geany/geanypy/plugins\"" \ -UHAVE_CONFIG_H -geanypy_la_CFLAGS = @GEANYPY_CFLAGS@ +geanypy_la_CFLAGS = @GEANYPY_CFLAGS@ @GMODULE_CFLAGS@ geanypy_la_LIBADD = @GEANY_LIBS@ @PYGTK_LIBS@ @PYTHON_LDFLAGS@ \ - @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ + @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ \ + @GMODULE_LIBS@ geanypy_la_SOURCES = geanypy-app.c \ geanypy-dialogs.c \ geanypy-document.c geanypy-document.h \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits April 2014