Skip to Content.
Sympa Menu

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

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 (f0aadda11e1df2ec8bc32860e9e2c0e662b87feb)
  • Date: Thu, 30 Mar 2023 14:30:51 +0000

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

utils/xdg-desktop-portal-hyprland/BUILD | 6 ++++--
utils/xdg-desktop-portal-hyprland/DEPENDS | 8 +++++++-
utils/xdg-desktop-portal-hyprland/HISTORY | 4 ++++
utils/xdg-desktop-portal-hyprland/INSTALL | 6 ++++--
4 files changed, 19 insertions(+), 5 deletions(-)

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

utils/xdg-desktop-portal-hyprland: added optional dependency on qt6base
thus
hyprland-share-picker is optional too

diff --git a/utils/xdg-desktop-portal-hyprland/BUILD
b/utils/xdg-desktop-portal-hyprland/BUILD
index b3c3f69..c4130a8 100755
--- a/utils/xdg-desktop-portal-hyprland/BUILD
+++ b/utils/xdg-desktop-portal-hyprland/BUILD
@@ -1,3 +1,5 @@
default_build &&
-cd hyprland-share-picker &&
-make all
+if is_depends_enabled "${SPELL}" "qt6base"; then
+ cd hyprland-share-picker &&
+ make all
+fi
diff --git a/utils/xdg-desktop-portal-hyprland/DEPENDS
b/utils/xdg-desktop-portal-hyprland/DEPENDS
index 58b1ea4..5644428 100755
--- a/utils/xdg-desktop-portal-hyprland/DEPENDS
+++ b/utils/xdg-desktop-portal-hyprland/DEPENDS
@@ -13,4 +13,10 @@ depends_one_of SD_BUS \
systemd 'sd-bus-provider=libsystemd systemd=enabled' \
elogind 'sd-bus-provider=libelogind' \
basu 'sd-bus-provider=basu' \
- 'sd-bus-provider'
+ 'sd-bus-provider' &&
+
+optional_depends qt6base "" "" "for hyprland-share-picker" &&
+if is_depends_enabled "${SPELL}" "qt6base"; then
+ depends cmake &&
+ depends make
+fi
diff --git a/utils/xdg-desktop-portal-hyprland/HISTORY
b/utils/xdg-desktop-portal-hyprland/HISTORY
index 9143460..40d2dc3 100644
--- a/utils/xdg-desktop-portal-hyprland/HISTORY
+++ b/utils/xdg-desktop-portal-hyprland/HISTORY
@@ -1,3 +1,7 @@
+2023-03-30 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, DEPENDS, INSTALL: added optional qt6ase and made
building/installing
+ of hyprland-share-picker optional as well
+
2023-03-29 Conner Clere <xenanthropy AT sourcemage.org>
* BUILD, INSTALL, CONFIGURE, DEPENDS, DETAILS: version 0.6.0, new
spell
* CONFLICTS: added, conflicts with all other portals besides gtk
diff --git a/utils/xdg-desktop-portal-hyprland/INSTALL
b/utils/xdg-desktop-portal-hyprland/INSTALL
index 2a2a08f..576322d 100755
--- a/utils/xdg-desktop-portal-hyprland/INSTALL
+++ b/utils/xdg-desktop-portal-hyprland/INSTALL
@@ -1,3 +1,5 @@
default_install &&
-install -D "./hyprland-share-picker/build/hyprland-share-picker" \
-"${INSTALL_ROOT}/usr/bin/hyprland-share-picker"
+if is_depends_enabled "${SPELL}" "qt6base"; then
+ install -D "./hyprland-share-picker/build/hyprland-share-picker" \
+ "${INSTALL_ROOT}/usr/bin/hyprland-share-picker"
+fi



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f0aadda11e1df2ec8bc32860e9e2c0e662b87feb), Pavel Vinogradov, 03/30/2023

Archive powered by MHonArc 2.6.24.

Top of Page