Update geany.modules

geany.modules

@@ -33,15 +33,15 @@
 
   <!-- Needed by VTE 2.91 -->
   <autotools id="pcre2"
-             autogenargs="--enable-jit --enable-pcre2-8">
+             autogenargs="--disable-jit --enable-pcre2-8">
     <branch repo="pcre"
             module="pcre2-${version}.tar.bz2"
-            version="10.34"/>
+            version="10.35"/>
   </autotools>
 
-  <meson id="vte291" mesonargs="-Dgnutls=false -Dvapi=false -D_b_symbolic_functions=false">
+  <meson id="vte291" mesonargs="-Dgnutls=false -Dicu=false -Dvapi=false -D_b_symbolic_functions=false">
     <branch module="vte/0.60/vte-${version}.tar.xz" 
-            version="0.60.0">
+            version="0.60.3">
       <!-- 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.patch" strip="1" />
     </branch>
@@ -83,10 +83,7 @@
   <metamodule id="geany-deps">
     <dependencies>
       <dep package="vte291" />
-      <!-- TODO: right now (March 2020), docutils fails to install (no idea why)
-           so let's use Geany online documentation instead
       <dep package="docutils" />
-      -->
       <dep package="meta-gtk-osx-gtk3-core-themes" />
       <dep package="gtk-mac-bundler" />
       <dep package="gtk-mac-integration-fixed" />
@@ -97,16 +94,15 @@
 
   <!-- Geany from git master -->
   <autotools id="geany-git"
-             autogenargs="--enable-mac-integration --enable-gtk3 --disable-html-docs">
+             autogenargs="--enable-mac-integration"
+             supports-non-srcdir-builds="no">
     <branch repo="github.com"
             module="geany/geany.git"
             checkoutdir="geany-git"
             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" />
       <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-geany_vte_login_shell.patch" strip="1" />
-      <!-- TODO: remove once Geany updates to the latest Scintilla -->
-      <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" />
@@ -115,16 +111,15 @@
 
   <!-- Geany tarball release -->
   <autotools id="geany-release"
-             autogenargs="--enable-mac-integration --enable-gtk3 --disable-html-docs">
+             autogenargs="--enable-mac-integration"
+             supports-non-srcdir-builds="no">
     <branch repo="download.geany.org"
             module="geany-${version}.tar.bz2"
             checkoutdir="geany-${version}"
             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" />
       <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-geany_vte_login_shell.patch" strip="1" />
-      <!-- TODO: remove once Geany updates to the latest Scintilla -->
-      <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" />
@@ -140,7 +135,6 @@
   </metamodule>
 
   <!-- Geany-plugins from git master -->
-  <!-- TODO: remove supports-non-srcdir-builds when fixed -->
   <autotools id="geany-plugins-git"
              supports-non-srcdir-builds="no">
     <branch repo="github.com"
@@ -154,7 +148,6 @@
   </autotools>
 
   <!-- Geany-plugins tarball release -->
-  <!-- TODO: remove supports-non-srcdir-builds when fixed -->
   <autotools id="geany-plugins-release"
              supports-non-srcdir-builds="no">
     <branch repo="download.geany.org"