Commits March 2020

commits@lists.geany.org

1 participants
8 discussions

[geany/geany-osx] af48b3: Use 'quartz' as the default IM module
by Jiří Techet 24 Mar '20

24 Mar '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 24 Mar 2020 19:34:44 UTC Commit: af48b3160668e7f183d358364fe6b396f5df4b9c https://github.com/geany/geany-osx/commit/af48b3160668e7f183d358364fe6b396f… Log Message: ----------- Use 'quartz' as the default IM module Since we are using the latest GTK release which fixes page up/down when IM is enabled and since the latest patches to Scintilla fixes most of the problems with IM, it should be safe to use quartz by default. Modified Paths: -------------- Launcher/geany/geany/main.m geany.modules patches/02-geany_scintilla_im_fix.patch Modified: Launcher/geany/geany/main.m 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -186,7 +186,7 @@ static int run_geany() { config = @{ THEME_KEY: [ConfigValue valueWithDefault:@"0" comment:@"0: automatic selection based on system settings (requires Geany restart when changed, macOS 10.14+); 1: light; 2: dark; make sure there's no ~/.config/gtk-3.0/settings.ini file, otherwise it overrides the settings made here"], LOCALE_KEY: [ConfigValue valueWithDefault:@"" comment:@"no value: autodetect; locale string: locale to be used (e.g. en_US.UTF-8)"], - IM_MODULE_KEY: [ConfigValue valueWithDefault:@"" comment:@"no value: don't use any IM module; module name: use the specified module, e.g. 'quartz' for native macOS behavior (slightly buggy so not enabled by default), for complete list of modules see Geany.app/Contents/Resources/lib/gtk-3.0/3.0.0/immodules, use without the 'im-' prefix"], + IM_MODULE_KEY: [ConfigValue valueWithDefault:@"quartz" comment:@"no value: don't use any IM module; module name: use the specified module, e.g. 'quartz' for native macOS behavior, for complete list of modules, see Geany.app/Contents/Resources/lib/gtk-3.0/3.0.0/immodules, use without the 'im-' prefix"], }; read_config(); Modified: geany.modules 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -105,7 +105,7 @@  <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-geany_config_shell…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-geany_vte_login_sh…" strip="1" /> -  +  <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-geany_scintilla_im…" strip="1" /> </branch> <dependencies> @@ -123,7 +123,7 @@  <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-geany_config_shell…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-geany_vte_login_sh…" strip="1" /> -  +  <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-geany_scintilla_im…" strip="1" /> </branch> <dependencies> Modified: patches/02-geany_scintilla_im_fix.patch 92 lines changed, 65 insertions(+), 27 deletions(-) =================================================================== @@ -1,38 +1,76 @@ # HG changeset patch -# User Jiří Techet <techet(a)gmail.com> -# Date 1571822802 -7200 -# Wed Oct 23 11:26:42 2019 +0200 -# Node ID 46e1cd396ba57332ec81628c7365bfc91ed207e1 -# Parent 4f8c3b19095af4f0d333f1b6aa1ff1e3a69d9f4c -Call SetCandidateWindowPos() inside PreeditChanged() +# User Zufu Liu +# Date 1578312404 -39600 +# Mon Jan 06 23:06:44 2020 +1100 +# Node ID 9d42a88f08cc4d336ecdb0c7f1587efdb00bddbe +# Parent 4dad3058a47731d1f90d09341e546465170fa40f +Bug [#2135]. Set candidate window position in windowed IME mode. -On macOS it is possible to long-press a key to get a popup offering to -select characters with additional accents. This popup should appear -at the position of the caret. Scintilla however only sets the -caret position using gtk_im_context_set_cursor_location() for some -input methods (which exclude im-quartz) so the caret position isn't -set correctly and macOS always displays the popup at the very bottom -of the screen. +diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx +--- a/gtk/ScintillaGTK.cxx ++++ b/gtk/ScintillaGTK.cxx +@@ -2432,6 +2432,8 @@ + try { + PreEditString pes(im_context); + if (strlen(pes.str) > 0) { ++ SetCandidateWindowPos(); ++ + PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), pes.str); + pango_layout_set_attributes(layout, pes.attrs); + +# HG changeset patch +# User Zufu Liu +# Date 1578312869 -39600 +# Mon Jan 06 23:14:29 2020 +1100 +# Node ID be67578909888e76e81421d32459ace2a59b9d1d +# Parent 9d42a88f08cc4d336ecdb0c7f1587efdb00bddbe +Bug [#2135]. Improve location of candidate window. -Moving SetCandidateWindowPos() into PreeditChanged() seems to fix -the problem. +diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx +--- a/gtk/ScintillaGTK.cxx ++++ b/gtk/ScintillaGTK.cxx +@@ -2315,8 +2315,10 @@ + // Composition box accompanies candidate box. + const Point pt = PointMainCaret(); + GdkRectangle imeBox = {0}; // No need to set width +- imeBox.x = static_cast<gint>(pt.x); // Only need positiion +- imeBox.y = static_cast<gint>(pt.y) + vs.lineHeight; // underneath the first charater ++ imeBox.x = static_cast<gint>(pt.x); ++ imeBox.y = static_cast<gint>(pt.y + std::max(4, vs.lineHeight/4)); ++ // prevent overlapping with current line ++ imeBox.height = vs.lineHeight; + gtk_im_context_set_cursor_location(im_context, &imeBox); + } + +# HG changeset patch +# User Zufu Liu +# Date 1578313229 -39600 +# Mon Jan 06 23:20:29 2020 +1100 +# Node ID 59f3c5ced2e22c4ab05082ada5cd356e13c16633 +# Parent be67578909888e76e81421d32459ace2a59b9d1d +Bug [#2135]. Prevent movement of candidate window while typing. -diff --git a/scintilla/gtk/ScintillaGTK.cxx b/scintilla/gtk/ScintillaGTK.cxx ---- a/scintilla/gtk/ScintillaGTK.cxx -+++ b/scintilla/gtk/ScintillaGTK.cxx -@@ -2442,7 +2442,6 @@ +diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx +--- a/gtk/ScintillaGTK.cxx ++++ b/gtk/ScintillaGTK.cxx +@@ -2388,8 +2388,11 @@ + return; + } + +- if (initialCompose) ++ if (initialCompose) { + ClearBeforeTentativeStart(); ++ } ++ ++ SetCandidateWindowPos(); + pdoc->TentativeStart(); // TentativeActive() from now on + + std::vector<int> indicator = MapImeIndicators(preeditStr.attrs, preeditStr.str); +@@ -2423,7 +2426,6 @@ } EnsureCaretVisible(); - SetCandidateWindowPos(); ShowCaretAtCurrentPosition(); } catch (...) { errorStatus = SC_STATUS_FAILURE; -@@ -2487,6 +2486,7 @@ - } else { - sciThis->PreeditChangedWindowedThis(); - } -+ sciThis->SetCandidateWindowPos(); - } - - void ScintillaGTK::StyleSetText(GtkWidget *widget, GtkStyle *, void *) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 3da435: Update modules
by Jiří Techet 24 Mar '20

24 Mar '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 24 Mar 2020 19:25:37 UTC Commit: 3da4356a1a253a3a625c1f1eaa18410eefddd716 https://github.com/geany/geany-osx/commit/3da4356a1a253a3a625c1f1eaa18410ee… Log Message: ----------- Update modules Modified Paths: -------------- README.md geany.modules patches/04-vte_2.91_bsymbolic.patch Modified: README.md 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -230,4 +230,4 @@ have to be performed during normal bundle/installer creation: --- -Jiri Techet, 2019 +Jiri Techet, 2020 Modified: geany.modules 10 lines changed, 4 insertions(+), 6 deletions(-) =================================================================== @@ -36,16 +36,14 @@ autogenargs="--enable-jit --enable-pcre2-8"> <branch repo="pcre" module="pcre2-${version}.tar.bz2" - version="10.33"/> + version="10.34"/> </autotools> <meson id="vte291" mesonargs="-Dgnutls=false -Dvapi=false -D_b_symbolic_functions=false"> - <branch module="vte/0.58/vte-${version}.tar.xz" - version="0.58.2"> + <branch module="vte/0.60/vte-${version}.tar.xz" + version="0.60.0">  <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/04-vte_2.91_bsymbolic…" strip="1" /> </branch> <dependencies> <dep package="pcre2" /> @@ -58,7 +56,7 @@ <branch repo="download.github.com" module="libgit2/libgit2/archive/v${version}.tar.gz" checkoutdir="libgit2-${version}" - version="0.28.3"/> + version="0.28.4"/> </cmake>  Modified: patches/04-vte_2.91_bsymbolic.patch 65 lines changed, 0 insertions(+), 65 deletions(-) =================================================================== @@ -1,65 +0,0 @@ -From 347f7dd9b1c11244156bfb593866306c735cb06a Mon Sep 17 00:00:00 2001 -From: Christian Persch <chpe(a)src.gnome.org> -Date: Sun, 13 Oct 2019 21:30:49 +0200 -Subject: [PATCH] build: Add option to disable -Bsymbolic-functions - -Fixes: https://gitlab.gnome.org/GNOME/vte/issues/184 ---- - meson.build | 16 +++++++++++----- - meson_options.txt | 9 +++++++++ - 2 files changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index a479f10f..06294595 100644 ---- a/meson.build -+++ b/meson.build -@@ -372,15 +372,21 @@ add_project_arguments(global_cxxflags, language: 'cpp') - # Linker flags - - linker_flags = [ -- '-Wl,-Bsymbolic-functions' -+ [ '-Wl,-Bsymbolic-functions', get_option('_b_symbolic_functions'),], - ] - - foreach flag: linker_flags -- assert(cc.has_link_argument(flag), flag + ' is required but not supported') -- add_project_link_arguments(flag, language: 'c') -+ if cc.has_link_argument(flag[0]) -+ add_project_link_arguments(flag[0], language: 'c') -+ elif flag[1] -+ assert(false, flag[0] + ' is required but not supported') -+ endif - -- assert(cxx.has_link_argument(flag), flag + ' is required but not supported') -- add_project_link_arguments(flag, language: 'cpp') -+ if cxx.has_link_argument(flag[0]) -+ add_project_link_arguments(flag[0], language: 'cpp') -+ elif flag[1] -+ assert(false, flag[0] + ' is required but not supported') -+ endif - endforeach - - # Dependencies -diff --git a/meson_options.txt b/meson_options.txt -index d29c66a3..5d8c8798 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,6 +13,15 @@ - # You should have received a copy of the GNU Lesser General Public License - # along with this library. If not, see <https://www.gnu.org/licenses/>. - -+# This option allows you to disable -Bsymbolic-functions if your linker -+# doesn't support it. -+option( -+ '_b_symbolic_functions', -+ type: 'boolean', -+ value: true, -+ description: 'Use -Bsymbolic-functions', -+) -+ - option( - 'debugg', # for some reason, 'debug' is "reserved" - type: 'boolean', --- -2.20.1 - -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 23e803: Read release versions dynamically from filesystem
by Enrico Tröger 22 Mar '20

22 Mar '20

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 22 Mar 2020 12:08:50 UTC Commit: 23e80333af1c72ad084068f6fd90237a06f944a1 https://github.com/geany/www.geany.org/commit/23e80333af1c72ad084068f6fd902… Log Message: ----------- Read release versions dynamically from filesystem Check the existing files on download.geany.org to determine which is the latest version and use this instead of the globally stored latest version. This enables us to add in-release sub versions. Modified Paths: -------------- README.dev.md docker/local_settings.docker.py geany/settings.py latest_version/context_processors.py latest_version/releases.py page_content/download/releases.md requirements.txt Modified: README.dev.md 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -103,6 +103,7 @@ the settings to your needs: LOGGING['handlers']['file']['filename'] = '/tmp/geany_django.log' + LATEST_VERSION_RELEASES_DIRECTORY = '/path/to/geany/releases/directory/or/just/empty' STATIC_DOCS_GEANY_SOURCE_TARBALL = '/path/to/geany/source/tarball/or/just/empty' IRC_USER_LIST_FILE = '/path/to/irc/data/or/just/empty' Modified: docker/local_settings.docker.py 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -55,6 +55,8 @@ STATIC_DOCS_GEANY_DESTINATION_URL = os.path.join(MEDIA_URL, 'i18n') STATIC_DOCS_GEANY_I18N_STATISTICS_FILENAME = 'i18n_statistics.json' +LATEST_VERSION_RELEASES_DIRECTORY = '' + LOGGING = { 'version': 1, 'disable_existing_loggers': True, Modified: geany/settings.py 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -456,6 +456,8 @@ IRC_USER_LIST_FILE = '/srv/tmp/irc_userlist' +LATEST_VERSION_RELEASES_DIRECTORY = '/srv/www/download.geany.org' + MEZZANINE_SYNC_PAGES_DESTINATION_PATH = os.path.join(PROJECT_ROOT, 'page_content') Modified: latest_version/context_processors.py 13 lines changed, 12 insertions(+), 1 deletions(-) =================================================================== @@ -12,12 +12,23 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +from mezzanine.conf import settings + from geany.decorators import cache_function, CACHE_TIMEOUT_1HOUR from latest_version.models import LatestVersion +from latest_version.releases import ReleaseVersionsProvider # ---------------------------------------------------------------------- @cache_function(CACHE_TIMEOUT_1HOUR, ignore_arguments=True) def latest_version(request): geany_latest_version = LatestVersion.objects.get(id=1) - return dict(geany_latest_version=geany_latest_version) + + release_versions_provider = ReleaseVersionsProvider( + settings.LATEST_VERSION_RELEASES_DIRECTORY, + fallback_version=geany_latest_version.version) + release_versions = release_versions_provider.provide() + + return dict( + geany_latest_version=geany_latest_version, + release_versions=release_versions) Modified: latest_version/releases.py 133 lines changed, 133 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,133 @@ +# -*- coding: utf-8 -*- +# LICENCE: This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from pathlib import Path +import logging +import re + +from packaging.version import parse as parse_version + + +RELEASE_TYPE_SOURCE_GZIP = 'source_gzip_version' +RELEASE_TYPE_SOURCE_BZIP2 = 'source_bzip2_version' +RELEASE_TYPE_WINDOWS = 'windows_version' +RELEASE_TYPE_MACOS = 'macos_version' + +RELEASE_TYPES = { + RELEASE_TYPE_SOURCE_GZIP: { + 'pattern': re.compile(r'^geany-([0-9\.\-]+).tar.gz$'), + 'fallback_filename': 'geany-{version}.tar.gz' + }, + RELEASE_TYPE_SOURCE_BZIP2: { + # ~'pattern': re.compile(r'^geany-([0-9\.\-]+).tar.bz2$'), + 'pattern': re.compile(r'^gany-([0-9\.\-]+).tar.bz2$'), + 'fallback_filename': 'geany-{version}.tar.bz2' + }, + RELEASE_TYPE_WINDOWS: { + 'pattern': re.compile(r'^geany-([0-9\.\-]+)_setup(-[0-9]+)?.exe$'), + 'fallback_filename': 'geany-{version}_setup.exe' + }, + RELEASE_TYPE_MACOS: { + 'pattern': re.compile(r'^geany-([0-9\.\-]+)_osx(-[0-9]+)?.dmg$'), + 'fallback_filename': 'geany-{version}_osx.dmg' + }, +} + + +logger = logging.getLogger(__name__) # pylint: disable=invalid-name + + +class ReleaseVersions: + + source_gzip_version = None + source_bzip2_version = None + windows_version = None + macos_version = None + + +class ReleaseVersionsProvider: + + # ---------------------------------------------------------------------- + def __init__(self, releases_directory, fallback_version): + self._releases_directory = releases_directory + self._fallback_version = fallback_version + self._release_files = None + self._release_files_by_version = None + self._release_versions = None + + # ---------------------------------------------------------------------- + def provide(self): + self._fetch_releases_from_filesystem() + self._group_releases_by_type() + self._factor_release_versions() + + return self._release_versions + + # ---------------------------------------------------------------------- + def _fetch_releases_from_filesystem(self): + self._release_files = list() + + if not self._releases_directory: + return + + path = Path(self._releases_directory) + for entry in path.iterdir(): + relative_entry = entry.relative_to(self._releases_directory) + filename = relative_entry.as_posix() + self._release_files.append(filename) + + # ---------------------------------------------------------------------- + def _group_releases_by_type(self): + self._release_files_by_version = dict() + for release_type in RELEASE_TYPES: + self._release_files_by_version[release_type] = list() + + for filename in self._release_files: + if RELEASE_TYPES[RELEASE_TYPE_SOURCE_GZIP]['pattern'].match(filename): + self._release_files_by_version[RELEASE_TYPE_SOURCE_GZIP].append(filename) + + elif RELEASE_TYPES[RELEASE_TYPE_SOURCE_BZIP2]['pattern'].match(filename): + self._release_files_by_version[RELEASE_TYPE_SOURCE_BZIP2].append(filename) + + elif RELEASE_TYPES[RELEASE_TYPE_WINDOWS]['pattern'].match(filename): + self._release_files_by_version[RELEASE_TYPE_WINDOWS].append(filename) + + elif RELEASE_TYPES[RELEASE_TYPE_MACOS]['pattern'].match(filename): + self._release_files_by_version[RELEASE_TYPE_MACOS].append(filename) + + # ---------------------------------------------------------------------- + def _factor_release_versions(self): + self._release_versions = ReleaseVersions() + for release_type in self._release_files_by_version: + latest_version = self._determine_latest_version(release_type) + + setattr(self._release_versions, release_type, latest_version) + + # ---------------------------------------------------------------------- + def _determine_latest_version(self, release_type): + versions = self._release_files_by_version[release_type] + sorted_versions = sorted(versions, key=parse_version) + try: + latest_version = sorted_versions.pop() + logger.debug( + 'Latest version found for "{}": {}'.format(release_type, latest_version)) + except IndexError: + fallback_filename = RELEASE_TYPES[release_type]['fallback_filename'] + latest_version = fallback_filename.format(version=self._fallback_version) + logger.debug( + 'Latest version found for "{}": {} (fallback)'.format( + release_type, + latest_version)) + + return latest_version Modified: page_content/download/releases.md 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -3,10 +3,10 @@ Releases Distribution | File | GPG Signature | GPG Key ----------------- | ------------- | ------------- | ------------- -Source (tar.gz) | [geany-{{ geany_latest_version.version }}.tar.gz](https://download.geany.org/geany-{{ geany_latest_version.version }}.tar.gz) | [geany-{{ geany_latest_version.version }}.tar.gz.sig](https://download.geany.org/geany-{{ geany_latest_version.version }}.tar.gz.sig) ([Instructions][4]) | [colombanw-pubkey.txt][1] -Source (tar.bz2) | [geany-{{ geany_latest_version.version }}.tar.bz2](https://download.geany.org/geany-{{ geany_latest_version.version }}.tar.bz2) | [geany-{{ geany_latest_version.version }}.tar.bz2.sig](https://download.geany.org/geany-{{ geany_latest_version.version }}.tar.bz2.sig) ([Instructions][4]) | [colombanw-pubkey.txt][1] -Windows | [geany-{{ geany_latest_version.version }}_setup.exe](https://download.geany.org/geany-{{ geany_latest_version.version }}_setup.exe) | [geany-{{ geany_latest_version.version }}_setup.exe.sig](https://download.geany.org/geany-{{ geany_latest_version.version }}_setup.exe.sig) ([Instructions][4]) | [eht16-pubkey.txt][2] -Mac OSX | [geany-{{ geany_latest_version.version }}_osx.dmg](https://download.geany.org/geany-{{ geany_latest_version.version }}_osx.dmg) | - | - +Source (tar.gz) | [{{ release_versions.source_gzip_version }}](https://download.geany.org/{{ release_versions.source_gzip_version }}) | [{{ release_versions.source_gzip_version }}.sig](https://download.geany.org/{{ release_versions.source_gzip_version }}.sig) ([Instructions][4]) | [colombanw-pubkey.txt][1] +Source (tar.bz2) | [{{ release_versions.source_bzip2_version }}](https://download.geany.org/{{ release_versions.source_bzip2_version }}) | [{{ release_versions.source_bzip2_version }}.sig](https://download.geany.org/{{ release_versions.source_bzip2_version }}.sig) ([Instructions][4]) | [colombanw-pubkey.txt][1] +Windows | [{{ release_versions.windows_version }}](https://download.geany.org/{{ release_versions.windows_version }}) | [{{ release_versions.windows_version }}.sig](https://download.geany.org/{{ release_versions.windows_version }}.sig) ([Instructions][4]) | [eht16-pubkey.txt][2] +Mac OSX | [{{ release_versions.macos_version }}](https://download.geany.org/{{ release_versions.macos_version }}) | - | - [Release notes for Geany {{ geany_latest_version.version }}][3] Modified: requirements.txt 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -8,6 +8,7 @@ django-link-shortener django-log-request-id mezzanine-pagedown mezzanine-sync-pages +packaging pygments pylibmc python-logstash-async -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 139ce9: #2459: Add Geany to Category TextEditor
by Dominic Hopf 20 Mar '20

20 Mar '20

Branch: refs/heads/dmaphy-patch-1 Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 20 Mar 2020 22:22:24 UTC Commit: 139ce9f5d2e717bec7d41c160d4e0c2e35f93618 https://github.com/geany/geany/commit/139ce9f5d2e717bec7d41c160d4e0c2e35f93… Log Message: ----------- #2459: Add Geany to Category TextEditor Modified Paths: -------------- geany.desktop.in Modified: geany.desktop.in 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7,7 +7,7 @@ _Comment=A fast and lightweight IDE using GTK+ Exec=geany %F Icon=geany Terminal=false -Categories=GTK;Development;IDE; +Categories=GTK;Development;IDE;TextEditor; MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff; StartupNotify=true _Keywords=Text;Editor; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 45f85d: Update README
by Jiří Techet 20 Mar '20

20 Mar '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 20 Mar 2020 21:15:55 UTC Commit: 45f85d0299200507de9928bbfa7e8b809e24791e https://github.com/geany/geany-osx/commit/45f85d0299200507de9928bbfa7e8b809… Log Message: ----------- Update README Modified Paths: -------------- README.md Modified: README.md 19 lines changed, 16 insertions(+), 3 deletions(-) =================================================================== @@ -29,6 +29,11 @@ A brief description of the contents of the project directory: * *Papirus, Papirus-Dark*: Papirus GTK 3 icon theme with lots of unneeded icons removed to save space. * *iconbuilder.iconset*: source Geany icons for the bundle. +* *modulesets-stable*: copy of the modulesets-stable directory from + the [gtk-osx](https://gitlab.gnome.org/GNOME/gtk-osx/) project containing + dependency specifications. Since the upstram project is in a constant + state of flux and fails to build frequently, this allows us to make + a snapshot of a working configuration for our build. * *patches*: various patches fixing dependencies to enable bundling. * *utils*: various utility scripts. @@ -99,10 +104,13 @@ To create the bundle, you need to first install JHBuild and GTK as described bel optimization flags. The `setup_release()` call enables optimizations. 5. Install GTK and all of its dependencies by running the following - command: + command inside the `geany-osx` directory: ``` - jhbuild bootstrap-gtk-osx && jhbuild build meta-gtk-osx-freetype meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 + jhbuild bootstrap-gtk-osx && jhbuild -m "https://raw.githubusercontent.com/geany/geany-osx/master/modulesets-stable/…" build meta-gtk-osx-bootstrap meta-gtk-osx-gtk3 ``` + It is possible to skip the module specification part `-m <url>` + in which case the upstream module specification is used instead + of our snapshot. Geany Build ----------- @@ -131,6 +139,7 @@ Bundling ``` xcodebuild -project Launcher/geany/geany.xcodeproj ``` + inside the `geany-osx` directory. 2. Run ``` @@ -208,7 +217,11 @@ have to be performed during normal bundle/installer creation: `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. - + +* Copy `modulesets-stable` from [gtk-osx](https://gitlab.gnome.org/GNOME/gtk-osx/) + into this project to get the latest dependencies (if it builds) and + possibly modify it (if something isn't working). + * To make sure nothing is left from the previous build when making a new release, run ``` -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 4accb6: Disable docutils in build because right now it doesn't seem to build
by Jiří Techet 20 Mar '20

20 Mar '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 20 Mar 2020 21:15:37 UTC Commit: 4accb66a44c3dd4c27218039b31a39f3ed09ed9a https://github.com/geany/geany-osx/commit/4accb66a44c3dd4c27218039b31a39f3e… Log Message: ----------- Disable docutils in build because right now it doesn't seem to build Modified Paths: -------------- geany.modules Modified: geany.modules 14 lines changed, 9 insertions(+), 5 deletions(-) =================================================================== @@ -24,10 +24,11 @@ <include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx…" />  - <distutils id="docutils"> + <distutils id="docutils" + supports-non-srcdir-builds="no"> <branch repo="files.pythonhosted.org" - module="packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61/docutils-${version}.tar.gz" - version="0.15.2"/> + module="packages/2f/e0/3d435b34abd2d62e8206171892f174b180cd37b09d57b924ca5c2ef2219d/docutils-${version}.tar.gz" + version="0.16"/> </distutils>  @@ -84,7 +85,10 @@ <metamodule id="geany-deps"> <dependencies> <dep package="vte291" /> +  <dep package="meta-gtk-osx-gtk3-core-themes" /> <dep package="gtk-mac-bundler" /> <dep package="gtk-mac-integration-fixed" /> @@ -95,7 +99,7 @@  <autotools id="geany-git" - autogenargs="--enable-mac-integration --enable-gtk3"> + autogenargs="--enable-mac-integration --enable-gtk3 --disable-html-docs"> <branch repo="github.com" module="geany/geany.git" checkoutdir="geany-git" @@ -113,7 +117,7 @@  <autotools id="geany-release" - autogenargs="--enable-mac-integration --enable-gtk3"> + autogenargs="--enable-mac-integration --enable-gtk3 --disable-html-docs"> <branch repo="download.geany.org" module="geany-${version}.tar.bz2" checkoutdir="geany-${version}" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 481d09: Use the latest GTK which fixes some macOS problems
by Jiří Techet 20 Mar '20

20 Mar '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 20 Mar 2020 11:44:06 UTC Commit: 481d09ea6f4535a25c9e3cbf5f0fd621e4118a6b https://github.com/geany/geany-osx/commit/481d09ea6f4535a25c9e3cbf5f0fd621e… Log Message: ----------- Use the latest GTK which fixes some macOS problems Modified Paths: -------------- modulesets-stable/gtk-osx.modules Modified: modulesets-stable/gtk-osx.modules 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -241,8 +241,8 @@ <autotools id="gtk+-3.0" autogen-sh="autogen.sh" autogenargs="--enable-quartz-backend --enable-quartz-relocation"> - <branch module="gtk+/3.24/gtk+-3.24.10.tar.xz" version="3.24.10" - hash="sha256:35a8f107e2b90fda217f014c0c15cb20a6a66678f6fd7e36556d469372c01b03"> + <branch module="gtk+/3.24/gtk+-3.24.14.tar.xz" version="3.24.14" + hash="sha256:1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88"> </branch> <dependencies> <dep package="glib"/> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] a668d2: Fix icu dependency
by Jiří Techet 20 Mar '20

20 Mar '20

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 20 Mar 2020 11:43:12 UTC Commit: a668d25a6795803993b64a43164199999f5386f5 https://github.com/geany/geany-osx/commit/a668d25a6795803993b64a43164199999… Log Message: ----------- Fix icu dependency Modified Paths: -------------- modulesets-stable/gtk-osx-bootstrap.modules Modified: modulesets-stable/gtk-osx-bootstrap.modules 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -149,9 +149,9 @@ <dependencies> <dep package="ragel"/> <dep package="glib"/> + <dep package="icu"/> </dependencies> <after> - <dep package="icu"/> <dep package="icu55"/> </after> </autotools> -------------- 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 March 2020