这是indexloc提供的服务，不要输入任何密码
Skip to content

Libxml2 rebuilds: Part 4 - Misc. X11 repo packages #24208

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 35 commits into from
Apr 14, 2025
Merged

Libxml2 rebuilds: Part 4 - Misc. X11 repo packages #24208

merged 35 commits into from
Apr 14, 2025

Conversation

@TomJo2000
Copy link
Member

@TomJo2000 TomJo2000 commented Apr 8, 2025

@TomJo2000 TomJo2000 requested a review from Grimler91 as a code owner April 8, 2025 20:39
@TomJo2000 TomJo2000 changed the title Libxml2 rebuilds: Part 4 - Misc. X11 repo package Libxml2 rebuilds: Part 4 - Misc. X11 repo packages Apr 8, 2025
@robertkirkman
Copy link
Member

robertkirkman commented Apr 9, 2025 

2025-04-09T00:02:56.9529040Z /home/builder/.termux-build/xournalpp/src/src/core/plugin/luapi_application.h:1987:9: error: use of undeclared identifier 'lua_isinteger'; did you mean 'lua_pushinteger'?
2025-04-09T00:02:56.9530223Z  1987 |     if (lua_isinteger(L, 2)) {
2025-04-09T00:02:56.9530621Z       |         ^~~~~~~~~~~~~
2025-04-09T00:02:56.9531089Z       |         lua_pushinteger
2025-04-09T00:02:56.9531801Z /data/data/com.termux/files/usr/include/lua5.2/lua.h:207:22: note: 'lua_pushinteger' declared here
2025-04-09T00:02:56.9532797Z   207 | LUA_API void        (lua_pushinteger) (lua_State *L, lua_Integer n);
2025-04-09T00:02:56.9533350Z       |                      ^

prefix pollution liblua52->xournalpp.

it can be resolved like this:

--- a/x11-packages/xournalpp/build.sh
+++ b/x11-packages/xournalpp/build.sh
@@ -4,12 +4,14 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_LICENSE_FILE="LICENSE, copyright.txt"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.2.6"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/xournalpp/xournalpp/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=dce483e01e267b0d20afb88c59bf53b8ca1bd8518a31f98ef5061a334d6dc4eb
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk3, libandroid-execinfo, libc++, libcairo, librsvg, libsndfile, libx11, libxi, libxml2, libzip, pango, poppler, portaudio, zlib"
 TERMUX_PKG_REPLACES="xournal"
+# Lua 5.4 would be a dependency if plugins were wanted
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DHELP2MAN=NO
+-DENABLE_PLUGINS=OFF
 "

@TomJo2000
Copy link
Member Author

TomJo2000 commented Apr 9, 2025

Thanks, will include that fix.

@TomJo2000 TomJo2000 force-pushed the libxml2-rebuilds4 branch 2 times, most recently from fcc7467 to b534155 Compare April 13, 2025 22:27
@TomJo2000 TomJo2000 mentioned this pull request Apr 13, 2025
Merged
TomJo2000 added 23 commits April 14, 2025 01:20
@TomJo2000
revbump(main/gdal): after libxml2 update
01f1f73
@TomJo2000
revbump(main/postgis): after libxml2 update
3a4f922
@TomJo2000
revbump(main/postgresql): after libxml2 update
d179946
@TomJo2000
revbump(main/vlc): after libxml2 update
55d7117
@TomJo2000
revbump(x11/vlc-qt): after libxml2 update
1b1f4d7
@TomJo2000
revbump(x11/abiword): after libxml2 update
deb99e2
@TomJo2000
revbump(x11/ardour): after libxml2 update
ac9a6ff
@TomJo2000
revbump(x11/atril): after libxml2 update
6243c95
@TomJo2000
revbump(x11/audacious-plugins): after libxml2 update
29b993d
@TomJo2000
revbump(x11/bluefish): after libxml2 update
cbeade0
@TomJo2000
revbump(x11/cairo-dock-core): after libxml2 update
2165228
@TomJo2000
revbump(x11/caja): after libxml2 update
ceded30
@TomJo2000
revbump(x11/cherrytree): after libxml2 update
faf2a4d
@TomJo2000
revbump(x11/evince): after libxml2 update
84f1176
@TomJo2000
revbump(x11/far2l): after libxml2 update
a52bf74
@TomJo2000
revbump(x11/florence): after libxml2 update
05a43df
@TomJo2000
revbump(x11/fontforge-gtk): after libxml2 update
19943b4
@TomJo2000
revbump(x11/glade): after libxml2 update
b689ac8
@TomJo2000
revbump(x11/gnome-calculator): after libxml2 update
b920bc6
@TomJo2000
revbump(x11/gnumeric): after libxml2 update
17b3770
@TomJo2000
revbump(x11/goffice): after libxml2 update
60509fe
@TomJo2000
revbump(x11/gtksourceview3): after libxml2 update
387b635
@TomJo2000
revbump(x11/gtksourceview4): after libxml2 update
a92b0e5
@TomJo2000 TomJo2000 merged commit 5d8e3f1 into termux:master Apr 14, 2025
4 of 9 checks passed
@TomJo2000 TomJo2000 mentioned this pull request Apr 14, 2025
Closed
@TomJo2000 TomJo2000 deleted the libxml2-rebuilds4 branch June 8, 2025 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Grimler91 Grimler91 Awaiting requested review from Grimler91 Grimler91 is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@TomJo2000 @robertkirkman