fix(x11/rnote): Fix compilation #21524

EDLLT · 2024-09-20T18:08:20Z

Thanks @Biswa96 @TomJo2000 @Doublonmousse @romanovj @askorbinovaya-kislota and everyone else for your help

EDLLT · 2024-09-20T18:27:00Z

Seems like it needs tabs for indentation
I need to sleep now, I'll probably fix it tmrw

TomJo2000

This looks very close to being done,
I do have a couple housekeeping items we need to take care of though.

^{(This is a pre-written, saved reply.)}
Also please make sure to keep your commits squashed.
For adding to a single commit you can use git commit --amend.
Since you already have multiple commits on your branch though,
you'll need to squash those with git rebase -i HEAD~<n> first.
^{(Where <n> is the number of commits you want to modify.

Please make sure to only modify your commits.)}
https://www.baeldung.com/ops/git-squash-commits#1-squash-the-last-x-commits

Since squashing or amending commits changes the git history you will need to force push any such changes.
e.g. git push --force,
or preferably git push --force-with-lease=branchname
to make sure you aren't clobbering any refs you haven't fetched locally yet.

x11-packages/rnote/build.sh

TomJo2000 · 2024-09-20T19:03:57Z

x11-packages/rnote/build.sh

+	local _version="0.21.4"
+	local _url="https://github.com/gettext-rs/gettext-rs/archive/refs/tags/gettext-sys-$_version.tar.gz"
+	local _path="$TERMUX_PKG_CACHEDIR/gettext-v$_version.tar.gz"
+	termux_download "$_url" "$_path" SKIP_CHECKSUM


Since we're downloading from a Github release tarball, please include the checksum.

Suggested change

termux_download "$_url" "$_path" SKIP_CHECKSUM

_sha256="211773408ab61880b94a0ea680785fc21fad307cd42594d547cf5a056627fcda"

termux_download "$_url" "$_path" "$_sha256"

TomJo2000 · 2024-09-20T19:04:51Z

x11-packages/rnote/build.sh

+
+	# Fetch latest and greatest gettext from upstream and place it inside gettext-source/gettext-sys
+	local _upstream_source_version="0.22.5"
+	wget "https://mirrors.kernel.org/gnu/gettext/gettext-${_upstream_source_version}.tar.xz" -P "$TERMUX_PKG_SRCDIR/gettext-source/gettext-sys"


Please use termux_download here as well.

TomJo2000 · 2024-09-20T19:10:41Z

x11-packages/rnote/build.sh

