Commits March 2023

commits@lists.geany.org

1 participants
39 discussions

[geany/geany-osx] 1bed7a: Update login shell patch to latest changes in master
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 21:52:04 UTC Commit: 1bed7a2f9b84c5016022979becb6d6e6f58b886c https://github.com/geany/geany-osx/commit/1bed7a2f9b84c5016022979becb6d6e6f… Log Message: ----------- Update login shell patch to latest changes in master Modified Paths: -------------- geany.modules geany_patches/03git-geany_vte_login_shell.patch Modified: geany.modules 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -113,7 +113,7 @@  <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01git-geany_con…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/02-geany_scinti…" strip="1" /> - <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/03-geany_vte_lo…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/03git-geany_vte…" strip="1" /> </branch> <dependencies> <dep package="geany-deps" /> Modified: geany_patches/03git-geany_vte_login_shell.patch 70 lines changed, 70 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,70 @@ +From 11ae19d0df6bf5715c1a92f9b1f5f5fe07621174 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet(a)gmail.com> +Date: Sat, 9 Nov 2019 11:07:19 -0800 +Subject: [PATCH 2/2] Make sure any shell used in VTE is run as login shell on + macOS + +Previously we did this for bash only but we should do it for arbitrary +shell. The -l option seems to be supported by all major shells. + +Previously we used to add -l to the settings value itself which probably +isn't the cleanest way as the entry should contain path. Let's add +it invisibly to user but make sure we don't add it when settings already +contains -l. +--- + src/keyfile.c | 7 ------- + src/vte.c | 12 +++++++++++- + 2 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/src/keyfile.c b/src/keyfile.c +index d4daa0b2f..92d3ac93c 100644 +--- a/src/keyfile.c ++++ b/src/keyfile.c +@@ -980,13 +980,6 @@ static void load_dialog_prefs(GKeyFile *config) + struct passwd *pw = getpwuid(getuid()); + const gchar *shell = (pw != NULL) ? pw->pw_shell : "/bin/sh"; + +-#ifdef __APPLE__ +- /* Geany is started using launchd on OS X and we don't get any environment variables +- * so PS1 isn't defined. Start as a login shell to read the corresponding config files. */ +- if (strcmp(shell, "/bin/bash") == 0) +- shell = "/bin/bash -l"; +-#endif +- + vte_info.dir = utils_get_setting_string(config, "VTE", "last_dir", NULL); + if ((vte_info.dir == NULL || utils_str_equal(vte_info.dir, "")) && pw != NULL) + /* last dir is not set, fallback to user's home directory */ +diff --git a/src/vte.c b/src/vte.c +index ec8c5df37..3b798de40 100644 +--- a/src/vte.c ++++ b/src/vte.c +@@ -485,8 +485,17 @@ static void vte_commit_cb(VteTerminal *vte, gchar *arg1, guint arg2, gpointer us + + static void vte_start(GtkWidget *widget) + { ++ gchar *shell = g_strdup(vte_config.shell); ++ ++#ifdef __APPLE__ ++ /* run as a login shell as macOS doesn't load any configuration when ++ * user is logged in and this is the only way to load config files */ ++ if (strstr(shell, " -l") == NULL) ++ SETPTR(shell, g_strconcat(shell, " -l", NULL)); ++#endif ++ + /* split the shell command line, so arguments will work too */ +- gchar **argv = g_strsplit(vte_config.shell, " ", -1); ++ gchar **argv = g_strsplit(shell, " ", -1); + + if (argv != NULL) + { +@@ -513,6 +522,7 @@ static void vte_start(GtkWidget *widget) + pid = 0; /* use 0 as invalid pid */ + + set_clean(TRUE); ++ g_free(shell); + } + + +-- +2.17.1 + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 760db6: Update patch so it applies with current glade file
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 21:29:13 UTC Commit: 760db618cef01e60ca11c2040e9f4c8c2937d7e0 https://github.com/geany/geany-osx/commit/760db618cef01e60ca11c2040e9f4c8c2… Log Message: ----------- Update patch so it applies with current glade file Modified Paths: -------------- geany.modules geany_patches/01git-geany_config_shell.patch Modified: geany.modules 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -111,7 +111,7 @@ checkoutdir="geany-git" revision="master" >  - <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01-geany_config…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01git-geany_con…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/02-geany_scinti…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/03-geany_vte_lo…" strip="1" /> </branch> Modified: geany_patches/01git-geany_config_shell.patch 254 lines changed, 254 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,254 @@ +From 2981b0761b343e0eb49ab36f01bf37c4acec5245 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ji=C5=99=C3=AD=20Techet?= <techet(a)gmail.com> +Date: Sat, 9 Nov 2019 10:46:39 -0800 +Subject: [PATCH 1/2] Allow configuring shell used for build commands + +Currently there is a problem when users use a different shell than sh/bash +and configure their environment in the config file of the given shell. +This config file isn't loaded by Geany because Geany always uses sh +in a non-login non-interactive way. + +This patch tries to solve the problem by allowing users to specify the +shell they want to use for launching build commands. In order to make +shells load their config files, the shells are run as login non-interactive +shells because non-login non-interactive shells like sh/bash don't load +configuration from any files. Unfortunately csh/tcsh don't allow us to be +run as login and use the -c option simultaneously so these shells aren't +started as login shells. + +Running shells as login is absolutely necessary on macOS even for sh/bash. +While on linux display managers typically source .profile upon login, +this doesn't happen on macOS and the only way to get the environment loaded +is to run shells as login. + +There are some places where /bin/sh can still be used. One of them is +the execute command. When configured to use VTE for execution, we already +have the environment set up by the shell in VTE so we don't need to do any +other work. When configured to use external terminal for running, the +terminal is run as non-login interactive so it should load its +configuration too. + +I kept the printing command to use /bin/sh because either the code used +for the build command would have to be duplicated there or somehow +factored-out and it doesn't seem to be worth the work for this simple +case where only /usr/bin/lpr is called. + +This patch has been tested with the following shells: +sh, bash, dash, ksh, zsh, csh, tcsh, fish, ion +--- + data/geany.glade | 59 +++++++++++++++++++++++++++++++++++++++++++++++- + src/build.c | 14 ++++++++++-- + src/keyfile.c | 7 ++++++ + src/prefs.c | 10 ++++++++ + src/prefs.h | 1 + + 5 files changed, 88 insertions(+), 3 deletions(-) + +diff --git a/data/geany.glade b/data/geany.glade +index 3864a0ad1..79cf7c4b9 100644 +--- a/data/geany.glade ++++ b/data/geany.glade +@@ -4798,7 +4798,7 @@ + <object class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="can-focus">False</property> +- <property name="n-rows">3</property> ++ <property name="n-rows">4</property> + <property name="n-columns">3</property> + <property name="column-spacing">6</property> + <property name="row-spacing">3</property> +@@ -4960,6 +4960,63 @@ + <property name="y-options"/> + </packing> + </child> ++ <child> ++ <object class="GtkLabel" id="label27"> ++ <property name="visible">True</property> ++ <property name="can-focus">False</property> ++ <property name="xalign">0</property> ++ <property name="label" translatable="yes">Shell:</property> ++ <property name="mnemonic-widget">entry-grep</property> ++ </object> ++ <packing> ++ <property name="top-attach">3</property> ++ <property name="bottom-attach">4</property> ++ <property name="x-options">GTK_FILL</property> ++ <property name="y-options"/> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkEntry" id="entry_shell1"> ++ <property name="visible">True</property> ++ <property name="can-focus">True</property> ++ <property name="tooltip-text" translatable="yes">Shell used for build commands (useful to get environment set up from the shell's config files)</property> ++ <property name="invisible-char">•</property> ++ <property name="invisible-char-set">True</property> ++ <property name="primary-icon-activatable">False</property> ++ <property name="secondary-icon-activatable">False</property> ++ <property name="primary-icon-sensitive">True</property> ++ <property name="secondary-icon-sensitive">True</property> ++ </object> ++ <packing> ++ <property name="left-attach">1</property> ++ <property name="right-attach">2</property> ++ <property name="top-attach">3</property> ++ <property name="bottom-attach">4</property> ++ <property name="y-options"/> ++ </packing> ++ </child> ++ <child> ++ <object class="GtkButton" id="button_shell"> ++ <property name="visible">True</property> ++ <property name="can-focus">True</property> ++ <property name="receives-default">False</property> ++ <child> ++ <object class="GtkImage" id="image7"> ++ <property name="visible">True</property> ++ <property name="can-focus">False</property> ++ <property name="stock">gtk-open</property> ++ </object> ++ </child> ++ </object> ++ <packing> ++ <property name="left-attach">2</property> ++ <property name="right-attach">3</property> ++ <property name="top-attach">3</property> ++ <property name="bottom-attach">4</property> ++ <property name="x-options">GTK_FILL</property> ++ <property name="y-options"/> ++ </packing> ++ </child> + </object> + <packing> + <property name="expand">False</property> +diff --git a/src/build.c b/src/build.c +index 4c9f4ebb2..996758d80 100644 +--- a/src/build.c ++++ b/src/build.c +@@ -772,10 +772,11 @@ static gchar *build_replace_placeholder(const GeanyDocument *doc, const gchar *s + static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir) + { + GError *error = NULL; +- gchar *argv[] = { "/bin/sh", "-c", NULL, NULL }; ++ gchar *argv[] = { tool_prefs.shell_cmd, "-l", "-c", NULL, NULL }; + gchar *working_dir; + gchar *utf8_working_dir; + gchar *cmd_string; ++ gchar *shell = NULL; + + g_return_if_fail(doc == NULL || doc->is_valid); + +@@ -799,8 +800,16 @@ static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d + + #ifdef G_OS_UNIX + cmd_string = utils_get_locale_from_utf8(cmd); +- argv[2] = cmd_string; + cmd = NULL; /* under Unix, use argv to start cmd via sh for compatibility */ ++ shell = g_path_get_basename(tool_prefs.shell_cmd); ++ if (g_strcmp0(shell, "csh") == 0 || g_strcmp0(shell, "tcsh") == 0) ++ { ++ /* csh and tcsh don't support -l together with -c so don't use it */ ++ argv[1] = "-c"; ++ argv[2] = cmd_string; ++ } ++ else ++ argv[3] = cmd_string; + #else + /* Expand environment variables like %blah%. */ + cmd_string = win32_expand_environment_variables(cmd); +@@ -825,6 +834,7 @@ static void build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d + + g_free(working_dir); + g_free(cmd_string); ++ g_free(shell); + } + + +diff --git a/src/keyfile.c b/src/keyfile.c +index a5f6e9dfd..d4daa0b2f 100644 +--- a/src/keyfile.c ++++ b/src/keyfile.c +@@ -93,6 +93,11 @@ + #endif + #define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" + #define GEANY_DEFAULT_TOOLS_GREP "grep" ++#ifdef __APPLE__ ++# define GEANY_DEFAULT_TOOLS_SHELL "/bin/bash" ++#else ++# define GEANY_DEFAULT_TOOLS_SHELL "/bin/sh" ++#endif + #define GEANY_DEFAULT_MRU_LENGTH 10 + #define GEANY_TOGGLE_MARK "~ " + #define GEANY_MAX_AUTOCOMPLETE_WORDS 30 +@@ -523,6 +528,7 @@ static void save_dialog_prefs(GKeyFile *config) + g_key_file_set_string(config, "tools", "terminal_cmd", tool_prefs.term_cmd ? tool_prefs.term_cmd : ""); + g_key_file_set_string(config, "tools", "browser_cmd", tool_prefs.browser_cmd ? tool_prefs.browser_cmd : ""); + g_key_file_set_string(config, "tools", "grep_cmd", tool_prefs.grep_cmd ? tool_prefs.grep_cmd : ""); ++ g_key_file_set_string(config, "tools", "shell_cmd", tool_prefs.shell_cmd ? tool_prefs.shell_cmd : ""); + g_key_file_set_string(config, PACKAGE, "context_action_cmd", tool_prefs.context_action_cmd); + + /* build menu */ +@@ -965,6 +971,7 @@ static void load_dialog_prefs(GKeyFile *config) + tool_prefs.term_cmd = cmd; + tool_prefs.browser_cmd = utils_get_setting_string(config, "tools", "browser_cmd", GEANY_DEFAULT_TOOLS_BROWSER); + tool_prefs.grep_cmd = utils_get_setting_string(config, "tools", "grep_cmd", GEANY_DEFAULT_TOOLS_GREP); ++ tool_prefs.shell_cmd = utils_get_setting_string(config, "tools", "shell_cmd", GEANY_DEFAULT_TOOLS_SHELL); + + tool_prefs.context_action_cmd = utils_get_setting_string(config, PACKAGE, "context_action_cmd", ""); + +diff --git a/src/prefs.c b/src/prefs.c +index 5d1b5fc97..f43f83619 100644 +--- a/src/prefs.c ++++ b/src/prefs.c +@@ -683,6 +683,8 @@ static void prefs_init_dialog(void) + if (tool_prefs.grep_cmd) + gtk_entry_set_text(GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_grep")), tool_prefs.grep_cmd); + ++ if (tool_prefs.shell_cmd) ++ gtk_entry_set_text(GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell1")), tool_prefs.shell_cmd); + + /* Template settings */ + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_developer"); +@@ -1160,6 +1162,9 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) + g_free(tool_prefs.grep_cmd); + tool_prefs.grep_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + ++ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell1"); ++ g_free(tool_prefs.shell_cmd); ++ tool_prefs.shell_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); + + /* Template settings */ + widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_developer"); +@@ -1727,6 +1732,7 @@ void prefs_show_dialog(void) + "entry_com_term", + "entry_browser", + "entry_grep", ++ "entry_shell1", + "entry_contextaction", + "entry_template_developer", + "entry_template_initial", +@@ -1787,6 +1793,10 @@ void prefs_show_dialog(void) + NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_grep"))); ++ ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "button_shell"), ++ NULL, ++ GTK_FILE_CHOOSER_ACTION_OPEN, ++ GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell1"))); + + /* tools commands */ + ui_setup_open_button_callback(ui_lookup_widget(ui_widgets.prefs_dialog, "button_contextaction"), +diff --git a/src/prefs.h b/src/prefs.h +index dcf33a502..aedfcb0f8 100644 +--- a/src/prefs.h ++++ b/src/prefs.h +@@ -49,6 +49,7 @@ typedef struct GeanyToolPrefs + gchar *term_cmd; /**< terminal emulator command */ + gchar *grep_cmd; /**< grep command */ + gchar *context_action_cmd; /**< context action command */ ++ gchar *shell_cmd; /**< shell used for running commands */ + } + GeanyToolPrefs; + +-- +2.17.1 + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] c29709: Add geanylua's support library to the bundle
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 18:34:05 UTC Commit: c29709e86173cbada56ffded654be495c7420aba https://github.com/geany/geany-osx/commit/c29709e86173cbada56ffded654be495c… Log Message: ----------- Add geanylua's support library to the bundle Modified Paths: -------------- geany.bundle Modified: geany.bundle 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,11 @@ ${prefix}/lib/geany/*.so </binary> +  + <binary> + ${prefix}/lib/geany-plugins/geanylua/*.so + </binary> + <!-- Translation filenames, one for each program or library that you want to copy in to the bundle. The "dest" attribute is optional, as usual. Bundler will find all translations of that -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 599567: Patch various problems in geanylua to make it compile and run as a macOS app bundle
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 18:31:58 UTC Commit: 599567eb2ed6382c0e17565b3eefe9f819c0e18e https://github.com/geany/geany-osx/commit/599567eb2ed6382c0e17565b3eefe9f81… Log Message: ----------- Patch various problems in geanylua to make it compile and run as a macOS app bundle Modified Paths: -------------- geany.modules geany_patches/06-geany-plugins_geanylua_link_against_statically_built_liblua.patch geany_patches/07-geany_plugins_geanylua_make_lib_data_directories_relocatable.patch geany_patches/08-geany_plugins_geanylua_remove_x11_dependency.patch Modified: geany.modules 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -158,11 +158,14 @@ checkoutdir="geany-plugins-git" revision="master"> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01-geany_plugin…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/06-geany-plugin…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/07-geany_plugin…" strip="1" />  <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/02-geany_plugin…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/03-geany_plugin…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/04-geany_plugin…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/05-geany_plugin…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/08-geany_plugin…" strip="1" /> </branch> <dependencies> <dep package="geany-git" /> Modified: geany_patches/06-geany-plugins_geanylua_link_against_statically_built_liblua.patch 54 lines changed, 54 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,54 @@ +From b6b9cd9b0e8e0a70200341486f0fb497b7104f0d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Mon, 6 Mar 2023 19:09:16 +0100 +Subject: [PATCH] Link geanylua against statically built liblua library + +--- + build/geanylua.m4 | 16 ---------------- + geanylua/Makefile.am | 3 +++ + 2 files changed, 3 insertions(+), 16 deletions(-) + +diff --git a/build/geanylua.m4 b/build/geanylua.m4 +index 1f1eaf67..ec2d1a82 100644 +--- a/build/geanylua.m4 ++++ b/build/geanylua.m4 +@@ -2,22 +2,6 @@ AC_DEFUN([GP_CHECK_GEANYLUA], + [ + GP_ARG_DISABLE([GeanyLua], [auto]) + +- AC_ARG_WITH([lua-pkg], +- AC_HELP_STRING([--with-lua-pkg=ARG], +- [name of Lua pkg-config script [[default=lua5.1]]]), +- [LUA_PKG_NAME=${withval%.pc}], +- [LUA_PKG_NAME=lua5.1 +- +- for L in lua5.1 lua51 lua-5.1 lua; do +- PKG_CHECK_EXISTS([$L], +- [LUA_PKG_NAME=$L]; break,[]) +- done]) +- +- LUA_VERSION=5.1 +- LUA_VERSION_BOUNDARY=5.2 +- GP_CHECK_PLUGIN_DEPS([GeanyLua], [LUA], +- [${LUA_PKG_NAME} >= ${LUA_VERSION} +- ${LUA_PKG_NAME} < ${LUA_VERSION_BOUNDARY}]) + GP_CHECK_PLUGIN_DEPS([GeanyLua], [GMODULE], [gmodule-2.0]) + GP_COMMIT_PLUGIN_STATUS([GeanyLua]) + +diff --git a/geanylua/Makefile.am b/geanylua/Makefile.am +index 6a8b055a..c4c3a9e5 100644 +--- a/geanylua/Makefile.am ++++ b/geanylua/Makefile.am +@@ -5,6 +5,9 @@ plugin = geanylua + + EXTRA_DIST += util + ++LUA_CFLAGS=-I ${PREFIX}/include/ ++LUA_LIBS=${PREFIX}/lib/liblua.a ++ + geanyplugins_LTLIBRARIES = geanylua.la + geanyluadir = $(pkglibdir)/geanylua + geanylua_LTLIBRARIES = libgeanylua.la +-- +2.37.5 + Modified: geany_patches/07-geany_plugins_geanylua_make_lib_data_directories_relocatable.patch 41 lines changed, 41 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,41 @@ +From 58842897c67d57771eaa9ae8dafd2af276cd056c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Mon, 6 Mar 2023 19:14:10 +0100 +Subject: [PATCH] Make lib and data directories of geanylua relocatable + +--- + geanylua/geanylua.c | 3 +++ + geanylua/glspi_init.c | 3 +++ + 2 files changed, 6 insertions(+) + +diff --git a/geanylua/geanylua.c b/geanylua/geanylua.c +index e9a2f1aa..045e83f5 100644 +--- a/geanylua/geanylua.c ++++ b/geanylua/geanylua.c +@@ -136,6 +136,9 @@ static gchar *get_lib_dir(void) + g_free(install_dir); + return result; + #else ++ gchar *prefix_dir = g_build_filename(g_getenv("GTK_PATH"), "lib", NULL); ++ if (g_file_test(prefix_dir, G_FILE_TEST_IS_DIR)) ++ return prefix_dir; + return g_strdup(LIBDIR); + #endif + } +diff --git a/geanylua/glspi_init.c b/geanylua/glspi_init.c +index f48b8678..b5e26b75 100644 +--- a/geanylua/glspi_init.c ++++ b/geanylua/glspi_init.c +@@ -398,6 +398,9 @@ static gchar *get_data_dir(void) + g_free(install_dir); + return result; + #else ++ gchar *prefix_dir = g_build_filename(g_getenv("GTK_PATH"), "share", NULL); ++ if (g_file_test(prefix_dir, G_FILE_TEST_IS_DIR)) ++ return prefix_dir; + return g_strdup(GEANYPLUGINS_DATADIR); + #endif + } +-- +2.37.5 + Modified: geany_patches/08-geany_plugins_geanylua_remove_x11_dependency.patch 269 lines changed, 269 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,269 @@ +From b061ff8aa1ef04402905339ad655043564d07207 Mon Sep 17 00:00:00 2001 +From: xiota <github(a)mentalfossa.com> +Date: Sun, 5 Mar 2023 17:53:10 -0800 +Subject: [PATCH 1/2] GeanyLua: Fix geany.keygrab * Make platform agnostic * + Fix infinite loop * Update documentation + +--- + geanylua/docs/geanylua-ref.html | 57 +++++----- + geanylua/glspi_app.c | 188 +++++++++----------------------- + 2 files changed, 78 insertions(+), 167 deletions(-) + +diff --git a/geanylua/glspi_app.c b/geanylua/glspi_app.c +index 14d2e780..e5a7b48c 100644 +--- a/geanylua/glspi_app.c ++++ b/geanylua/glspi_app.c +@@ -439,170 +439,82 @@ static gint glspi_launch(lua_State* L) + } + + +-static guint My_Shift_L=0; +-static guint My_Shift_R=0; +-static guint My_Control_L=0; +-static guint My_Control_R=0; +-static guint My_Alt_L=0; +-static guint My_Alt_R=0; +- +- +-#ifndef G_OS_WIN32 +- +-#include <X11/Xlib.h> +-#include <X11/keysym.h> +- +- +-#define IsShift ( (My_Shift_L == ev->xkey.keycode) || (My_Shift_R == ev->xkey.keycode) ) +- +-#define IsCtrl ( (My_Control_L == ev->xkey.keycode) || (My_Control_R == ev->xkey.keycode) ) +-#define IsAlt ( (My_Alt_L == ev->xkey.keycode) || (My_Alt_R == ev->xkey.keycode) ) +- +-#define IsCtrlAlt ( IsCtrl || IsAlt ) +- + typedef struct _KeyGrabData { +-gchar *prompt; +-GdkKeymapKey km; ++ gboolean keypress; ++ guint keyval; + } _KeyGrabData; + + +-static GdkFilterReturn keygrab_cb(GdkXEvent *xevent, GdkEvent *event, gpointer data) ++static gboolean keygrab_cb(GtkWidget *widget, GdkEventKey *ev, gpointer data) + { +- XEvent*ev = (XEvent*) xevent; +- GdkKeymapKey *km = (GdkKeymapKey*) data; +- switch (ev->type) { +- case KeyPress:{ +- if (IsShift) { +- km->level=1; +- } else { +- if (!IsCtrlAlt) km->group=1; /* Flag to know we have keydown before keyup */ +- } +- return GDK_FILTER_REMOVE; +- } +- case KeyRelease:{ +- if (IsShift) { +- km->level=0; +- } else { +- if ((km->group==1)&&(!IsCtrlAlt)) { /* OK, we already got our keydown */ +- km->group=2; +- km->level=(ev->xkey.state & ShiftMask)?1:0; +- km->keycode=ev->xkey.keycode; +- } +- } +- return GDK_FILTER_REMOVE; +- } +- default:{} +- } +- return GDK_FILTER_CONTINUE; +-} ++ _KeyGrabData *km = (_KeyGrabData*) data; + +-#define dosleep() g_usleep(1) ++ if (ev->keyval == 0) { ++ return FALSE; ++ } + +-#else +-#include <windows.h> +-#define dosleep() Sleep(1) ++ km->keyval = ev->keyval; ++ km->keypress = TRUE; ++ return TRUE; ++} + +-#define IsShift ( (My_Shift_L == msg->wParam) || (My_Shift_R == msg->wParam) ) + +-#define IsCtrl ( (My_Control_L == msg->wParam) || (My_Control_R == msg->wParam) ) +-#define IsAlt ( (My_Alt_L == msg->wParam) || (My_Alt_R == msg->wParam) ) ++static gint glspi_keygrab(lua_State* L) ++{ ++ GeanyDocument *doc = NULL; ++ const gchar *prompt = NULL; ++ static gulong keygrab_cb_handle = 0; + +-#define IsCtrlAlt ( IsCtrl || IsAlt ) + ++ _KeyGrabData km; ++ km.keypress = FALSE; ++ km.keyval = 0; + +-static GdkFilterReturn keygrab_cb(GdkXEvent *xevent, GdkEvent *event, gpointer data) +-{ +- MSG*msg = (MSG*) xevent; +- GdkKeymapKey *km = (GdkKeymapKey*) data; +- switch (msg->message) { +- case WM_KEYDOWN:{ +- if (IsShift) { +- km->level=1; +- } else { +- if (!IsCtrlAlt) km->group=1; /* Flag to know we have keydown before keyup */ +- } +- return GDK_FILTER_REMOVE; +- } +- case WM_KEYUP:{ +- if (IsShift) { +- km->level=0; +- } else { +- if ((km->group==1)&&(!IsCtrlAlt)) { /* OK, we already got our keydown */ +- km->group=2; +- km->level=HIBYTE(GetKeyState(VK_SHIFT))?1:0; +- km->keycode=msg->wParam; +- } +- } +- return GDK_FILTER_REMOVE; ++ /* get prompt, if exists */ ++ if (lua_gettop(L) > 0) { ++ if (!lua_isstring(L, 1)) { ++ return FAIL_STRING_ARG(1); + } +- default:{} ++ prompt = lua_tostring(L,1); ++ doc = document_get_current(); + } +- return GDK_FILTER_CONTINUE; +-} +- + +-#endif +- +- +-#include <gdk/gdkkeysyms.h> +-static gint init_key(guint keyval){ +- GdkKeymapKey *kmk=NULL; +- GdkKeymap *gdk_key_map=gdk_keymap_get_default(); +- gint n_keys=0; +- gint rv=0; +- if (gdk_keymap_get_entries_for_keyval(gdk_key_map,keyval,&kmk,&n_keys)) { +- rv=kmk[0].keycode; +- g_free(kmk); ++ /* show prompt in tooltip */ ++ if (prompt && doc && doc->is_valid ) { ++ gint fvl = scintilla_send_message(doc->editor->sci, SCI_GETFIRSTVISIBLELINE, 0, 0); ++ gint pos = sci_get_position_from_line(doc->editor->sci, fvl+1); ++ scintilla_send_message(doc->editor->sci, SCI_CALLTIPSHOW, pos+3, (sptr_t) prompt); + } +- return rv; +-} +- +-#define InitKey(code,value) if (!code) { code=init_key(value); } + +-static gint glspi_keygrab(lua_State* L) +-{ +- GeanyDocument*doc=NULL; +- const gchar*prompt=NULL; +- GdkKeymapKey km={0,0,0}; +- GdkKeymap *gdk_key_map; +- km.keycode=0; +- km.group=0; /* Note: we hijack this field to use as a flag for first keydown. */ +- km.level=0; +- InitKey(My_Shift_L, GDK_Shift_L); +- InitKey(My_Shift_R, GDK_Shift_R); +- InitKey(My_Control_L, GDK_Control_L); +- InitKey(My_Control_R, GDK_Control_R); +- InitKey(My_Alt_L, GDK_Alt_L); +- InitKey(My_Alt_R, GDK_Alt_R); +- if (lua_gettop(L)>0) { +- if (!lua_isstring(L,1)) {return FAIL_STRING_ARG(1); } +- prompt=lua_tostring(L,1); +- doc=document_get_current(); ++ /* callback to handle keypress ++ only one keygrab callback can be running at a time, otherwise geanylua will hang ++ */ ++ if (!keygrab_cb_handle) { ++ keygrab_cb_handle = g_signal_connect(main_widgets->window, "key-press-event", G_CALLBACK(keygrab_cb), &km); ++ } else { ++ lua_pushnil(L); ++ return 1; + } + +- if (prompt && doc && doc->is_valid ) { +- gint fvl=scintilla_send_message(doc->editor->sci,SCI_GETFIRSTVISIBLELINE, 0,0); +- gint pos=sci_get_position_from_line(doc->editor->sci, fvl+1); +- scintilla_send_message(doc->editor->sci,SCI_CALLTIPSHOW,pos+3, (sptr_t)prompt); +- } +- gdk_window_add_filter(gtk_widget_get_window(main_widgets->window), keygrab_cb, &km); +- do { ++ /* wait for keypress */ ++ while (!km.keypress) { + while (gtk_events_pending()) { +- if (km.group==2) { break; } ++ if (km.keypress) { ++ break; ++ } + gtk_main_iteration(); + } +- if (km.group==2) { break; } +- dosleep(); +- } while (km.group!=2); ++ } ++ ++ /* clear callback */ ++ g_clear_signal_handler(&keygrab_cb_handle, main_widgets->window); + +- gdk_window_remove_filter(gtk_widget_get_window(main_widgets->window), keygrab_cb, &km); ++ /* clear tooltip */ + if (prompt && doc && doc->is_valid) { +- sci_send_command(doc->editor->sci, SCI_CALLTIPCANCEL); ++ sci_send_command(doc->editor->sci, SCI_CALLTIPCANCEL); + } +- km.group=0; /* reset the hijacked flag before passing to GDK */ +- gdk_key_map = gdk_keymap_get_default(); +- lua_pushstring(L, gdk_keyval_name(gdk_keymap_lookup_key(gdk_key_map, &km))); + ++ lua_pushstring(L, gdk_keyval_name(km.keyval)); + return 1; + } + +-- +2.37.5 + + +From 3c2e16a9d5834b1f153a2557ac819386481a9c2e Mon Sep 17 00:00:00 2001 +From: xiota <github(a)mentalfossa.com> +Date: Sun, 5 Mar 2023 18:13:57 -0800 +Subject: [PATCH 2/2] Use g_signal_handler_disconnect instead of + g_clear_signal_handler + +--- + geanylua/glspi_app.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/geanylua/glspi_app.c b/geanylua/glspi_app.c +index e5a7b48c..d21f8ba6 100644 +--- a/geanylua/glspi_app.c ++++ b/geanylua/glspi_app.c +@@ -506,8 +506,9 @@ static gint glspi_keygrab(lua_State* L) + } + } + +- /* clear callback */ +- g_clear_signal_handler(&keygrab_cb_handle, main_widgets->window); ++ /* remove callback and clear handle */ ++ g_signal_handler_disconnect(main_widgets->window, keygrab_cb_handle); ++ keygrab_cb_handle = 0; + + /* clear tooltip */ + if (prompt && doc && doc->is_valid) { +-- +2.37.5 + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 9fcba5: Use mkdir to create directories including DESTDIR
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 16:23:13 UTC Commit: 9fcba588b0fcc0036ac50e6a1e2a32d962643ca9 https://github.com/geany/geany-osx/commit/9fcba588b0fcc0036ac50e6a1e2a32d96… Log Message: ----------- Use mkdir to create directories including DESTDIR Modified Paths: -------------- geany_patches/01-lua51_set_correct_install_prefix.patch Modified: geany_patches/01-lua51_set_correct_install_prefix.patch 20 lines changed, 6 insertions(+), 14 deletions(-) =================================================================== @@ -1,14 +1,14 @@ -From cbba05defbbb29e59992e70c069416bffbe8142e Mon Sep 17 00:00:00 2001 +From eedde6888d84cbc52a86fa02cee43b0f07b569f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> Date: Mon, 6 Mar 2023 13:12:50 +0100 Subject: [PATCH] Set correct install prefix --- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 209a132..7ab56b7 100644 +index 209a132..109a060 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ PLAT= none @@ -20,20 +20,12 @@ index 209a132..7ab56b7 100644 INSTALL_BIN= $(INSTALL_TOP)/bin INSTALL_INC= $(INSTALL_TOP)/include INSTALL_LIB= $(INSTALL_TOP)/lib -@@ -25,6 +25,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V - INSTALL= install -p - INSTALL_EXEC= $(INSTALL) -m 0755 - INSTALL_DATA= $(INSTALL) -m 0644 -+INSTALL_DIR= $(INSTALL) -d - # - # If you don't have install you can use cp instead. - # INSTALL= cp -p -@@ -59,7 +60,7 @@ test: dummy +@@ -59,7 +59,7 @@ test: dummy src/lua test/hello.lua install: dummy - cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) -+ cd src && $(INSTALL_DIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) ++ cd src && $(MKDIR) $(DESTDIR)/$(INSTALL_BIN) $(DESTDIR)/$(INSTALL_INC) $(DESTDIR)/$(INSTALL_LIB) $(DESTDIR)/$(INSTALL_MAN) $(DESTDIR)/$(INSTALL_LMOD) $(DESTDIR)/$(INSTALL_CMOD) cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 8f6432: One more attempt to correctly install lua
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 13:46:38 UTC Commit: 8f6432a40fc9f2bc02053470246507104c7ffd11 https://github.com/geany/geany-osx/commit/8f6432a40fc9f2bc02053470246507104… Log Message: ----------- One more attempt to correctly install lua Modified Paths: -------------- geany_patches/01-lua51_set_correct_install_prefix.patch Modified: geany_patches/01-lua51_set_correct_install_prefix.patch 28 lines changed, 18 insertions(+), 10 deletions(-) =================================================================== @@ -1,14 +1,14 @@ -From 0b9619da46bab46a191aec08073452cd71ff6231 Mon Sep 17 00:00:00 2001 +From cbba05defbbb29e59992e70c069416bffbe8142e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> Date: Mon, 6 Mar 2023 13:12:50 +0100 Subject: [PATCH] Set correct install prefix --- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 209a132..84acea5 100644 +index 209a132..7ab56b7 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ PLAT= none @@ -20,15 +20,23 @@ index 209a132..84acea5 100644 INSTALL_BIN= $(INSTALL_TOP)/bin INSTALL_INC= $(INSTALL_TOP)/include INSTALL_LIB= $(INSTALL_TOP)/lib -@@ -22,7 +22,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V - - # How to install. If your install program does not support "-p", then you - # may have to run ranlib on the installed liblua.a (do "make ranlib"). --INSTALL= install -p -+INSTALL= install -p -d +@@ -25,6 +25,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + INSTALL= install -p INSTALL_EXEC= $(INSTALL) -m 0755 INSTALL_DATA= $(INSTALL) -m 0644 ++INSTALL_DIR= $(INSTALL) -d # + # If you don't have install you can use cp instead. + # INSTALL= cp -p +@@ -59,7 +60,7 @@ test: dummy + src/lua test/hello.lua + + install: dummy +- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) ++ cd src && $(INSTALL_DIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) + cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) -- 2.37.5 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 662a7e: Make the lua makefile create install directories
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 13:21:00 UTC Commit: 662a7eaf8e94ce30903e7924187bd478bbe240e4 https://github.com/geany/geany-osx/commit/662a7eaf8e94ce30903e7924187bd478b… Log Message: ----------- Make the lua makefile create install directories JHBuild installs into a temp directory and then moves it to the dest directory and we need to make sure these are created. Modified Paths: -------------- geany_patches/01-lua51_set_correct_install_prefix.patch Modified: geany_patches/01-lua51_set_correct_install_prefix.patch 17 lines changed, 13 insertions(+), 4 deletions(-) =================================================================== @@ -1,14 +1,14 @@ -From 1d2c756ab70d0c29c64b78d2d04beee3723b94e4 Mon Sep 17 00:00:00 2001 +From 0b9619da46bab46a191aec08073452cd71ff6231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> Date: Mon, 6 Mar 2023 13:12:50 +0100 Subject: [PATCH] Set correct install prefix --- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 209a132..534f995 100644 +index 209a132..84acea5 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ PLAT= none @@ -20,6 +20,15 @@ index 209a132..534f995 100644 INSTALL_BIN= $(INSTALL_TOP)/bin INSTALL_INC= $(INSTALL_TOP)/include INSTALL_LIB= $(INSTALL_TOP)/lib +@@ -22,7 +22,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + + # How to install. If your install program does not support "-p", then you + # may have to run ranlib on the installed liblua.a (do "make ranlib"). +-INSTALL= install -p ++INSTALL= install -p -d + INSTALL_EXEC= $(INSTALL) -m 0755 + INSTALL_DATA= $(INSTALL) -m 0644 + # -- 2.37.5 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 92c450: Build lua as part of the plugins build
by Jiří Techet 06 Mar '23

