* [gentoo-commits] repo/gentoo:master commit in: gui-libs/wf-config/, gui-wm/wayfire/, gui-apps/wcm/, gui-apps/wf-shell/
@ 2020-06-06 2:00 Aaron Bauman
0 siblings, 0 replies; only message in thread
From: Aaron Bauman @ 2020-06-06 2:00 UTC (permalink / raw
To: gentoo-commits
commit: 5e95b1f9ac84775b95ce31f7c85b61fbdef8952c
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon May 18 23:57:53 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jun 6 01:56:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e95b1f9
gui-wm/wayfire: fix dependency versioning for building
Closes: https://bugs.gentoo.org/723760
added proper dependency versions of wlroots
also changed options to src_configure instead of
src_compile as per standard convention
not version bumping as this fixes compile bugs
and no runtime changes
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/15875
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
gui-apps/wcm/wcm-0.4.0.ebuild | 4 ++--
gui-apps/wcm/wcm-9999.ebuild | 4 ++--
gui-apps/wf-shell/wf-shell-0.4.0.ebuild | 6 +++---
gui-apps/wf-shell/wf-shell-9999.ebuild | 6 +++---
gui-libs/wf-config/wf-config-0.4.0.ebuild | 6 +++---
gui-libs/wf-config/wf-config-9999.ebuild | 6 +++---
gui-wm/wayfire/wayfire-0.4.0.ebuild | 6 +++---
gui-wm/wayfire/wayfire-9999.ebuild | 6 +++---
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/gui-apps/wcm/wcm-0.4.0.ebuild b/gui-apps/wcm/wcm-0.4.0.ebuild
index 8178a3b0d88..b59aeb83170 100644
--- a/gui-apps/wcm/wcm-0.4.0.ebuild
+++ b/gui-apps/wcm/wcm-0.4.0.ebuild
@@ -35,12 +35,12 @@ BDEPEND="
virtual/pkgconfig
"
-src_compile() {
+src_configure() {
local emesonargs=""
if use debug; then
emesonargs+=(
"-Db_sanitize=address,undefined"
)
fi
- meson_src_compile
+ meson_src_configure
}
diff --git a/gui-apps/wcm/wcm-9999.ebuild b/gui-apps/wcm/wcm-9999.ebuild
index 8178a3b0d88..b59aeb83170 100644
--- a/gui-apps/wcm/wcm-9999.ebuild
+++ b/gui-apps/wcm/wcm-9999.ebuild
@@ -35,12 +35,12 @@ BDEPEND="
virtual/pkgconfig
"
-src_compile() {
+src_configure() {
local emesonargs=""
if use debug; then
emesonargs+=(
"-Db_sanitize=address,undefined"
)
fi
- meson_src_compile
+ meson_src_configure
}
diff --git a/gui-apps/wf-shell/wf-shell-0.4.0.ebuild b/gui-apps/wf-shell/wf-shell-0.4.0.ebuild
index 9167682d0b6..ab448db2642 100644
--- a/gui-apps/wf-shell/wf-shell-0.4.0.ebuild
+++ b/gui-apps/wf-shell/wf-shell-0.4.0.ebuild
@@ -23,7 +23,7 @@ IUSE="+pulseaudio debug"
DEPEND="
dev-cpp/gtkmm:3.0=[wayland]
dev-libs/gobject-introspection
- ~gui-wm/wayfire-${PV}
+ ~gui-wm/wayfire-${PV}[debug=]
>=gui-libs/gtk-layer-shell-0.1
pulseaudio? ( media-sound/pulseaudio )
"
@@ -36,7 +36,7 @@ BDEPEND="
virtual/pkgconfig
"
-src_compile () {
+src_configure () {
local emesonargs=(
"$(meson_feature pulseaudio pulse)"
)
@@ -45,5 +45,5 @@ src_compile () {
"-Db_sanitize=address,undefined"
)
fi
- meson_src_compile
+ meson_src_configure
}
diff --git a/gui-apps/wf-shell/wf-shell-9999.ebuild b/gui-apps/wf-shell/wf-shell-9999.ebuild
index 9167682d0b6..ab448db2642 100644
--- a/gui-apps/wf-shell/wf-shell-9999.ebuild
+++ b/gui-apps/wf-shell/wf-shell-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="+pulseaudio debug"
DEPEND="
dev-cpp/gtkmm:3.0=[wayland]
dev-libs/gobject-introspection
- ~gui-wm/wayfire-${PV}
+ ~gui-wm/wayfire-${PV}[debug=]
>=gui-libs/gtk-layer-shell-0.1
pulseaudio? ( media-sound/pulseaudio )
"
@@ -36,7 +36,7 @@ BDEPEND="
virtual/pkgconfig
"
-src_compile () {
+src_configure () {
local emesonargs=(
"$(meson_feature pulseaudio pulse)"
)
@@ -45,5 +45,5 @@ src_compile () {
"-Db_sanitize=address,undefined"
)
fi
- meson_src_compile
+ meson_src_configure
}
diff --git a/gui-libs/wf-config/wf-config-0.4.0.ebuild b/gui-libs/wf-config/wf-config-0.4.0.ebuild
index 328ec180742..b52ae6b08e2 100644
--- a/gui-libs/wf-config/wf-config-0.4.0.ebuild
+++ b/gui-libs/wf-config/wf-config-0.4.0.ebuild
@@ -23,8 +23,8 @@ IUSE="debug"
DEPEND="
dev-libs/libevdev
dev-libs/libxml2
- gui-libs/wlroots
media-libs/glm
+ <=gui-libs/wlroots-0.10.1
"
RDEPEND="${DEPEND}"
@@ -35,12 +35,12 @@ BDEPEND="
virtual/pkgconfig
"
-src_compile () {
+src_configure () {
local emesonargs=""
if use debug; then
emesonargs+=(
"-Db_sanitize=address,undefined"
)
fi
- meson_src_compile
+ meson_src_configure
}
diff --git a/gui-libs/wf-config/wf-config-9999.ebuild b/gui-libs/wf-config/wf-config-9999.ebuild
index 328ec180742..3efe9aa8cc6 100644
--- a/gui-libs/wf-config/wf-config-9999.ebuild
+++ b/gui-libs/wf-config/wf-config-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="debug"
DEPEND="
dev-libs/libevdev
dev-libs/libxml2
- gui-libs/wlroots
+ ~gui-libs/wlroots-9999
media-libs/glm
"
@@ -35,12 +35,12 @@ BDEPEND="
virtual/pkgconfig
"
-src_compile () {
+src_configure () {
local emesonargs=""
if use debug; then
emesonargs+=(
"-Db_sanitize=address,undefined"
)
fi
- meson_src_compile
+ meson_src_configure
}
diff --git a/gui-wm/wayfire/wayfire-0.4.0.ebuild b/gui-wm/wayfire/wayfire-0.4.0.ebuild
index 96c6375e2b0..960c7938036 100644
--- a/gui-wm/wayfire/wayfire-0.4.0.ebuild
+++ b/gui-wm/wayfire/wayfire-0.4.0.ebuild
@@ -38,7 +38,7 @@ DEPEND="
gles2? ( media-libs/libglvnd[X] )
system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] )
!system-wfconfig? ( !gui-libs/wf-config )
- system-wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] )
+ system-wlroots? ( ~gui-libs/wlroots-0.10.0[elogind=,systemd=,X] )
!system-wlroots? ( !gui-libs/wlroots )
"
@@ -55,7 +55,7 @@ BDEPEND="
>=dev-libs/wayland-protocols-1.18
"
-src_compile(){
+src_configure() {
local emesonargs=(
$(meson_feature system-wfconfig use_system_wfconfig)
$(meson_feature system-wlroots use_system_wlroots)
@@ -66,7 +66,7 @@ src_compile(){
"-Db_sanitize=address,undefined"
)
fi
- meson_src_compile
+ meson_src_configure
}
src_install() {
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 96c6375e2b0..2ca45c4a7e8 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -38,7 +38,7 @@ DEPEND="
gles2? ( media-libs/libglvnd[X] )
system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] )
!system-wfconfig? ( !gui-libs/wf-config )
- system-wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] )
+ system-wlroots? ( >=gui-libs/wlroots-0.10.1[elogind=,systemd=,X] )
!system-wlroots? ( !gui-libs/wlroots )
"
@@ -55,7 +55,7 @@ BDEPEND="
>=dev-libs/wayland-protocols-1.18
"
-src_compile(){
+src_configure() {
local emesonargs=(
$(meson_feature system-wfconfig use_system_wfconfig)
$(meson_feature system-wlroots use_system_wlroots)
@@ -66,7 +66,7 @@ src_compile(){
"-Db_sanitize=address,undefined"
)
fi
- meson_src_compile
+ meson_src_configure
}
src_install() {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-06 2:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-06 2:00 [gentoo-commits] repo/gentoo:master commit in: gui-libs/wf-config/, gui-wm/wayfire/, gui-apps/wcm/, gui-apps/wf-shell/ Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox