Commits November 2021

commits@lists.geany.org

1 participants
67 discussions

[geany/geany-osx] b47d01: Improve description of x86 cross-compilation on ARM processors
by Jiří Techet 13 Nov '21

13 Nov '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 13 Nov 2021 19:48:01 UTC Commit: b47d01a0170a5a4a8e749272bd546b982eb6db3c https://github.com/geany/geany-osx/commit/b47d01a0170a5a4a8e749272bd546b982… Log Message: ----------- Improve description of x86 cross-compilation on ARM processors Modified Paths: -------------- README.md Modified: README.md 30 lines changed, 16 insertions(+), 14 deletions(-) =================================================================== @@ -77,8 +77,16 @@ To create the bundle, you need to first install JHBuild and GTK as described bel 1. Create a new account for jhbuild (not necessary but this makes sure jhbuild does not interfere with some other command-line tools installed on your system). - -2. Depending on the used shell, add the following lines + +2. Optionally, when cross-compiling x86_64 binaries on a new ARM-based + Apple computer, run + ``` + env /usr/bin/arch -x86_64 /bin/zsh --login + ``` + to create a `x86_64` shell. All the compilation steps below + have to be executed in this shell. + +3. Depending on the used shell, add the following lines ``` export PATH=$PATH:"$HOME/.new_local/bin" export LC_ALL=en_US.UTF-8 @@ -87,7 +95,7 @@ To create the bundle, you need to first install JHBuild and GTK as described bel either to your `.zprofile` or `.bash_profile` to make sure these variables are defined and restart your shell. -3. Get `gtk-osx-setup.sh` by +4. Get `gtk-osx-setup.sh` by ``` curl -L -o gtk-osx-setup.sh https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/gtk-osx-setup.sh ``` @@ -96,24 +104,18 @@ To create the bundle, you need to first install JHBuild and GTK as described bel bash gtk-osx-setup.sh ``` -4. Add the following lines to `~/.config/jhbuildrc-custom`: +5. Add the following lines to `~/.config/jhbuildrc-custom`: ``` setup_sdk(target="10.13", architectures=["x86_64"]) setup_release() # enables optimizations ``` With this settings, the build creates a 64-bit Intel binary that works on macOS 10.13 and later. Instead of `x86_64` you can also specify `arm64` to produce binaries for Apple ARM processors. This only works - when building on an ARM processors - it isn't possible to compile - ARM binaries on Intel processors. It is, however, possible to compile - `x86_64` binaries on an ARM Mac - to do so, it is necessary to run - ``` - env /usr/bin/arch -x86_64 /bin/zsh --login - ``` - which creates a `x86_64` shell and all the compilation steps below - have to be executed in this shell. + when building on ARM processors - it isn't possible to compile + ARM binaries on Intel processors. -5. Install GTK and all of its dependencies by running the following +6. Install GTK and all of its dependencies by running the following command inside the `geany-osx` directory: ``` jhbuild bootstrap-gtk-osx && jhbuild build python3 && jhbuild run pip3 install pygments && jhbuild build meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 @@ -125,7 +127,7 @@ To create the bundle, you need to first install JHBuild and GTK as described bel jhbuild bootstrap-gtk-osx && jhbuild -m "https://raw.githubusercontent.com/geany/geany-osx/master/modulesets-stable/…" build python3 meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 ``` -6. To build Geany, plugins and all of their dependencies, run one of +7. To build Geany, plugins and all of their dependencies, run one of the following commands inside the `geany-osx` directory depending on whether to use Geany sources from the latest release tarball or current git master: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] c4aa94: Determine binary type based on Geany.app binary type instead of current architecture
by Jiří Techet 13 Nov '21

13 Nov '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 13 Nov 2021 18:28:49 UTC Commit: c4aa94833d965e30748ec3c28bf95d7595e19a93 https://github.com/geany/geany-osx/commit/c4aa94833d965e30748ec3c28bf95d759… Log Message: ----------- Determine binary type based on Geany.app binary type instead of current architecture Modified Paths: -------------- create_dmg.sh Modified: create_dmg.sh 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash VERSION="1.38" @@ -9,8 +9,8 @@ DMGNAME="geany-${VERSION}_osx.dmg" APPNAME="${NAME}.app" TMPDIR="tmp-out" -ARCH=`uname -m` -if [ "$ARCH" = "arm64" ]; then +FILE_TYPE=`file Geany.app/Contents/MacOS/geany` +if [[ "$FILE_TYPE" == *"arm64"* ]]; then DMGNAME="geany-${VERSION}_osx_arm64.dmg" fi -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] e6ff68: Delete old Geany.app before creating bundle to be sure we have new files
by Jiří Techet 13 Nov '21

13 Nov '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 13 Nov 2021 14:07:43 UTC Commit: e6ff68028b36cb06a9344e174d32891d7d3dfc89 https://github.com/geany/geany-osx/commit/e6ff68028b36cb06a9344e174d32891d7… Log Message: ----------- Delete old Geany.app before creating bundle to be sure we have new files Modified Paths: -------------- .gitignore bundle.sh Modified: .gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -4,3 +4,4 @@ Geany.icns Launcher/geany/build/ xcuserdata/ .DS_Store +*.geany Modified: bundle.sh 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,6 @@ #!/bin/sh +rm -rf ./Geany.app iconutil -c icns ./iconbuilder.iconset --output Geany.icns ~/.local/bin/gtk-mac-bundler geany.bundle cp -R Papirus Papirus-Dark ./Geany.app/Contents/Resources/share/icons -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 06d69e: Add patch to allow enchant to look for its modules at bundle path
by Jiří Techet 13 Nov '21

13 Nov '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 13 Nov 2021 13:09:50 UTC Commit: 06d69e78b5aefc727504a9b4fed8062abd7926c8 https://github.com/geany/geany-osx/commit/06d69e78b5aefc727504a9b4fed8062ab… Log Message: ----------- Add patch to allow enchant to look for its modules at bundle path Modified Paths: -------------- geany.modules geany_patches/01-geany_plugins_spellcheck_relocation.patch Modified: geany.modules 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -138,7 +138,9 @@ <branch repo="github.com" module="geany/geany-plugins.git" checkoutdir="geany-plugins-git" - revision="master" /> + revision="master"> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01-geany_plugin…" strip="1" /> + </branch> <dependencies> <dep package="geany-git" /> <dep package="geany-plugins-deps" /> @@ -151,7 +153,9 @@ <branch repo="download.geany.org" module="geany-plugins/geany-plugins-${version}.tar.bz2" checkoutdir="geany-plugins-${version}" - version="1.38" /> + version="1.38"> + <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01-geany_plugin…" strip="1" /> + </branch> <dependencies> <dep package="geany-release" /> <dep package="geany-plugins-deps" /> Modified: geany_patches/01-geany_plugins_spellcheck_relocation.patch 28 lines changed, 28 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,28 @@ +From 7379b7c197f5cdbcf94457b5fc0c3f441acbbd56 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Sat, 13 Nov 2021 13:53:00 +0100 +Subject: [PATCH] Set relocation prefix to the spellcheck plugin + +--- + spellcheck/src/speller.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/spellcheck/src/speller.c b/spellcheck/src/speller.c +index 897dfa28..a342e5b4 100644 +--- a/spellcheck/src/speller.c ++++ b/spellcheck/src/speller.c +@@ -599,6 +599,11 @@ static void log_enchant_version(void) + + void sc_speller_init(void) + { ++ gchar *prefix_dir = g_build_filename(g_getenv("GTK_PATH"), NULL); ++ if (g_file_test(prefix_dir, G_FILE_TEST_IS_DIR)) ++ enchant_set_prefix_dir(prefix_dir); ++ g_free(prefix_dir); ++ + log_enchant_version(); + sc_speller_broker = enchant_broker_init(); + +-- +2.31.1 + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] b5bc2a: Describe the macos-icon-design directory
by Jiří Techet 12 Nov '21

12 Nov '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 12 Nov 2021 21:29:23 UTC Commit: b5bc2a9aab388ea562a199b2eb2d7e9bbaf0b56f https://github.com/geany/geany-osx/commit/b5bc2a9aab388ea562a199b2eb2d7e9bb… Log Message: ----------- Describe the macos-icon-design directory Modified Paths: -------------- README.md Modified: README.md 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -28,6 +28,7 @@ A brief description of the contents of the project directory: * *WhiteSur-light-solid*: WhiteSur GTK 3 Theme * *Papirus, Papirus-Dark*: Papirus GTK 3 icon theme with lots of unneeded icons removed to save space. +* *macos-icon-design*: design file for macOS Geany icon. * *iconbuilder.iconset*: source Geany icons for the bundle. * *modulesets-stable, patches*: copy of the modulesets-stable and patches directory from the [gtk-osx](https://gitlab.gnome.org/GNOME/gtk-osx/) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 852867: A new icon for the macOS Big Sur / Monterey design language (#33)
by Pouya Kary ✨ 12 Nov '21

