From 9071e19ee665064407005a6c9526bdba5a9d46a1 Mon Sep 17 00:00:00 2001
From: Peter Oliver <gitlab.com@mavit.org.uk>
Date: Mon, 20 Jan 2025 05:32:25 +0000
Subject: [PATCH] Emacs 30.0.93

---
 metadata/org.gnu.emacs.yml | 129 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 127 insertions(+), 2 deletions(-)

diff --git a/metadata/org.gnu.emacs.yml b/metadata/org.gnu.emacs.yml
index 17b7ca49f5..5a1dba966a 100644
--- a/metadata/org.gnu.emacs.yml
+++ b/metadata/org.gnu.emacs.yml
@@ -458,6 +458,118 @@ Builds:
       - make all
     ndk: r25c
 
+  - versionName: 30.0.93
+    versionCode: 300093000
+    commit: 68bcabf58afddb377d172857ce7648ad3ff09618
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc libncurses-dev autoconf texinfo g++
+    output: java/emacs-*.apk
+    prebuild:
+      - sed -i 's/android:versionCode="[^"]*"/android:versionCode="$$VERCODE$$"/'
+        java/AndroidManifest.xml.in
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0'
+    scanignore:
+      - admin/charsets/glibc/*.gz
+      - build-aux/dir_top
+    scandelete:
+      - test
+      - etc/e
+    build:
+      - cd etc/e
+      - tic -o ../ ./eterm-color.ti
+      - cd -
+      - ./autogen.sh
+      - ./configure --with-android=$$SDK$$/platforms/android-34/android.jar ANDROID_CC=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android22-clang
+        SDK_BUILD_TOOLS=$$SDK$$/build-tools/34.0.0 --with-gnutls=ifavailable --without-android-debug
+      - make all
+    ndk: r25c
+
+  - versionName: 30.0.93
+    versionCode: 300093001
+    commit: 68bcabf58afddb377d172857ce7648ad3ff09618
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc libncurses-dev autoconf texinfo g++
+    output: java/emacs-*.apk
+    prebuild:
+      - sed -i 's/android:versionCode="[^"]*"/android:versionCode="$$VERCODE$$"/'
+        java/AndroidManifest.xml.in
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0'
+    scanignore:
+      - admin/charsets/glibc/*.gz
+      - build-aux/dir_top
+    scandelete:
+      - test
+      - etc/e
+    build:
+      - cd etc/e
+      - tic -o ../ ./eterm-color.ti
+      - cd -
+      - ./autogen.sh
+      - ./configure --with-android=$$SDK$$/platforms/android-34/android.jar ANDROID_CC=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi22-clang
+        SDK_BUILD_TOOLS=$$SDK$$/build-tools/34.0.0 --with-gnutls=ifavailable --without-android-debug
+      - make all
+    ndk: r25c
+
+  - versionName: 30.0.93
+    versionCode: 300093002
+    commit: 68bcabf58afddb377d172857ce7648ad3ff09618
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc libncurses-dev autoconf texinfo g++
+    output: java/emacs-*.apk
+    prebuild:
+      - sed -i 's/android:versionCode="[^"]*"/android:versionCode="$$VERCODE$$"/'
+        java/AndroidManifest.xml.in
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0'
+    scanignore:
+      - admin/charsets/glibc/*.gz
+      - build-aux/dir_top
+    scandelete:
+      - test
+      - etc/e
+    build:
+      - cd etc/e
+      - tic -o ../ ./eterm-color.ti
+      - cd -
+      - ./autogen.sh
+      - ./configure --with-android=$$SDK$$/platforms/android-34/android.jar ANDROID_CC=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android22-clang
+        SDK_BUILD_TOOLS=$$SDK$$/build-tools/34.0.0 --with-gnutls=ifavailable --without-android-debug
+      - make all
+    ndk: r25c
+
+  - versionName: 30.0.93
+    versionCode: 300093003
+    commit: 68bcabf58afddb377d172857ce7648ad3ff09618
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc libncurses-dev autoconf texinfo g++
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0'
+      - sed -i 's/android:versionCode="[^"]*"/android:versionCode="$$VERCODE$$"/'
+        java/AndroidManifest.xml.in
+    scanignore:
+      - admin/charsets/glibc/*.gz
+      - build-aux/dir_top
+    scandelete:
+      - test
+      - etc/e
+    build:
+      - cd etc/e
+      - tic -o ../ ./eterm-color.ti
+      - cd -
+      - ./autogen.sh
+      - ./configure --with-android=$$SDK$$/platforms/android-34/android.jar ANDROID_CC=$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang
+        SDK_BUILD_TOOLS=$$SDK$$/build-tools/34.0.0 --with-gnutls=ifavailable --without-android-debug
+      - make all
+    ndk: r25c
+
 MaintainerNotes: |-
   Build instructions can be found at:
   https://git.savannah.gnu.org/cgit/emacs.git/tree/java/INSTALL
@@ -474,6 +586,19 @@ MaintainerNotes: |-
   x86_64 - 2
   arm64-v8a - 3
 
+  We would like to set something along the lines of the following, but
+  cannot, because we currently have no way of automatically detecting a
+  suitable version code.  It is permanently set to 30 in
+  java/AndroidManifest.xml.in.
+
+  AutoUpdateMode: Version
+  UpdateCheckMode: Tags ^emacs-(\d+\.[1-9]|30\.0)
+  UpdateCheckData: java/AndroidManifest.xml.in|android:versionCode="(\d+)"||^emacs-([\d.]+)$
+
+  UpdateCheckMode here is set so that prereleases are ignored, except
+  for those leading up to Emacs 30 (which will be the first version to
+  support Android).
+
   Scangnored files:
   * admin/charsets/glibc/*.gz - contains gzipped charsets which are needed
     for the build;
@@ -489,5 +614,5 @@ MaintainerNotes: |-
 ArchivePolicy: 12
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 30.0.50
-CurrentVersionCode: 300050033
+CurrentVersion: 30.0.93
+CurrentVersionCode: 300093003