Skip to content

Commit 7a45446

Browse files
robertkirkmanrobertkirkman
committed
addpkg(main/python-psutil): 7.2.2
- Fixes #28770 - Package `python-psutil` for `pkg install` because it is now necessary to patch it to make it installable on Android after the update to Python 3.13
1 parent b7a664f commit 7a45446

5 files changed

Lines changed: 44 additions & 11 deletions

File tree

‎packages/python-psutil/android.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
https://github.com/giampaolo/psutil/issues/2743
2+
3+
--- a/psutil/_common.py
4+
+++ b/psutil/_common.py
5+
@@ -71,7 +71,7 @@ __all__ = [
6+
7+
POSIX = os.name == "posix"
8+
WINDOWS = os.name == "nt"
9+
-LINUX = sys.platform.startswith("linux")
10+
+LINUX = sys.platform.startswith(("linux", "android"))
11+
MACOS = sys.platform.startswith("darwin")
12+
OSX = MACOS # deprecated alias
13+
FREEBSD = sys.platform.startswith(("freebsd", "midnightbsd"))

‎packages/python-psutil/build.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
TERMUX_PKG_HOMEPAGE=https://github.com/giampaolo/psutil
2+
TERMUX_PKG_DESCRIPTION="Cross-platform process and system utilities module for Python"
3+
TERMUX_PKG_LICENSE="BSD 3-Clause"
4+
TERMUX_PKG_MAINTAINER="@termux"
5+
TERMUX_PKG_VERSION="7.2.2"
6+
TERMUX_PKG_SRCURL="https://github.com/giampaolo/psutil/archive/refs/tags/release-$TERMUX_PKG_VERSION.tar.gz"
7+
TERMUX_PKG_SHA256=38f406bf21acc67e45f414b7980463b2e6e6270ba3616ffd41995d997078cbe6
8+
TERMUX_PKG_DEPENDS="python, python-pip"
9+
TERMUX_PKG_SETUP_PYTHON=true
10+
TERMUX_PKG_BUILD_IN_SRC=true
11+
TERMUX_PKG_AUTO_UPDATE=true
12+
TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+"

‎x11-packages/cinnamon-session/build.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ TERMUX_PKG_DESCRIPTION="The Cinnamon session manager"
33
TERMUX_PKG_LICENSE="GPL-2.0"
44
TERMUX_PKG_MAINTAINER="@termux"
55
TERMUX_PKG_VERSION="6.6.3"
6+
TERMUX_PKG_REVISION=1
67
TERMUX_PKG_SRCURL="https://github.com/linuxmint/cinnamon-session/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
78
TERMUX_PKG_SHA256=ac7426dc383bbec3bd1576cb569d0837d95a87ec166a897263e0941be95feed6
89
TERMUX_PKG_AUTO_UPDATE=true
910
TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+"
10-
TERMUX_PKG_DEPENDS="glib, libcanberra, gtk3, pango, python-pip, libx11, libsm, libice, libxext, libxau, libxcomposite, cinnamon-desktop, opengl, dbus-python, keybinder, xapp"
11+
TERMUX_PKG_DEPENDS="glib, libcanberra, gtk3, pango, python-pip, python-psutil, libx11, libsm, libice, libxext, libxau, libxcomposite, cinnamon-desktop, opengl, dbus-python, keybinder, xapp"
1112
TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, glib-cross"
1213
TERMUX_PKG_VERSIONED_GIR=false
13-
TERMUX_PKG_PYTHON_TARGET_DEPS="psutil, pyinotify, pyinotify-elephant-fork"
14+
TERMUX_PKG_PYTHON_TARGET_DEPS="pyinotify, pyinotify-elephant-fork"
1415
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
1516
-Dxtrans=false
1617
-Dfake-consolekit=true

‎x11-packages/mate-tweak/build.sh‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ TERMUX_PKG_DESCRIPTION="Tweak tool for the MATE Desktop"
33
TERMUX_PKG_LICENSE="GPL-2.0-or-later"
44
TERMUX_PKG_MAINTAINER="@termux"
55
TERMUX_PKG_VERSION="22.10.0"
6+
TERMUX_PKG_REVISION=1
67
TERMUX_PKG_SRCURL="https://github.com/ubuntu-mate/mate-tweak/archive/refs/tags/$TERMUX_PKG_VERSION.tar.gz"
78
TERMUX_PKG_SHA256=c33c092b0151b50d8a5706825f1bcef57f1738f8f5cf22af49c11f45bc14e84a
89
TERMUX_PKG_AUTO_UPDATE=true
9-
TERMUX_PKG_PYTHON_RUNTIME_DEPS="distro, psutil, setproctitle"
10-
TERMUX_PKG_DEPENDS="dconf, gsettings-desktop-schemas, ldd, libnotify, libmatekbd, mate-applets, mate-panel, pygobject, python, python-pip"
10+
TERMUX_PKG_PYTHON_RUNTIME_DEPS="distro, setproctitle"
11+
TERMUX_PKG_DEPENDS="dconf, gsettings-desktop-schemas, ldd, libnotify, libmatekbd, mate-applets, mate-panel, pygobject, python, python-pip, python-psutil"
1112
TERMUX_PKG_SUGGESTS="mate-applet-brisk-menu, plank-reloaded, tilda, mate-applet-appmenu"
12-
TERMUX_PKG_BUILD_DEPENDS="rsync"
1313
TERMUX_PKG_PLATFORM_INDEPENDENT=true
1414
TERMUX_PKG_BUILD_IN_SRC=true
1515
TERMUX_PKG_RM_AFTER_INSTALL="
@@ -20,6 +20,14 @@ share/polkit-1
2020
termux_step_post_make_install() {
2121
# this software installs itself in a really messed-up directory structure.
2222
# The easiest way to explain what is wrong is to just show commands fixing it after installation:
23-
rsync -av "$TERMUX_PREFIX/local/bin/" "$TERMUX_PREFIX/bin"
24-
rsync -av "$TERMUX_PREFIX/local/lib/python$TERMUX_PYTHON_VERSION/dist-packages/usr/" "$TERMUX_PREFIX"
23+
install -Dm755 -t "$TERMUX_PREFIX/bin" "$TERMUX_PREFIX/local/bin/marco-compton"
24+
install -Dm755 -t "$TERMUX_PREFIX/bin" "$TERMUX_PREFIX/local/bin/marco-picom"
25+
local prog
26+
for prog in marco-glx marco-no-composite marco-xr_glx_hybrid marco-xrender mate-tweak; do
27+
install -Dm755 -t "$TERMUX_PREFIX/bin" "$TERMUX_PREFIX/local/bin/$prog"
28+
install -Dm644 -t "$TERMUX_PREFIX/share/applications" "data/$prog.desktop"
29+
install -Dm644 -t "$TERMUX_PREFIX/share/man/man1" "data/$prog.1"
30+
done
31+
install -Dm644 -t "$TERMUX_PREFIX/lib/$TERMUX_PKG_NAME" data/mate-tweak.ui
32+
install -Dm644 -t "$TERMUX_PREFIX/lib/$TERMUX_PKG_NAME" util/mate-tweak-helper
2533
}

‎x11-packages/xfce4-panel-profiles/build.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ TERMUX_PKG_DESCRIPTION="A simple application to manage Xfce panel layouts."
33
TERMUX_PKG_LICENSE="GPL-3.0"
44
TERMUX_PKG_MAINTAINER="@termux"
55
TERMUX_PKG_VERSION="1.1.1"
6-
TERMUX_PKG_REVISION=2
7-
TERMUX_PKG_SRCURL=https://archive.xfce.org/src/apps/xfce4-panel-profiles/${TERMUX_PKG_VERSION%.*}/xfce4-panel-profiles-${TERMUX_PKG_VERSION}.tar.xz
6+
TERMUX_PKG_REVISION=3
7+
TERMUX_PKG_SRCURL="https://archive.xfce.org/src/apps/xfce4-panel-profiles/${TERMUX_PKG_VERSION%.*}/xfce4-panel-profiles-${TERMUX_PKG_VERSION}.tar.xz"
88
TERMUX_PKG_SHA256=0126373a03778bb4894afa151de28d36bfc563ddab96d3bd7c63962350d34ba2
99
TERMUX_PKG_AUTO_UPDATE=true
10-
TERMUX_PKG_DEPENDS="gtk3, libxfce4ui, libxfce4util, pygobject, python, python-pip, xfce4-panel"
11-
TERMUX_PKG_PYTHON_TARGET_DEPS="psutil"
10+
TERMUX_PKG_DEPENDS="gtk3, libxfce4ui, libxfce4util, pygobject, python, python-pip, python-psutil, xfce4-panel"
1211
TERMUX_PKG_PLATFORM_INDEPENDENT=true
1312
TERMUX_PKG_BUILD_IN_SRC=true
1413

0 commit comments

Comments
 (0)