From 151c3c785f22bb06ed9690cbf401004b30edfab6 Mon Sep 17 00:00:00 2001 From: Matheus Date: Mon, 29 Jun 2026 19:27:28 -0300 Subject: [PATCH] nscde: default astra palette and background --- patches/nscde/jinx-working-patch.patch | 38 ++++++++++++++++++++++++++ recipes/nscde | 3 +- source-recipes/nscde | 13 +++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/patches/nscde/jinx-working-patch.patch b/patches/nscde/jinx-working-patch.patch index 9fad7cd7..4277c6fb 100644 --- a/patches/nscde/jinx-working-patch.patch +++ b/patches/nscde/jinx-working-patch.patch @@ -71,6 +71,31 @@ index 122d744..11a5019 100644 emacs xemacs mousepad +diff --git nscde-clean/data/fvwm/Backdrops.fvwmconf nscde-workdir/data/fvwm/Backdrops.fvwmconf +index 731fe96..a2dbf63 100644 +--- nscde-clean/data/fvwm/Backdrops.fvwmconf ++++ nscde-workdir/data/fvwm/Backdrops.fvwmconf +@@ -6,11 +6,12 @@ + + # Backdrops for virtual desks are from 31 - 40 + +-Colorset 31 TiledPixmap $[NSCDE_DATADIR]/defaults/backer/Desk1-Ankh.pm +-Colorset 32 TiledPixmap $[NSCDE_DATADIR]/defaults/backer/Desk2-BrickWall.pm +-Colorset 33 TiledPixmap $[NSCDE_DATADIR]/defaults/backer/Desk3-Convex.pm +-Colorset 34 TiledPixmap $[NSCDE_DATADIR]/defaults/backer/Desk4-Toronto.pm +-Colorset 35 TiledPixmap $[NSCDE_DATADIR]/defaults/backer/Desk5-Ankh.pm +-Colorset 36 TiledPixmap $[NSCDE_DATADIR]/defaults/backer/Desk6-BrickWall.pm +-Colorset 37 TiledPixmap $[NSCDE_DATADIR]/defaults/backer/Desk7-Convex.pm +-Colorset 38 TiledPixmap $[NSCDE_DATADIR]/defaults/backer/Desk8-Toronto.pm ++Colorset 31 bg $[bg.cs40], AspectPixmap $[NSCDE_DATADIR]/photos/NightSky.png ++Colorset 32 bg $[bg.cs42], AspectPixmap $[NSCDE_DATADIR]/photos/NightSky.png ++Colorset 33 bg $[bg.cs44], AspectPixmap $[NSCDE_DATADIR]/photos/NightSky.png ++Colorset 34 bg $[bg.cs46], AspectPixmap $[NSCDE_DATADIR]/photos/NightSky.png ++ ++Colorset 35 bg $[bg.cs40], AspectPixmap $[NSCDE_DATADIR]/photos/NightSky.png ++Colorset 36 bg $[bg.cs42], AspectPixmap $[NSCDE_DATADIR]/photos/NightSky.png ++Colorset 37 bg $[bg.cs44], AspectPixmap $[NSCDE_DATADIR]/photos/NightSky.png ++Colorset 38 bg $[bg.cs46], AspectPixmap $[NSCDE_DATADIR]/photos/NightSky.png diff --git nscde-clean/data/fvwm/FrontPanel.fvwm3.fvwmconf nscde-workdir/data/fvwm/FrontPanel.fvwm3.fvwmconf index b539a2b..f29ecf6 100644 --- nscde-clean/data/fvwm/FrontPanel.fvwm3.fvwmconf @@ -145,6 +170,19 @@ index c0be848..ff38eea 100644 p = QtGui.QPainter(pixmap) p.setPen(QtGui.QColor(tocolor)) p.drawPixmap(pixmap.rect(), mask, mask.rect()) +diff --git nscde-clean/nscde_tools/bootstrap.in nscde-workdir/nscde_tools/bootstrap.in +index 5774672..c3ee991 100644 +--- nscde-clean/nscde_tools/bootstrap.in ++++ nscde-workdir/nscde_tools/bootstrap.in +@@ -78,7 +78,7 @@ function setup_nscde + echo "" + + if [ -z $NSCDE_PALETTE ]; then +- NSCDE_PALETTE="Broica" ++ NSCDE_PALETTE="Astral" + fi + + if [ -z $NSCDE_PALETTE_NCOLORS ]; then diff --git nscde-clean/nscde_tools/themegen.in nscde-workdir/nscde_tools/themegen.in index a716eb0..a7227f6 100644 --- nscde-clean/nscde_tools/themegen.in diff --git a/recipes/nscde b/recipes/nscde index 1aea20ea..166f9fde 100644 --- a/recipes/nscde +++ b/recipes/nscde @@ -1,5 +1,5 @@ name=nscde -revision=4 +revision=5 from_source=nscde imagedeps="build-essential ksh93u+m" hostdeps="xgcc xbinutils pkgconfig libtool" @@ -8,6 +8,7 @@ deps="base fvwm ksh93 imagemagick x11-utils x11-xserver-utils xterm python pytho configure() { cp -rp ${source_dir}/* . ./configure --prefix=${prefix} --host=x86_64-astral + python3 ./nscde_tools/palette_colorgen -p data/palettes/Astral.dp -n 8 -f > data/fvwm/Colorset.fvwmconf } build() { diff --git a/source-recipes/nscde b/source-recipes/nscde index 92077c55..34a43441 100644 --- a/source-recipes/nscde +++ b/source-recipes/nscde @@ -3,8 +3,21 @@ version=2.3 source_method=tarball tarball_url="https://github.com/NsCDE/NsCDE/releases/download/${version}/NsCDE-${version}.tar.gz" tarball_sha512="e07bbdd8f3a9107d4f35e1e438ee4bbd7b60fea5b449511f6fdaf70440110be2e89b5e2ea3173d4ae7eefb7e4532116f70f923a6a4faf3c7a3bf3523d9567496" +allow_network="yes" +imagedeps="wget" hostdeps="autoconf automake util-macros pkgconfig libtool" prepare() { + cat > data/palettes/Astral.dp << EOF +#35357373a0a0 +#1b1b5d5d6c6c +#0c0c5a5a8787 +#000057577a7a +#414152525c5c +#4b4b7b7b8282 +#272770708b8b +#3d3d40407c7c +EOF + wget https://astral-os.org/mirror/background1.png -O data/photos/NightSky.png autoreconf -fvi }