Commits October 2017

commits@lists.geany.org

1 participants
39 discussions

[geany/geany-osx] 320bd6: Fix plugin dependencies
by Jiří Techet 17 Oct '17

17 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 16 Oct 2017 22:24:19 UTC Commit: 320bd67f31d21ab99680189e3bc40b21a6a02517 https://github.com/geany/geany-osx/commit/320bd67f31d21ab99680189e3bc40b21a… Log Message: ----------- Fix plugin dependencies Modified Paths: -------------- geany.modules Modified: geany.modules 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -170,7 +170,7 @@ </autotools>  - <metamodule id="geany-plugins-deps-gtk2"> + <metamodule id="geany-plugins-deps"> <dependencies> <dep package="vala" /> <dep package="libgit2" /> @@ -186,7 +186,7 @@ revision="master" /> <dependencies> <dep package="geany-git-gtk2" /> - <dep package="geany-plugins-deps-gtk2" /> + <dep package="geany-plugins-deps" /> </dependencies> </autotools> @@ -197,7 +197,7 @@ revision="master" /> <dependencies> <dep package="geany-git-gtk3" /> - <dep package="geany-plugins-deps-gtk3" /> + <dep package="geany-plugins-deps" /> </dependencies> </autotools> @@ -208,7 +208,7 @@ version="1.31"/> <dependencies> <dep package="geany-release-gtk2" /> - <dep package="geany-plugins-deps-gtk2" /> + <dep package="geany-plugins-deps" /> </dependencies> </autotools> @@ -219,7 +219,7 @@ version="1.31"/> <dependencies> <dep package="geany-release-gtk3" /> - <dep package="geany-plugins-deps-gtk3" /> + <dep package="geany-plugins-deps" /> </dependencies> </autotools> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] aaae3b: Use the "patch" extension for patches
by Jiří Techet 17 Oct '17

17 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 16 Oct 2017 19:34:18 UTC Commit: aaae3b63934edb646e04b29b593c4992ef1fd56d https://github.com/geany/geany-osx/commit/aaae3b63934edb646e04b29b593c4992e… Log Message: ----------- Use the "patch" extension for patches Modified Paths: -------------- geany.modules patches/01-gtk_mac_integration_radio_fix.patch patches/01-vte_0.28_fix.patch patches/02-vte_0.28_relpath.patch patches/03-vte_2.91_relpath.patch Modified: geany.modules 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -43,9 +43,9 @@ <branch module="vte/0.28/vte-${version}.tar.xz" version="0.28.2">  - <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-vte_0.28_fix.diff" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-vte_0.28_fix.patch" strip="1" />  - <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-vte_0.28_relpath.d…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-vte_0.28_relpath.p…" strip="1" /> </branch> </autotools> @@ -55,7 +55,7 @@ <branch module="vte/0.50/vte-${version}.tar.xz" version="0.50.1">  - <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_2.91_relpath.d…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_2.91_relpath.p…" strip="1" />  <patch file="https://github.com/geany/geany-osx/raw/master/patches/0001-build-Add-strchr…" strip="1" /> </branch> @@ -89,7 +89,7 @@ <branch module="gtk-mac-integration/2.0/gtk-mac-integration-${version}.tar.xz" checkoutdir="gtk-mac-integration-fixed" version="2.0.8"> - <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-gtk_mac_integratio…" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-gtk_mac_integratio…" strip="1" /> </branch> </autotools> Modified: patches/01-gtk_mac_integration_radio_fix.patch 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: patches/01-vte_0.28_fix.patch 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: patches/02-vte_0.28_relpath.patch 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: patches/03-vte_2.91_relpath.patch 0 lines changed, 0 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] 2c5cce: Use the latest VTE release and apply patch fixing Mac build on top of that
by Jiří Techet 17 Oct '17

