From f90639df0cc69836f6d784f2aa4ff015f9f87281 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 26 Feb 2025 22:51:04 -0800 Subject: [PATCH] testing/cosmic-store: new aport --- ...01-backend-mod-drop-malloc_trim-call.patch | 37 +++++++++++++ testing/cosmic-store/APKBUILD | 52 +++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 testing/cosmic-store/0001-backend-mod-drop-malloc_trim-call.patch create mode 100644 testing/cosmic-store/APKBUILD diff --git a/testing/cosmic-store/0001-backend-mod-drop-malloc_trim-call.patch b/testing/cosmic-store/0001-backend-mod-drop-malloc_trim-call.patch new file mode 100644 index 00000000000..14395147ab5 --- /dev/null +++ b/testing/cosmic-store/0001-backend-mod-drop-malloc_trim-call.patch @@ -0,0 +1,37 @@ +From 1266d27f896f0f701a085224a29b0bb5b9a8b59e Mon Sep 17 00:00:00 2001 +From: Clayton Craft +Date: Wed, 26 Feb 2025 22:37:14 -0800 +Subject: [PATCH] backend/mod: drop malloc_trim call + +Apparently this is a workaround for something related to glibc?[1] +It's not supported on musl. + +1. https://github.com/pop-os/cosmic-store/issues/62#issuecomment-2099358857 +--- + src/backend/mod.rs | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/src/backend/mod.rs b/src/backend/mod.rs +index d1390cd..cef63ec 100644 +--- a/src/backend/mod.rs ++++ b/src/backend/mod.rs +@@ -107,16 +107,5 @@ pub fn backends(locale: &str, refresh: bool) -> Backends { + } + }); + +- //TODO: Workaround for xml-rs memory leak when loading appstream data +- #[cfg(target_os = "linux")] +- { +- let start = Instant::now(); +- unsafe { +- libc::malloc_trim(0); +- } +- let duration = start.elapsed(); +- log::info!("trimmed allocations in {:?}", duration); +- } +- + backends + } +-- +2.48.1 + diff --git a/testing/cosmic-store/APKBUILD b/testing/cosmic-store/APKBUILD new file mode 100644 index 00000000000..22d1eabe2d0 --- /dev/null +++ b/testing/cosmic-store/APKBUILD @@ -0,0 +1,52 @@ +# Contributor: Clayton Craft +# Maintainer: Clayton Craft +pkgname=cosmic-store +pkgver=1.0.0_alpha6 +_upstreamver="${pkgver/_alpha/-alpha.}" +pkgrel=0 +pkgdesc="App store for the COSMIC Desktop Environment" +url="https://github.com/pop-os/cosmic-store" +arch="aarch64 x86_64" +license="GPL-3.0-only" +depends=" + cosmic-icons +" +makedepends=" + appstream-dev + cargo + flatpak-dev + glib-dev + just + libxkbcommon-dev + openssl-dev + wayland-dev +" +options="net !check" # fetch dependencies, no tests +source=" + $pkgname-$pkgver.tar.gz::https://github.com/pop-os/cosmic-store/archive/refs/tags/epoch-$_upstreamver.tar.gz + 0001-backend-mod-drop-malloc_trim-call.patch +" +builddir="$srcdir/$pkgname-epoch-$_upstreamver" + +prepare() { + default_prepare + + cargo fetch --target="$CTARGET" --locked +} + +build() { + just build-release --frozen +} + +check() { + cargo test --release --frozen +} + +package() { + just rootdir="$pkgdir" install +} + +sha512sums=" +076f0542c0496520f88eafc9e489b2e7f56120d1f4b9417e628f2e1ae4743c9f47da8ec36dc8fcd87530b4cb5bde710c94378ca1171d98c6e8ef3004a0cc9a1b cosmic-store-1.0.0_alpha6.tar.gz +e36c0b24a854efd239a640d31031d3ec79470aa8bdcdfe367bf36e53878706b73f00f7c17a88055b532cfd7d7372885744a3cf379bb841061c86917c3a7a7120 0001-backend-mod-drop-malloc_trim-call.patch +"