commit: 111df125781f2206940359a27f26358e1a887dcd Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Wed Apr 3 14:20:44 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Wed Apr 3 14:21:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=111df125
gui-libs/libdecor: add missing gtk useflag * improve ebuild Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com> gui-libs/libdecor/libdecor-0.2.2.ebuild | 20 +++++++++++++------- gui-libs/libdecor/libdecor-9999.ebuild | 21 ++++++++++++++------- gui-libs/libdecor/metadata.xml | 13 +++++++++++-- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/gui-libs/libdecor/libdecor-0.2.2.ebuild b/gui-libs/libdecor/libdecor-0.2.2.ebuild index 7a320ed516..1adc093e6b 100644 --- a/gui-libs/libdecor/libdecor-0.2.2.ebuild +++ b/gui-libs/libdecor/libdecor-0.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,21 +7,27 @@ inherit meson DESCRIPTION="A client-side decorations library for Wayland clients" HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor"; -SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"; - +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git"; + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"; + KEYWORDS="~amd64" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" -IUSE="+dbus examples" +IUSE="+dbus +gtk examples" DEPEND=" >=dev-libs/wayland-1.18 >=dev-libs/wayland-protocols-1.15 x11-libs/pango + x11-libs/cairo + x11-libs/gtk+ dbus? ( sys-apps/dbus ) examples? ( virtual/opengl - media-libs/mesa[egl(+)] + media-libs/mesa[opengl(+)] x11-libs/libxkbcommon ) " @@ -31,7 +37,7 @@ src_configure() { local emesonargs=( # Avoid auto-magic, built-in feature of meson -Dauto_features=disabled - + $(meson_feature gtk) $(meson_feature dbus) $(meson_use examples demo) -Dinstall_demo=true diff --git a/gui-libs/libdecor/libdecor-9999.ebuild b/gui-libs/libdecor/libdecor-9999.ebuild index bbcd2b2e3d..1adc093e6b 100644 --- a/gui-libs/libdecor/libdecor-9999.ebuild +++ b/gui-libs/libdecor/libdecor-9999.ebuild @@ -1,26 +1,33 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit meson git-r3 +inherit meson DESCRIPTION="A client-side decorations library for Wayland clients" HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor"; -EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git"; - +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git"; + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"; + KEYWORDS="~amd64" +fi LICENSE="MIT" SLOT="0" -IUSE="+dbus examples" +IUSE="+dbus +gtk examples" DEPEND=" >=dev-libs/wayland-1.18 >=dev-libs/wayland-protocols-1.15 x11-libs/pango + x11-libs/cairo + x11-libs/gtk+ dbus? ( sys-apps/dbus ) examples? ( virtual/opengl - media-libs/mesa[egl(+)] + media-libs/mesa[opengl(+)] x11-libs/libxkbcommon ) " @@ -30,7 +37,7 @@ src_configure() { local emesonargs=( # Avoid auto-magic, built-in feature of meson -Dauto_features=disabled - + $(meson_feature gtk) $(meson_feature dbus) $(meson_use examples demo) -Dinstall_demo=true diff --git a/gui-libs/libdecor/metadata.xml b/gui-libs/libdecor/metadata.xml index 67df2efa9f..954491ca9b 100644 --- a/gui-libs/libdecor/metadata.xml +++ b/gui-libs/libdecor/metadata.xml @@ -2,9 +2,18 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <use> - <flag name="dbus">Enable dbus to query current cursor theme </flag> + <flag name="dbus">Enable dbus to query current cursor theme </flag> + <flag name="gtk">Build GTK plugin</flag> <flag name="examples">Build and install examples</flag> </use> + <maintainer type="person"> + <email>[email protected]</email> + <name>James Le Cuirot</name> + </maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo Proxy Maintainers</name> + </maintainer> <maintainer type="person"> <email>[email protected]</email> <name>Gonçalo Negrier Duarte</name> @@ -12,4 +21,4 @@ <upstream> <remote-id type="freedesktop-gitlab">libdecor/libdecor</remote-id> </upstream> -</pkgmetadata> \ No newline at end of file +</pkgmetadata>
