Branch: refs/heads/master
Author: xiota <github(a)mentalfossa.com>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Sun, 07 Nov 2021 16:45:31 UTC
Commit: 8318ed4f5f1115eff8239b2d3a81770f86a58973
https://github.com/geany/geany/commit/8318ed4f5f1115eff8239b2d3a81770f86a58…
Log Message:
-----------
Add option to hide project close/save warning when opening another project
Modified Paths:
--------------
doc/geany.txt
src/plugindata.h
src/project.c
src/ui_utils.c
src/ui_utils.h
Modified: doc/geany.txt
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -2542,6 +2542,8 @@ msgwin_messages_visible Whether to show the Messages tab in the t
Messages Window
msgwin_scribble_visible Whether to show the Scribble tab in the true immediately
Messages Window
+warn_on_project_close Whether to show a warning when opening true immediately
+ a project while one is already open.
**``terminal`` group**
send_selection_unsafe By default, Geany strips any trailing false immediately
newline characters from the current
Modified: src/plugindata.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -58,7 +58,7 @@ G_BEGIN_DECLS
* @warning You should not test for values below 200 as previously
* @c GEANY_API_VERSION was defined as an enum value, not a macro.
*/
-#define GEANY_API_VERSION 240
+#define GEANY_API_VERSION 241
/* hack to have a different ABI when built with different GTK major versions
* because loading plugins linked to a different one leads to crashes.
Modified: src/project.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -661,7 +661,8 @@ gboolean project_ask_close(void)
{
if (app->project != NULL)
{
- if (dialogs_show_question_full(NULL, GTK_STOCK_CLOSE, GTK_STOCK_CANCEL,
+ if (!interface_prefs.warn_on_project_close ||
+ dialogs_show_question_full(NULL, GTK_STOCK_CLOSE, GTK_STOCK_CANCEL,
_("Do you want to close it before proceeding?"),
_("The '%s' project is open."), app->project->name))
{
Modified: src/ui_utils.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -2352,6 +2352,8 @@ void ui_init_prefs(void)
"msgwin_messages_visible", TRUE);
stash_group_add_boolean(group, &interface_prefs.msgwin_scribble_visible,
"msgwin_scribble_visible", TRUE);
+ stash_group_add_boolean(group, &interface_prefs.warn_on_project_close,
+ "warn_on_project_close", TRUE);
}
Modified: src/ui_utils.h
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -69,6 +69,8 @@ typedef struct GeanyInterfacePrefs
gboolean compiler_tab_autoscroll;
gint msgwin_orientation; /**< orientation of the message window */
gint symbols_sort_mode; /**< symbol list sorting mode */
+ /** whether to show a warning when closing a project to open a new one */
+ gboolean warn_on_project_close;
}
GeanyInterfacePrefs;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Sun, 07 Nov 2021 16:14:31 UTC
Commit: aa3b17114c5ff7f47a694fd167bc772f285dd0a0
https://github.com/geany/geany-osx/commit/aa3b17114c5ff7f47a694fd167bc772f2…
Log Message:
-----------
Describe x86 cross-compilation on ARM-based Macs
Modified Paths:
--------------
README.md
Modified: README.md
14 lines changed, 9 insertions(+), 5 deletions(-)
===================================================================
@@ -98,15 +98,19 @@ To create the bundle, you need to first install JHBuild and GTK as described bel
4. Add the following lines to `~/.config/jhbuildrc-custom`:
```
setup_sdk(target="10.13", architectures=["x86_64"])
- setup_release()
+ setup_release() # enables optimizations
```
With this settings, the build creates a 64-bit 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
+ `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). By default,
- jhbuild compiles without optimization flags. The `setup_release()`
- call enables optimizations.
+ ARM binaries on an Intel processor. 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
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).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Sun, 07 Nov 2021 10:22:20 UTC
Commit: f4e5411f1749618bee92a685afb419264844dc44
https://github.com/geany/geany-osx/commit/f4e5411f1749618bee92a685afb419264…
Log Message:
-----------
Update README with instructions how to build Geany for ARM processors
Modified Paths:
--------------
README.md
Modified: README.md
47 lines changed, 24 insertions(+), 23 deletions(-)
===================================================================
@@ -69,15 +69,24 @@ Prerequisities
* macOS
* Xcode and command-line tools
-JHBuild Installation
---------------------
+Building
+--------
To create the bundle, you need to first install JHBuild and GTK as described below.
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
+ ```
+ export PATH=$PATH:"$HOME/.new_local/bin"
+ export LC_ALL=en_US.UTF-8
+ export LANG=en_US.UTF-8
+ ```
+ either to your `.zprofile` or `.bash_profile` to make sure these variables
+ are defined and restart your shell.
-2. Get `gtk-osx-setup.sh` by
+3. 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
```
@@ -86,20 +95,18 @@ To create the bundle, you need to first install JHBuild and GTK as described bel
sh gtk-osx-setup.sh
```
-3. Run
- ```
- export PATH=$PATH:"$HOME/.new_local/bin"
- ```
- to set path to jhbuild installed in the previous step.
-
4. Add the following lines to `~/.config/jhbuildrc-custom`:
```
setup_sdk(target="10.13", architectures=["x86_64"])
setup_release()
```
With this settings, the build creates a 64-bit binary that works on
- macOS 10.13 and later. By default, jhbuild compiles without
- optimization flags. The `setup_release()` call enables optimizations.
+ 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). By default,
+ jhbuild compiles without optimization flags. The `setup_release()`
+ call enables optimizations.
5. Install GTK and all of its dependencies by running the following
command inside the `geany-osx` directory:
@@ -113,15 +120,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
```
-Geany Build
------------
-1. Run
- ```
- export LC_ALL=en_US.UTF-8; export LANG=en_US.UTF-8
- ```
- (docutils fails when you do not set these variables).
-
-2. To build Geany, plugins and all of their dependencies, run one of
+6. 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:
@@ -138,7 +137,7 @@ Bundling
--------
1. To build the launcher binary, run
```
- xcodebuild -project Launcher/geany/geany.xcodeproj
+ xcodebuild ARCHS=`uname -m` -project Launcher/geany/geany.xcodeproj
```
inside the `geany-osx` directory.
@@ -148,7 +147,7 @@ Bundling
```
to start jhbuild shell.
- *The rest of this section assumes you are running from within the jhbuild shell.*
+ *Steps 3 and 4 of this section assume you are running from within the jhbuild shell.*
3. To bundle all available Geany themes, get them from
@@ -162,7 +161,9 @@ Bundling
./bundle.sh
```
-5. Optionally, if you have a development account at Apple and want to
+5. Leave jhbuild shell if it was entered in step 2 by typing `exit`.
+
+6. Optionally, if you have a development account at Apple and want to
sign the resulting bundle, get the list of signing identities by
```
security find-identity -p codesigning
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).