Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2a5da37a3111e8bc29a1dffd7e0a23b70cc2893e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2a5da37a3111e8bc29a1dffd7e0a23b70cc2893e)
  • Date: Thu, 22 Jun 2023 00:03:15 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

shell-term-fm/alacritty/BUILD | 11 ++---------
shell-term-fm/alacritty/DEPENDS | 16 +++++++++++-----
shell-term-fm/alacritty/DETAILS | 1 +
shell-term-fm/alacritty/HISTORY | 7 +++++++
4 files changed, 21 insertions(+), 14 deletions(-)

New commits:
commit 2a5da37a3111e8bc29a1dffd7e0a23b70cc2893e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

shell-term-fm/alacritty: reworked BUILD and DEPENDS logic, added
libxcursor,
libxi, libxrandr for libx11 enabled builds, added
Watch line

diff --git a/shell-term-fm/alacritty/BUILD b/shell-term-fm/alacritty/BUILD
index 59ce6b7..b186b86 100755
--- a/shell-term-fm/alacritty/BUILD
+++ b/shell-term-fm/alacritty/BUILD
@@ -1,9 +1,2 @@
-if is_depends_enabled $SPELL wayland && ! is_depends_enabled $SPELL libx11;
then
- env CARGO_HOME="$SOURCE_DIRECTORY/.cargo" cargo build \
- --release --no-default-features --features=wayland
-elif is_depends_enabled $SPELL libx11 && ! is_depends_enabled $SPELL
wayland; then
- env CARGO_HOME="$SOURCE_DIRECTORY/.cargo" cargo build \
- --release --no-default-features --features=x11
-else
- env CARGO_HOME="$SOURCE_DIRECTORY/.cargo" cargo build --release
-fi
+cargo fetch --locked --target "${BUILD/-pc-/-unknown-}" &&
+env CARGO_HOME="$SOURCE_DIRECTORY/.cargo" cargo build --locked --release
--no-default-features ${OPTS}
diff --git a/shell-term-fm/alacritty/DEPENDS b/shell-term-fm/alacritty/DEPENDS
index 562cd40..8dcdb4e 100755
--- a/shell-term-fm/alacritty/DEPENDS
+++ b/shell-term-fm/alacritty/DEPENDS
@@ -4,18 +4,24 @@ depends OPENGL &&
depends freetype2 &&
depends expat &&
depends fontconfig &&
-depends libxcb &&
depends libxkbcommon &&
-depends xcb-util &&

optional_depends bash-completion '' '' 'Bash completion support?' &&
optional_depends zsh '' '' 'Zsh completion support?' &&
optional_depends fish '' '' 'Fish shell completion support?' &&

-optional_depends wayland '' '' 'Wayland support?' &&
+optional_depends wayland '--features=wayland' '' 'Wayland support?' &&

if is_depends_enabled $SPELL wayland; then
- optional_depends libx11 '' '' 'X11 support?'
+ optional_depends libx11 '--features=x11' '' 'X11 support?'
else
- depends libx11
+ depends libx11 '--features=x11'
+fi &&
+
+if is_depends_enabled "${SPELL}" libx11; then
+ depends libxcb &&
+ depends libxcursor &&
+ depends libxi &&
+ depends libxrandr &&
+ depends xcb-util
fi
diff --git a/shell-term-fm/alacritty/DETAILS b/shell-term-fm/alacritty/DETAILS
index 3b4bab1..c96d54a 100755
--- a/shell-term-fm/alacritty/DETAILS
+++ b/shell-term-fm/alacritty/DETAILS
@@ -3,6 +3,7 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/${SPELL}/${SPELL}/archive/refs/tags/v${VERSION}.tar.gz
+# Watch: https://github.com/alacritty/alacritty/tags tags/v([0-9.]+)[.]tar

SOURCE_HASH=sha256:14bce0bfc538872c97e0e38b9233a9d1fa992dcf83a22b6035da5fe58a55bc6c
LICENSE[0]=MIT
WEB_SITE=https://github.com/alacritty/alacritty
diff --git a/shell-term-fm/alacritty/HISTORY b/shell-term-fm/alacritty/HISTORY
index c7e2c3d..6b64b59 100644
--- a/shell-term-fm/alacritty/HISTORY
+++ b/shell-term-fm/alacritty/HISTORY
@@ -1,3 +1,10 @@
+2023-06-21 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD: simplified logic, moved it to DEPENDS, added
--no-default-features
+ and --locked flags as well as separate fetch command
+ * DEPENDS: incorporated flags from BUILD, libxcb, xcb-util and also
+ libxcursor, libxi, libxrandr are required only with libx11
+ * DETAILS: added Watch line
+
2023-06-21 Conner Clere <xenanthropy AT sourcemage.org>
* BUILD, INSTALL, CONFIGURE, DEPENDS, DETAILS: version 0.12.1, new
spell




  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2a5da37a3111e8bc29a1dffd7e0a23b70cc2893e), Pavel Vinogradov, 06/21/2023

Archive powered by MHonArc 2.6.24.

Top of Page