12 Nov '21

Branch: refs/heads/master Author: Pouya Kary ✨ <pouya(a)kary.us> Committer: GitHub <noreply(a)github.com> Date: Fri, 12 Nov 2021 20:50:05 UTC Commit: 852867a6578159a441f03612243b8cb61d9d9765 https://github.com/geany/geany-osx/commit/852867a6578159a441f03612243b8cb61… Log Message: ----------- A new icon for the macOS Big Sur / Monterey design language (#33) Modified Paths: -------------- iconbuilder.iconset/icon_128x128.png iconbuilder.iconset/icon_128x128(a)2x.png iconbuilder.iconset/icon_16x16.png iconbuilder.iconset/icon_16x16(a)2x.png iconbuilder.iconset/icon_256x256.png iconbuilder.iconset/icon_256x256(a)2x.png iconbuilder.iconset/icon_32x32.png iconbuilder.iconset/icon_32x32(a)2x.png iconbuilder.iconset/icon_512x512.png iconbuilder.iconset/icon_512x512(a)2x.png macos-icon-design/geany-macos-icon.afdesign macos-icon-design/geany-macos-icon.svg Modified: iconbuilder.iconset/icon_128x128.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_128x128(a)2x.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_16x16.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_16x16(a)2x.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_256x256.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_256x256(a)2x.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_32x32.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_32x32(a)2x.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_512x512.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: iconbuilder.iconset/icon_512x512(a)2x.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: macos-icon-design/geany-macos-icon.afdesign 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: macos-icon-design/geany-macos-icon.svg 37 lines changed, 37 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 10cd14: Remove also .local directory to be sure the environment is clean
by Jiří Techet 12 Nov '21

12 Nov '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 12 Nov 2021 19:12:22 UTC Commit: 10cd14dd1ccdbab8b962b50454ca75c4d93fd81b https://github.com/geany/geany-osx/commit/10cd14dd1ccdbab8b962b50454ca75c4d… Log Message: ----------- Remove also .local directory to be sure the environment is clean Modified Paths: -------------- README.md Modified: README.md 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -231,7 +231,7 @@ have to be performed during normal bundle/installer creation: * To make sure nothing is left from the previous build when making a new release, run ``` - rm -rf .new_local Source gtk .cache/jhbuild + rm -rf .new_local .local Source gtk .cache/jhbuild ``` --- -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 66bfec: Make sure we use bash to run gtk-osx-setup.sh
by Jiří Techet 11 Nov '21

11 Nov '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 10 Nov 2021 23:14:53 UTC Commit: 66bfec63f5610c588b0440cd16a6720f0382b7ef https://github.com/geany/geany-osx/commit/66bfec63f5610c588b0440cd16a6720f0… Log Message: ----------- Make sure we use bash to run gtk-osx-setup.sh Modified Paths: -------------- README.md Modified: README.md 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -92,7 +92,7 @@ To create the bundle, you need to first install JHBuild and GTK as described bel ``` and run it: ``` - sh gtk-osx-setup.sh + bash gtk-osx-setup.sh ``` 4. Add the following lines to `~/.config/jhbuildrc-custom`: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a03339: When "go to line" is out of bounds, go to beginning or end of document (#2973)
by xiota 09 Nov '21

09 Nov '21

