diff options
Diffstat (limited to 'x11-misc')
73 files changed, 947 insertions, 682 deletions
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest index a2be37478ac4..ea75a3b62cfd 100644 --- a/x11-misc/appmenu-gtk-module/Manifest +++ b/x11-misc/appmenu-gtk-module/Manifest @@ -1 +1,2 @@ DIST appmenu-gtk-module-0.7.6.tar.xz 41212 BLAKE2B 7d37107e36502e44a38a1dc4e7ab02a761ec368b791182b223a4ae2631bad2eb52d9fec913ae0274f95f15a1cfbefb47f4807f1e83e8e3985fd4af7c6f0d075b SHA512 6efad2a13a04ae0a2a5e87fdc62eb7a37c8c85051339a3774fd8b579eea97b4633b10e064325205b3f10597530bab003deae24986c3175429a899c292e8786d5 +DIST appmenu-gtk-module-24.05.tar.xz 41364 BLAKE2B 45593cad5431f1b12fd7bc710399f7be7ff381d5757672c90db42187197de67b80f4436fc402e59abfa164d6d659557fb5a57737020d4cda361a2904154e9878 SHA512 0b233e56663f1e46f35b8edda5ea551f9569f6ffc20730fc62fcc090cf14a4032d58c7b8f03f14b29e9433f8ccd9fc89e3de7be50141fba5f85f5bf219517fa7 diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild new file mode 100644 index 000000000000..d4570fc72a9d --- /dev/null +++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-24.05-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo gnome2-utils flag-o-matic meson systemd virtualx + +DESCRIPTION="Application menu module for GTK" +HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu" +SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/b5ace7bf5bd6e3ec3b20e98befb5da39/${P}.tar.xz" +# 24.05 really is a different release to 24.02 (diffed tarballs to check), +# but it has the wrong version in the directory name. +S="${WORKDIR}"/${PN}-24.02 + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="gtk2 test wayland" +# Tests are manual and hang in the ebuild +RESTRICT="!test? ( test ) test" + +RDEPEND=" + dev-libs/glib[dbus] + >=x11-libs/gtk+-3.22.0:3[wayland?] + gtk2? ( >=x11-libs/gtk+-2.24.0:2 ) +" +DEPEND=" + ${RDEPEND} + wayland? ( dev-libs/wayland ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-0.7.6-no-automagic-gtk.patch" + "${FILESDIR}/${PN}-24.05-no-automagic-unitdir.patch" + "${FILESDIR}/${PN}-24.05-fix-pkgconfig.patch" +) + +src_configure() { + # defang automagic dependencies, bug #785619 + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + + # outputs [ '2', '3' ] OR [ '3' ] + local gtks="[$(usex gtk2 " '2'," '') '3' ]" + + local emesonargs=( + -Dgtk="${gtks}" + -Duserunitdir="$(systemd_get_userunitdir)" + $(meson_use test tests) + ) + + meson_src_configure +} + +my_test() { + cd "${BUILD_DIR}"/tests || die + + local name + for name in hello radio tester ; do + edo ./${name} + done +} + +src_test() { + virtx my_test +} + +src_install() { + meson_src_install + + mv "${ED}"/usr/share/doc/appmenu-gtk-module/* "${ED}"/usr/share/doc/${PF} || die + rmdir "${ED}"/usr/share/doc/appmenu-gtk-module || die + + rm "${ED}"/usr/share/licenses/appmenu-gtk-module/LICENSE || die + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}"/${PN}-r1 85-${PN} +} + +pkg_postinst() { + gnome2_schemas_update +} diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch new file mode 100644 index 000000000000..76455dd55655 --- /dev/null +++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-fix-pkgconfig.patch @@ -0,0 +1,10 @@ +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project('appmenu-gtk-module', 'c', + meson_version: '>=0.61.0', +- version: '24.02', ++ version: '24.05', + license: ['LGPL-3.0-or-later'], + default_options: [ + 'c_std=gnu11', diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch new file mode 100644 index 000000000000..007462e767d8 --- /dev/null +++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-24.05-no-automagic-unitdir.patch @@ -0,0 +1,56 @@ +From c60d530583a8bd07aea22c4f3f3aa8b0aaf271c1 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Tue, 4 Jan 2022 19:06:37 -0800 +Subject: [PATCH] appmenu-gtk-module: add userunitdir option + +allows setting systemd unit on systemd-less systems + +Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> +--- + .../appmenu-gtk-module/data/meson.build | 19 ++++++++++++------- + .../appmenu-gtk-module/meson_options.txt | 1 + + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/subprojects/appmenu-gtk-module/data/meson.build b/subprojects/appmenu-gtk-module/data/meson.build +index 8378965..d0d1717 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,14 +2,19 @@ install_data([ + 'org.appmenu.gtk-module.gschema.xml' + ], install_dir: schema_dir) + ++userunitdir = get_option('userunitdir') + systemd = dependency('systemd', required: false) + +-if systemd.found() ++if userunitdir == '' ++ if systemd.found() + userunitdir = systemd.get_variable(pkgconfig:'systemduserunitdir') +- configure_file( +- input: 'appmenu-gtk-module.service.in', +- output: 'appmenu-gtk-module.service', +- install_dir: userunitdir, +- configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))} +- ) ++ else ++ userunitdir = '/usr/lib/systemd/user' ++ endif + endif ++configure_file( ++ input: 'appmenu-gtk-module.service.in', ++ output: 'appmenu-gtk-module.service', ++ install_dir: userunitdir, ++ configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))} ++) +diff --git a/subprojects/appmenu-gtk-module/meson_options.txt b/subprojects/appmenu-gtk-module/meson_options.txt +index f93877a..ec0b3a6 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,4 @@ + option('gtk', type: 'array', choices : ['2','3'], value: ['2','3'], description: 'Supported GTK versions') + option('tests', type : 'boolean', value : false, description: 'Parser tests') + option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference') ++option('userunitdir', type: 'string', description: 'Installation path for user unit file (optional)') +-- +2.34.1 + diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1 b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1 new file mode 100644 index 000000000000..328f390af48b --- /dev/null +++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-r1 @@ -0,0 +1,13 @@ +case :$GTK_MODULES: in + *:appmenu-gtk-module:*) + ;; + *) + GTK_MODULES=${GTK_MODULES}${GTK_MODULES:+:}appmenu-gtk-module +esac + +if [ -z "$UBUNTU_MENUPROXY" ]; then + UBUNTU_MENUPROXY=1 +fi + +export GTK_MODULES +export UBUNTU_MENUPROXY diff --git a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild index a3194cfe7320..939f15accb56 100644 --- a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild +++ b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit systemd +inherit optfeature systemd DESCRIPTION="Clipboard management" HOMEPAGE="https://github.com/cdown/clipmenu" @@ -49,7 +49,20 @@ src_install() { } pkg_postinst() { + optfeature "ignoring specific windows via CM_IGNORE_WINDOW" x11-misc/xdotool + + if systemd_is_booted || has_version sys-apps/systemd; then + einfo "" + einfo "Make sure to import \$DISPLAY when using the systemd unit for clipmenud" + einfo "without a desktop environment. Preferably check /etc/X11/xinit/xinitrc{,.d}" + einfo "for relevant examples, or at least include the following in your ~/.xinitrc" + einfo "before clipmenud:" + einfo "" + einfo "systemctl --user import-environment DISPLAY" + fi + if ! use dmenu && ! use fzf && ! use rofi ; then + ewarn "" ewarn "Clipmenu has been installed without a launcher." ewarn "You will need to set \$CM_LAUNCHER to a dmenu-compatible app for clipmenu to work." ewarn "Please refer to the documents for more info." diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml index ad77c07f77a8..40a619301ac7 100644 --- a/x11-misc/clipmenu/metadata.xml +++ b/x11-misc/clipmenu/metadata.xml @@ -9,6 +9,9 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">cdown/clipmenu</remote-id> + </upstream> <use> <flag name="dmenu">Use dmenu as default launcher</flag> <flag name="rofi">Use rofi as default launcher</flag> diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest index 25b09129264c..3803f6c183ed 100644 --- a/x11-misc/compose-tables/Manifest +++ b/x11-misc/compose-tables/Manifest @@ -1 +1,2 @@ +DIST libX11-1.8.10.tar.xz 1839380 BLAKE2B 72ff400e1aad5bcb04e5dd3fb43f7767fad47e38cf628382cd5ffd5a204efc4de4f626027dddbbc7e10f80f8eaee0bcdf9792d9d012256366920f7ae0cffcb15 SHA512 f801f5b77cbc55074f73dc95b29fff7b5e1b13b99641f6e397788ad9f31a29793ed4e8e5bd373122c790ef90627e8f9d6d5e271051c1767a479a85c55cd82bc1 DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96 diff --git a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild new file mode 100644 index 000000000000..7bbed1913eb7 --- /dev/null +++ b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild @@ -0,0 +1,46 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=no +XORG_TARBALL_SUFFIX=xz +inherit xorg-3 + +# Note: please bump this with x11-libs/libX11 +DESCRIPTION="X.Org Compose Key tables from libX11" +# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package +SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}" +S="${WORKDIR}/libX11-${PV}/" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# Only needed by configure +DEPEND=" + x11-base/xorg-proto + >=x11-libs/libxcb-1.11.1 + x11-libs/xtrans" +# RDEPEND="" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --without-xmlto + --without-fop + --disable-specs + --disable-xkb + --with-keysymdefdir="${ESYSROOT}/usr/include/X11" + ) + xorg-3_src_configure +} + +src_compile() { + emake -C nls +} + +src_test() { + :; +} + +src_install() { + emake DESTDIR="${D}" -C nls install +} diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest index 092518520b53..c9b144ae31ea 100644 --- a/x11-misc/copyq/Manifest +++ b/x11-misc/copyq/Manifest @@ -1,2 +1 @@ -DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4 DIST copyq-7.1.0.tar.gz 3351093 BLAKE2B 758271f6bb54760372b8b5ab84de7c91af874bd72a22c8c22d338705869eab5500fde90808b4bf1288f8bdbad11163283637b81d85c09ccf0d734286dee605b6 SHA512 4320095ab75c361cc3d553c7817951eb6e74d47223f62bf6c1722e0f0b0d3ff59a1762354cf46fe0de064d516d60a467bff9ad9143b12016fc3f9e62139d3909 diff --git a/x11-misc/copyq/copyq-7.0.0.ebuild b/x11-misc/copyq/copyq-7.0.0.ebuild deleted file mode 100644 index d93363879bb5..000000000000 --- a/x11-misc/copyq/copyq-7.0.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake edo optfeature virtualx xdg - -DESCRIPTION="Clipboard manager with advanced features" -HOMEPAGE="https://github.com/hluk/CopyQ" -SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CopyQ-${PV}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug kde qt6 test" -RESTRICT="test" - -RDEPEND=" - dev-libs/wayland - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXtst - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwayland:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - kde? ( kde-frameworks/knotifications:5 ) - test? ( dev-qt/qttest:5 ) - ) - qt6? ( - dev-qt/qtbase:6=[X,gui,network,widgets,xml(+)] - dev-qt/qtdeclarative:6 - dev-qt/qtsvg:6 - dev-qt/qtwayland:6 - ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - kde-frameworks/extra-cmake-modules:0 - !qt6? ( - dev-qt/linguist-tools:5 - dev-qt/qtwaylandscanner:5 - ) - qt6? ( - dev-qt/qttools:6[linguist] - dev-qt/qtwayland:6 - dev-util/wayland-scanner - ) - test? ( - app-crypt/gnupg - x11-wm/icewm - ) -" - -src_configure() { - if use debug; then - # Add debug definitions - CMAKE_BUILD_TYPE="Debug" - fi - - local mycmakeargs=( - -DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" - -DWITH_NATIVE_NOTIFICATIONS=$(usex kde) - -DWITH_QT6=$(usex qt6) - -DWITH_TESTS=$(usex test) - ) - - cmake_src_configure -} - -my_src_test() { - local -x COPYQ_TESTS_RERUN_FAILED=0 - local -x COPYQ_TESTS_NO_NETWORK=1 - - ebegin "Starting IceWM" - icewm & - sleep 5 - eend 0 - - cd "${BUILD_DIR}" || die - mkdir -p "${HOME}"/.gnupg || die - - # ScriptError: Failed to send key presses - edo ./copyq tests -} - -src_test() { - virtx my_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "encryption support" app-crypt/gnupg -} diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest index 309b824fe76e..ae656c25fbcf 100644 --- a/x11-misc/fraqtive/Manifest +++ b/x11-misc/fraqtive/Manifest @@ -1 +1,2 @@ +DIST fraqtive-0.4.8.1.tar.gz 291381 BLAKE2B a5f93d42767c35ff7e27c87e89133a1c9d045acbb8b59c87799c5b838361aaba47af6ef001914f29eb27e2830ec3bdebe36111c1ae65e1f18a219367d168397c SHA512 d08659305dcc698a1fd0a81a833e4ffb8bc6496f7a95d7908d9f64ba1b51f9585be9b51ff44a15ca3a051d478ba0e04803f16cfd9abc56f426c8aa2f3e094c80 DIST fraqtive-0.4.8.tar.bz2 260484 BLAKE2B 0bbbd983af324c38fb73db043e808de6cbf8e3e39073163b748215a2a3a374e53e4118b7fb0993685d3eef4ef6b65afcc51c5a7d23f4ab91ffc2dfd41305171d SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942 diff --git a/x11-misc/fraqtive/fraqtive-0.4.8.1.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8.1.ebuild new file mode 100644 index 000000000000..94004917cc29 --- /dev/null +++ b/x11-misc/fraqtive/fraqtive-0.4.8.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils toolchain-funcs xdg + +DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals" +HOMEPAGE="https://fraqtive.mimec.org/ https://github.com/mimecorg/fraqtive" +SRC_URI="https://github.com/mimecorg/fraqtive/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cpu_flags_x86_sse2" + +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtxml:5 + virtual/glu +" +RDEPEND="${DEPEND}" + +src_configure() { + tc-export PKG_CONFIG + sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die + local conf="release" + + if use cpu_flags_x86_sse2; then + conf="$conf sse2" + else + conf="$conf no-sse2" + fi + + echo "CONFIG += $conf" > config.pri || die + echo "PREFIX = ${EPREFIX}/usr" >> config.pri || die + # Don't strip wrt #252096 + echo "QMAKE_STRIP =" >> config.pri || die + + eqmake5 +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} diff --git a/x11-misc/i3blocks/i3blocks-1.5-r2.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r2.ebuild new file mode 100644 index 000000000000..416be1d800fd --- /dev/null +++ b/x11-misc/i3blocks/i3blocks-1.5-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 + +DESCRIPTION="highly flexible status line for the i3 window manager" +HOMEPAGE="https://github.com/vivien/i3blocks" +SRC_URI="https://github.com/vivien/i3blocks/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+contrib" + +PDEPEND="contrib? ( x11-misc/i3blocks-contrib )" + +PATCHES=( "${FILESDIR}"/${PN}-disable-bash-completion.patch ) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + newbashcomp bash-completion ${PN} +} diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest index 963a57ad07c0..3ed401135cf9 100644 --- a/x11-misc/i3lock/Manifest +++ b/x11-misc/i3lock/Manifest @@ -1,2 +1 @@ -DIST i3lock-2.14.1.tar.xz 28756 BLAKE2B b38a3fafeebb5f8cebb643baeb875922659b556a5f919c2a837923e45e8f91a5f3ce297a424414ec9f05255e5888b91723617d837e5ffdbdf81aded42edc34cb SHA512 63b6bd73f66654fe52639434f7d3da64006144ec2ed685ba8683186730d4cc2c10d5aa66174f965030030243f59afaf6def3ff732f710ae441410218f84d6deb DIST i3lock-2.15.tar.xz 29100 BLAKE2B e84622e34a54681e162a3012c21fea4cc8b93a66e466647d65cc85f1a874d2be4d9988d54db74165b3dd1eccca1ca257a74b64ddbce08d681c9fc1c78701ee88 SHA512 6079f5233c0820c6e38f3cd8f3732d585e95e7d670408e4fb18ab580a2e1face8f3d6ea13eaaeedc8671f74def917183667e736b35306bf7c630d40625b41ac2 diff --git a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild b/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild deleted file mode 100644 index ce0e41df1a3b..000000000000 --- a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Simple screen locker" -HOMEPAGE="https://i3wm.org/i3lock/" -SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" - -RDEPEND=" - dev-libs/libev - sys-libs/pam - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb - x11-libs/libxkbcommon[X] - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-xrm" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - sed -i -e 's:login:system-auth:g' pam/${PN} || die -} diff --git a/x11-misc/i3lock/i3lock-2.15.ebuild b/x11-misc/i3lock/i3lock-2.15.ebuild index 512d70eb36e7..a201f2e984f9 100644 --- a/x11-misc/i3lock/i3lock-2.15.ebuild +++ b/x11-misc/i3lock/i3lock-2.15.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" RDEPEND=" dev-libs/libev diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest index 11475aab7087..685e7af970b0 100644 --- a/x11-misc/j4-dmenu-desktop/Manifest +++ b/x11-misc/j4-dmenu-desktop/Manifest @@ -1,2 +1,2 @@ -DIST j4-dmenu-desktop-2.18.tar.gz 34785 BLAKE2B 26d5861d6d7ddcd9653a464d1175d19532001705de193811087fd42fddbdead89b8d49bd14f8e323288d6a7ba37bd4e11f4c7c52dd9b0a454f95a83a14853bcb SHA512 f8b0c825d567d60da0fb418e6f0b24a6d9daa9fb142b194b0a8b249303f4e09b6694fce72bf031007ac67253e488fc7666d4ba7beb032bc74cc2a32aca0f6c96 DIST j4-dmenu-desktop-3.0.tar.gz 87265 BLAKE2B 63fb87b98e500b1adba188b0b523ef0c2449826e7fa5b5ca442c451ff5003160a9f6803cdb3c918da366447355b9312b9bf0ece4a7d2eebe427da4edf219f881 SHA512 9823428477600f3ab284dc80f6baef20b5f22b34269317f491c65e7331817f5a0115af20e05acb7f2c66f021f7c2d683c332a334f03088d867319926eaa4568a +DIST j4-dmenu-desktop-3.1.tar.gz 108974 BLAKE2B fd0527ee27855ef453b76e52cd15402bb86b9812255edacfacd5b5486162b052eb74d41f072fcf151837698d352dfa743a6bd30cd28156f62ddafc39d2402edb SHA512 6baa4bdf0564683e09bf3dd34f619ec9dcfc840be68ec0f68b4cd643bee5acbc09ebfffaf82daced991899fb467c84ed441257915a9c6b411f317e9947471fca diff --git a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch deleted file mode 100644 index 269044a01ba7..000000000000 --- a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/enkore/j4-dmenu-desktop/pull/139 - -From 53e318f155875562b22318395461b836e9ec7e8b Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Tue, 18 Apr 2023 11:08:53 +0100 -Subject: [PATCH] Fix build with GCC 13 - -GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some -are no longer transitively included. - -See https://gnu.org/software/gcc/gcc-13/porting_to.html. - -Bug: https://bugs.gentoo.org/895200 ---- a/src/Application.hh -+++ b/src/Application.hh -@@ -19,7 +19,8 @@ - #define APPLICATION_DEF - - #include <algorithm> --#include <string.h> -+#include <cstdint> -+#include <cstring> - #include <unistd.h> - - #include "Utilities.hh" diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild index e56bc1b3ab29..a44226418300 100644 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+dmenu test" RESTRICT="!test? ( test )" diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild index 0e03d6f0d6be..e56bc1b3ab29 100644 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,16 +14,19 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="+dmenu test" RESTRICT="!test? ( test )" -DEPEND="test? ( dev-cpp/catch:1 )" -RDEPEND="dmenu? ( x11-misc/dmenu )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.18-gcc13.patch -) +BDEPEND="test? ( dev-cpp/catch:0 )" +DEPEND=" + dev-libs/libfmt:= + dev-libs/spdlog:= +" +RDEPEND=" + ${DEPEND} + dmenu? ( x11-misc/dmenu ) +" src_prepare() { cmake_src_prepare @@ -34,6 +37,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DNO_DOWNLOAD="ON" -DWITH_GIT_CATCH="no" -DWITH_TESTS="$(usex test)" ) diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest index 6a32cca715ac..206289477787 100644 --- a/x11-misc/kronometer/Manifest +++ b/x11-misc/kronometer/Manifest @@ -1 +1,2 @@ DIST kronometer-2.3.0.tar.xz 136140 BLAKE2B b5ae57711b06ff53d3d096b6ce004620951132f4ab451aeaf67ac679e5154a4942d3cb910ed1d64ac32473b7fde59da0fd3b143171bb6f81ff29b81b29eceb2d SHA512 23321db24a0850be744765dc5eb17b3848d82b20e0bcc0520b5ee9bce6537650405aafeb435248459fd924fcfcd8acc113d8ca440edadd1d7c8f86dc282dd2e2 +DIST kronometer-2.3.70_pre20240906-e87e16c8.tar.gz 203320 BLAKE2B 572da633cdd5ce7609e1ddb59c8677603b87951a4b766d64a56b31644bb25b957e15328cf96afc13c6032fca117b86726d523292c961a058cda706f6ae1939e5 SHA512 040ba702a4b4086f90b526922abcb54f3f00f68b130241b8ae7eb057e5f774a21c32df34d267502f904c1e6947fd6dada48de96806b1f0d357004a6b4c27db92 diff --git a/x11-misc/kronometer/kronometer-2.3.0.ebuild b/x11-misc/kronometer/kronometer-2.3.0.ebuild index 0c50aa9f6fd0..0ceb59594704 100644 --- a/x11-misc/kronometer/kronometer-2.3.0.ebuild +++ b/x11-misc/kronometer/kronometer-2.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer" SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" LICENSE="GPL-2+" -SLOT="5" +SLOT="0" KEYWORDS="amd64" DEPEND=" diff --git a/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild b/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild new file mode 100644 index 000000000000..084a23885c8c --- /dev/null +++ b/x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=e87e16c8e623a8f5646f5286ac02ac9298dbb235 +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=6.5.0 +QTMIN=6.7.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Stopwatch application" +HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +RDEPEND="${DEPEND}" diff --git a/x11-misc/kronometer/metadata.xml b/x11-misc/kronometer/metadata.xml index d925f2439758..3ab22ed86477 100644 --- a/x11-misc/kronometer/metadata.xml +++ b/x11-misc/kronometer/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kronometer</bugs-to> + <remote-id type="kde-invent">kde/kronometer</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest index 9b0e7421cee2..7cb3b391105d 100644 --- a/x11-misc/libinput-gestures/Manifest +++ b/x11-misc/libinput-gestures/Manifest @@ -1,2 +1 @@ -DIST libinput-gestures-2.73.tar.gz 28771 BLAKE2B 9f3c546b637b0038431517e2df5e3dfba4fbb7db708f108dd7a979e6674b2bdd44b2b877b5e200c05373a57bfeffefadfde59bc6c403f7188e349c2e051d8683 SHA512 8e46931c76541eb836b1bd79295f05fdc0e22091d1693eac1cc9c16407830806f9e56819e5fb8ba3eed7a26664946010d24d62d99131bcf71b1d8a3682f34ec6 DIST libinput-gestures-2.76.tar.gz 28913 BLAKE2B d1c610af1eaf48170c08bea1eb92ce3cc36efc8f8035ea5f00cdf151bfe5c8d14368e4a37f8eb9cca7e59742136ba65909c9a468ba254a78d35dcaba7500ce62 SHA512 001c6c64e9ca52b4a7453837448803c797cc746fac04ad15613aa20a6bb33c44b441c343dfa56f23fa195fc7216a6d6c00a88f13e39481a12654a3a1a6dbdd98 diff --git a/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch b/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch deleted file mode 100644 index 4d14f13f2b8d..000000000000 --- a/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/internal b/internal -index 432179d..6898173 100755 ---- a/internal -+++ b/internal -@@ -1,7 +1,7 @@ - #!/usr/bin/env python3 - 'Command line program to exercise/test/debug the _internal command.' - # Mark Blakeney, Oct 2019 --import sys, importlib, argparse -+import sys, importlib.util, importlib.machinery, argparse - from pathlib import Path - - CMD = '_internal' diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild deleted file mode 100644 index 93c9ae3b00fb..000000000000 --- a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit python-single-r1 xdg - -DESCRIPTION="Actions gestures on your touchpad using libinput" -HOMEPAGE="https://github.com/bulletmark/libinput-gestures" -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git" -else - SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -# This is completely broken -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libinput - x11-misc/wmctrl - x11-misc/xdotool -" -DEPEND=" - dev-libs/libinput - dev-util/desktop-file-utils -" - -PATCHES=( - "${FILESDIR}/${P}-python-39-tests.patch" -) - -src_prepare() { - default - - # Fix docdir installation path - sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \ - || die "sed failed for libinput-gestures-setup" -} - -src_test() { - emake test -} - -src_install() { - default - # Actually respect the python target setting - python_doscript "${PN}" -} - -pkg_postinst() { - xdg_icon_cache_update - - elog "You must be in the input group to read the touchpad device." - - if ! has_version x11-libs/gtk+:3 ; then - elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3." - fi - if ! has_version kde-plasma/kde-cli-tools:5 ; then - elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5." - fi -} diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild index f6e072b536d2..2d50443a9876 100644 --- a/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild +++ b/x11-misc/libinput-gestures/libinput-gestures-2.76.ebuild @@ -53,7 +53,7 @@ pkg_postinst() { if ! has_version x11-libs/gtk+:3 ; then elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3." fi - if ! has_version kde-plasma/kde-cli-tools:5 ; then - elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5." + if ! has_version kde-plasma/kdesu-gui ; then + elog "${PN}-setup script supports Plasma via kde-plasma/kdesu-gui." fi } diff --git a/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild index b0ae015ea719..78615491ee6e 100644 --- a/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild +++ b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild @@ -47,6 +47,7 @@ DEPEND="${COMMON_DEPEND} gnome? ( gnome-base/gnome-common ) " BDEPEND=" + app-text/yelp-tools dev-build/gtk-doc-am dev-util/intltool sys-devel/gettext diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild index 68c3f864159d..92ef246fac77 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-2.0.0.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~riscv" fi LICENSE="GPL-2 GPL-2+ LGPL-2.1+" diff --git a/x11-misc/pcmanfm/files/pcmanfm-1.3.2-c99.patch b/x11-misc/pcmanfm/files/pcmanfm-1.3.2-c99.patch new file mode 100644 index 000000000000..52337891d5d6 --- /dev/null +++ b/x11-misc/pcmanfm/files/pcmanfm-1.3.2-c99.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/919077 +https://github.com/lxde/pcmanfm/pull/17 + +From 9bf5145eba45cd5e3b87d4f040618fe0ea69a81d Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Fri, 26 Jul 2024 12:13:32 +0900 +Subject: [PATCH] Fix build with gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to gcc -Werror=incompatible-pointer-types . +This commit adds required casts to different pointer types. +--- a/src/desktop.c ++++ b/src/desktop.c +@@ -1267,7 +1267,7 @@ static AtkObject *fm_desktop_accessible_ref_selection(AtkSelection *selection, + item = items->data; + if (item->item->is_selected) + if (i-- == 0) +- return g_object_ref(item); ++ return (AtkObject *)g_object_ref(item); + } + return NULL; + } +@@ -1454,7 +1454,7 @@ static AtkObject *fm_desktop_accessible_ref_child(AtkObject *accessible, + item = g_list_nth_data(priv->items, index); + if (!item) + return NULL; +- return g_object_ref(item); ++ return (AtkObject *)g_object_ref(item); + } + + static void fm_desktop_accessible_initialize(AtkObject *accessible, gpointer data) + diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2-r2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r2.ebuild new file mode 100644 index 000000000000..27188a32160d --- /dev/null +++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="${PN}-${PV/_/}" +inherit xdg readme.gentoo-r1 + +DESCRIPTION="Fast lightweight tabbed filemanager" +HOMEPAGE="https://github.com/lxde/pcmanfm" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~riscv ~x86" +IUSE="debug" + +RDEPEND=" + dev-libs/atk + >=dev-libs/glib-2.18:2 + >=lxde-base/menu-cache-1.1.0-r1 + sys-apps/util-linux + virtual/freedesktop-icon-theme + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + >=x11-libs/libfm-${PV}:=[gtk] + x11-libs/libX11 + x11-libs/pango + x11-misc/shared-mime-info +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.2-c99.patch +) + +src_configure() { + econf \ + --sysconfdir="${EPREFIX}"/etc \ + --with-gtk=3 \ + $(use_enable debug) +} + +src_install() { + default + + local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ + location. You should install lxde-base/lxmenu-data for that functionality." + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest index a0f2cfe13f4c..3701a0dc928f 100644 --- a/x11-misc/polybar/Manifest +++ b/x11-misc/polybar/Manifest @@ -1,2 +1,2 @@ -DIST polybar-3.6.3.tar.gz 439838 BLAKE2B 522e95bb11e947008f0909401a769ba7ef44733e7edb4a067185bad610ac70077e1370e0e9da9fbff27b9f981b5285561f7c86e12fc5da79c383d794da6b4a86 SHA512 d8e08d2b217a353b967f58eb61907b05ed7b9c2b9e1b3a891f4cac91b37f1cf751b10b1e93e74e6414eb0beb1696f4ae64a0a43bfc6c0afa3863b72293217c2e DIST polybar-3.7.1.tar.gz 495162 BLAKE2B 33ffb3bb3595a41cb82a5ee70c79f5a31f23b6463c156a704546c803f0f006780c59b04fe2d1479f52dd15a44534687f130dfde794ac08218df2b634b34838de SHA512 cb248fd904a89dbd88d2d1ab71aeaf31e2b5781304f126aeb489da1238681e354d5347555076e814751ef5bb6717a3a6742d1726cf4721697e75694c7643bed4 +DIST polybar-3.7.2.tar.gz 494383 BLAKE2B dda97c42de5f32a005ae6d4de737651278df0364187c735d7fa8a6d34e644b917ba3f32859cc19bd869c43f5d14f73ca734a4227651eb267724d808e4a766e08 SHA512 a0ee701533e101789f7eb95c71717ecf1d389a10b202d19261f9f71fee9d43fb8be17fb63e4a056c5e8bd62d2e669c95ee4d4b8c6bb06b933e1e4b26ab1a0624 diff --git a/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch b/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch deleted file mode 100644 index 1007d7237af7..000000000000 --- a/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f71801c8..0979f8af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,7 +63,7 @@ endif() - - if(BUILD_CONFIG) - install(FILES ${CMAKE_SOURCE_DIR}/doc/config.ini -- DESTINATION /etc/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME} - COMPONENT config) - endif() - diff --git a/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch b/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch new file mode 100644 index 000000000000..97d9a4c7720b --- /dev/null +++ b/x11-misc/polybar/files/polybar-3.7.2-gcc15-cstdint-includes.patch @@ -0,0 +1,97 @@ +commit e79b671aa7bc4edbae5d8272d523caa092f7548d +Author: John Helmert III <ajak@gentoo.org> +Date: Fri Aug 30 23:13:23 2024 -0700 + + add missing cstdint includes + + In GCC 15, cstdint is less commonly included in stdlib headers so we + need explicit includes: https://gcc.gnu.org/gcc-15/porting_to.html + + See-Also: https://bugs.gentoo.org/937526 + Signed-off-by: John Helmert III <ajak@gentoo.org> + +diff --git a/include/ipc/decoder.hpp b/include/ipc/decoder.hpp +index 9d1afe1c..dcdf9e1a 100644 +--- a/include/ipc/decoder.hpp ++++ b/include/ipc/decoder.hpp +@@ -5,6 +5,8 @@ + #include "errors.hpp" + #include "ipc/msg.hpp" + ++#include <cstdint> ++ + POLYBAR_NS + + namespace ipc { +diff --git a/include/ipc/encoder.hpp b/include/ipc/encoder.hpp +index 1fd36f60..ebb1ea82 100644 +--- a/include/ipc/encoder.hpp ++++ b/include/ipc/encoder.hpp +@@ -4,6 +4,8 @@ + #include "errors.hpp" + #include "ipc/msg.hpp" + ++#include <cstdint> ++ + POLYBAR_NS + + namespace ipc { +diff --git a/include/ipc/msg.hpp b/include/ipc/msg.hpp +index 1b37022d..a423d3bb 100644 +--- a/include/ipc/msg.hpp ++++ b/include/ipc/msg.hpp +@@ -3,6 +3,7 @@ + #include "common.hpp" + + #include <array> ++#include <cstdint> + + POLYBAR_NS + +diff --git a/include/utils/color.hpp b/include/utils/color.hpp +index 491d48ee..9d301af7 100644 +--- a/include/utils/color.hpp ++++ b/include/utils/color.hpp +@@ -1,6 +1,7 @@ + #pragma once + + #include <cstdlib> ++#include <cstdint> + + #include "common.hpp" + +diff --git a/include/utils/string.hpp b/include/utils/string.hpp +index 45eaec06..27e06f7a 100644 +--- a/include/utils/string.hpp ++++ b/include/utils/string.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> + #include <sstream> + + #include "common.hpp" +diff --git a/src/ipc/encoder.cpp b/src/ipc/encoder.cpp +index 87cbd915..38da55a1 100644 +--- a/src/ipc/encoder.cpp ++++ b/src/ipc/encoder.cpp +@@ -2,6 +2,7 @@ + + #include <cassert> + #include <cstring> ++#include <cstdint> + + POLYBAR_NS + +diff --git a/src/utils/color.cpp b/src/utils/color.cpp +index 59fa59ae..7e47dad5 100644 +--- a/src/utils/color.cpp ++++ b/src/utils/color.cpp +@@ -1,6 +1,7 @@ + #include "utils/color.hpp" + + #include <algorithm> ++#include <cstdint> + + POLYBAR_NS + diff --git a/x11-misc/polybar/polybar-3.7.1-r1.ebuild b/x11-misc/polybar/polybar-3.7.1-r1.ebuild index e6bbf888dce8..acdb2155246d 100644 --- a/x11-misc/polybar/polybar-3.7.1-r1.ebuild +++ b/x11-misc/polybar/polybar-3.7.1-r1.ebuild @@ -5,15 +5,15 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake python-single-r1 +inherit cmake optfeature python-single-r1 DESCRIPTION="A fast and easy-to-use tool for creating status bars" HOMEPAGE="https://github.com/polybar/polybar" SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~riscv x86" LICENSE="MIT" SLOT="0" +KEYWORDS="amd64 ~riscv x86" IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -61,3 +61,7 @@ src_configure() { cmake_src_configure } + +pkg_postinst() { + optfeature "Unprivileged display backlight control via udev" sys-power/acpilight +} diff --git a/x11-misc/polybar/polybar-3.6.3-r3.ebuild b/x11-misc/polybar/polybar-3.7.2.ebuild index 09507ab90029..7dfd36994d4a 100644 --- a/x11-misc/polybar/polybar-3.6.3-r3.ebuild +++ b/x11-misc/polybar/polybar-3.7.2.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake python-single-r1 +inherit cmake optfeature python-single-r1 DESCRIPTION="A fast and easy-to-use tool for creating status bars" HOMEPAGE="https://github.com/polybar/polybar" SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~riscv x86" LICENSE="MIT" SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -23,6 +23,7 @@ DEPEND=" dev-libs/libuv:= media-libs/fontconfig media-libs/freetype + x11-base/xorg-proto x11-libs/cairo[X,xcb(+)] x11-libs/libxcb:= x11-libs/xcb-util @@ -43,7 +44,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-fix-prefix.patch" ) +PATCHES=( + "${FILESDIR}/${P}-gcc15-cstdint-includes.patch" +) src_configure() { local mycmakeargs=( @@ -62,3 +65,7 @@ src_configure() { cmake_src_configure } + +pkg_postinst() { + optfeature "Unprivileged display backlight control via udev" sys-power/acpilight +} diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest index cfbbc1543857..3ee15a8a585d 100644 --- a/x11-misc/py3status/Manifest +++ b/x11-misc/py3status/Manifest @@ -1 +1 @@ -DIST py3status-3.58.tar.gz 451043 BLAKE2B 77ffbb1301d6ed434feea572b0bc806f96bc94e6c015f3bca4ea2503fc718b3629d13b1437fea4d1544b6f0920159b1a68a7acbc578e0577e2125f749bf749cd SHA512 c527dfc5028bfdd3760d1f081a8d3964e9c9cea9af8998bdb01f2b7150cbb9247cc5b32db165a0515abed788745433d0cdef99e683d3ec49122b3f2358738506 +DIST py3status-3.59.tar.gz 451201 BLAKE2B 3a16b9aaddb25514305aaf52a828fc36c9e2e7e9f290c1a3750b99d37c9cdeac2bf66f818a4ef315f1aa815a6a89df721fda1c55c6969312dd7a1e46a43b2dd7 SHA512 04dbdd981d3a66616188a5ef392f28447d38886720b95eedec090f7666877a252e676e5b85178a286177d24efd35fd6da2db03f3e4a1920ae8e365e2ff39c316 diff --git a/x11-misc/py3status/py3status-3.58.ebuild b/x11-misc/py3status/py3status-3.59.ebuild index 0a40790c0771..0a40790c0771 100644 --- a/x11-misc/py3status/py3status-3.58.ebuild +++ b/x11-misc/py3status/py3status-3.59.ebuild diff --git a/x11-misc/qps/qps-2.9.0.ebuild b/x11-misc/qps/qps-2.9.0.ebuild index 6307611cdd3e..f6a19ec84193 100644 --- a/x11-misc/qps/qps-2.9.0.ebuild +++ b/x11-misc/qps/qps-2.9.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~riscv" fi LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0" diff --git a/x11-misc/rendercheck/rendercheck-1.6.ebuild b/x11-misc/rendercheck/rendercheck-1.6.ebuild index 15635c0581c1..92baf76cb370 100644 --- a/x11-misc/rendercheck/rendercheck-1.6.ebuild +++ b/x11-misc/rendercheck/rendercheck-1.6.ebuild @@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz" inherit xorg-3 meson if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="Tests for compliance with X RENDER extension" diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest index 36ea19b3fde4..aff88b0684bc 100644 --- a/x11-misc/rofi-calc/Manifest +++ b/x11-misc/rofi-calc/Manifest @@ -1,2 +1,3 @@ DIST rofi-calc-2.0.0.tar.gz 1695125 BLAKE2B d76c304724b0f3326a8bd26ab2c7eaed5f77f3b6d07ddc97570a1fb28d56504d98ac9ab66411290cb548b760bd3231a729dfc470e748a8447e323d1b290f677c SHA512 298f9983dbd140f5aee5b3799b165500eae100f3f5744ba07914b962faf01661dee0f5f4c9c12a07a4e210b6115ac6fb377d9fa9a7e64ef5a19600e9f55cd478 DIST rofi-calc-2.2.0.tar.gz 1695821 BLAKE2B ab91e17c2baa854e76f593626b774390b5bdd57c78419c16981371f1e4be64cee0a38845dcd93998741ceeac462a1158af08519692c65a04a22418aa7026dc89 SHA512 7eedb5c7be97f42a1683cabdf0745c28d2a4f123f02e7cf2bf5a44cf851271b5bdc31f7622f4f30d086ecdcbcc7e4d62d3550b8c5b8ceebcdaca362e8d09a68d +DIST rofi-calc-2.2.1.tar.gz 1696532 BLAKE2B 5595f81b5eebefb68b97b397f4b9571afd548d7e2a3323cd2693a2ced629f0d270afe4351fe01f43c36760b2ba2c6c5509181d262285eb6caa9f768be1b2d2cf SHA512 33c4b5ca2c13d538c902d747c65b376d00b4f6b628d5fc14b4761105537503f24bd51a5cf8f07b6ab4b28bccbf6e84c70ea3125ed7e1664eadb108e4250a42ba diff --git a/x11-misc/rofi-calc/rofi-calc-2.2.1.ebuild b/x11-misc/rofi-calc/rofi-calc-2.2.1.ebuild new file mode 100644 index 000000000000..47135ee28930 --- /dev/null +++ b/x11-misc/rofi-calc/rofi-calc-2.2.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Do live calculations in rofi!" +HOMEPAGE="https://github.com/svenstaro/rofi-calc" +SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + x11-misc/rofi + >=sci-libs/libqalculate-2.0 +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + eautoreconf -i +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest index 7db8e7fb01f7..928e70238662 100644 --- a/x11-misc/safeeyes/Manifest +++ b/x11-misc/safeeyes/Manifest @@ -2,3 +2,4 @@ DIST safeeyes-2.1.6.tar.gz 286359 BLAKE2B a5e4b4d680d455f2ae9494705f1e4508341802 DIST safeeyes-2.1.8.tar.gz 288991 BLAKE2B 53fa71171c42679f7241a13b5542855c542c020814a4ec9e9c7480163bc2179e93787fb87291999815f900d5dea3522f5de8e35e85b714d3cb1cc4e24bad5638 SHA512 df3192ee751510449a0ee8946c8e59daff3dc5b4ef95a2f5563cc82834fbe8d3de52f39be2e0c26c13db7ac3d115ef1de63184ec8d069b99f411f4d60e9b5139 DIST safeeyes-2.1.9.tar.gz 288598 BLAKE2B 4a8892758220d7422c9d58b0dfcaef19c4a7cbef1266dc593321d2abaeafee5857dff277d16a4a98c5fdd745cdf305762f593e04c1cf9f9886d3e79486108c5c SHA512 2a752686c101bd3a952ed11b7c68e692077220663ac36ee73343d001807bb5d7c02477cb45ab92be99fd8463f436570caf021ae1a064079fcecd82447c13c3ac DIST safeeyes-2.2.0.tar.gz 291116 BLAKE2B a1650447c04fa828d58fd650488eeec47699da4b16476d58471ec396c4f724e516e16069b748cd94e215b1dd1d75f716d1955f7488f39d412fbe7b53dc27f5ea SHA512 f3b6679ad7f8a9983f466ef5b29a67bed62ffb95aff2468401eefa543e359e9c2470b593e27023874e1400d6569ac55decfb024a9ad81ba07a8989d70af7dab0 +DIST safeeyes-2.2.2.tar.gz 312701 BLAKE2B 73e316c699bb1b6a1291bc2afefc228067d692352788cbd68904917bbea8d8d566e3a3b764d44cb8be37d75a89a97326f153be98b69b800c42f49b0e9668dfd5 SHA512 b84f3bdeae06bc0db88a7ef1c029f8896880bd4f0cdf624eb332eb974dbfca4ce766f13d41b275747098016b3b3dbe4f1fe4ac544448916a641913ddf0a18f77 diff --git a/x11-misc/safeeyes/safeeyes-2.2.2.ebuild b/x11-misc/safeeyes/safeeyes-2.2.2.ebuild new file mode 100644 index 000000000000..d3e9574426cd --- /dev/null +++ b/x11-misc/safeeyes/safeeyes-2.2.2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py +DISTUTILS_USE_PEP517=setuptools + +inherit xdg distutils-r1 pypi + +DESCRIPTION="Linux alternative to EyeLeo" +HOMEPAGE="https://github.com/slgobinath/SafeEyes" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + +RDEPEND=" + dev-libs/libayatana-appindicator + dev-python/Babel[${PYTHON_USEDEP}] + dev-python/croniter[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/python-xlib[${PYTHON_USEDEP}] + media-sound/alsa-utils + x11-apps/xprop + x11-libs/gtk+:3[introspection] + x11-libs/libnotify[introspection] + x11-misc/xprintidle + " + +python_install() { + distutils-r1_python_install + + # Workaround for https://bugs.gentoo.org/926816 + # Files were misplaced and also duplicate across Python slots. + local misplaced_usr="${D}/usr/lib/${EPYTHON}/site-packages/usr" + local i + for i in applications icons ; do + local source="${misplaced_usr}/share/${i}" + local target="${D}/usr/share/${i}" + if [[ ! -d "${target}" ]]; then + dodir /usr/share/ + mv "${source}" "${target}" || die + fi + done + rm -R "${misplaced_usr}" || die +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/screengrab/screengrab-2.8.0.ebuild b/x11-misc/screengrab/screengrab-2.8.0.ebuild index 6656d3c0aba2..59943066ffe6 100644 --- a/x11-misc/screengrab/screengrab-2.8.0.ebuild +++ b/x11-misc/screengrab/screengrab-2.8.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~loong ~riscv" fi LICENSE="GPL-2 GPL-2+ LGPL-2.1+" diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 9daaf7abe4e4..5eaf19f0fc31 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1,5 +1,4 @@ DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1 SHA512 30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144 SHA512 6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2 -DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0 SHA512 2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370caaaa70f458 -DIST sddm-0.21.0_p20240302.tar.gz 3555893 BLAKE2B 2c0d6b5185088750f3e656f593b1f9cd212e76d250c6285e03c8d86fad99412dce4a784dd8dfdd8cf7759552101ce36971b6c292f8ce51e9aecc3e9a1a785daa SHA512 0e0a143ec2007b09c406773ff81a5d722b9a7fadd0c5c6c8ef23d67623c16f8327cf54617dcc273b0b690ca5447b6707ff1dd48a8a563a6efed8d9aac70bd522 +DIST sddm-0.21.0_p20240723.tar.gz 3557578 BLAKE2B b92feb20a39eaf34822b077fcb8b89a100ff65814f9b523b2a1a0ffd3592edf2e86fa8fbdfcd8b592756a0b4baf0b085e8c7b4ad2aaa2f08b90e25e580df9925 SHA512 1ea2f758099f86086aebf05a77b176227475c1eb9c21c77bc99b9bb5a2882ce087e020ae6a11585b793fe09a3567e0ea4d0c1632a5823b7be83e33882964de48 diff --git a/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild index 744f832c4ac8..7024c639d357 100644 --- a/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild +++ b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild @@ -8,13 +8,13 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" else - COMMIT=ae072f901671b68861da9577e3e12e350a9053d5 + COMMIT=4ec29a8bba033d475f197693fac6cb0c383a1da2 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" fi -QTMIN=6.7.1 +QTMIN=6.7.2 inherit cmake linux-info optfeature pam systemd tmpfiles DESCRIPTION="Simple Desktop Display Manager" @@ -28,7 +28,7 @@ IUSE="+elogind systemd test +X" REQUIRED_USE="^^ ( elogind systemd )" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +DEPEND=" acct-group/sddm acct-user/sddm >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network] @@ -42,10 +42,7 @@ COMMON_DEPEND=" ) systemd? ( sys-apps/systemd:=[pam] ) " -DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtbase-${QTMIN}:6 ) -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} X? ( x11-base/xorg-server ) !systemd? ( gui-libs/display-manager-init ) " diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild index ca86d169665e..b7a18e066574 100644 --- a/x11-misc/sddm/sddm-0.21.0.ebuild +++ b/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild @@ -8,7 +8,9 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" else - SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + COMMIT=4ec29a8bba033d475f197693fac6cb0c383a1da2 + SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" fi @@ -37,9 +39,11 @@ COMMON_DEPEND=" sys-libs/pam x11-libs/libXau x11-libs/libxcb:= - elogind? ( sys-auth/elogind[pam] ) + elogind? ( + sys-auth/elogind[pam] + sys-power/upower + ) systemd? ( sys-apps/systemd:=[pam] ) - !systemd? ( sys-power/upower ) " DEPEND="${COMMON_DEPEND} test? ( >=dev-qt/qttest-${QTMIN}:5 ) @@ -50,6 +54,7 @@ RDEPEND="${COMMON_DEPEND} " BDEPEND=" dev-python/docutils + >=dev-build/cmake-3.25.0 >=dev-qt/linguist-tools-${QTMIN}:5 kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig @@ -58,7 +63,7 @@ BDEPEND=" PATCHES=( # Downstream patches "${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch" - "${FILESDIR}/${P}-Xsession.patch" # bug 611210 + "${FILESDIR}/${PN}-0.21.0-Xsession.patch" # bug 611210 ) pkg_setup() { @@ -98,7 +103,6 @@ src_configure() { -DBUILD_MAN_PAGES=ON -DBUILD_WITH_QT6=OFF # default theme (and others) not yet compatible -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - -DINSTALL_PAM_CONFIGURATION=OFF -DRUNTIME_DIR=/run/sddm -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d" -DNO_SYSTEMD=$(usex !systemd) diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild deleted file mode 100644 index 0e63a546df0d..000000000000 --- a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info optfeature xdg - -DESCRIPTION="A multi-panel tabbed file manager" -HOMEPAGE="https://ignorantguru.github.io/spacefm/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git" - EGIT_BRANCH="next" - inherit git-r3 -else - KEYWORDS="amd64 x86" - SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -IUSE="+startup-notification +video-thumbnails" - -RDEPEND="dev-libs/glib:2 - dev-util/desktop-file-utils - virtual/udev - virtual/freedesktop-icon-theme - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - x11-libs/libX11 - x11-misc/shared-mime-info - startup-notification? ( x11-libs/startup-notification ) - video-thumbnails? ( media-video/ffmpegthumbnailer )" -DEPEND="${RDEPEND}" -BDEPEND="dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-include-sysmacros.patch - "${FILESDIR}"/${PN}-fno-common.patch -) - -src_configure() { - econf \ - $(use_enable startup-notification) \ - $(use_enable video-thumbnails) \ - --disable-hal \ - --enable-inotify \ - --disable-pixmaps \ - --with-gtk3 -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks - optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil - optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu] - # sys-apps/util-linux is required for eject - optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux - - if ! has_version 'sys-fs/udisks' ; then - elog "When using SpaceFM without udisks, and without the udisks-daemon running," - elog "you may need to enable kernel polling for device media changes to be detected." - elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll" - fi -} diff --git a/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild index c250bfeca80f..af7ed926aa22 100644 --- a/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild +++ b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -64,7 +64,7 @@ pkg_postinst() { optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil - optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu] + optfeature "performing as root" x11-misc/ktsuss kde-plasma/kdesu-gui # sys-apps/util-linux is required for eject optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux diff --git a/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild index 6b688c387c0a..38b080eb29e4 100644 --- a/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild +++ b/x11-misc/spacefm/spacefm-1.0.6-r3.ebuild @@ -66,7 +66,7 @@ pkg_postinst() { optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil - optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu] + optfeature "performing as root" x11-misc/ktsuss kde-plasma/kdesu-gui # sys-apps/util-linux is required for eject optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux diff --git a/x11-misc/stalonetray/stalonetray-0.8.5.ebuild b/x11-misc/stalonetray/stalonetray-0.8.5.ebuild index 5831b163f7d3..b2915f6002d2 100644 --- a/x11-misc/stalonetray/stalonetray-0.8.5.ebuild +++ b/x11-misc/stalonetray/stalonetray-0.8.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/kolbusa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" IUSE="debug +graceful-exit" RDEPEND="x11-libs/libICE diff --git a/x11-misc/sunflower/sunflower-0.5-r2.ebuild b/x11-misc/sunflower/sunflower-0.5-r3.ebuild index 927a7198f232..90f88d11859e 100644 --- a/x11-misc/sunflower/sunflower-0.5-r2.ebuild +++ b/x11-misc/sunflower/sunflower-0.5-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="sqlite" DISTUTILS_USE_PEP517="setuptools" inherit distutils-r1 xdg @@ -28,7 +28,7 @@ DEPEND=" RDEPEND="${DEPEND} dev-python/pycairo[${PYTHON_USEDEP}] - x11-libs/vte + x11-libs/vte:2.91 " S="${WORKDIR}/${MY_PN}-${MY_PV}" diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch new file mode 100644 index 000000000000..6239e0877923 --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-fix-build-on-32bit.patch @@ -0,0 +1,105 @@ +From daecf59cc8b294265666482a4766aaa3148c308b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Nov 2019 11:43:32 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f +--- + src/uinput.c | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +diff --git a/src/uinput.c b/src/uinput.c +index 28fbad39..d71bcde7 100644 +--- a/src/uinput.c ++++ b/src/uinput.c +@@ -54,6 +54,11 @@ so, delete this exception statement from your version. + #include <linux/input.h> + #include <linux/uinput.h> + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #if !defined(EV_SYN) || !defined(SYN_REPORT) + #undef UINPUT_OK + #endif +@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) { + static void ptr_move(int dx, int dy) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int d = direct_rel_fd < 0 ? fd : direct_rel_fd; + + if (injectable && strchr(injectable, 'M') == NULL) { +@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) { + + if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d); + +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_REL; + ev.code = REL_Y; + ev.value = dy; +@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) { + static void ptr_abs(int x, int y, int p) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int x0, y0; + int d = direct_abs_fd < 0 ? fd : direct_abs_fd; + +@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) { + + if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d); + +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_ABS; + ev.code = ABS_Y; + ev.value = y; +@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;} + static void button_click(int down, int btn) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int d = direct_btn_fd < 0 ? fd : direct_btn_fd; + + if (injectable && strchr(injectable, 'B') == NULL) { +@@ -959,7 +971,9 @@ static void button_click(int down, int btn) { + if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d); + + memset(&ev, 0, sizeof(ev)); +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_KEY; + ev.value = down; + +@@ -1230,6 +1244,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) { + void uinput_key_command(int down, int keysym, rfbClientPtr client) { + #ifdef UINPUT_OK + struct input_event ev; ++ struct timeval tval; + int scancode; + allowed_input_t input; + int d = direct_key_fd < 0 ? fd : direct_key_fd; +@@ -1253,7 +1268,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) { + if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d); + + memset(&ev, 0, sizeof(ev)); +- gettimeofday(&ev.time, NULL); ++ gettimeofday(&tval, NULL); ++ ev.input_event_sec = tval.tv_sec; ++ ev.input_event_usec = tval.tv_usec; + ev.type = EV_KEY; + ev.code = (unsigned char) scancode; + ev.value = down; diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild index 62b802f2bb43..214d2bf12b72 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${P}-CVE-2020-29074.patch "${FILESDIR}"/${P}-implicit-function-declaration.patch "${FILESDIR}"/${P}-libressl.patch # 903001 + "${FILESDIR}"/${P}-fix-build-on-32bit.patch ) src_prepare() { diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest index fcc0588cf220..671b77fc7043 100644 --- a/x11-misc/xdg-utils/Manifest +++ b/x11-misc/xdg-utils/Manifest @@ -1,3 +1 @@ -DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51 -DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71 DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b59cb1bd260884ca5bfd2cb8ed7ed68a2f5a8db6d660ceabab59cbb9880fd4f1a26cb71a8f759ec40c2f9f95bbc8a05 SHA512 d5436449fec2f4db952239ee910bfda203955c8df8cb92379f182dc36f9c82b6ceb092ccbebfd02ed00eb7ef5f6895ef745baca67906ae7490e425db27b1dbfc diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch b/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch index a92d652bf2dc..67a84e9c4a9b 100644 --- a/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch +++ b/x11-misc/xdg-utils/files/xdg-utils-1.2.1-qtpaths.patch @@ -12,9 +12,9 @@ Pending questions: - if [ "${KDE_SESSION_VERSION:-0}" -gt 4 ] ; then - default_dir="$(qtpaths --writable-path ConfigLocation)" + if [ "${KDE_SESSION_VERSION:-0}" -gt 5 ] ; then -+ default_dir="$($(pkg-config --variable=bindir Qt6Core)/qt6paths) --writable-path ConfigLocation)" ++ default_dir="$($(pkg-config --variable=bindir Qt6Core)/qtpaths6 --writable-path ConfigLocation)" + default_file="$default_dir/mimeapps.list" -+ elif [ x"$KDE_SESSION_VERSION" = x"5" ; then ++ elif [ x"$KDE_SESSION_VERSION" = x"5" ] ; then + default_dir="$(qtpaths5 --writable-path ConfigLocation)" default_file="$default_dir/mimeapps.list" elif [ x"$KDE_SESSION_VERSION" = x"4" ]; then diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch deleted file mode 100644 index 71608552a08b..000000000000 --- a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001 -From: E5ten <ethancsommer@gmail.com> -Date: Thu, 16 Jan 2020 02:06:09 +0000 -Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E" - ---- - scripts/xdg-open.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 202f3e3..35b0522 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -72,7 +72,7 @@ get_key() - is_file_url_or_path() - { - if echo "$1" | grep -q '^file://' \ -- || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then -+ || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then - return 0 - else - return 1 --- -GitLab - diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild deleted file mode 100644 index 852bfc0c9eea..000000000000 --- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9" -DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/" -SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2" -# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24 -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz" -S="${WORKDIR}"/xdg-utils-${MY_COMMIT} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="dbus doc gnome X" -REQUIRED_USE="gnome? ( dbus )" - -RDEPEND=" - dev-util/desktop-file-utils - dev-perl/File-MimeInfo - dbus? ( - sys-apps/dbus - gnome? ( - dev-perl/Net-DBus - dev-perl/X11-Protocol - ) - ) - x11-misc/shared-mime-info - X? ( - x11-apps/xprop - x11-apps/xset - ) -" -BDEPEND=" - >=app-text/xmlto-0.0.28-r3[text(+)] - app-alternatives/awk -" - -DOCS=( ChangeLog README RELEASE_NOTES TODO ) - -# Tests run random system programs, including interactive programs -# that block forever -RESTRICT="test" - -PATCHES=( - "${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch - # https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21 - "${FILESDIR}"/${PN}-egrep.patch -) - -src_prepare() { - default - - # If you choose to do git snapshot instead of patchset, you need to remember - # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh - # all the files - eautoreconf -} - -src_configure() { - export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166 - default - emake -C scripts scripts-clean -} - -src_install() { - default - - newdoc scripts/xsl/README README.xsl - use doc && dodoc -r scripts/html - - # Install default XDG_DATA_DIRS, bug #264647 - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local - echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local - doenvd 30xdg-data-local - - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base - echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base - doenvd 90xdg-data-base -} - -pkg_postinst() { - [[ -x $(type -P gtk-update-icon-cache) ]] \ - || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command." -} diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild deleted file mode 100644 index 3f66355e2cb9..000000000000 --- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/" -if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852" - SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2" - S="${WORKDIR}"/xdg-utils-${MY_COMMIT} -else - SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" - S="${WORKDIR}"/${PN}-v${PV} -fi - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="dbus doc gnome X" -REQUIRED_USE="gnome? ( dbus )" - -RDEPEND=" - dev-util/desktop-file-utils - dev-perl/File-MimeInfo - dbus? ( - sys-apps/dbus - gnome? ( - dev-perl/Net-DBus - dev-perl/X11-Protocol - ) - ) - x11-misc/shared-mime-info - X? ( - x11-apps/xprop - x11-apps/xset - ) -" -BDEPEND=" - >=app-text/xmlto-0.0.28-r3[text(+)] - app-alternatives/awk -" - -# Tests run random system programs, including interactive programs -# that block forever -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${P}-xdg-mime-default.patch -) - -src_prepare() { - default - - if [[ ${PV} == *_p* ]] ; then - # If you choose to do git snapshot instead of patchset, you need to remember - # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh - # all the files - eautoreconf - fi -} - -src_configure() { - export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166 - default - emake -C scripts scripts-clean -} - -src_install() { - default - - dodoc RELEASE_NOTES - - newdoc scripts/xsl/README README.xsl - use doc && dodoc -r scripts/html - - # Install default XDG_DATA_DIRS, bug #264647 - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die - echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die - doenvd 30xdg-data-local - - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die - echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die - doenvd 90xdg-data-base -} - -pkg_postinst() { - [[ -x $(type -P gtk-update-icon-cache) ]] \ - || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command." -} diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild index 78afc65ad4b2..02710d2c3ef5 100644 --- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild +++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild @@ -18,7 +18,7 @@ fi LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="dbus doc gnome plasma X" REQUIRED_USE="gnome? ( dbus )" @@ -35,6 +35,14 @@ RDEPEND=" ) plasma? ( virtual/pkgconfig + ) + X? ( + x11-apps/xprop + x11-apps/xset + ) +" +PDEPEND=" + plasma? ( || ( ( kde-frameworks/kservice:6 @@ -46,10 +54,6 @@ RDEPEND=" ) ) ) - X? ( - x11-apps/xprop - x11-apps/xset - ) " BDEPEND=" app-alternatives/awk diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest index c200cd335b0b..3c993f5e27cd 100644 --- a/x11-misc/xfe/Manifest +++ b/x11-misc/xfe/Manifest @@ -1,2 +1,3 @@ DIST xfe-1.44.tar.xz 1444296 BLAKE2B 3ace2689adc2a4e2b24e44f8f416cad5e4904d38d2be7e275256714a707995368450e63c4cf2eee3f870be51c42f295a938ea6ecd159dd1a996aad53b5d119b3 SHA512 d02f0db46c5ca6e26cff447d7f11bbc5f03a9d28b8d492a783bb47f67431a022785d6f3b25013f82a6121a8675f86caf1a9154a7faa8186e05cf4de0bd2f1749 +DIST xfe-1.46.2.tar.xz 1615460 BLAKE2B 0c4a49aaf1ff04d25a13349fa81be9d3e8400009c7d8c24f96a017850a156b116950e0ac5d471190defeceb236e0ed82a614a143a0cdddf10dd86a9b9c318cca SHA512 0287835433297eb2280a3d16ee85b61a74d4c3a6414279df58a201c55a58906128333c7574a94da38195f9934816a91f6e726487caeb8c97f9a5f3cef1ba1c3e DIST xfe-1.46.tar.xz 1431496 BLAKE2B d7b85e5280d1d9d6db3737f8ac14f4248ae4e99b52d843b51468299bdf71581003b21d0fb2be9949c7189481ed5f3fe88bbd146d2185c17dea3a4785edb876b7 SHA512 9fea984ebbfe4dada85e028bfbde1352392cb77462c238c77c6950aac2526db11d556c8187fd765fd935ba21088c1b551e88ee414dcac35d7c59f5411c4c145b diff --git a/x11-misc/xfe/xfe-1.46.2.ebuild b/x11-misc/xfe/xfe-1.46.2.ebuild new file mode 100644 index 000000000000..690f416c2cef --- /dev/null +++ b/x11-misc/xfe/xfe-1.46.2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES=" + bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr + zh_CN zh_TW +" +inherit flag-o-matic plocale xdg-utils + +DESCRIPTION="MS-Explorer-like minimalist file manager for X" +HOMEPAGE="http://roland65.free.fr/xfe/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug nls startup-notification" +# The only dir which defines a 'check' target is po/ which doesn't do anything +# useful for us. It also fails, see bug #847253. +RESTRICT="test" + +RDEPEND=" + x11-libs/fox:1.6[png,truetype] + media-libs/fontconfig + x11-libs/libXrandr + x11-libs/libX11 + x11-libs/libXft + startup-notification? ( + x11-libs/libxcb:= + x11-libs/startup-notification + x11-libs/xcb-util + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( + sys-devel/gettext + ) +" + +DOCS=( AUTHORS BUGS ChangeLog README TODO ) + +src_prepare() { + default + + cat >po/POTFILES.skip || die <<-EOF + src/icons.cpp + xfe.desktop.in.in + xfi.desktop.in.in + xfp.desktop.in.in + xfv.desktop.in.in + xfw.desktop.in.in + EOF + + # malformed LINGUAS file + # recent intltool expects newline for every linguas + sed -i \ + -e '/^#/!s:\s\s*:\n:g' \ + po/LINGUAS || die + + # remove not selected locales + rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;} + plocale_for_each_disabled_locale rm_locale +} + +src_configure() { + # https://sourceforge.net/p/xfe/bugs/282/ (bug #864757) + filter-lto + + econf \ + $(use_enable debug) \ + $(use_enable nls) \ + $(use_enable startup-notification sn) \ + --enable-minimalflags +} + +src_install() { + default + + # Install this unconditionally rather than automagically based on whether + # polkit is installed + rm -rf "${ED}"/usr/share/polkit-1/actions || die + insinto /usr/share/polkit-1/actions + newins - org.xfe.root.policy <<-EOF + <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" + "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> + <policyconfig> + <vendor>Xfe</vendor> + <vendor_url>http://roland65.free.fr/xfe</vendor_url> + <icon_name>xfe</icon_name> + <action id="org.xfe.root"> + <description>Run Xfe as root</description> + <message>Authentication is required to run Xfe as root</message> + <defaults> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> + <annotate key="org.freedesktop.policykit.exec.path">${EPREFIX}/usr/bin/xfe</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> + </policyconfig> + EOF +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index 7d07d1ab956d..63727b9b98bd 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,2 +1 @@ -DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a DIST xkeyboard-config-2.42.tar.xz 910192 BLAKE2B 1b49a9bdf9e6ad2c196b8c4cc93803a2b4ce804148a7eb55616672db5c4d3eb289e2de931ee8b08a2152dd542a9f2d1e00ba8cca7651d7f33b570ed4a5f4c57b SHA512 654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild deleted file mode 100644 index fe824fdb32a2..000000000000 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit meson python-any-r1 - -DESCRIPTION="X keyboard configuration database" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" - inherit git-r3 -else - SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -# <dev-python/pycountry-23.12.7 bug #920278 -BDEPEND=" - dev-lang/perl - dev-libs/libxslt - sys-devel/gettext - test? ( - ${PYTHON_DEPS} - x11-apps/xkbcomp - x11-libs/libxkbcommon - $(python_gen_any_dep ' - dev-python/pycountry[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - ') - ) -" - -python_check_deps() { - use test || return 0 - python_has_version \ - "dev-python/pycountry[${PYTHON_USEDEP}]" \ - "dev-python/pytest-xdist[${PYTHON_USEDEP}]" \ - "dev-python/pytest[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - eapply_user - - # Remove pytest timeout - sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die -} - -src_configure() { - local emesonargs=( - -Dxkb-base="${EPREFIX}/usr/share/X11/xkb" - -Dcompat-rules=true - ) - meson_src_configure -} diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild index d745fe878f9f..15135c82ec6d 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild @@ -7,14 +7,14 @@ PYTHON_COMPAT=( python3_{11..12} ) inherit meson python-any-r1 DESCRIPTION="X keyboard configuration database" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" inherit git-r3 else SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi LICENSE="MIT" @@ -26,8 +26,8 @@ BDEPEND=" dev-lang/perl dev-libs/libxslt sys-devel/gettext + ${PYTHON_DEPS} test? ( - ${PYTHON_DEPS} x11-apps/xkbcomp x11-libs/libxkbcommon $(python_gen_any_dep ' @@ -47,7 +47,7 @@ python_check_deps() { } pkg_setup() { - use test && python-any-r1_pkg_setup + python-any-r1_pkg_setup } src_prepare() { diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 9ae1caa1e13b..f0a2c00dbf40 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..12} ) inherit meson python-any-r1 DESCRIPTION="X keyboard configuration database" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" @@ -26,8 +26,8 @@ BDEPEND=" dev-lang/perl dev-libs/libxslt sys-devel/gettext + ${PYTHON_DEPS} test? ( - ${PYTHON_DEPS} x11-apps/xkbcomp x11-libs/libxkbcommon $(python_gen_any_dep ' @@ -47,7 +47,7 @@ python_check_deps() { } pkg_setup() { - use test && python-any-r1_pkg_setup + python-any-r1_pkg_setup } src_prepare() { diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild index cc9e028b4a34..a022cc835edb 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -DEPEND="dev-util/patchutils" +BDEPEND="dev-util/patchutils" RDEPEND="x11-apps/xauth x11-base/xorg-server[xvfb]" @@ -21,7 +21,8 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch + assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild index 1191b6b39e1c..a022cc835edb 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -DEPEND="dev-util/patchutils" +BDEPEND="dev-util/patchutils" RDEPEND="x11-apps/xauth x11-base/xorg-server[xvfb]" @@ -21,7 +21,8 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch + assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild index 1191b6b39e1c..a022cc835edb 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -DEPEND="dev-util/patchutils" +BDEPEND="dev-util/patchutils" RDEPEND="x11-apps/xauth x11-base/xorg-server[xvfb]" @@ -21,7 +21,8 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch + assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild index b37ac978a797..4203dc8e35a4 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" -DEPEND="dev-util/patchutils" +BDEPEND="dev-util/patchutils" RDEPEND="x11-apps/xauth x11-base/xorg-server[xvfb]" @@ -22,7 +22,8 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch + assert "filterdiff+patch failed" eapply_user } |