Skip to Content.
Sympa Menu

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

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 (4689f4108081e872ee2e78b67302b6a9854a8384)
  • Date: Sun, 15 Oct 2023 05:12:21 +0000

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

windowmanagers/hyprland/DETAILS | 19 +---
windowmanagers/hyprland/HISTORY | 5 +
windowmanagers/hyprland/patches/hyprland-system-wlroots.patch | 41
++++------
3 files changed, 33 insertions(+), 32 deletions(-)

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

windowmanagers/hyprland: version 0.30.0

also properly changed the subprojects to their respective commit ids
that hyprland repo uses, should prevent any compile issues from using
newer commits of packages that may be incompatible with hyprland

diff --git a/windowmanagers/hyprland/DETAILS b/windowmanagers/hyprland/DETAILS
index f73c385..f7e3fe8 100755
--- a/windowmanagers/hyprland/DETAILS
+++ b/windowmanagers/hyprland/DETAILS
@@ -1,24 +1,21 @@
. "$GRIMOIRE/MESON_FUNCTIONS"
SPELL=hyprland
- VERSION=0.29.1
-
SOURCE_HASH=sha256:8509b283218c382c73866494970533eefb0a2e0dab70c05db6abb92c250e3325
+ VERSION=0.30.0
+
SOURCE_HASH=sha512:075718be059751e6ee997e0e0fa65263860d8965e45a3d66e6d463e5e45d69e73614fed6e759f712205d9e6deea46fe2770b6c394648056b23acefcd0435ccf4
SOURCE=Hyprland-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/hyprwm/${SPELL}/archive/refs/tags/v${VERSION}.tar.gz
# Watch: https://github.com/hyprwm/Hyprland/tags tags/v([0-9.]+)[.]tar
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Hyprland-${VERSION}"
SOURCE2="${SPELL}-protocols-scm.tar.xz"
-
SOURCE2_URL[0]="git_http://github.com/hyprwm/${SPELL}-protocols:${SPELL}-protocols-scm:main";
- SOURCE2_IGNORE="volatile"
-FORCE_DOWNLOAD[2]=on
+
SOURCE2_URL[0]="git_http://github.com/hyprwm/${SPELL}-protocols:${SPELL}-protocols-scm:4d29e48433270a2af06b8bc711ca1fe5109746cd";
+
SOURCE2_HASH=sha512:8fec666b6dd349e96e9ea367392161e99b1714a866b9a187f0b48a056c10c103abccc374aa4f2199fa8664ae3808ec750b9d0e1b752ce274e2d129c4c4c83dff
SOURCE3="udis86-scm.tar.xz"
- SOURCE3_URL[0]="git_http://github.com/canihavesomecoffee/udis86:udis86-scm";
- SOURCE3_IGNORE="volatile"
-FORCE_DOWNLOAD[3]=on
+
SOURCE3_URL[0]="git_http://github.com/canihavesomecoffee/udis86:udis86-scm:5336633af70f3917760a6d441ff02d93477b0c86";
+
SOURCE3_HASH=sha512:423a38f1f76d43107764b1f385e2a3eb93888ea2271912c568539b9c80afccf439a8c97808e1a55ce9c32970841f289c84bae50913cb24639437369f6d6bd5cb
if [[ "${SYSWLROOTS}" == "n" ]]; then
SOURCE4="${SPELL}-wlroots-scm.tar.xz"
-
SOURCE4_URL[0]="git_http://gitlab.freedesktop.org/wlroots/wlroots.git:${SPELL}-wlroots-scm:717ded9bb0191ea31bf4368be32e7a15fe1b8294";
- SOURCE4_IGNORE="volatile"
-FORCE_DOWNLOAD[4]=on
+
SOURCE4_URL[0]="git_http://gitlab.freedesktop.org/wlroots/wlroots.git:${SPELL}-wlroots-scm:98a745d926d8048bc30aef11b421df207a01c279";
+
SOURCE4_HASH=sha512:a0434dc32fbba5c231e7527e2ed06970829ee589440c421cc4cb55ee8d75f662017a79a40f15b86983861c38635c125bde4a8cae222392f90e3f50ceb5085742
fi
WEB_SITE=http://www.hyprland.org/
ENTERED=20230123
diff --git a/windowmanagers/hyprland/HISTORY b/windowmanagers/hyprland/HISTORY
index 1450611..09b5f9f 100644
--- a/windowmanagers/hyprland/HISTORY
+++ b/windowmanagers/hyprland/HISTORY
@@ -1,3 +1,8 @@
+2023-10-15 Conner Clere <xenanthropy AT sourcemage.org>
+ * DETAILS: version 0.30.0, changed subprojects to proper commid IDs
and added
+ source hash checks
+ * patches/hyprland-system-wlroots.patch: updated patch to work with
0.30.0
+
2023-09-16 Pavel Vinogradov <public AT sorcemage.org>
* DETAILS: version 0.29.1