17 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 16 Oct 2017 19:32:32 UTC Commit: 2c5cce59d29b4aaedca5c8fd9e52bfee8b593d76 https://github.com/geany/geany-osx/commit/2c5cce59d29b4aaedca5c8fd9e52bfee8… Log Message: ----------- Use the latest VTE release and apply patch fixing Mac build on top of that Modified Paths: -------------- geany.modules Modified: geany.modules 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -52,10 +52,12 @@ <autotools id="vte291" autogenargs="--disable-Bsymbolic" autogen-sh="configure"> - <branch module="vte/0.48/vte-${version}.tar.xz" - version="0.48.4"> + <branch module="vte/0.50/vte-${version}.tar.xz" + version="0.50.1">  <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_2.91_relpath.d…" strip="1" /> +  + <patch file="https://github.com/geany/geany-osx/raw/master/patches/0001-build-Add-strchr…" strip="1" /> </branch> <dependencies> <dep package="gnutls" /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 847bcd: Fix VTE patch using bundle relative path to apply against tarball release
by Jiří Techet 17 Oct '17

17 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 16 Oct 2017 19:09:14 UTC Commit: 847bcd65253e5646daa1bdbf994285d8869cb689 https://github.com/geany/geany-osx/commit/847bcd65253e5646daa1bdbf994285d88… Log Message: ----------- Fix VTE patch using bundle relative path to apply against tarball release Modified Paths: -------------- patches/03-vte_2.91_relpath.diff Modified: patches/03-vte_2.91_relpath.diff 30 lines changed, 3 insertions(+), 27 deletions(-) =================================================================== @@ -1,37 +1,13 @@ -From 0b83d3b8c0e1fcf8e29c0d114d1bf2dc484eb163 Mon Sep 17 00:00:00 2001 +From 41f97055aeb2e8ef20b32ef8bf27322ac22937d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> Date: Sun, 15 Oct 2017 21:56:57 +0200 Subject: [PATCH] VTE 3.91 relative path Use path relative to app bundle for gettext. --- - src/app/app.cc | 12 +++++++++++- - src/vtegtk.cc | 12 +++++++++++- - 2 files changed, 22 insertions(+), 2 deletions(-) + src/vtegtk.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) -diff --git a/src/app/app.cc b/src/app/app.cc -index bc66cd9c..d47e673a 100644 ---- a/src/app/app.cc -+++ b/src/app/app.cc -@@ -1903,7 +1903,17 @@ main(int argc, - { - setlocale(LC_ALL, ""); - -- bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); -+ gchar *localedir = g_build_filename(g_getenv("GTK_PATH"), -+ "share", -+ "locale", -+ NULL); -+ if (!g_file_test(localedir, G_FILE_TEST_IS_DIR)) -+ { -+ g_free(localedir); -+ localedir = g_strdup(LOCALEDIR); -+ } -+ bindtextdomain(GETTEXT_PACKAGE, localedir); -+ g_free(localedir); - #ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - #endif diff --git a/src/vtegtk.cc b/src/vtegtk.cc index d671957a..0ff936a6 100644 --- a/src/vtegtk.cc -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 57b8e8: Add patch fixing VTE compilation on Mac
by Jiří Techet 17 Oct '17

