[geany/geany-osx] e3544d: Modify modules to download geany and geany-plugins master instead of cloning git - Commits

6 Mar 2023


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Mon, 06 Mar 2023 22:51:50 UTC
Commit:      e3544dc11e2bc78e5ada5efd772f08b2eb696a25
             https://github.com/geany/geany-osx/commit/e3544dc11e2bc78e5ada5efd772f08b2eb...
Log Message:
-----------
Modify modules to download geany and geany-plugins master instead of cloning git
When cloned, the provided patches aren't applied
Modified Paths:
--------------
    geany.modules
Modified: geany.modules
24 lines changed, 13 insertions(+), 11 deletions(-)
===================================================================
@@ -4,8 +4,6 @@
 <moduleset>
   <repository type="tarball" name="ftp.gnome.org"
               href="https://ftp.gnome.org/pub/GNOME/sources/"/>
-  <repository type="git" name="github.com"
-              href="https://github.com/%22/%3E
   <repository type="git" name="gitlab.gnome.org"
               href="https://gitlab.gnome.org/GNOME/"/>
   <repository type="tarball" name="download.gitlab.gnome.org"
@@ -89,7 +87,9 @@
              supports-non-srcdir-builds="no"
              makeargs="install">  <!-- all we need to do is 'make install' -->
     <branch repo="gitlab.gnome.org"
-            module="gtk-mac-bundler"/>
+            module="gtk-mac-bundler">
+        <!-- using git clone - potential patches here wouldn't work -->
+    </branch>
   </autotools>
<metamodule id="geany-deps">
@@ -104,12 +104,13 @@
     </dependencies>
   </metamodule>
-  <!-- Geany from git master -->
+  <!-- Geany from git master - use tarball download otherwise patches don't work -->
   <meson id="geany-git" mesonargs="-Dmac-integration=enabled">
-    <branch repo="github.com"
-            module="geany/geany.git"
+    <branch repo="download.github.com"
+            module="geany/geany/archive/refs/heads/master.tar.gz"
+            rename-tarball="geany-git.tar.gz"
             checkoutdir="geany-git"
-            revision="master" >
+            version="master" >
       <!-- This patch corresponds to https://github.com/geany/geany/pull/2363 -->
       <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01git-geany_config_shell.patch" strip="1" />
       <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/02-geany_scintilla_candidate_window_pos.patch" strip="1" />
@@ -151,13 +152,14 @@
     </dependencies>
   </metamodule>
-  <!-- Geany-plugins from git master -->
+  <!-- Geany-plugins from git master - use tarball download otherwise patches don't work -->
   <autotools id="geany-plugins-git"
              supports-non-srcdir-builds="no">
-    <branch repo="github.com"
-            module="geany/geany-plugins.git"
+    <branch repo="download.github.com"
+            module="geany/geany-plugins/archive/refs/heads/master.tar.gz"
+            rename-tarball="geany-plugins-git.tar.gz"
             checkoutdir="geany-plugins-git"
-            revision="master">
+            version="master" >
       <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/01-geany_plugins_spellcheck_relocation.patch" strip="1" />
       <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/06-geany-plugins_geanylua_link_against_statically_built_liblua.patch" strip="1" />
       <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/07-geany_plugins_geanylua_make_lib_data_directories_relocatable.patch" strip="1" />
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    