Branch: refs/heads/master Author: xiota <xiota(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 09 Nov 2021 04:17:35 UTC Commit: a0333989f72e17cc221c41dbec7c16d50549b023 https://github.com/geany/geany/commit/a0333989f72e17cc221c41dbec7c16d50549b… Log Message: ----------- When "go to line" is out of bounds, go to beginning or end of document (#2973) * When "go to line" is out of bounds, go to beginning or end of document * change offset to gboolean in editor_goto_line() remove get_line_and_offset_from_text() * use gint for line_count Modified Paths: -------------- src/callbacks.c src/editor.c src/editor.h Modified: src/callbacks.c 32 lines changed, 4 insertions(+), 28 deletions(-) =================================================================== @@ -911,21 +911,6 @@ void on_find_in_files1_activate(GtkMenuItem *menuitem, gpointer user_data) } -static void get_line_and_offset_from_text(const gchar *text, gint *line_no, gint *offset) -{ - if (*text == '+' || *text == '-') - { - *line_no = atoi(text + 1); - *offset = (*text == '+') ? 1 : -1; - } - else - { - *line_no = atoi(text) - 1; - *offset = 0; - } -} - - void on_go_to_line_activate(GtkMenuItem *menuitem, gpointer user_data) { static gchar value[16] = ""; @@ -936,18 +921,10 @@ void on_go_to_line_activate(GtkMenuItem *menuitem, gpointer user_data) _("Enter the line you want to go to:"), value); if (result != NULL) { - GeanyDocument *doc = document_get_current(); - gint offset; - gint line_no; - - g_return_if_fail(doc != NULL); + on_toolbutton_goto_entry_activate(NULL, result, NULL); - get_line_and_offset_from_text(result, &line_no, &offset); - if (! editor_goto_line(doc->editor, line_no, offset)) - utils_beep(); /* remember value for future calls */ g_snprintf(value, sizeof(value), "%s", result); - g_free(result); } } @@ -956,12 +933,11 @@ void on_go_to_line_activate(GtkMenuItem *menuitem, gpointer user_data) void on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data) { GeanyDocument *doc = document_get_current(); - gint offset; - gint line_no; - g_return_if_fail(doc != NULL); - get_line_and_offset_from_text(text, &line_no, &offset); + gint line_no = atoi(text); + gboolean offset = (*text == '+' || *text == '-'); + if (! editor_goto_line(doc->editor, line_no, offset)) utils_beep(); else Modified: src/editor.c 28 lines changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -4699,24 +4699,24 @@ void editor_set_indent(GeanyEditor *editor, GeanyIndentType type, gint width) } -/* Convenience function for editor_goto_pos() to pass in a line number. */ -gboolean editor_goto_line(GeanyEditor *editor, gint line_no, gint offset) +/* Convenience function for editor_goto_pos() to pass a line number. + * line_no is 1 based */ +gboolean editor_goto_line(GeanyEditor *editor, gint line_no, gboolean offset) { - gint pos; - g_return_val_if_fail(editor, FALSE); - if (line_no < 0 || line_no >= sci_get_line_count(editor->sci)) - return FALSE; + gint line_count = sci_get_line_count(editor->sci); - if (offset != 0) - { - gint current_line = sci_get_current_line(editor->sci); - line_no *= offset; - line_no = current_line + line_no; - } + if (offset) + line_no += sci_get_current_line(editor->sci) + 1; + + /* ensure line_no is in bounds and determine whether to set line marker */ + gboolean set_marker = line_no > 0 && line_no < line_count; + line_no = line_no <= 0 ? 0 + : line_no >= line_count ? line_count - 1 + : line_no - 1; - pos = sci_get_position_from_line(editor->sci, line_no); - return editor_goto_pos(editor, pos, TRUE); + gint pos = sci_get_position_from_line(editor->sci, line_no); + return editor_goto_pos(editor, pos, set_marker); } Modified: src/editor.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -319,7 +319,7 @@ void editor_set_indent(GeanyEditor *editor, GeanyIndentType type, gint width); void editor_set_line_wrapping(GeanyEditor *editor, gboolean wrap); -gboolean editor_goto_line(GeanyEditor *editor, gint line_no, gint offset); +gboolean editor_goto_line(GeanyEditor *editor, gint line_no, gboolean offset); void editor_set_indentation_guides(GeanyEditor *editor); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] eac0a6: Wording changes
by Jiří Techet 07 Nov '21

07 Nov '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Nov 2021 17:06:01 UTC Commit: eac0a606c7c05f0b5657e187b6b0ac5342644dcd https://github.com/geany/geany-osx/commit/eac0a606c7c05f0b5657e187b6b0ac534… Log Message: ----------- Wording changes Modified Paths: -------------- README.md Modified: README.md 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -100,17 +100,17 @@ To create the bundle, you need to first install JHBuild and GTK as described bel setup_sdk(target="10.13", architectures=["x86_64"]) setup_release() # enables optimizations ``` - With this settings, the build creates a 64-bit binary that works on + With this settings, the build creates a 64-bit Intel binary that works on macOS 10.13 and later. Instead of `x86_64` you can also specify `arm64` to produce binaries for Apple ARM processors. This only works - when building on an ARM processor - it isn't possible to compile - ARM binaries on an Intel processor. It is, however, possible to compile + when building on an ARM processors - it isn't possible to compile + ARM binaries on Intel processors. It is, however, possible to compile `x86_64` binaries on an ARM Mac - to do so, it is necessary to run ``` env /usr/bin/arch -x86_64 /bin/zsh --login ``` which creates a `x86_64` shell and all the compilation steps below - have to be executed in this shell + have to be executed in this shell. 5. Install GTK and all of its dependencies by running the following command inside the `geany-osx` directory: -------------- 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 November 2021