gnucash-htdocs beta: New MacOS Apple Silicon bundle.
John Ralls
jralls at code.gnucash.org
Tue Jul 16 19:29:22 EDT 2024
discards https://github.com/Gnucash/gnucash-htdocs/commit/a5cc9901 (commit)
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/ee6990b9 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (https://github.com/Gnucash/gnucash-htdocs/commit/a5cc9901)
\
N -- N -- N (https://github.com/Gnucash/gnucash-htdocs/commit/ee6990b9)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
commit ee6990b909afe74fa99cbd170a540b454cc05e7b
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Jul 16 16:00:27 2024 -0700
New MacOS Apple Silicon bundle.
diff --git a/download.phtml b/download.phtml
index 15e3105..452fb0d 100644
--- a/download.phtml
+++ b/download.phtml
@@ -22,7 +22,8 @@
<h3><?php echo T_("Installers")?></h3>
<ul class="imagelist"><!-- ToDo: merge concat into format on next patch-po session -->
<li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/windows.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <a href="<?php echo $latest_stable_path.$latest_stable_win;?>"><?=\LABEL_WIN." ".\SUPPORTED_WIN?></a></li>
- <li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/macosx.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <a href="<?php echo $latest_stable_path.$latest_stable_mac_intel;?>"><?=\LABEL_MAC." ".\SUPPORTED_MAC?></a></li>
+ <li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/apple-silver-32.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <a href="<?php echo $latest_stable_path.$latest_stable_mac_arm;?>"><?=\LABEL_MAC." ".\ARCH_MAC_ARM." ".\SUPPORTED_MAC_ARM?></a></li>
+ <li class="imagelistitem" style="background-image: url(<?=$top_dir?>/images/icons/apple_logo.png);"><?php printf (T_("GnuCash %s for"), $latest_stable)?> <a href="<?php echo $latest_stable_path.$latest_stable_mac_x86;?>"><?=\LABEL_MAC." ".\ARCH_MAC_X86." ".\SUPPORTED_MAC_X86?></a></li>
</ul>
<a id="distribution"></a><h3>Linux</h3>
diff --git a/externals/global_params.php b/externals/global_params.php
index 61ccd3d..f370019 100644
--- a/externals/global_params.php
+++ b/externals/global_params.php
@@ -13,7 +13,8 @@
$latest_stable = $major_stable.".".$minor_stable;
$latest_stable_win = $latest_stable;
//$latest_stable_win = $latest_stable."-1";
- $latest_stable_mac_intel = $latest_stable."-2";
+ $latest_stable_mac_arm = $latest_stable."-1";
+ $latest_stable_mac_x86 = $latest_stable."-2";
// Change this when there has been a re-tag to add the re-tag letter,
// e.g. if one retagged 2.6.13 to 2.6.13a, make $tarball = $latest_stable."a".
$tarball = $latest_stable."";
@@ -33,10 +34,13 @@
$old_stable_mac_intel = $old_stable."-1";
// Supported targets:
+ define("ARCH_MAC_ARM", "Apple Silicon");
+ define("ARCH_MAC_X86", "Intel");
define("LABEL_WIN", "Microsoft Windows");
define("LABEL_MAC", "Apple macOS");
define("SUPPORTED_WIN", "8/10/11");
- define("SUPPORTED_MAC", "≥ 10.13â\"High Sierra\"");
+ define("SUPPORTED_MAC_ARM", "≥ 11â\"Big Sur\"");
+ define("SUPPORTED_MAC_X86", "≥ 10.13â\"High Sierra\"");
// Frozen versions:
$show_historical = True;
$last_win7_version = "3.11"; //Still used in download block on index.phtml
@@ -60,7 +64,8 @@
$last_win7="gnucash-".$last_win7_version.".setup.exe";
$last_xp_vista="gnucash-".$last_xp_vista_version."-setup.exe";
$last_win2k="gnucash-".$last_win2k_version."-setup.exe";
- $latest_stable_mac_intel="Gnucash-Intel-".$latest_stable_mac_intel.".dmg";
+ $latest_stable_mac_arm="Gnucash-Arm-".$latest_stable_mac_arm.".dmg";
+ $latest_stable_mac_x86="Gnucash-Intel-".$latest_stable_mac_x86.".dmg";
$last_mac_sierra="Gnucash-Intel-".$last_mac_sierra.".dmg";
$last_mac_ppc="Gnucash-PPC-".$last_mac_ppc.".dmg";
$latest_stable_source="gnucash-".$tarball.".tar.bz2";
diff --git a/images/icons/apple-silver-32.png b/images/icons/apple-silver-32.png
new file mode 100644
index 0000000..6f52f80
Binary files /dev/null and b/images/icons/apple-silver-32.png differ
diff --git a/index.phtml b/index.phtml
index d96c45d..f0b6493 100644
--- a/index.phtml
+++ b/index.phtml
@@ -25,9 +25,10 @@ include ("externals/menu.phtml");
<li><img alt="windows" src="<?=$top_dir?>/images/icons/windows.png" style="vertical-align: middle;"/> <?=\LABEL_WIN?>
<a
href="<?=$latest_stable_path.$latest_stable_win?>"><?=\SUPPORTED_WIN?></a></li>
- <li><img alt="Apple Logo" src="<?=$top_dir?>/images/icons/apple_logo.png" style="vertical-align: middle;"/> <?=\LABEL_MAC?>
- <a
- href="<?=$latest_stable_path.$latest_stable_mac_intel?>"><?=\SUPPORTED_MAC?></a></li>
+ <li><img alt="Apple Logo" src="<?=$top_dir?>/images/icons/apple-silver-32.png" style="vertical-align: middle;"/> <?=\LABEL_MAC." ".\ARCH_MAC_ARM?>
+ <a href="<?=$latest_stable_path.$latest_stable_mac_arm?>"><?=\SUPPORTED_MAC_ARM?></a></li>
+ <li><img alt="Apple Logo" src="<?=$top_dir?>/images/icons/apple_logo.png" style="vertical-align: middle;"/> <?=\LABEL_MAC." ".\ARCH_MAC_X86?>
+ <a href="<?=$latest_stable_path.$latest_stable_mac_x86?>"><?=\SUPPORTED_MAC_X86?></a></li>
<li><a href="<?=$home?>/download.phtml" style="font-size: 80%;"><?=T_("More downloads (Source code, Development â¦)")?></a></li>
</ul>
</div>
diff --git a/news/240707-5.8.news b/news/240707-5.8.news
index 2bd2201..4c1e39f 100644
--- a/news/240707-5.8.news
+++ b/news/240707-5.8.news
@@ -37,6 +37,7 @@
<li><code>a2c823fb700b9d4598692ec81394959bde388d8ef191efe4ea2c02426bb52593</code> gnucash-5.8.tar.bz2</li>
<li><code>b00cff635e8bc8ff996a9f7942fd92414f13ccf3415402cc33220ee58d6f12b8</code> gnucash-5.8.tar.gz</li>
<li><code>a8fdeab6ea49dfb78fa5f6b638005b3e392a8d87c1ed6bc9b0f56ebb48eaa48f</code> gnucash-5.8-1.setup.exe</li>
+ <li><code>3b736455e7c2f26324f4968c475bb1b858e243269fdcb676091fa99b51cd7e98</code> Gnucash-Arm-5.8-1.dmg</li>
<li><code>ddfbbecc87db276dc30a164a90b51189702215d4326160346824cb69d7f0ffe9</code> Gnucash-Intel-5.8-2.dmg</li>
<li><code>b8f344ec5824090669f93e9ba3ecfafecd55462a5ff1b2d323d7a9c8f9aa5a3f</code> gnucash-docs-5.8.tar.gz</li>
</ul>
@@ -45,12 +46,14 @@
<li>SourceForge:
<ul>
<li><a href="https://downloads.sourceforge.net/gnucash/gnucash%20%28stable%29/5.8/gnucash-5.8-1.setup.exe">Win32</a></li>
- <li><a href="https://downloads.sourceforge.net/gnucash/gnucash%20%28stable%29/5.8/Gnucash-Intel-5.8-1.dmg">Mac-Intel</a></li>
+ <li><a href="https://downloads.sourceforge.net/gnucash/gnucash%20%28stable%29/5.8/Gnucash-Arm-5.8-1.dmg">Mac-Intel</a></li>
+ <li><a href="https://downloads.sourceforge.net/gnucash/gnucash%20%28stable%29/5.8/Gnucash-Intel-5.8-2.dmg">Mac-Intel</a></li>
</ul></li>
<li>Github
<ul>
<li><a href="https://github.com/Gnucash/gnucash/releases/download/5.8/gnucash-5.8-1.setup.exe">Win32</a></li>
- <li><a href="https://github.com/Gnucash/gnucash/releases/download/5.8/Gnucash-Intel-5.8-1.dmg">Mac-Intel</a></li>
+ <li><a href="https://github.com/Gnucash/gnucash/releases/download/5.8/Gnucash-Arm-5.8-1.dmg">Mac-Intel</a></li>
+ <li><a href="https://github.com/Gnucash/gnucash/releases/download/5.8/Gnucash-Intel-5.8-2.dmg">Mac-Intel</a></li>
</ul></li></ul>
<h3>Getting GnuCash as source code</h3>
Summary of changes:
externals/global_params.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list