Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Thu, 12 Oct 2017 17:27:56 UTC
Commit: 83e8ae1737910d9be8520ac9246cc8f77703040d
https://github.com/geany/geany/commit/83e8ae1737910d9be8520ac9246cc8f777030…
Log Message:
-----------
Make sure GDK_MOD2_MASK is cleared when getting modifiers
gtk_accelerator_get_default_mod_mask() behaves differently on OS X under
GTK 3 when compared to GTK 2. On GTK 2 it used to clear the GDK_MOD2_MASK
bit while on GTK 3 it's preserved. We need to clear it ourselves
otherwise e.g. <Command>S leads to <Commands><Mod2>S and none of the
keybindings work under GTK 3.
Modified Paths:
--------------
src/keybindings.c
Modified: src/keybindings.c
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -124,7 +124,10 @@ GdkModifierType keybindings_get_modifiers(GdkModifierType mods)
{
#ifdef __APPLE__
if (mods & GDK_MOD2_MASK)
+ {
mods |= GEANY_PRIMARY_MOD_MASK;
+ mods &= ~GDK_MOD2_MASK;
+ }
#endif
return mods & gtk_accelerator_get_default_mod_mask();
}
--------------
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: elextr <elextr(a)gmail.com>
Date: Sat, 07 Oct 2017 00:48:47 UTC
Commit: 3fb94c235c91a980a7fd7aa159f373b457833148
https://github.com/geany/geany/commit/3fb94c235c91a980a7fd7aa159f373b457833…
Log Message:
-----------
Use non-symlinked VTE libraries on macOS (#1625)
* Try non-symlinked VTE libraries on macOS before the symlinked ones
Plugins using VTE such as multiterm or debugger are linked against the
non-symlinked version of the library like libvte.9.dylib and not
libvte.dylib. When a bundle is created, all symlinks are replaced by
a copy of the symlinked file. This means there are both libvte.dylib
and libvte.9.dylib in the bundle both containing the same code. When
Geany loads libvte.dylib and plugins load libvte.9.dylib the same code
gets loaded twice and when the same type gets registered by GTK, it fails
and the whole application freezes.
This problem doesn't exist on linux or when running from the command line
on macOS because the operating system detects it's the same library
because of the symlink and it's loaded only once.
Loading the same library as the one used by plugins fixes the issue with
macOS bundle. The original symlinked name is still used as a fallback.
The patch also adds #ifdef __APPLE__ around the Apple-specific library
names which also prevents unnecessary retries on other platforms. Loading
*.so libraries is still kept as a fallback on Apple as these are legal too
and could in theory be used on OS X as well.
* Try loading newer VTE versions before older ones on GTK 2
Modified Paths:
--------------
src/vte.c
Modified: src/vte.c
15 lines changed, 11 insertions(+), 4 deletions(-)
===================================================================
@@ -276,10 +276,17 @@ void vte_init(void)
gint i;
const gchar *sonames[] = {
#if GTK_CHECK_VERSION(3, 0, 0)
- "libvte-2.91.so", "libvte-2.91.so.0", "libvte-2.91.dylib",
- "libvte2_90.so", "libvte2_90.so.9", "libvte2_90.dylib",
-#else
- "libvte.so", "libvte.so.4", "libvte.so.8", "libvte.so.9", "libvte.dylib",
+# ifdef __APPLE__
+ "libvte-2.91.0.dylib", "libvte-2.91.dylib",
+ "libvte2_90.9.dylib", "libvte2_90.dylib",
+# endif
+ "libvte-2.91.so", "libvte-2.91.so.0",
+ "libvte2_90.so", "libvte2_90.so.9",
+#else /* GTK 2 */
+# ifdef __APPLE__
+ "libvte.9.dylib", "libvte.dylib",
+# endif
+ "libvte.so", "libvte.so.9", "libvte.so.8", "libvte.so.4",
#endif
NULL
};
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Fri, 06 Oct 2017 13:52:33 UTC
Commit: b4415b16dacff0d79ff15747dfdbf87b2a282848
https://github.com/geany/geany/commit/b4415b16dacff0d79ff15747dfdbf87b2a282…
Log Message:
-----------
Update of Swedish translation
Modified Paths:
--------------
po/sv.po
Modified: po/sv.po
1295 lines changed, 654 insertions(+), 641 deletions(-)
===================================================================
No diff available, check online
--------------
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: Wed, 04 Oct 2017 21:33:57 UTC
Commit: 71b04e7060faa36e319eb8b999114a8dae83826c
https://github.com/geany/geany-osx/commit/71b04e7060faa36e319eb8b999114a8da…
Log Message:
-----------
Update README to build python before the rest of the system
Right now there seems to be some clash of the python version shipped with
macOS and the gobject-introspection package which leads to an error during
build. A workaround is to build python before the rest of the system which
makes the build process use the built python instead of the system one
which eliminates the error.
Modified Paths:
--------------
README.md
Modified: README.md
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -100,7 +100,7 @@ To create the bundle, you need to first install JHBuild and GTK as described bel
6. Install GTK 2 and all its dependencies using the following commands:
```
- jhbuild bootstrap && jhbuild build meta-gtk-osx-bootstrap && jhbuild build meta-gtk-osx-core
+ jhbuild bootstrap && jhbuild build python && jhbuild build meta-gtk-osx-bootstrap && jhbuild build meta-gtk-osx-core
```
Instead of meta-gtk-osx-core (GTK 2) you can also use `meta-gtk-osx-gtk3` to
--------------
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: Wed, 04 Oct 2017 21:33:57 UTC
Commit: 4bc99363637424b22cec4d46b089b70977f87f73
https://github.com/geany/geany-osx/commit/4bc99363637424b22cec4d46b089b7097…
Log Message:
-----------
Improve README so it's easier to copy/paste commands from it
Modified Paths:
--------------
README.md
Modified: README.md
17 lines changed, 11 insertions(+), 6 deletions(-)
===================================================================
@@ -70,11 +70,17 @@ To create the bundle, you need to first install JHBuild and GTK as described bel
jhbuild will not interfere with some other command-line tools installed
on your system).
-2. Get `gtk-osx-build-setup.sh` from
+2. Get `gtk-osx-build-setup.sh` by
- <https://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh>
-
- and run it.
+ ```
+ curl -o gtk-osx-build-setup.sh https://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh
+ ```
+
+ and run it:
+
+ ```
+ sh gtk-osx-build-setup.sh
+ ```
3. Run
@@ -115,8 +121,7 @@ Geany Installation
1. Docutils will fail if you do not set the following environment variables:
```
- export LC_ALL=en_US.UTF-8
- export LANG=en_US.UTF-8
+ export LC_ALL=en_US.UTF-8; export LANG=en_US.UTF-8
```
2. Inside the geany-osx directory run either
--------------
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: Wed, 04 Oct 2017 21:33:09 UTC
Commit: ac28b6ab00146ba08f64c654adc7e1344a6da267
https://github.com/geany/geany-osx/commit/ac28b6ab00146ba08f64c654adc7e1344…
Log Message:
-----------
Link against libstdc++ and Bump deployment target to 10.7
Scintilla now requires C++11 which is only supported by the new libc++
library which is shipped since OS X 10.7.
tmp
Modified Paths:
--------------
Info.plist
README.md
geany.modules
Modified: Info.plist
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -28,7 +28,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>LSMinimumSystemVersion</key>
- <string>10.6</string>
+ <string>10.7</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>NSHighResolutionCapable</key>
Modified: README.md
6 lines changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -87,10 +87,12 @@ To create the bundle, you need to first install JHBuild and GTK as described bel
4. Update the `setup_sdk()` call in `~/.jhbuildrc-custom` to something like
```
- setup_sdk(target="10.6", sdk_version="native", architectures=["x86_64"])
+ setup_sdk(target="10.7", sdk_version="native", architectures=["x86_64"])
```
- so the build creates a 64-bit binary that works on OS X 10.6 and later.
+ so the build creates a 64-bit binary that works on OS X 10.7 and later.
+ OS X 10.7 is the first version which ships libc++ which is now required
+ because the Scintilla component needs C++11 support.
5. By default, jhbuild compiles without optimization flags. To enable
optimization, add `setup_release()` at the end of `~/.jhbuildrc-custom`.
Modified: geany.modules
12 lines changed, 8 insertions(+), 4 deletions(-)
===================================================================
@@ -121,7 +121,8 @@
<!-- Geany -->
<autotools id="geany"
- autogenargs="--enable-mac-integration">
+ autogenargs="--enable-mac-integration"
+ makeargs='CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=c++11"'>
<branch repo="github.com"
module="geany/geany.git"
revision="master" />
@@ -132,7 +133,8 @@
<!-- Geany GTK 3-->
<autotools id="geany-gtk3"
- autogenargs="--enable-mac-integration --enable-gtk3">
+ autogenargs="--enable-mac-integration --enable-gtk3"
+ makeargs='CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=c++11"'>
<branch repo="github.com"
module="geany/geany.git"
revision="master" />
@@ -143,7 +145,8 @@
<!-- Geany tarball release -->
<autotools id="geany-release"
- autogenargs="--enable-mac-integration">
+ autogenargs="--enable-mac-integration"
+ makeargs='CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=c++11"'>
<branch repo="download.geany.org"
module="geany-1.31.tar.bz2"
version="1.31"/>
@@ -154,7 +157,8 @@
<!-- Geany tarball release GTK 3 -->
<autotools id="geany-release-gtk3"
- autogenargs="--enable-mac-integration --enable-gtk3">
+ autogenargs="--enable-mac-integration --enable-gtk3"
+ makeargs='CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=c++11"'>
<branch repo="download.geany.org"
module="geany-1.31.tar.bz2"
version="1.31"/>
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: Frank Lanitz <frank(a)frank.uvena.de>
Date: Tue, 03 Oct 2017 08:21:30 UTC
Commit: 0e26c726e3bc54f1e6e8c9f20058a8368b10ee3f
https://github.com/geany/geany/commit/0e26c726e3bc54f1e6e8c9f20058a8368b10e…
Log Message:
-----------
Update of German translation
Modified Paths:
--------------
po/de.po
Modified: po/de.po
1118 lines changed, 565 insertions(+), 553 deletions(-)
===================================================================
No diff available, check online
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).