Skip to Content.
Sympa Menu

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

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, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (8be814d0cdd2fd4dc336d5b6ecf4196e671f9b5f)
  • Date: Wed, 14 May 2025 04:09:41 +0000

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

windowmanagers/hyprland/DETAILS | 7 ++++---
windowmanagers/hyprland/HISTORY | 4 ++++
windowmanagers/hyprland/PRE_BUILD | 7 ++++++-
3 files changed, 14 insertions(+), 4 deletions(-)

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

windowmanagers/hyprland: fix version.h issue

github source tarball doesn't have proper version.h and hyprland's
version generation script only works properly on git repos.
Vaxry releases a "source" release that has proper version.h
pre-generated, which fixes the issue.

diff --git a/windowmanagers/hyprland/DETAILS b/windowmanagers/hyprland/DETAILS
index 9d27e3d..f64c3d3 100755
--- a/windowmanagers/hyprland/DETAILS
+++ b/windowmanagers/hyprland/DETAILS
@@ -1,13 +1,14 @@
. "$GRIMOIRE/MESON_FUNCTIONS"
SPELL=hyprland
VERSION=0.49.0
-
SOURCE_HASH=sha512:9af6e517cf3abadb1745e5c7014ac1c88e0ee16a51400fcf4a3f13faf88a5be52f4b66ffd7e4a37cdc6351e460f53ab64547b5e1e2be73004c1084bd8b826715
+ PATCHLEVEL=1
+
SOURCE_HASH=sha512:d80d937efb5b1e5b97e2bd89cb077cb2bc5de2d6baaa32611f595a0705f8edf39e0aa9398e0aa4f202f7407ec419c0f7a632d635853b107974429f59d153c23c
UDIS86_COMMIT=5336633af70f3917760a6d441ff02d93477b0c86

SOURCE3_HASH=sha512:64fc65b7388db25b6a8b008b51e274753e5e8b1dbd48126bdd676a3d0276ce37a4140bc5d08d6499ab5e61f51109eb8b9d1b14588bf8dc6d44d1642305403a82
SOURCE=Hyprland-${VERSION}.tar.gz
-
SOURCE_URL[0]=https://github.com/hyprwm/${SPELL}/archive/refs/tags/v${VERSION}.tar.gz
+
SOURCE_URL[0]=https://github.com/hyprwm/Hyprland/releases/download/v${VERSION}/source-v${VERSION}.tar.gz
# Watch: https://github.com/hyprwm/Hyprland/tags tags/v([0-9.]+)[.]tar
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/Hyprland-${VERSION}"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/hyprland-source"
SOURCE3="udis86-${UDIS86_COMMIT}.tar.gz"

SOURCE3_URL[0]="https://github.com/canihavesomecoffee/udis86/archive/$UDIS86_COMMIT.tar.gz";
WEB_SITE=http://www.hyprland.org/
diff --git a/windowmanagers/hyprland/HISTORY b/windowmanagers/hyprland/HISTORY
index f58125e..b5254c3 100644
--- a/windowmanagers/hyprland/HISTORY
+++ b/windowmanagers/hyprland/HISTORY
@@ -1,3 +1,7 @@
+2025-05-13 Conner Clere <xenanthropy AT sourcemage.org>
+ * DETAILS: patchlevel added, updated source tarball to use "release"
source
+ * PRE_BUILD: added line to stop version script from running
+
2025-05-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.49.0

diff --git a/windowmanagers/hyprland/PRE_BUILD
b/windowmanagers/hyprland/PRE_BUILD
index cbb7d99..18ec9ff 100755
--- a/windowmanagers/hyprland/PRE_BUILD
+++ b/windowmanagers/hyprland/PRE_BUILD
@@ -2,4 +2,9 @@ default_pre_build &&
cd "${SOURCE_DIRECTORY}/subprojects" &&
unpack_file 3 &&
rm -rf "udis86" &&
-mv "${SOURCE3%.tar.gz}" "./udis86"
+mv "${SOURCE3%.tar.gz}" "./udis86" &&
+
+# delete running of version generation script,
+# we don't need it for tarball release
+cd "${SOURCE_DIRECTORY}" &&
+sed -i "/^run_command('sh', '-c', 'scripts\/generateVersion.sh', check:
true)/d" meson.build


  • [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (8be814d0cdd2fd4dc336d5b6ecf4196e671f9b5f), Conner Clere, 05/14/2025

Archive powered by MHonArc 2.6.24.

Top of Page