Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts(setup-ubuntu.sh): Apply system libdirs and pkgconfig dirs to new pkgconf build #22061

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

robertkirkman
Copy link
Contributor

@robertkirkman robertkirkman commented Nov 1, 2024

Fixes #22060

There are also several other methods that could be used to fix this particular problem, but the way I have written this keeps it mostly similar to how fornwall originally wrote this update, without radically changing the method too much from his general idea.

@Biswa96
Copy link
Member

Biswa96 commented Nov 1, 2024

Could you upgrade the tuxpaint version also? It would help to check if this fix is working.

@robertkirkman
Copy link
Contributor Author

robertkirkman commented Nov 1, 2024

Sure! with this commit applied to my local container, scripts/run-docker.sh ./build-package.sh -I tuxpaint works after I made this change to it:

--- a/x11-packages/tuxpaint/build.sh
+++ b/x11-packages/tuxpaint/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://tuxpaint.org/
 TERMUX_PKG_DESCRIPTION="A free, award-winning drawing program for children ages 3 to 12"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="0.9.33"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION="0.9.34"
 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/tuxpaint/tuxpaint-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=8701ec5082d48a00ba2f408c7c48cf592aa82b60f50dd6d4b6574fac6b48dc76
+TERMUX_PKG_SHA256=b761df5ed386a9e04a6809ab3e0cbf2126f10b770527cb2b5f190ff5e370ed03
 TERMUX_PKG_DEPENDS="fontconfig, fribidi, glib, libandroid-wordexp, libcairo, libimagequant, libpaper, libpng, librsvg, pango, sdl2, sdl2-gfx, sdl2-image, sdl2-mixer, sdl2-pango, sdl2-ttf, zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_HOSTBUILD=true

Should I also make a PR for that or will the termuxbot2 be able to automatically try again after the docker image is fixed?

I tried without -I first, but currently the gnome.org download for the gtk3 dependency has an error 503 so, that will not work for the time being.

image

Also it might be helpful for future reference for anyone, that the way I obtained the values I placed in the variables is by doing this.

scripts/run-docker.sh
sudo sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
sudo apt update
sudo apt install devscripts
apt source pkgconf
cd pkgconf-*
debian/system-libdirs.sh gcc
grep debian/rules -e pkg-config-dir

@Biswa96
Copy link
Member

Biswa96 commented Nov 1, 2024

Should I also make a PR for that or will the termuxbot2 be able to automatically try again after the docker image is fixed?

Yeah, termuxbot2 will update tuxpaint automatically after any maintainer close the auto-update issue. Just I was not sure if this change actually fixes the tuxpaint issue. Thanks for checking that.

@robertkirkman
Copy link
Contributor Author

I will temporarily mark it as a draft because I want to test it with the command scripts/run-docker.sh ./build-package.sh -I -a all nodejs. If it succeeds then that means that it worked for a package that is marked as having a hostbuild step depending on multiarch host packages in the comments.

@robertkirkman robertkirkman marked this pull request as draft November 1, 2024 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: new pkgconf cannot find the pkgconfig folders during hostbuild-steps yet
2 participants