From 82f555518e31e7686d243e7e43e83d4261df5e91 Mon Sep 17 00:00:00 2001 From: sulincix Date: Thu, 6 Jul 2023 20:51:34 +0000 Subject: [PATCH] cinnamon done (I hope) --- cinnamon/base/cinnamon/ympbuild | 4 +++- gnome/extra/cjs/ympbuild | 2 +- gnome/extra/mozjs102/ympbuild | 15 +++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cinnamon/base/cinnamon/ympbuild b/cinnamon/base/cinnamon/ympbuild index 12e6ff1c..0810416c 100644 --- a/cinnamon/base/cinnamon/ympbuild +++ b/cinnamon/base/cinnamon/ympbuild @@ -12,7 +12,7 @@ depends=(nm-applet accountsservice cinnamon-control-center cinnamon-menus cinnamon-session cinnamon-settings-daemon cjs gnome-backgrounds gsound gstreamer libcroco libgnomekbd libkeybinder3 librsvg muffin nemo polkit-gnome py3-cairo py3-dbus py3-pygobject py3-pam py3-pexpect py3-pillow py3-inotify py3-tz py3-tinycss2 py3-xapp py3-requests - timezonemap xapp xdg-desktop-portal-xapp + timezonemap xapp xdg-desktop-portal-xapp libxkbfile ) makedepends=(meson gobject-introspection intltool) md5sums=('f1984b3296868dba9bb481faa3dbaf50') @@ -34,5 +34,7 @@ build(){ package(){ ninja -C build install $jobs + # remove broken symlink + rm -f $DESTDIR/etc/xdg/menus/cinnamon-applications-merged } diff --git a/gnome/extra/cjs/ympbuild b/gnome/extra/cjs/ympbuild index b736e8ce..701442f2 100644 --- a/gnome/extra/cjs/ympbuild +++ b/gnome/extra/cjs/ympbuild @@ -8,7 +8,7 @@ email='akarsu@protonmail.com' maintainer='akarsu' license=('GPL') source=("https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz") -depends=(js102) +depends=(mozjs102) makedepends=() md5sums=('991e1bbf2ebf7cca4e93cfce66c4a876') group=(gnome.extra) diff --git a/gnome/extra/mozjs102/ympbuild b/gnome/extra/mozjs102/ympbuild index 38561848..63083348 100644 --- a/gnome/extra/mozjs102/ympbuild +++ b/gnome/extra/mozjs102/ympbuild @@ -25,19 +25,22 @@ export CXX=clang++ export CFLAGS="$CFLAGS -O2" export CXXFLAGS="$CXXFLAGS -O2" export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system -export MOZBUILD_STATE_PATH="$srcdir/mozbuild" +export MOZBUILD_STATE_PATH="$HOME/mozbuild" export MOZ_NOSPAM=1 export PYTHON=/usr/bin/python3 -export RUST_TARGET="$CTARGET" +export RUST_TARGET="x86_64" export SHELL=/bin/ash -export RUSTFLAGS="$RUSTFLAGS -C debuginfo=1" - + +prepare(){ + echo "ac_add_options --prefix=/usr" >> ./mozconfig.opt +} + build(){ - ./mach build --directory $DESTDIR + ./mach build } package(){ - cd obj + cd obj-opt make DESTDIR="$DESTDIR" install rm -f "$DESTDIR"/usr/lib/*.ajs }