Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Conner Clere (d4f87f0cb7b519b49f438c56036fd8416260174c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (d4f87f0cb7b519b49f438c56036fd8416260174c)
  • Date: Wed, 8 Mar 2023 19:01:57 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

wm-addons/wlroots/CONFIGURE | 5 +----
wm-addons/wlroots/DETAILS | 4 ++++
wm-addons/wlroots/HISTORY | 7 ++++---
wm-addons/wlroots/PREPARE | 6 +++++-
4 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit d4f87f0cb7b519b49f438c56036fd8416260174c
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

wlroots: update SOURCE_URL to grab hyprland commit-id directly

diff --git a/wm-addons/wlroots/CONFIGURE b/wm-addons/wlroots/CONFIGURE
index ab7bcef..e1385873 100755
--- a/wm-addons/wlroots/CONFIGURE
+++ b/wm-addons/wlroots/CONFIGURE
@@ -1,7 +1,4 @@
. "${GRIMOIRE}/MESON_CONFIGURE" &&

config_query_option WLROOTS_OPTS "Build examples?" \
- "n" "examples=true" "examples=false" &&
-if [[ $WLROOTS_BRANCH == "scm" ]]; then
- config_query HYPRLAND "Checkout commit ID for hyprland?" n
-fi
+ "n" "examples=true" "examples=false"
diff --git a/wm-addons/wlroots/DETAILS b/wm-addons/wlroots/DETAILS
index 7d8057b..7904fc9 100755
--- a/wm-addons/wlroots/DETAILS
+++ b/wm-addons/wlroots/DETAILS
@@ -5,7 +5,11 @@ if [[ "${WLROOTS_BRANCH}" == "scm" ]]; then
VERSION="$(get_scm_version)"
SOURCE="${SPELL}-git.tar.xz"
FORCE_DOWNLOAD="on"
+ if [[ ${HYPRLAND} == 'y' ]]; then
+
SOURCE_URL[0]="git_http://gitlab.freedesktop.org/wlroots/wlroots.git:${SPELL}-git:677a3f2f8847ed2de49dd60868f9d9487a546f58";
+ else
SOURCE_URL[0]="git_http://gitlab.freedesktop.org/wlroots/wlroots.git";
+ fi
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
diff --git a/wm-addons/wlroots/HISTORY b/wm-addons/wlroots/HISTORY
index 19de995..82c8252 100644
--- a/wm-addons/wlroots/HISTORY
+++ b/wm-addons/wlroots/HISTORY
@@ -1,11 +1,12 @@
2023-03-08 Conner Clere <xenanthropy AT sourcemage.org>
- * CONFIGURE: add HYPRLAND config_query
- * PRE_BUILD: added, if HYPRLAND=y then checkout
- appropriate commit id to sync wlroots version with hyprland
+ * PREPARE: add HYPRLAND config_query
+ * DETAILS: if HYPRLAND=y then SOURCE_URL = commit id
+ to sync wlroots version with hyprland
* DEPENDS: reworked dependencies (seatd, DEVICE-MANAGER,
xcb-util-errors, hwdata optional) xwayland hard dep if
x11 backend enabled; new (possible) deps: xcb-util-renderutil,
xcb-util-wm, libdisplay-info, libliftoff
+ * PRE_BUILD: removed

2023-03-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: https -> git_http for scm branch, dropped signature too
diff --git a/wm-addons/wlroots/PREPARE b/wm-addons/wlroots/PREPARE
index e38d86f..cd12abc 100755
--- a/wm-addons/wlroots/PREPARE
+++ b/wm-addons/wlroots/PREPARE
@@ -1,2 +1,6 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch stable scm
+prepare_select_branch stable scm &&
+
+if [[ $WLROOTS_BRANCH == "scm" ]]; then
+ config_query HYPRLAND "Checkout commit ID for hyprland?" n
+fi



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (d4f87f0cb7b519b49f438c56036fd8416260174c), Conner Clere, 03/08/2023

Archive powered by MHonArc 2.6.24.

Top of Page