Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3d717bb4680e4ff386bd616d0e6de1e089d279c6)

Chronological Thread  
    < 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 (3d717bb4680e4ff386bd616d0e6de1e089d279c6)
  • Date: Thu, 30 Nov 2023 04:49:24 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

windowmanagers/sway/DEPENDS | 3 +-
windowmanagers/sway/HISTORY | 2 +
windowmanagers/sway/patches/no-werror.patch | 13 ++++++++++
wm-addons/wlroots/DEPENDS | 2 -
wm-addons/wlroots/DETAILS | 34
++++++++++++++++++---------
wm-addons/wlroots/HISTORY | 6 +++-
wm-addons/wlroots/PREPARE | 7 ++---
wm-addons/wlroots/PRE_SUB_DEPENDS | 3 +-
wm-addons/wlroots/REPAIR^all^PRE_SUB_DEPENDS | 9 +++----
wm-addons/wlroots/SUB_DEPENDS | 4 ++-
10 files changed, 59 insertions(+), 24 deletions(-)

New commits:
commit 3d717bb4680e4ff386bd616d0e6de1e089d279c6
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

windowmanagers/sway: needs wlroots 0.16.2 tag, disabled -Werror

commit 07315251a3985927bab92775e8ed4fc309b40c34
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

wm-addons/wlroots: adapted for sway

diff --git a/windowmanagers/sway/DEPENDS b/windowmanagers/sway/DEPENDS
index 4dda214..3f05265 100755
--- a/windowmanagers/sway/DEPENDS
+++ b/windowmanagers/sway/DEPENDS
@@ -16,9 +16,10 @@ vdepends <<!
meson >= 0.60.0
wayland >= 1.20.0
wayland-protocols >= 1.24
- wlroots >= 0.15.0
!

+depends -sub "SWAY" wlroots &&
+
optional_depends gdk-pixbuf2 \
"" \
"" \
diff --git a/windowmanagers/sway/HISTORY b/windowmanagers/sway/HISTORY
index a2970fa..1111e7f 100644
--- a/windowmanagers/sway/HISTORY
+++ b/windowmanagers/sway/HISTORY
@@ -1,5 +1,7 @@
2023-11-29 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: git:// -> git_http://
+ * DEPENDS: depends on wlroots 0.16.2 tag
+ * patches/no-werror.patch: disabled -Werror

2023-02-23 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.8.1
diff --git a/windowmanagers/sway/patches/no-werror.patch
b/windowmanagers/sway/patches/no-werror.patch
new file mode 100644
index 0000000..81ca5d6
--- /dev/null
+++ b/windowmanagers/sway/patches/no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 7185daf..f76ea7b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,7 +7,7 @@ project(
+ default_options: [
+ 'c_std=c11',
+ 'warning_level=2',
+- 'werror=true',
++ 'werror=false',
+ ],
+ )
+
diff --git a/wm-addons/wlroots/DEPENDS b/wm-addons/wlroots/DEPENDS
index d43d560..3d99b6a 100755
--- a/wm-addons/wlroots/DEPENDS
+++ b/wm-addons/wlroots/DEPENDS
@@ -48,7 +48,7 @@ if list_find "${WLROOTS_BACKENDS}" "x11"; then
'Enable improved error reporting?'
fi &&

-if [[ "${WLROOTS_BRANCH}" == "scm" && "${HYPRLAND}" != "y" ]]; then
+if [[ "${WLROOTS_BRANCH}" == "scm" ]]; then
depends git
fi &&

diff --git a/wm-addons/wlroots/DETAILS b/wm-addons/wlroots/DETAILS
index f36a3af..437182a 100755
--- a/wm-addons/wlroots/DETAILS
+++ b/wm-addons/wlroots/DETAILS
@@ -2,22 +2,32 @@
. "${GRIMOIRE}/FUNCTIONS"
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL="wlroots"
-if [[ "${WLROOTS_BRANCH}" == "scm" ]]; then
+case "${WLROOTS_BRANCH}" in
+scm)
VERSION="$(get_scm_version)"
SOURCE="${SPELL}-git.tar.xz"
- if [[ ${HYPRLAND} == 'y' ]]; then
- WLROOTS_COMMIT=5de9e1a99d6642c2d09d589aa37ff0a8945dcee1
-
SOURCE_HASH=sha512:043f20e4edf9856fd24772d899ac2a93a76da29a8c55a83c9b283750a31f05560aa0a66ef09560875c38aa0c9a8d86cda41e6b2b6e54a3d212c63e84b0304ca7
- SOURCE="wlroots-${WLROOTS_COMMIT}.tar.gz"
-
SOURCE_URL[0]="https://gitlab.freedesktop.org/${SPELL}/${SPELL}/-/archive/${WLROOTS_COMMIT}/${SOURCE}.tar.gz";
- SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${WLROOTS_COMMIT}"
- else

SOURCE_URL[0]="git_http://gitlab.freedesktop.org/${SPELL}/${SPELL}.git:${SPELL}-git";
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
SOURCE_IGNORE="volatile"
FORCE_DOWNLOAD=on
- fi
-else
+;;
+hyprland)
+ WLROOTS_COMMIT=5de9e1a99d6642c2d09d589aa37ff0a8945dcee1
+
SOURCE_HASH=sha512:043f20e4edf9856fd24772d899ac2a93a76da29a8c55a83c9b283750a31f05560aa0a66ef09560875c38aa0c9a8d86cda41e6b2b6e54a3d212c63e84b0304ca7
+ VERSION="${WLROOTS_COMMIT}"
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]="https://gitlab.freedesktop.org/${SPELL}/${SPELL}/-/archive/${WLROOTS_COMMIT}/${SOURCE}.tar.gz";
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+;;
+sway)
+ WLROOTS_COMMIT="0a32b5a74db06a27bee55a47205951bb277a9657"
+
SOURCE_HASH="sha512:96334c53b522caa68dea61f6fdf12148182ccd08eca506253396717872248052ae6d958368d5f73692816eb754c749b6bbc6280763be3a86f5775bcadb3e26d2"
+ VERSION="${WLROOTS_COMMIT}"
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]="https://gitlab.freedesktop.org/${SPELL}/${SPELL}/-/archive/${WLROOTS_COMMIT}/${SOURCE}.tar.gz";
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+;;
+*)
VERSION=0.17.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
@@ -26,7 +36,8 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=sway.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-fi
+;;
+esac
LICENSE[0]="MIT"
WEB_SITE="https://swaywm.org";
ENTERED="20181223"
@@ -53,3 +64,4 @@ top of writing your compositor.
avoid writing GL code directly, but which steps out of the way when your
needs
demand custom rendering code.
EOF
+ /var/spool/sorcery/wlroots-0a32b5a74db06a27bee55a47205951bb277a9657.tar.gz
diff --git a/wm-addons/wlroots/HISTORY b/wm-addons/wlroots/HISTORY
index 146626d..2c2bce8 100644
--- a/wm-addons/wlroots/HISTORY
+++ b/wm-addons/wlroots/HISTORY
@@ -1,3 +1,7 @@
+2023-11-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE, PRE_SUB_DEPENDS, SUB_DEPENDS,
+ REPAIR^all^PRE_SUB_DEPENDS: added tag for sway, reorganized queries
+
2023-11-28 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: update HYPRLAND commit id for hyprland 0.32.3
* DEPENDS: doesn't need git if built for hyprland
@@ -14,7 +18,7 @@
* DETAILS: update HYPRLAND commit id for hyprland 0.30.0,
add source hash when checking out for hyprland

-2023-09-02 Pavel Vinogradov <public AT sorcemage.org>
+2023-09-02 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated HYPRLAND commit id for hyprland 0.29.0

2023-08-17 Conner Clere <xenanthropy AT sourcemage.org>
diff --git a/wm-addons/wlroots/PREPARE b/wm-addons/wlroots/PREPARE
index cd12abc..c672c97 100755
--- a/wm-addons/wlroots/PREPARE
+++ b/wm-addons/wlroots/PREPARE
@@ -1,6 +1,5 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch stable scm &&

-if [[ $WLROOTS_BRANCH == "scm" ]]; then
- config_query HYPRLAND "Checkout commit ID for hyprland?" n
-fi
+persistent_remove HYPRLAND &&
+
+prepare_select_branch stable scm hyprland sway
diff --git a/wm-addons/wlroots/PRE_SUB_DEPENDS
b/wm-addons/wlroots/PRE_SUB_DEPENDS
index 0c6aa30..9839f64 100755
--- a/wm-addons/wlroots/PRE_SUB_DEPENDS
+++ b/wm-addons/wlroots/PRE_SUB_DEPENDS
@@ -1,6 +1,7 @@
case "${THIS_SUB_DEPENDS}" in
SCM) [[ "${WLROOTS_BRANCH}" == "scm" ]] ;;
- HYPRLAND) [[ "${HYPRLAND}" == "y" ]] ;;
+ HYPRLAND) [[ "${WLROOTS_BRANCH}" == "hyprland" ]] ;;
+ SWAY) [[ "${WLROOTS_BRANCH}" == "sway" ]] ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
return 1 ;;
esac
diff --git a/wm-addons/wlroots/REPAIR^all^PRE_SUB_DEPENDS
b/wm-addons/wlroots/REPAIR^all^PRE_SUB_DEPENDS
index a5a632b..9839f64 100755
--- a/wm-addons/wlroots/REPAIR^all^PRE_SUB_DEPENDS
+++ b/wm-addons/wlroots/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,6 +1,7 @@
case "${THIS_SUB_DEPENDS}" in
- SCM) [[ "${WLROOTS_BRANCH}" == "scm" ]] ;;
-HYPRLAND) [[ "${HYPRLAND}" == "y" ]] ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
- return 1 ;;
+ SCM) [[ "${WLROOTS_BRANCH}" == "scm" ]] ;;
+ HYPRLAND) [[ "${WLROOTS_BRANCH}" == "hyprland" ]] ;;
+ SWAY) [[ "${WLROOTS_BRANCH}" == "sway" ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1 ;;
esac
diff --git a/wm-addons/wlroots/SUB_DEPENDS b/wm-addons/wlroots/SUB_DEPENDS
index 5dc4c14..00d718e 100755
--- a/wm-addons/wlroots/SUB_DEPENDS
+++ b/wm-addons/wlroots/SUB_DEPENDS
@@ -2,7 +2,9 @@ case "${THIS_SUB_DEPENDS}" in
SCM) echo "SCM branch needed, forcing it." &&
[[ "${WLROOTS_BRANCH}" == "scm" ]] || WLROOTS_BRANCH="scm" ;;
HYPRLAND) echo "HYPRLAND commit-id needed, forcing it." &&
- [[ "${HYPRLAND}" == "y" ]] || HYPRLAND="y" ;;
+ [[ "${WLROOTS_BRANCH}" == "hyprland" ]] ||
WLROOTS_BRANCH="hyprland" ;;
+SWAY) echo "Sway commit-id needed, forcing it." &&
+ [[ "${WLROOTS_BRANCH}" == "sway" ]] || WLROOTS_BRANCH="sway"
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
return 1 ;;
esac


  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (3d717bb4680e4ff386bd616d0e6de1e089d279c6), Pavel Vinogradov, 11/29/2023

Archive powered by MHonArc 2.6.24.

Top of Page