Emacs packaging

repetitivestrain · February 12, 2025, 1:14pm

I should clarify that these notes are already there in the existing recipe:

MaintainerNotes: |-
  Build instructions can be found at:
  https://git.savannah.gnu.org/cgit/emacs.git/tree/java/INSTALL

  VersionCode is substituted based on versionCode in the
  build section.
  VersionCode is based on versionName with 2 digits for each of
  major version, minor version, patch.
  Three numbers are appended to the end of versionCode, two to account for builds until
  the release of GNU Emacs 30 and one to differentiate builds for each architecture:

  x86 - 0
  armeabi-v7a - 1
  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;
  * build-aux/dir_top - page for emacs' info system, which contains an ASCII
    control character and falsely reported as binary.

  Scandeleted files:
  * test - contains multiple gzip-compressed files related to tests,
    not needed for the build;
  * etc/e - contains prebuilt terminfo data, which is deleted and built
    again during the build.

ArchivePolicy: 12
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: 30.0.93
CurrentVersionCode: 300093003

repetitivestrain · February 12, 2025, 1:15pm

A typo, sorry. It should be fixed here.

diff --git a/metadata/org.gnu.emacs.yml b/metadata/org.gnu.emacs.yml
index 5a1dba966a..4d48ee6ca0 100644
--- a/metadata/org.gnu.emacs.yml
+++ b/metadata/org.gnu.emacs.yml
@@ -6,7 +6,7 @@ AuthorName: GNU Project
 WebSite: https://www.gnu.org/software/emacs/
 SourceCode: https://git.savannah.gnu.org/cgit/emacs.git/tree/
 IssueTracker: https://debbugs.gnu.org/
-Changelog: https://git.savannah.gnu.org/cgit/emacs.git/tree/ChangeLog.android?h=feature/android
+Changelog: https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30
 Donate: https://my.fsf.org/donate/
 
 Description: |-
@@ -25,13 +25,16 @@ Description: |-
   * A wide range of functionality beyond text editing, including a project planner, mail and news reader, debugger interface, calendar, IRC client, and more;
   * A packaging system for downloading and installing extensions.
 
-  Android notes:
-  * System keyboard can be invoked by tapping on a non read-only buffer;
-  * Permissions are not granted by default, they must be explicitly enabled in system settings menu;
-  * Android version of emacs is built without GNUTLS support;
+  Notes regarding Android support:
+
+  * The on-screen keyboard is automatically invoked when a non read-only buffer is tapped, and the user option `touch-screen-display-keyboard' arranges for it always to be displayed.
+  * `modifier-bar-mode' may be enabled to display a panel of modifier keys beside the tool bar.
+  * Permissions are not granted by default, but must be explicitly enabled in system settings menu.
+  * External storage permissions may be granted by observing the instructions in the banner that is displayed on the splash screen if they are denied.
+  * Answers to other questions probably exist in the Android appendix to the bundled Emacs manual.  Read it!
 
 RepoType: git
-Repo: git://git.savannah.gnu.org/emacs.git
+Repo: https://git.savannah.gnu.org/git/emacs.git
 
 Builds:
   - versionName: 30.0.50
@@ -570,6 +573,147 @@ Builds:
       - make all
     ndk: r25c
 
