Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Mon, 14 Oct 2019 09:35:08 UTC
Commit: bc0bbc83fc5c412f32a9f7ed90e207f53e224b40
https://github.com/geany/geany-osx/commit/bc0bbc83fc5c412f32a9f7ed90e207f53…
Log Message:
-----------
Use the latest version of VTE
For now we can't use a release because _b_symbolic_functions was just
added to master.
Modified Paths:
--------------
geany.modules
Modified: geany.modules
18 lines changed, 10 insertions(+), 8 deletions(-)
===================================================================
@@ -51,20 +51,22 @@
</branch>
</autotools>
- <!-- disable vala for now, there seems to be some problem -->
- <autotools id="vte291"
- autogenargs="--disable-Bsymbolic --without-gnutls --enable-vala=no"
- autogen-sh="configure">
- <branch module="vte/0.56/vte-${version}.tar.xz"
- version="0.56.3">
+ <meson id="vte291" mesonargs="-Dgnutls=false -Dvapi=false -D_b_symbolic_functions=false">
+ <!-- TODO: use some official release once it contains the _b_symbolic_functions config option
+ <branch module="vte/0.58/vte-${version}.tar.xz"
+ version="0.58.2">
+ -->
+ <branch repo="gitlab.gnome.org"
+ module="vte.git"
+ branch="master"
+ tag="347f7dd9b1c11244156bfb593866306c735cb06a">
<!-- Make paths relative to bundle (fallback to system paths if not found) -->
<patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_2.91_relpath.p…" strip="1" />
</branch>
<dependencies>
- <!-- <dep package="vala" /> -->
<dep package="pcre2" />
</dependencies>
- </autotools>
+ </meson>
<!-- Needed by the used GTK 2 theme -->
<autotools id="murrine-engine"
--------------
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, 13 Oct 2019 16:56:38 UTC
Commit: c6517b5811a2d0b5e0a4ce54768ad46ee196894e
https://github.com/geany/geany-osx/commit/c6517b5811a2d0b5e0a4ce54768ad46ee…
Log Message:
-----------
README updates
Modified Paths:
--------------
README.md
Modified: README.md
6 lines changed, 4 insertions(+), 2 deletions(-)
===================================================================
@@ -22,11 +22,13 @@ A brief description of the contents of the project directory:
removed to save space.
* *Greybird*: Greybird GTK 2 theme which has been modified to look more
like Mac OS.
-* *Sierra-light-solid*: Sierra GTK 3 Theme
+* *Mojave-light-solid*: Mojave GTK 3 Theme
* *iconbuilder.iconset*: contains source icons for the Geany.icns
file. Not needed for normal build, present just in case the icns file
needs to be recreated for some reason.
-* *patches*: patches fixing VTE under Mac OS and enabling VTE bundling.
+* *patches*: patches fixing VTE under Mac OS and enabling VTE bundling.
+* *LauncherGtk3*: A binary launcher which is used to set up environment
+ variables to run Geany.
### Configuration files
* *geany.modules*: JHBuild modules file with Geany dependencies.
--------------
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: Sat, 12 Oct 2019 10:27:01 UTC
Commit: bf446b0e1e3a6d8bed19a5c30fff43724ac4eb0d
https://github.com/geany/geany-osx/commit/bf446b0e1e3a6d8bed19a5c30fff43724…
Log Message:
-----------
Update README to reflect the latest changes
Modified Paths:
--------------
README.md
Modified: README.md
21 lines changed, 12 insertions(+), 9 deletions(-)
===================================================================
@@ -52,7 +52,7 @@ General Instructions
For more general instructions about building and bundling Mac OS applications
please visit
-<https://wiki.gnome.org/Projects/GTK%2B/OSX/>
+<https://gitlab.gnome.org/GNOME/gtk-osx/>
The HOWTO below contains just the portions necessary/relevant for
building and bundling Geany.
@@ -107,15 +107,14 @@ To create the bundle, you need to first install JHBuild and GTK as described bel
commands:
* **GTK 2**
```
- jhbuild bootstrap-gtk-osx && jhbuild build python3 meta-gtk-osx-freetype meta-gtk-osx-bootstrap meta-gtk-osx-core
+ jhbuild bootstrap-gtk-osx && jhbuild build meta-gtk-osx-freetype meta-gtk-osx-bootstrap meta-gtk-osx-core
```
* **GTK 3**
```
- jhbuild bootstrap-gtk-osx && jhbuild build python3 meta-gtk-osx-bootstrap meta-gtk-osx-gtk3
+ jhbuild bootstrap-gtk-osx && jhbuild build meta-gtk-osx-freetype meta-gtk-osx-bootstrap meta-gtk-osx-gtk3
```
This is the moment when you have to make a decision whether to build
Geany with GTK 2 or GTK 3 - they cannot be installed side by side.
- At the moment GTK 2 is more stable and recommended for Geany build.
Geany Installation
------------------
@@ -150,7 +149,11 @@ Geany Installation
Bundling
--------
-1. Run
+1. To build the GTK3 binary launcher, run
+ ```
+ xcodebuild -project LauncherGtk3/geany/geany.xcodeproj
+ ```
+2. Run
```
jhbuild shell
@@ -159,13 +162,13 @@ Bundling
*The rest of this section assumes you are running from within the jhbuild shell.*
-2. To bundle all available Geany themes, get them from
+3. To bundle all available Geany themes, get them from
<https://github.com/geany/geany-themes>
and copy the `colorschemes` directory under `$PREFIX/share/geany`.
-3. Go to the `geany-osx` directory and copy the icon theme to the GTK
+4. Go to the `geany-osx` directory and copy the icon theme to the GTK
icons directory:
* **GTK 2**
```
@@ -176,7 +179,7 @@ Bundling
cp -R Papirus $PREFIX/share/icons
```
-4. Inside the `geany-osx` directory run the following command to create
+5. Inside the `geany-osx` directory run the following command to create
the app bundle.
* **GTK 2**
```
@@ -187,7 +190,7 @@ Bundling
~/.local/bin/gtk-mac-bundler geany-gtk3.bundle
```
-5. Optionally if you have a development account at Apple and want to sign the
+6. Optionally if you have a development account at Apple and want to sign the
resulting bundle so it can be started without warning dialogs, use
```
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).