06 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 06 Mar 2023 12:20:48 UTC Commit: 92c4501610b74ce0eb2b22ac8ae9c5d265cc6cbd https://github.com/geany/geany-osx/commit/92c4501610b74ce0eb2b22ac8ae9c5d26… Log Message: ----------- Build lua as part of the plugins build Modified Paths: -------------- geany.modules geany_patches/01-lua51_set_correct_install_prefix.patch Modified: geany.modules 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -16,6 +16,8 @@ href="https://download.geany.org/"/> <repository type="tarball" name="files.pythonhosted.org" href="https://files.pythonhosted.org/"/> + <repository type="tarball" name="lua.org" + href="https://www.lua.org/ftp/"/> <include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx…" /> @@ -57,6 +59,17 @@ version="1.3.0"/> </cmake> + <autotools id="lua" + makeargs="macosx" + skip-autogen="true" + supports-non-srcdir-builds="no"> + <branch repo="lua.org" + module="lua-5.1.5.tar.gz" + version="5.1.5"> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01-lua51_set_co…" strip="1" /> + </branch> + </autotools> +  <autotools id="gtk-mac-integration-fixed" autogen-sh="configure" @@ -133,6 +146,7 @@ <dep package="libgit2" /> <dep package="hunspell" /> <dep package="enchant" /> + <dep package="lua" /> </dependencies> </metamodule> Modified: geany_patches/01-lua51_set_correct_install_prefix.patch 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,25 @@ +From 1d2c756ab70d0c29c64b78d2d04beee3723b94e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Mon, 6 Mar 2023 13:12:50 +0100 +Subject: [PATCH] Set correct install prefix + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 209a132..534f995 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ PLAT= none + + # Where to install. The installation starts in the src and doc directories, + # so take care if INSTALL_TOP is not an absolute path. +-INSTALL_TOP= /usr/local ++INSTALL_TOP= $(PREFIX) + INSTALL_BIN= $(INSTALL_TOP)/bin + INSTALL_INC= $(INSTALL_TOP)/include + INSTALL_LIB= $(INSTALL_TOP)/lib +-- +2.37.5 + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 3ea8eb: Build pygments which seems to be needed now
by Jiří Techet 02 Mar '23