diff --git a/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
b/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
index c855975..b61f633 100644
--- a/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
+++ b/windowmanagers/hyprland/patches/hyprland-system-wlroots.patch
@@ -1,42 +1,41 @@
-diff --git a/meson.build b/meson.build
-index f380255..0b43fc2 100644
---- a/meson.build
-+++ b/meson.build
+diff -urp a/meson.build b/meson.build
+--- a/meson.build 2023-10-14 22:54:39.226371688 -0500
++++ b/meson.build 2023-10-14 23:00:28.755390834 -0500
@@ -39,8 +39,19 @@ add_project_arguments(
],
language: 'cpp')

--wlroots = subproject('wlroots', default_options: ['examples=false'])
+-wlroots = subproject('wlroots', default_options: ['examples=false',
'renderers=gles2'])
-have_xwlr = wlroots.get_variable('features').get('xwayland')
+wlroots = dependency('wlroots', required: get_option('use_system_wlroots'))
+use_system_wlroots = not get_option('use_system_wlroots').disabled() and
wlroots.found()
+if not use_system_wlroots
-+ wlroots = subproject('wlroots', default_options :
['examples=false']).get_variable('wlroots')
++ wlroots = subproject('wlroots', default_options :
['examples=false']).get_variable('wlroots')
+endif
+
+have_xwlr = false
+if use_system_wlroots
-+ have_xwlr = cpp_compiler.get_define('WLR_HAS_XWAYLAND', prefix:
'#include <wlr/config.h>', dependencies: wlroots) == '1'
++ have_xwlr = cpp_compiler.get_define('WLR_HAS_XWAYLAND', prefix:
'#include <wlr/config.h>', dependencies: wlroots) == '1'
+else
-+ have_xwlr =
subproject('wlroots').get_variable('features').get('xwayland')
++ have_xwlr =
subproject('wlroots').get_variable('features').get('xwayland')
+endif
+
xcb_dep = dependency('xcb', required: get_option('xwayland'))

cmake = import('cmake')
-diff --git a/meson_options.txt b/meson_options.txt
-index d34c617..adf708f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1 +1,2 @@
+diff -urp a/meson_options.txt b/meson_options.txt
+--- a/meson_options.txt 2023-10-14 22:52:56.346366052 -0500
++++ b/meson_options.txt 2023-10-14 22:55:23.933374136 -0500
+@@ -1,3 +1,4 @@
+option('use_system_wlroots', type: 'feature', value: 'auto', description:
'Use the system-wide installation of wlroots')
option('xwayland', type: 'feature', value: 'auto', description: 'Enable
support for X11 applications')
-diff --git a/src/meson.build b/src/meson.build
-index 5d64188..1d8f7b2 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -5,9 +5,9 @@ executable('Hyprland', src,
- cpp_args: ['-DWLR_USE_UNSTABLE'],
+ option('systemd', type: 'feature', value: 'auto', description: 'Enable
systemd integration')
+ option('legacy_renderer', type: 'feature', value: 'disabled', description:
'Enable legacy renderer')
+diff -urp a/src/meson.build b/src/meson.build
+--- a/src/meson.build 2023-10-14 22:54:39.231371688 -0500
++++ b/src/meson.build 2023-10-14 22:55:36.874374845 -0500
+@@ -7,9 +7,9 @@ executable('Hyprland', src,
+ cpp_pch: 'pch/pch.hpp',
dependencies: [
server_protos,
+ wlroots,
@@ -44,5 +43,5 @@ index 5d64188..1d8f7b2 100644
dependency('wayland-client'),
- wlroots.get_variable('wlroots'),
dependency('cairo'),
- dependency('pango'),
- dependency('pangocairo'),
+ dependency('libdrm'),
+ dependency('egl'),



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (4689f4108081e872ee2e78b67302b6a9854a8384), Conner Clere, 10/15/2023

Archive powered by MHonArc 2.6.24.

Top of Page