public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Julien Roy" <julien@jroy.ca>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/xdg-desktop-portal-hyprland/
Date: Sat, 17 Feb 2024 21:06:30 +0000 (UTC)	[thread overview]
Message-ID: <1708203829.951d783222709a34bde6d9afd4edfbd9b98453fe.julien@gentoo> (raw)

commit:     951d783222709a34bde6d9afd4edfbd9b98453fe
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Feb 17 18:15:20 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Feb 17 21:03:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=951d7832

gui-libs/xdg-desktop-portal-hyprland: move hyprlang to BDEPEND

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 ... => xdg-desktop-portal-hyprland-1.3.1-r1.ebuild} | 21 +++++++++++++--------
 .../xdg-desktop-portal-hyprland-9999.ebuild         |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
similarity index 88%
copy from gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
copy to gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
index af03bb435c..f09bf0c356 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
@@ -22,19 +22,25 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="elogind systemd"
+IUSE="elogind qt6 systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=media-video/pipewire-0.3.41:=
 	dev-cpp/sdbus-c++
+	dev-libs/hyprlang:=
 	dev-libs/inih
 	dev-libs/wayland
-	dev-qt/qtbase
-	dev-qt/qtcore
-	dev-qt/qtgui
-	dev-qt/qtwayland:6
-	dev-qt/qtwidgets
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtwayland:6
+	)
+	!qt6? (
+		dev-qt/qtcore
+		dev-qt/qtgui
+		dev-qt/qtwidgets
+		dev-qt/qtwayland:5
+	)
 	media-libs/mesa
 	sys-apps/util-linux
 	x11-libs/libdrm
@@ -48,7 +54,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
-	dev-libs/hyprlang
 "
 
 BDEPEND="
@@ -83,7 +88,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch"
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch"
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
 }

diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
index af03bb435c..ac2bb3c938 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
@@ -28,6 +28,7 @@ REQUIRED_USE="?? ( elogind systemd )"
 DEPEND="
 	>=media-video/pipewire-0.3.41:=
 	dev-cpp/sdbus-c++
+	dev-libs/hyprlang:=
 	dev-libs/inih
 	dev-libs/wayland
 	dev-qt/qtbase
@@ -48,7 +49,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
-	dev-libs/hyprlang
 "
 
 BDEPEND="


WARNING: multiple messages have this Message-ID (diff)
From: "Julien Roy" <julien@jroy.ca>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: gui-libs/xdg-desktop-portal-hyprland/
Date: Sat, 17 Feb 2024 21:17:38 +0000 (UTC)	[thread overview]
Message-ID: <1708203829.951d783222709a34bde6d9afd4edfbd9b98453fe.julien@gentoo> (raw)
Message-ID: <20240217211738.qp8mKhviG3XoWdWQFTQ-2brOTpwbMSPu3_xqFH-niAo@z> (raw)

commit:     951d783222709a34bde6d9afd4edfbd9b98453fe
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Feb 17 18:15:20 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Feb 17 21:03:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=951d7832

gui-libs/xdg-desktop-portal-hyprland: move hyprlang to BDEPEND

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 ... => xdg-desktop-portal-hyprland-1.3.1-r1.ebuild} | 21 +++++++++++++--------
 .../xdg-desktop-portal-hyprland-9999.ebuild         |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
similarity index 88%
copy from gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
copy to gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
index af03bb435c..f09bf0c356 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.3.1-r1.ebuild
@@ -22,19 +22,25 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="elogind systemd"
+IUSE="elogind qt6 systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=media-video/pipewire-0.3.41:=
 	dev-cpp/sdbus-c++
+	dev-libs/hyprlang:=
 	dev-libs/inih
 	dev-libs/wayland
-	dev-qt/qtbase
-	dev-qt/qtcore
-	dev-qt/qtgui
-	dev-qt/qtwayland:6
-	dev-qt/qtwidgets
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtwayland:6
+	)
+	!qt6? (
+		dev-qt/qtcore
+		dev-qt/qtgui
+		dev-qt/qtwidgets
+		dev-qt/qtwayland:5
+	)
 	media-libs/mesa
 	sys-apps/util-linux
 	x11-libs/libdrm
@@ -48,7 +54,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
-	dev-libs/hyprlang
 "
 
 BDEPEND="
@@ -83,7 +88,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-9999_use_sys_sdbus-c++.patch"
+	eapply "${FILESDIR}/xdg-desktop-portal-hyprland-1.3.1_use_sys_sdbus-c++.patch"
 	sed -i "/add_compile_options(-O3)/d" "${S}/CMakeLists.txt" || die
 	cmake_src_prepare
 }

diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
index af03bb435c..ac2bb3c938 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-9999.ebuild
@@ -28,6 +28,7 @@ REQUIRED_USE="?? ( elogind systemd )"
 DEPEND="
 	>=media-video/pipewire-0.3.41:=
 	dev-cpp/sdbus-c++
+	dev-libs/hyprlang:=
 	dev-libs/inih
 	dev-libs/wayland
 	dev-qt/qtbase
@@ -48,7 +49,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	sys-apps/xdg-desktop-portal
-	dev-libs/hyprlang
 "
 
 BDEPEND="


             reply	other threads:[~2024-02-17 21:06 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-17 21:06 Julien Roy [this message]
2024-02-17 21:17 ` [gentoo-commits] repo/proj/guru:master commit in: gui-libs/xdg-desktop-portal-hyprland/ Julien Roy
  -- strict thread matches above, loose matches on Subject: below --
2025-06-07 13:35 [gentoo-commits] repo/proj/guru:dev " Filip Kobierski
2025-06-07 13:35 Filip Kobierski
2025-06-07 13:35 Filip Kobierski
2025-04-01 12:38 Filip Kobierski
2025-01-14 11:29 David Roman
2025-01-14 11:29 David Roman
2024-10-31 13:38 Filip Kobierski
2024-10-31 12:54 Filip Kobierski
2024-10-31 12:41 Filip Kobierski
2024-10-31 11:14 David Roman
2024-10-31  2:49 John M. Harris, Jr.
2024-10-30  6:48 Filip Kobierski
2024-10-29  5:28 Viorel Munteanu
2024-07-22 19:29 Gonçalo Negrier Duarte
2024-07-22 19:29 Gonçalo Negrier Duarte
2024-07-22 16:32 John M. Harris, Jr.
2024-07-06 19:05 Gonçalo Negrier Duarte
2024-07-06 19:04 Gonçalo Negrier Duarte
2024-07-06 18:51 Gonçalo Negrier Duarte
2024-07-06 18:42 Gonçalo Negrier Duarte
2024-07-06 18:42 Gonçalo Negrier Duarte
2024-07-03  4:57 John M. Harris, Jr.
2024-07-03  4:46 John M. Harris, Jr.
2024-02-07 12:48 Steffen Winter
2024-01-03 12:35 Gonçalo Negrier Duarte
2024-01-02 11:40 Gonçalo Negrier Duarte
2023-12-10  7:51 Remigiusz Micielski
2023-12-04 18:00 Remigiusz Micielski
2023-12-03  9:32 Remigiusz Micielski
2023-11-27 15:04 Remigiusz Micielski
2023-11-22 18:26 Remigiusz Micielski
2023-11-22 18:17 Remigiusz Micielski
2023-11-22 17:27 Remigiusz Micielski
2023-10-11 13:45 Mia Neufeld
2023-10-08  5:53 Remigiusz Micielski
2023-10-07  9:11 Remigiusz Micielski
2023-10-07  9:11 Remigiusz Micielski
2023-09-30 14:05 Mia Neufeld
2023-09-29 16:01 Remigiusz Micielski
2023-09-29 16:01 Remigiusz Micielski
2023-09-29 13:27 Remigiusz Micielski
2023-09-29 13:27 Remigiusz Micielski
2023-09-29 13:20 Remigiusz Micielski
2023-09-24 18:40 Remigiusz Micielski
2023-08-11 14:17 Remigiusz Micielski
2023-05-30 15:44 Remigiusz Micielski
2023-04-27 16:37 Remigiusz Micielski
2023-04-24 20:38 Remigiusz Micielski
2023-04-24 20:38 Remigiusz Micielski
2023-04-24 20:38 Remigiusz Micielski
2023-04-24 12:28 Remigiusz Micielski
2023-04-22  9:45 Remigiusz Micielski
2023-04-11  9:47 Remigiusz Micielski
2023-04-11  9:37 Remigiusz Micielski
2023-04-11  8:41 Remigiusz Micielski
2023-04-11  8:30 Remigiusz Micielski
2023-04-11  8:30 Remigiusz Micielski
2023-04-10 20:45 Remigiusz Micielski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1708203829.951d783222709a34bde6d9afd4edfbd9b98453fe.julien@gentoo \
    --to=julien@jroy.ca \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox