diff --git a/pentoo/pentoo-desktop/files/xfce4-desktop.xml b/pentoo/pentoo-desktop/files/xfce4-desktop.xml deleted file mode 100644 index 7acc49dff..000000000 --- a/pentoo/pentoo-desktop/files/xfce4-desktop.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/pentoo/pentoo-desktop/files/xsettings.xml b/pentoo/pentoo-desktop/files/xsettings.xml index d38bc84f3..7c8f67781 100644 --- a/pentoo/pentoo-desktop/files/xsettings.xml +++ b/pentoo/pentoo-desktop/files/xsettings.xml @@ -31,7 +31,7 @@ - + diff --git a/pentoo/pentoo-desktop/pentoo-desktop-2025.3.ebuild b/pentoo/pentoo-desktop/pentoo-desktop-2025.3-r1.ebuild similarity index 98% rename from pentoo/pentoo-desktop/pentoo-desktop-2025.3.ebuild rename to pentoo/pentoo-desktop/pentoo-desktop-2025.3-r1.ebuild index 5103faf32..dae19f715 100644 --- a/pentoo/pentoo-desktop/pentoo-desktop-2025.3.ebuild +++ b/pentoo/pentoo-desktop/pentoo-desktop-2025.3-r1.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Pentoo meta ebuild to install all X and WM/DE related things" HOMEPAGE="https://www.pentoo.org" -SLOT="0" +S="${WORKDIR}" LICENSE="GPL-3" +SLOT="0" KEYWORDS="amd64 arm ~arm64 x86" IUSE="X cups enlightenment +firefox kde livecd-stage1 mate pentoo-in-a-container pentoo-full policykit pulseaudio +vnc +xfce" -S="${WORKDIR}" - #X windows stuff PDEPEND="X? ( !livecd-stage1? ( || ( x11-base/xorg-server dev-libs/wayland ) ) @@ -90,6 +89,7 @@ PDEPEND="${PDEPEND} x11-themes/tango-icon-theme xfce-base/thunar xfce-base/thunar-volman + xfce-base/xfdesktop[pentoo(-)] xfce-extra/thunar-archive-plugin xfce-extra/thunar-vcs-plugin xfce-base/tumbler @@ -135,7 +135,6 @@ src_install() { insinto /etc/skel/.config/xfce4 doins "${FILESDIR}"/helpers.rc insinto /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml - doins "${FILESDIR}"/xfce4-desktop.xml doins "${FILESDIR}"/xsettings.xml #gtk-theme-switch needs X so do it manually diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest new file mode 100644 index 000000000..356b31f48 --- /dev/null +++ b/xfce-base/xfdesktop/Manifest @@ -0,0 +1 @@ +DIST xfdesktop-4.20.1.tar.bz2 2527982 BLAKE2B b9ce68433181221c20b15bab27d1652ef044b0a1524d9acfbff12b40034f629af8b99eebb6b8874816cc37f4db4874ceca03eec51c7cf091795f0b934d3fd20b SHA512 11f422e31fb5b4f789ac61252a79ef9b139fd0a3e29f1346d5e3c06779567f1809fd78d751df5595cdb5510d0349e908276e85f6325b8ac90dfd00c79ca5d0e2 diff --git a/xfce-base/xfdesktop/metadata.xml b/xfce-base/xfdesktop/metadata.xml new file mode 100644 index 000000000..9506cf2cf --- /dev/null +++ b/xfce-base/xfdesktop/metadata.xml @@ -0,0 +1,11 @@ + + + + + sidhayn@gmail.com + Zero_Chaos + + + Build support for desktop icons (for example, launchers and folders) + + diff --git a/xfce-base/xfdesktop/xfdesktop-4.20.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.20.1.ebuild new file mode 100644 index 000000000..40c078fa9 --- /dev/null +++ b/xfce-base/xfdesktop/xfdesktop-4.20.1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg-utils + +DESCRIPTION="Desktop manager for the Xfce desktop environment" +HOMEPAGE=" + https://docs.xfce.org/xfce/xfdesktop/start + https://gitlab.xfce.org/xfce/xfdesktop/ +" +SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +# CC for /usr/share/backgrounds, see backgrounds/README.md +LICENSE="GPL-2+ CC-BY-SA-4.0" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +IUSE="libnotify pentoo pentoo-release +thunar wayland X" +REQUIRED_USE="|| ( wayland X )" + +DEPEND=" + >=x11-libs/cairo-1.16 + >=dev-libs/glib-2.72.0 + >=x11-libs/gtk+-3.24.0:3[wayland?,X?] + >=xfce-base/exo-0.11:= + >=xfce-base/garcon-0.6:= + >=xfce-base/libxfce4ui-4.18.0:=[X(+)?] + >=xfce-base/libxfce4util-4.13:= + >=xfce-base/libxfce4windowing-4.19.8:=[X?] + >=xfce-base/xfconf-4.19.3:= + libnotify? ( >=x11-libs/libnotify-0.7:= ) + thunar? ( + >=dev-libs/libyaml-0.2.5:= + >=xfce-base/thunar-4.17.10:= + ) + wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 ) + X? ( >=x11-libs/libX11-1.6.7 ) +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + dev-libs/glib + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +# pentoo-desktop depends on xfdesktop but it also installs the background we set in this ebuild +PDEPEND="pentoo? ( pentoo/pentoo-desktop )" + +src_configure() { + if use pentoo; then + if use pentoo-release; then + backdrop="--with-default-backdrop-filename=/usr/share/pentoo/wallpaper/domo-roolz.jpg" + else + backdrop="--with-default-backdrop-filename=/usr/share/pentoo/wallpaper/tux-winfly-killah.1600x1200.jpg" + fi + else + backdrop="" + fi + + local myconf=( + $(use_enable wayland) + $(use_enable X x11) + $(use_enable thunar file-icons) + $(use_enable thunar thunarx) + $(use_enable libnotify notifications) + ${backdrop} + # these aren't run via make check, they are only for manual use + --disable-tests + ) + + econf "${myconf[@]}" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +}