[geany/geany-osx] 6f8dfd: Update modules to patch scintilla

Jiří Techet git-noreply at xxxxx
Wed Oct 23 16:28:48 UTC 2019


Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Wed, 23 Oct 2019 16:28:48 UTC
Commit:      6f8dfdc03f15e97bfca783e9af05c2262b279b2e
             https://github.com/geany/geany-osx/commit/6f8dfdc03f15e97bfca783e9af05c2262b279b2e

Log Message:
-----------
Update modules to patch scintilla


Modified Paths:
--------------
    geany.modules

Modified: geany.modules
9 lines changed, 8 insertions(+), 1 deletions(-)
===================================================================
@@ -170,6 +170,8 @@
             version="1.36">
       <!-- This patch corresponds to https://github.com/geany/geany/pull/2363 -->
       <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-geany_config_shell.patch" strip="1" />
+      <!-- TODO: remove once merged upstream-->
+      <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-geany_scintilla_im_fix.patch" strip="1" />
     </branch>
     <dependencies>
       <dep package="geany-deps-gtk3" />
@@ -204,7 +206,12 @@
             module="geany/geany-plugins.git"
             checkoutdir="geany-plugins-git"
             supports-non-srcdir-builds="no"
-            revision="master" />
+            revision="master" >
+	  <!-- This patch corresponds to https://github.com/geany/geany/pull/2363 -->
+	  <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-geany_config_shell.patch" strip="1" />
+	  <!-- TODO: remove once merged upstream-->
+	  <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-geany_scintilla_im_fix.patch" strip="1" />
+    </branch>
     <dependencies>
       <dep package="geany-git-gtk3" />
       <dep package="geany-plugins-deps" />



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list