Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (4e5d511d6cd9b7eddd9c06c78b5ab4618c131856)
  • Date: Sun, 14 Jan 2024 19:26:01 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

utils/xdg-desktop-portal-hyprland/CONFIGURE | 2 +-
utils/xdg-desktop-portal-hyprland/DEPENDS | 11 ++---------
utils/xdg-desktop-portal-hyprland/DETAILS | 6 +++---
utils/xdg-desktop-portal-hyprland/HISTORY | 5 +++++
utils/xdg-desktop-portal-hyprland/INSTALL | 4 +---
utils/xdg-desktop-portal-hyprland/PRE_BUILD | 6 +-----
6 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 4e5d511d6cd9b7eddd9c06c78b5ab4618c131856
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

utils/xdg-desktop-portal-hyprland: version 1.3.1

diff --git a/utils/xdg-desktop-portal-hyprland/CONFIGURE
b/utils/xdg-desktop-portal-hyprland/CONFIGURE
index 9f48d22..90942b1 100755
--- a/utils/xdg-desktop-portal-hyprland/CONFIGURE
+++ b/utils/xdg-desktop-portal-hyprland/CONFIGURE
@@ -1 +1 @@
-. "${GRIMOIRE}/MESON_CONFIGURE"
+. "${GRIMOIRE}/CMAKE_CONFIGURE"
diff --git a/utils/xdg-desktop-portal-hyprland/DEPENDS
b/utils/xdg-desktop-portal-hyprland/DEPENDS
index e4b27d3..ee6bf9c 100755
--- a/utils/xdg-desktop-portal-hyprland/DEPENDS
+++ b/utils/xdg-desktop-portal-hyprland/DEPENDS
@@ -1,4 +1,4 @@
-. "${GRIMOIRE}/MESON_DEPENDS" &&
+. "${GRIMOIRE}/CMAKE_DEPENDS" &&
depends xdg-desktop-portal &&
depends pipewire &&
depends hyprland &&
@@ -9,11 +9,4 @@ depends mesa &&
depends libdrm &&
depends sdbus-cpp &&
depends qt6base &&
-depends cmake &&
-depends make &&
-depends qt6wayland &&
-
-optional_depends systemd \
- 'systemd=enabled' \
- 'systemd=disabled' \
- 'for systemd unit'
+depends qt6wayland
diff --git a/utils/xdg-desktop-portal-hyprland/DETAILS
b/utils/xdg-desktop-portal-hyprland/DETAILS
index 0d793b5..42635a8 100755
--- a/utils/xdg-desktop-portal-hyprland/DETAILS
+++ b/utils/xdg-desktop-portal-hyprland/DETAILS
@@ -1,7 +1,7 @@
-. "${GRIMOIRE}/MESON_FUNCTIONS"
+. "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=xdg-desktop-portal-hyprland
- VERSION=1.2.6
-
SOURCE_HASH=sha256:ebb7194fbac953d3ec0aabc0845c3e6260be715f0c16f8904666724d4140e970
+ VERSION=1.3.1
+
SOURCE_HASH=sha256:60b390f326b84cc52657b735e3d7ba8f03aa3363672100dba47580984491611f
COMMIT_ID_PROTO=0c2ce70625cb30aef199cb388f99e19a61a6ce03

SOURCE2_HASH=sha256:48557ca194f48967ea51f6b5094b06646fd557877831c1cd5fd286f6428b0638
SOURCE=${SPELL}-${VERSION}.tar.gz
diff --git a/utils/xdg-desktop-portal-hyprland/HISTORY
b/utils/xdg-desktop-portal-hyprland/HISTORY
index 39c41d3..6787bc3 100644
--- a/utils/xdg-desktop-portal-hyprland/HISTORY
+++ b/utils/xdg-desktop-portal-hyprland/HISTORY
@@ -1,3 +1,8 @@
+2024-01-14 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFIGURE, DEPENDS, DETAILS, PRE_BUILD, INSTALL: version 1.3.1,
converted
+ to cmake, dropped optional dependency on systemd, removed meson
related
+ code and qt6base dependency checks
+
2023-12-29 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.2.6
* DEPENDS: made qt6base and friends non-optional
diff --git a/utils/xdg-desktop-portal-hyprland/INSTALL
b/utils/xdg-desktop-portal-hyprland/INSTALL
index 576322d..1552b6c 100755
--- a/utils/xdg-desktop-portal-hyprland/INSTALL
+++ b/utils/xdg-desktop-portal-hyprland/INSTALL
@@ -1,5 +1,3 @@
default_install &&
-if is_depends_enabled "${SPELL}" "qt6base"; then
- install -D "./hyprland-share-picker/build/hyprland-share-picker" \
+install -D "./hyprland-share-picker/build/hyprland-share-picker" \
"${INSTALL_ROOT}/usr/bin/hyprland-share-picker"
-fi
diff --git a/utils/xdg-desktop-portal-hyprland/PRE_BUILD
b/utils/xdg-desktop-portal-hyprland/PRE_BUILD
index 703bcdd..326e494 100755
--- a/utils/xdg-desktop-portal-hyprland/PRE_BUILD
+++ b/utils/xdg-desktop-portal-hyprland/PRE_BUILD
@@ -4,8 +4,4 @@ rm -r hyprland-protocols &&
unpack_file 2 &&
mv "hyprland-protocols-${COMMIT_ID_PROTO}" "hyprland-protocols" &&

-cd "${SOURCE_DIRECTORY}" &&
-
-if ! is_depends_enabled "${SPELL}" "qt6base"; then
- sed '/hyprland\-share\-picker/d' -i meson.build
-fi
+cd "${SOURCE_DIRECTORY}"



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (4e5d511d6cd9b7eddd9c06c78b5ab4618c131856), Pavel Vinogradov, 01/14/2024

Archive powered by MHonArc 2.6.24.

Top of Page