+  - versionName: 30.0.93
+    versionCode: 300093010
+    commit: ea3a937176fbf038a6f6f5cc7b47fb8cecdd894a
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc m4 libncurses-dev autoconf texinfo g++ git nasm
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0' 'ndk;26.3.11579264'
+      - 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 -
+      - mkdir emacs_deps
+      - cd emacs_deps
+      - /bin/bash ../admin/download-android-deps.sh 64
+      - cd ..
+      - ./autogen.sh
+      - export deps=`pwd`/emacs_deps
+      - ./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 --without-android-debug
+         --with-ndk-path="`cat $deps/search-path.txt`" --with-gif --with-xml2 --with-jpeg --with-png --with-sqlite3 --with-webp --with-gnutls --with-tiff --with-selinux --with-tree-sitter --with-harfbuzz
+      - make all
+    ndk: 26.3.11579264
+
+  - versionName: 30.0.93
+    versionCode: 300093011
+    commit: ea3a937176fbf038a6f6f5cc7b47fb8cecdd894a
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc m4 libncurses-dev autoconf texinfo g++ git
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0' 'ndk;26.3.11579264'
+      - 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 -
+      - mkdir emacs_deps
+      - cd emacs_deps
+      - /bin/bash ../admin/download-android-deps.sh 64
+      - cd ..
+      - ./autogen.sh
+      - export deps=`pwd`/emacs_deps
+      - ./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 --without-android-debug
+         --with-ndk-path="`cat $deps/search-path.txt`" --with-gif --with-xml2 --with-jpeg --with-png --with-sqlite3 --with-webp --with-gnutls --with-tiff --with-selinux --with-tree-sitter --with-harfbuzz
+      - make all
+    ndk: 26.3.11579264
+
+  - versionName: 30.0.93
+    versionCode: 300093012
+    commit: ea3a937176fbf038a6f6f5cc7b47fb8cecdd894a
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc m4 libncurses-dev autoconf texinfo g++ git nasm
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0' 'ndk;26.3.11579264'
+      - 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 -
+      - mkdir emacs_deps
+      - cd emacs_deps
+      - /bin/bash ../admin/download-android-deps.sh 64
+      - cd ..
+      - ./autogen.sh
+      - export deps=`pwd`/emacs_deps
+      - ./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 --without-android-debug
+         --with-ndk-path="`cat $deps/search-path.txt`" --with-gif --with-xml2 --with-jpeg --with-png --with-sqlite3 --with-webp --with-gnutls --with-tiff --with-selinux --with-tree-sitter --with-harfbuzz
+      - make all
+    ndk: 26.3.11579264
+
+  - versionName: 30.0.93
+    versionCode: 300093013
+    commit: ea3a937176fbf038a6f6f5cc7b47fb8cecdd894a
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc m4 libncurses-dev autoconf texinfo g++ git
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0' 'ndk;26.3.11579264'
+      - 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 -
+      - mkdir emacs_deps
+      - cd emacs_deps
+      - /bin/bash ../admin/download-android-deps.sh 64
+      - cd ..
+      - ./autogen.sh
+      - export deps=`pwd`/emacs_deps
+      - ./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 --without-android-debug
+         --with-ndk-path="`cat $deps/search-path.txt`" --with-gif --with-xml2 --with-jpeg --with-png --with-sqlite3 --with-webp --with-gnutls --with-tiff --with-selinux --with-tree-sitter --with-harfbuzz
+      - make all
+    ndk: 26.3.11579264
+
 MaintainerNotes: |-
   Build instructions can be found at:
   https://git.savannah.gnu.org/cgit/emacs.git/tree/java/INSTALL

linsui · February 12, 2025, 1:15pm

We need a version code to extract. Can you put it in the file somewhere? Even a comment besides the version name would work.

repetitivestrain · February 12, 2025, 1:17pm

I shall see. But can’t it be generated automatically from the version code? We guarantee a consistent format for the version code: major.0.patch for pre-releases, and major.minor for regular releases, which lends itself naturally to numerical version codes.

linsui · February 12, 2025, 1:20pm

Currently it’s not supported. We can only extract it with regex.

repetitivestrain · February 12, 2025, 1:21pm

I see. I’ll try to accommodate you then (but it is so close to the release of Emacs 30 that these non-trivial changes to administrative procedures will probably not make it into 30.1).

linsui · February 12, 2025, 1:36pm

No hurry, before we setup autoupdate for emacs you just need to ping us for new versions.

jindam.vani · February 12, 2025, 1:46pm

@repetitivestrain

account on forum is certainly +
you are emacs android port developer!
i kind of following this closely
please confirm
- that patches are only to auto update on fdroid
- i can easily downgrade if any issues crop up

repetitivestrain · February 12, 2025, 1:47pm

I’m terribly sorry, but there’s another typo. This should fix 32-bit builds.

diff --git a/metadata/org.gnu.emacs.yml b/metadata/org.gnu.emacs.yml
index 5a1dba966a..370f2d934e 100644
--- a/metadata/org.gnu.emacs.yml
+++ b/metadata/org.gnu.emacs.yml
@@ -6,7 +6,7 @@ AuthorName: GNU Project
 WebSite: https://www.gnu.org/software/emacs/
 SourceCode: https://git.savannah.gnu.org/cgit/emacs.git/tree/
 IssueTracker: https://debbugs.gnu.org/
-Changelog: https://git.savannah.gnu.org/cgit/emacs.git/tree/ChangeLog.android?h=feature/android
+Changelog: https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30
 Donate: https://my.fsf.org/donate/
 
 Description: |-
@@ -25,13 +25,16 @@ Description: |-
   * A wide range of functionality beyond text editing, including a project planner, mail and news reader, debugger interface, calendar, IRC client, and more;
   * A packaging system for downloading and installing extensions.
 
-  Android notes:
-  * System keyboard can be invoked by tapping on a non read-only buffer;
-  * Permissions are not granted by default, they must be explicitly enabled in system settings menu;
-  * Android version of emacs is built without GNUTLS support;
+  Notes regarding Android support:
+
+  * The on-screen keyboard is automatically invoked when a non read-only buffer is tapped, and the user option `touch-screen-display-keyboard' arranges for it always to be displayed.
+  * `modifier-bar-mode' may be enabled to display a panel of modifier keys beside the tool bar.
+  * Permissions are not granted by default, but must be explicitly enabled in system settings menu.
+  * External storage permissions may be granted by observing the instructions in the banner that is displayed on the splash screen if they are denied.
+  * Answers to other questions probably exist in the Android appendix to the bundled Emacs manual.  Read it!
 
 RepoType: git
-Repo: git://git.savannah.gnu.org/emacs.git
+Repo: https://git.savannah.gnu.org/git/emacs.git
 
 Builds:
   - versionName: 30.0.50
@@ -570,6 +573,147 @@ Builds:
       - make all
     ndk: r25c
 
+  - versionName: 30.0.93
+    versionCode: 300093010
+    commit: ea3a937176fbf038a6f6f5cc7b47fb8cecdd894a
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc m4 libncurses-dev autoconf texinfo g++ git nasm
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0' 'ndk;26.3.11579264'
+      - 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 -
+      - mkdir emacs_deps
+      - cd emacs_deps
+      - /bin/bash ../admin/download-android-deps.sh 32
+      - cd ..
+      - ./autogen.sh
+      - export deps=`pwd`/emacs_deps
+      - ./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 --without-android-debug
+         --with-ndk-path="`cat $deps/search-path.txt`" --with-gif --with-xml2 --with-jpeg --with-png --with-sqlite3 --with-webp --with-gnutls --with-tiff --with-selinux --with-tree-sitter --with-harfbuzz
+      - make all
+    ndk: 26.3.11579264
+
+  - versionName: 30.0.93
+    versionCode: 300093011
+    commit: ea3a937176fbf038a6f6f5cc7b47fb8cecdd894a
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc m4 libncurses-dev autoconf texinfo g++ git
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0' 'ndk;26.3.11579264'
+      - 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 -
+      - mkdir emacs_deps
+      - cd emacs_deps
+      - /bin/bash ../admin/download-android-deps.sh 32
+      - cd ..
+      - ./autogen.sh
+      - export deps=`pwd`/emacs_deps
+      - ./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 --without-android-debug
+         --with-ndk-path="`cat $deps/search-path.txt`" --with-gif --with-xml2 --with-jpeg --with-png --with-sqlite3 --with-webp --with-gnutls --with-tiff --with-selinux --with-tree-sitter --with-harfbuzz
+      - make all
+    ndk: 26.3.11579264
+
+  - versionName: 30.0.93
+    versionCode: 300093012
+    commit: ea3a937176fbf038a6f6f5cc7b47fb8cecdd894a
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc m4 libncurses-dev autoconf texinfo g++ git nasm
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0' 'ndk;26.3.11579264'
+      - 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 -
+      - mkdir emacs_deps
+      - cd emacs_deps
+      - /bin/bash ../admin/download-android-deps.sh 64
+      - cd ..
+      - ./autogen.sh
+      - export deps=`pwd`/emacs_deps
+      - ./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 --without-android-debug
+         --with-ndk-path="`cat $deps/search-path.txt`" --with-gif --with-xml2 --with-jpeg --with-png --with-sqlite3 --with-webp --with-gnutls --with-tiff --with-selinux --with-tree-sitter --with-harfbuzz
+      - make all
+    ndk: 26.3.11579264
+
+  - versionName: 30.0.93
+    versionCode: 300093013
+    commit: ea3a937176fbf038a6f6f5cc7b47fb8cecdd894a
+    timeout: 15000
+    sudo:
+      - apt-get update
+      - apt-get install -y make gcc m4 libncurses-dev autoconf texinfo g++ git
+    output: java/emacs-*.apk
+    prebuild:
+      - sdkmanager 'platforms;android-34' 'build-tools;34.0.0' 'ndk;26.3.11579264'
+      - 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 -
+      - mkdir emacs_deps
+      - cd emacs_deps
+      - /bin/bash ../admin/download-android-deps.sh 64
+      - cd ..
+      - ./autogen.sh
+      - export deps=`pwd`/emacs_deps
+      - ./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 --without-android-debug
+         --with-ndk-path="`cat $deps/search-path.txt`" --with-gif --with-xml2 --with-jpeg --with-png --with-sqlite3 --with-webp --with-gnutls --with-tiff --with-selinux --with-tree-sitter --with-harfbuzz
+      - make all
+    ndk: 26.3.11579264
+
 MaintainerNotes: |-
   Build instructions can be found at:
   https://git.savannah.gnu.org/cgit/emacs.git/tree/java/INSTALL