02 Mar '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 02 Mar 2023 21:43:54 UTC Commit: 3ea8ebf35afd819d600a9220ad904fb76a43bf77 https://github.com/geany/geany-osx/commit/3ea8ebf35afd819d600a9220ad904fb76… Log Message: ----------- Build pygments which seems to be needed now Modified Paths: -------------- README.md Modified: README.md 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -118,13 +118,13 @@ To create the bundle, you need to first install JHBuild and GTK as described bel 6. Install GTK and all of its dependencies by running the following command inside the `geany-osx` directory: ``` - jhbuild bootstrap-gtk-osx && jhbuild build meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 + jhbuild bootstrap-gtk-osx && jhbuild build pygments meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 ``` The upstream project is sometimes in an unstable state and fails to build; if this happens, you can use our snapshot of modulesets which was used to build the last release of Geany: ``` - jhbuild bootstrap-gtk-osx && jhbuild -m "https://raw.githubusercontent.com/geany/geany-osx/master/modulesets-stable/…" build meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 + jhbuild bootstrap-gtk-osx && jhbuild -m "https://raw.githubusercontent.com/geany/geany-osx/master/modulesets-stable/…" build pygments meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 ``` 7. To build Geany, plugins and all of their dependencies, run one of -------------- 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

2007

2006

Commits March 2023