17 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 16 Oct 2017 18:57:58 UTC Commit: 57b8e8c34b0929ca088e51e88f8d1b1861916bca https://github.com/geany/geany-osx/commit/57b8e8c34b0929ca088e51e88f8d1b186… Log Message: ----------- Add patch fixing VTE compilation on Mac Modified Paths: -------------- patches/0001-build-Add-strchrnul-implementation-to-fix-compilatio.patch Modified: patches/0001-build-Add-strchrnul-implementation-to-fix-compilatio.patch 117 lines changed, 117 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,117 @@ +From a4362e96d882e496444c8858963d4d4be4d7b430 Mon Sep 17 00:00:00 2001 +From: Egmont Koblinger <egmont(a)gmail.com> +Date: Sun, 15 Oct 2017 22:33:22 +0200 +Subject: [PATCH 1/2] build: Add strchrnul implementation to fix compilation on + macOS + +https://bugzilla.gnome.org/show_bug.cgi?id=788476 +--- + configure.ac | 3 +++ + src/vteseq.cc | 1 + + src/vtespawn.cc | 13 ++----------- + src/vteutils.cc | 13 +++++++++++++ + src/vteutils.h | 3 +++ + 5 files changed, 22 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e5109fff..e7c386d6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -293,6 +293,9 @@ AC_CHECK_FUNCS([cfmakeraw fork setsid setpgid getpgid tcgetattr tcsetattr]) + AC_CHECK_FUNCS([pread pwrite]) + AC_CHECK_FUNCS([explicit_bzero]) + ++# Misc string routines. ++AC_CHECK_FUNCS([strchrnul]) ++ + # for vtespawn + AC_CHECK_HEADERS([sys/resource.h]) + AC_CHECK_FUNCS([fdwalk]) +diff --git a/src/vteseq.cc b/src/vteseq.cc +index 6876341d..7b5b49b0 100644 +--- a/src/vteseq.cc ++++ b/src/vteseq.cc +@@ -31,6 +31,7 @@ + #include <vte/vte.h> + #include "vteinternal.hh" + #include "vtegtk.hh" ++#include "vteutils.h" /* for strchrnul on non-GNU systems */ + #include "caps.h" + #include "debug.h" + +diff --git a/src/vtespawn.cc b/src/vtespawn.cc +index b411ca71..331e8fc2 100644 +--- a/src/vtespawn.cc ++++ b/src/vtespawn.cc +@@ -39,6 +39,7 @@ + #include <glib-unix.h> + + #include "vtespawn.hh" ++#include "vteutils.h" /* for strchrnul on non-GNU systems */ + #include "reaper.hh" + + #define VTE_SPAWN_ERROR_TIMED_OUT (G_SPAWN_ERROR_FAILED + 1000) +@@ -1001,16 +1002,6 @@ script_execute (const gchar *file, + } + } + +-static gchar* +-my_strchrnul (const gchar *str, gchar c) +-{ +- gchar *p = (gchar*) str; +- while (*p && (*p != c)) +- ++p; +- +- return p; +-} +- + static gint + g_execute (const gchar *file, + gchar **argv, +@@ -1081,7 +1072,7 @@ g_execute (const gchar *file, + char *startp; + + path = p; +- p = my_strchrnul (path, ':'); ++ p = strchrnul (path, ':'); + + if (p == path) + /* Two adjacent colons, or a colon at the beginning or the end +diff --git a/src/vteutils.cc b/src/vteutils.cc +index 648d1851..e683375b 100644 +--- a/src/vteutils.cc ++++ b/src/vteutils.cc +@@ -96,3 +96,16 @@ _vte_mkstemp (void) + + return fd; + } ++ ++#ifndef HAVE_STRCHRNUL ++/* Copied from glib */ ++char * ++strchrnul (const char *s, int c) ++{ ++ char *p = (char *) s; ++ while (*p && (*p != c)) ++ ++p; ++ ++ return p; ++} ++#endif /* !HAVE_STRCHRNUL */ +diff --git a/src/vteutils.h b/src/vteutils.h +index 999e3bf9..0cc98eb2 100644 +--- a/src/vteutils.h ++++ b/src/vteutils.h +@@ -24,6 +24,9 @@ + G_BEGIN_DECLS + + int _vte_mkstemp (void); ++#ifndef HAVE_STRCHRNUL ++char *strchrnul (const char *s, int c); ++#endif + + G_END_DECLS + +-- +2.13.5 (Apple Git-94) + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 18daf6: Ignore all Geany app bundles
by Jiří Techet 16 Oct '17

16 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 16 Oct 2017 16:54:07 UTC Commit: 18daf648a9e34e6e61a488ea7874b64cb5b65112 https://github.com/geany/geany-osx/commit/18daf648a9e34e6e61a488ea7874b64cb… Log Message: ----------- Ignore all Geany app bundles Modified Paths: -------------- .gitignore Modified: .gitignore 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,3 @@ -Geany.app +Geany*.app Geany*.dmg -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] c7365d: Fix libgit2 compilation and reference version number in package names when possible
by Jiří Techet 16 Oct '17

16 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 16 Oct 2017 16:51:29 UTC Commit: c7365d64053045c372a33b8fe6a80c2094ae6d74 https://github.com/geany/geany-osx/commit/c7365d64053045c372a33b8fe6a80c209… Log Message: ----------- Fix libgit2 compilation and reference version number in package names when possible Modified Paths: -------------- geany.modules Modified: geany.modules 27 lines changed, 14 insertions(+), 13 deletions(-) =================================================================== @@ -24,23 +24,23 @@  <distutils id="docutils"> <branch repo="sourceforge" - module="docutils/docutils-0.12.tar.gz" + module="docutils/docutils-${version}.tar.gz" version="0.12"/> </distutils>  <autotools id="pcre2" autogenargs="--enable-jit --enable-pcre2-8"> <branch repo="pcre" - module="pcre2-10.30.tar.bz2" + module="pcre2-${version}.tar.bz2" version="10.30"/> </autotools>  <autotools id="vte28" autogenargs="--disable-Bsymbolic" autogen-sh="configure"> - <branch module="vte/0.28/vte-0.28.2.tar.xz" + <branch module="vte/0.28/vte-${version}.tar.xz" version="0.28.2">  <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-vte_0.28_fix.diff" strip="1" /> @@ -52,7 +52,7 @@ <autotools id="vte291" autogenargs="--disable-Bsymbolic" autogen-sh="configure"> - <branch module="vte/0.48/vte-0.48.4.tar.xz" + <branch module="vte/0.48/vte-${version}.tar.xz" version="0.48.4">  <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_2.91_relpath.d…" strip="1" /> @@ -64,26 +64,27 @@ </dependencies> </autotools> -  +  <autotools id="murrine-engine" autogen-sh="configure"> - <branch module="murrine/0.98/murrine-0.98.2.tar.xz" + <branch module="murrine/0.98/murrine-${version}.tar.xz" version="0.98.2"/> </autotools> -  +  <cmake id="libgit2" cmakeargs="-DTHREADSAFE:BOOL=1"> <branch repo="download.github.com" - module="libgit2/libgit2/archive/v0.26.0.tar.gz" + module="libgit2/libgit2/archive/v${version}.tar.gz" + checkoutdir="libgit2-${version}" version="0.26.0"/> </cmake>  <autotools id="gtk-mac-integration-fixed" autogen-sh="configure" autogenargs="--disable-python"> - <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.8.tar.xz" + <branch module="gtk-mac-integration/2.0/gtk-mac-integration-${version}.tar.xz" checkoutdir="gtk-mac-integration-fixed" version="2.0.8"> <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-gtk_mac_integratio…" strip="1" /> @@ -148,7 +149,7 @@ <autotools id="geany-release-gtk2" autogenargs="--enable-mac-integration"> <branch repo="download.geany.org" - module="geany-1.31.tar.bz2" + module="geany-${version}.tar.bz2" version="1.31"/> <dependencies> <dep package="geany-deps-gtk2" /> @@ -159,7 +160,7 @@ <autotools id="geany-release-gtk3" autogenargs="--enable-mac-integration --enable-gtk3"> <branch repo="download.geany.org" - module="geany-1.31.tar.bz2" + module="geany-${version}.tar.bz2" version="1.31"/> <dependencies> <dep package="geany-deps-gtk3" /> @@ -201,7 +202,7 @@  <autotools id="geany-plugins-release-gtk2"> <branch repo="download.geany.org" - module="geany-plugins/geany-plugins-1.31.tar.bz2" + module="geany-plugins/geany-plugins-${version}.tar.bz2" version="1.31"/> <dependencies> <dep package="geany-release-gtk2" /> @@ -212,7 +213,7 @@  <autotools id="geany-plugins-release-gtk3"> <branch repo="download.geany.org" - module="geany-plugins/geany-plugins-1.31.tar.bz2" + module="geany-plugins/geany-plugins-${version}.tar.bz2" version="1.31"/> <dependencies> <dep package="geany-release-gtk3" /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 2901cd: Updates describing both GTK 2 and GTK 3 build
by Jiří Techet 16 Oct '17

16 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 16 Oct 2017 09:53:00 UTC Commit: 2901cd4bacd1d0c5d1c490a70bf5be07b241b72e https://github.com/geany/geany-osx/commit/2901cd4bacd1d0c5d1c490a70bf5be07b… Log Message: ----------- Updates describing both GTK 2 and GTK 3 build Modified Paths: -------------- Greybird/close.png Greybird/gtkrc Greybird/gtkrc.theme README.md geany-gtk2.bundle geany.modules Modified: Greybird/close.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: Greybird/gtkrc 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: Greybird/gtkrc.theme 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: README.md 163 lines changed, 87 insertions(+), 76 deletions(-) =================================================================== @@ -15,30 +15,31 @@ Files and Directories A brief description of the contents of the project directory: ### Directories -* *Faience*: Faience icon theme combined with Faenza-Cupertino +* *Faience*: Faience GTK 2 icon theme combined with Faenza-Cupertino icon theme (for better folder icons) and with lots of unneeded icons removed to save space. +* *Papirus*: Papirus GTK 3 icon theme with lots of unneeded icons + removed to save space. +* *Greybird*: Greybird GTK 2 theme which has been modified to look more + like Mac OS. +* *Arc*: Arc GTK 3 theme with minor text contrast adjustments. * *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. ### Configuration files * *geany.modules*: JHBuild modules file with Geany dependencies. -* *geany.bundle*: configuration file describing the contents of the - app bundle. +* *geany-gtk2.bundle, geany-gtk3.bundle*: configuration files describing + the contents of the app bundle. * *Info.plist*: Mac OS application configuration file containing some basic information such as application name, version, etc. but also additional configuration including file types the application can open. -* *gtkrc.theme, close.png*: GTK theme based on the Greybird theme and - modified to match the Mac OS theme better. -* *gtkrc*: GTK configuration file including the theme file and changing - some Geany gtkrc settings. * *Geany.icns*: Mac OS Geany icon file. ### Scripts -* *launcher.sh*: launcher script from the gtk-mac-bundler project setting - all the necessary environment variables. +* *launcher-gtk2.sh, launcher-gtk3*: launcher script from the + gtk-mac-bundler project setting all the necessary environment variables. * *replace_icons.sh*: script replacing the color icons distributed together with Geany with grey icons from the Faience theme. * *plist_filetypes.py*: script generating the file type portion of the @@ -96,25 +97,26 @@ To create the bundle, you need to first install JHBuild and GTK as described bel setup_sdk(target="10.9", sdk_version="native", architectures=["x86_64"]) ``` - so the build creates a 64-bit binary that works on OS X 10.7 and later. + so the build creates a 64-bit binary that works on OS X 10.9 and later. OS X 10.9 is the first version which uses libc++ by default which is now required by Scintilla and VTE libraries because of C++11 support. 5. By default, jhbuild compiles without optimization flags. To enable optimization, add `setup_release()` at the end of `~/.jhbuildrc-custom`. -6. Install GTK 2 and all its dependencies using the following commands: - - ``` - 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 - install GTK 3. Note that both GTK 2 and GTK 3 cannot be installed at the - same time. Also note that there seem to be various problems with the Mac OS - support in GTK 3; for this reason I have not spent more time with the GTK 3 - backend so there is no GTK3-specific theme or bundling support at this - moment. +6. Install GTK and all of its dependencies by running one of the following + commands: + * **GTK 2** + ``` + jhbuild bootstrap && jhbuild build python && jhbuild build meta-gtk-osx-bootstrap && jhbuild build meta-gtk-osx-core + ``` + * **GTK 3** + ``` + jhbuild bootstrap && jhbuild build python && jhbuild build meta-gtk-osx-bootstrap && jhbuild build 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 ------------------ @@ -124,22 +126,28 @@ Geany Installation export LC_ALL=en_US.UTF-8; export LANG=en_US.UTF-8 ``` -2. Inside the geany-osx directory run either - - ``` - jhbuild -m geany.modules build geany-bundle-release-gtk2 - ``` - - or - - ``` - jhbuild -m geany.modules build geany-bundle-gtk2 - ``` - - to build Geany either from release tarballs or git master. - - There are other useful module installation options - check the geany.modules - file for more options. +2. To build Geany, plugins and all of their dependencies, run one of + the following commandsinside the `geany-osx` directory depending on + the GTK version used and whether to use Geany sources from the latest + release tarball or current git master: + * **GTK 2** + * **Geany from release tarball** + ``` + jhbuild -m geany.modules build geany-bundle-release-gtk2 + ``` + * **Geany from git master** + ``` + jhbuild -m geany.modules build geany-bundle-git-gtk2 + ``` + * **GTK 3** + * **Geany from release tarball** + ``` + jhbuild -m geany.modules build geany-bundle-release-gtk3 + ``` + * **Geany from git master** + ``` + jhbuild -m geany.modules build geany-bundle-git-gtk3 + ``` Bundling -------- @@ -148,7 +156,6 @@ Bundling ``` jhbuild shell ``` - to start jhbuild shell. *The rest of this section assumes you are running from within the jhbuild shell.* @@ -157,32 +164,36 @@ Bundling <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 Faience icon theme to the - gtk icons directory: - - ``` - cp -r Faience $PREFIX/share/icons - ``` - -4. Replace Geany color icons by grey icons from the Faience theme by calling - - ``` - ./replace_icons.sh - ``` - - from within the geany-osx directory. - -5. Create the app bundle by calling - - ``` - gtk-mac-bundler geany-gtk2.bundle - ``` - - from within the geany-osx directory. - -6. Optionally if you have a development account at Apple and want to sign the + and copy the `colorschemes` directory under `$PREFIX/share/geany`. + +3. Go to the `geany-osx` directory and copy the icon theme to the GTK + icons directory: + * **GTK 2** + ``` + cp -r Faience $PREFIX/share/icons + ``` + and replace some Geany-specific icons by the icons from the theme + by running: + ``` + ./replace_icons.sh + ``` + * **GTK 3** + ``` + cp -r Papirus $PREFIX/share/icons + ``` + +4. Inside the `geany-osx` directory run the following command to create + the app bundle. + * **GTK 2** + ``` + gtk-mac-bundler geany-gtk2.bundle + ``` + * **GTK 3** + ``` + gtk-mac-bundler geany-gtk3.bundle + ``` + +5. 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 ``` @@ -203,43 +214,43 @@ Bundling Distribution ------------ -1. Get the create-dmg script from +1. Get the `create-dmg` script from <https://github.com/andreyvit/create-dmg.git> - and put it to your $PATH. + and put it to your `$PATH`. 2. Create the dmg installation image by calling ``` ./create_dmg.sh ``` - from within the geany-osx directory. If the SIGN_CERTIFICATE variable is + from within the `geany-osx` directory. If the `SIGN_CERTIFICATE` variable is defined, the image gets signed by the specified certificate. Maintenance ----------- This section describes some maintenance-related activities which do not have to be performed during normal bundle/installer creation: -* To get the Info.plist file associations in sync with - filetype_extensions.conf, copy the filetype extension portion from - filetype_extensions.conf to the marked place in plist_filetypes.py +* To get the `Info.plist` file associations in sync with + `filetype_extensions.conf`, copy the filetype extension portion from + `filetype_extensions.conf` to the marked place in `plist_filetypes.py` and run the script. Copy the output of the script to the marked - place in Info.plist. + place in `Info.plist`. -* The Geany.icns icon file can be regenerated from the iconbuilder.iconset +* The `Geany.icns` icon file can be regenerated from the `iconbuilder.iconset` directory using ``` iconutil -c icns ./iconbuilder.iconset ``` * Before the release update the Geany version and copyright years inside - Info.plist and create_dmg.sh. Also update the `-release` targets in - geany.modules file to point to the new release. Dependencies inside - geany.modules can also be updated to newer versions. + `Info.plist` and `create_dmg.sh`. Also update the `-release` targets in + `geany.modules` file to point to the new release. Dependencies inside + `geany.modules` can also be updated to newer versions. --- Modified: geany-gtk2.bundle 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -178,15 +178,15 @@  <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc"> - ${project}/gtkrc + ${project}/Greybird/gtkrc </data>  <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc.theme"> - ${project}/gtkrc.theme + ${project}/Greybird/gtkrc.theme </data>  <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/close.png"> - ${project}/close.png + ${project}/Greybird/close.png </data>  - <autotools id="geany-gtk2" +  + <autotools id="geany-git-gtk2" autogenargs="--enable-mac-integration"> <branch repo="github.com" module="geany/geany.git" @@ -134,8 +133,8 @@ </dependencies> </autotools> -  - <autotools id="geany-gtk3" +  + <autotools id="geany-git-gtk3" autogenargs="--enable-mac-integration --enable-gtk3"> <branch repo="github.com" module="geany/geany.git" @@ -145,7 +144,7 @@ </dependencies> </autotools> -  +  <autotools id="geany-release-gtk2" autogenargs="--enable-mac-integration"> <branch repo="download.geany.org" @@ -156,7 +155,7 @@ </dependencies> </autotools> -  +  <autotools id="geany-release-gtk3" autogenargs="--enable-mac-integration --enable-gtk3"> <branch repo="download.geany.org" @@ -177,29 +176,29 @@ </dependencies> </metamodule> -  - <autotools id="geany-plugins-gtk2"> +  + <autotools id="geany-plugins-git-gtk2"> <branch repo="github.com" module="geany/geany-plugins.git" revision="master" /> <dependencies> - <dep package="geany-gtk2" /> + <dep package="geany-git-gtk2" /> <dep package="geany-plugins-deps-gtk2" /> </dependencies> </autotools> -  - <autotools id="geany-plugins-gtk3"> +  + <autotools id="geany-plugins-git-gtk3"> <branch repo="github.com" module="geany/geany-plugins.git" revision="master" /> <dependencies> - <dep package="geany-gtk3" /> + <dep package="geany-git-gtk3" /> <dep package="geany-plugins-deps-gtk3" /> </dependencies> </autotools> -  +  <autotools id="geany-plugins-release-gtk2"> <branch repo="download.geany.org" module="geany-plugins/geany-plugins-1.31.tar.bz2" @@ -210,7 +209,7 @@ </dependencies> </autotools> -  +  <autotools id="geany-plugins-release-gtk3"> <branch repo="download.geany.org" module="geany-plugins/geany-plugins-1.31.tar.bz2" @@ -221,34 +220,30 @@ </dependencies> </autotools> -  - <metamodule id="geany-bundle-gtk2"> +  + <metamodule id="geany-bundle-git-gtk2"> <dependencies> - <dep package="geany-gtk2" /> - <dep package="geany-plugins-gtk2" /> + <dep package="geany-plugins-git-gtk2" /> </dependencies> </metamodule> -  - <metamodule id="geany-bundle-gtk3"> +  + <metamodule id="geany-bundle-git-gtk3"> <dependencies> - <dep package="geany-gtk3" /> - <dep package="geany-plugins-gtk3" /> + <dep package="geany-plugins-git-gtk3" /> </dependencies> </metamodule>  <metamodule id="geany-bundle-release-gtk2"> <dependencies> - <dep package="geany-release-gtk2" /> <dep package="geany-plugins-release-gtk2" /> </dependencies> </metamodule>  <metamodule id="geany-bundle-release-gtk3"> <dependencies> - <dep package="geany-release-gtk3" /> <dep package="geany-plugins-release-gtk3" /> </dependencies> </metamodule> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 958974: Remove redundant and erroneous file patterns from Doxygen
by Colomban Wendling 16 Oct '17

16 Oct '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 16 Oct 2017 07:33:01 UTC Commit: 958974338d4a8a64736101c7ac8f1896da3e4a7b https://github.com/geany/geany/commit/958974338d4a8a64736101c7ac8f1896da3e4… Log Message: ----------- Remove redundant and erroneous file patterns from Doxygen Modified Paths: -------------- doc/Doxyfile.in Modified: doc/Doxyfile.in 6 lines changed, 1 insertions(+), 5 deletions(-) =================================================================== @@ -837,11 +837,7 @@ FILE_PATTERNS = *.c \ *.C++ \ *.H \ *.HH \ - *.H++ \ - *.dox \ - RECURSIVE \ - = \ - NO + *.H++ # The RECURSIVE tag can be used to specify whether or not subdirectories should # be searched for input files as well. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] fbec97: Update GTK 3 bundle config file
by Jiří Techet 16 Oct '17

16 Oct '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 15 Oct 2017 22:12:33 UTC Commit: fbec97b2f137fc3c4d95f0353ffaf9cff6afb949 https://github.com/geany/geany-osx/commit/fbec97b2f137fc3c4d95f0353ffaf9cff… Log Message: ----------- Update GTK 3 bundle config file Modified Paths: -------------- geany-gtk2.bundle geany-gtk3.bundle Modified: geany-gtk2.bundle 10 lines changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -83,12 +83,6 @@ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so </binary> - -  <binary> ${prefix}/lib/libvte.9.dylib @@ -112,7 +106,7 @@ ${prefix}/lib/geany/*.so </binary> -  @@ -136,7 +130,7 @@ "dest" property. The destination must then start with the macro "${bundle}", which refers to the bundle root directory. --> - +  <data dest="${bundle}/Contents/Resources/share/geany"> ${prefix}/share/geany Modified: geany-gtk3.bundle 41 lines changed, 27 insertions(+), 14 deletions(-) =================================================================== @@ -52,16 +52,13 @@ <main-binary>${prefix}/bin/geany</main-binary> -  + <binary> - ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so + ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so </binary> - <binary> - ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so + ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so </binary>  @@ -73,10 +70,16 @@ <binary> ${prefix}/lib/libvte-2.91.0.dylib </binary> -  + +  + <binary> + ${prefix}/lib/enchant/*.so + </binary> + +  + <binary> + ${prefix}/lib/gio/modules/*.so + </binary>  <binary> @@ -87,7 +90,7 @@ want to copy in to the bundle. The "dest" attribute is optional, as usual. Bundler will find all translations of that library/program under the indicated directory and copy them.--> - <translations name="gtk30"> + <translations name="gtk30"> ${prefix}/share/locale </translations> <translations name="vte-2.91"> @@ -131,12 +134,14 @@  + +  <data> - ${prefix}/share/themes + ${prefix}/share/themes/Mac </data> <data> - ${prefix}/share/icons + ${prefix}/share/themes/Arc </data> <!-- Copy icons. Note that the .icns file is an Apple format which @@ -147,4 +152,12 @@ ${project}/Geany.icns </data> - </app-bundle> + <data> + ${prefix}/share/icons/hicolor + </data> + + <data> + ${prefix}/share/icons/Papirus + </data> + +</app-bundle> -------------- 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 October 2017