gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[sway] fix use of VERSION, PATCH_6249

Browse source
This commit is contained in:
Gwenhael Le Moine 2023-03-07 11:25:59 +01:00
parent e81e7302eb
commit f73df4d0b7
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
wayland/sway/SlackBuild
View file

@ -35,23 +35,28 @@ cp -R "$REPOSITORY" $TMP/
cd "$TMP/$PRGNAM/" || exit 1 cd "$TMP/$PRGNAM/" || exit 1
case $VERSION in case $VERSION in
trunk) trunk)
VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" PKGVERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)"
;; ;;
latest) latest)
VERSION=$(git describe --tags --abbrev=0) PKGVERSION=$(git describe --tags --abbrev=0)
git checkout "$VERSION" git checkout "$PKGVERSION"
;; ;;
*) *)
git checkout "$VERSION" git checkout "$PKGVERSION"
;; ;;
esac esac
[ -e "$CWD"/patches/6249-tray-menu.patch ] && mv "$CWD"/patches/6249-tray-menu.patch{,.previous}
wget -c https://patch-diff.githubusercontent.com/raw/swaywm/sway/pull/6249.patch -O "$CWD"/patches/6249-tray-menu.patch
patch -p1 < "$CWD"/patches/6249-tray-menu.patch
PKGNAM=${PRGNAM} PKGNAM=${PRGNAM}
PKGVERSION=$(echo "${VERSION}" | tr - _)
# Tray-menu patch
PATCH_6249=${PATCH_6249:-"yes"}
if [ "$PATCH_6249" = "yes" ]; then
[ -e "$CWD"/patches/6249-tray-menu.patch ] && mv "$CWD"/patches/6249-tray-menu.patch{,.previous}
wget -c https://patch-diff.githubusercontent.com/raw/swaywm/sway/pull/6249.patch -O "$CWD"/patches/6249-tray-menu.patch
patch -p1 < "$CWD"/patches/6249-tray-menu.patch
PKGVERSION="${PKGVERSION}_+6249"
fi
# Embed wlroots # Embed wlroots
EMBED_WLROOTS=${EMBED_WLROOTS:-"yes"} EMBED_WLROOTS=${EMBED_WLROOTS:-"yes"}
@ -82,6 +87,7 @@ if [ "$EMBED_WLROOTS" = "yes" ]; then
PKGVERSION="${PKGVERSION}+${WLROOTS_VERSION}" PKGVERSION="${PKGVERSION}+${WLROOTS_VERSION}"
fi fi
# Embed libliftoff # Embed libliftoff
EMBED_LIBLIFTOFF=${EMBED_LIBLIFTOFF:-"yes"} EMBED_LIBLIFTOFF=${EMBED_LIBLIFTOFF:-"yes"}
if [ "$EMBED_LIBLIFTOFF" = "yes" ]; then if [ "$EMBED_LIBLIFTOFF" = "yes" ]; then
@ -111,6 +117,7 @@ if [ "$EMBED_LIBLIFTOFF" = "yes" ]; then
PKGVERSION="${PKGVERSION}+${LIBLIFTOFF_VERSION}" PKGVERSION="${PKGVERSION}+${LIBLIFTOFF_VERSION}"
fi fi
# Embed libdisplay-info # Embed libdisplay-info
EMBED_LIBDISPLAYINFO=${EMBED_LIBDISPLAYINFO:-"yes"} EMBED_LIBDISPLAYINFO=${EMBED_LIBDISPLAYINFO:-"yes"}
if [ "$EMBED_LIBDISPLAYINFO" = "yes" ]; then if [ "$EMBED_LIBDISPLAYINFO" = "yes" ]; then
@ -140,6 +147,7 @@ if [ "$EMBED_LIBDISPLAYINFO" = "yes" ]; then
PKGVERSION="${PKGVERSION}+${LIBDISPLAYINFO_VERSION}" PKGVERSION="${PKGVERSION}+${LIBDISPLAYINFO_VERSION}"
fi fi
# Back to compiling sway… # Back to compiling sway…
cd "$TMP/$PRGNAM/" || exit 1 cd "$TMP/$PRGNAM/" || exit 1