+
+__patch_gettext_rs() {
+    # Patch gettext-rs crate to use a newer gettext version because the old one doesn't compile properly with clang
+    patch -p1 -d "$TERMUX_PKG_SRCDIR/gettext-source" < "$TERMUX_PKG_BUILDER_DIR"/gettext-rs-crate-patch.diff


Use -i to specify the input patch file instead of redirecting it in.

Bash would be an example for this usage.

termux-packages/packages/bash/build.sh

Lines 72 to 81 in 7021972

PATCH_CHECKSUMS[032]=7b9c77daeca93ff711781d7537234166e83ed9835ce1ee7dcd5742319c372a16

for PATCH_NUM in $(seq -f '%03g' ${_PATCH_VERSION}); do

PATCHFILE=$TERMUX_PKG_CACHEDIR/bash_patch_${PATCH_NUM}.patch

termux_download \

"https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}-patches/bash${_MAIN_VERSION/./}-$PATCH_NUM" \

$PATCHFILE \

${PATCH_CHECKSUMS[$PATCH_NUM]}

patch -p0 -i $PATCHFILE

done

Though in that case we are downloading upstream patches, since that's how Bash does bugfix releases.

TomJo2000 · 2024-09-20T19:19:05Z

x11-packages/rnote/build.sh

+
+termux_step_post_make_install() {
+    cd "${TERMUX_PKG_SRCDIR}"
+	install -Dm755 "target/$CARGO_TARGET_NAME/release/rnote" -t "$TERMUX_PREFIX/bin"


Going by what is included in Arch Linux's rnote package we also want to include:

/bin/rnote-cli

/share/fonts/rnote-fonts/*

/share/glib-2.0/schemas/com.github.flxzt.rnote.gschema.xml

/share/icons/hicolor/scalable/apps/com.github.flxzt.rnote.svg

/share/icons/hicolor/scalable/mimetypes/application-rnote.svg

/share/icons/hicolor/symbolic/apps/com.github.flxzt.rnote-symbolic.svg

/share/locale/*/LC_MESSAGES/rnote.mo
^{Although this may not apply since Android doesn't have proper locale support}

/share/metainfo/com.github.flxzt.rnote.metainfo.xml

/share/mime/packages/com.github.flxzt.rnote.xml

/share/rnote/*
Mentally prepend $TERMUX_PREFIX to each of those locations

I'll update these with the location they get compiled to later after I do a local build.

TomJo2000 · 2024-09-20T19:23:31Z

x11-packages/rnote/remove-rodio-audio.patch

Why are we disabling sound?
Unless PulseAudio causes compilation issues please leave it enabled.

If it is causing compilation issues, turning it off for now will be fine,
but having working sound would be a worthwhile enhancement to add later.

TomJo2000 · 2024-09-20T19:26:30Z

x11-packages/rnote/disable-cargo-command-meson.build.patch

+         gtk_update_icon_cache: true,
+         update_desktop_database: true,
+-        update_mime_database: true,
+        update_mime_database: false,


The MIME database defintely works on Termux, so please leave it enabled if it doesn't cause a build failure.

TomJo2000 · 2024-09-20T19:28:31Z

x11-packages/rnote/build.sh

+TERMUX_PKG_HOMEPAGE="https://github.com/flxzt/rnote"
+TERMUX_PKG_DESCRIPTION="An infinite canvas vector-based drawing application for handwritten notes"
+TERMUX_PKG_LICENSE="GPL-3.0"
+TERMUX_PKG_MAINTAINER="@termux"


Since there are quite extensive patches included with this package please consider setting yourself as the maintainer.

Suggested change

TERMUX_PKG_MAINTAINER="@termux"

TERMUX_PKG_MAINTAINER="TERMUX_PKG_MAINTAINER="<Name or Pseudonym> @EDLLT"

TomJo2000 · 2024-09-20T19:33:30Z

Almost forgot the most important thing.

A huge thanks to you for your work and contribution.

TomJo2000

Missed a couple things on the initial pass.

TomJo2000 · 2024-09-20T19:37:10Z

x11-packages/rnote/build.sh

+TERMUX_PKG_BUILD_DEPENDS="libiconv"
+
+__fetch_gettext_rs() {
+    # This version is relative to gettext-sys provided by the gettext-rs crate


Gonna need tabs here as well.

Suggested change

# This version is relative to gettext-sys provided by the gettext-rs crate

# This version is relative to gettext-sys provided by the gettext-rs crate

TomJo2000 · 2024-09-20T19:37:41Z

x11-packages/rnote/build.sh

+}
+
+__patch_gettext_rs() {
+    # Patch gettext-rs crate to use a newer gettext version because the old one doesn't compile properly with clang


Suggested change

# Patch gettext-rs crate to use a newer gettext version because the old one doesn't compile properly with clang

# Patch gettext-rs crate to use a newer gettext version because the old one doesn't compile properly with clang

TomJo2000 · 2024-09-20T19:37:50Z

x11-packages/rnote/build.sh

+
+__patch_gettext_rs() {
+    # Patch gettext-rs crate to use a newer gettext version because the old one doesn't compile properly with clang
+    patch -p1 -d "$TERMUX_PKG_SRCDIR/gettext-source" < "$TERMUX_PKG_BUILDER_DIR"/gettext-rs-crate-patch.diff


Suggested change

patch -p1 -d "$TERMUX_PKG_SRCDIR/gettext-source" < "$TERMUX_PKG_BUILDER_DIR"/gettext-rs-crate-patch.diff

patch -p1 -d "$TERMUX_PKG_SRCDIR/gettext-source" < "$TERMUX_PKG_BUILDER_DIR"/gettext-rs-crate-patch.diff

TomJo2000 · 2024-09-20T19:39:08Z

x11-packages/rnote/build.sh

+}
+
+termux_step_post_make_install() {
+    cd "${TERMUX_PKG_SRCDIR}"


Instead of cd-ing, use the absolute path.

Suggested change

cd "${TERMUX_PKG_SRCDIR}"

install -Dm755 "${TERMUX_PKG_SRCDIR}/target/$CARGO_TARGET_NAME/release/rnote" -t "$TERMUX_PREFIX/bin"

TomJo2000 · 2024-09-20T19:42:11Z

x11-packages/rnote/build.sh

+termux_step_make() {
+    termux_setup_rust
+
+    cd "${TERMUX_PKG_SRCDIR}"


~~We can also get rid of this cd by using TERMUX_PKG_BUILD_IN_SRC=true in the control variable above.~~

nvm I'm stupid we can't do that here.

TomJo2000 · 2024-09-20T19:44:05Z

x11-packages/rnote/build.sh

+}
+
+termux_step_make() {
+    termux_setup_rust


This should probably be moved to termux_step_pre_configure() since it's setup.

TomJo2000 · 2024-09-20T21:00:00Z

x11-packages/rnote/gettext-rs-crate-patch.diff

The patches should either all be called *.diff or *.patch, so since the other patches are all *.patch, it would be good to rename this one.

Nvm, I see now , forgot that *.patch files get applied automatically.
Disregard my previous comment.

TomJo2000 · 2024-09-20T23:40:49Z

Alright I have it building locally.
And I've done most of the cleanup I mentioned above.
Will be pushing that shortly.

temporary commit, refactor build script

EDLLT requested review from finagolfin and Grimler91 as code owners September 20, 2024 18:08

EDLLT mentioned this pull request Sep 20, 2024

Android Version flxzt/rnote#390

Open

TomJo2000 requested changes Sep 20, 2024

View reviewed changes

TomJo2000 requested a review from Biswa96 September 20, 2024 19:34

TomJo2000 reviewed Sep 20, 2024

View reviewed changes

Biswa96 and others added 2 commits September 21, 2024 01:40

addpkg(x11/rnote): 0.11.0

8ba8d33

fix(x11/rnote): Fix compilation

a029cc2

TomJo2000 force-pushed the rnote branch from 4caf872 to a029cc2 Compare September 20, 2024 23:40

addpkg(x11/rnote): 0.11.0

d7e60ce

temporary commit, refactor build script

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(x11/rnote): Fix compilation #21524

fix(x11/rnote): Fix compilation #21524

EDLLT commented Sep 20, 2024

EDLLT commented Sep 20, 2024 •

edited

Loading

TomJo2000 left a comment

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 commented Sep 20, 2024

TomJo2000 left a comment

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024 •

edited

Loading

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 Sep 20, 2024

TomJo2000 commented Sep 20, 2024

	termux_download "$_url" "$_path" SKIP_CHECKSUM
	_sha256="211773408ab61880b94a0ea680785fc21fad307cd42594d547cf5a056627fcda"
	termux_download "$_url" "$_path" "$_sha256"

	PATCH_CHECKSUMS[032]=7b9c77daeca93ff711781d7537234166e83ed9835ce1ee7dcd5742319c372a16

	for PATCH_NUM in $(seq -f '%03g' ${_PATCH_VERSION}); do
	PATCHFILE=$TERMUX_PKG_CACHEDIR/bash_patch_${PATCH_NUM}.patch
	termux_download \
	"https://mirrors.kernel.org/gnu/bash/bash-${_MAIN_VERSION}-patches/bash${_MAIN_VERSION/./}-$PATCH_NUM" \
	$PATCHFILE \
	${PATCH_CHECKSUMS[$PATCH_NUM]}
	patch -p0 -i $PATCHFILE
	done

	TERMUX_PKG_MAINTAINER="@termux"
	TERMUX_PKG_MAINTAINER="TERMUX_PKG_MAINTAINER="<Name or Pseudonym> @EDLLT"

	# This version is relative to gettext-sys provided by the gettext-rs crate
	# This version is relative to gettext-sys provided by the gettext-rs crate

	# Patch gettext-rs crate to use a newer gettext version because the old one doesn't compile properly with clang
	# Patch gettext-rs crate to use a newer gettext version because the old one doesn't compile properly with clang

	patch -p1 -d "$TERMUX_PKG_SRCDIR/gettext-source" < "$TERMUX_PKG_BUILDER_DIR"/gettext-rs-crate-patch.diff
	patch -p1 -d "$TERMUX_PKG_SRCDIR/gettext-source" < "$TERMUX_PKG_BUILDER_DIR"/gettext-rs-crate-patch.diff

	cd "${TERMUX_PKG_SRCDIR}"
	install -Dm755 "${TERMUX_PKG_SRCDIR}/target/$CARGO_TARGET_NAME/release/rnote" -t "$TERMUX_PREFIX/bin"

fix(x11/rnote): Fix compilation #21524

Are you sure you want to change the base?

fix(x11/rnote): Fix compilation #21524

Conversation

EDLLT commented Sep 20, 2024

EDLLT commented Sep 20, 2024 • edited Loading

TomJo2000 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TomJo2000 commented Sep 20, 2024

TomJo2000 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TomJo2000 Sep 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TomJo2000 commented Sep 20, 2024

EDLLT commented Sep 20, 2024 •

edited

Loading

TomJo2000 Sep 20, 2024 •

edited

Loading