linsui · February 12, 2025, 4:30pm

Please check if the apk built by the CI works correctly.

Licaon_Kter · February 12, 2025, 4:33pm

@repetitivestrain CI APK link for arm64: https://gitlab.com/linsui/fdroiddata/-/jobs/9117303543/artifacts/raw/tmp/org.gnu.emacs_300093013.apk that you need o sign first

linsui · February 12, 2025, 4:36pm

And maybe you’d like to write something for TWIF.

repetitivestrain · February 13, 2025, 1:13am

This functions correctly, thanks.

repetitivestrain · February 13, 2025, 1:13am

Glad to oblige.

jindam.vani · February 19, 2025, 2:30am

@repetitivestrain @linsui

does Version 30.0.93 (300093011) enabled gnutls?
i am on arm v7
please add all features which are enabled or compiled and which are yet to be enabled or compiled in this post or twif post
on Version 30.0.93 (300093001) newsticker update fails with tls deprecated error, but it works fine on termux version!
please consider

repetitivestrain · February 19, 2025, 2:43am

The answer is yes, and why don’t you install the upgrade and see for yourself, or read the history of this thread? Pray don’t expect everyone to be constantly on call to answer every single question of yours.

jindam.vani · February 19, 2025, 5:24am

The answer is yes, and why don’t you install the upgrade and see for yourself

recently data charges have skyrockected
consuming data strictly if
absolutely necessary
upgrades will be done only
if it is absolutely necessary
thanks for confirming

or read the history of this thread? Pray don’t expect everyone to be constantly on call to answer every single question of yours.

Visit Topic or reply to this email to respond.

To unsubscribe from these emails, click here.

regards,
జిందం వాఐి [ jindam, vani ]

web_ jivani.neocities.org
[matrix]_ @jindam:catgirl.cloud

jindam.vani · February 19, 2025, 5:29am

my init code:

(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won’t work right.
'(backup-by-copying t)
'(custom-enabled-themes '(modus-operandi-tinted))
'(delete-old-versions t)
'(global-display-line-numbers-mode t)
'(indent-tabs-mode nil)
'(initial-buffer-choice “/sdcard/”)
'(kept-new-versions 3)
'(kept-old-versions 3)
'(make-backup-files t)
'(modifier-bar-mode t)
'(pop-up-frames 'graphic-only)
'(tab-width 4)
'(tool-bar-position 'bottom)
'(touch-screen-display-keyboard t)
'(touch-screen-extend-selection t)
'(touch-screen-word-select t)
'(truncate-lines nil)
'(version-control t))

(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won’t work right.
)

;; removed settings
;; '(desktop-save-mode t)

regards,
జిందం వాఐి [ jindam, vani ]

web_ jivani.neocities.org
[matrix]_ @jindam:catgirl.cloud

repetitivestrain · February 20, 2025, 3:56pm

Emacs 30.1-rc1 has been released. Updating the F-Droid recipe should be a simple matter of bumping the revision hashes.

Licaon_Kter · February 20, 2025, 4:04pm

we’ll see in the next EU morning