diff options
Diffstat (limited to 'x11-misc')
496 files changed, 7387 insertions, 6028 deletions
diff --git a/x11-misc/3dfm/3dfm-1.0-r1.ebuild b/x11-misc/3dfm/3dfm-1.0-r2.ebuild index d8ea37203cb5..f8c9c5cf0921 100644 --- a/x11-misc/3dfm/3dfm-1.0-r1.ebuild +++ b/x11-misc/3dfm/3dfm-1.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="OpenGL-based 3D File Manager" HOMEPAGE="https://sourceforge.net/projects/innolab/" @@ -10,14 +10,14 @@ SRC_URI="mirror://sourceforge/innolab/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -DEPEND="virtual/glu +RDEPEND=" + virtual/glu virtual/opengl media-libs/freeglut" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_install() { default - mv "${ED%/}"/usr/bin/{interface,3dfm} || die + mv "${ED}"/usr/bin/{interface,3dfm} || die } diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest index 635e21745e23..73e1781dceda 100644 --- a/x11-misc/alacarte/Manifest +++ b/x11-misc/alacarte/Manifest @@ -1 +1 @@ -DIST alacarte-3.44.2.tar.xz 253580 BLAKE2B 206eea28b50ef6d0cf228031ff72c16c6ebd130dfa623b96eb727ef62aad3db0003f3a97bc188f4b8a0e9d18cc184a9230fb332131d37afb0abe71dc3d13ee1e SHA512 b62c15ca37717e988b1d64f0ab565970ae15a4bc11a3f31da8574a0b4f10a9cf8b94d0a85be34d871c106ab34c63b2dfbf535b46eb630829e73c14023b99053e +DIST alacarte-3.50.0.tar.xz 255404 BLAKE2B c22aeb83f707e4860c9a84311da2bf87e79db8b8859b8c45d5c1d0f6ead896f15b83cd112ac248fbb83b2bf839afbc90d2a24685c767ebaaaa850dfab8b26d35 SHA512 12578c35e8e68c83b46d81edc59444a92dc672a4a91bb4b443bbc0b26d94a3badf5598602dfc62dfbbabce7e3392c081c39055a201d60d4813b23e061014ee17 diff --git a/x11-misc/alacarte/alacarte-3.44.2.ebuild b/x11-misc/alacarte/alacarte-3.50.0.ebuild index c9c4ffadba98..40f4d74498a9 100644 --- a/x11-misc/alacarte/alacarte-3.44.2.ebuild +++ b/x11-misc/alacarte/alacarte-3.50.0.ebuild @@ -1,8 +1,8 @@ -# 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="xml(+)" inherit gnome2 python-single-r1 diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest deleted file mode 100644 index 2f4fb01d3cc0..000000000000 --- a/x11-misc/albert/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -DIST albert-0.17.2-jetbrains-python-extension.tar.gz 17062 BLAKE2B fa5da8a7df5e1bb337af75a30b7fbb2584eaa49745d14e88eeea18037d70c55e9885fdbeaeab8aaaa94531e73286c69e14b4864011875d59dcb790a10fd91e88 SHA512 53b9a0d9f972dd495648dd563df8d3b1c973aa02dce99ce7bb8a9da3bcf43174094d5a03035fbaf132072d834ccf918b17076d4f522265bea77c4220140b31de -DIST albert-0.17.2-plugins.tar.gz 548312 BLAKE2B b8911953eb40b0985eb67108249487e589910d1701d609cc9ad305db915c2c69f794a6bdd7e6453f856874ef11dfb4657e7a527abfe746dffb8952309f1aeffd SHA512 ff6a22f1ffd39c73061baaf2ae9b1b2243673ebed56cfac7bd639a262fceadea1cbea4a7534ebe2937576d22fc9a4bc1f4d1cf05262d1fb08b9230460fd7811e -DIST albert-0.17.2-pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264 -DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53 -DIST albert-0.17.2-xkcd-python-extension.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402 -DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d98cc0a4b730cc8e95509d15c5b8ccfaef6e19d3dd2ded5e56403b14c3ac08fce90845abdfdb74ce7b3ff8b71 SHA512 ce2e32fa0018b210196e09cda8a3cce0a2cafecfdef5edae4610c621c39b66e3b4b039449d1900deb9689b5fa14178d079f7f0a7917cc1019d26b48a0a3ca415 -DIST albert-0.17.3.tar.gz 73536 BLAKE2B 21755a9dfa2532ad43b812bb7de70d381c8ad75b815520f51ca7b2afd98c78bb83ec55b715c7f5cfdf065b4e0db51f4e645d7c21d22a128d8337a01ec9029959 SHA512 2734eb2a05067883c9e55bd6533928256240bfc7fd10be2bf0c2fa80da60cf19f62e23843ae4a1a009c5f8d937e791bbb5af9db30f7b0741e28c34b7780e8cf9 -DIST albert-0.17.5.tar.gz 73506 BLAKE2B 427c95878b4388fc891cd7cb2195cae748a09b68d86974877570cf8b5afc6845c63df2b282946c894ef4ce9de12670ec68a6bf9e4b10cdd6021890bddbf1ff7d SHA512 4535c4fc212da10fd4469643636ca020c5c8cfe0aad2c81231ccd1b1b20f9c090db5bfffa3ea189c34180a2e5fc71c6b4e0691f70a4c85d2e272e10e60fee9c0 -DIST albert-0.17.6.tar.gz 71453 BLAKE2B 7c39e1cdc0c6245269088b28b8aefab1e6c727be1c2f00461e247d4de1e5e6b79d2e7ad51e728e506d0437817ac21d26e482294fe03250f36fff32dc6fc3ecba SHA512 86589b32719e9b53ea963fa230474b8add016364724e2a34c6cb6dd17882d3e8c06fd8554a81afe1cb97690c43dd26342f225fd72a9759e6405e6a91e04996d2 -DIST albert-jetbrains-python-extension-b7157473cc923fe4f15023c85a032eeab3627652.tar.gz 17062 BLAKE2B fa5da8a7df5e1bb337af75a30b7fbb2584eaa49745d14e88eeea18037d70c55e9885fdbeaeab8aaaa94531e73286c69e14b4864011875d59dcb790a10fd91e88 SHA512 53b9a0d9f972dd495648dd563df8d3b1c973aa02dce99ce7bb8a9da3bcf43174094d5a03035fbaf132072d834ccf918b17076d4f522265bea77c4220140b31de -DIST albert-plugins-1bc69826f8eabc215cdeb1765bb4750f84133d1b.tar.gz 548693 BLAKE2B 98e2f19fa51d8fd422b4f0258ab9c08eced946239002cedbfd73fc37ff49c638ddcd4e7591ea8b27d575ac5940452f6d0bc18062d1e3b6624e366ac9a4724d21 SHA512 376e5dac161a4f69d3ab7efed9216e7ad186d92d911627b2fdff7dbf600498ee5effcd47f6393e1c8b172d590527cb24f3f507e0bf690c69f3563d79309c424f -DIST albert-plugins-22881af568d70a3d4c16a901cd49c0e233c14a7a.tar.gz 548330 BLAKE2B 780bd1ff7d71a6f0c4c921d637d064c765d3052591af2e2c371b1763b366dd1340de2a7d5f3eb5cebecc1d611ae86bc626ee62b7545b01d7275b9e3478d05c00 SHA512 eb7e7ed9b24471422e7a7cdf319276071d6ff9613b9932d0752488c5992478dedcab96230359031f50ea1826d8b15dc0eba1edb205e1e9779690f1a973d4060d -DIST albert-plugins-ee55048e138028b4889d71e0574e85b2c4d69541.tar.gz 548351 BLAKE2B 6433ccf690cc57a649e6bfabe378c4458e005306529c6f3a143c0e7c0fb64e2c4216a9f17b7283a69684b36f676c5a9e27bcba8a76fc04f5ea4d7d4812f62d1d SHA512 85c6c6cabbdad91b926c446e44c02684cc2f619ca041faf3a23b432046db1f02413fc82dea9eba9aece560ac442a3202d2e9246b98fd36bdadf47470ff160c5a -DIST albert-python-extensions-7f571aceaf8e60eee8bb21e1ec4efa0e95523d13.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53 -DIST albert-xkcd-python-extension-bf88a964473d65b39c9e09eb48dabb847206f06f.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402 diff --git a/x11-misc/albert/albert-0.17.2-r1.ebuild b/x11-misc/albert/albert-0.17.2-r1.ebuild deleted file mode 100644 index 688d62bc66b8..000000000000 --- a/x11-misc/albert/albert-0.17.2-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -DESCRIPTION="A fast and flexible keyboard launcher" -HOMEPAGE="https://albertlauncher.github.io/" - -PLUGINS_HASH="b4cac28be7b265027b00279baba14086d97c4d07" -PYBIND11_VERSION="2.6.1" -PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13" -JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652" -XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f" - -SRC_URI=" - https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz - python? ( - https://github.com/pybind/pybind11/archive/v${PYBIND11_VERSION}.tar.gz -> ${P}-pybind11-${PYBIND11_VERSION}.tar.gz - ) - python-extensions? ( - https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${P}-python-extensions.tar.gz - https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${P}-jetbrains-python-extension.tar.gz - https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${P}-xkcd-python-extension.tar.gz - ) -" - -LICENSE="all-rights-reserved" # unclear licensing #766129 -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug +python +python-extensions +statistics virtualbox" -RESTRICT="mirror bindist" - -REQUIRED_USE="python-extensions? ( python )" - -RDEPEND=" - dev-cpp/muParser - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - statistics? ( dev-qt/qtcharts:5 ) - virtualbox? ( app-emulation/virtualbox[sdk] ) - x11-libs/libX11 -" -DEPEND="${RDEPEND}" - -src_prepare() { - mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die - if $(use python); then - mv "${WORKDIR}"/pybind11-${PYBIND11_VERSION}/* "${S}"/plugins/python/pybind11 || die - fi - if $(use python-extensions); then - mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die - mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die - mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DEBUG=$(usex debug) - -DBUILD_PYTHON=$(usex python) - -DBUILD_VIRTUALBOX=$(usex virtualbox) - -DBUILD_WITH_QTCHARTS=$(usex statistics) - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/albert/albert-0.17.3.ebuild b/x11-misc/albert/albert-0.17.3.ebuild deleted file mode 100644 index c4bd8605e9d9..000000000000 --- a/x11-misc/albert/albert-0.17.3.ebuild +++ /dev/null @@ -1,94 +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 cmake python-single-r1 xdg-utils - -DESCRIPTION="A fast and flexible keyboard launcher" -HOMEPAGE="https://albertlauncher.github.io/" - -PLUGINS_HASH="ee55048e138028b4889d71e0574e85b2c4d69541" -PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13" -JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652" -XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f" - -SRC_URI=" - https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_HASH}.tar.gz - python-extensions? ( - https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${PN}-python-extensions-${PYTHON_EXTENSIONS_COMMIT}.tar.gz - https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-jetbrains-python-extension-${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz - https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-xkcd-python-extension-${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz - ) -" - -LICENSE="all-rights-reserved" # unclear licensing #766129 -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug +python +python-extensions +statistics virtualbox" -RESTRICT="mirror bindist" - -REQUIRED_USE=" - python-extensions? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - dev-cpp/muParser - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - python? ( ${PYTHON_DEPS} ) - statistics? ( - dev-qt/qtcharts:5 - dev-qt/qtxml:5 - ) - virtualbox? ( app-emulation/virtualbox[sdk,vboxwebsrv] ) -" -DEPEND="${RDEPEND} - python? ( $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') )" - -PATCHES=("${FILESDIR}/${P}-find-and-use-python-libraries-and-headers.patch") - -src_prepare() { - mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die - if use python-extensions; then - mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die - mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die - mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DEBUG=$(usex debug) - -DBUILD_PYTHON=$(usex python) - -DBUILD_VIRTUALBOX=$(usex virtualbox) - -DBUILD_WITH_QTCHARTS=$(usex statistics) - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/albert/albert-0.17.5.ebuild b/x11-misc/albert/albert-0.17.5.ebuild deleted file mode 100644 index 05d2458a910d..000000000000 --- a/x11-misc/albert/albert-0.17.5.ebuild +++ /dev/null @@ -1,94 +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 cmake python-single-r1 xdg-utils - -DESCRIPTION="A fast and flexible keyboard launcher" -HOMEPAGE="https://albertlauncher.github.io/" - -PLUGINS_HASH="22881af568d70a3d4c16a901cd49c0e233c14a7a" -PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13" -JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652" -XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f" - -SRC_URI=" - https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_HASH}.tar.gz - python-extensions? ( - https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${PN}-python-extensions-${PYTHON_EXTENSIONS_COMMIT}.tar.gz - https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-jetbrains-python-extension-${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz - https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-xkcd-python-extension-${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz - ) -" - -LICENSE="all-rights-reserved" # unclear licensing #766129 -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug +python +python-extensions +statistics virtualbox" -RESTRICT="mirror bindist" - -REQUIRED_USE=" - python-extensions? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - dev-cpp/muParser - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - python? ( ${PYTHON_DEPS} ) - statistics? ( - dev-qt/qtcharts:5 - dev-qt/qtxml:5 - ) - virtualbox? ( app-emulation/virtualbox[sdk,vboxwebsrv] ) -" -DEPEND="${RDEPEND} - python? ( $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') )" - -PATCHES=("${FILESDIR}/${PN}-0.17.3-find-and-use-python-libraries-and-headers.patch") - -src_prepare() { - mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die - if use python-extensions; then - mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die - mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die - mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DEBUG=$(usex debug) - -DBUILD_PYTHON=$(usex python) - -DBUILD_VIRTUALBOX=$(usex virtualbox) - -DBUILD_WITH_QTCHARTS=$(usex statistics) - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/albert/albert-0.17.6.ebuild b/x11-misc/albert/albert-0.17.6.ebuild deleted file mode 100644 index 46ce8a108f04..000000000000 --- a/x11-misc/albert/albert-0.17.6.ebuild +++ /dev/null @@ -1,94 +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 cmake python-single-r1 xdg-utils - -DESCRIPTION="A fast and flexible keyboard launcher" -HOMEPAGE="https://albertlauncher.github.io/" - -PLUGINS_HASH="1bc69826f8eabc215cdeb1765bb4750f84133d1b" -PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13" -JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652" -XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f" - -SRC_URI=" - https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_HASH}.tar.gz - python-extensions? ( - https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${PN}-python-extensions-${PYTHON_EXTENSIONS_COMMIT}.tar.gz - https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-jetbrains-python-extension-${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz - https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-xkcd-python-extension-${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz - ) -" - -LICENSE="all-rights-reserved" # unclear licensing #766129 -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug +python +python-extensions +statistics virtualbox" -RESTRICT="mirror bindist" - -REQUIRED_USE=" - python-extensions? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - dev-cpp/muParser - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - python? ( ${PYTHON_DEPS} ) - statistics? ( - dev-qt/qtcharts:5 - dev-qt/qtxml:5 - ) - virtualbox? ( app-emulation/virtualbox[sdk,vboxwebsrv] ) -" -DEPEND="${RDEPEND} - python? ( $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') )" - -PATCHES=("${FILESDIR}/${PN}-0.17.3-find-and-use-python-libraries-and-headers.patch") - -src_prepare() { - mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die - if use python-extensions; then - mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die - mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die - mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DEBUG=$(usex debug) - -DBUILD_PYTHON=$(usex python) - -DBUILD_VIRTUALBOX=$(usex virtualbox) - -DBUILD_WITH_QTCHARTS=$(usex statistics) - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch b/x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch deleted file mode 100644 index 943e5d8acf2d..000000000000 --- a/x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From aa89c47db62163eddea623beb48f7ffd8d76062c Mon Sep 17 00:00:00 2001 -From: Buchan Milne <bgmilne@gmail.com> -Date: Thu, 14 Jun 2018 08:10:31 +0200 -Subject: [PATCH] Find and use python libraries and headers - ---- - plugins/python/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/plugins/python/CMakeLists.txt b/plugins/python/CMakeLists.txt -index 2dd085d..0dc9b91 100644 ---- a/plugins/python/CMakeLists.txt -+++ b/plugins/python/CMakeLists.txt -@@ -5,7 +5,8 @@ PROJECT(python) - FILE(GLOB_RECURSE SRC src/*) - - find_package(Qt5 5.5.0 REQUIRED COMPONENTS Widgets) --add_subdirectory(pybind11) -+find_package(PythonLibs) -+include_directories(${PYTHON_INCLUDE_DIRS}) - - add_library(${PROJECT_NAME} SHARED ${SRC} ${PROJECT_NAME}.qrc metadata.json) - -@@ -14,8 +15,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE src/) - target_link_libraries(${PROJECT_NAME} - PUBLIC - Qt5::Widgets -+ ${PYTHON_LIBRARIES} - PRIVATE -- pybind11::embed - albert::lib - xdg - ) diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml deleted file mode 100644 index 954705f29c0a..000000000000 --- a/x11-misc/albert/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@retornaz.com</email> - <name>Quentin Retornaz</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">albertlauncher/albert</remote-id> - </upstream> - <use> - <flag name="debug">Enable debugging informations</flag> - <flag name="python-extensions">Install default python extensions system-wide</flag> - <flag name="statistics">Enable local statistics</flag> - <flag name="virtualbox">Enable <pkg>app-emulation/virtualbox</pkg> extension</flag> - </use> -</pkgmetadata> diff --git a/x11-misc/apwal/apwal-0.4.5-r2.ebuild b/x11-misc/apwal/apwal-0.4.5-r3.ebuild index 766c3ed8f76c..1fd5a464954a 100644 --- a/x11-misc/apwal/apwal-0.4.5-r2.ebuild +++ b/x11-misc/apwal/apwal-0.4.5-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -20,14 +20,10 @@ RDEPEND=" x11-libs/gdk-pixbuf x11-libs/gtk+:2 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}"/${P}-makefile.patch -) +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_configure() { tc-export CC PKG_CONFIG diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest index 7e6c05abfb49..aa275d15bd43 100644 --- a/x11-misc/arandr/Manifest +++ b/x11-misc/arandr/Manifest @@ -1,2 +1 @@ -DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba DIST arandr-0.1.11.tar.gz 100603 BLAKE2B cbceaec815cb0b43731d10004a6fa3829e7ecbb1358b206a1dc2d8a1285884199e677a0e8a155ceaeca10d33515a1942754440569f3e338b79faa1b8351d4807 SHA512 5f3ccabbffac0ea9e05b9d8c229f4f3b05f06ef285fb05a1ce2d7f88fd1723fd680636f5b97764b0aeb3cedac16863c4ccb154d65bf6fe987a1b3cc8a0026584 diff --git a/x11-misc/arandr/arandr-0.1.10-r3.ebuild b/x11-misc/arandr/arandr-0.1.10-r3.ebuild deleted file mode 100644 index 0e702d60d0ba..000000000000 --- a/x11-misc/arandr/arandr-0.1.10-r3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -# Fails w/ py3.11, bug #889986 -PYTHON_COMPAT=( python3_{9..10} ) -inherit distutils-r1 - -DESCRIPTION="Another XRandR GUI" -HOMEPAGE="https://christian.amsuess.com/tools/arandr/" -SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ppc64 x86" - -RDEPEND=" - dev-python/pygobject:3=[${PYTHON_USEDEP},cairo] - x11-libs/gtk+:3[introspection] - x11-apps/xrandr -" -BDEPEND="dev-python/docutils[${PYTHON_USEDEP}]" - -PATCHES=( "${FILESDIR}/${PN}-0.1.10-manpages.patch" ) diff --git a/x11-misc/arandr/arandr-0.1.11.ebuild b/x11-misc/arandr/arandr-0.1.11.ebuild index 1070e68f54ef..eea0a6c99bb8 100644 --- a/x11-misc/arandr/arandr-0.1.11.ebuild +++ b/x11-misc/arandr/arandr-0.1.11.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{10..12} ) + inherit distutils-r1 DESCRIPTION="Another XRandR GUI" @@ -13,7 +14,7 @@ SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc64 x86" RDEPEND=" dev-python/pygobject:3=[${PYTHON_USEDEP},cairo] diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest index a7ff290a6551..026ae3b7c25c 100644 --- a/x11-misc/autorandr/Manifest +++ b/x11-misc/autorandr/Manifest @@ -1,2 +1,2 @@ -DIST autorandr-1.12.1.tar.gz 45550 BLAKE2B 5b434325d13c00c3fa70b5d09edb540cdcf3bb921307c60f2c616231e7a87ea85f60e39500ed8116f28619139f71ecc4a8fa153ffadc6b8d74df570736a0d815 SHA512 a7e095eb96e7e0d3a5b3b2122d68a3d3a5121d8be7a86ddd9f837ad42b7a53ed5ee45151f23861c5b900e214a4dfc0c575f45fe70c8c5587562a4035458137a0 -DIST autorandr-1.13.3.tar.gz 47630 BLAKE2B fb53316af4d3fa399f278be874e95d06cbd188bebf1e22793ca30ad4f9a8817674390c7d02d501f4a35a0a6f23b16202e97f2a6559727e67e908d21121de8a56 SHA512 6c3f99da52a029a8f1717020ebafbd7afb58d97651776a6620f47e299584704ab65c37be5e9497cca3c53d6268ebde11481f32967ec289adf606a73e587e874f +DIST autorandr-1.14.tar.gz 49234 BLAKE2B 3ff149d30b023bc54d83c4be1f81f67204d20d3e6a7a43e15009c1c4f1180fa920789ce84ae56f13946a9cec1f72bc7adb27be3c58ca8532235d0457b1f5aa92 SHA512 dc1ee4c28b06dde4a721fe564734e7a79c1c843986f7c84307ea60f19c2237ba53d1bcd2202e377363e7e0a5bf5dea95bea4490b3fa5ec5fa6738114646a502d +DIST autorandr-1.15.tar.gz 49352 BLAKE2B b7200eb7a77230076f1a9f8b1a21be883ae363cc41cff7f1191e034359cc8ebb52e9dd19dd5f2e415a34b9a3a89fda3d0d43a946b2f3401de0d279fb9d5ba1a2 SHA512 2837348b755f5c4b30ad2b68e191e1969a467401cf32dda495dd19867e391f8b8b4a9c0b4958ef33f75c71aace46686995e27bab805e1e40cc4a1af44e9f0405 diff --git a/x11-misc/autorandr/autorandr-1.13.3.ebuild b/x11-misc/autorandr/autorandr-1.14.ebuild index 5a4cdc0e7c9f..40586032d8fd 100644 --- a/x11-misc/autorandr/autorandr-1.13.3.ebuild +++ b/x11-misc/autorandr/autorandr-1.14.ebuild @@ -13,7 +13,7 @@ if [[ "${PV}" = "9999" ]] ; then EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git" else SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Automatically select a display configuration based on connected devices" diff --git a/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild b/x11-misc/autorandr/autorandr-1.15.ebuild index 5f8e8128a64e..fd13373441f5 100644 --- a/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild +++ b/x11-misc/autorandr/autorandr-1.15.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 distutils-r1 systemd udev @@ -13,7 +13,7 @@ if [[ "${PV}" = "9999" ]] ; then EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git" else SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64" fi DESCRIPTION="Automatically select a display configuration based on connected devices" @@ -29,12 +29,11 @@ RDEPEND=" udev? ( virtual/udev ) " DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - # https://github.com/phillipberndt/autorandr/pull/306 - "${FILESDIR}"/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch -) +# desktop-file-util: uses desktop-file-edit in Makefile +BDEPEND=" + dev-util/desktop-file-utils + virtual/pkgconfig +" src_compile() { distutils-r1_src_compile diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild index 5a4cdc0e7c9f..0011c189d5ca 100644 --- a/x11-misc/autorandr/autorandr-9999.ebuild +++ b/x11-misc/autorandr/autorandr-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 distutils-r1 systemd udev @@ -13,7 +13,7 @@ if [[ "${PV}" = "9999" ]] ; then EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git" else SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi DESCRIPTION="Automatically select a display configuration based on connected devices" diff --git a/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch b/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch deleted file mode 100644 index ff3b31d01326..000000000000 --- a/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b8d397fc7a0d22a51ee13428ae13d892c0cc911 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus <flo@geekplace.eu> -Date: Thu, 20 Oct 2022 10:48:54 +0200 -Subject: [PATCH] Makefile: fix install_udev target by s/TARGETS/MAKECMDGOALS/ - -A Gentoo user reported [1] that the 'install_udev' target would -install a systemd-flavored udev rules, despite the 'systemd' target -not being selected. Replacing 'TARGETS' with 'MAKECMDGOALS' in the -Makefile rule fixes this . - -I am not sure where the TARGETS variable origniates from, but GNU make -uses MAKECMDGOALS (FreeBSD make uses .TARGETS, i.e., with a leading -dot). So if further portability between make variants is required, -then this needs to be adjusted. - -1: https://bugs.gentoo.org/803545#c3 -Fixes: ae1f18a06039 ("udev rule: Dynamically call either systemd or autorandr directly depending on whether systemd unit is available") ---- a/Makefile -+++ b/Makefile -@@ -129,7 +129,7 @@ endif - install_udev: - $(if $(UDEV_RULES_DIR),,$(error UDEV_RULES_DIR is not defined)) - mkdir -p ${DESTDIR}/${UDEV_RULES_DIR}/ -- echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(TARGETS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules -+ echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(MAKECMDGOALS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules - @echo - @echo "To activate the udev rules, run this command as root:" - @echo " udevadm control --reload-rules" diff --git a/x11-misc/barrier/barrier-2.4.0.ebuild b/x11-misc/barrier/barrier-2.4.0.ebuild index f086465e0601..0c587b0c8a91 100644 --- a/x11-misc/barrier/barrier-2.4.0.ebuild +++ b/x11-misc/barrier/barrier-2.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,6 +43,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${P}-includes.patch + "${FILESDIR}"/${P}-gcc-13.patch ) DOCS=( diff --git a/x11-misc/barrier/files/barrier-2.4.0-gcc-13.patch b/x11-misc/barrier/files/barrier-2.4.0-gcc-13.patch new file mode 100644 index 000000000000..5b1759049143 --- /dev/null +++ b/x11-misc/barrier/files/barrier-2.4.0-gcc-13.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/895088 +https://github.com/debauchee/barrier/pull/1886 + +From d376d23d534e053a160c32ee1170d237a2f3d6bd Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" <code@musicinmybrain.net> +Date: Thu, 26 Jan 2023 09:25:59 -0500 +Subject: [PATCH] Add missing #include directives needed for GCC 13 + +--- + src/lib/base/String.h | 1 + + src/lib/net/FingerprintData.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/lib/base/String.h b/src/lib/base/String.h +index 9c5a53bac4..fa37f8f0dc 100644 +--- a/src/lib/base/String.h ++++ b/src/lib/base/String.h +@@ -18,6 +18,7 @@ + + #pragma once + ++#include <cstdint> + #include "common/common.h" + #include "common/stdstring.h" + +diff --git a/src/lib/net/FingerprintData.h b/src/lib/net/FingerprintData.h +index 938a69538d..522a481353 100644 +--- a/src/lib/net/FingerprintData.h ++++ b/src/lib/net/FingerprintData.h +@@ -18,6 +18,7 @@ + #ifndef BARRIER_LIB_NET_FINGERPRINT_DATA_H + #define BARRIER_LIB_NET_FINGERPRINT_DATA_H + ++#include <cstdint> + #include <string> + #include <vector> + + diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r4.ebuild index e3fb13c155f1..ddab1dc8bc98 100644 --- a/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild +++ b/x11-misc/bbacpi/bbacpi-0.1.5-r4.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="ACPI monitor for X11" -HOMEPAGE="http://bbacpi.sourceforge.net" +HOMEPAGE="https://bbacpi.sourceforge.net" SRC_URI="mirror://sourceforge/bbacpi/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 x86" @@ -23,7 +23,6 @@ RDEPEND=" ${DEPEND} media-fonts/font-adobe-100dpi" -DOCS=( AUTHORS ChangeLog NEWS README data/README.bbacpi ) PATCHES=( "${FILESDIR}"/${P}-noextraquals.diff "${FILESDIR}"/${P}-overflows.diff @@ -31,11 +30,12 @@ PATCHES=( src_prepare() { default - mv configure.{in,ac} || die eautoreconf } src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbacpi || die + dodoc data/README.bbacpi + + rm "${ED}"/usr/share/bbtools/README.bbacpi || die } diff --git a/x11-misc/bbcd/bbcd-0.3.1-r4.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r4.ebuild deleted file mode 100644 index 8fe5e8ee889f..000000000000 --- a/x11-misc/bbcd/bbcd-0.3.1-r4.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="Basic CD Player for blackbox wm" -HOMEPAGE="http://tranber1.free.fr/bbcd.html" -SRC_URI="http://tranber1.free.fr/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RDEPEND="media-libs/libcdaudio - x11-libs/libX11" -DEPEND="${RDEPEND} - x11-libs/libXt" - -PATCHES=( - "${FILESDIR}"/${P}_${PV}a.diff - "${FILESDIR}"/${P}-gcc3.3.patch - "${FILESDIR}"/${P}-gcc4.3.patch -) - -src_configure() { - append-cxxflags -std=c++14 - default -} - -src_install() { - default - rm "${ED}/usr/share/bbtools/README.bbcd" || die -} diff --git a/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild index e6e27136388f..f1e4c0f5b75e 100644 --- a/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild +++ b/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,6 +25,9 @@ src_prepare() { sed -i \ -e 's|-helvetica-|-*-|g' \ resource.cc data/${PN}.{nobb,style} || die + sed -i \ + -e 's|register ||' \ + Image.cc LinkedList.cc || die eautoreconf } diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild index 5ae4a57762d3..bc6f3f4ff3ca 100644 --- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild +++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,6 +28,9 @@ PATCHES=( src_prepare() { default mv configure.{in,ac} || die + sed -i \ + -e 's|register ||' \ + Image.cc LinkedList.cc || die eautoreconf } diff --git a/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild b/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild index 8c74fcf000b9..8b7f49b5efc4 100644 --- a/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild +++ b/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,6 +23,9 @@ PATCHES=( "${FILESDIR}"/${P}-asneeded.patch ) src_prepare() { default mv configure.{in,ac} || die + sed -i \ + -e 's|register ||' \ + Image.cc || die eautoreconf } diff --git a/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild index 7f45dd7000ed..d232bb5c4dbf 100644 --- a/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild +++ b/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,12 +25,16 @@ PATCHES=( "${FILESDIR}"/${PN}-asneeded.patch ) src_prepare() { default gunzip doc/*.gz || die + mv configure.{in,ac} || die sed -i \ -e "s:man_DATA:man1_MANS:;s:.gz::g;/^mandir/d" \ doc/Makefile.am || die sed -i \ -e 's|-helvetica-|-*-|g' \ resource.cpp data/${PN}.{nobb,style} || die + sed -i \ + -e 's|register ||' \ + Image.cpp || die eautoreconf } diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest index 627878d6b052..d351edd982e9 100644 --- a/x11-misc/birdtray/Manifest +++ b/x11-misc/birdtray/Manifest @@ -1 +1 @@ -DIST birdtray-1.9.0.tar.gz 810297 BLAKE2B acc6593116fa735311f62405406192ad43e8af6481eac1d09298f846f5fab9a0dff575caefe9490d0a183c464fab763515e20e5725649fe4a800e575f712067b SHA512 898bfcebc7ba4b738e3ab41539c4de48871ebccf431bb1b12464e7f2956bad95af6158742c64ec5923d63889e777c98c75db31121d926e26f3dfe1b34d9f8b4a +DIST birdtray-1.11.4.gh.tar.gz 867399 BLAKE2B e3e5663bb343d991c66ff0bd774fdc1abf74a5e94f7ea42ecfe5e16f3c1be932fe8d91ae0d9a6e43d75475671f4f18df0a90f80a09e58892d9629c4cc464b729 SHA512 a3eeeb93fea3f32bbf6a43944d76d0c3990a26db0abbad52102aa72f15f9a32a746620ca347444dab0d90393785aeada7ffb9ec901f91b4701fb128c4e7e628c diff --git a/x11-misc/birdtray/birdtray-1.9.0.ebuild b/x11-misc/birdtray/birdtray-1.11.4.ebuild index 25cc5efe468d..82afb728b6df 100644 --- a/x11-misc/birdtray/birdtray-1.9.0.ebuild +++ b/x11-misc/birdtray/birdtray-1.11.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git" else - SRC_URI="https://github.com/gyunaev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/gyunaev/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64" fi @@ -29,6 +29,9 @@ RDEPEND="dev-db/sqlite:= x11-libs/libX11" DEPEND="${RDEPEND}" + +# https://github.com/gyunaev/birdtray/commit/74a97df3a17efd5ef679b8eed6999b97abc23f10 +# translations have been made optional, let's see how we would manage them BDEPEND="dev-qt/linguist-tools:5" pkg_postinst() { diff --git a/x11-misc/birdtray/birdtray-9999.ebuild b/x11-misc/birdtray/birdtray-9999.ebuild index 4fb71861085b..82afb728b6df 100644 --- a/x11-misc/birdtray/birdtray-9999.ebuild +++ b/x11-misc/birdtray/birdtray-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git" else - SRC_URI="https://github.com/gyunaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/gyunaev/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64" fi @@ -29,6 +29,9 @@ RDEPEND="dev-db/sqlite:= x11-libs/libX11" DEPEND="${RDEPEND}" + +# https://github.com/gyunaev/birdtray/commit/74a97df3a17efd5ef679b8eed6999b97abc23f10 +# translations have been made optional, let's see how we would manage them BDEPEND="dev-qt/linguist-tools:5" pkg_postinst() { diff --git a/x11-misc/blockdpy/blockdpy-1-r1.ebuild b/x11-misc/blockdpy/blockdpy-1-r2.ebuild index 37504c2a8993..a53a9f8c48af 100644 --- a/x11-misc/blockdpy/blockdpy-1-r1.ebuild +++ b/x11-misc/blockdpy/blockdpy-1-r2.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Tool to block access via the physical display while x11vnc is running" HOMEPAGE="http://www.karlrunge.com/x11vnc/blockdpy.c" SRC_URI="http://www.karlrunge.com/x11vnc/blockdpy.c" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" x11-libs/libX11 x11-libs/libXext" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR} +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_unpack() { cp "${DISTDIR}"/blockdpy.c blockdpy.c || die @@ -34,16 +32,16 @@ src_prepare() { sed -i '/#include <stdio.h>/i#include <string.h>' blockdpy.c || die } +src_configure() { + tc-export CC + append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xext) + export LDLIBS=$($(tc-getPKG_CONFIG) --libs x11 xext) +} + src_compile() { - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags x11) \ - $($(tc-getPKG_CONFIG) --cflags xext) \ - -o blockdpy blockdpy.c \ - $($(tc-getPKG_CONFIG) --libs x11) \ - $($(tc-getPKG_CONFIG) --libs xext) \ - || die "compile failed" + emake blockdpy - # Create README from head comment in source. + # Create README from head comment in source sed -n '1,/^ *\*\//s/^[ -]*\*[ \/]*//p' < blockdpy.c > README || die } @@ -55,7 +53,7 @@ src_install() { pkg_postinst() { # Just warn about missing xlock instead of requiring it in case # the user wants to use something else. - if [[ ! -x ${EPREFIX}/usr/bin/xlock ]]; then + if [[ ! -x ${EROOR}/usr/bin/xlock ]]; then ewarn 'The xlock executable was not found.' ewarn 'blockdpy runs "xlock" as the screen-lock program by default.' ewarn 'You should either install x11-misc/xlockmore or override the' diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild new file mode 100644 index 000000000000..d7bd5272ae0d --- /dev/null +++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="An analog clock displaying the system-time" +HOMEPAGE="https://launchpad.net/cairo-clock" +SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=dev-libs/glib-2.8 + >=gnome-base/libglade-2.6 + >=gnome-base/librsvg-2.14 + >=x11-libs/cairo-1.2 + >=x11-libs/gtk+-2.10:2 + >=x11-libs/pango-1.10 +" +DEPEND="${RDEPEND}" +# autoconf-archive for F_S patch +BDEPEND=" + dev-util/intltool + dev-build/autoconf-archive + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-desktop.patch + "${FILESDIR}"/${P}-linker.patch + "${FILESDIR}"/${P}-fortify-source.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + + gzip -d "${ED}"/usr/share/man/man1/cairo-clock.1.gz || die +} diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch new file mode 100644 index 000000000000..c10461b47f35 --- /dev/null +++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch @@ -0,0 +1,16 @@ +Don't clobber our toolchain defaults. + +https://bugs.gentoo.org/898240 +--- a/configure.ac ++++ b/configure.ac +@@ -96,7 +96,9 @@ CLOCK_DEFINES='-DDATA_DIR="\"$(datadir)\"" -DPKGDATA_DIR="\"$(pkgdatadir)\""' + AC_SUBST([CLOCK_DEFINES]) + + dnl CFLAGS +-CFLAGS="$CFLAGS -Wall -pedantic -std=c99 -fno-strict-aliasing -fmessage-length=0 -D_FORTIFY_SOURCE=2" ++CFLAGS="$CFLAGS -Wall -pedantic -std=c99 -fno-strict-aliasing -fmessage-length=0" ++ ++AX_ADD_FORTIFY_SOURCE + + AC_CONFIG_FILES([ + Makefile diff --git a/x11-misc/cdm/metadata.xml b/x11-misc/cdm/metadata.xml index 7f73310a2eaf..bda2ea2392c5 100644 --- a/x11-misc/cdm/metadata.xml +++ b/x11-misc/cdm/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>gienah@gentoo.org</email> - <name>Mark Wright</name> -</maintainer> -<longdescription lang="en"> -CDM is a minimalistic, yet full-featured replacement for -login-managers like slim, kdm, gdm and qingy that provides a fast, -dialog-based login system without the overhead of the X Window System -or the instability of qingy. Written in pure bash, CDM has no other -dependencies, yet supports multiple users/sessions and can start -virtually any DE/WM. -</longdescription> + <!-- maintainer-needed --> + <longdescription lang="en"> + CDM is a minimalistic, yet full-featured replacement for + login-managers like slim, kdm, gdm and qingy that provides a fast, + dialog-based login system without the overhead of the X Window System + or the instability of qingy. Written in pure bash, CDM has no other + dependencies, yet supports multiple users/sessions and can start + virtually any DE/WM. + </longdescription> + <upstream> + <remote-id type="github">evertiro/cdm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/chgres/chgres-0.1-r2.ebuild b/x11-misc/chgres/chgres-0.1-r3.ebuild index 34ce121d6578..f3da79feafe0 100644 --- a/x11-misc/chgres/chgres-0.1-r2.ebuild +++ b/x11-misc/chgres/chgres-0.1-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,21 +12,22 @@ SRC_URI="http://hpwww.ec-lyon.fr/~vincent/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXxf86dga x11-libs/libXext x11-libs/libXxf86vm" DEPEND="${RDEPEND} - x11-base/xorg-proto - virtual/pkgconfig -" + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${P}-{flags,includes}.patch ) +PATCHES=( + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-includes.patch +) -src_prepare() { - default +src_configure() { tc-export CC PKG_CONFIG } diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest index fcc9473fc547..d4d19bcb59ed 100644 --- a/x11-misc/colord/Manifest +++ b/x11-misc/colord/Manifest @@ -1 +1 @@ -DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123 +DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be diff --git a/x11-misc/colord/colord-1.4.6-r1.ebuild b/x11-misc/colord/colord-1.4.7-r1.ebuild index 58918a6d770d..ed40a24f368b 100644 --- a/x11-misc/colord/colord-1.4.6-r1.ebuild +++ b/x11-misc/colord/colord-1.4.7-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 VALA_USE_DEPEND="vapigen" inherit bash-completion-r1 meson-multilib tmpfiles udev vala @@ -58,12 +58,15 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${P}-lcms2-corruption.patch + "${FILESDIR}"/${PN}-1.4.7-systemd-permissions.patch ) +pkg_setup() { + use vala && vala_setup +} + src_prepare() { default - use vala && vala_src_prepare # Test requires a running session # https://github.com/hughsie/colord/issues/94 diff --git a/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch b/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch deleted file mode 100644 index 4df6773cfb4b..000000000000 --- a/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/880865 - -https://github.com/mm2/Little-CMS/issues/344 -https://github.com/hughsie/colord/issues/145 - -https://github.com/hughsie/colord/commit/91a3cc2e994be587def3b70762f15461101d43a1 - -From 91a3cc2e994be587def3b70762f15461101d43a1 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Tue, 15 Nov 2022 17:03:37 +0000 -Subject: [PATCH] lib: avoid destructing LCMS plugin twice with lcms 2.14 - -lcms 2.14 contains a change to avoid a memory leak, but that change -assumes correct API usage. It's not necessary to both cmsUnregisterPluginsTHR() -and then cmsDeleteContext() -- we can just straight up delete the LCMS -context instead (cmsDeleteContext()). - -So, follow upstream's suggestion & do that. This fixes memory corruption -when building colord on x86, for example. - -Bug: https://github.com/mm2/Little-CMS/issues/344 -Fixes: https://github.com/hughsie/colord/issues/145 -Signed-off-by: Sam James <sam@gentoo.org> ---- a/lib/colord/cd-context-lcms.c -+++ b/lib/colord/cd-context-lcms.c -@@ -163,7 +163,6 @@ cd_context_lcms_free (gpointer ctx) - g_clear_error (error_ctx); - g_free (error_ctx); - -- cmsUnregisterPluginsTHR (ctx); - cmsDeleteContext (ctx); - } - diff --git a/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch b/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch new file mode 100644 index 000000000000..0a97d8ac579d --- /dev/null +++ b/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch @@ -0,0 +1,51 @@ +https://github.com/hughsie/colord/commit/08a32b2379fb5582f4312e59bf51a2823df56276 +https://github.com/hughsie/colord/commit/9283abd9c00468edb94d2a06d6fa3681cae2700d + +From 08a32b2379fb5582f4312e59bf51a2823df56276 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Mon, 29 Jan 2024 10:37:11 +0000 +Subject: [PATCH] Fix writing to the database with ProtectSystem=strict + +Fixes https://github.com/hughsie/colord/issues/166 +--- a/data/colord.service.in ++++ b/data/colord.service.in +@@ -17,6 +17,10 @@ ProtectControlGroups=true + RestrictRealtime=true + RestrictAddressFamilies=AF_UNIX + ++ConfigurationDirectory=colord ++StateDirectory=colord ++CacheDirectory=colord ++ + # drop all capabilities + CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER CAP_NET_ADMIN CAP_SYS_RAWIO CAP_SYS_TIME CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE CAP_KILL CAP_MKNOD CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RESOURCE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_BOOT CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CAP_SYS_CHROOT CAP_BLOCK_SUSPEND CAP_LEASE CAP_SYS_PACCT CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM + + +From 9283abd9c00468edb94d2a06d6fa3681cae2700d Mon Sep 17 00:00:00 2001 +From: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at> +Date: Tue, 30 Jan 2024 12:44:18 +0100 +Subject: [PATCH] Fix USB scanners not working with RestrictAddressFamilies + +colord-sane scanner drivers using libusb can't initialize properly with +RestrictAddressFamilies set to AF_UNIX. Remove that line to ensure those +can work properly. + +This also avoids a crash in HPLIP due to unchecked calls to libusb_init(). + +Fixes #165 +--- + data/colord.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/colord.service.in b/data/colord.service.in +index c358dc4b..45ec5811 100644 +--- a/data/colord.service.in ++++ b/data/colord.service.in +@@ -15,7 +15,6 @@ ProtectKernelModules=true + ProtectKernelLogs=true + ProtectControlGroups=true + RestrictRealtime=true +-RestrictAddressFamilies=AF_UNIX + + ConfigurationDirectory=colord + StateDirectory=colord diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest index fa660d479356..cbcce5636e7c 100644 --- a/x11-misc/compose-tables/Manifest +++ b/x11-misc/compose-tables/Manifest @@ -1 +1,2 @@ -DIST libX11-1.8.3.tar.xz 1811712 BLAKE2B 0adc92c13ba4bdec5d927349ca8c02adbb851eb376f19aa5f39e13caddb36c089be227c1f2dc61b34f882aae794f2b46ae237345c12c8e897be8df01e9fb3ef2 SHA512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 +DIST libX11-1.8.7.tar.xz 1859256 BLAKE2B 335d8af91c13aba11255c266c4687a7f66b021207a92485d723b4107601bbabb6a0e5535241a3bcff4ac9a99142730d2b3d2e2eaff86b507fee5b35a2590d792 SHA512 d53bfc18f38d339a6a695b09835b2ae96b323881678bfe7ddca697605e3bdf4102ff49cc3078880a6c55b5977fcdd0aadaf5429086132de3a5bda302f79a2fa6 +DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96 diff --git a/x11-misc/compose-tables/compose-tables-1.8.3.ebuild b/x11-misc/compose-tables/compose-tables-1.8.7.ebuild index 23230b505b42..f8356e0b46b9 100644 --- a/x11-misc/compose-tables/compose-tables-1.8.3.ebuild +++ b/x11-misc/compose-tables/compose-tables-1.8.7.ebuild @@ -1,7 +1,7 @@ # Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_MULTILIB=no XORG_TARBALL_SUFFIX=xz @@ -13,20 +13,21 @@ DESCRIPTION="X.Org Compose Key tables from libX11" 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +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="!<x11-libs/libX11-1.7.0" +RDEPEND="" XORG_CONFIGURE_OPTIONS=( --without-xmlto --without-fop --disable-specs --disable-xkb + --with-keysymdefdir="${ESYSROOT}/usr/include/X11" ) src_compile() { diff --git a/x11-misc/compose-tables/compose-tables-1.8.9.ebuild b/x11-misc/compose-tables/compose-tables-1.8.9.ebuild new file mode 100644 index 000000000000..ade5421accec --- /dev/null +++ b/x11-misc/compose-tables/compose-tables-1.8.9.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 db723c3427ff..092518520b53 100644 --- a/x11-misc/copyq/Manifest +++ b/x11-misc/copyq/Manifest @@ -1,3 +1,2 @@ -DIST copyq-3.13.0.tar.gz 2917941 BLAKE2B e8fc963e6a773ae70ca5a39f9ea55a98de5c5d129b845d0da9ed08ffec65d88ed8b5dd138dea11a33d563b899f0497929ed3c40d418574e50c2a1fbbd7b1a9f6 SHA512 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307 -DIST copyq-4.1.0.tar.gz 2999036 BLAKE2B 1252a66a3bbde3d4435ced9934792ed97066229b23cd5ec21a6187d4f36718d46ac5e16ff19c45afee8715a32686bfe8e47af1bbb37d61a1cacb4e9395dc7bc9 SHA512 538be8b5b60dc054cb8220174461516a4d1e9d6f7c1a03406770f143b83f9a23875b0cf663406e16d83a762b6170587f0e44c386a7d9d552ec6f914b3673206d -DIST copyq-5.0.0.tar.gz 3019807 BLAKE2B d39c02867ed4a23eeeec7283f0cbf02a77a3c3fc3ece0a7323d67de9d2b8f03749318d066c23221ccd393923217c7cf357657bdf70802087edae7f4128a63529 SHA512 b6ff28bd7529bf371c7f9d10372eeafd5f291fd1f6bbed5416938973db43e43f0113a8f6ba4619840a7edd95d26ccb9369f8a58d30b740944d3f8510482b1405 +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-3.13.0.ebuild b/x11-misc/copyq/copyq-3.13.0.ebuild deleted file mode 100644 index 2f1b7720f7a3..000000000000 --- a/x11-misc/copyq/copyq-3.13.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Clipboard manager with advanced features" -HOMEPAGE="https://github.com/hluk/CopyQ" -SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXtst -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S="${WORKDIR}/CopyQ-${PV}" - -src_configure() { - local mycmakeargs=( - -DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins" - -DWITH_TESTS=$(usex test) - -DWITH_WEBKIT=OFF - ) - cmake_src_configure -} - -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/copyq/copyq-4.1.0.ebuild b/x11-misc/copyq/copyq-4.1.0.ebuild deleted file mode 100644 index eddc9db5ab26..000000000000 --- a/x11-misc/copyq/copyq-4.1.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Clipboard manager with advanced features" -HOMEPAGE="https://github.com/hluk/CopyQ" -SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/wayland - 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 - kde-frameworks/knotifications:5 - x11-libs/libX11 - x11-libs/libXtst -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -S="${WORKDIR}/CopyQ-${PV}" - -PATCHES=( "${FILESDIR}/${P}-bash-completion.patch" ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins" - -DWITH_TESTS=$(usex test) - ) - cmake_src_configure -} - -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/copyq/copyq-5.0.0.ebuild b/x11-misc/copyq/copyq-5.0.0.ebuild deleted file mode 100644 index a8356570fecc..000000000000 --- a/x11-misc/copyq/copyq-5.0.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Clipboard manager with advanced features" -HOMEPAGE="https://github.com/hluk/CopyQ" -SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CopyQ-${PV}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/wayland - 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 - kde-frameworks/knotifications:5 - x11-libs/libX11 - x11-libs/libXtst -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 )" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -src_configure() { - local mycmakeargs=( - -DCMAKE_BUILD_TYPE=Release - -DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins" - -DWITH_TESTS=$(usex test) - ) - cmake_src_configure -} - -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/copyq/copyq-7.0.0.ebuild b/x11-misc/copyq/copyq-7.0.0.ebuild new file mode 100644 index 000000000000..d93363879bb5 --- /dev/null +++ b/x11-misc/copyq/copyq-7.0.0.ebuild @@ -0,0 +1,103 @@ +# 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/copyq/copyq-7.1.0-r1.ebuild b/x11-misc/copyq/copyq-7.1.0-r1.ebuild new file mode 100644 index 000000000000..85ed9029ecee --- /dev/null +++ b/x11-misc/copyq/copyq-7.1.0-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake optfeature virtualx xdg + +DESCRIPTION="Clipboard manager with advanced features" +HOMEPAGE=" + https://hluk.github.io/CopyQ/ + 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="notification qt6 test" +# Native notifications are not supported with Qt 6 +# (Bumpers please check when this requirement is lifted). +# src/notifications.cmake +REQUIRED_USE="notification? ( !qt6 )" + +RDEPEND=" + dev-libs/wayland + x11-libs/libX11 + 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 + notification? ( 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-util/wayland-scanner + ) + test? ( + app-crypt/gnupg + x11-wm/openbox + ) +" + +PATCHES=( + "${FILESDIR}/copyq-7.1.0-fix-qt-6.6.0-build.patch" + "${FILESDIR}/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch" + "${FILESDIR}/copyq-7.1.0-fix-gpg-2.1-support.patch" + "${FILESDIR}/copyq-7.1.0-support-plugin-dir-envvar-r1.patch" +) + +src_prepare() { + cmake_src_prepare + + # FAIL! : Tests::actionDialogAccept() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. + # FAIL! : Tests::actionDialogSelection() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. + # FAIL! : Tests::actionDialogSelectionInputOutput() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. + # FAIL! : Tests::commandShowAt() 'NO_ERRORS(m_test->waitOnOutput((Args() << "visible"), toByteArray("true\n")))' returned FALSE. + sed -Ei -e ' + /Tests::(actionDialog(Accept|Selection(|InputOutput))|commandShow)/,/}/ { + /^\s*\{/ a \ + #if QT_VERSION < QT_VERSION_CHECK(6,0,0)\ + SKIP("Broken on qt5");\ + #endif + }' src/tests/tests.cpp || die +} + +src_configure() { + local mycmakeargs=( + -DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" + -DWITH_NATIVE_NOTIFICATIONS=$(usex notification) + -DWITH_QT6=$(usex qt6) + -DWITH_TESTS=$(usex test) + ) + + cmake_src_configure +} + +my_src_test() { + # Don't rerun tests and more logs + local -x COPYQ_TESTS_RERUN_FAILED=0 + local -x COPYQ_LOG_LEVEL=DEBUG + + # Skip test that require network + local -x COPYQ_TESTS_NO_NETWORK=1 + + # Less noise from trying the wayland plugin + local -x QT_QPA_PLATFORM=xcb + + # Make sure copyq doesn't use system installed plugins which may be incompatible. + local -x COPYQ_PLUGIN_DIR="${BUILD_DIR}/plugins" + + # In case the users current system confuses the notification integration + unset KDE_FULL_SESSION XDG_CURRENT_DESKTOP + + mkdir "${HOME}"/.gnupg || die + + ebegin "Starting Openbox" + openbox & # upstream uses Openbox and it doesn't fail like IceWM + sleep 5 + eend 0 + + "${BUILD_DIR}"/copyq tests + + return $? +} + +src_test() { + virtx my_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "encryption support" app-crypt/gnupg +} diff --git a/x11-misc/copyq/files/copyq-4.1.0-bash-completion.patch b/x11-misc/copyq/files/copyq-4.1.0-bash-completion.patch deleted file mode 100644 index f787dcbd2ae5..000000000000 --- a/x11-misc/copyq/files/copyq-4.1.0-bash-completion.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix installation of bash completion script. -Signed-off-by: Christian Schroeder <chris.schroeder.public@gmail.com> - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,7 +54,7 @@ - set(copyq_ICON_MASK src/images/icon_mask.svg) - set(copyq_DESKTOP shared/${copyq_APP_ID}.desktop) - set(copyq_APPDATA shared/${copyq_APP_ID}.appdata.xml) --set(copyq_BASH_COMPLETION shared/${copyq_APP_ID}.appdata.xml) -+set(copyq_BASH_COMPLETION shared/copyq-completion) - set(copyq_MANPAGE debian/copyq.1) - - # Be more strict while compiling debugging version diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch new file mode 100644 index 000000000000..b06e7e759b84 --- /dev/null +++ b/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch @@ -0,0 +1,558 @@ +https://github.com/hluk/CopyQ/pull/2471 +https://github.com/hluk/CopyQ/issues/2463 +https://github.com/hluk/CopyQ/commit/a7a891e1f84c6c046a7bfc904c5fc6ebb98dec94 + +From a7a891e1f84c6c046a7bfc904c5fc6ebb98dec94 Mon Sep 17 00:00:00 2001 +From: Lukas Holecek <hluk@email.cz> +Date: Wed, 20 Sep 2023 19:42:08 +0200 +Subject: [PATCH] itemencrypted: Fix managing keys with gpg 2.1 and above + (#2471) + +* itemencrypted: Fix managing keys with gpg 2.1 and above + +Fixes #2463, #1208 + +* Tests: Avoid skipping itemencrypted tests if gpg is not found + +* Windows: Fix running itemencrypted plugin tests + +* itemencrypted: Fix error logging + +* Ensure config directory exists + +* itemencrypted: Fix handling native/non-native key paths + +* Appveyor: Fix stuck job waiting on gpg-agent +--- a/plugins/itemencrypted/itemencrypted.cpp ++++ b/plugins/itemencrypted/itemencrypted.cpp +@@ -57,20 +57,23 @@ bool waitOrTerminate(QProcess *p, int timeoutMs) + bool verifyProcess(QProcess *p, int timeoutMs = 30000) + { + if ( !waitOrTerminate(p, timeoutMs) ) { +- log( "ItemEncrypt ERROR: Process timed out; stderr: " + p->readAllStandardError(), LogError ); ++ log( QStringLiteral("ItemEncrypt: Process timed out; stderr: %1") ++ .arg(QString::fromUtf8(p->readAllStandardError())), LogError ); + return false; + } + + const int exitCode = p->exitCode(); + if ( p->exitStatus() != QProcess::NormalExit ) { +- log( "ItemEncrypt ERROR: Failed to run GnuPG: " + p->errorString(), LogError ); ++ log( QStringLiteral("ItemEncrypt: Failed to run GnuPG: %1") ++ .arg(p->errorString()), LogError ); + return false; + } + + if (exitCode != 0) { + const QString errors = p->readAllStandardError(); + if ( !errors.isEmpty() ) +- log( "ItemEncrypt ERROR: GnuPG stderr:\n" + errors, LogError ); ++ log( QStringLiteral("ItemEncrypt: GnuPG stderr:\n%1") ++ .arg(errors), LogError ); + return false; + } + +@@ -88,55 +91,106 @@ QString getGpgVersionOutput(const QString &executable) { + return p.readAllStandardOutput(); + } + +-bool checkGpgExecutable(const QString &executable) ++struct GpgVersion { ++ int major; ++ int minor; ++}; ++ ++GpgVersion parseVersion(const QString &versionOutput) + { +- const auto versionOutput = getGpgVersionOutput(executable); +- return versionOutput.contains(" 2."); ++ const int lineEndIndex = versionOutput.indexOf('\n'); ++#if QT_VERSION < QT_VERSION_CHECK(5,15,2) ++ const QStringRef firstLine = versionOutput.midRef(0, lineEndIndex); ++#else ++ const auto firstLine = QStringView{versionOutput}.mid(0, lineEndIndex); ++#endif ++ const QRegularExpression versionRegex(QStringLiteral(R"( (\d+)\.(\d+))")); ++ const QRegularExpressionMatch match = versionRegex.match(firstLine); ++#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) ++ const int major = match.hasMatch() ? match.capturedView(1).toInt() : 0; ++ const int minor = match.hasMatch() ? match.capturedView(2).toInt() : 0; ++#else ++ const int major = match.hasMatch() ? match.capturedRef(1).toInt() : 0; ++ const int minor = match.hasMatch() ? match.capturedRef(2).toInt() : 0; ++#endif ++ return GpgVersion{major, minor}; + } + ++class GpgExecutable { ++public: ++ GpgExecutable() = default; ++ ++ explicit GpgExecutable(const QString &executable) ++ : m_executable(executable) ++ { ++ const auto versionOutput = getGpgVersionOutput(executable); ++ if ( !versionOutput.isEmpty() ) { ++ COPYQ_LOG_VERBOSE( ++ QStringLiteral("ItemEncrypt INFO: '%1 --version' output: %2") ++ .arg(executable, versionOutput) ); ++ ++ const GpgVersion version = parseVersion(versionOutput); ++ m_isSupported = version.major >= 2; ++ COPYQ_LOG( QStringLiteral("ItemEncrypt INFO: %1 gpg version: %2.%3") ++ .arg(m_isSupported ? "Supported" : "Unsupported") ++ .arg(version.major) ++ .arg(version.minor) ); ++ ++ const bool needsSecring = version.major == 2 && version.minor == 0; ++ ++ const QString path = getConfigurationFilePath(""); ++ m_pubring = path + ".pub"; ++ m_pubringNative = QDir::toNativeSeparators(m_pubring); ++ if (needsSecring) { ++ m_secring = path + ".sec"; ++ m_secringNative = QDir::toNativeSeparators(m_secring); ++ } ++ + #ifdef Q_OS_WIN +-bool checkUnixGpg(const QString &executable) +-{ +- static const auto unixGpg = getGpgVersionOutput(executable).contains("Home: /c/"); +- return unixGpg; +-} ++ const bool isUnixGpg = versionOutput.contains("Home: /c/"); ++ if (isUnixGpg) { ++ m_pubringNative = QString(m_pubring).replace(":", "").insert(0, '/'); ++ if (needsSecring) ++ m_secringNative = QString(m_secring).replace(":", "").insert(0, '/'); ++ } + #endif ++ } ++ } ++ ++ const QString &executable() const { return m_executable; } ++ bool isSupported() const { return m_isSupported; } ++ bool needsSecring() const { return !m_secring.isEmpty(); } ++ const QString &pubring() const { return m_pubring; } ++ const QString &secring() const { return m_secring; } ++ const QString &pubringNative() const { return m_pubringNative; } ++ const QString &secringNative() const { return m_secringNative; } ++ ++private: ++ QString m_executable; ++ QString m_pubring; ++ QString m_secring; ++ QString m_pubringNative; ++ QString m_secringNative; ++ bool m_isSupported = false; ++}; + +-QString findGpgExecutable() ++GpgExecutable findGpgExecutable() + { + for (const auto &executable : {"gpg2", "gpg"}) { +- if ( checkGpgExecutable(executable) ) +- return executable; ++ GpgExecutable gpg(executable); ++ if ( gpg.isSupported() ) ++ return gpg; + } + +- return QString(); ++ return GpgExecutable(); + } + +-const QString &gpgExecutable() ++const GpgExecutable &gpgExecutable() + { + static const auto gpg = findGpgExecutable(); + return gpg; + } + +-struct KeyPairPaths { +- KeyPairPaths() +- { +- const QString path = getConfigurationFilePath(""); +- sec = QDir::toNativeSeparators(path + ".sec"); +- pub = QDir::toNativeSeparators(path + ".pub"); +- +-#ifdef Q_OS_WIN +- if (checkUnixGpg(gpgExecutable())) { +- pub = QDir::fromNativeSeparators(pub).replace(":", "").insert(0, '/'); +- sec = QDir::fromNativeSeparators(sec).replace(":", "").insert(0, '/'); +- } +-#endif +- } +- +- QString sec; +- QString pub; +-}; +- + QStringList getDefaultEncryptCommandArguments(const QString &publicKeyPath) + { + return QStringList() << "--trust-model" << "always" << "--recipient" << "copyq" +@@ -146,16 +200,18 @@ QStringList getDefaultEncryptCommandArguments(const QString &publicKeyPath) + + void startGpgProcess(QProcess *p, const QStringList &args, QIODevice::OpenModeFlag mode) + { +- KeyPairPaths keys; +- p->start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) + args, mode); ++ const auto &gpg = gpgExecutable(); ++ p->start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) + args, mode); + } + + QString importGpgKey() + { +- KeyPairPaths keys; ++ const auto &gpg = gpgExecutable(); ++ if ( !gpg.needsSecring() ) ++ return QString(); + + QProcess p; +- p.start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) << "--import" << keys.sec); ++ p.start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) << "--import" << gpg.secringNative()); + if ( !verifyProcess(&p) ) + return "Failed to import private key (see log)."; + +@@ -164,18 +220,20 @@ QString importGpgKey() + + QString exportGpgKey() + { +- KeyPairPaths keys; ++ const auto &gpg = gpgExecutable(); ++ if ( !gpg.needsSecring() ) ++ return QString(); + + // Private key already created or exported. +- if ( QFile::exists(keys.sec) ) ++ if ( QFile::exists(gpg.secring()) ) + return QString(); + + QProcess p; +- p.start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) << "--export-secret-key" << "copyq"); ++ p.start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) << "--export-secret-key" << gpg.secringNative()); + if ( !verifyProcess(&p) ) + return "Failed to export private key (see log)."; + +- QFile secKey(keys.sec); ++ QFile secKey(gpg.secring()); + if ( !secKey.open(QIODevice::WriteOnly) ) + return "Failed to create private key."; + +@@ -240,7 +298,7 @@ bool encryptMimeData(const QVariantMap &data, const QModelIndex &index, QAbstrac + + void startGenerateKeysProcess(QProcess *process, bool useTransientPasswordlessKey = false) + { +- const KeyPairPaths keys; ++ const auto &gpg = gpgExecutable(); + + auto args = QStringList() << "--batch" << "--gen-key"; + +@@ -253,15 +311,19 @@ void startGenerateKeysProcess(QProcess *process, bool useTransientPasswordlessKe + } + + startGpgProcess(process, args, QIODevice::ReadWrite); +- process->write( "\nKey-Type: RSA" +- "\nKey-Usage: encrypt" +- "\nKey-Length: 4096" +- "\nName-Real: copyq" +- + transientOptions + +- "\n%secring " + keys.sec.toUtf8() + +- "\n%pubring " + keys.pub.toUtf8() + +- "\n%commit" +- "\n" ); ++ process->write( ++ "\nKey-Type: RSA" ++ "\nKey-Usage: encrypt" ++ "\nKey-Length: 4096" ++ "\nName-Real: copyq" ++ + transientOptions + ++ "\n%pubring " + gpg.pubringNative().toUtf8() ++ ); ++ ++ if ( gpg.needsSecring() ) ++ process->write("\n%secring " + gpg.secringNative().toUtf8()); ++ ++ process->write("\n%commit\n"); + process->closeWriteChannel(); + } + +@@ -276,7 +338,7 @@ QString exportImportGpgKeys() + + bool isGpgInstalled() + { +- return !gpgExecutable().isEmpty(); ++ return gpgExecutable().isSupported(); + } + + } // namespace +@@ -314,7 +376,7 @@ bool ItemEncryptedSaver::saveItems(const QString &, const QAbstractItemModel &mo + bytes = readGpgOutput(QStringList("--encrypt"), bytes); + if ( bytes.isEmpty() ) { + emitEncryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to read encrypted data"); ++ log("ItemEncrypt: Failed to read encrypted data", LogError); + return false; + } + +@@ -325,7 +387,7 @@ bool ItemEncryptedSaver::saveItems(const QString &, const QAbstractItemModel &mo + + if ( stream.status() != QDataStream::Ok ) { + emitEncryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to write encrypted data"); ++ log("ItemEncrypt: Failed to write encrypted data", LogError); + return false; + } + +@@ -510,17 +572,22 @@ void ItemEncryptedScriptable::pasteEncryptedItems() + + QString ItemEncryptedScriptable::generateTestKeys() + { +- const KeyPairPaths keys; +- for ( const auto &keyFileName : {keys.sec, keys.pub} ) { ++ const auto &gpg = gpgExecutable(); ++ ++ const QStringList keys = gpg.needsSecring() ++ ? QStringList{gpg.pubring(), gpg.secring()} ++ : QStringList{gpg.pubring()}; ++ ++ for (const auto &keyFileName : keys) { + if ( QFile::exists(keyFileName) && !QFile::remove(keyFileName) ) +- return QString("Failed to remove \"%1\"").arg(keys.sec); ++ return QString("Failed to remove \"%1\"").arg(keyFileName); + } + + QProcess process; + startGenerateKeysProcess(&process, true); + + if ( !verifyProcess(&process) ) { +- return QString("ItemEncrypt ERROR: %1; stderr: %2") ++ return QString("ItemEncrypt: %1; stderr: %2") + .arg( process.errorString(), + QString::fromUtf8(process.readAllStandardError()) ); + } +@@ -529,9 +596,9 @@ QString ItemEncryptedScriptable::generateTestKeys() + if ( !error.isEmpty() ) + return error; + +- for ( const auto &keyFileName : {keys.sec, keys.pub} ) { ++ for (const auto &keyFileName : keys) { + if ( !QFile::exists(keyFileName) ) +- return QString("Failed to create \"%1\"").arg(keys.sec); ++ return QString("Failed to create \"%1\"").arg(keyFileName); + } + + return QString(); +@@ -606,19 +673,29 @@ QWidget *ItemEncryptedLoader::createSettingsWidget(QWidget *parent) + m_encryptTabs.join('\n') ); + + if (status() != GpgNotInstalled) { +- KeyPairPaths keys; ++ const auto &gpg = gpgExecutable(); + ui->labelShareInfo->setTextFormat(Qt::RichText); +- ui->labelShareInfo->setText( ItemEncryptedLoader::tr( +- "To share encrypted items on other computer or" +- " session, you'll need public and secret key files:" +- "<ul>" +- "<li>%1</li>" +- "<li>%2<br />(Keep this secret key in a safe place.)</li>" +- "</ul>" +- ) +- .arg( quoteString(keys.pub), +- quoteString(keys.sec) ) +- ); ++ QString text = ItemEncryptedLoader::tr( ++ "To share encrypted items on other computer or" ++ " session, you'll need these secret key files (keep them in a safe place):" ++ ); ++ if (gpg.needsSecring()) { ++ text.append( QStringLiteral( ++ "<ul>" ++ "<li>%1</li>" ++ "<li>%2</li>" ++ "</ul>" ++ ).arg(quoteString(gpg.pubringNative()), quoteString(gpg.secringNative())) ++ ); ++ } else { ++ text.append( QStringLiteral( ++ "<ul>" ++ "<li>%1</li>" ++ "</ul>" ++ ).arg(quoteString(gpg.pubringNative())) ++ ); ++ } ++ ui->labelShareInfo->setText(text); + } + + updateUi(); +@@ -689,7 +766,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + const int bytesRead = stream.readRawData(encryptedBytes, 4096); + if (bytesRead == -1) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypted ERROR: Failed to read encrypted data"); ++ log("ItemEncrypted: Failed to read encrypted data", LogError); + return nullptr; + } + p.write(encryptedBytes, bytesRead); +@@ -708,7 +785,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + const QByteArray bytes = p.readAllStandardOutput(); + if ( bytes.isEmpty() ) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to read encrypted data."); ++ log("ItemEncrypt: Failed to read encrypted data", LogError); + verifyProcess(&p); + return nullptr; + } +@@ -719,7 +796,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + stream2 >> length; + if ( stream2.status() != QDataStream::Ok ) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to parse item count!"); ++ log("ItemEncrypt: Failed to parse item count", LogError); + return nullptr; + } + length = qMin(length, static_cast<quint64>(maxItems)) - static_cast<quint64>(model->rowCount()); +@@ -728,7 +805,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + for ( int i = 0; i < count && stream2.status() == QDataStream::Ok; ++i ) { + if ( !model->insertRow(i) ) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to insert item!"); ++ log("ItemEncrypt: Failed to insert item", LogError); + return nullptr; + } + QVariantMap dataMap; +@@ -738,7 +815,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + + if ( stream2.status() != QDataStream::Ok ) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to decrypt item!"); ++ log("ItemEncrypt: Failed to decrypt item", LogError); + return nullptr; + } + +--- a/plugins/itemencrypted/tests/itemencryptedtests.cpp ++++ b/plugins/itemencrypted/tests/itemencryptedtests.cpp +@@ -25,6 +25,8 @@ void ItemEncryptedTests::cleanupTestCase() + void ItemEncryptedTests::init() + { + TEST(m_test->init()); ++ ++ QVERIFY(isGpgInstalled()); + } + + void ItemEncryptedTests::cleanup() +@@ -34,13 +36,10 @@ void ItemEncryptedTests::cleanup() + + void ItemEncryptedTests::encryptDecryptData() + { +- if ( !isGpgInstalled() ) +- SKIP("gpg2 is required to run the test"); +- +- RUN("-e" << "plugins.itemencrypted.generateTestKeys()", "\n"); ++ RUN("plugins.itemencrypted.generateTestKeys()", "\n"); + + // Test gpg errors first. +- RUN("-e" << "plugins.itemencrypted.encrypt(input());print('')", ""); ++ RUN("plugins.itemencrypted.encrypt(input());print('')", ""); + + const QByteArray input("\x00\x01\x02\x03\x04", 5); + QByteArray stdoutActual; +@@ -60,10 +59,7 @@ void ItemEncryptedTests::encryptDecryptItems() + SKIP("Ctrl+L shortcut doesn't seem work on OS X"); + #endif + +- if ( !isGpgInstalled() ) +- SKIP("gpg2 is required to run the test"); +- +- RUN("-e" << "plugins.itemencrypted.generateTestKeys()", "\n"); ++ RUN("plugins.itemencrypted.generateTestKeys()", "\n"); + + // Load commands from the plugin generating keys. + RUN("keys" << "Ctrl+P" << "ENTER", ""); +--- a/src/app/clipboardserver.cpp ++++ b/src/app/clipboardserver.cpp +@@ -124,6 +124,8 @@ ClipboardServer::ClipboardServer(QApplication *app, const QString &sessionName) + + QApplication::setQuitOnLastWindowClosed(false); + ++ ensureSettingsDirectoryExists(); ++ + m_sharedData = std::make_shared<ClipboardBrowserShared>(); + m_sharedData->itemFactory = new ItemFactory(this); + m_sharedData->notifications = new NotificationDaemon(this); +--- a/src/common/config.cpp ++++ b/src/common/config.cpp +@@ -157,6 +157,20 @@ QString getConfigurationFilePathHelper() + + } // namespace + ++bool ensureSettingsDirectoryExists() ++{ ++ QDir settingsDir( settingsDirectoryPath() ); ++ if ( !settingsDir.mkpath(".") ) { ++ log( QStringLiteral("Failed to create the directory for settings: %1") ++ .arg(settingsDir.path()), ++ LogError ); ++ ++ return false; ++ } ++ ++ return true; ++} ++ + const QString &getConfigurationFilePath() + { + static const QString path = getConfigurationFilePathHelper(); +--- a/src/common/config.h ++++ b/src/common/config.h +@@ -9,6 +9,8 @@ class QString; + class QVariant; + class QWidget; + ++bool ensureSettingsDirectoryExists(); ++ + const QString &getConfigurationFilePath(); + + QString getConfigurationFilePath(const char *suffix); +--- a/src/item/itemstore.cpp ++++ b/src/item/itemstore.cpp +@@ -22,20 +22,6 @@ QString itemFileName(const QString &id) + return getConfigurationFilePath("_tab_") + part + QLatin1String(".dat"); + } + +-bool createItemDirectory() +-{ +- QDir settingsDir( settingsDirectoryPath() ); +- if ( !settingsDir.mkpath(".") ) { +- log( QString("Cannot create directory for settings %1!") +- .arg(quoteString(settingsDir.path()) ), +- LogError ); +- +- return false; +- } +- +- return true; +-} +- + void printItemFileError( + const QString &action, const QString &id, const QFileDevice &file) + { +@@ -83,9 +69,6 @@ ItemSaverPtr createTab( + + ItemSaverPtr loadItems(const QString &tabName, QAbstractItemModel &model, ItemFactory *itemFactory, int maxItems) + { +- if ( !createItemDirectory() ) +- return nullptr; +- + const QString tabFileName = itemFileName(tabName); + if ( !QFile::exists(tabFileName) ) + return createTab(tabName, model, itemFactory, maxItems); +@@ -107,7 +90,7 @@ bool saveItems(const QString &tabName, const QAbstractItemModel &model, const It + { + const QString tabFileName = itemFileName(tabName); + +- if ( !createItemDirectory() ) ++ if ( !ensureSettingsDirectoryExists() ) + return false; + + // Save tab data to a new temporary file. diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch new file mode 100644 index 000000000000..2b149ab843bf --- /dev/null +++ b/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch @@ -0,0 +1,44 @@ +https://bugs.gentoo.org/916129 +https://github.com/hluk/CopyQ/pull/2508 +https://github.com/hluk/CopyQ/commit/19e9dd1c2ecb49b14a24159c5ac3bc1b77fdf250 + +From 19e9dd1c2ecb49b14a24159c5ac3bc1b77fdf250 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 17 Oct 2023 02:08:51 -0400 +Subject: [PATCH] itemfakevim: fix build with qt 6.6.0 (#2508) + +Reference: https://github.com/qt-creator/qt-creator/commit/e56e3b6f374e00179eb0537198437864dddc47f2 +--- a/plugins/itemfakevim/fakevim/fakevimhandler.cpp ++++ b/plugins/itemfakevim/fakevim/fakevimhandler.cpp +@@ -1057,14 +1057,6 @@ inline QString msgMarkNotSet(const QString &text) + return Tr::tr("Mark \"%1\" not set.").arg(text); + } + +-static void initSingleShotTimer(QTimer *timer, int interval, FakeVimHandler::Private *receiver, +- void (FakeVimHandler::Private::*slot)()) +-{ +- timer->setSingleShot(true); +- timer->setInterval(interval); +- QObject::connect(timer, &QTimer::timeout, receiver, slot); +-} +- + class Input + { + public: +@@ -2424,6 +2416,16 @@ class FakeVimHandler::Private : public QObject + FakeVimSettings &s = *fakeVimSettings(); + }; + ++static void initSingleShotTimer(QTimer *timer, ++ int interval, ++ FakeVimHandler::Private *receiver, ++ void (FakeVimHandler::Private::*slot)()) ++{ ++ timer->setSingleShot(true); ++ timer->setInterval(interval); ++ QObject::connect(timer, &QTimer::timeout, receiver, slot); ++} ++ + FakeVimHandler::Private::GlobalData FakeVimHandler::Private::g; + + FakeVimHandler::Private::Private(FakeVimHandler *parent, QWidget *widget) diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch new file mode 100644 index 000000000000..e526f3a89f0b --- /dev/null +++ b/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch @@ -0,0 +1,98 @@ +https://github.com/hluk/CopyQ/commit/42c02f2dc74b188ea7982a30c38acaf668bbf76a + +From 42c02f2dc74b188ea7982a30c38acaf668bbf76a Mon Sep 17 00:00:00 2001 +From: Lukas Holecek <hluk@email.cz> +Date: Mon, 4 Sep 2023 21:12:44 +0200 +Subject: [PATCH] Avoid showing warnings about invalid regex + +--- a/src/scriptable/scriptableitemselection.cpp ++++ b/src/scriptable/scriptableitemselection.cpp +@@ -46,10 +46,6 @@ QVector<int> toIntVector(const QJSValue &value) + + QRegularExpression toRegularExpression(const QJSValue &value) + { +- // If argument is invalid/not-regexp, create an invalid regex to match nothing. +- if ( !value.isRegExp() ) +- return QRegularExpression("("); +- + const QVariant variant = value.toVariant(); + QRegularExpression regexp = variant.toRegularExpression(); + +@@ -136,7 +132,7 @@ QJSValue ScriptableItemSelection::selectAll() + + QJSValue ScriptableItemSelection::select(const QJSValue &re, const QString &mimeFormat) + { +- const QVariant regexp = re.isUndefined() ? QVariant() : toRegularExpression(re); ++ const QVariant regexp = re.isRegExp() ? toRegularExpression(re) : QVariant(); + m_proxy->selectionSelect(m_id, regexp, mimeFormat); + return m_self; + } +--- a/src/tests/testinterface.h ++++ b/src/tests/testinterface.h +@@ -85,9 +85,6 @@ class TestInterface { + /// Clean up tabs and items. Return error string on error. + virtual QByteArray cleanup() = 0; + +- /// Ignore given text in logs for current unit test. +- virtual void setIgnoreError(const QByteArray &ignoreError) = 0; +- + /// Platform specific key to remove (usually Delete, Backspace on OS X). + virtual QString shortcutToRemove() = 0; + +--- a/src/tests/tests.cpp ++++ b/src/tests/tests.cpp +@@ -150,8 +150,6 @@ bool testStderr(const QByteArray &stderrData, TestInterface::ReadStderrFlag flag + // Ignore exceptions and errors from clients in application log + // (these are expected in some tests). + static const std::vector<QRegularExpression> ignoreList{ +- plain("[EXPECTED-IN-TEST]"), +- + regex(R"(CopyQ Note \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}\] <Client-[^\n]*)"), + + // X11 (Linux) +@@ -520,8 +518,6 @@ class TestInterfaceImpl final : public TestInterface { + if (m_server) { + QCoreApplication::processEvents(); + QByteArray output = readLogFile(maxReadLogSize); +- if ( !m_ignoreError.isEmpty() ) +- output.replace(m_ignoreError, "[EXPECTED-IN-TEST] " + m_ignoreError); + if ( flag == ReadAllStderr || !testStderr(output, flag) ) + return decorateOutput("Server STDERR", output); + } +@@ -645,16 +641,10 @@ class TestInterfaceImpl final : public TestInterface { + + QByteArray cleanup() override + { +- m_ignoreError.clear(); + addFailedTest(); + return QByteArray(); + } + +- void setIgnoreError(const QByteArray &ignoreError) override +- { +- m_ignoreError = ignoreError; +- } +- + QString shortcutToRemove() override + { + return ::shortcutToRemove(); +@@ -771,8 +761,6 @@ class TestInterfaceImpl final : public TestInterface { + QStringList m_failed; + + PlatformClipboardPtr m_clipboard; +- +- QByteArray m_ignoreError; + }; + + QString keyNameFor(QKeySequence::StandardKey standardKey) +@@ -2272,9 +2260,8 @@ void Tests::classItemSelection() + RUN(args << "ItemSelection().select(undefined, mimeItemNotes).str()", outRows.arg("0,2")); + + // Match nothing if select() argument is not a regular expression. +- m_test->setIgnoreError("QtWarning: QString::contains: invalid QRegularExpression object"); ++ RUN(args << "add" << "", ""); + RUN(args << "ItemSelection().select('A').str()", outRows.arg("")); +- m_test->setIgnoreError(QByteArray()); + } + + void Tests::classItemSelectionGetCurrent() diff --git a/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch b/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch new file mode 100644 index 000000000000..d2d0ec94b659 --- /dev/null +++ b/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch @@ -0,0 +1,26 @@ +From 6d20653b924481048fa017dc40cf9d7360f95a13 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Tue, 30 Jan 2024 20:44:18 +0200 +Subject: [PATCH] itemfactory: Add support for setting plugin dir in the + environment + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/src/item/itemfactory.cpp ++++ b/src/item/itemfactory.cpp +@@ -31,6 +31,13 @@ namespace { + + bool findPluginDir(QDir *pluginsDir) + { ++ QString pluginDirEnv = qEnvironmentVariable("COPYQ_PLUGIN_DIR"); ++ if ( !pluginDirEnv.isEmpty() ) { ++ pluginsDir->setPath(pluginDirEnv); ++ if ( pluginsDir->isReadable() ) ++ return true; ++ } ++ + #ifdef COPYQ_PLUGIN_PREFIX + pluginsDir->setPath(COPYQ_PLUGIN_PREFIX); + if ( pluginsDir->isReadable() ) +-- +2.43.0 + diff --git a/x11-misc/copyq/metadata.xml b/x11-misc/copyq/metadata.xml index 7606b24718c3..195b1a447114 100644 --- a/x11-misc/copyq/metadata.xml +++ b/x11-misc/copyq/metadata.xml @@ -3,6 +3,10 @@ <pkgmetadata> <!-- maintainer-needed --> <upstream> + <doc>https://copyq.readthedocs.io/</doc> <remote-id type="github">hluk/CopyQ</remote-id> </upstream> + <use> + <flag name="notification">Build with native notification support (requires <pkg>kde-frameworks/knotifications</pkg>:5)</flag> + </use> </pkgmetadata> diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest index bb41aa8b1a15..eb6754035496 100644 --- a/x11-misc/dex/Manifest +++ b/x11-misc/dex/Manifest @@ -1,2 +1 @@ -DIST dex-0.8.0.tar.gz 8665 BLAKE2B de62557d207d257286cc706c07969b10b0d753b197333f1d24c0c0a22a897fb2e3c64a25f71770424e6cc365d028c9a1e994fcf35c68c96be7281d24ce19b1e3 SHA512 d87a7306b931736aa302dc883cbd9c635397eda2c119133a3ae8028869a4302ce3713b43cc85fdb2f804d1a74ab2499ef32a2680d5d6be039831006e617aa70a DIST dex-0.9.0.tar.gz 10056 BLAKE2B 7abc01ccc6938e926840e4448eb6436db77703c1f8e1fef334d97196803a0b59af0f05fc507d1ac4337367120f7d9d9a211aecec6ac3644424edee3599067a89 SHA512 d68f5482cb0948f27a724437ddfc6de9a0f502bfd0d5c60c76fb85dda3c30e4c432013e530f6a91138c9ac9ff36b3824cd5e382e9d29bb9fb2ec2b9de4133094 diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild deleted file mode 100644 index 56393cf8cc9d..000000000000 --- a/x11-misc/dex/dex-0.8.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_9,3_10} ) - -inherit python-r1 - -DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries" -HOMEPAGE="http://e-jc.de/" -SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="doc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -src_compile() { - # Makefile is for creating man page only - use doc && emake -} - -src_install() { - dobin dex - python_replicate_script "${ED}/usr/bin/dex" - dodoc CHANGELOG.md README.rst - use doc && doman dex.1 -} diff --git a/x11-misc/dex/dex-0.9.0.ebuild b/x11-misc/dex/dex-0.9.0.ebuild index 9a26bc92b006..4774c80d2f54 100644 --- a/x11-misc/dex/dex-0.9.0.ebuild +++ b/x11-misc/dex/dex-0.9.0.ebuild @@ -3,8 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) - +PYTHON_COMPAT=( python3_{9..11} ) inherit python-r1 DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries" @@ -14,20 +13,31 @@ SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - IUSE="doc" - REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# https://github.com/jceb/dex/issues/37 +RESTRICT="test" RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( dev-python/sphinx )" src_compile() { # Makefile is for creating man page only use doc && emake } +src_test() { + dex_test() { + ./dex --test 2>&1 | tee test.log || die + if grep -q "Failed example" test.log ; then + die "Tests failed with ${EPYTHON}" + fi + } + + python_foreach_impl dex_test +} + src_install() { dobin dex python_replicate_script "${ED}/usr/bin/dex" diff --git a/x11-misc/dex/metadata.xml b/x11-misc/dex/metadata.xml index 924f4c8f03f1..ddaf19bc80ca 100644 --- a/x11-misc/dex/metadata.xml +++ b/x11-misc/dex/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">jceb/dex</remote-id> </upstream> diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest index 641869ae7333..153676f0aeb1 100644 --- a/x11-misc/dmenu/Manifest +++ b/x11-misc/dmenu/Manifest @@ -1,3 +1,2 @@ -DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3 -DIST dmenu-5.1.tar.gz 16096 BLAKE2B 22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c SHA512 2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453 DIST dmenu-5.2.tar.gz 16196 BLAKE2B f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d SHA512 7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3 +DIST dmenu-5.3.tar.gz 16274 BLAKE2B fd76b0b11a153f98dd58ec888820bc8a0ebc67f814cdf2d13a35ea3addcc3ad423bb9b2f4f73897cf6293e61a507900e7b7fec65e4f0acd15cc8e425f5506faa SHA512 60f758134063ad7f304fbb0785c66dddc21461e5e5014f8735cf6d5c95dc22a177f069d48101e633ddffe5bbefc1118a2bf8b31daaf7b6438fdf6fe1bcb5d61c diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild deleted file mode 100644 index a8602b9f9bb2..000000000000 --- a/x11-misc/dmenu/dmenu-5.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit savedconfig toolchain-funcs - -DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" -HOMEPAGE="https://tools.suckless.org/dmenu/" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" -IUSE="xinerama" - -RDEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXft - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-4.9-gentoo.patch -) - -src_prepare() { - default - - sed -i \ - -e 's|^ @| |g' \ - -e '/^ echo/d' \ - Makefile || die - - restore_config config.h -} - -src_compile() { - emake CC="$(tc-getCC)" \ - "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ - "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ - "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ - "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \ - "XINERAMAFLAGS=$( - usex xinerama "-DXINERAMA $( - $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null - )" '' - )" \ - "XINERAMALIBS=$( - usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' - )" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - - save_config config.h -} diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild index de7dd36d35cb..9bc599cf5b83 100644 --- a/x11-misc/dmenu/dmenu-5.2.ebuild +++ b/x11-misc/dmenu/dmenu-5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="xinerama" RDEPEND=" diff --git a/x11-misc/dmenu/dmenu-5.1.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild index 98db03cf8f38..7d41a6f1d7f5 100644 --- a/x11-misc/dmenu/dmenu-5.1.ebuild +++ b/x11-misc/dmenu/dmenu-5.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit savedconfig toolchain-funcs DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" @@ -16,7 +16,7 @@ IUSE="xinerama" RDEPEND=" media-libs/fontconfig x11-libs/libX11 - x11-libs/libXft + >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama ) " DEPEND="${RDEPEND} @@ -25,7 +25,7 @@ DEPEND="${RDEPEND} BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-4.9-gentoo.patch + "${FILESDIR}"/${PN}-5.2-gentoo.patch ) src_prepare() { diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild index 49e950d0bb94..9fc2e0ca88da 100644 --- a/x11-misc/dmenu/dmenu-9999.ebuild +++ b/x11-misc/dmenu/dmenu-9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit git-r3 savedconfig toolchain-funcs DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" @@ -10,13 +11,12 @@ EGIT_REPO_URI="https://git.suckless.org/dmenu" LICENSE="MIT" SLOT="0" -KEYWORDS="" IUSE="xinerama" RDEPEND=" media-libs/fontconfig x11-libs/libX11 - x11-libs/libXft + >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama ) " DEPEND="${RDEPEND} @@ -25,7 +25,7 @@ DEPEND="${RDEPEND} BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-4.9-gentoo.patch + "${FILESDIR}"/${PN}-5.2-gentoo.patch ) src_prepare() { diff --git a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch deleted file mode 100644 index 25fd34ab4579..000000000000 --- a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -19,13 +19,13 @@ - #FREETYPEINC = $(X11INC)/freetype2 - - # includes and libs --INCS = -I$(X11INC) -I$(FREETYPEINC) --LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -+INCS = $(X11INC) $(FREETYPEINC) -+LIBS = $(X11LIB) $(XINERAMALIBS) $(FREETYPELIBS) - - # flags --CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) --CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) --LDFLAGS = $(LIBS) -+CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) -+CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS) -+LDFLAGS += $(LIBS) - - # compiler and linker - CC = cc diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml index 2f82d0bb8eb7..c07e13d4a6bd 100644 --- a/x11-misc/dmenu/metadata.xml +++ b/x11-misc/dmenu/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> </pkgmetadata> diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest index bcdd1211825f..119ef44c3b9d 100644 --- a/x11-misc/dunst/Manifest +++ b/x11-misc/dunst/Manifest @@ -1 +1,2 @@ -DIST dunst-1.9.0.tar.gz 4609222 BLAKE2B 4879122e342c1e518bca079bacd4ae769fd7da41db681230613c61531e62df94223757372c428c06710afd843200dcb78883d352f4e25098f0672b5c89ab0d87 SHA512 e43c960561d1f804c1d8f73f9376b33f61bf1ba5c5d0579c9875ef96da6522e214d5b74166ca3375dff1b4b0291b611b2d9ac1fb41fa8722db04c21e898824d1 +DIST dunst-1.10.0.tar.gz 4639084 BLAKE2B 29056b55aa53e20d4d9f0be5ff560aaad3829a933f30fd6a6f17f5e6adb9f4ca3b659dc977959f69224a2847a116043215e05097e9eaae4556ec02c1852c4a05 SHA512 e7e453c9470a063cdee4602315b22c1c8bcbf1405d3c295bccf01ae4e1b535e11b7323313b63cfc510e38ea8243117d550e6057df15924bbd4efb7e0b7f9a709 +DIST dunst-1.11.0.tar.gz 4645279 BLAKE2B 0daa8d098f032a0e3b16872bc2e33c8411e8eed543fc13533e649935d2d0796ad74b3fb27769f839972b335b7a2f7ae6b5efd9f324a8bb807ac2f82fa8611a5d SHA512 84c9edccddd183fb867233cb5377115d96735f4c1be84007194ac39dd48d913e5bb021d2952057aecdb978564c2471a8974c4ee4eeccfb188e5345527007a5c4 diff --git a/x11-misc/dunst/dunst-1.10.0.ebuild b/x11-misc/dunst/dunst-1.10.0.ebuild new file mode 100644 index 000000000000..5ac47fb06765 --- /dev/null +++ b/x11-misc/dunst/dunst-1.10.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit shell-completion systemd toolchain-funcs + +DESCRIPTION="Lightweight replacement for common notification daemons" +HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst" +SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="wayland" + +DEPEND=" + dev-libs/glib:2 + sys-apps/dbus + x11-libs/cairo[X,glib] + x11-libs/gdk-pixbuf:2 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXScrnSaver + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libnotify + x11-libs/pango[X] + x11-misc/xdg-utils + wayland? ( dev-libs/wayland ) +" + +RDEPEND="${DEPEND}" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + wayland? ( dev-libs/wayland-protocols ) +" + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-Os//' -i config.mk || die + + # Use correct path for dbus and system unit + sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die + sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die +} + +src_configure() { + tc-export CC PKG_CONFIG + + default +} + +src_compile() { + local myemakeargs=( + SYSCONFDIR="${EPREFIX}/etc/xdg" + SYSTEMD="0" + WAYLAND="$(usex wayland 1 0)" + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + local myemakeargs=( + PREFIX="${ED}/usr" + SYSCONFDIR="${ED}/etc/xdg" + SYSTEMD="0" + WAYLAND="$(usex wayland 1 0)" + ) + + emake "${myemakeargs[@]}" install + + newbashcomp contrib/dunst.bashcomp dunst + newbashcomp contrib/dunstctl.bashcomp dunstctl + newfishcomp contrib/dunst.fishcomp dunst + newfishcomp contrib/dunstctl.fishcomp dunstctl + newfishcomp contrib/dunstify.fishcomp dunstify + newzshcomp contrib/_dunst.zshcomp _dunst + newzshcomp contrib/_dunstctl.zshcomp _dunstctl + + systemd_newuserunit dunst.systemd.service.in dunst.service +} diff --git a/x11-misc/dunst/dunst-1.9.0.ebuild b/x11-misc/dunst/dunst-1.11.0.ebuild index 37336b25c793..37b4346e96b7 100644 --- a/x11-misc/dunst/dunst-1.9.0.ebuild +++ b/x11-misc/dunst/dunst-1.11.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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="wayland" DEPEND=" diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild index bb3f803de889..901f3e6a33b9 100644 --- a/x11-misc/dunst/dunst-9999.ebuild +++ b/x11-misc/dunst/dunst-9999.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 @@ -12,7 +12,6 @@ HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst" LICENSE="BSD" SLOT="0" -KEYWORDS="" IUSE="wayland" DEPEND=" diff --git a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild b/x11-misc/dxpc/dxpc-3.9.2-r3.ebuild index fb1d75627254..bbb2053edca4 100644 --- a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild +++ b/x11-misc/dxpc/dxpc-3.9.2-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Differential X Protocol Compressor" HOMEPAGE="http://www.vigor.nu/dxpc/" @@ -10,16 +10,12 @@ SRC_URI="http://www.vigor.nu/dxpc/${P}.tgz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="" -RDEPEND="x11-libs/libXt +RDEPEND=" + x11-libs/libXt >=dev-libs/lzo-2" DEPEND="${RDEPEND} x11-base/xorg-proto" +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) DOCS=( CHANGES README TODO ) - -src_install() { - emake prefix="${ED%/}"/usr man1dir="${ED%/}"/usr/share/man/man1 install - einstalldocs -} diff --git a/x11-misc/dxpc/files/dxpc-3.9.2-makefile.patch b/x11-misc/dxpc/files/dxpc-3.9.2-makefile.patch new file mode 100644 index 000000000000..691a1504d977 --- /dev/null +++ b/x11-misc/dxpc/files/dxpc-3.9.2-makefile.patch @@ -0,0 +1,54 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -20,10 +20,7 @@ + + # We may have separate source and binary trees -- make sure we can find + # dxpcconf.h +-CPPFLAGS = -I. +- +-.C.o: +- $(CXX) $(CPPFLAGS) -c $(CXXFLAGS) $< ++CPPFLAGS += -I. + + TARGET= dxpc$(EXEEXT) + +@@ -53,18 +50,18 @@ + OBJS= $(SRCS:.C=.o) + + $(TARGET): $(OBJS) +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + ifeq ($(MINGW32),true) + $(SECONDTARGET): $(OBJS) +- $(CXX) -mwindows $(CPPFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) ++ $(CXX) -mwindows $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + endif + + pure_$(TARGET): $(OBJS) +- purify $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) ++ purify $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + quant_$(TARGET): $(OBJS) $(OBJS) +- quantify $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) ++ quantify $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + depends: + makedepend -f Makefile $(SRCS) +@@ -72,12 +69,12 @@ + install: install.bin install.man + + install.bin: $(TARGET) +- $(srcdir)/mkinstalldirs $(bindir) +- $(INSTALL) $(TARGET) $(bindir)/$(TARGET) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) ++ $(INSTALL) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET) + + install.man: +- $(srcdir)/mkinstalldirs $(man1dir) +- $(INSTALL_DATA) $(TARGET).man $(man1dir)/$(TARGET).1 ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) ++ $(INSTALL_DATA) $(TARGET).man $(DESTDIR)$(man1dir)/$(TARGET).1 + + clean: + -rm -f *~ *.o $(TARGET) pure_* quant_* *.bak core gmon.out diff --git a/x11-misc/dzen/dzen-0.9.5_p2.ebuild b/x11-misc/dzen/dzen-0.9.5_p2.ebuild index 547c24c755b8..ff606eb36623 100644 --- a/x11-misc/dzen/dzen-0.9.5_p2.ebuild +++ b/x11-misc/dzen/dzen-0.9.5_p2.ebuild @@ -1,42 +1,46 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs -COMMIT_HASH="488ab66019f475e35e067646621827c18a879ba1" +HASH_DZEN=488ab66019f475e35e067646621827c18a879ba1 DESCRIPTION="General purpose messaging, notification, and menu utility" -HOMEPAGE="https://github.com/robm/dzen" -SRC_URI="https://github.com/robm/dzen/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT_HASH}" +HOMEPAGE="https://github.com/robm/dzen/" +SRC_URI="https://github.com/robm/dzen/archive/${HASH_DZEN}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${HASH_DZEN} LICENSE="MIT" -KEYWORDS="amd64 x86" SLOT="2" +KEYWORDS="amd64 x86" IUSE="xinerama xpm" RDEPEND=" x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama ) - xpm? ( x11-libs/libXpm )" + xpm? ( x11-libs/libXpm ) +" DEPEND=" ${RDEPEND} - x11-base/xorg-proto" + x11-base/xorg-proto +" BDEPEND=" - virtual/pkgconfig" + virtual/pkgconfig +" src_prepare() { default + sed -i '/strip/d; /@echo/d; s/\t@/\t/; s/-L.*/$(X11LIBS)/' \ Makefile gadgets/Makefile || die } src_compile() { - local cflags="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags x11)" - local libs="$($(tc-getPKG_CONFIG) --libs x11)" + local cflags="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags x11 || die)" + local libs="$($(tc-getPKG_CONFIG) --libs x11 || die)" emake -C gadgets \ CC="$(tc-getCC)" CFLAGS="${cflags}" \ @@ -57,7 +61,10 @@ src_compile() { src_install() { emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C gadgets install + dobin gadgets/*.sh + dodoc gadgets/README* + einstalldocs } diff --git a/x11-misc/e16-keyedit/metadata.xml b/x11-misc/e16-keyedit/metadata.xml index c351ebbf5c9d..c742aaa36aa6 100644 --- a/x11-misc/e16-keyedit/metadata.xml +++ b/x11-misc/e16-keyedit/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">enlightenment</remote-id> </upstream> diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3-r1.ebuild index 44b1cc54d695..97e6c4f9efaf 100644 --- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild +++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 GNOME2_EAUTORECONF="yes" inherit gnome2 @@ -9,25 +9,21 @@ inherit gnome2 DESCRIPTION="Menu editor for Enlightenment DR16 written in GTK2" HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/" SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz" -KEYWORDS="~amd64 ~x86" LICENSE="MIT-with-advertising" SLOT="0" +KEYWORDS="~amd64 ~x86" -DEPEND=" +RDEPEND=" >=gnome-base/libglade-2.4 - virtual/pkgconfig x11-libs/gtk+:2 x11-wm/e16 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}/${PN}-no-default-docs.patch" - "${FILESDIR}/${PN}-no-common.patch" + "${FILESDIR}"/${PN}-missing-include.patch + "${FILESDIR}"/${PN}-autotools.patch + "${FILESDIR}"/${PN}-no-common.patch ) - -src_prepare() { - sed -i '1i#include <glib/gstdio.h>' src/e16menuedit2.c || die - gnome2_src_prepare -} diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-default-docs.patch b/x11-misc/e16menuedit2/files/e16menuedit2-autotools.patch index bb456d52b0d7..98ae4d6fbd99 100644 --- a/x11-misc/e16menuedit2/files/e16menuedit2-no-default-docs.patch +++ b/x11-misc/e16menuedit2/files/e16menuedit2-autotools.patch @@ -1,5 +1,5 @@ ---- e16menuedit2-0.0.3/Makefile.am.orig 2019-03-08 00:52:08.000000000 +0300 -+++ e16menuedit2-0.0.3/Makefile.am 2019-03-08 00:52:31.930201552 +0300 +--- a/Makefile.am ++++ b/Makefile.am @@ -2,15 +2,8 @@ SUBDIRS = src po pixmaps help @@ -18,3 +18,13 @@ GLADE_FILES = e16menuedit2.glade +--- a/configure.in ++++ b/configure.in +@@ -1,6 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(configure.in) ++AC_INIT(configure.ac) + AM_INIT_AUTOMAKE(e16menuedit2, 0.0.3) + AM_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch b/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch new file mode 100644 index 000000000000..25cc8908177c --- /dev/null +++ b/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch @@ -0,0 +1,10 @@ +--- a/src/e16menuedit2.c ++++ b/src/e16menuedit2.c +@@ -31,6 +31,7 @@ + #include <sys/types.h> + #include <string.h> + #include <stdarg.h> ++#include <glib/gstdio.h> + #include "callbacks.h" + #include "e16menuedit2.h" + #include "file.h" diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch index 4ac213b101f9..521be7df2b0d 100644 --- a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch +++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch @@ -1,5 +1,5 @@ ---- e16menuedit2-0.0.3/src/e16menu.h.orig 2020-10-11 10:41:36.827021380 +0300 -+++ e16menuedit2-0.0.3/src/e16menu.h 2020-10-11 10:51:27.043070842 +0300 +--- a/src/e16menu.h ++++ b/src/e16menu.h @@ -45,6 +45,6 @@ gboolean table_check_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data); @@ -8,8 +8,8 @@ +extern gchar *menu_file[MAX_RECURSION]; #endif /* _E16MENU_H */ ---- e16menuedit2-0.0.3/src/e16menu.c.orig 2005-02-18 15:09:55.000000000 +0300 -+++ e16menuedit2-0.0.3/src/e16menu.c 2020-10-11 10:51:52.615152314 +0300 +--- a/src/e16menu.c ++++ b/src/e16menu.c @@ -34,6 +34,7 @@ #include "treeview.h" diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml index c351ebbf5c9d..c742aaa36aa6 100644 --- a/x11-misc/e16menuedit2/metadata.xml +++ b/x11-misc/e16menuedit2/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">enlightenment</remote-id> </upstream> diff --git a/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.1.ebuild b/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.2.ebuild index 92d93860fb2f..aa83394f2032 100644 --- a/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.1.ebuild +++ b/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,8 +29,12 @@ src_install() { # The Desktop Entry Specification does not allow field codes like %u # inside a quoted argument, therefore we need a shell wrapper. - # We want to pass a literal '"(message-mailto \"$1\")"' in the -c - # command, but in the desktop entry '"', '\', and '$' must be escaped + # We pass the following commands to it, in order to backslash-escape + # any special characters '\' and '"' that occur in %u: + # u=${1//\\/\\\\} + # u=${u//\"/\\\"} + # exec emacsclient --eval "(message-mailto \"$u\")" + # However, in the desktop entry '"', '\', and '$' must be escaped # as '\\"', '\\\\', and '\\$', respectively. Yet another level of # backslash escapes is needed for '\' and '$' in the here-document. newmenu - emacsclient-mail.desktop <<-EOF @@ -38,8 +42,11 @@ src_install() { Type=Application Name=Emacsclient (mail) NoDisplay=true - Exec=${EPREFIX}/bin/bash -c "exec ${EPREFIX}/usr/bin/emacsclient \ ---eval \\\\"(message-mailto \\\\\\\\\\\\"\\\\\$1\\\\\\\\\\\\")\\\\"" bash %u + Exec=${EPREFIX}/bin/bash -c \ +"u=\\\\\${1//\\\\\\\\\\\\\\\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}; \ +u=\\\\\${u//\\\\\\\\\\\\"/\\\\\\\\\\\\\\\\\\\\\\\\\\\\"}; \ +exec ${EPREFIX}/usr/bin/emacsclient \ +--eval \\\\"(message-mailto \\\\\\\\\\\\"\\\\\$u\\\\\\\\\\\\")\\\\"" bash %u Terminal=false MimeType=x-scheme-handler/mailto; EOF diff --git a/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild index 4542d4719455..896d9f96a7f7 100644 --- a/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild +++ b/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit flag-o-matic + DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop" HOMEPAGE="http://fluxbox.sourceforge.net/fbdesk/" SRC_URI="mirror://gentoo/${P}.tar.gz" @@ -30,6 +32,8 @@ PATCHES=( ) src_configure() { + append-cxxflags -std=c++14 + econf \ $(use_enable debug) \ $(use_enable png) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r3.ebuild index be22542d46ae..ded711fabf0b 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 toolchain-funcs +inherit edo python-any-r1 toolchain-funcs -DESCRIPTION="light-weight X11 desktop panel" +DESCRIPTION="Light-weight X11 desktop panel" HOMEPAGE="https://aanatoly.github.io/fbpanel/" SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -49,17 +49,18 @@ src_prepare() { src_configure() { tc-export CC + # not autotools based - local myconfigure=( - ./configure V=1 + local confargs=( + V=1 --mandir="${EPREFIX}"/usr/share/man/man1 --datadir="${EPREFIX}"/usr/share/${PN} --prefix="${EPREFIX}"/usr --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} $(usex alsa --sound --no-sound) ) - echo ${myconfigure[@]} || die - ${myconfigure[@]} || die + + edo ./configure "${confargs[@]}" } pkg_postinst() { diff --git a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild new file mode 100644 index 000000000000..04f05780e684 --- /dev/null +++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit edo python-any-r1 toolchain-funcs + +DESCRIPTION="Light-weight X11 desktop panel" +HOMEPAGE="https://aanatoly.github.io/fbpanel/" +SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT LGPL-2+ GPL-2+" # bug #795591 +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="alsa" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libX11 + alsa? ( media-libs/alsa-lib ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1-underlinking.patch + "${FILESDIR}"/${PN}-7.0-clang.patch + "${FILESDIR}"/${PN}-7.0-fno-common.patch + "${FILESDIR}"/${PN}-7.0-images.patch + "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch + "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch + "${FILESDIR}"/${PN}-7.0-python3.10.patch +) + +src_prepare() { + default + 2to3 -n -w --no-diffs configure .config/*.py || die +} + +src_configure() { + tc-export CC + + # not autotools based + local confargs=( + V=1 + --mandir="${EPREFIX}"/usr/share/man/man1 + --datadir="${EPREFIX}"/usr/share/${PN} + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} + $(usex alsa --sound --no-sound) + ) + + edo ./configure "${confargs[@]}" +} + +pkg_postinst() { + elog "For the volume plugin to work, you need to configure your kernel" + elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means" + elog "that provide the /dev/mixer device node." +} diff --git a/x11-misc/fireflies/fireflies-2.08-r1.ebuild b/x11-misc/fireflies/fireflies-2.08-r1.ebuild index 12f1009cf6e9..7858232ef416 100644 --- a/x11-misc/fireflies/fireflies-2.08-r1.ebuild +++ b/x11-misc/fireflies/fireflies-2.08-r1.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 @@ -20,7 +20,7 @@ RDEPEND=" x11-libs/libX11 elibc_musl? ( sys-libs/argp-standalone )" DEPEND="${RDEPEND}" -BDEPEND="sys-devel/autoconf-archive" # for AX_CXX_BOOL macro +BDEPEND="dev-build/autoconf-archive" # for AX_CXX_BOOL macro src_prepare() { default diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild index bd7d62f1034a..ec465111b73a 100644 --- a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild +++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake -DESCRIPTION="A pomodoro app that blocks distractions while you work" +DESCRIPTION="Pomodoro app that blocks distractions while you work" HOMEPAGE="https://github.com/iamsergio/flow-pomodoro" SRC_URI="https://github.com/iamsergio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" diff --git a/x11-misc/fluxter/fluxter-0.1.0.ebuild b/x11-misc/fluxter/fluxter-0.1.0-r1.ebuild index 374d2e885186..a171049f9525 100644 --- a/x11-misc/fluxter/fluxter-0.1.0.ebuild +++ b/x11-misc/fluxter/fluxter-0.1.0-r1.ebuild @@ -1,23 +1,28 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools +EAPI=8 -DESCRIPTION="workspace pager dockapp, particularly useful with the Fluxbox window manager" +inherit autotools flag-o-matic + +DESCRIPTION="Workspace pager dockapp, particularly useful with the Fluxbox window manager" HOMEPAGE="http://www.isomedia.com/homes/stevencooper" SRC_URI="http://www.isomedia.com/homes/stevencooper/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~hppa ppc x86" -IUSE="" -DEPEND="x11-libs/libX11 +DEPEND=" + x11-libs/libX11 x11-libs/libSM - x11-libs/libICE" + x11-libs/libICE +" +RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-asneeded.patch" ) +PATCHES=( + "${FILESDIR}/${P}-asneeded.patch" +) src_prepare() { default @@ -25,6 +30,7 @@ src_prepare() { } src_configure() { - econf \ - --datadir="${EPREFIX}"/usr/share/commonbox + append-cxxflags -std=c++14 + + econf --datadir="${EPREFIX}"/usr/share/commonbox } diff --git a/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch b/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch new file mode 100644 index 000000000000..ddd64f4a386d --- /dev/null +++ b/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch @@ -0,0 +1,12 @@ +--- a/common.h ++++ b/common.h +@@ -44,6 +44,9 @@ + #include <boost/scoped_array.hpp> + #include <boost/scoped_ptr.hpp> + ++#ifndef __STRING ++#define __STRING(x) #x ++#endif + #define stringify(S) __STRING(S) + + typedef unsigned int uint; diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild index 5f89bd2b1b43..6d08682f6cf4 100644 --- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild +++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils @@ -25,6 +25,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-0.5.1-musl.patch +) + HTML_DOCS=( fracplanet.{htm,css} ) src_configure() { diff --git a/x11-misc/fraqtive/metadata.xml b/x11-misc/fraqtive/metadata.xml index c8122e8ebae5..ee82dad00b2a 100644 --- a/x11-misc/fraqtive/metadata.xml +++ b/x11-misc/fraqtive/metadata.xml @@ -4,5 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">fraqtive</remote-id> + <remote-id type="github">mimecorg/fraqtive</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/ftmenu/ftmenu-0.4.0-r1.ebuild b/x11-misc/ftmenu/ftmenu-0.4.0-r2.ebuild index be90c2a835b5..8ae682a2c151 100644 --- a/x11-misc/ftmenu/ftmenu-0.4.0-r1.ebuild +++ b/x11-misc/ftmenu/ftmenu-0.4.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A tray menu for the Fluxbox toolbar" HOMEPAGE="http://ftmenu.sourceforge.net/" @@ -10,14 +10,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -COMMON_DEPEND=">=x11-libs/gtk+-2.6:2 - >=dev-libs/glib-2.6:2" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} +DEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:2" +RDEPEND=" + ${DEPEND} x11-wm/fluxbox" +BDEPEND="virtual/pkgconfig" pkg_postinst() { einfo diff --git a/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild index 6024a5b52019..92f8e6965471 100644 --- a/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild +++ b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="appindicator geoclue gtk nls wayland" COMMON_DEPEND=">=x11-libs/libX11-1.4 diff --git a/x11-misc/gammastep/gammastep-2.0.9.ebuild b/x11-misc/gammastep/gammastep-2.0.9-r2.ebuild index 59e51f985f0d..a23136d111fb 100644 --- a/x11-misc/gammastep/gammastep-2.0.9.ebuild +++ b/x11-misc/gammastep/gammastep-2.0.9-r2.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_{9..12} ) inherit autotools systemd xdg-utils python-r1 @@ -13,14 +13,14 @@ SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="appindicator geoclue gtk nls wayland" COMMON_DEPEND=">=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm - appindicator? ( dev-libs/libappindicator:3[introspection] ) + appindicator? ( dev-libs/libayatana-appindicator ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( ${PYTHON_DEPS} )" RDEPEND="${COMMON_DEPEND} diff --git a/x11-misc/gbase/files/gbase-0.5-gtk.patch b/x11-misc/gbase/files/gbase-0.5-gtk.patch index 4763839624af..55a1dfff9b95 100644 --- a/x11-misc/gbase/files/gbase-0.5-gtk.patch +++ b/x11-misc/gbase/files/gbase-0.5-gtk.patch @@ -1,25 +1,22 @@ --- a/Makefile +++ b/Makefile -@@ -1,15 +1,15 @@ +@@ -1,15 +1,7 @@ -CC = gcc -CCFLAGS = `gtk-config --cflags` -LDFLAGS = `gtk-config --libs` -+CC ?= gcc -+CFLAGS += `${PKG_CONFIG} --cflags gtk+-2.0` -+LIBS = `${PKG_CONFIG} --libs gtk+-2.0` ++CPPFLAGS += `${PKG_CONFIG} --cflags gtk+-2.0` ++LDLIBS = `${PKG_CONFIG} --libs gtk+-2.0` - gbase: gbase.o +-gbase: gbase.o - $(CC) gbase.o $(LDFLAGS) -o gbase -+ $(CC) $(LDFLAGS) gbase.o $(LIBS) -o gbase ++all: gbase clean: rm -f gbase gbase.o gbase.c~ - - # Make object files: - %.o: +- +-# Make object files: +-%.o: - $(CC) $(CCFLAGS) -c $*.c -+ $(CC) $(CFLAGS) -c $*.c - +- -gbase.o: gbase.c \ No newline at end of file -+gbase.o: gbase.c diff --git a/x11-misc/gbase/gbase-0.5-r1.ebuild b/x11-misc/gbase/gbase-0.5-r2.ebuild index e40430eebba8..c24962442fd6 100644 --- a/x11-misc/gbase/gbase-0.5-r1.ebuild +++ b/x11-misc/gbase/gbase-0.5-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,21 +12,19 @@ SRC_URI="http://www.fluxcode.net/files/${P}.tar.gz" LICENSE="Artistic" SLOT="0" KEYWORDS="amd64 x86" - RESTRICT="test" #424671 RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-gtk.patch ) -src_compile() { +src_configure() { tc-export CC PKG_CONFIG - default } src_install() { - dobin ${PN} + dobin gbase einstalldocs } diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest index 4705b7ca2038..3eb7172a5770 100644 --- a/x11-misc/gccmakedep/Manifest +++ b/x11-misc/gccmakedep/Manifest @@ -1 +1 @@ -DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc +DIST gccmakedep-1.0.4.tar.xz 102704 BLAKE2B 2efb17475bb2d4b36f5387483b189dcc62cdddc9ed66d4c737ffa4726ea94480c67e498aaf65762dac6cdeab6596c30249aeb78703dd3e6c808b78196956f79b SHA512 7665923de51256720e7ae73c09f3c8c908c5cda2e204afac60e3c1ef45c7211cee303629ab9e53171df2a37765944a8a85a654bb1b2e90df9f497dff7d9d29a8 diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild deleted file mode 100644 index 9db630f28c56..000000000000 --- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="create dependencies in makefiles using 'gcc -M'" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/gccmakedep" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/gccmakedep.git" - inherit autotools git-r3 - # x11-misc/util-macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -DEPEND=" - ${LIVE_DEPEND} - x11-base/xorg-proto -" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild new file mode 100644 index 000000000000..27c6ffeb9cb8 --- /dev/null +++ b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild @@ -0,0 +1,10 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="create dependencies in makefiles using 'gcc -M'" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild deleted file mode 100644 index 09a01d23bf93..000000000000 --- a/x11-misc/gccmakedep/gccmakedep-9999.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="create dependencies in makefiles using 'gcc -M'" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/gccmakedep" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/gccmakedep.git" - inherit autotools git-r3 - # x11-misc/util-macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -DEPEND=" - ${LIVE_DEPEND} - x11-base/xorg-proto -" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} diff --git a/x11-misc/genmenu/files/genmenu-1.0.2.patch b/x11-misc/genmenu/files/genmenu-1.0.2.patch index 1ad0002441d3..2817a69880a6 100644 --- a/x11-misc/genmenu/files/genmenu-1.0.2.patch +++ b/x11-misc/genmenu/files/genmenu-1.0.2.patch @@ -1,5 +1,5 @@ ---- a/genmenu-orig 2003-05-29 02:26:17.000000000 -0700 -+++ b/genmenu 2003-05-29 02:35:21.000000000 -0700 +--- a/genmenu ++++ b/genmenu @@ -815,6 +815,7 @@ fi diff --git a/x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch b/x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch index 72ae66927e17..7e632f79eeee 100644 --- a/x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch +++ b/x11-misc/genmenu/files/genmenu-1.1.0-remove-openbox-support.patch @@ -1,6 +1,6 @@ Openbox config files have changed. Genmenu doesn't work anymore with openbox ---- a/genmenu 2012-03-01 20:34:08.000000000 +0200 -+++ b/genmenu 2017-02-19 11:38:53.687593570 +0200 +--- a/genmenu ++++ b/genmenu @@ -111,7 +111,7 @@ # Window managers to check for diff --git a/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild b/x11-misc/genmenu/genmenu-1.1.0-r2.ebuild index 06c91e668080..55539c926be0 100644 --- a/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild +++ b/x11-misc/genmenu/genmenu-1.1.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="menu generator for *box, WindowMaker, and Enlightenment" HOMEPAGE="http://f00l.de/genmenu/" @@ -10,13 +10,12 @@ SRC_URI="http://f00l.de/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" RDEPEND="app-shells/bash" PATCHES=( - "${FILESDIR}"/"${PN}"-1.0.2.patch - "${FILESDIR}"/"${P}"-remove-openbox-support.patch + "${FILESDIR}"/${PN}-1.0.2.patch + "${FILESDIR}"/${P}-remove-openbox-support.patch ) src_install() { diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest index 315c312f6e56..1d05e1f5d05d 100644 --- a/x11-misc/gigolo/Manifest +++ b/x11-misc/gigolo/Manifest @@ -1 +1 @@ -DIST gigolo-0.5.2.tar.bz2 294210 BLAKE2B 67ac4f161ddac212b15456713b1abbcda83a0ceb744606b7050b185d7ebb286ec087d4a25dfd2adaf269f7b57b627232157a259c3cca8c22b84551ab17eac0ab SHA512 2277186495a5ae5f4b4a30ca738b6c35287d6fa51d0df11d31ac627811a67ad31202c3c78225e3035b92c3bf111e6ff098bc7ba83482e0bea0e5e2edcfaec0c7 +DIST gigolo-0.5.3.tar.bz2 304664 BLAKE2B 958e2cdbd043adf1e4f166ca6435462ee2621d7f7bc4918505715bc3240f5ee2a60fb5a27f23a607a1ffd862d41123dfd5977aa87f7c4fe1c7a085d05aac3b2a SHA512 46d93d4c2654a91724208f144098f0a870465823a516339c8455345b5d32be6efe2b7fb13d3e5c89daf2cd919e07e5fcbdc8c8e93bce03c78dbe1907ea5edfcd diff --git a/x11-misc/gigolo/gigolo-0.5.2.ebuild b/x11-misc/gigolo/gigolo-0.5.3.ebuild index 30cc8c819935..294595709b70 100644 --- a/x11-misc/gigolo/gigolo-0.5.2.ebuild +++ b/x11-misc/gigolo/gigolo-0.5.3.ebuild @@ -1,24 +1,33 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit xdg-utils -DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs" -HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo" +DESCRIPTION="A frontend to easily manage connections to remote filesystems using GIO/GVfs" +HOMEPAGE=" + https://www.uvena.de/gigolo/ + https://docs.xfce.org/apps/gigolo/start + https://gitlab.xfce.org/apps/gigolo/ +" SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.16 - >=x11-libs/gtk+-3.14:3" -DEPEND="${RDEPEND} +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86" + +DEPEND=" + >=dev-libs/glib-2.38.0 + >=x11-libs/gtk+-3.14.0:3 +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" dev-util/intltool - virtual/pkgconfig" + virtual/pkgconfig +" src_prepare() { rm COPYING || die diff --git a/x11-misc/gmrun/metadata.xml b/x11-misc/gmrun/metadata.xml index 067b91cb34ee..de0dd23ad806 100644 --- a/x11-misc/gmrun/metadata.xml +++ b/x11-misc/gmrun/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> <maintainer type="person" proxied="yes"> <email>henning@hennsch.de</email> <name>Henning Schild</name> diff --git a/x11-misc/grabc/files/grabc-1.1-makefile.patch b/x11-misc/grabc/files/grabc-1.1-makefile.patch index ef2968ba0e14..80961ab40a04 100644 --- a/x11-misc/grabc/files/grabc-1.1-makefile.patch +++ b/x11-misc/grabc/files/grabc-1.1-makefile.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -2,17 +2,15 @@ +@@ -2,30 +2,16 @@ # Makefile automatically generated by genmake 1.0, Mar-16-97 # genmake 1.0 by ma_muquit@fccc.edu, RCS ## @@ -8,30 +8,28 @@ DEFS= PROGNAME= grabc -LIBS= -L/usr/X11R6/lib -lX11 -+LIBS= $(shell ${PKG_CONFIG} --libs x11) ++LDLIBS= $(shell $(PKG_CONFIG) --libs x11) INCLUDES= -I. -# replace -O with -g in order to debug -+# replace -O2 -pipe -Wall -march=athlon-xp with -g in order to debug - DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1 +-DEFINES= $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1 -CFLAGS= -O $(DEFINES) - - SRCS = grabc.c - -@@ -20,12 +18,12 @@ - - .c.o: - rm -f $@ +- +-SRCS = grabc.c +- +-OBJS = grabc.o +- +-.c.o: +- rm -f $@ - $(CC) $(CFLAGS) -c $*.c -+ $(CC) $(CFLAGS) $(DEFINES) -c $*.c ++CPPFLAGS += $(INCLUDES) $(DEFS) -D__USE_FIXED_PROTOTYPES__ -DSYS_UNIX=1 all: $(PROGNAME) - $(PROGNAME) : $(OBJS) +-$(PROGNAME) : $(OBJS) - $(CC) $(CFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGNAME) $(OBJS) $(LIBS) - +- clean: rm -f $(OBJS) $(PROGNAME) core diff --git a/x11-misc/grabc/grabc-1.1-r2.ebuild b/x11-misc/grabc/grabc-1.1-r3.ebuild index 847aacb19a8d..d655831fd8a1 100644 --- a/x11-misc/grabc/grabc-1.1-r2.ebuild +++ b/x11-misc/grabc/grabc-1.1-r3.ebuild @@ -1,31 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Identify color of a pixel on the screen by clicking on a pixel on the screen" HOMEPAGE="https://www.muquit.com/muquit/software/grabc/grabc.html" SRC_URI="https://www.muquit.com/muquit/software/${PN}/${PN}${PV}.tar.gz" +S="${WORKDIR}/${PN}${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} - x11-base/xorg-proto - virtual/pkgconfig -" + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}${PV}" PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -src_compile() { +src_configure() { tc-export CC PKG_CONFIG - default } src_install() { diff --git a/x11-misc/gromit/files/gromit-20041213-build.patch b/x11-misc/gromit/files/gromit-20041213-build.patch index b539aa9e6dca..c32653410f5b 100644 --- a/x11-misc/gromit/files/gromit-20041213-build.patch +++ b/x11-misc/gromit/files/gromit-20041213-build.patch @@ -8,12 +8,12 @@ Fix underlinking for bug #369453. proptest: proptest.c - gcc -o proptest proptest.c `gtk-config --libs --cflags` -+ $(CC) -o proptest proptest.c `gtk-config --libs --cflags` ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o proptest proptest.c `gtk-config --libs --cflags` propertywatch: propertywatch.c - gcc -o propertywatch propertywatch.c `gtk-config --libs --cflags` -+ $(CC) -o propertywatch propertywatch.c `gtk-config --libs --cflags` ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o propertywatch propertywatch.c `gtk-config --libs --cflags` gromit: gromit.c Makefile - gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0` -+ $(CC) -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall $(CFLAGS) $(LDFLAGS) `${PKG_CONFIG} --libs --cflags gtk+-2.0` -lX11 -lm ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `$(PKG_CONFIG) --libs --cflags gtk+-2.0 x11` -lm diff --git a/x11-misc/gromit/gromit-20041213-r1.ebuild b/x11-misc/gromit/gromit-20041213-r2.ebuild index 5c81d81cc756..a5597d8987db 100644 --- a/x11-misc/gromit/gromit-20041213-r1.ebuild +++ b/x11-misc/gromit/gromit-20041213-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -14,22 +14,17 @@ SLOT="0" KEYWORDS="~amd64 ppc x86" RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}"/${P}-build.patch -) +PATCHES=( "${FILESDIR}"/${P}-build.patch ) -src_compile() { - tc-export PKG_CONFIG - - emake CC="$(tc-getCC)" +src_configure() { + tc-export CC PKG_CONFIG } src_install() { - dobin ${PN} - newdoc ${PN}rc ${PN}rc.example + dobin gromit + newdoc gromitrc gromitrc.example einstalldocs } diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest index 022f1de4f644..34c75a3e0a8d 100644 --- a/x11-misc/grsync/Manifest +++ b/x11-misc/grsync/Manifest @@ -1 +1,2 @@ DIST grsync-1.3.0.tar.gz 304725 BLAKE2B 4e58eb7db8082b733468b95db995a2e7f7f970cebe2b3eb614e0a828d2fb34bc20fc2163f8bca7d5d87e648cfe0dd45a0cd22319d6504e9bd491a6da462ee8a3 SHA512 2d2d9e7910f18e061c5259f51510cd5e3c14c1c15b649618ea096777531780c2d5821a7bb415cd762a695302146b4835d793d31c032667431e227ac11a7aa108 +DIST grsync-1.3.1.tar.gz 302904 BLAKE2B 26bfdc0787ed3340df866f21cad79bba6ad6bb91abc834338be1dfcbe8ae464b755b4d5832586dafb416e8e88ef97a06074b5018d14ba415f625e24c66c42bef SHA512 af3e70108085ad240b8f692f4fd389e7df42448291b721e923fb7e7309e52a673a034583e68684820b47e520386c382efe56820da7b0e7146407bd3d09f2dc72 diff --git a/x11-misc/grsync/grsync-1.3.1.ebuild b/x11-misc/grsync/grsync-1.3.1.ebuild new file mode 100644 index 000000000000..20da83187937 --- /dev/null +++ b/x11-misc/grsync/grsync-1.3.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit xdg + +DESCRIPTION="A gtk frontend to rsync" +HOMEPAGE="http://www.opbyte.it/grsync/" +SRC_URI="http://www.opbyte.it/release/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+gtk3" + +DEPEND=" + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( >=x11-libs/gtk+-2.16:2 )" +RDEPEND="${DEPEND} + net-misc/rsync" +BDEPEND="virtual/pkgconfig + dev-util/intltool" + +DOCS="AUTHORS NEWS README" + +src_prepare() { + default + + if ! use gtk3; then + sed -e "s/gtk_widget_override_font/gtk_widget_modify_font/" \ + -i src/callbacks.c || die + fi +} + +src_configure() { + econf --disable-unity $(use_enable gtk3) +} diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest index 2f6acbb0ec62..01aeb87985e4 100644 --- a/x11-misc/grub2-theme-preview/Manifest +++ b/x11-misc/grub2-theme-preview/Manifest @@ -1 +1 @@ -DIST grub2-theme-preview-2.7.0.tar.gz 203112 BLAKE2B 6279ece40999cea94c04396b4b6161bb90b060b5cc2d7573367d52d42321c9d598a839e9c6cd263b8aef5022a6296d9c5ae5919b0a228456b85e027ec059cc8c SHA512 4ea79b598342b60d1ff1f54eb27b1c4c92fa2a74c874a7107b6dad0aa0838a41e9e033a0f44a87307c0a5022c782b2fc51fa15f8599a63d2d5e10ac4e5b137e1 +DIST grub2-theme-preview-2.8.0.tar.gz 203315 BLAKE2B 1599438dd24dec2e4ea82d3a6253c3b374afebdc1cac9ab666776b7e076b45111845ccfeb683a3ca851065459c8ce6a5fa5009cc2c809a4646048cdb25c38b96 SHA512 1df944957859f87fafd8cac445191e079d6e60d6513273dacc5a18e7959b1e57045fb6ebf6acb57407dc5ab5f7cc9278f8bfc6029b11c7f42721f1a8221c4a98 diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild index 4fe300bbbd58..3ec8fd8085ea 100644 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild +++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild @@ -3,7 +3,8 @@ EAPI="8" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -21,7 +22,7 @@ RDEPEND="app-emulation/qemu sys-fs/mtools grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_efi-64] - sys-firmware/edk2-ovmf + || ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin ) ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc] diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0-r1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild index e5b2d0432704..da256c221fe2 100644 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0-r1.ebuild +++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild @@ -22,7 +22,7 @@ RDEPEND="app-emulation/qemu sys-fs/mtools grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_efi-64] - sys-firmware/edk2-ovmf + || ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin ) ) !grub_platforms_efi-64? ( sys-boot/grub:2[grub_platforms_pc] diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild index cd27d5e63dd4..74b3a58f0d7f 100644 --- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild +++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.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 @@ -27,7 +27,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" sys-apps/texinfo - sys-devel/flex + app-alternatives/lex virtual/pkgconfig app-alternatives/yacc " diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild index 883b6172ce89..4e8729405cba 100644 --- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild +++ b/x11-misc/gtkdialog/gtkdialog-99999.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 @@ -27,7 +27,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" sys-apps/texinfo - sys-devel/flex + app-alternatives/lex virtual/pkgconfig app-alternatives/yacc " diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild index 350cbd2fc58a..36bafb0ed9cb 100644 --- a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild +++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux" RDEPEND=">=media-libs/imlib2-1.0.6.2003[X] x11-libs/libX11 diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch new file mode 100644 index 000000000000..bf92d791df55 --- /dev/null +++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch @@ -0,0 +1,25 @@ +From 230f42f5bc5ebc44062820bde1e9e40ae0746c00 Mon Sep 17 00:00:00 2001 +From: Corentin Rondier <contact@rondier.io> +Date: Sun, 24 Sep 2023 23:22:58 +0200 +Subject: [PATCH] cpu_usage2: fix build failures on clang/llvm + +Remove a non-standard suffix on a floating-point literal, causing build failures on clang/LLVM + +fixes #504 +--- + cpu_usage2/cpu_usage2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpu_usage2/cpu_usage2.c b/cpu_usage2/cpu_usage2.c +index 72709037..483c4c81 100644 +--- a/cpu_usage2/cpu_usage2.c ++++ b/cpu_usage2/cpu_usage2.c +@@ -124,7 +124,7 @@ int main(int argc, char *argv[]) + sleep(t); + total = get_usage(&used); + +- display(label, 100.0D * (used - old_used) / (total - old_total), ++ display(label, 100.0 * (used - old_used) / (total - old_total), + warning, critical, decimals); + fflush(stdout); + old_total = total; diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild index 104cad3b9417..8d3664dbaec5 100644 --- a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild +++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild @@ -13,11 +13,13 @@ SLOT="0" KEYWORDS="amd64 ~arm64 x86" DEPEND="" -RDEPEND="!<x11-misc/i3blocks-1.5 - >=x11-misc/i3blocks-1.5" +RDEPEND=">=x11-misc/i3blocks-1.5" BDEPEND="" -PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch ) +PATCHES=( + "${FILESDIR}"/${P}-respect-CFLAGS.patch + "${FILESDIR}"/${P}-fix-build-on-clang-llvm.patch +) src_prepare() { sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest index d497d592cb07..963a57ad07c0 100644 --- a/x11-misc/i3lock/Manifest +++ b/x11-misc/i3lock/Manifest @@ -1 +1,2 @@ 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.15.ebuild b/x11-misc/i3lock/i3lock-2.15.ebuild new file mode 100644 index 000000000000..512d70eb36e7 --- /dev/null +++ b/x11-misc/i3lock/i3lock-2.15.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 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/i3status/Manifest b/x11-misc/i3status/Manifest index 56f072db9c04..3b335da31c78 100644 --- a/x11-misc/i3status/Manifest +++ b/x11-misc/i3status/Manifest @@ -1,2 +1 @@ -DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2 DIST i3status-2.14.tar.xz 68900 BLAKE2B e85019c2a95d50b6bd4adc6bc9dafb85c3a3d8cdaa93602a9c2af54e6818a4e58ad26f47e2c85b38744c12c08f52c4b5c1216e6f3215f8ee2f4152b42a547905 SHA512 10a1235cc314f5fc4dde4e1369a30f49118c95271f636c5803caa52d94d99ad8565b89fcd602d0c8aa7c830a79d3a3bb08e5ac8123cf07cfddc8ef0126b10f80 diff --git a/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch b/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch deleted file mode 100644 index 32a0358b4211..000000000000 --- a/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 3a51673c05142b99f8db6a0bd9b8e4b806efeb72 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse <jasper@humppa.nl> -Date: Mon, 8 Jul 2019 17:53:25 +0200 -Subject: [PATCH 1/7] Extend battery handling on OpenBSD (#351) - -If acpibat watts value is not available, try current (for batteries -that report in amps), then convert to watts. - -originally submitted by @jcs ---- - src/print_battery_info.c | 47 ++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 45 insertions(+), 2 deletions(-) - -diff --git a/src/print_battery_info.c b/src/print_battery_info.c -index 1c51624..e2a790c 100644 ---- a/src/print_battery_info.c -+++ b/src/print_battery_info.c -@@ -20,6 +20,8 @@ - #include <dev/acpica/acpiio.h> - #include <sys/sysctl.h> - #include <sys/types.h> -+#include <sys/sysctl.h> -+#include <sys/sensors.h> - #endif - - #if defined(__DragonFly__) -@@ -31,6 +33,7 @@ - #include <sys/fcntl.h> - #include <sys/ioctl.h> - #include <sys/types.h> -+#include <sys/sensors.h> - #endif - - #if defined(__NetBSD__) -@@ -269,11 +272,16 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen - #elif defined(__OpenBSD__) - /* - * We're using apm(4) here, which is the interface to acpi(4) on amd64/i386 and -- * the generic interface on macppc/sparc64/zaurus, instead of using sysctl(3) and -- * probing acpi(4) devices. -+ * the generic interface on macppc/sparc64/zaurus. Machines that have ACPI -+ * battery sensors gain some extra information. - */ - struct apm_power_info apm_info; -+ struct sensordev sensordev; -+ struct sensor sensor; -+ size_t sdlen, slen; - int apm_fd; -+ int dev, mib[5] = {CTL_HW, HW_SENSORS, 0, 0, 0}; -+ int volts = 0; - - apm_fd = open("/dev/apm", O_RDONLY); - if (apm_fd < 0) { -@@ -311,6 +319,41 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen - if (batt_info->status != CS_CHARGING) { - batt_info->seconds_remaining = apm_info.minutes_left * 60; - } -+ -+ /* If acpibat* are present, check sensors for data not present via APM. */ -+ batt_info->present_rate = 0; -+ sdlen = sizeof(sensordev); -+ slen = sizeof(sensor); -+ -+ for (dev = 0;; dev++) { -+ mib[2] = dev; -+ if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) { -+ break; -+ } -+ /* 'path' is the node within the full path */ -+ if (BEGINS_WITH(sensordev.xname, "acpibat")) { -+ /* power0 */ -+ mib[3] = SENSOR_WATTS; -+ mib[4] = 0; -+ if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) { -+ /* try current0 */ -+ mib[3] = SENSOR_AMPS; -+ if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) -+ continue; -+ volts = sensor.value; -+ -+ /* we also need current voltage to convert amps to watts */ -+ mib[3] = SENSOR_VOLTS_DC; -+ mib[4] = 1; -+ if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) -+ continue; -+ -+ batt_info->present_rate += (((float)volts / 1000.0) * ((float)sensor.value / 1000.0)); -+ } else { -+ batt_info->present_rate += sensor.value; -+ } -+ } -+ } - #elif defined(__NetBSD__) - /* - * Using envsys(4) via sysmon(4). --- -2.26.2 - diff --git a/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch b/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch deleted file mode 100644 index be9a08e32cc0..000000000000 --- a/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 70b954b122c1dae1d21593d6a5239d38fde1fd55 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse <jasper@humppa.nl> -Date: Mon, 8 Jul 2019 20:14:59 +0200 -Subject: [PATCH 2/7] Fix headers meant for OpenBSD, but snuck in for FreeBSD - ---- - src/print_battery_info.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/print_battery_info.c b/src/print_battery_info.c -index e2a790c..1768bc5 100644 ---- a/src/print_battery_info.c -+++ b/src/print_battery_info.c -@@ -20,8 +20,6 @@ - #include <dev/acpica/acpiio.h> - #include <sys/sysctl.h> - #include <sys/types.h> --#include <sys/sysctl.h> --#include <sys/sensors.h> - #endif - - #if defined(__DragonFly__) -@@ -33,6 +31,7 @@ - #include <sys/fcntl.h> - #include <sys/ioctl.h> - #include <sys/types.h> -+#include <sys/sysctl.h> - #include <sys/sensors.h> - #endif - --- -2.26.2 - diff --git a/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch b/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch deleted file mode 100644 index a1ac91ff8f21..000000000000 --- a/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1999d5cf555c6f373549840d40f8565dcabad93b Mon Sep 17 00:00:00 2001 -From: Michael Stapelberg <michael@stapelberg.de> -Date: Thu, 11 Jul 2019 15:23:08 +0200 -Subject: [PATCH 3/7] conditionally compile pulse.c only when using pulseaudio - -fixes #352 ---- - Makefile.am | 7 +++++-- - configure.ac | 3 +++ - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index bb251f0..c2c1c0a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -68,8 +68,11 @@ i3status_SOURCES = \ - src/print_volume.c \ - src/print_wireless_info.c \ - src/print_file_contents.c \ -- src/process_runs.c \ -- src/pulse.c -+ src/process_runs.c -+ -+if PULSE -+i3status_SOURCES += src/pulse.c -+endif - - dist_sysconf_DATA = \ - i3status.conf -diff --git a/configure.ac b/configure.ac -index cf9e430..95009ac 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -80,16 +80,19 @@ AC_CANONICAL_HOST - PKG_CHECK_MODULES([CONFUSE], [libconfuse]) - PKG_CHECK_MODULES([YAJL], [yajl]) - -+pulse=false - case $host_os in - linux*) - PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0]) - PKG_CHECK_MODULES([ALSA], [alsa]) - PKG_CHECK_MODULES([PULSE], [libpulse]) -+ pulse=true - ;; - netbsd*) - AC_SEARCH_LIBS([prop_string_create], [prop]) - ;; - esac -+AM_CONDITIONAL([PULSE], [test x$pulse = xtrue]) - - dnl TODO: check for libbsd for GNU/kFreeBSD - --- -2.26.2 - diff --git a/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch b/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch deleted file mode 100644 index 579c74e7e09c..000000000000 --- a/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 02a47cd19641a04f6cf8d486cbb8882a1819c661 Mon Sep 17 00:00:00 2001 -From: Michael Stapelberg <michael@stapelberg.de> -Date: Fri, 12 Jul 2019 14:38:43 +0200 -Subject: [PATCH 4/7] battery: include sys/sysctl.h on OpenBSD - -This is required so that CTL_HW and others are defined (ran into this on OpenBSD -6.5). ---- - src/print_battery_info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/print_battery_info.c b/src/print_battery_info.c -index e2a790c..a36b05f 100644 ---- a/src/print_battery_info.c -+++ b/src/print_battery_info.c -@@ -34,6 +34,7 @@ - #include <sys/ioctl.h> - #include <sys/types.h> - #include <sys/sensors.h> -+#include <sys/sysctl.h> - #endif - - #if defined(__NetBSD__) --- -2.26.2 - diff --git a/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch b/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch deleted file mode 100644 index 8ebb296f7ed0..000000000000 --- a/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 54e798e3a6dcf5747c3e943b376ae441ee0534a4 Mon Sep 17 00:00:00 2001 -From: Michael Stapelberg <michael@stapelberg.de> -Date: Fri, 12 Jul 2019 14:45:34 +0200 -Subject: [PATCH 5/7] configure: disable pulse on OpenBSD and DragonFlyBSD -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This matches the conditional compilation in the code and is more correct than -distinguishing linux vs. non-linux (which breaks on Debian’s kFreeBSD and hurd -variants). - -Thanks to sdk for providing an OpenBSD 6.5 environment for verification. This -has not been tested on DragonFlyBSD. - -related to #352 ---- - configure.ac | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 95009ac..a6c31d7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -80,19 +80,25 @@ AC_CANONICAL_HOST - PKG_CHECK_MODULES([CONFUSE], [libconfuse]) - PKG_CHECK_MODULES([YAJL], [yajl]) - --pulse=false -+pulse=true - case $host_os in - linux*) - PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0]) - PKG_CHECK_MODULES([ALSA], [alsa]) -- PKG_CHECK_MODULES([PULSE], [libpulse]) -- pulse=true -+ ;; -+ openbsd*) -+ pulse=false -+ ;; -+ dragonfly*) -+ pulse=false - ;; - netbsd*) - AC_SEARCH_LIBS([prop_string_create], [prop]) - ;; - esac - AM_CONDITIONAL([PULSE], [test x$pulse = xtrue]) -+AS_IF([test x"$pulse" = x"true"], -+ [PKG_CHECK_MODULES([PULSE], [libpulse])]) - - dnl TODO: check for libbsd for GNU/kFreeBSD - --- -2.26.2 - diff --git a/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch b/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch deleted file mode 100644 index 171a1c39cfd2..000000000000 --- a/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 667e38ababb69b68ddcd3c453bd78f022198559a Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <tk@giga.or.at> -Date: Sun, 21 Jul 2019 21:17:59 +0200 -Subject: [PATCH 6/7] On NetBSD, include sys/socket.h for AF_INET{,6}. - ---- - src/print_wireless_info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c -index 8b2d210..6215704 100644 ---- a/src/print_wireless_info.c -+++ b/src/print_wireless_info.c -@@ -61,6 +61,7 @@ - - #ifdef __NetBSD__ - #include <sys/types.h> -+#include <sys/socket.h> - #include <net80211/ieee80211.h> - #define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN - #endif --- -2.26.2 - diff --git a/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch b/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch deleted file mode 100644 index e60a1375fec1..000000000000 --- a/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 23da59920c4c911ee08498eb283b69bdef80fd65 Mon Sep 17 00:00:00 2001 -From: Michael Stapelberg <michael@stapelberg.de> -Date: Mon, 29 Jul 2019 20:57:48 +0200 -Subject: [PATCH 7/7] make pulseaudio an optional dependency, follow best - practices -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For my thoughts about optional dependencies, see -https://michael.stapelberg.ch/posts/2019-05-23-optional-dependencies/ - -This commit follows the best practices outlined in that article: - -1. The travis config was modified to verify both code paths build and link/don’t - link against pulseaudio. - -2. If pulseaudio is missing, the build fails until packagers explicitly pass a - --disable flag. In practice, I think the only situation when this flag should - be set is in source-based linux distributions where users can express - package-level compilation preferences (e.g. Gentoo USE flags). - -3. The --version output now reflects the status of the optional dependency. - -fixes #359 ---- - .travis.yml | 5 +++-- - configure.ac | 25 +++++++++++++++---------- - i3status.c | 8 +++++++- - src/print_volume.c | 2 +- - 4 files changed, 26 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a6c31d7..11caa33 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -80,25 +80,29 @@ AC_CANONICAL_HOST - PKG_CHECK_MODULES([CONFUSE], [libconfuse]) - PKG_CHECK_MODULES([YAJL], [yajl]) - --pulse=true -+AC_ARG_ENABLE(pulseaudio, -+ AS_HELP_STRING( -+ [--disable-pulseaudio], -+ [build without pulseaudio support]), -+ [ax_pulse=$enableval], -+ [ax_pulse=yes]) -+AM_CONDITIONAL([PULSE], [test x$ax_pulse = xyes]) -+AS_IF([test x"$ax_pulse" = x"yes"], -+ [PKG_CHECK_MODULES([PULSE], [libpulse])]) -+pulse_def=0 -+AS_IF([test x"$ax_pulse" = x"yes"], -+ [pulse_def=1]) -+AC_DEFINE_UNQUOTED([HAS_PULSEAUDIO], [$pulse_def], [Build with pulseaudio]) -+ - case $host_os in - linux*) - PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0]) - PKG_CHECK_MODULES([ALSA], [alsa]) - ;; -- openbsd*) -- pulse=false -- ;; -- dragonfly*) -- pulse=false -- ;; - netbsd*) - AC_SEARCH_LIBS([prop_string_create], [prop]) - ;; - esac --AM_CONDITIONAL([PULSE], [test x$pulse = xtrue]) --AS_IF([test x"$pulse" = x"true"], -- [PKG_CHECK_MODULES([PULSE], [libpulse])]) - - dnl TODO: check for libbsd for GNU/kFreeBSD - -@@ -160,6 +164,7 @@ AS_HELP_STRING([is release version:], [${is_release}]) - AS_HELP_STRING([enable debug flags:], [${ax_enable_debug}]) - AS_HELP_STRING([code coverage:], [${CODE_COVERAGE_ENABLED}]) - AS_HELP_STRING([enabled sanitizers:], [${ax_enabled_sanitizers}]) -+AS_HELP_STRING([pulseaudio support:], [${ax_pulse}]) - - To compile, run: - -diff --git a/i3status.c b/i3status.c -index 0898da3..1ab8400 100644 ---- a/i3status.c -+++ b/i3status.c -@@ -565,7 +565,13 @@ int main(int argc, char *argv[]) { - return 0; - break; - case 'v': -- printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"); -+ printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n" -+#if HAS_PULSEAUDIO -+ "Built with pulseaudio support\n" -+#else -+ "Built without pulseaudio support\n" -+#endif -+ ); - return 0; - break; - case 0: -diff --git a/src/print_volume.c b/src/print_volume.c -index 91e8ce2..7364d47 100644 ---- a/src/print_volume.c -+++ b/src/print_volume.c -@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * - free(instance); - } - --#if !defined(__DragonFly__) && !defined(__OpenBSD__) -+#if HAS_PULSEAUDIO - /* Try PulseAudio first */ - - /* If the device name has the format "pulse[:N]" where N is the --- -2.26.2 - diff --git a/x11-misc/i3status/i3status-2.13-r1.ebuild b/x11-misc/i3status/i3status-2.13-r1.ebuild deleted file mode 100644 index 94263d66e0ef..000000000000 --- a/x11-misc/i3status/i3status-2.13-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit fcaps autotools - -DESCRIPTION="generates a status bar for dzen2, xmobar or similar" -HOMEPAGE="https://i3wm.org/i3status/" -SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~riscv x86" -IUSE="pulseaudio" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - >=dev-libs/yajl-2.0.2 - dev-libs/confuse:= - dev-libs/libnl:3 - media-libs/alsa-lib - pulseaudio? ( || ( media-sound/pulseaudio media-sound/apulse[sdk] ) ) -" - -DEPEND=" - ${RDEPEND} - app-text/asciidoc - app-text/xmlto -" - -PATCHES=( - "${FILESDIR}/0001-Extend-battery-handling-on-OpenBSD-351.patch" - "${FILESDIR}/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch" - "${FILESDIR}/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch" - "${FILESDIR}/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch" - "${FILESDIR}/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch" - "${FILESDIR}/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch" - "${FILESDIR}/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_enable pulseaudio) -} - -src_compile() { - pushd "${S}/${CHOST}" || die - default -} - -src_install() { - pushd "${S}/${CHOST}" || die - default -} - -pkg_postinst() { - fcaps cap_net_admin usr/bin/${PN} - - elog "${PN} can be used with any of the following programs:" - elog " i3bar (x11-wm/i3)" - elog " x11-misc/xmobar" - elog " x11-misc/dzen" - elog "Please refer to manual: man ${PN}" -} diff --git a/x11-misc/i3status/i3status-2.14.ebuild b/x11-misc/i3status/i3status-2.14-r1.ebuild index 9a1390b6ee6a..4197471f91fa 100644 --- a/x11-misc/i3status/i3status-2.14.ebuild +++ b/x11-misc/i3status/i3status-2.14-r1.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit fcaps meson -DESCRIPTION="generates a status bar for dzen2, xmobar or similar" +DESCRIPTION="Generates a status bar for dzen2, xmobar or similar" HOMEPAGE="https://i3wm.org/i3status/" SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" IUSE="pulseaudio" BDEPEND="virtual/pkgconfig" @@ -19,17 +20,22 @@ RDEPEND=" dev-libs/confuse:= dev-libs/libnl:3 media-libs/alsa-lib - pulseaudio? ( || ( media-sound/pulseaudio media-sound/apulse[sdk] ) ) + pulseaudio? ( || ( media-libs/libpulse media-sound/apulse[sdk] ) ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} app-text/asciidoc app-text/xmlto " -PATCHES=( -) +src_prepare() { + default + + # Needs an ALSA master device, bug #840622 + # Also skipped in CI: + # https://github.com/i3/i3status/blob/07ad5aef2deea1f10eb6c544593e7a87205f24f8/.github/workflows/main.yml#L34 + rm -rf testcases/020-percentliteral-volume || die +} src_configure() { local emesonargs=( diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml index dc27abb8c502..e16cefd50de7 100644 --- a/x11-misc/i3status/metadata.xml +++ b/x11-misc/i3status/metadata.xml @@ -14,6 +14,9 @@ your CPU as much as spawning the corresponding amount of shell commands would. </longdescription> <use> - <flag name="filecaps">Linux capabilities library is required for i3status to be able to read net bandwith</flag> + <flag name="filecaps">Linux capabilities library is required for i3status to be able to read net bandwidth</flag> </use> + <upstream> + <remote-id type="github">i3/i3status</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild index 95e306517e7a..4f0484191bcc 100644 --- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild +++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Utils to help with the transition to the new freedesktop.org naming scheme" HOMEPAGE="http://tango.freedesktop.org" @@ -9,9 +9,9 @@ SRC_URI="http://tango.freedesktop.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" -RDEPEND=">=dev-perl/XML-Simple-2 - >=dev-lang/perl-5" +RDEPEND=" + dev-lang/perl + dev-perl/XML-Simple" DEPEND="${RDEPEND}" diff --git a/x11-misc/idesk-extras/idesk-extras-1.37-r2.ebuild b/x11-misc/idesk-extras/idesk-extras-1.37-r3.ebuild index 326a880a51d5..505f802b4a62 100644 --- a/x11-misc/idesk-extras/idesk-extras-1.37-r2.ebuild +++ b/x11-misc/idesk-extras/idesk-extras-1.37-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Graphical configuration for iDesk plus icons" HOMEPAGE="https://web.archive.org/web/20070828214007/http://www.jmurray.id.au/idesk-extras.html" @@ -10,9 +10,9 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="app-shells/bash +RDEPEND=" + app-shells/bash x11-misc/idesk x11-misc/xdialog" @@ -21,7 +21,8 @@ HTML_DOCS=( ${PN}.html ) src_install() { dobin idesktool + einstalldocs + insinto /usr/share/idesk doins -r icons - einstalldocs } diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest index bb0f43c35a82..fc7452893316 100644 --- a/x11-misc/imake/Manifest +++ b/x11-misc/imake/Manifest @@ -1 +1 @@ -DIST imake-1.0.9.tar.xz 153332 BLAKE2B d9de997016112833e50d1151448366c538b9796622630724552cc0476deed165621edc1a01318a83b577a85fcfc78b753e6fa9fbdf4c71413319abe542f1beca SHA512 e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644 +DIST imake-1.0.10.tar.xz 155284 BLAKE2B 85ea5d14280b0e4e3d07f806b1ebc777f1c6f431af05e94571e1d7908028f1497c4b5edb6e808c858429e98f314fe6c3cee84e265a30fce02d7ebeaa2111ab8d SHA512 ea96db27a6da13ea2d64652936e508b5e3d5d712347a2eb248376dc1f262c18720d9934b8ae69b4c0fc65b135c847be42da084fe924e4825ce1d359f4ef7e60f diff --git a/x11-misc/imake/imake-1.0.9.ebuild b/x11-misc/imake/imake-1.0.10.ebuild index 12436d8ee0ab..c5519695461d 100644 --- a/x11-misc/imake/imake-1.0.9.ebuild +++ b/x11-misc/imake/imake-1.0.10.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 @@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz" inherit toolchain-funcs xorg-3 DESCRIPTION="C preprocessor interface to the make utility" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="x11-misc/xorg-cf-files" DEPEND="x11-base/xorg-proto" diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild index b2028583345f..d6db068fc05b 100644 --- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild +++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit autotools DESCRIPTION="mouse tool for advanced features such as wheels and 3+ buttons" -HOMEPAGE="http://imwheel.sourceforge.net/" +HOMEPAGE="https://imwheel.sourceforge.net/" SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" 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 new file mode 100644 index 000000000000..269044a01ba7 --- /dev/null +++ b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch @@ -0,0 +1,25 @@ +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-2.18-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild index 1ad6b767f43d..0e03d6f0d6be 100644 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,6 +21,10 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-cpp/catch:1 )" RDEPEND="dmenu? ( x11-misc/dmenu )" +PATCHES=( + "${FILESDIR}"/${PN}-2.18-gcc13.patch +) + src_prepare() { cmake_src_prepare diff --git a/x11-misc/kdocker/kdocker-5.4.ebuild b/x11-misc/kdocker/kdocker-5.4.ebuild index 43d293885e65..d307e8c299a0 100644 --- a/x11-misc/kdocker/kdocker-5.4.ebuild +++ b/x11-misc/kdocker/kdocker-5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.ta LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=" diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest index 2ac027d641ab..dc00e0ef1e3a 100644 --- a/x11-misc/lightdm-gtk-greeter/Manifest +++ b/x11-misc/lightdm-gtk-greeter/Manifest @@ -1,3 +1,3 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274 -DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944 DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db +DIST lightdm-gtk-greeter-2.0.9.tar.gz 602540 BLAKE2B 33c7df912ee9faa46c97e7a458f400b13d7d746521de58b1c63ec845574c45374a27fe21718ac78a33a729617941cff01802c4736d1d3066d001065a57acc264 SHA512 05d786d31e447cacc28ddb06e89e91623b137665badcebd82ac7f9e8ff745a01aadf406e25ebd2c6594915fe8a90a242ef065ad46fd9ee73cd6e8c2879f70158 diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild index 91860c1597e0..3d8d49a1c38b 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools xdg-utils DESCRIPTION="LightDM GTK+ Greeter" HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter" SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz - branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )" + branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )" LICENSE="GPL-3 LGPL-3 branding? ( CC-BY-3.0 )" @@ -16,13 +16,16 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="appindicator branding" -DEPEND="appindicator? ( dev-libs/libindicator:3 ) - x11-libs/gtk+:3 - >=x11-misc/lightdm-1.2.2" +DEPEND="x11-libs/gtk+:3 + >=x11-misc/lightdm-1.2.2 + appindicator? ( + dev-libs/ayatana-ido + dev-libs/libayatana-indicator:3 + )" BDEPEND=" + dev-build/xfce4-dev-tools dev-util/intltool - dev-util/xfce4-dev-tools sys-devel/gettext " @@ -57,6 +60,7 @@ src_configure() { local myeconfargs=( --enable-kill-on-sigterm --enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately" + --with-libindicator=ayatana $(use_enable appindicator libindicator) ) econf "${myeconfargs[@]}" diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.9.ebuild index 5cbefb2fe18b..40ca5f48ebff 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.9.ebuild @@ -1,35 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools xdg-utils DESCRIPTION="LightDM GTK+ Greeter" -HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter" -SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz - branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )" +HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter" +SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz + branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )" LICENSE="GPL-3 LGPL-3 branding? ( CC-BY-3.0 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="appindicator branding" -COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 ) - x11-libs/gtk+:3 - >=x11-misc/lightdm-1.2.2" +DEPEND="x11-libs/gtk+:3 + >=x11-misc/lightdm-1.2.2 + appindicator? ( + dev-libs/ayatana-ido + dev-libs/libayatana-indicator:3 + )" -DEPEND=" - ${COMMON_DEPEND} - xfce-base/exo -" BDEPEND=" + dev-build/xfce4-dev-tools dev-util/intltool sys-devel/gettext " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1" @@ -60,6 +60,7 @@ src_configure() { local myeconfargs=( --enable-kill-on-sigterm --enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately" + --with-libindicator=ayatana $(use_enable appindicator libindicator) ) econf "${myeconfargs[@]}" diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml index f465836dc081..bea26602d3d4 100644 --- a/x11-misc/lightdm-gtk-greeter/metadata.xml +++ b/x11-misc/lightdm-gtk-greeter/metadata.xml @@ -6,6 +6,7 @@ <name>Marek Szuba</name> </maintainer> <upstream> + <remote-id type="github">Xubuntu/lightdm-gtk-greeter</remote-id> <remote-id type="launchpad">lightdm-gtk-greeter</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/lightdm-mini-greeter/metadata.xml b/x11-misc/lightdm-mini-greeter/metadata.xml index 9ed4fbb74beb..d06d17c29f64 100644 --- a/x11-misc/lightdm-mini-greeter/metadata.xml +++ b/x11-misc/lightdm-mini-greeter/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>graaff@gentoo.org</email> - <name>Hans de Graaff</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">prikhi/lightdm-mini-greeter</remote-id> </upstream> diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index 599ecb3f3678..d830b4edeb81 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -1,3 +1,2 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be -DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce DIST lightdm-1.32.0.tar.xz 518168 BLAKE2B 90191559895a58e2c5892705ea95766aaaaa87d3470f1372ab90fcf3991d27f9280d5bbabe0cfce70e25f960d63c1e7eab7beeeb501341996afd155788cbe1c7 SHA512 81497fb25904bc2e8687dc99992628eb534f7418f72e1908c4766e917fc1221714210d998739417e1cae2ee15e3197a2eb8d4981cb944cfeb0334dc9e356e716 diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession deleted file mode 100644 index 1fe0110c9d9b..000000000000 --- a/x11-misc/lightdm/files/Xsession +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# -# LightDM wrapper to run around X sessions. - -echo "Running X session wrapper" - -# Load profile -for file in "/etc/profile" "${HOME}/.profile" "/etc/xprofile" "${HOME}/.xprofile" ; do - if [ -f "${file}" ] ; then - echo "Loading profile from ${file}"; - . "${file}" - fi -done - -# Load resources -for file in "/etc/X11/Xresources" "${HOME}/.Xresources" ; do - if [ -f "${file}" ] ; then - echo "Loading resource: ${file}" - xrdb -nocpp -merge "${file}" - fi -done - -# Load keymaps -for file in "/etc/X11/Xkbmap" "${HOME}/.Xkbmap" ; do - if [ -f "${file}" ] ; then - echo "Loading keymap: ${file}" - setxkbmap $(cat "${file}") - XKB_IN_USE=yes - fi -done - -# Load xmodmap if not using XKB -if [ -z "${XKB_IN_USE}" ] ; then - for file in "/etc/X11/Xmodmap" "${HOME}/.Xmodmap" ; do - if [ -f "${file}" ] ; then - echo "Loading modmap: ${file}" - xmodmap "${file}" - fi - done -fi - -unset XKB_IN_USE - -# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be -# set to the Xsession arguments. So make it happy. See -# https://bugs.gentoo.org/show_bug.cgi?id=533456 -command="$@" - -# Run all system xinitrc shell scripts. -xinitdir="/etc/X11/xinit/xinitrc.d" -if [ -d "${xinitdir}" ] ; then - for script in ${xinitdir}/* ; do - if [ -x "${script}" ] && [ ! -d "${script}" ] ; then - echo "Loading xinit script ${script}" - . "${script}" - fi - done -fi - -# Load Xsession scripts -xsessionddir="/etc/X11/Xsession.d" -if [ -d "${xsessionddir}" ] ; then - for i in $(ls ${xsessionddir}) ; do - script="${xsessionddir}/${i}" - if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then - echo "Loading X session script ${script}" - . "${script}" - fi - done -fi - -echo "X session wrapper complete, running session ${@}" - -exec ${command} diff --git a/x11-misc/lightdm/files/lightdm.service b/x11-misc/lightdm/files/lightdm.service deleted file mode 100644 index 7eb46cebaa10..000000000000 --- a/x11-misc/lightdm/files/lightdm.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Light Display Manager -Documentation=man:lightdm(1) -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/sbin/lightdm -StandardOutput=syslog -Restart=always -IgnoreSIGPIPE=no -BusName=org.freedesktop.DisplayManager - -[Install] -Alias=display-manager.service diff --git a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild deleted file mode 100644 index 5f23bb293fae..000000000000 --- a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils - -DESCRIPTION="A lightweight display manager" -HOMEPAGE="https://github.com/CanonicalLtd/lightdm" -SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz - mirror://gentoo/introspection-20110205.m4.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -IUSE="audit +gnome +gtk +introspection non-root qt5 vala" - -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2 - dev-libs/libxml2 - sys-libs/pam - x11-libs/libX11 - >=x11-libs/libxklavier-5 - audit? ( sys-process/audit ) - gnome? ( sys-apps/accountsservice ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/lightdm - acct-group/video - acct-user/lightdm - >=sys-auth/pambase-20101024-r2" -DEPEND="${COMMON_DEPEND} - gnome? ( gnome-base/gnome-common ) -" -BDEPEND=" - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" - -DOCS=( NEWS ) -RESTRICT="test" -REQUIRED_USE="vala? ( introspection )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.30.0-musl-locale.patch - "${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch -) - -pkg_setup() { - export LIGHTDM_USER=${LIGHTDM_USER:-lightdm} -} - -src_prepare() { - xdg_environment_reset - - sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 - sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die - - einfo "Fixing the session-wrapper variable in lightdm.conf" - sed -i -e \ - "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ - data/lightdm.conf || die "Failed to fix lightdm.conf" - - # use correct version of qmake. bug #566950 - sed \ - -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \ - -i configure.ac || die - - default - - # Remove bogus Makefile statement. This needs to go upstream - sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die - if has_version dev-libs/gobject-introspection; then - eautoreconf - else - AT_M4DIR=${WORKDIR} eautoreconf - fi - - use vala && vala_src_prepare -} - -src_configure() { - # Set default values if global vars unset - local _greeter _session _user - _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} - _session=${LIGHTDM_SESSION:=gnome} - _user="$(usex non-root "${LIGHTDM_USER}" root)" - # Let user know how lightdm is configured - einfo "Gentoo configuration" - einfo "Default greeter: ${_greeter}" - einfo "Default session: ${_session}" - einfo "Greeter user: ${_user}" - - # also disable tests because libsystem.c does not build. Tests are - # restricted so it does not matter anyway. - local myeconfargs=( - --localstatedir=/var - --disable-static - --disable-tests - $(use_enable audit libaudit) - $(use_enable introspection) - --disable-liblightdm-qt - $(use_enable qt5 liblightdm-qt5) - $(use_enable vala) - --with-user-session=${_session} - --with-greeter-session=${_greeter} - --with-greeter-user=${_user} - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Delete apparmor profiles because they only work with Ubuntu's - # apparmor package. Bug #494426 - if [[ -d ${ED}/etc/apparmor.d ]]; then - rm -r "${ED}/etc/apparmor.d" || die \ - "Failed to remove apparmor profiles" - fi - - insinto /etc/${PN} - doins data/{${PN},keys}.conf - doins "${FILESDIR}"/Xsession - fperms +x /etc/${PN}/Xsession - # /var/lib/lightdm-data could be useful. Bug #522228 - keepdir /var/lib/${PN}-data - - find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die - rm -r "${ED}"/etc/init || die - - # Remove existing pam file. We will build a new one. Bug #524792 - rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die - pamd_mimic system-local-login ${PN} auth account password session #372229 - pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 - dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 - - readme.gentoo_create_doc - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_postinst() { - systemd_reenable "${PN}.service" -} diff --git a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild deleted file mode 100644 index 3573551b00d3..000000000000 --- a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils - -DESCRIPTION="A lightweight display manager" -HOMEPAGE="https://github.com/canonical/lightdm" -SRC_URI="https://github.com/canonical/lightdm/releases/download/${PV}/${P}.tar.xz - mirror://gentoo/introspection-20110205.m4.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -IUSE="audit +gnome +gtk +introspection non-root qt5 vala" - -REQUIRED_USE="vala? ( introspection )" - -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2 - dev-libs/libgcrypt:= - dev-libs/libxml2 - sys-libs/pam - x11-libs/libX11 - >=x11-libs/libxklavier-5 - audit? ( sys-process/audit ) - gnome? ( sys-apps/accountsservice ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/lightdm - acct-group/video - acct-user/lightdm - >=sys-auth/pambase-20101024-r2" -DEPEND="${COMMON_DEPEND} - gnome? ( gnome-base/gnome-common ) -" -BDEPEND=" - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - vala? ( $(vala_depend) ) -" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.30.0-musl-locale.patch - "${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch -) - -DOCS=( NEWS ) - -pkg_setup() { - export LIGHTDM_USER=${LIGHTDM_USER:-lightdm} - vala_setup -} - -src_prepare() { - xdg_environment_reset - - sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 - sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die - - einfo "Fixing the session-wrapper variable in lightdm.conf" - sed -i -e \ - "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ - data/lightdm.conf || die "Failed to fix lightdm.conf" - - # use correct version of qmake. bug #566950 - sed \ - -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \ - -i configure.ac || die - - default - - # Remove bogus Makefile statement. This needs to go upstream - sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die - if has_version dev-libs/gobject-introspection; then - eautoreconf - else - AT_M4DIR=${WORKDIR} eautoreconf - fi -} - -src_configure() { - # Set default values if global vars unset - local _greeter _session _user - _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} - _session=${LIGHTDM_SESSION:=gnome} - _user="$(usex non-root "${LIGHTDM_USER}" root)" - # Let user know how lightdm is configured - einfo "Gentoo configuration" - einfo "Default greeter: ${_greeter}" - einfo "Default session: ${_session}" - einfo "Greeter user: ${_user}" - - # also disable tests because libsystem.c does not build. Tests are - # restricted so it does not matter anyway. - local myeconfargs=( - --localstatedir=/var - --disable-static - --disable-tests - $(use_enable audit libaudit) - $(use_enable introspection) - $(use_enable qt5 liblightdm-qt5) - $(use_enable vala) - --with-user-session=${_session} - --with-greeter-session=${_greeter} - --with-greeter-user=${_user} - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # Delete apparmor profiles because they only work with Ubuntu's - # apparmor package. Bug #494426 - if [[ -d ${ED}/etc/apparmor.d ]]; then - rm -r "${ED}/etc/apparmor.d" || die \ - "Failed to remove apparmor profiles" - fi - - insinto /etc/${PN} - doins data/{${PN},keys}.conf - newins "${FILESDIR}"/Xsession-r1 Xsession - fperms +x /etc/${PN}/Xsession - # /var/lib/lightdm-data could be useful. Bug #522228 - keepdir /var/lib/${PN}-data - - find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die - rm -r "${ED}"/etc/init || die - - # Remove existing pam file. We will build a new one. Bug #524792 - rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die - pamd_mimic system-local-login ${PN} auth account password session #372229 - pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 - dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 - - readme.gentoo_create_doc - - systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service -} - -pkg_postinst() { - systemd_reenable "${PN}.service" -} diff --git a/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild index 1209f8df2a34..b0ae015ea719 100644 --- a/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild +++ b/x11-misc/lightdm/lightdm-1.32.0-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 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/canonical/lightdm/releases/download/${PV}/${P}.tar.x LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="audit elogind +gnome +gtk +introspection non-root qt5 systemd vala" REQUIRED_USE="^^ ( elogind systemd ) @@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND} gnome? ( gnome-base/gnome-common ) " BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild index 3c59326074c8..8b97a1985e3e 100644 --- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild +++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild @@ -6,11 +6,11 @@ EAPI=8 MY_P=${P/.0/} DESCRIPTION="Mute/unmute and other macros for LINEAK" -HOMEPAGE="http://lineak.sourceforge.net" +HOMEPAGE="https://lineak.sourceforge.net" SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="debug" diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild index 0f57d3d19650..35b3b1b4a5d6 100644 --- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild +++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild @@ -5,11 +5,11 @@ EAPI=8 MY_P=${P/.0/} DESCRIPTION="Xosd plugin for LINEAK" -HOMEPAGE="http://lineak.sourceforge.net/" +HOMEPAGE="https://lineak.sourceforge.net/" SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="debug" diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest index ef8e3819d293..b6bbf4d33fcd 100644 --- a/x11-misc/lndir/Manifest +++ b/x11-misc/lndir/Manifest @@ -1 +1 @@ -DIST lndir-1.0.4.tar.xz 120136 BLAKE2B dbc9370c66bfffe02a9dfa2004a354f006dad1252c6d76f9707fa6b420be2b4072941c9c65bf695dbf6f0a7a01f6ef8152146d6aa3b5eda310e6f3f1412a6747 SHA512 71ebebaa9edb1ffe9d833cf23241bd7d99f4704a2eec20638eb9af1ff34bd42882557dadbcbe84a9e26f9d885caf1e555dca4756efd9915ca7642e39a8c6f711 +DIST lndir-1.0.5.tar.xz 121460 BLAKE2B 1d51789c47e8958bcfca9f356e6cbc34916a6164024c3d33e684479b50773e806f85d0aad3558ab2704115f10408a69d709043543fd7adeafd28f354a2edca20 SHA512 f6c1498ed0d867d4aa98ef098a9ab57027ac4e852f688b2c1695a3c9ca571b927bc401925e3bd7951fbf0db54798a55f838c4a4ad113dafd95d811ba61551061 diff --git a/x11-misc/lndir/lndir-1.0.4.ebuild b/x11-misc/lndir/lndir-1.0.5.ebuild index 687c72d9f785..784bc50925af 100644 --- a/x11-misc/lndir/lndir-1.0.4.ebuild +++ b/x11-misc/lndir/lndir-1.0.5.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 @@ -9,6 +9,13 @@ inherit xorg-3 DESCRIPTION="create a shadow directory of symbolic links to another directory tree" KEYWORDS="amd64 ppc ppc64 sparc x86" -RDEPEND="dev-libs/libbsd" +RDEPEND=" + elibc_glibc? ( + || ( >=sys-libs/glibc-2.38 dev-libs/libbsd ) + ) + !elibc_glibc? ( + dev-libs/libbsd + ) +" DEPEND="${RDEPEND} x11-base/xorg-proto" diff --git a/x11-misc/lsw/metadata.xml b/x11-misc/lsw/metadata.xml index 2f82d0bb8eb7..115e9d64a669 100644 --- a/x11-misc/lsw/metadata.xml +++ b/x11-misc/lsw/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest index 7a3942ff94e6..c7cdad3b3938 100644 --- a/x11-misc/makedepend/Manifest +++ b/x11-misc/makedepend/Manifest @@ -1 +1 @@ -DIST makedepend-1.0.8.tar.xz 141304 BLAKE2B 15c29c9b727cf2fd7bb560596376f86f94d5ebd4dddeaf95c39acbed7f3a0b891db80bbc40cec4dae76e7019795d06d30869d2606f756ed5c4e2f8736101813d SHA512 6707b1107c07d4ffbcf008181e877d18a0bcc4aea03860ee1158f5630c7fdce4cf9ad7bee3b38ee420c3a44819ed4b56a6f2428a5b695c0dbd17fb3e60825a6d +DIST makedepend-1.0.9.tar.xz 145080 BLAKE2B 7f8b2c0a3992a7c87a37f152eb5df1e6a881c0523f4cc4e69fd0ec3aa9aee37b6a0b32c548ad246151c938596b6d4a6c32d956aa9be1ed6c81978d313644f9a3 SHA512 68d289656314dc9f12c792d0e394cfbc95404a0d01155dbcb38313d451b506da48a3d44183f568a2cbb2b1d1da9e26703a0d92f2bb658f72fc968eeb03bf2fe8 diff --git a/x11-misc/makedepend/makedepend-1.0.8.ebuild b/x11-misc/makedepend/makedepend-1.0.9.ebuild index 8123954619ab..cbda29127cd3 100644 --- a/x11-misc/makedepend/makedepend-1.0.8.ebuild +++ b/x11-misc/makedepend/makedepend-1.0.9.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 @@ -7,8 +7,4 @@ XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="create dependencies in makefiles" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -RDEPEND="" -DEPEND="${RDEPEND} - x11-base/xorg-proto" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r2.ebuild index 4ceed10c88e9..8017cd6c4e34 100644 --- a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild +++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r2.ebuild @@ -1,28 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -inherit versionator +inherit autotools DESCRIPTION="Matchbox-keyboard is an on screen 'virtual' or 'software' keyboard" HOMEPAGE="http://matchbox-project.org/" -SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2" +SRC_URI="http://matchbox-project.org/sources/${PN}/$(ver_cut 1-2)/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm ~hppa ppc x86" IUSE="debug cairo" -DEPEND="x11-libs/libfakekey +DEPEND=" + x11-libs/libfakekey cairo? ( x11-libs/cairo[X] ) !cairo? ( x11-libs/libXft )" RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-0.1-r1-modernize_desktop.patch -) +PATCHES=( "${FILESDIR}"/${PN}-0.1-r1-modernize_desktop.patch ) + +src_prepare() { + default + eautoreconf # bug 898250 +} src_configure() { - econf $(use_enable debug) $(use_enable cairo) + econf \ + $(use_enable debug) \ + $(use_enable cairo) } diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest index f9eb9dc04398..4181e806b6d2 100644 --- a/x11-misc/mate-notification-daemon/Manifest +++ b/x11-misc/mate-notification-daemon/Manifest @@ -1 +1,3 @@ DIST mate-notification-daemon-1.26.0.tar.xz 421032 BLAKE2B 3f55a281cc51e63245371a1bf4ddadb2be4fa09bf16a4ffac701d4530f519a65e2ff69c7e58e6589fa923d3af86315e36d5445a6a1915a6857271933605eaaac SHA512 5249cf14ba93f2e74b9774226c5d0f5e90a517df07569e16a23af7053f5ef160afe98c8a3452baf80c243272763eee1fde0b84f434f55df1f9de26298361a1dc +DIST mate-notification-daemon-1.26.1.tar.xz 428836 BLAKE2B 78b852f8b6f6f2cdae46831c527ccca24fddf0c12660a886e5eb1b31c1046f1fcaa64de42915038306288f6baef6071ef4347f32b5cce30e4d2488e7bdc6c6d0 SHA512 c7aaef499acb2829f9833734a57e77a11a321369cb5134a4c49bb3c1e9899951c6c3702d3aac1dff6ce1bb8e60e41fc7ac31046e3346852d2da5d4dacf849a1e +DIST mate-notification-daemon-1.28.0.tar.xz 433572 BLAKE2B 89c386fb7707b87de61e5346ab018227864427d590e2908f0c85b8697d2d19d3528870f701adfa8f9657ea395718724d6398baf325d0b1d68284eb855f16df3f SHA512 dba0989945b81ff0fed5e77ac8ef7c96bf52ee854c9dc0f46549697e0d0537a8ff4a9491839076768443cc62140d1dfbf911aee489ab568c2975b67c52c78d2e diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0-r1.ebuild index d34108e27c33..0a02cc9cd01d 100644 --- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild +++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -50,7 +50,7 @@ DEPEND="${COMMON_DEPEND} src_configure() { mate_src_configure \ - $(use_enable nls) + $(use_enable nls) \ $(use_enable X x11) \ $(use_enable wayland) } diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.1.ebuild new file mode 100644 index 000000000000..737071d3f840 --- /dev/null +++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MATE_LA_PUNT="yes" + +inherit mate + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +DESCRIPTION="MATE Notification daemon" +LICENSE="GPL-2+ GPL-3+" +SLOT="0" + +IUSE="nls X wayland" +REQUIRED_USE="|| ( X wayland )" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + >=dev-libs/glib-2.50:2 + >=dev-libs/libxml2-2.9.0 + >=sys-apps/dbus-1 + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.22:2 + >=x11-libs/libnotify-0.7 + >=x11-libs/gtk+-3.22:3 + >=media-libs/libcanberra-0.4:0[gtk3] + X? ( + x11-libs/libX11 + >=x11-libs/libwnck-3:3 + ) + wayland? ( gui-libs/gtk-layer-shell ) +" + +RDEPEND="${COMMON_DEPEND} + !x11-misc/notify-osd + !x11-misc/notification-daemon +" + +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + dev-util/gdbus-codegen + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + mate-base/mate-panel +" + +src_configure() { + mate_src_configure \ + $(use_enable nls) \ + $(use_enable X x11) \ + $(use_enable wayland) +} + +src_install() { + mate_src_install + + insinto /usr/share/dbus-1/services + doins "${FILESDIR}/org.freedesktop.Notifications.service" +} diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.28.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.28.0.ebuild new file mode 100644 index 000000000000..a1e84c301f57 --- /dev/null +++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.28.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MATE_LA_PUNT="yes" + +inherit mate + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +DESCRIPTION="MATE Notification daemon" +LICENSE="GPL-2+ GPL-3+" +SLOT="0" + +IUSE="nls X wayland" +REQUIRED_USE="|| ( X wayland )" + +COMMON_DEPEND="dev-libs/atk + >=dev-libs/glib-2.50:2 + >=dev-libs/libxml2-2.9.0 + >=sys-apps/dbus-1 + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.22:2 + >=x11-libs/libnotify-0.7 + >=x11-libs/gtk+-3.22:3 + >=media-libs/libcanberra-0.4:0[gtk3] + X? ( + x11-libs/libX11 + >=x11-libs/libwnck-3:3 + ) + wayland? ( gui-libs/gtk-layer-shell ) +" + +RDEPEND="${COMMON_DEPEND} + !x11-misc/notify-osd + !x11-misc/qtnotifydaemon + !x11-misc/notification-daemon +" + +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + dev-util/gdbus-codegen + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + mate-base/mate-panel +" + +src_configure() { + mate_src_configure \ + $(use_enable nls) \ + $(use_enable X x11) \ + $(use_enable wayland) +} + +src_install() { + mate_src_install + + insinto /usr/share/dbus-1/services + doins "${FILESDIR}/org.freedesktop.Notifications.service" +} diff --git a/x11-misc/mate-notification-daemon/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml index 7174df65a7e4..e215d24b5b1b 100644 --- a/x11-misc/mate-notification-daemon/metadata.xml +++ b/x11-misc/mate-notification-daemon/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">mate-desktop/mate-notification-daemon</remote-id> </upstream> diff --git a/x11-misc/menulibre/menulibre-2.2.3.ebuild b/x11-misc/menulibre/menulibre-2.2.3.ebuild index 7161e3740c3c..edeabe5b03f5 100644 --- a/x11-misc/menulibre/menulibre-2.2.3.ebuild +++ b/x11-misc/menulibre/menulibre-2.2.3.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" inherit distutils-r1 xdg @@ -27,7 +27,8 @@ RDEPEND=" x11-themes/hicolor-icon-theme" BDEPEND=" $(python_gen_cond_dep ' - dev-python/python-distutils-extra[${PYTHON_USEDEP}]')" + dev-python/python-distutils-extra[${PYTHON_USEDEP}]') + dev-util/intltool" python_prepare_all() { distutils-r1_python_prepare_all diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest index 10cb05fd2c69..4fcd2e61d58e 100644 --- a/x11-misc/menumaker/Manifest +++ b/x11-misc/menumaker/Manifest @@ -1 +1,2 @@ DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6 +DIST menumaker-0.99.14.tar.gz 205664 BLAKE2B b86e46ec07ea14b695c9350e5156081db7a5ae278a7356d98ae1e1a488d83da02d3efd547f9c7d3ac5bdc894b77085434a05e27fd76c09cafc88f1cbce4c428a SHA512 81d44c1917d0fd4cd1c8b7cdd4ce12795fee7cc286959a7fc9dc6f84a096ea850a4348d98b6a7dce153c5d07fdb8b3aaf13f3476a9f34dd56646af3097d406d0 diff --git a/x11-misc/menumaker/menumaker-0.99.14.ebuild b/x11-misc/menumaker/menumaker-0.99.14.ebuild new file mode 100644 index 000000000000..adea47767a3c --- /dev/null +++ b/x11-misc/menumaker/menumaker-0.99.14.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools python-single-r1 + +DESCRIPTION="Utility that scans through the system and generates a menu of installed programs" +HOMEPAGE="http://menumaker.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" + +IUSE="doc" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND} + doc? ( sys-apps/texinfo )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.99.12-AM_PATH_PYTHON.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}" +} + +src_compile() { + default + use doc && emake html +} + +src_install() { + default + use doc && emake DESTDIR="${D}" install-html + python_optimize + python_fix_shebang "${ED}"/usr/bin/mmaker +} diff --git a/x11-misc/meteo/Manifest b/x11-misc/meteo/Manifest index f6ed738831ff..fc55cb8a38d4 100644 --- a/x11-misc/meteo/Manifest +++ b/x11-misc/meteo/Manifest @@ -1 +1,2 @@ DIST meteo-0.9.9.1.tar.gz 598205 BLAKE2B ac66e84a04f087cf75f9101da0c80e68c132e0e5064aec4cb2ea609e93f48a2ef3eb51266805b2547b4839c82496b470d4bb07e4fa0538e2ebc691a9491606d8 SHA512 d148393acc47dab1886a25600adb2a3e2ff5cb313c0004d50a54106c61f3cbd26ff95d526d13a77a1d33ede2622ff2ea9277a8fdc1899ebf34581a5a6b36c861 +DIST meteo-0.9.9.2.tar.bz2 609059 BLAKE2B 77557c28c755065f5b2da6cef429df96342c67217650f3ca3e5282f14c93d095b0e4c3f7b5cdfd62374f41e543cce14080d85291019e4336acc5d9f8f09e06c9 SHA512 96f05fb2b84d0be73eb26e101edf2a03345a06c79a86ec6c9f5acbe8b32e4fbaf6f4d7b59b65eb69f4db8667e1178d5641792b259cf23c46d4dcaee8a2243a5a diff --git a/x11-misc/meteo/metadata.xml b/x11-misc/meteo/metadata.xml index 424492050f4c..82e7a6d88640 100644 --- a/x11-misc/meteo/metadata.xml +++ b/x11-misc/meteo/metadata.xml @@ -5,4 +5,7 @@ <email>pacho@gentoo.org</email> <name>Pacho Ramos</name> </maintainer> +<upstream> + <remote-id type="gitlab">bitseater/meteo</remote-id> +</upstream> </pkgmetadata> diff --git a/x11-misc/meteo/meteo-0.9.9.1-r2.ebuild b/x11-misc/meteo/meteo-0.9.9.1-r3.ebuild index ee8a03bdb61b..65d2e2cb6ad8 100644 --- a/x11-misc/meteo/meteo-0.9.9.1-r2.ebuild +++ b/x11-misc/meteo/meteo-0.9.9.1-r3.ebuild @@ -31,7 +31,6 @@ RDEPEND="${DEPEND} " BDEPEND="${PYTHON_DEPS} dev-libs/appstream-glib - dev-util/intltool virtual/pkgconfig $(vala_depend) " diff --git a/x11-misc/meteo/meteo-0.9.9.2.ebuild b/x11-misc/meteo/meteo-0.9.9.2.ebuild new file mode 100644 index 000000000000..043a307df6fa --- /dev/null +++ b/x11-misc/meteo/meteo-0.9.9.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +inherit gnome2-utils meson python-any-r1 vala xdg + +DESCRIPTION="Forecast application using OpenWeatherMap API" +HOMEPAGE="https://gitlab.com/bitseater/meteo" +SRC_URI="https://gitlab.com/bitseater/meteo/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +# One test needs network (#828052), the other simply checks desktop file +# validation, that we also test with our QA tests +RESTRICT="test" + +DEPEND=" + dev-libs/libayatana-appindicator:0 + dev-libs/glib:2 + dev-libs/json-glib + net-libs/libsoup:2.4 + net-libs/webkit-gtk:4 + x11-libs/gtk+:3 +" +RDEPEND="${DEPEND} + gnome-base/gsettings-desktop-schemas + x11-themes/hicolor-icon-theme +" +BDEPEND="${PYTHON_DEPS} + dev-libs/appstream-glib + virtual/pkgconfig + $(vala_depend) +" + +src_configure() { + vala_setup + meson_src_configure +} + +src_install() { + meson_src_install + dosym com.gitlab.bitseater.meteo /usr/bin/meteo +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/x11-misc/mgm/mgm-1.2-r1.ebuild b/x11-misc/mgm/mgm-1.2-r2.ebuild index 63774cf206e7..cdf7c850095b 100644 --- a/x11-misc/mgm/mgm-1.2-r1.ebuild +++ b/x11-misc/mgm/mgm-1.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Moaning Goat Meter: load and status meter written in Perl" HOMEPAGE="http://www.linuxmafia.com/mgm" @@ -10,18 +10,20 @@ SRC_URI="http://downloads.xiph.org/releases/mgm/${P}.tgz" LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="" -RDEPEND=">=dev-lang/perl-5.6.1 - >=dev-perl/Tk-800.024" +RDEPEND=" + dev-lang/perl + dev-perl/Tk" HTML_DOCS=( doc/. ) src_install() { exeinto /usr/share/mgm doexe mgm - dosym /usr/share/mgm/mgm /usr/bin/mgm + dosym ../share/mgm/mgm /usr/bin/mgm + insinto /usr/share/mgm doins -r lib modules + einstalldocs } diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest index 23cdee565c11..7c89dca04af0 100644 --- a/x11-misc/mozo/Manifest +++ b/x11-misc/mozo/Manifest @@ -1 +1,2 @@ -DIST mozo-1.26.1.tar.xz 242836 BLAKE2B 59047b087e531792c0e831779d06a2dc7d9d2709bef7a7c8ba4a21d6f9fe1a79f917e2ba4e4912d655ad94391c0f7789e6ad6394be1a7bcb482881781f81c9ff SHA512 8570db4719d88bb34269a23acaa63638c5b7e50bf840bca73db718040c9d585670f1fd3be128c51ff22b4314f59dad6050907db8ce60bb506e4d46c3f807707e +DIST mozo-1.26.2.tar.xz 249672 BLAKE2B 95e9a04fc91424e8ce95e870253bf1d2eddfbbf1b78b632b15d057a3ffa86068bb2c89442cfc50c4f74a76e75b345c6b06cf47d5891eed3ffce460697fb0094b SHA512 c4ea00f97f4dd5c9b33b78e1b438ba80a5e23b69d05f6ea59c522a580c1b07c280cddc0591f266c16f39bbe5f3e07ca28cdbd33753162a02584b551a9857b904 +DIST mozo-1.28.0.tar.xz 251512 BLAKE2B 79248acfb03bde54414399f832402cd40e05ccd6ea47ca239691b1c4856a301b5c20874399fa6e27ca098a73021ed4cd4fa573d94f4c2d9926c58257b29be0a8 SHA512 7576bcf275f3dc402db7a436094fe9e601529f5d9827c14b658caca82393ce71075977e523550ab15986eb32ff30718431dc6fcbbb6ae8e9d332ebb3f220beec diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml index ee004bec072c..ae5e541c57d8 100644 --- a/x11-misc/mozo/metadata.xml +++ b/x11-misc/mozo/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">mate-desktop/mozo</remote-id> </upstream> diff --git a/x11-misc/mozo/mozo-1.26.1.ebuild b/x11-misc/mozo/mozo-1.26.2.ebuild index 145332a6ed9f..29f50e52fa7b 100644 --- a/x11-misc/mozo/mozo-1.26.1.ebuild +++ b/x11-misc/mozo/mozo-1.26.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="xml(+)" inherit mate python-r1 @@ -19,8 +19,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-python/pygobject-3:3[${PYTHON_USEDEP}] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] - >=x11-libs/gtk+-3.22:3[introspection] - !!x11-misc/mate-menu-editor + >=x11-libs/gtk+-3.12:3[introspection] " RDEPEND="${COMMON_DEPEND} diff --git a/x11-misc/mozo/mozo-1.28.0.ebuild b/x11-misc/mozo/mozo-1.28.0.ebuild new file mode 100644 index 000000000000..6496e4d89d96 --- /dev/null +++ b/x11-misc/mozo/mozo-1.28.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" + +inherit mate python-r1 + +DESCRIPTION="Mozo menu editor for MATE" +LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+" + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +else + KEYWORDS="" +fi + +SLOT="0" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + >=dev-python/pygobject-3:3[${PYTHON_USEDEP}] + >=mate-base/mate-menus-1.21.0[introspection] + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/gtk+-3.12:3[introspection] +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl +" +DEPEND="${COMMON_DEPEND} + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_prepare() { + mate_src_prepare + python_copy_sources +} + +src_configure() { + python_foreach_impl run_in_build_dir mate_src_configure \ + --disable-icon-update +} + +src_compile() { + python_foreach_impl run_in_build_dir default +} + +src_test() { + python_foreach_impl run_in_build_dir emake check +} + +src_install() { + installing() { + mate_src_install + + # Massage shebang to make python_doscript happy + sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \ + -i mozo || die + + python_doscript mozo + python_optimize + } + + python_foreach_impl run_in_build_dir installing +} diff --git a/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild b/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild index 07a085adf15d..8915f623113a 100644 --- a/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild +++ b/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 gnome2-utils xdg-utils +inherit distutils-r1 gnome2-utils DESCRIPTION="A lightweight user-configuration application" HOMEPAGE="https://github.com/bluesabre/mugshot" diff --git a/x11-misc/mygestures/files/mygestures-2.0-gcc14.patch b/x11-misc/mygestures/files/mygestures-2.0-gcc14.patch new file mode 100644 index 000000000000..e2f228f80479 --- /dev/null +++ b/x11-misc/mygestures/files/mygestures-2.0-gcc14.patch @@ -0,0 +1,7 @@ +https://bugs.gentoo.org/923585 +--- a/src/configuration_parser.c ++++ b/src/configuration_parser.c +@@ -18,2 +18,3 @@ + ++#include <stdlib.h> + #include <string.h> diff --git a/x11-misc/mygestures/mygestures-2.0.ebuild b/x11-misc/mygestures/mygestures-2.0-r1.ebuild index 18b0d8fe375b..2a4e45a2e732 100644 --- a/x11-misc/mygestures/mygestures-2.0.ebuild +++ b/x11-misc/mygestures/mygestures-2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,11 @@ EAPI=8 inherit autotools DESCRIPTION="Mouse gestures for X" -HOMEPAGE="https://github.com/deters/mygestures" -SRC_URI="https://github.com/deters/mygestures/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/deters/mygestures/" +SRC_URI=" + https://github.com/deters/mygestures/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz +" LICENSE="GPL-2+" SLOT="0" @@ -18,11 +21,19 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXi x11-libs/libXrender - x11-libs/libXtst" + x11-libs/libXtst +" DEPEND=" ${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0-gcc14.patch +) src_prepare() { default diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild index 7e28a746c191..4ab64e577887 100644 --- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild +++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" >=dev-libs/glib-2.28:2 diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild deleted file mode 100644 index 6a1096cc8f5b..000000000000 --- a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2-utils savedconfig - -DESCRIPTION="Canonical's on-screen-display notification agent" -HOMEPAGE="https://launchpad.net/notify-osd" -SRC_URI="https://launchpad.net/${PN}/precise/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="minimal" - -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.98 - >=dev-libs/glib-2.16:2 - >=x11-libs/gtk+-3.2:3 - >=x11-libs/libnotify-0.7 - >=x11-libs/libwnck-3:3 - x11-libs/libX11 - x11-libs/pixman - !x11-misc/notification-daemon - !x11-misc/qtnotifydaemon -" -RDEPEND="${COMMON_DEPEND} - gnome-base/gsettings-desktop-schemas - !minimal? ( x11-themes/notify-osd-icons ) -" -DEPEND="${COMMON_DEPEND} - dev-util/glib-utils - gnome-base/gnome-common - x11-base/xorg-proto - virtual/pkgconfig -" - -RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules - -src_prepare() { - default - sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die - restore_config src/{bubble,defaults,dnd}.c #428134 - mv configure.in configure.ac || die - eautoreconf -} - -src_configure() { - econf --libexecdir="/usr/$(get_libdir)/${PN}" -} - -src_install() { - default - save_config src/{bubble,defaults,dnd}.c - rm -f "${ED}"/usr/share/${PN}/icons/*/*/*/README -} - -pkg_preinst() { - gnome2_icon_savelist - gnome2_schemas_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_icon_cache_update - gnome2_schemas_update -} diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest index 1f6656be0990..578ebc2bfcea 100644 --- a/x11-misc/obconf-qt/Manifest +++ b/x11-misc/obconf-qt/Manifest @@ -1 +1,3 @@ DIST obconf-qt-0.16.2.tar.xz 111080 BLAKE2B 1ea6d4f5afb3e34db288bb1cfeb0c76345704b592230ebbaaff464206b13b9dfde7ff0ae07dd164e1d925e93e51a9a9bd6c571f55b81f3bbfc1537bfa620f521 SHA512 bd91a5669f07471966d296b91d78e2a40e2e3640405de2179513457088eb7d6cb063dbfaff623db6f404985734e986b52c1e3155a050f374b7afa58f7d720c0d +DIST obconf-qt-0.16.3.tar.xz 116488 BLAKE2B 9c710ee521e014ece480ffe9b5d7f13d9ce6fc8fe164003ec8512261a884fa3e00da4720813a19c0f6bc8879c91e869d47117630b5994fabeecb7ab28888c51c SHA512 617b0b1e7ddd6efaf8f3d771fbddd88ede5fe3daf6a5c5233cffdb2cf44ecc27731c4860f38e156c49953a369f07c93db0a88c48dae83f526461da34066f6c84 +DIST obconf-qt-0.16.4.tar.xz 118780 BLAKE2B 5f8ffc2eddbd2c9fc7c019716256c5ae27c7d5ed3ffa1d221ca876d323f4833845908f2180895985ad94fcfe1596e773a3dfbdd7076350e7bc7bc00766040587 SHA512 4f75a5275e14cd7e8f0abc1bfcd40b4d860d613bc37c06c0e68d6f622ed126dce2fea98b5dd8e629b5de472ab5e668a5b0af7f6621d09fcb0b2287a11b0fb662 diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.3.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.3.ebuild new file mode 100644 index 000000000000..7c66c3dd88fd --- /dev/null +++ b/x11-misc/obconf-qt/obconf-qt-0.16.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI Openbox Configuration Tool" +HOMEPAGE="https://lxqt.github.io/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + 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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2 GPL-2+" +SLOT="0" + +BDEPEND=" + dev-qt/linguist-tools:5 + >=dev-util/lxqt-build-tools-0.8.0 + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-wm/openbox:3 +" +DEPEND="${RDEPEND}" + +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/obconf-qt/obconf-qt-0.16.4.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.4.ebuild new file mode 100644 index 000000000000..582c6577d826 --- /dev/null +++ b/x11-misc/obconf-qt/obconf-qt-0.16.4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI Openbox Configuration Tool" +HOMEPAGE="https://lxqt.github.io/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + 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 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +LICENSE="GPL-2 GPL-2+" +SLOT="0" + +BDEPEND=" + dev-qt/linguist-tools:5 + >=dev-util/lxqt-build-tools-0.8.0 + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-wm/openbox:3 +" +DEPEND="${RDEPEND}" + +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/obconf/files/obconf-2.0.4_p20150213-clang16.patch b/x11-misc/obconf/files/obconf-2.0.4_p20150213-clang16.patch index 4775005da274..943c812e9b79 100644 --- a/x11-misc/obconf/files/obconf-2.0.4_p20150213-clang16.patch +++ b/x11-misc/obconf/files/obconf-2.0.4_p20150213-clang16.patch @@ -1,3 +1,4 @@ +https://bugzilla.icculus.org/show_bug.cgi?id=6671 https://bugs.gentoo.org/870538 --- a/src/appearance.c +++ b/src/appearance.c diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest index 2a41e3de2f3f..a5a79ee63853 100644 --- a/x11-misc/obmenu-generator/Manifest +++ b/x11-misc/obmenu-generator/Manifest @@ -1 +1 @@ -DIST obmenu-generator-0.91.tar.gz 20648 BLAKE2B 669508f51a5ee84d2e68c7568f6eefc33c8a5984c702a54f4f9d057021c03da92bb3c8e29efa5448e71175552618affda9d07e6755b9bc814d604ab8a36be450 SHA512 9829b8cac6464eabec197d9c9c51beefad3619d42e602181d6873ddd1ed1c848a8eeed6ca6495c332fe97e82a55a05e34c42cc3a95b4ff22c9481470a9ea6ef5 +DIST obmenu-generator-0.93.tar.gz 20893 BLAKE2B 19fca5960ab423c9df145d3f8f7fc47a07bdfa0302d62d6565d3218296da0f24a93476e73e21413430ec4842bae64432aabbff930968d13c1ebc2f95da389ab1 SHA512 f63b7b2be80703ad3fbb1d8a6a35b74c3747035ecb19bcfb3b07a109e20a51b2d2576dbc71828e00854c331906d6d7c6e18049aa547e802bdc983a134c357515 diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.93.ebuild index b2b926f8c687..1c13fd072ed2 100644 --- a/x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild +++ b/x11-misc/obmenu-generator/obmenu-generator-0.93.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/x11-misc/oroborus-deskmenu/files/oroborus-deskmenu-1.4.5-Wimplicit-function-declaration.patch b/x11-misc/oroborus-deskmenu/files/oroborus-deskmenu-1.4.5-Wimplicit-function-declaration.patch new file mode 100644 index 000000000000..80e83a3a9c88 --- /dev/null +++ b/x11-misc/oroborus-deskmenu/files/oroborus-deskmenu-1.4.5-Wimplicit-function-declaration.patch @@ -0,0 +1,12 @@ +--- a/src/deskmenu.c ++++ b/src/deskmenu.c +@@ -146,6 +146,9 @@ + return value; + } + ++int ++decode_switches (int argc, char **argv); ++ + void + initialize (int argc, char *argv[]) + { diff --git a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild deleted file mode 100644 index 69756f240669..000000000000 --- a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN=${PN/oroborus-//} - -DESCRIPTION="root menu program for Oroborus" -HOMEPAGE="https://www.oroborus.org" -SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_PN}_${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="=x11-libs/gtk+-2* - !x11-wm/oroborus-extras" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_PN}-${PV} - -DOCS=( AUTHORS ChangeLog NEWS README TODO example_rc ) diff --git a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r2.ebuild b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r2.ebuild new file mode 100644 index 000000000000..ff4450b199aa --- /dev/null +++ b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN="${PN/oroborus-//}" + +DESCRIPTION="root menu program for Oroborus" +HOMEPAGE="https://www.oroborus.org" +SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_PN}_${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="x11-libs/gtk+:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # bug 875131 + "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch +) + +src_prepare() { + default + eautoreconf # bug 898252 +} + +src_install() { + default + dodoc example_rc +} diff --git a/x11-misc/oroborus-keylaunch/files/oroborus-keylaunch-1.3.9-makefile.patch b/x11-misc/oroborus-keylaunch/files/oroborus-keylaunch-1.3.9-makefile.patch new file mode 100644 index 000000000000..523fd85aa0eb --- /dev/null +++ b/x11-misc/oroborus-keylaunch/files/oroborus-keylaunch-1.3.9-makefile.patch @@ -0,0 +1,44 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -14,7 +14,7 @@ + DOC_DIR = $(INSTDIR)/share/doc/$(PROG) + + +-VERBOSE = ++VERBOSE = 1 + ifeq ($(VERBOSE), 1) + Q = + else +@@ -22,7 +22,8 @@ + endif + + CC = @CC@ +-CFLAGS = @CFLAGS@ @X_CFLAGS@ -g -O2 -Wall ++CFLAGS = @CFLAGS@ @X_CFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + LIBS = @LIBS@ @X_LIBS@ + LDFLAGS = @LDFLAGS@ + RCFILE = .$(PROG)rc +@@ -55,11 +56,11 @@ + + $(PROG): $(OBJS) + @echo "[ linking $< ]" +- $Q$(CC) $< $(LDFLAGS) $(LIBS) -o $@ ++ $Q$(CC) $(LDFLAGS) $(CFLAGS) $< -o $@ $(LIBS) + + $(OBJS): %.o: %.c $(HEADERS) + @echo "[ compiling $< ]" +- $Q$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ ++ $Q$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o $@ + + install-mans: + @echo "[ installing manpages. (section 1) ]" +@@ -71,7 +72,7 @@ + $Q$(INSTALL) $(INST_CREATEDIR) $(DOC_DIR) + $Q$(INSTALL) $(INST_DOC_OPTS) $(DOCS) $(DOC_DIR) + +-install: all install-mans install-docs ++install: all install-mans + @echo "[ installing $(PROG) ]" + $Q$(INSTALL) $(INST_PROG_OPTS) $(PROG) $(BIN_DIR)/$(PROG) + diff --git a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r2.ebuild index aade3f2ad749..e3907005102c 100644 --- a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild +++ b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r2.ebuild @@ -1,34 +1,29 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +WANT_AUTOMAKE=none +inherit autotools MY_PN=${PN/oroborus-//} DESCRIPTION="utility for binding keys in Oroborus" HOMEPAGE="https://www.oroborus.org" SRC_URI="mirror://debian/pool/main/k/${MY_PN}/${MY_PN}_${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="x11-libs/libX11 - !x11-wm/oroborus-extras" -RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_PN}-${PV} +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) DOCS=( README docs/example_rc debian/changelog ) src_prepare() { default - sed -e "s: -g -O2 -Wall::" \ - -e "/^install:/s/install-docs//" \ - -i Makefile.in || die -} - -src_compile() { - emake VERBOSE=1 + eautoconf # bug 898254 } diff --git a/x11-misc/parcellite/parcellite-1.2.1.ebuild b/x11-misc/parcellite/parcellite-1.2.1.ebuild index d9bab58ad41d..76814799fc7f 100644 --- a/x11-misc/parcellite/parcellite-1.2.1.ebuild +++ b/x11-misc/parcellite/parcellite-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,12 +7,12 @@ inherit autotools xdg MY_P=${PN}-${PV/_} -DESCRIPTION="A lightweight GTK+ based clipboard manager" -HOMEPAGE="http://parcellite.sourceforge.net/" +DESCRIPTION="Lightweight GTK+ based clipboard manager" +HOMEPAGE="https://parcellite.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="nls" diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest index 6a1ee3deb049..5fc3bb6d3ea8 100644 --- a/x11-misc/pcmanfm-qt/Manifest +++ b/x11-misc/pcmanfm-qt/Manifest @@ -1,2 +1,3 @@ -DIST pcmanfm-qt-1.1.0.tar.xz 331652 BLAKE2B 055660b841feb1cced2ec8c67493e0db9656825c4925e5699c27904ed1c7c6483bc1fbba98838c39a2e55fb4b8cb0a67bb2e8eee58fab6224448ad9300dad0b6 SHA512 b453b56bd10a94b6c4cbf6e999a470208c7817384f3868ef230a65d39ff3b1e2b2e6db8c08ca894c4e226288efd38dbdddeb1294fa4f8507836cf84594b956ef -DIST pcmanfm-qt-1.2.0.tar.xz 352536 BLAKE2B 4da72028fc22c9cc5711a2c5f4b7f92bdccc0f2006fb501b5111144df7441473ffe2719d161335b7b7d72f8a7fd3b545a73267a3a1b5b9716333c03c2e67241f SHA512 30e4d606a1eb5f3f64f0f6a3c3e855cca62a012f6e18e76a9f5738f304d2934fb0607fa579fa7ddf00ee863b8cd85f03bdb6e10eeb8bc61f5d50081ccc1db32b +DIST pcmanfm-qt-1.3.0.tar.xz 358932 BLAKE2B e3f9104758ea0a1b4d20c400010d13a79b0d9f8071978a8a0ae17b5b8c85931217cae84f3cdaf01cbeefbfb44ee0f7a66f5f9f14f8a83fb33611ea74a8a65e07 SHA512 c656b89258b8156863057a6f99932174f6f2f4d85ffae85b18ff3f0e3c199624aff29866df3b5f78e826918321cc3298bfe492119e6e01aaf5495cc9500ea3e3 +DIST pcmanfm-qt-1.4.0.tar.xz 377652 BLAKE2B 50d0c01cbc7557989196251fce7a9b43296fcfc33dc437afc4a9b9799818797659c849174937a042023bea8fe8aa2ffc825a24a35a1125760697884d052c16e2 SHA512 dbc24092b5ea7f13d484caf4cbefd2267f65db4c5d3b43cecf46114d149f91e58e977bed9fa3dc128e54e0b2bcb1043b8a234d16a7a211a94ae5f123e73ff117 +DIST pcmanfm-qt-1.4.1.tar.xz 390960 BLAKE2B 8a7e8dae9faefd77284a03526304e90f94fc0a4993f78a615e07cf466d12a10e0361e41f80275d7a5537702ca9b648ce8834917a4025c1d0d08453ed303179d4 SHA512 3c0186ba2defe3ce440345bfe17635613e9fa2a511dc8309810799cbac931266ea9a42a9a3ebed7bd7bb2f7ec4383dc7d1526b7c689424c5aefcc295bfa2845d diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.2.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.3.0.ebuild index 2911b656b08b..93d96dca9935 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.2.0.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.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 @@ -23,7 +23,7 @@ SLOT="0" BDEPEND=" >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.12.0 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" dev-libs/glib:2 diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.0.ebuild index 7b2b1951b854..4a1afc34ba63 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.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 @@ -23,7 +23,7 @@ SLOT="0" BDEPEND=" >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.11.0 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" dev-libs/glib:2 @@ -39,7 +39,7 @@ DEPEND=" x11-misc/xdg-utils " RDEPEND="${DEPEND} - >=lxde-base/lxmenu-data-0.1.5 + =lxqt-base/lxqt-menu-data-${MY_PV}* " pkg_postinst() { diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.1-r1.ebuild new file mode 100644 index 000000000000..40ec293d1661 --- /dev/null +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake optfeature xdg-utils + +DESCRIPTION="Qt GUI Tabbed Filemanager" +HOMEPAGE="https://lxqt-project.org/" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + 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 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2 GPL-2+ LGPL-2.1+" +SLOT="0" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 +" +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + sys-apps/util-linux + virtual/freedesktop-icon-theme + =x11-libs/libfm-qt-${MY_PV}*:= + x11-libs/libxcb:= + x11-misc/xdg-utils +" +RDEPEND="${DEPEND} + =lxqt-base/lxqt-menu-data-${MY_PV}* +" + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + + optfeature "mount password storing" gnome-base/gnome-keyring + ! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/pcmanfm/metadata.xml b/x11-misc/pcmanfm/metadata.xml index de50b1cbd61f..c568a312ad63 100644 --- a/x11-misc/pcmanfm/metadata.xml +++ b/x11-misc/pcmanfm/metadata.xml @@ -4,5 +4,6 @@ <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">pcmanfm</remote-id> + <remote-id type="github">lxde/pcmanfm</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild index bdf7b0c31bc6..2e4e7970e73a 100644 --- a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild +++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ MY_P="${PN}-${PV/_/}" inherit xdg readme.gentoo-r1 DESCRIPTION="Fast lightweight tabbed filemanager" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" +HOMEPAGE="https://github.com/lxde/pcmanfm" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" S="${WORKDIR}"/${MY_P} diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild index 34b24b34d3ce..a11494b24660 100644 --- a/x11-misc/peksystray/peksystray-0.4.0.ebuild +++ b/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools -DESCRIPTION="A system tray dockapp for window managers supporting docking" -HOMEPAGE="http://peksystray.sourceforge.net/" +DESCRIPTION="System tray dockapp for window managers supporting docking" +HOMEPAGE="https://peksystray.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ppc x86" -IUSE="" DEPEND="x11-libs/libX11 x11-libs/libXt" diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest index 28a2e222497e..2b746ee310bf 100644 --- a/x11-misc/picom/Manifest +++ b/x11-misc/picom/Manifest @@ -1,3 +1,3 @@ -DIST picom-10.1.tar.gz 286934 BLAKE2B 0a6637c5615cfed514b746d85c2627b398fb0dd45b1027967b5145e1309e9ec4f2ac2e77a1459c06cb1db70fa3b12c350f42c6a0299ae7e4acc41270ca88dbbd SHA512 6c97f0f0665be5cd38f844d0902cc7cac7f97af578f9df585aaa43b5f7b0a20c3660a2fcb44b1af5ae87407f4a0691c976ab1e6ad09939f385c3bcb8c0d4a351 DIST picom-10.2.tar.gz 287166 BLAKE2B feaa07fc5f0a53396675dfd4d8f2507caf6ce355b2db242b25b3559b287845b0505c48194e51c9c7fc6809dd10b871be6adf3e9fc87d91a41f01ccfeb87803ab SHA512 9c0351fbe8a9e76533243c8e76f8e7d10c1e49292f1c8e6c06f31fb0b512542a67970abe803d061c953546ff8d3e704488c263002a5a831f68deb010caee481d -DIST picom-9.1.tar.gz 263924 BLAKE2B 093f2fe12f3388b7979379d2e2b695a779cc9ebf95cbfa5b4f39c4fcc7cd6fc82be662bb9b0355fbadca66c0b0d7ac0d1e463272b0dbe4bbcca985691b6255e9 SHA512 375dc245be1c0f277bc0ddfc6e6480255efba06ce49f953c5314b7ba9795d1f50c5de907762208becc13c5210f24ac5b2241e2eb5e0e10dc5e5b96081cc821df +DIST picom-11.1.tar.gz 308617 BLAKE2B cb100ec8d7ae9a9b43d59fb6d8eaf7079f1a1ea8da6eddea4bfc67f0180d2d43da30bb63049d685da71d424cb9bc091216331d3f54678da6c6379ed4de2e6347 SHA512 94c3a17a51f4749453d7d6334f8041bd1ee9f676f94f93c9368f02783ac86650031421c3d2fdd05d177c4c8535a76a6aff2c8e3cae4ae99bff7c458bd921b536 +DIST picom-11.2.tar.gz 308679 BLAKE2B d592dce3e67bc3df68cbece00cd4446ea6214b994d9ceffdd3d43a983e4a520f7a92c9c09bec12f49f18b4e581a4122c363f8de0c156bfe2e99fa09b04ec2196 SHA512 df8fc1a593e108b37be185129ac1f3a23c2ae648a04352c45b9d5888838e5754c68f2eb684f12f1ed4d973eca0aef83a61789f028c63bc2d0f0f38902232aadc diff --git a/x11-misc/picom/picom-10.2.ebuild b/x11-misc/picom/picom-10.2.ebuild index 096c4965a203..5500bc0c290b 100644 --- a/x11-misc/picom/picom-10.2.ebuild +++ b/x11-misc/picom/picom-10.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" IUSE="+config-file dbus +doc +drm opengl pcre test" REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!" diff --git a/x11-misc/picom/picom-10.1.ebuild b/x11-misc/picom/picom-11.1.ebuild index 096c4965a203..e122ab5870bb 100644 --- a/x11-misc/picom/picom-10.1.ebuild +++ b/x11-misc/picom/picom-11.1.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_{9..12} ) inherit meson python-any-r1 virtualx xdg DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" @@ -24,6 +24,7 @@ RDEPEND="dev-libs/libev x11-libs/libxcb x11-libs/libXext x11-libs/pixman + x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( @@ -32,8 +33,7 @@ RDEPEND="dev-libs/libev dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre ) - !x11-misc/compton" + pcre? ( dev-libs/libpcre2:= )" DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig diff --git a/x11-misc/picom/picom-9.1.ebuild b/x11-misc/picom/picom-11.2.ebuild index 540e2e03889d..05fd95b68772 100644 --- a/x11-misc/picom/picom-9.1.ebuild +++ b/x11-misc/picom/picom-11.2.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..10} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit meson python-any-r1 virtualx xdg DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0 MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="+config-file dbus +doc +drm opengl pcre test" REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!" @@ -24,6 +24,7 @@ RDEPEND="dev-libs/libev x11-libs/libxcb x11-libs/libXext x11-libs/pixman + x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( @@ -31,9 +32,11 @@ RDEPEND="dev-libs/libev ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) - opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre ) - !x11-misc/compton" + opengl? ( + media-libs/libepoxy + virtual/opengl + ) + pcre? ( dev-libs/libpcre2:= )" DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild index e1b85646fdb2..a5dd11d9c8ba 100644 --- a/x11-misc/picom/picom-9999.ebuild +++ b/x11-misc/picom/picom-9999.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_{9..12} ) inherit git-r3 meson python-any-r1 virtualx xdg DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" @@ -23,6 +23,7 @@ RDEPEND="dev-libs/libev x11-libs/libxcb x11-libs/libXext x11-libs/pixman + x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( @@ -30,9 +31,11 @@ RDEPEND="dev-libs/libev ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) - opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre2:= ) - !x11-misc/compton" + opengl? ( + media-libs/libepoxy + virtual/opengl + ) + pcre? ( dev-libs/libpcre2:= )" DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig diff --git a/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff b/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff new file mode 100644 index 000000000000..b32832f10e10 --- /dev/null +++ b/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff @@ -0,0 +1,108 @@ +# Fix build with clang 16. There were two main issues: +# 1. Usage of regiter keyword, which has been removed since C++17 +# 2. Non-constant-expression cannot be narrowed +# This patch fixes both the issues. +# Bug: https://bugs.gentoo.org/898888 +--- a/src/Blender.cpp ++++ b/src/Blender.cpp +@@ -147,20 +147,20 @@ void Blender::blendInto32Bit(Details &details) { + a >>= 24; + mod = alphaMax / static_cast<double>(a); + +- register int d = (*dest) & 0xff; +- register int blue = (*src) & 0xff; ++ int d = (*dest) & 0xff; ++ int blue = (*src) & 0xff; + blue -= d; + blue /= mod; + blue += d; + + d = (*dest>>8) & 0xff; +- register int green = (*src >> 8) & 0xff; ++ int green = (*src >> 8) & 0xff; + green -= d; + green /= mod; + green += d; + + d = (*dest >> 16) & 0xff; +- register int red = (*src >> 16) & 0xff; ++ int red = (*src >> 16) & 0xff; + red -= d; + red /= mod; + red += d; +@@ -282,9 +282,9 @@ void Blender::blendInto16Bit(Details &details) { + src += 4; + dest += 2; + } else if (a == 0xff && !useGlobalAlpha) { +- register int blue = *(src++); +- register int green = *(src++); +- register int red = *(src++); ++ int blue = *(src++); ++ int green = *(src++); ++ int red = *(src++); + + *(reinterpret_cast<uint16_t *>(dest)) = + static_cast<uint16_t>((blue & 0xf8) >> 3) | +@@ -297,21 +297,21 @@ void Blender::blendInto16Bit(Details &details) { + mod = alphaMax/static_cast<double>(a); + + uint16_t pixel = *(reinterpret_cast<uint16_t *>(dest)); +- register int db = (pixel << 3) & 0xf8; +- register int dg = (pixel >> 3) & 0xf8; +- register int dr = (pixel >> 8) & 0xf8; ++ int db = (pixel << 3) & 0xf8; ++ int dg = (pixel >> 3) & 0xf8; ++ int dr = (pixel >> 8) & 0xf8; + +- register int blue = *src++; ++ int blue = *src++; + blue -= db; + blue /= mod; + blue += db; + +- register int green = *src++; ++ int green = *src++; + green -= dg; + green /= mod; + green += dg; + +- register int red = *src++; ++ int red = *src++; + red -= dr; + red /= mod; + red += dr; +--- a/src/Cartouche.cpp ++++ b/src/Cartouche.cpp +@@ -110,7 +110,7 @@ void Cartouche::drawRoundedRectangle( + bottom - radius - 1, + right - radius - 1, + getBytesPerLine(), +- color, ++ static_cast<int>( color ), + getData() + top * getBytesPerLine() + }; + +--- a/src/Settings.cpp ++++ b/src/Settings.cpp +@@ -614,7 +614,7 @@ void Settings::load(Display *d) { + !((*ki).modifier & (*mi))) { + Trigger trigger = { + (*ki).modifier | (*mi), +- (*ki).keySym, ++ static_cast<unsigned int>( (*ki).keySym ), + (*ki).menuName, + (*ki).eventMask + }; +--- a/src/WildcardCompare.cpp ++++ b/src/WildcardCompare.cpp +@@ -91,8 +91,8 @@ const bool WildcardCompare::match( + return false; + } + } else { +- register unsigned char p = *pattern; +- register unsigned char l = *literal; ++ unsigned char p = *pattern; ++ unsigned char l = *literal; + + if (p > 64 && p < 91) { + p += 32; diff --git a/x11-misc/piedock/piedock-1.6.9.ebuild b/x11-misc/piedock/piedock-1.6.9-r1.ebuild index cd38c36006d0..f458b11594b0 100644 --- a/x11-misc/piedock/piedock-1.6.9.ebuild +++ b/x11-misc/piedock/piedock-1.6.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ RDEPEND=" x11-libs/libXmu x11-libs/libXrender gtk? ( - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0 dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.1-signals.patch "${FILESDIR}"/${PN}-1.6.9-freetype_pkgconfig.patch "${FILESDIR}"/${PN}-1.6.9-gcc12-time.patch + "${FILESDIR}"/${PN}-1.6.9-clang16-register-narrowing.diff ) src_prepare() { diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest index dbdf109b7eae..a0f2cfe13f4c 100644 --- a/x11-misc/polybar/Manifest +++ b/x11-misc/polybar/Manifest @@ -1 +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 diff --git a/x11-misc/polybar/polybar-3.6.3-r2.ebuild b/x11-misc/polybar/polybar-3.6.3-r3.ebuild index 6abbfc9d38c9..09507ab90029 100644 --- a/x11-misc/polybar/polybar-3.6.3-r2.ebuild +++ b/x11-misc/polybar/polybar-3.6.3-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 @@ -11,7 +11,7 @@ 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 x86" +KEYWORDS="amd64 ~riscv x86" LICENSE="MIT" SLOT="0" IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" @@ -35,11 +35,11 @@ DEPEND=" doc? ( dev-python/sphinx ) i3wm? ( dev-libs/jsoncpp:= - || ( x11-wm/i3 x11-wm/i3-gaps ) + x11-wm/i3 ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) " RDEPEND="${DEPEND}" diff --git a/x11-misc/polybar/polybar-3.7.1-r1.ebuild b/x11-misc/polybar/polybar-3.7.1-r1.ebuild new file mode 100644 index 000000000000..55a6164277bb --- /dev/null +++ b/x11-misc/polybar/polybar-3.7.1-r1.ebuild @@ -0,0 +1,63 @@ +# 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 + +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" +IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]') + 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 + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm + alsa? ( media-libs/alsa-lib ) + curl? ( net-misc/curl ) + doc? ( dev-python/sphinx ) + i3wm? ( + dev-libs/jsoncpp:= + x11-wm/i3 + ) + mpd? ( media-libs/libmpdclient ) + network? ( dev-libs/libnl:3 ) + pulseaudio? ( media-libs/libpulse ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_ALSA="$(usex alsa)" + -DENABLE_CURL="$(usex curl)" + -DBUILD_DOC="$(usex doc)" + -DENABLE_I3="$(usex i3wm)" + -DBUILD_POLYBAR_MSG="$(usex ipc)" + -DENABLE_MPD="$(usex mpd)" + -DENABLE_NETWORK="$(usex network)" + -DENABLE_PULSEAUDIO="$(usex pulseaudio)" + # Bug 767949 + -DENABLE_CCACHE="OFF" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc/" + ) + + cmake_src_configure +} diff --git a/x11-misc/prime-run/prime-run-1.0.ebuild b/x11-misc/prime-run/prime-run-1.0.ebuild index 087aea49cd30..7f1956bce524 100644 --- a/x11-misc/prime-run/prime-run-1.0.ebuild +++ b/x11-misc/prime-run/prime-run-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,10 +12,6 @@ LICENSE="GPL-1" SLOT="0" KEYWORDS="amd64" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - S="${WORKDIR}" src_install() { diff --git a/x11-misc/primus/primus-0.2-r3.ebuild b/x11-misc/primus/primus-0.2-r3.ebuild index b70260a99d7b..3a4c0197ea9a 100644 --- a/x11-misc/primus/primus-0.2-r3.ebuild +++ b/x11-misc/primus/primus-0.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/amonakov/${PN}.git" LICENSE="ISC" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" IUSE="+libglvnd" RDEPEND=" diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest index 79ae747c86e8..8905babc8b9c 100644 --- a/x11-misc/projecteur/Manifest +++ b/x11-misc/projecteur/Manifest @@ -1 +1 @@ -DIST projecteur-0.9.2.tar.gz 394033 BLAKE2B 576a16853cdb2ae4614b83946caf85636f364c268320bcd99cdd9312ac1e76fb663f2e6c7cede4202df581770b4640444283eb55747735ab1bbb125d5bb9c6c1 SHA512 75c7e30b9ef72b4c1fc5e1a8e42c1668ccf2698677c1617cea080c7f5db722098635098304a7557f93f1a14143f8f2f089e8aed9265d44b2cfcd82974363baac +DIST projecteur-0.10.tar.gz 464761 BLAKE2B 51488cd9f4380f3164ea8c186aeb2389917a1cfb7a5046fc90cc8e75ff5c33ecaa8224cf56c0dcfc0ba1c54741f5ae0d98ec1061318f439801a2b959832b0da4 SHA512 fae7bb6af1fe24ff5e2c98610a768ed93ed968fa8a78dee59fe2c0e7217880ad54e98b6bd0da4defd0297c959bc10e53c476d004c1847c50bc843816359b58a7 diff --git a/x11-misc/projecteur/files/projecteur-0.9.1-dont-compress-manpage.patch b/x11-misc/projecteur/files/projecteur-0.9.1-dont-compress-manpage.patch deleted file mode 100644 index e7c96648e0c7..000000000000 --- a/x11-misc/projecteur/files/projecteur-0.9.1-dont-compress-manpage.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -223,14 +223,7 @@ - - # Configure man page and gzip it. - configure_file("${TMPLDIR}/projecteur.1" "projecteur.1" @ONLY) --find_program(GZIP_EXECUTABLE gzip) --add_custom_command( -- OUTPUT ${OUTDIR}/projecteur.1.gz -- COMMAND ${GZIP_EXECUTABLE} -9f -n "${OUTDIR}/projecteur.1" -- WORKING_DIRECTORY ${OUTDIR} --) --add_custom_target(gzip-manpage ALL DEPENDS "${OUTDIR}/projecteur.1.gz") --install(FILES "${OUTDIR}/projecteur.1.gz" DESTINATION share/man/man1/) -+install(FILES "${OUTDIR}/projecteur.1" DESTINATION share/man/man1/) - - configure_file("${TMPLDIR}/projecteur.metainfo.xml" "projecteur.metainfo.xml" @ONLY) - install(FILES "${OUTDIR}/projecteur.metainfo.xml" DESTINATION share/metainfo/) -@@ -270,7 +263,7 @@ - # PREINST_SCRIPT "${OUTDIR}/pkg/scripts/preinst" - POSTINST_SCRIPT "${OUTDIR}/pkg/scripts/postinst" - ) -- add_dependencies(dist-package gzip-manpage projecteur) -+ add_dependencies(dist-package projecteur) - - # Additional files for debian packages, adhering to some debian rules, - # see https://manpages.debian.org/buster/lintian/lintian.1.en.html diff --git a/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch b/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch deleted file mode 100644 index 7c7ff0f4105b..000000000000 --- a/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 2e989dabcf853da5ab82ab67e3eca8619cb6669a Mon Sep 17 00:00:00 2001 -From: Jahn F <jahnf@users.noreply.github.com> -Date: Tue, 3 May 2022 09:02:05 +0200 -Subject: [PATCH] Add missing <array> include - ---- - src/device.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/device.h b/src/device.h -index 1c51585..1ce24fe 100644 ---- a/src/device.h -+++ b/src/device.h -@@ -7,6 +7,7 @@ - - #include "devicescan.h" - -+#include <array> - #include <memory> - #include <vector> - diff --git a/x11-misc/projecteur/projecteur-0.9.2.ebuild b/x11-misc/projecteur/projecteur-0.10.ebuild index 34852f249fa4..4d34d681c673 100644 --- a/x11-misc/projecteur/projecteur-0.9.2.ebuild +++ b/x11-misc/projecteur/projecteur-0.10.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 @@ -33,11 +33,6 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}/${PN}-0.9.1-dont-compress-manpage.patch" - "${FILESDIR}/${PN}-0.9.2-gcc12.patch" -) - src_prepare() { cmake_src_prepare @@ -45,6 +40,15 @@ src_prepare() { sed -e '/add_compile_options/d' -i CMakeLists.txt || die } +src_configure() { + local mycmakeargs=( + -DCOMPRESS_MAN_PAGE="OFF" + -DPROJECTEUR_QT_VERSION=5 + ) + + cmake_src_configure +} + pkg_postinst() { udev_reload xdg_icon_cache_update diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest index 0d5750b09aca..7db61c553a9d 100644 --- a/x11-misc/py3status/Manifest +++ b/x11-misc/py3status/Manifest @@ -1 +1 @@ -DIST py3status-3.48.tar.gz 420799 BLAKE2B 4676ca711a34649fd9abf449e5b9eccf43f70dfcf46569a5e68a9f03504fbc7276d64e4247ede002b2f77dde8603b13bab5c44de227078ef415773912cb5aae3 SHA512 7f1d6bd88f3b40b427564bbca638e0e173140bd92bc9b4f0c3e554abacc15945c550027330968f6c5875eb78d9856f4abbbf6356d15b5362ada9422acd7444d1 +DIST py3status-3.57.tar.gz 450564 BLAKE2B 136e8737ebf2fb0bfba91e767ba557656a0a09b57ae62da9a3196eb511016dae9967bdddfdbb24d1b6e17e6601fa091e7f5c7e8d73a091a9d6e05fea702479c3 SHA512 e91f78c3b081f4e98a91bc82d81088dfef0da7fe00ca3b1c90c5054aeda9f64e79c8c09e886e13ad514297cb0fc5cdf327e1b11f99f59f33a8a44ffb7ff469e0 diff --git a/x11-misc/py3status/py3status-3.48.ebuild b/x11-misc/py3status/py3status-3.57.ebuild index c149a1d0f3dc..306470adcb04 100644 --- a/x11-misc/py3status/py3status-3.48.ebuild +++ b/x11-misc/py3status/py3status-3.57.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=7 PYTHON_COMPAT=( python{3_9,3_10,3_11} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_USE_PEP517=hatchling SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -18,16 +18,16 @@ HOMEPAGE="https://github.com/ultrabug/py3status" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="minimal +udev" +IUSE="minimal +dbus +udev" # It feels useless to run tests on this simple package # since upstream (I) runs tox on CI RESTRICT="test" RDEPEND=" !minimal? ( x11-misc/i3status ) + dbus? ( >=dev-python/dbus-python-1.3.2[${PYTHON_USEDEP}] >=dev-python/pygobject-3.46.0[${PYTHON_USEDEP}] ) udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] ) " -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest index 382ce368003f..f4580a2b3282 100644 --- a/x11-misc/qps/Manifest +++ b/x11-misc/qps/Manifest @@ -1,2 +1,2 @@ -DIST qps-2.5.0.tar.xz 289796 BLAKE2B 9af9127d45eb3340177e7ed39242332d976f52c91de415da645baddd60583d010c4b7576efd0bf37f76459ce1487ec422601deb9f9baa2cfd6bb669baf7974d7 SHA512 58e8473eb9266a102e5df68025a2beb496a32e6c5cac54232242253abaede5adbf693a8b9f089693990687b53e20c1e23cc800b7928fe68e18f05e3b3d344dca -DIST qps-2.6.0.tar.xz 295320 BLAKE2B e6a917993b64ace2333fec11d2406a0d9770bd8f3287ba38c586b7debd2572c342ebfb6e5e8c42f71f7ae6b6135995ba21f597258948538da5721daa8cde69c4 SHA512 c405841b2a455daeaf57e86c90a85e2d1e7c9a012d29262cba2b25f4b26ef693ae902d7d97b82504124d1b4562341af9c782b06745903616f1d3b809979d569a +DIST qps-2.7.0.tar.xz 269192 BLAKE2B 90cb86f854d7c7df92ad206558741284a758b569ad117e9c4c0fcf063ec86539e9dc45e25e02449c63063b335056d01b5926ec760fde505b014ba3eb76c4ca2f SHA512 76285f37869f057fccd895eccf965547c11e49dd8315ef8ac4ea199734aae449be8e7782d41fb8582b0fa60715952857595d4bef7a3afcb47e83f31a168fd3c7 +DIST qps-2.8.0.tar.xz 450280 BLAKE2B 2cb5197ed9564f1b2c48cca734bfca70df9513c1e44fd46ffada374823275370afdaa43ca4a2c8572781ba255efd5b95a67ca0aad038eea2cea9acefd8fdd449 SHA512 1dc4e0018eec82a70f33604d3f5b58a20892f1d97bb0334596d9ca47bc9d4e51c5acbdc8f72289612ab12a9a180c04b87de5f91a2fc0872791f68d0e6a1a2129 diff --git a/x11-misc/qps/qps-2.6.0.ebuild b/x11-misc/qps/qps-2.7.0.ebuild index 7c995b4b42c9..1c66548a5258 100644 --- a/x11-misc/qps/qps-2.6.0.ebuild +++ b/x11-misc/qps/qps-2.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,13 +15,13 @@ KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" BDEPEND=" >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.12.0 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 - >=lxqt-base/liblxqt-1.2:= + >=lxqt-base/liblxqt-1.3:= " RDEPEND="${DEPEND}" diff --git a/x11-misc/qps/qps-2.5.0.ebuild b/x11-misc/qps/qps-2.8.0.ebuild index cddee09ea467..67bba6929681 100644 --- a/x11-misc/qps/qps-2.5.0.ebuild +++ b/x11-misc/qps/qps-2.8.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 @@ -11,17 +11,17 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" BDEPEND=" >=dev-qt/linguist-tools-5.15:5 - >=dev-util/lxqt-build-tools-0.11.0 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 >=dev-qt/qtwidgets-5.15:5 - >=lxqt-base/liblxqt-1.1:= + >=lxqt-base/liblxqt-1.4:= " RDEPEND="${DEPEND}" diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index 40866f5b141a..16af51180b67 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1 +1 @@ -DIST qt5ct-1.5.tar.bz2 81089 BLAKE2B 8bf02a6c53c68f30e0647ff7c40c9d80044cbf914ee13f9e7f13ad6424e5cf73b9460af70ea484d498bfb693e8f8b018f7e32cac6205ffa2dba05930c6d0610c SHA512 fc16c7849a89aa8ee9480162888294638bc01f83b89d86c978397e58f6da4360cf07b9f558635b8a5b13bd10d18f3ad49663fe8a76183da9ae55aac23230b1e5 +DIST qt5ct-1.8.tar.bz2 85945 BLAKE2B 0a882a076eb1013c4196e9067f7ed135b0f86c2850071de4945bb17053618a605ca412fbc1c7a87a6e00ee051f4fb5f0d31754490aa51abe472c72a6918088c9 SHA512 5417850fb2bad4faaed59c8af61bec04c1ee7fefe8495286571e257b2f68cd417d36439c66fcfac28bb735c753a4ca4cec327b74e97e5ce8c2d4e36b3e4fba28 diff --git a/x11-misc/qt5ct/qt5ct-1.5.ebuild b/x11-misc/qt5ct/qt5ct-1.8.ebuild index ee2fded801ce..8be1a39d4b3c 100644 --- a/x11-misc/qt5ct/qt5ct-1.5.ebuild +++ b/x11-misc/qt5ct/qt5ct-1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild index 31cb28351002..75e2178a1c6a 100644 --- a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild +++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~riscv ~sparc x86" +KEYWORDS="amd64 ~loong ppc ~riscv ~sparc x86" IUSE="vbe-mode" DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )" diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest index d091a9428eab..18f1b94c1740 100644 --- a/x11-misc/redshift/Manifest +++ b/x11-misc/redshift/Manifest @@ -1,2 +1 @@ -DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f DIST redshift-1.12.tar.xz 486072 BLAKE2B b7ce74ae134a8f6954ff978e99670f24c447b23ab5e8d69a62109806bfe38c5e1b41e5f65cd6b182298aaf3e0b9187a2c70ea3148fd4ccba8b9c17697024944d SHA512 225e222e5f2c55be4571094ccaf02a92e162dfc35fd0fe504084e21e358b888a72f9992f9f9edaf1d496eb673af74a0d825ae5cf6ef7f0f1ab51d32419722c32 diff --git a/x11-misc/redshift/metadata.xml b/x11-misc/redshift/metadata.xml index 04a06daab34e..d0fbd4448cd5 100644 --- a/x11-misc/redshift/metadata.xml +++ b/x11-misc/redshift/metadata.xml @@ -4,10 +4,6 @@ <maintainer type="person"> <email>sping@gentoo.org</email> </maintainer> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> <use> <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag> </use> diff --git a/x11-misc/redshift/redshift-1.12-r10.ebuild b/x11-misc/redshift/redshift-1.12-r10.ebuild index a63b6864529c..c0fecea4ac9d 100644 --- a/x11-misc/redshift/redshift-1.12-r10.ebuild +++ b/x11-misc/redshift/redshift-1.12-r10.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 @@ SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ppc64 ~riscv x86" IUSE="appindicator geoclue gtk nls" COMMON_DEPEND=">=x11-libs/libX11-1.4 diff --git a/x11-misc/redshift/redshift-1.12-r9.ebuild b/x11-misc/redshift/redshift-1.12-r11.ebuild index 76823b834014..b2b5c880cfe7 100644 --- a/x11-misc/redshift/redshift-1.12-r9.ebuild +++ b/x11-misc/redshift/redshift-1.12-r11.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit flag-o-matic systemd xdg-utils python-r1 +inherit autotools flag-o-matic systemd xdg-utils python-r1 DESCRIPTION="A screen color temperature adjusting software" HOMEPAGE="http://jonls.dk/redshift/" @@ -20,7 +20,7 @@ COMMON_DEPEND=">=x11-libs/libX11-1.4 x11-libs/libXxf86vm x11-libs/libxcb x11-libs/libdrm - appindicator? ( dev-libs/libappindicator:3[introspection] ) + appindicator? ( dev-libs/libayatana-appindicator ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( ${PYTHON_DEPS} )" RDEPEND="${COMMON_DEPEND} @@ -35,8 +35,19 @@ REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( "${FILESDIR}"/${P}-apparmor.patch + "${FILESDIR}"/${P}-libayatana-appindicator.patch ) +src_prepare() { + # we need to re-generate file py-compile with a version + # that supports Python >=3.12 to not fail with error: + # ModuleNotFoundError: No module named 'imp' + rm py-compile || die + eautoreconf + + eapply_user +} + src_configure() { use gtk && python_setup diff --git a/x11-misc/redshift/redshift-1.12-r6.ebuild b/x11-misc/redshift/redshift-1.12-r6.ebuild deleted file mode 100644 index de25b572c077..000000000000 --- a/x11-misc/redshift/redshift-1.12-r6.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit flag-o-matic systemd autotools xdg-utils python-r1 - -DESCRIPTION="A screen color temperature adjusting software" -HOMEPAGE="http://jonls.dk/redshift/" -SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="appindicator geoclue gtk nls" - -COMMON_DEPEND=">=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - x11-libs/libdrm - appindicator? ( dev-libs/libappindicator:3[introspection] ) - geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) - gtk? ( ${PYTHON_DEPS} )" -RDEPEND="${COMMON_DEPEND} - gtk? ( dev-python/pygobject[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - dev-python/pyxdg[${PYTHON_USEDEP}] )" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50 - nls? ( sys-devel/gettext ) -" -REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use gtk && python_setup - - # Fix compile for Clang (bug #732438) - append-cflags -fPIE - - econf \ - $(use_enable nls) \ - --enable-drm \ - --enable-randr \ - --enable-vidmode \ - --disable-wingdi \ - \ - --disable-corelocation \ - $(use_enable geoclue geoclue2) \ - \ - $(use_enable gtk gui) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - --enable-apparmor \ - --disable-quartz \ - --disable-ubuntu -} - -_impl_specific_src_install() { - emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \ - -C src/redshift-gtk install -} - -src_install() { - emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install - - if use gtk; then - python_foreach_impl _impl_specific_src_install - python_replicate_script "${D}"/usr/bin/redshift-gtk - dosym redshift-gtk /usr/bin/gtk-redshift - - python_foreach_impl python_optimize - - # https://bugs.gentoo.org/784281 - mv "${D}"/usr/share/{appdata,metainfo}/ || die - fi -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} diff --git a/x11-misc/redshift/redshift-1.12-r7.ebuild b/x11-misc/redshift/redshift-1.12-r7.ebuild deleted file mode 100644 index dd358b255f21..000000000000 --- a/x11-misc/redshift/redshift-1.12-r7.ebuild +++ /dev/null @@ -1,85 +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 flag-o-matic systemd xdg-utils python-r1 - -DESCRIPTION="A screen color temperature adjusting software" -HOMEPAGE="http://jonls.dk/redshift/" -SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="appindicator geoclue gtk nls" - -COMMON_DEPEND=">=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - x11-libs/libdrm - appindicator? ( dev-libs/libappindicator:3[introspection] ) - geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) - gtk? ( ${PYTHON_DEPS} )" -RDEPEND="${COMMON_DEPEND} - gtk? ( dev-python/pygobject[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - dev-python/pyxdg[${PYTHON_USEDEP}] )" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50 - nls? ( sys-devel/gettext ) -" -REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )" - -src_configure() { - use gtk && python_setup - - # Fix compile for Clang (bug #732438) - append-cflags -fPIE - - econf \ - $(use_enable nls) \ - --enable-drm \ - --enable-randr \ - --enable-vidmode \ - --disable-wingdi \ - \ - --disable-corelocation \ - $(use_enable geoclue geoclue2) \ - \ - $(use_enable gtk gui) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - --enable-apparmor \ - --disable-quartz \ - --disable-ubuntu -} - -_impl_specific_src_install() { - emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \ - -C src/redshift-gtk install -} - -src_install() { - emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install - - if use gtk; then - python_foreach_impl _impl_specific_src_install - python_replicate_script "${D}"/usr/bin/redshift-gtk - dosym redshift-gtk /usr/bin/gtk-redshift - - python_foreach_impl python_optimize - - # https://bugs.gentoo.org/784281 - mv "${D}"/usr/share/{appdata,metainfo}/ || die - fi -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} diff --git a/x11-misc/redshift/redshift-1.12-r8.ebuild b/x11-misc/redshift/redshift-1.12-r8.ebuild deleted file mode 100644 index 9bed05ef1b74..000000000000 --- a/x11-misc/redshift/redshift-1.12-r8.ebuild +++ /dev/null @@ -1,87 +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 flag-o-matic systemd xdg-utils python-r1 - -DESCRIPTION="A screen color temperature adjusting software" -HOMEPAGE="http://jonls.dk/redshift/" -SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="appindicator geoclue gtk nls" - -COMMON_DEPEND=">=x11-libs/libX11-1.4 - x11-libs/libXxf86vm - x11-libs/libxcb - x11-libs/libdrm - appindicator? ( dev-libs/libappindicator:3[introspection] ) - geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) - gtk? ( ${PYTHON_DEPS} )" -RDEPEND="${COMMON_DEPEND} - gtk? ( dev-python/pygobject[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - dev-python/pyxdg[${PYTHON_USEDEP}] )" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50 - nls? ( sys-devel/gettext ) -" -REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )" - -src_configure() { - use gtk && python_setup - - # Fix compile for Clang (bug #732438) - append-cflags -fPIE - - econf \ - $(use_enable nls) \ - --enable-drm \ - --enable-randr \ - --enable-vidmode \ - --disable-wingdi \ - \ - --disable-corelocation \ - $(use_enable geoclue geoclue2) \ - \ - $(use_enable gtk gui) \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - --enable-apparmor \ - --disable-quartz \ - --disable-ubuntu -} - -_impl_specific_src_install() { - emake DESTDIR="${D}" \ - PYTHON="${PYTHON}" \ - pythondir="$(python_get_sitedir)" \ - -C src/redshift-gtk install -} - -src_install() { - emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install - - if use gtk; then - python_foreach_impl _impl_specific_src_install - python_replicate_script "${D}"/usr/bin/redshift-gtk - dosym redshift-gtk /usr/bin/gtk-redshift - - python_foreach_impl python_optimize - - # https://bugs.gentoo.org/784281 - mv "${D}"/usr/share/{appdata,metainfo}/ || die - fi -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest index af896a75ee4b..a6a9bf90f24b 100644 --- a/x11-misc/rendercheck/Manifest +++ b/x11-misc/rendercheck/Manifest @@ -1 +1 @@ -DIST rendercheck-1.5.tar.bz2 143656 BLAKE2B 50de34193aeb4751f967fbc04b54e75909672dc7bbac29a1fbf6ac0e648ac032c877bc215586feb44c89cb7625fc2ac2317d03ff30dcab83625290d85aad6cda SHA512 ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616 +DIST rendercheck-1.6.tar.xz 23996 BLAKE2B 981095f88d70320ba22b15ceeb33182c88fb5c4ca1df323e016a6750812dc7b0154e95c76619926bfe945a80243de5ea0921e04d94b70992b8be512d70a437d3 SHA512 0cc5372a318d4a28d63d82a2efc42f15b810186ce91b226bc5b962520637b628b1ae991a9e7745f8239c4fd100bf8f8eab79bc3803a01cad6827022af49be1a3 diff --git a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild b/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild deleted file mode 100644 index 2b27b2a2f34d..000000000000 --- a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Tests for compliance with X RENDER extension" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/test/rendercheck" -SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86" -IUSE="" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - x11-libs/libXrender - x11-libs/libX11 -" -DEPEND="${RDEPEND}" - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} diff --git a/x11-misc/rendercheck/rendercheck-1.6.ebuild b/x11-misc/rendercheck/rendercheck-1.6.ebuild new file mode 100644 index 000000000000..15635c0581c1 --- /dev/null +++ b/x11-misc/rendercheck/rendercheck-1.6.ebuild @@ -0,0 +1,32 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MODULE=test/ +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" +fi + +DESCRIPTION="Tests for compliance with X RENDER extension" +HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/test/rendercheck" +LICENSE="MIT GPL-2+" + +RDEPEND=" + x11-libs/libXrender + x11-libs/libXext + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +# Override xorg-3's src_prepare +src_prepare() { + default +} diff --git a/x11-misc/rendercheck/rendercheck-9999.ebuild b/x11-misc/rendercheck/rendercheck-9999.ebuild new file mode 100644 index 000000000000..89bb8e72ef8d --- /dev/null +++ b/x11-misc/rendercheck/rendercheck-9999.ebuild @@ -0,0 +1,32 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MODULE=test/ +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" +fi + +DESCRIPTION="Tests for compliance with X RENDER extension" +HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/test/rendercheck" +LICENSE="MIT GPL-2+" + +RDEPEND=" + x11-libs/libXrender + x11-libs/libXext + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +# Override xorg-3's src_prepare +src_prepare() { + default +} diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest index 62230acdf449..26dedb4a157d 100644 --- a/x11-misc/revelation/Manifest +++ b/x11-misc/revelation/Manifest @@ -1,2 +1 @@ -DIST revelation-0.5.4.tar.xz 282600 BLAKE2B 519b01252b82acf0e927a9d19783792f83822cc1f1a4c3be4af3678d5446f8012d993e12397f44aae616aca88257970de7391a1269e24cc1ebc08275d0c962ed SHA512 bd536f6c03e443d91a20606765b661dc54f3e4c1f45d060d3829a894a31e553a61785bb31d7508267abd66e057fc1d93f1716ed1b553566d92a2580ad696606f DIST revelation-0.5.5.tar.xz 282252 BLAKE2B 7c4c430d24d79b820139dd2b4989dc2d78c967b16c864149d2aafa9e91ddc26a3351f42b5782812202f77a36529c46d9515cc1aea73346c7e8e017079b810a7d SHA512 17bfeda87e27c00f12bc068446d053cee394282e5eabea6d075ac262b5f400f31520d2f9b29f99097d1d6ad72bbcf5d2d9d4da2a0eba2806ff0adbf1bb47bb0f diff --git a/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch b/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch deleted file mode 100644 index 4a224fc529d1..000000000000 --- a/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://github.com/mikelolasagasti/revelation/issues/87 ---- a/data/meson.build -+++ b/data/meson.build -@@ -59,7 +59,6 @@ rvl_appstreamdir = join_paths(rvl_datadir, 'metainfo') - - # Merge the translations with the appdata file - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: join_paths(meson.source_root(), 'po'), diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml index 3b67b534c310..f2900a6d8676 100644 --- a/x11-misc/revelation/metadata.xml +++ b/x11-misc/revelation/metadata.xml @@ -9,4 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">mikelolasagasti/revelation</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/revelation/revelation-0.5.4-r1.ebuild b/x11-misc/revelation/revelation-0.5.4-r1.ebuild deleted file mode 100644 index ff85436ffe63..000000000000 --- a/x11-misc/revelation/revelation-0.5.4-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_9 ) - -inherit gnome2-utils python-single-r1 meson xdg - -DESCRIPTION="A password manager for GNOME" -HOMEPAGE="https://revelation.olasagasti.info/ https://github.com/mikelolasagasti/revelation" -SRC_URI="https://github.com/mikelolasagasti/revelation/releases/download/${P}/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Upstream does not provide any test suite. -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - dev-libs/libpwquality[python,${PYTHON_USEDEP}] - ') - x11-libs/gtk+:3 - dev-libs/glib - dev-libs/gobject-introspection -" - -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/revelation-0.5.4-issue87-fix-meson-0.60.patch ) - -src_prepare() { - find -name '*.py' -exec \ - sed -i -e 's:Cryptodome:Crypto:' meson.build {} + || die - xdg_src_prepare -} - -src_install() { - meson_src_install - python_fix_shebang "${ED}" - python_optimize -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/x11-misc/revelation/revelation-0.5.5.ebuild b/x11-misc/revelation/revelation-0.5.5.ebuild index 31deaaf42451..f31aeae6bc97 100644 --- a/x11-misc/revelation/revelation-0.5.5.ebuild +++ b/x11-misc/revelation/revelation-0.5.5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit gnome2-utils python-single-r1 meson xdg diff --git a/x11-misc/rodent/Manifest b/x11-misc/rodent/Manifest deleted file mode 100644 index d3ae1e0e2d18..000000000000 --- a/x11-misc/rodent/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rodent-5.3.16.3.tar.bz2 10873231 BLAKE2B 5eca3c69d5a0427997bfcb7af8cd187fcb9f49e98988ed16a2cb292e59686d82ca93f60f8c827669df3b168d53c1da5b956d267dc94c1b67793113ae42b98954 SHA512 83c85501d3fe49e84abe9bb61a23ca4ec86fb22abb2e9a01228b3180d114380ff085ee58f51b9ac47173214ab8323e0bde7cfca6fb9b7907d4b1551ad48326f5 diff --git a/x11-misc/rodent/metadata.xml b/x11-misc/rodent/metadata.xml deleted file mode 100644 index 3b88f745b655..000000000000 --- a/x11-misc/rodent/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>xfce@gentoo.org</email> - <name>XFCE Team</name> - </maintainer> - <longdescription lang="en">Rodent is fast, small and powerful file manager for the GNU operating system (but it also works in BSD). Rodent is *not* a filemanager for dummies. Emphasis is on ease of use for the advanced user, not the computer illiterate.</longdescription> - <upstream> - <remote-id type="sourceforge">xffm</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild b/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild deleted file mode 100644 index bb5422a7ceda..000000000000 --- a/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2-utils xdg-utils - -DESCRIPTION="A fast, small and powerful file manager and graphical shell" -HOMEPAGE="http://xffm.org/" -SRC_URI="mirror://sourceforge/xffm/${PV}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=x11-libs/librfm-5.3.16.3" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog TODO ) - -src_prepare() { - pushd apps/rodent-pkg >/dev/null || die - sed -i -e "/^install-data-hook/d" \ - -e "/rm -f/d" Build/Makefile.am || die - eautoreconf - popd >/dev/null || die - default -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest index 916e7b8d7309..36ea19b3fde4 100644 --- a/x11-misc/rofi-calc/Manifest +++ b/x11-misc/rofi-calc/Manifest @@ -1 +1,2 @@ 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 diff --git a/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild b/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild index a267871cd50b..ce53ee1c9e75 100644 --- a/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild +++ b/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,3 +24,8 @@ src_prepare() { default eautoreconf -i } + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-misc/rofi-calc/rofi-calc-2.2.0.ebuild b/x11-misc/rofi-calc/rofi-calc-2.2.0.ebuild new file mode 100644 index 000000000000..5264d2023257 --- /dev/null +++ b/x11-misc/rofi-calc/rofi-calc-2.2.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 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" +IUSE="" + +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/rofi-calc/rofi-calc-9999.ebuild b/x11-misc/rofi-calc/rofi-calc-9999.ebuild index c70193f7e119..ac69969f2903 100644 --- a/x11-misc/rofi-calc/rofi-calc-9999.ebuild +++ b/x11-misc/rofi-calc/rofi-calc-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit git-r3 autotools @@ -25,3 +25,8 @@ src_prepare() { default eautoreconf -i } + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest index 104287457489..75d274fd3f64 100644 --- a/x11-misc/rofi/Manifest +++ b/x11-misc/rofi/Manifest @@ -1,2 +1 @@ -DIST rofi-1.7.3.tar.xz 755776 BLAKE2B af746e72ce5d09f3815960eb533bf58160c56141a116d1d950db498445e07696d0af2abe36a661ce67178f2040bfba7a39ac6c8eacdfc4db9f75e5f74daf47f5 SHA512 bba9ee25c7ff2168370ad1fd21a2286706f9db1efccdab84c55abd3bfa822ed10d23128388c69c964e81b2c51e1a95b3a3c7ca503a4564d0bdb3a993d8a9553d DIST rofi-1.7.5.tar.xz 772952 BLAKE2B 54511f4f793f3ba0b58294daa1d2974228904a637d13d729b0b7d974c0ebf8d0d98514705212bd42500fe90b0685a3515dc67793baa95baefe6dfc0ecdee83c7 SHA512 84cbb8ccef14fdb5d68062b17245fbcb0e9bab46534eb6c7ce532750b86fb33ce6e43ed24cf3c65e553d15b23a201c9168d97d257da4dddeddb0a7c44dd59cc0 diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml index 040d877273ac..61c7bf918fc9 100644 --- a/x11-misc/rofi/metadata.xml +++ b/x11-misc/rofi/metadata.xml @@ -18,6 +18,6 @@ <flag name="windowmode">Enable normal window mode</flag> </use> <upstream> - <remote-id type="github">DaveDavenport/rofi</remote-id> + <remote-id type="github">davatorium/rofi</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/rofi/rofi-1.7.3-r1.ebuild b/x11-misc/rofi/rofi-1.7.3-r1.ebuild deleted file mode 100644 index 803fb05e4226..000000000000 --- a/x11-misc/rofi/rofi-1.7.3-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="A window switcher, run dialog and dmenu replacement" -HOMEPAGE="https://github.com/davatorium/rofi" -SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm64 x86" -IUSE="+drun test +windowmode" -RESTRICT="!test? ( test )" - -BDEPEND=" - sys-devel/bison - >=sys-devel/flex-2.5.39 - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - x11-libs/cairo[X,xcb(+)] - x11-libs/gdk-pixbuf:2 - x11-libs/libxcb:= - x11-libs/libxkbcommon[X] - x11-libs/pango[X] - x11-libs/startup-notification - x11-libs/xcb-util - x11-libs/xcb-util-cursor - x11-libs/xcb-util-wm - x11-misc/xkeyboard-config -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - test? ( >=dev-libs/check-0.11 ) -" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Doesn't work with reflex, bug #887049 - export LEX=flex - - tc-export CC - - local myeconfargs=( - $(use_enable drun) - $(use_enable test check) - $(use_enable windowmode) - ) - econf "${myeconfargs[@]}" -} - -pkg_postinst() { - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -lt 1.7.0; then - elog "Rofi 1.7.0 removed the (deprecated) xresources based configuration setup." - elog "If you are still using old configuration setup, please convert it to new format manually." - elog "The new format configuration can be generated by 'rofi -dump-config > ~/.config/rofi/config.rasi'." - elog "For more information, please see https://github.com/davatorium/rofi/releases/tag/1.7.0" - fi - done -} diff --git a/x11-misc/rofi/rofi-1.7.5.ebuild b/x11-misc/rofi/rofi-1.7.5.ebuild index c51049b5e10e..69974bf5e0e4 100644 --- a/x11-misc/rofi/rofi-1.7.5.ebuild +++ b/x11-misc/rofi/rofi-1.7.5.ebuild @@ -1,17 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools toolchain-funcs xdg-utils +inherit autotools flag-o-matic toolchain-funcs xdg-utils DESCRIPTION="A window switcher, run dialog and dmenu replacement" HOMEPAGE="https://github.com/davatorium/rofi" -SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/davatorium/rofi" + inherit git-r3 +else + SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 arm64 ~riscv x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm64 x86" IUSE="+drun test +windowmode" RESTRICT="!test? ( test )" @@ -45,9 +51,17 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/881281 + # fixed upstream in git next, remove on next version bump + filter-lto + # Doesn't work with reflex, bug #887049 export LEX=flex + # Requires bison, see https://bugs.gentoo.org/894634. + unset YACC + tc-export CC local myeconfargs=( @@ -59,15 +73,6 @@ src_configure() { } pkg_postinst() { - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -lt 1.7.0; then - elog "Rofi 1.7.0 removed the (deprecated) xresources based configuration setup." - elog "If you are still using old configuration setup, please convert it to new format manually." - elog "The new format configuration can be generated by 'rofi -dump-config > ~/.config/rofi/config.rasi'." - elog "For more information, please see https://github.com/davatorium/rofi/releases/tag/1.7.0" - fi - done - xdg_icon_cache_update } diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-9999.ebuild index 88dba687d9d8..aa90b0c02f84 100644 --- a/x11-misc/rofi/rofi-99999.ebuild +++ b/x11-misc/rofi/rofi-9999.ebuild @@ -1,17 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools git-r3 toolchain-funcs +inherit autotools toolchain-funcs xdg-utils DESCRIPTION="A window switcher, run dialog and dmenu replacement" HOMEPAGE="https://github.com/davatorium/rofi" -EGIT_REPO_URI="https://github.com/davatorium/rofi" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/davatorium/rofi" + inherit git-r3 +else + SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 arm64 ~riscv x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="" IUSE="+drun test +windowmode" RESTRICT="!test? ( test )" @@ -22,19 +28,15 @@ BDEPEND=" " RDEPEND=" dev-libs/glib:2 - gnome-base/librsvg:2 - media-libs/freetype - virtual/jpeg x11-libs/cairo[X,xcb(+)] - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libxcb + x11-libs/gdk-pixbuf:2 + x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util + x11-libs/xcb-util-cursor x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm x11-misc/xkeyboard-config " DEPEND=" @@ -52,6 +54,9 @@ src_configure() { # Doesn't work with reflex, bug #887049 export LEX=flex + # Requires bison, see https://bugs.gentoo.org/894634. + unset YACC + tc-export CC local myeconfargs=( @@ -61,3 +66,11 @@ src_configure() { ) econf "${myeconfargs[@]}" } + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest index 242aeade11fd..4fcd5e9d7940 100644 --- a/x11-misc/safeeyes/Manifest +++ b/x11-misc/safeeyes/Manifest @@ -1,3 +1 @@ -DIST safeeyes-2.1.3.tar.gz 354494 BLAKE2B 5f7977a8de280f5022cb226689c5b1d48f494932babd014b9ee8affcf9aaa0ef8dfe3ed18c33dbfa4ebaf1c5bfdbed4efc3b69c1ce3065e3ff3c82e83fa71723 SHA512 8a708b3e8f40f75659092a2effb0318b0fb7f47345e3f430f6b83ff2fc3c7de46b2dc881bf69902055bc8233f539946e60822e6ab7a6149f2c99441af1191f48 -DIST safeeyes-2.1.4.tar.gz 383245 BLAKE2B 307d58fd589c0a8b01f0c20c21f06a0f81b0d8a43f81e71e79a273a124e00df7cdd2c7c498a4918f6b56abc03fa7cb58db231124a96806a2fe60d6f9dab7f6c8 SHA512 547d00f18e06679464e225ab62f76c43e8efb733e945ae93c02c7cf55ab0bcf5fc078ffc41ad2842a324fff2513050cced404e8bd53d63b78ba7fb1f862c1ad3 -DIST safeeyes-2.1.5.tar.gz 284690 BLAKE2B deedf39bc0a69ee70a692061c96e0ea5ce6aeb09513d7469710d25b8660eaed854b3ee711de4702f839dbfb1f04aee84cb05ebc24d4567fc2b56c04e319f5c63 SHA512 0e4ed1d9f4473b45f6f5d4a74ba4817fca08199072fe937fd3b7ceed1ef543729c618e672198cf4dfeba8ed896b24779ca725f2f2c98bf1c9cdf1a8e9c147dc8 +DIST safeeyes-2.1.6.tar.gz 286359 BLAKE2B a5e4b4d680d455f2ae9494705f1e4508341802f4826b2d11f5407eed4074f0eab45066a3741745dd164b47e26a2dbf2a393945bffef0f747cbebd5f87b3b1961 SHA512 6476284ed1d8cdde77f10b3fe962a5d9d5ead944b0418f797e375cc67affa6807d858279cf4a1189585b7688dbe983fc6b90c917e0e55a2a11ebfdc56b44ca93 diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch b/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch deleted file mode 100644 index e494dfc1a2ce..000000000000 --- a/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1fabfb9eddc2b67d174dffba0e46ecb4fb4dec71 Mon Sep 17 00:00:00 2001 -From: tibequadorian <tibequadorian@posteo.de> -Date: Tue, 24 Jan 2023 18:39:49 +0100 -Subject: [PATCH] utility.py: Fix getargspec error with python 3.11 - ---- - safeeyes/utility.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/safeeyes/utility.py b/safeeyes/utility.py -index bf2dede..7e08735 100644 ---- a/safeeyes/utility.py -+++ b/safeeyes/utility.py -@@ -666,7 +666,7 @@ def has_method(module, method_name, no_of_args=0): - Check whether the given function is defined in the module or not. - """ - if hasattr(module, method_name): -- if len(inspect.getargspec(getattr(module, method_name)).args) == no_of_args: -+ if len(inspect.getfullargspec(getattr(module, method_name)).args) == no_of_args: - return True - return False - --- -2.39.1 - diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch b/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch new file mode 100644 index 000000000000..93430da89b88 --- /dev/null +++ b/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch @@ -0,0 +1,34 @@ +From 043d9c5018431b3b41cc2bcfacdaaa7f0db1563c Mon Sep 17 00:00:00 2001 +From: Alyssa Rosenzweig <alyssa@rosenzweig.io> +Date: Thu, 9 Nov 2023 12:14:13 -0400 +Subject: [PATCH] Fix with python3.12 + +imp is deprecated in 3.4 and removed in 3.12. this caused safe eyes to +break on upgrading to fedora 39 + +Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> +--- + safeeyes/utility.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/safeeyes/utility.py b/safeeyes/utility.py +index e145d4d..3976140 100644 +--- a/safeeyes/utility.py ++++ b/safeeyes/utility.py +@@ -21,7 +21,6 @@ + """ + + import errno +-import imp + import inspect + import importlib + import json +@@ -355,7 +354,7 @@ def module_exist(module): + Check wther the given Python module exists or not. + """ + try: +- imp.find_module(module) ++ importlib.util.find_spec(module) + return True + except ImportError: + return False diff --git a/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild deleted file mode 100644 index 329df210ab2b..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) - -inherit xdg distutils-r1 - -DESCRIPTION="Linux alternative to EyeLeo" -HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - dev-libs/libappindicator:3[introspection] - dev-python/Babel[${PYTHON_USEDEP}] - dev-python/croniter[${PYTHON_USEDEP}] - dev-python/dbus-python[${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 - " - -DOCS=( - README.md -) - -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/safeeyes/safeeyes-2.1.5-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild index debfe192fcfa..c6d102ef6476 100644 --- a/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild @@ -7,20 +7,14 @@ PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py DISTUTILS_USE_PEP517=setuptools -inherit xdg distutils-r1 +inherit xdg distutils-r1 pypi DESCRIPTION="Linux alternative to EyeLeo" HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~riscv ~x86" -IUSE="" - -PATCHES=( - "${FILESDIR}"/${P}-python-3.11.patch -) RDEPEND=" dev-libs/libayatana-appindicator diff --git a/x11-misc/safeeyes/safeeyes-2.1.4.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild index 2e6849d06d75..307103b60daf 100644 --- a/x11-misc/safeeyes/safeeyes-2.1.4.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild @@ -3,22 +3,25 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py +DISTUTILS_USE_PEP517=setuptools -inherit xdg distutils-r1 +inherit xdg distutils-r1 pypi DESCRIPTION="Linux alternative to EyeLeo" HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~riscv ~x86" -IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-py312.patch +) RDEPEND=" - dev-libs/libappindicator:3[introspection] + dev-libs/libayatana-appindicator dev-python/Babel[${PYTHON_USEDEP}] dev-python/croniter[${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}] @@ -32,10 +35,6 @@ RDEPEND=" x11-misc/xprintidle " -DOCS=( - README.md -) - pkg_postinst() { xdg_desktop_database_update xdg_icon_cache_update diff --git a/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r3.ebuild index a00135abf2fc..7f1927eab085 100644 --- a/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.1.6-r3.ebuild @@ -1,24 +1,27 @@ -# 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_{9..12} ) PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py +DISTUTILS_USE_PEP517=setuptools -inherit xdg distutils-r1 +inherit xdg distutils-r1 pypi DESCRIPTION="Linux alternative to EyeLeo" HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~riscv ~x86" -IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-py312.patch +) RDEPEND=" - dev-libs/libappindicator:3[introspection] + dev-libs/libayatana-appindicator dev-python/Babel[${PYTHON_USEDEP}] dev-python/croniter[${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}] @@ -32,13 +35,22 @@ RDEPEND=" x11-misc/xprintidle " -DOCS=( - README.md -) +python_install() { + distutils-r1_python_install -src_prepare() { - default - find . -type f -name \*.pyc -delete # bug #864765 + # 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() { diff --git a/x11-misc/safeeyes/safeeyes-2.1.5.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6.ebuild index 5bbf7b03b886..5aca9341d36c 100644 --- a/x11-misc/safeeyes/safeeyes-2.1.5.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.1.6.ebuild @@ -7,11 +7,10 @@ PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py DISTUTILS_USE_PEP517=setuptools -inherit xdg distutils-r1 +inherit xdg distutils-r1 pypi DESCRIPTION="Linux alternative to EyeLeo" HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -19,7 +18,7 @@ KEYWORDS="~amd64 ~riscv ~x86" IUSE="" RDEPEND=" - dev-libs/libappindicator:3[introspection] + dev-libs/libayatana-appindicator dev-python/Babel[${PYTHON_USEDEP}] dev-python/croniter[${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}] diff --git a/x11-misc/screen-message/Manifest b/x11-misc/screen-message/Manifest index 77a211c1e2ef..0cf545daa71c 100644 --- a/x11-misc/screen-message/Manifest +++ b/x11-misc/screen-message/Manifest @@ -1 +1,2 @@ +DIST screen-message-0.28.gh.tar.gz 264372 BLAKE2B 6df2e894fd3c4fde99d80844b3ee2e2dc51202f891f69fa5fc7c51770949fab68bac935da1e5661105952f1941ed65fc991f9ab27c0177ed56c6da25b934bb9f SHA512 6c993b0f77e4ed0a6c13b8afc4e194e0fbdaea5af0cd423b26343b10e1daf471926e007faad5b48b8af649f984abc0ccb2d1f6ead45d0f11be67b58e5bc7019c DIST screen-message_0.26.orig.tar.gz 347704 BLAKE2B 5ba40db417fbb391aa3e3be44dc5cf78cdff4117df4d22f5d790906a90f7a5a338ae7c20fb31bd60fdffd4ee6d332a5fb87643a4906a2b59ebadc3f4237e41b3 SHA512 3364c4b2cedbadc40c0f885b2810dfbb3b57a067288b8c5bacc62f76c68a5293a4d5215fc31717310526e0ae3fb8b791ceeacf958587dbeef14debfe9bd346eb diff --git a/x11-misc/screen-message/metadata.xml b/x11-misc/screen-message/metadata.xml index 6a22e9e318bb..6eb25c3bed2d 100644 --- a/x11-misc/screen-message/metadata.xml +++ b/x11-misc/screen-message/metadata.xml @@ -5,4 +5,7 @@ <email>sping@gentoo.org</email> <name>Sebastian Pipping</name> </maintainer> + <upstream> + <remote-id type="github">nomeata/screen-message</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/screen-message/screen-message-0.28.ebuild b/x11-misc/screen-message/screen-message-0.28.ebuild new file mode 100644 index 000000000000..ba37f9dd98a9 --- /dev/null +++ b/x11-misc/screen-message/screen-message-0.28.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools xdg + +DESCRIPTION="Display a multi-line message large, fullscreen, black on white" +HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message + https://github.com/nomeata/screen-message" +SRC_URI="https://github.com/nomeata/screen-message/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="x11-libs/gtk+:3 + x11-libs/cairo + >=x11-libs/pango-1.16" +RDEPEND="${DEPEND}" + +src_prepare() { + eapply_user + eautoreconf +} + +src_install() { + default + + # It's not a game so let's make it *not* end up in /usr/games + dodir /usr/bin + mv "${D}"/usr/{games,bin}/sm || die + rmdir "${D}"/usr/games || die + sed 's|^Exec=/usr/games/sm|Exec=/usr/bin/sm|' \ + -i "${D}"/usr/share/applications/sm.desktop || die +} diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest index ee6abdde4c3c..ed031be0fb24 100644 --- a/x11-misc/screengrab/Manifest +++ b/x11-misc/screengrab/Manifest @@ -1,2 +1,2 @@ -DIST screengrab-2.4.0.tar.xz 336400 BLAKE2B f60bc298dba5a2f4153804c3d37b263f1191c7d4bc3099def037dc7dcedaf5c59bf2b67d2649f279f870d030260272e906d8d23f7eb0b4e49fa340054824ae90 SHA512 88aec38b957256f93bebf13facf33135a5a80ed879325342d19d3b102e7103fd23f1f7b3c1702c4bff01898e2b3029b07e50e4fde0de9e206a74484e4aa395ee -DIST screengrab-2.5.0.tar.xz 336852 BLAKE2B 7c59cadbac952cf982873f427bc9d6ff594b6e517b7dcda287f80dc51d272b17250d3cb78f264d09eb348bc0c8ce783b22e1ce5f67ec52004d4091f86866e84c SHA512 681adc0e9e26ad591aceb8002095e9117534ba20cc1086e7e2be5c6707d2b308c7bb9e4201563692891678b40b45f4a2e7db20008676af9ca513c34c00c0fc02 +DIST screengrab-2.6.0.tar.xz 337392 BLAKE2B 086490ef883ce1a317da00d7580f1b5162d6273f2a7caa286ccfb00ba3017631d2c58a127d8ca735d4d9f5947b46a8a5b0f6b315dba857153789a0f353846f6a SHA512 622bd9fa4548dbbd2b965f2a38446d6b6002786ff2154f9efe86a4970ac464174d1d7e34b8fdc61761f935c97bf4ac8bb2e8ffd166b859cddd3183bd76380b88 +DIST screengrab-2.7.0.tar.xz 341696 BLAKE2B ad45155caa4964577626d54a067d20935c7419e4a54b725077fb5d0db21b8a7b55c6caebedf6522c74cf8026487d203f8570f57f9f9f71ad11609175b901124c SHA512 0becd8972408a788b56affc9091cdc9ce1fe79160bba27ae29c5f1bf48ed0b73bafdabf3aeaac1eafe646aeaa4e162c0302b7ba1ee4f07785010e50a7d8131a1 diff --git a/x11-misc/screengrab/screengrab-2.5.0.ebuild b/x11-misc/screengrab/screengrab-2.6.0.ebuild index 7962f498a9dc..480ce47768d4 100644 --- a/x11-misc/screengrab/screengrab-2.5.0.ebuild +++ b/x11-misc/screengrab/screengrab-2.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ IUSE="" BDEPEND="dev-qt/linguist-tools:5" DEPEND=" - >=dev-libs/libqtxdg-3.10.0 + >=dev-libs/libqtxdg-3.11.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 diff --git a/x11-misc/screengrab/screengrab-2.4.0.ebuild b/x11-misc/screengrab/screengrab-2.7.0.ebuild index 07c912db1240..4603a5d4cf46 100644 --- a/x11-misc/screengrab/screengrab-2.4.0.ebuild +++ b/x11-misc/screengrab/screengrab-2.7.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 @@ -11,12 +11,12 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-2 GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" IUSE="" BDEPEND="dev-qt/linguist-tools:5" DEPEND=" - >=dev-libs/libqtxdg-3.9.0 + >=dev-libs/libqtxdg-3.12.0 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdbus-5.15:5 >=dev-qt/qtgui-5.15:5 diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest index 9fc437d3e308..98a2838dc2a5 100644 --- a/x11-misc/screenkey/Manifest +++ b/x11-misc/screenkey/Manifest @@ -1,2 +1 @@ -DIST screenkey-1.5.tar.gz 87449 BLAKE2B 1ca3a7d643c65e2a82ce51feb4de022ccb0bb35848c0bb63871343b499e4b7a677e7df379ad259c149ba4a93d98cc36a05d9fb58976cc96d20b3fe98b54301db SHA512 bc9457b17c9e2fea3cefc97546dfd89a019a527608ec79960d1a712c1f1bbc97cf37404a1d84ca1c4587ae4d52163e2de30797f75b9a4a1da45ac585b8b650cf DIST screenkey-1.5_p20230109.tar.bz2 77229 BLAKE2B 8b6d089bdecbbd0d9057ccad12d72321de5b9c6df60785398e15e9196b21fec2b88e27b2e068c53caf5c699ed7b7dcd3bacfbdf86d14b3c4c4a3b2125dfa66c7 SHA512 b6b5121c2b4f68cd8df409176e32019b0747da637c6baa7f45d6268c1605144d32cb099aa16a91748ae672d6386be2579af1bef167488bcdc5e1b452d39d2eee diff --git a/x11-misc/screenkey/metadata.xml b/x11-misc/screenkey/metadata.xml index 2a52ec37acfb..3926bbb56384 100644 --- a/x11-misc/screenkey/metadata.xml +++ b/x11-misc/screenkey/metadata.xml @@ -5,10 +5,6 @@ <email>xgqt@gentoo.org</email> <name>Maciej Barć</name> </maintainer> - <maintainer type="person"> - <email>sultan@gentoo.org</email> - <name>Stephan Hartmann</name> - </maintainer> <longdescription> A screencast tool to display your keys, inspired by Screenflick. Featuring: diff --git a/x11-misc/screenkey/screenkey-1.5-r3.ebuild b/x11-misc/screenkey/screenkey-1.5-r3.ebuild deleted file mode 100644 index 83969fb16f75..000000000000 --- a/x11-misc/screenkey/screenkey-1.5-r3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit distutils-r1 xdg - -DESCRIPTION="A screencast tool to display your keys inspired by Screenflick" -HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/" - -if [[ "${PV}" == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git" -else - SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64" - S="${WORKDIR}/${PN}-v${PV}" -fi - -RESTRICT="test" -LICENSE="GPL-3+" -SLOT="0" -IUSE="appindicator" - -BDEPEND=" - dev-python/Babel[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] -" -RDEPEND=" - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - media-fonts/fontawesome - x11-libs/gtk+:3[X,introspection] - x11-misc/slop - appindicator? ( dev-libs/libappindicator:3[introspection] ) -" - -src_prepare() { - # Change the doc install path - sed -i "s|share/doc/screenkey|share/doc/${PF}|g" setup.py || die - - default -} diff --git a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild b/x11-misc/screenkey/screenkey-1.5_p20230109-r1.ebuild index 907a2a7510f5..379af07f4cf6 100644 --- a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild +++ b/x11-misc/screenkey/screenkey-1.5_p20230109-r1.ebuild @@ -1,31 +1,33 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 xdg DESCRIPTION="A screencast tool to display your keys inspired by Screenflick" HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/" -if [[ ${PV} == *9999* ]]; then +if [[ "${PV}" == *9999* ]]; then inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git" else - if [[ ${PV} == *_p20230109 ]] ; then - H=7bdba66574244061c6e1934c4f204d02d570f182 - SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${H}/${PN}-${H}.tar.bz2 + if [[ "${PV}" == *_p20230109 ]] ; then + COMMIT=7bdba66574244061c6e1934c4f204d02d570f182 + SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-${H} + S="${WORKDIR}/${PN}-${COMMIT}" else SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-v${PV} + S="${WORKDIR}/${PN}-v${PV}" fi - KEYWORDS="~amd64" + + KEYWORDS="amd64" fi LICENSE="GPL-3+" diff --git a/x11-misc/screenkey/screenkey-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild index dcc404244124..bbfbe5b4cae5 100644 --- a/x11-misc/screenkey/screenkey-9999.ebuild +++ b/x11-misc/screenkey/screenkey-9999.ebuild @@ -1,23 +1,25 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 xdg DESCRIPTION="A screencast tool to display your keys inspired by Screenflick" HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/" -if [[ ${PV} == *9999* ]]; then +if [[ "${PV}" == *9999* ]]; then inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git" else SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-v${PV} + S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64" fi diff --git a/x11-misc/sct/metadata.xml b/x11-misc/sct/metadata.xml index 4c0d3032d69c..115e9d64a669 100644 --- a/x11-misc/sct/metadata.xml +++ b/x11-misc/sct/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index d1006dba1575..8d6ee0946cd6 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1 +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 diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch b/x11-misc/sddm/files/pam-1.4-substack.patch deleted file mode 100644 index b0467b268228..000000000000 --- a/x11-misc/sddm/files/pam-1.4-substack.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- sddm-0.18.1/services/sddm-autologin.pam.bak 2020-06-19 22:27:57.305580696 +0200 -+++ sddm-0.18.1/services/sddm-autologin.pam 2020-06-19 22:30:50.513583973 +0200 -@@ -1,6 +1,5 @@ - #%PAM-1.0 - auth required pam_env.so --auth required pam_tally.so file=/var/log/faillog onerr=succeed - auth required pam_shells.so - auth required pam_nologin.so - auth required pam_permit.so ---- sddm-0.18.1/services/sddm.pam.bak 2020-06-19 22:27:26.721580117 +0200 -+++ sddm-0.18.1/services/sddm.pam 2020-06-19 22:27:48.729580533 +0200 -@@ -1,15 +1,15 @@ - #%PAM-1.0 - --auth include system-login -+auth substack system-login - -auth optional pam_gnome_keyring.so - -auth optional pam_kwallet5.so - --account include system-login -+account substack system-login - --password include system-login -+password substack system-login - -password optional pam_gnome_keyring.so use_authtok - - session optional pam_keyinit.so force revoke --session include system-login -+session substack system-login - -session optional pam_gnome_keyring.so auto_start - -session optional pam_kwallet5.so auto_start
\ No newline at end of file diff --git a/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch b/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch deleted file mode 100644 index 9d8f2b545a1e..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 300078995ae82495cf09a0646a07e0214f0ae030 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sat, 21 Jul 2018 22:41:29 +0200 -Subject: [PATCH] Change location of sddm.conf.d to DATAROOTDIR - -/usr/lib is not a location that should be hardcoded - depending on -distribution and architecture this can be different. So far, SDDM -does not use this path unless the above conditions happen to make -it coincide with the install location of its Qml modules. - -DATAROOTDIR is defined as: Read-only architecture-independent data. -This seems to be a better fit for a system SDDM default config dir. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8500c65..5150b7d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -184,7 +184,7 @@ set(WAYLAND_SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/wayland-session" - - set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") - set(CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d" CACHE PATH "Path of the sddm config directory") --set(SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory") -+set(SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory") - set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file") - set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file") - set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") --- -2.18.0 - diff --git a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch deleted file mode 100644 index e1e3c1527be7..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/data/scripts/Xsession -+++ b/data/scripts/Xsession -@@ -50,6 +50,10 @@ - ;; - esac - -+# Make D-Bus start properly, see: -+# /etc/X11/xinit/xinitrc.d/80-dbus -+command="$@" -+ - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f $HOME/.xprofile ] && . $HOME/.xprofile - -@@ -94,8 +98,8 @@ - . "$USERXSESSION" - fi - --if [ -z "$*" ]; then -+if [ -z "$command" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - else -- exec $@ -+ exec $command - fi diff --git a/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch b/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch deleted file mode 100644 index 8209c0739dc6..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch +++ /dev/null @@ -1,94 +0,0 @@ -From be202f533ab98a684c6a007e8d5b4357846bc222 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Tue, 6 Oct 2020 21:21:38 +0200 -Subject: [PATCH] Fix X not having access control on startup - -If the auth file is empty, X allows any local application (= any user on the -system) to connect. This is currently the case until X wrote the display -number to sddm and sddm used that to write the entry into the file. -To work around this chicken-and-egg problem, make use of the fact that X -doesn't actually look at the display number in the passed auth file and just -use :0 unconditionally. Also make sure that writing the entry was actually -successful. - -CVE-2020-28049 ---- - src/daemon/XorgDisplayServer.cpp | 25 ++++++++++++++++++++----- - src/daemon/XorgDisplayServer.h | 2 +- - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp -index d04f6344..df685b2d 100644 ---- a/src/daemon/XorgDisplayServer.cpp -+++ b/src/daemon/XorgDisplayServer.cpp -@@ -88,7 +88,7 @@ namespace SDDM { - return m_cookie; - } - -- void XorgDisplayServer::addCookie(const QString &file) { -+ bool XorgDisplayServer::addCookie(const QString &file) { - // log message - qDebug() << "Adding cookie to" << file; - -@@ -104,13 +104,13 @@ namespace SDDM { - - // check file - if (!fp) -- return; -+ return false; - fprintf(fp, "remove %s\n", qPrintable(m_display)); - fprintf(fp, "add %s . %s\n", qPrintable(m_display), qPrintable(m_cookie)); - fprintf(fp, "exit\n"); - - // close pipe -- pclose(fp); -+ return pclose(fp) == 0; - } - - bool XorgDisplayServer::start() { -@@ -127,6 +127,15 @@ namespace SDDM { - // log message - qDebug() << "Display server starting..."; - -+ // generate auth file. -+ // For the X server's copy, the display number doesn't matter. -+ // An empty file would result in no access control! -+ m_display = QStringLiteral(":0"); -+ if(!addCookie(m_authPath)) { -+ qCritical() << "Failed to write xauth file"; -+ return false; -+ } -+ - if (daemonApp->testing()) { - QStringList args; - QDir x11socketDir(QStringLiteral("/tmp/.X11-unix")); -@@ -217,8 +226,14 @@ namespace SDDM { - emit started(); - } - -- // generate auth file -- addCookie(m_authPath); -+ // The file is also used by the greeter, which does care about the -+ // display number. Write the proper entry, if it's different. -+ if(m_display != QStringLiteral(":0")) { -+ if(!addCookie(m_authPath)) { -+ qCritical() << "Failed to write xauth file"; -+ return false; -+ } -+ } - changeOwner(m_authPath); - - // set flag -diff --git a/src/daemon/XorgDisplayServer.h b/src/daemon/XorgDisplayServer.h -index d2bdf6d4..e97a0b53 100644 ---- a/src/daemon/XorgDisplayServer.h -+++ b/src/daemon/XorgDisplayServer.h -@@ -40,7 +40,7 @@ namespace SDDM { - - const QString &cookie() const; - -- void addCookie(const QString &file); -+ bool addCookie(const QString &file); - - public slots: - bool start(); diff --git a/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch b/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch deleted file mode 100644 index 70efa284803f..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9a440ba5917ff93c6a78726380c6267d91c13f19 Mon Sep 17 00:00:00 2001 -From: Alex <alex.shaw.as@gmail.com> -Date: Mon, 30 Sep 2019 16:50:16 -0400 -Subject: [PATCH] Prevent duplicate session name. - -Several desktop sessions (e.g. KDE Plasma) already include the string " (Wayland)" in the session name. When this happens, the session name displayed to the user is "Plasma (Wayland) (Wayland)". This change makes it so that only "Plasma (Wayland)" will be displayed. - -(cherry picked from commit f9a0648ff3f841b68a07c139c3540b9e75bfd279) ---- - src/common/Session.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/Session.cpp b/src/common/Session.cpp -index aa4dad3..923ecd4 100644 ---- a/src/common/Session.cpp -+++ b/src/common/Session.cpp -@@ -169,7 +169,7 @@ namespace SDDM { - - if (line.startsWith(QLatin1String("Name="))) { - if (type == WaylandSession) -- m_displayName = QObject::tr("%1 (Wayland)").arg(line.mid(5)); -+ m_displayName = QObject::tr("%1").arg(line.mid(5)); - else - m_displayName = line.mid(5); - } --- -2.38.1 - diff --git a/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch b/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch deleted file mode 100644 index 65e9b8573356..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5fe712d0e73c6263647bf306f40fbac94a52f4a6 Mon Sep 17 00:00:00 2001 -From: Harald Sitter <sitter@kde.org> -Date: Mon, 24 Oct 2022 13:15:48 +0200 -Subject: disable automatic portal launching - -in Qt6 (and the KDE patch collection for Qt 5) genericunixservices will -internally attempt to probe the portal tech early on in the app life -cycle. this causes the protal system to launch app and then crash -because we aren't actually providing a fully functional session. instead -opt out of this altogether - -(cherry picked from commit fc24321541f6f65b7d1aac89cd82336ffd53e1a0) ---- - src/greeter/GreeterApp.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp -index 4e117a7..a491f4d 100644 ---- a/src/greeter/GreeterApp.cpp -+++ b/src/greeter/GreeterApp.cpp -@@ -318,6 +318,9 @@ int main(int argc, char **argv) - QSurfaceFormat::setDefaultFormat(format); - } - -+ // Qt internally may load the xdg portal system early on, prevent this, we do not have a functional session running. -+ qputenv("QT_NO_XDG_DESKTOP_PORTAL", "1"); -+ - QGuiApplication app(argc, argv); - - QCommandLineParser parser; --- -2.38.1 - diff --git a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch deleted file mode 100644 index f4ce7ae7ad73..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001 -From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de> -Date: Thu, 9 May 2019 03:06:48 +0200 -Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159) - -This moves the supplemental group initialization step from -UserSession.cpp to the Backend system, so that the Pam Backend can -inject additional supplemental groups via modules like pam_group.so. - -pam_setcred(3) assumes that it operates on an already initialized -supplemental group list. However, PamBackend calls -pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start -PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call -must be issued to repeat the injection of PAM's supplemental groups. ---- - src/helper/Backend.cpp | 5 +++++ - src/helper/Backend.h | 3 +++ - src/helper/HelperApp.cpp | 4 ++++ - src/helper/HelperApp.h | 1 + - src/helper/UserSession.cpp | 13 ++++++++----- - src/helper/backend/PamBackend.cpp | 18 ++++++++++++++++++ - src/helper/backend/PamBackend.h | 2 ++ - 7 files changed, 41 insertions(+), 5 deletions(-) - -diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp -index d6bb4d0a..35ae2bdf 100644 ---- a/src/helper/Backend.cpp -+++ b/src/helper/Backend.cpp -@@ -29,6 +29,7 @@ - #include <QtCore/QProcessEnvironment> - - #include <pwd.h> -+#include <grp.h> - - namespace SDDM { - Backend::Backend(HelperApp* parent) -@@ -79,4 +80,8 @@ namespace SDDM { - bool Backend::closeSession() { - return true; - } -+ -+ bool Backend::setupSupplementalGroups(struct passwd *pw) { -+ return !initgroups(pw->pw_name, pw->pw_gid); -+ } - } -diff --git a/src/helper/Backend.h b/src/helper/Backend.h -index b790e001..3caf1592 100644 ---- a/src/helper/Backend.h -+++ b/src/helper/Backend.h -@@ -22,6 +22,7 @@ - #define BACKEND_H - - #include <QtCore/QObject> -+#include <pwd.h> - - namespace SDDM { - class HelperApp; -@@ -38,6 +39,8 @@ namespace SDDM { - void setAutologin(bool on = true); - void setGreeter(bool on = true); - -+ virtual bool setupSupplementalGroups(struct passwd *pw); -+ - public slots: - virtual bool start(const QString &user = QString()) = 0; - virtual bool authenticate() = 0; -diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp -index cad93bd8..d0891d75 100644 ---- a/src/helper/HelperApp.cpp -+++ b/src/helper/HelperApp.cpp -@@ -253,6 +253,10 @@ namespace SDDM { - return m_session; - } - -+ Backend *HelperApp::backend() { -+ return m_backend; -+ } -+ - const QString& HelperApp::user() const { - return m_user; - } -diff --git a/src/helper/HelperApp.h b/src/helper/HelperApp.h -index 3742df12..cb5959a7 100644 ---- a/src/helper/HelperApp.h -+++ b/src/helper/HelperApp.h -@@ -39,6 +39,7 @@ namespace SDDM { - virtual ~HelperApp(); - - UserSession *session(); -+ Backend *backend(); - const QString &user() const; - const QString &cookie() const; - -diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp -index f71fd358..62fd4d70 100644 ---- a/src/helper/UserSession.cpp -+++ b/src/helper/UserSession.cpp -@@ -19,6 +19,7 @@ - * - */ - -+#include "Backend.h" - #include "Configuration.h" - #include "UserSession.h" - #include "HelperApp.h" -@@ -129,7 +130,8 @@ namespace SDDM { - #endif - - // switch user -- const QByteArray username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit(); -+ HelperApp* app = qobject_cast<HelperApp*>(parent()); -+ const QByteArray username = app->user().toLocal8Bit(); - struct passwd pw; - struct passwd *rpw; - long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX); -@@ -146,12 +148,13 @@ namespace SDDM { - qCritical() << "getpwnam_r(" << username << ") failed with error: " << strerror(err); - exit(Auth::HELPER_OTHER_ERROR); - } -- if (setgid(pw.pw_gid) != 0) { -- qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username; -+ -+ if (!app->backend()->setupSupplementalGroups(&pw)) { -+ qCritical() << "failed to set up supplemental groups for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); - } -- if (initgroups(pw.pw_name, pw.pw_gid) != 0) { -- qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username; -+ if (setgid(pw.pw_gid) != 0) { -+ qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); - } - if (setuid(pw.pw_uid) != 0) { -diff --git a/src/helper/backend/PamBackend.cpp b/src/helper/backend/PamBackend.cpp -index f86d77d6..cccfa258 100644 ---- a/src/helper/backend/PamBackend.cpp -+++ b/src/helper/backend/PamBackend.cpp -@@ -289,6 +289,24 @@ namespace SDDM { - return QString::fromLocal8Bit((const char*) m_pam->getItem(PAM_USER)); - } - -+ bool PamBackend::setupSupplementalGroups(struct passwd *pw) { -+ if (!Backend::setupSupplementalGroups(pw)) -+ return false; -+ -+ // pam_setcred(3) may inject additional groups into the user's -+ // list of supplemental groups, and assumes that the user's -+ // supplemental groups have already been initialized before -+ // its invocation. Since pam_setcred was already called at the -+ // start of openSession, we need to repeat this step here as -+ // the user's groups have only just now been initialized. -+ -+ if (!m_pam->setCred(PAM_REINITIALIZE_CRED)) { -+ m_app->error(m_pam->errorString(), Auth::ERROR_AUTHENTICATION); -+ return false; -+ } -+ return true; -+ } -+ - int PamBackend::converse(int n, const struct pam_message **msg, struct pam_response **resp) { - qDebug() << "[PAM] Conversation with" << n << "messages"; - -diff --git a/src/helper/backend/PamBackend.h b/src/helper/backend/PamBackend.h -index 4c8b4b35..5b079099 100644 ---- a/src/helper/backend/PamBackend.h -+++ b/src/helper/backend/PamBackend.h -@@ -28,6 +28,7 @@ - #include <QtCore/QObject> - - #include <security/pam_appl.h> -+#include <pwd.h> - - namespace SDDM { - class PamHandle; -@@ -61,6 +62,7 @@ namespace SDDM { - explicit PamBackend(HelperApp *parent); - virtual ~PamBackend(); - int converse(int n, const struct pam_message **msg, struct pam_response **resp); -+ virtual bool setupSupplementalGroups(struct passwd *pw); - - public slots: - virtual bool start(const QString &user = QString()); diff --git a/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch b/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch deleted file mode 100644 index ab2fc18cbcbf..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 76c11653522453efcf86f6f2f53bca1a497ea350 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Thu, 28 Mar 2019 11:43:37 +0000 -Subject: Enable QSurfaceFormat::ResetNotification on new Qt - -This fixes graphical glitches on nvidia after VT switching. - -It's opt-in as it requires code paths to handle glGetError differently. -The version comparison is because my early implementations missed a code -path. This was fixed in 5.12.2, but we may as well play safe - -(cherry picked from commit cd4e1fa21e1ab7178fa5d2ef858f3271575fd315) ---- - src/greeter/GreeterApp.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp -index d47998e..4e117a7 100644 ---- a/src/greeter/GreeterApp.cpp -+++ b/src/greeter/GreeterApp.cpp -@@ -40,6 +40,9 @@ - #include <QDebug> - #include <QTimer> - #include <QTranslator> -+#include <QLibraryInfo> -+#include <QVersionNumber> -+#include <QSurfaceFormat> - - #include <iostream> - -@@ -309,6 +312,12 @@ int main(int argc, char **argv) - qDebug() << "High-DPI autoscaling not Enabled"; - } - -+ if (QLibraryInfo::version() >= QVersionNumber(5, 13, 0)) { -+ auto format(QSurfaceFormat::defaultFormat()); -+ format.setOption(QSurfaceFormat::ResetNotification); -+ QSurfaceFormat::setDefaultFormat(format); -+ } -+ - QGuiApplication app(argc, argv); - - QCommandLineParser parser; --- -2.38.1 - diff --git a/x11-misc/sddm/files/sddm-0.18.1-only-reuse-online-sessions.patch b/x11-misc/sddm/files/sddm-0.18.1-only-reuse-online-sessions.patch deleted file mode 100644 index b3ea90ff768c..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-only-reuse-online-sessions.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f131270ff3ae6e6b4e2dc965cd05b46e194b48c1 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Tue, 31 Jul 2018 16:51:13 +0200 -Subject: [PATCH] Session reuse: Only consider "online" sessions - -Otherwise it might switch to already dead sessions ("closing" or "lingering"). ---- - src/daemon/Display.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp -index 86e597e..ec442b0 100644 ---- a/src/daemon/Display.cpp -+++ b/src/daemon/Display.cpp -@@ -290,8 +290,8 @@ namespace SDDM { - foreach(const SessionInfo &s, reply.value()) { - if (s.userName == user) { - OrgFreedesktopLogin1SessionInterface session(Logind::serviceName(), s.sessionPath.path(), QDBusConnection::systemBus()); -- if (session.service() == QLatin1String("sddm")) { -- m_reuseSessionId = s.sessionId; -+ if (session.service() == QLatin1String("sddm") && session.state() == QLatin1String("online")) { -+ m_reuseSessionId = s.sessionId; - break; - } - } --- -2.18.0 diff --git a/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch deleted file mode 100644 index 7179d14e4c1e..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001 -From: "aacid@kde.org" <aacid@kde.org> -Date: Thu, 12 Nov 2020 23:42:48 +0100 -Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed - -And also comes closes to Qt6 compatibility ---- - src/daemon/XorgDisplayServer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp -index 5f93a1b3..d5f29a94 100644 ---- a/src/daemon/XorgDisplayServer.cpp -+++ b/src/daemon/XorgDisplayServer.cpp -@@ -65,7 +65,7 @@ namespace SDDM { - // create a random hexadecimal number - const char *digits = "0123456789abcdef"; - for (int i = 0; i < 32; ++i) -- m_cookie[i] = digits[dis(gen)]; -+ m_cookie[i] = QLatin1Char(digits[dis(gen)]); - } - - XorgDisplayServer::~XorgDisplayServer() { diff --git a/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch deleted file mode 100644 index 6801fa799ead..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/CMakeLists.txt 2020-10-12 13:03:39.000000000 +0200 -+++ b/CMakeLists.txt 2020-10-12 23:40:04.480687143 +0200 -@@ -41,22 +41,6 @@ - # Definitions - add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH) - --# Default build type --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE Release) --endif() -- --# Handle build type --if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug) -- message(STATUS "Debug build") -- add_definitions(-DDEBUG) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") --else() -- message(STATUS "Release build") -- add_definitions(-DNDEBUG) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") --endif() -- - # Default absolute paths - if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR) - set(CMAKE_INSTALL_SYSCONFDIR "/etc") diff --git a/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch b/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch deleted file mode 100644 index f14ff7670c88..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch +++ /dev/null @@ -1,87 +0,0 @@ -From d3953e88a94ec25a87d3c5136517b3d1009cb1fd Mon Sep 17 00:00:00 2001 -From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de> -Date: Wed, 8 May 2019 18:58:53 +0200 -Subject: [PATCH] Revert "Honor PAM's ambient supplemental groups. (#834)" - -This reverts commit 1bc813d08b8130e458a6550ec47fb2bfbe6de080, which -misuses PAM and leads to pulling in all of root's supplemental groups -during session initialization instead of only adding PAM's extra -groups. The problem was masked due to the root user not having any -supplemental groups in some common contexts, like running sddm from a -systemd unit. ---- - src/helper/UserSession.cpp | 57 -------------------------------------- - 1 file changed, 57 deletions(-) - -diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp -index b3aec356..f71fd358 100644 ---- a/src/helper/UserSession.cpp -+++ b/src/helper/UserSession.cpp -@@ -150,67 +150,10 @@ namespace SDDM { - qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); - } -- --#ifdef USE_PAM -- -- // fetch ambient groups from PAM's environment; -- // these are set by modules such as pam_groups.so -- int n_pam_groups = getgroups(0, NULL); -- gid_t *pam_groups = NULL; -- if (n_pam_groups > 0) { -- pam_groups = new gid_t[n_pam_groups]; -- if ((n_pam_groups = getgroups(n_pam_groups, pam_groups)) == -1) { -- qCritical() << "getgroups() failed to fetch supplemental" -- << "PAM groups for user:" << username; -- exit(Auth::HELPER_OTHER_ERROR); -- } -- } else { -- n_pam_groups = 0; -- } -- -- // fetch session's user's groups -- int n_user_groups = 0; -- gid_t *user_groups = NULL; -- if (-1 == getgrouplist(username.constData(), pw.pw_gid, -- NULL, &n_user_groups)) { -- user_groups = new gid_t[n_user_groups]; -- if ((n_user_groups = getgrouplist(username.constData(), -- pw.pw_gid, user_groups, -- &n_user_groups)) == -1 ) { -- qCritical() << "getgrouplist(" << username << ", " << pw.pw_gid -- << ") failed"; -- exit(Auth::HELPER_OTHER_ERROR); -- } -- } -- -- // set groups to concatenation of PAM's ambient -- // groups and the session's user's groups -- int n_groups = n_pam_groups + n_user_groups; -- if (n_groups > 0) { -- gid_t *groups = new gid_t[n_groups]; -- memcpy(groups, pam_groups, (n_pam_groups * sizeof(gid_t))); -- memcpy((groups + n_pam_groups), user_groups, -- (n_user_groups * sizeof(gid_t))); -- -- // setgroups(2) handles duplicate groups -- if (setgroups(n_groups, groups) != 0) { -- qCritical() << "setgroups() failed for user: " << username; -- exit (Auth::HELPER_OTHER_ERROR); -- } -- delete[] groups; -- } -- delete[] pam_groups; -- delete[] user_groups; -- --#else -- - if (initgroups(pw.pw_name, pw.pw_gid) != 0) { - qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); - } -- --#endif /* USE_PAM */ -- - if (setuid(pw.pw_uid) != 0) { - qCritical() << "setuid(" << pw.pw_uid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); diff --git a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch new file mode 100644 index 000000000000..daaf9f52dbcf --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ + message(STATUS "Debug build") + add_definitions(-DDEBUG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") +-else() ++elseif(CMAKE_BUILD_TYPE MATCHES Release) + message(STATUS "Release build") + add_definitions(-DNDEBUG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") diff --git a/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch new file mode 100644 index 000000000000..0388ee894231 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch @@ -0,0 +1,41 @@ +From dac9752495d1467d11e30450989194177677f30a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 21 Oct 2017 14:44:59 2017 +0200 +Subject: [PATCH 2/5] Xsession + +Thanks-to: Joakim Tjernlund <joakim.tjernlund@infinera.com> +Bug: https://bugs.gentoo.org/611210 + +--- + data/scripts/Xsession | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index a971d40..2d84a5a 100755 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -39,6 +39,10 @@ case $SHELL in + ;; + esac + ++# Make D-Bus start properly, see: ++# /etc/X11/xinit/xinitrc.d/80-dbus ++command="$@" ++ + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f /usr/local/etc/xprofile ] && . /usr/local/etc/xprofile + [ -f $HOME/.xprofile ] && . $HOME/.xprofile +@@ -87,8 +91,8 @@ if [ -f "$USERXSESSION" ]; then + . "$USERXSESSION" + fi + +-if [ -z "$*" ]; then ++if [ -z "$command" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +- exec $@ ++ exec $command + fi +-- +2.43.0 + diff --git a/x11-misc/sddm/files/sddm.logrotate b/x11-misc/sddm/files/sddm.logrotate new file mode 100644 index 000000000000..ba6199c416dc --- /dev/null +++ b/x11-misc/sddm/files/sddm.logrotate @@ -0,0 +1,5 @@ +/var/log/sddm.log { + missingok + notifempty + copytruncate +} diff --git a/x11-misc/sddm/files/sddm.tmpfiles b/x11-misc/sddm/files/sddm.tmpfiles deleted file mode 100644 index 300d646138c1..000000000000 --- a/x11-misc/sddm/files/sddm.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/lib/sddm 0755 sddm sddm diff --git a/x11-misc/sddm/sddm-0.18.1-r8.ebuild b/x11-misc/sddm/sddm-0.18.1-r8.ebuild index 6394fe47a726..0f35ab30d4eb 100644 --- a/x11-misc/sddm/sddm-0.18.1-r8.ebuild +++ b/x11-misc/sddm/sddm-0.18.1-r8.ebuild @@ -1,13 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +PATCHSET="${P}-patchset" inherit cmake linux-info systemd tmpfiles DESCRIPTION="Simple Desktop Display Manager" HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" SLOT="0" @@ -42,27 +44,27 @@ RDEPEND="${COMMON_DEPEND} BDEPEND=" dev-python/docutils dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig " PATCHES=( - "${FILESDIR}/${P}-respect-user-flags.patch" - "${FILESDIR}/${P}-Xsession.patch" # bug 611210 - "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" + "${WORKDIR}/${PATCHSET}/${P}-respect-user-flags.patch" + "${WORKDIR}/${PATCHSET}/${P}-Xsession.patch" # bug 611210 + "${WORKDIR}/${PATCHSET}/${PN}-0.18.0-sddmconfdir.patch" # fix for groups: https://github.com/sddm/sddm/issues/1159 - "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" - "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch" + "${WORKDIR}/${PATCHSET}/${P}-revert-honor-PAM-supplemental-groups.patch" + "${WORKDIR}/${PATCHSET}/${P}-honor-PAM-supplemental-groups-v2.patch" # fix for ReuseSession=true - "${FILESDIR}/${P}-only-reuse-online-sessions.patch" + "${WORKDIR}/${PATCHSET}/${P}-only-reuse-online-sessions.patch" # TODO: fix properly - "${FILESDIR}/pam-1.4-substack.patch" + "${WORKDIR}/${PATCHSET}/pam-1.4-substack.patch" # upstream git develop branch: - "${FILESDIR}/${P}-qt-5.15.2.patch" - "${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104 - "${FILESDIR}/${P}-nvidia-glitches-vt-switch.patch" - "${FILESDIR}/${P}-drop-wayland-suffix.patch" - "${FILESDIR}/${P}-fix-qt-5.15.7.patch" # KDE-bug 458865 + "${WORKDIR}/${PATCHSET}/${P}-qt-5.15.2.patch" + "${WORKDIR}/${PATCHSET}/${P}-cve-2020-28049.patch" # bug 753104 + "${WORKDIR}/${PATCHSET}/${P}-nvidia-glitches-vt-switch.patch" + "${WORKDIR}/${PATCHSET}/${P}-drop-wayland-suffix.patch" + "${WORKDIR}/${PATCHSET}/${P}-fix-qt-5.15.7.patch" # KDE-bug 458865 ) pkg_setup() { @@ -93,7 +95,7 @@ src_configure() { src_install() { cmake_src_install - newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" + newtmpfiles "${WORKDIR}/${PATCHSET}/${PN}.tmpfiles" "${PN}.conf" # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement local confd="/usr/share/sddm/sddm.conf.d" diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0.ebuild new file mode 100644 index 000000000000..6aa0a5118fe9 --- /dev/null +++ b/x11-misc/sddm/sddm-0.21.0.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PAM_TAR="${PN}-0.21.0-pam" +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" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +QTMIN=5.15.12 +inherit cmake linux-info optfeature pam systemd tmpfiles + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="+elogind systemd test" + +REQUIRED_USE="^^ ( elogind systemd )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + acct-group/sddm + acct-user/sddm + >=dev-qt/qtcore-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + sys-libs/pam + x11-libs/libXau + x11-libs/libxcb:= + elogind? ( sys-auth/elogind[pam] ) + systemd? ( sys-apps/systemd:=[pam] ) + !systemd? ( sys-power/upower ) +" +DEPEND="${COMMON_DEPEND} + test? ( >=dev-qt/qttest-${QTMIN}:5 ) +" +RDEPEND="${COMMON_DEPEND} + x11-base/xorg-server + !systemd? ( gui-libs/display-manager-init ) +" +BDEPEND=" + dev-python/docutils + >=dev-qt/linguist-tools-${QTMIN}:5 + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +PATCHES=( + # Downstream patches + "${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch" + "${FILESDIR}/${P}-Xsession.patch" # bug 611210 +) + +pkg_setup() { + local CONFIG_CHECK="~DRM" + use kernel_linux && linux-info_pkg_setup +} + +src_unpack() { + [[ ${PV} == *9999* ]] && git-r3_src_unpack + default +} + +src_prepare() { + touch 01gentoo.conf || die + +cat <<-EOF >> 01gentoo.conf +[General] +# Remove qtvirtualkeyboard as InputMethod default +InputMethod= +EOF + + cmake_src_prepare + + if ! use test; then + sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die + cmake_comment_add_subdirectory test + fi + + if use systemd; then + sed -e "/pam_elogind.so/s/elogind/systemd/" \ + -i "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam || die + fi +} + +src_configure() { + local mycmakeargs=( + -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) + -DUSE_ELOGIND=$(usex elogind) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /etc/sddm.conf.d/ + doins "${S}"/01gentoo.conf + + # with systemd logs are sent to journald, so no point to bother in that case + if ! use systemd; then + insinto /etc/logrotate.d + newins "${FILESDIR}/sddm.logrotate" sddm + fi + + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}.pam ${PN} + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-autologin.pam ${PN}-autologin + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam ${PN}-greeter +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" + + elog "NOTE: If SDDM startup appears to hang then entropy pool is too low." + elog "This can be fixed by configuring one of the following:" + elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel" + elog " - # emerge sys-apps/haveged && rc-update add haveged boot" + elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot" + elog + elog "SDDM example config can be shown with:" + elog " ${EROOT}/usr/bin/sddm --example-config" + elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific options." + elog + elog "For more information on how to configure SDDM, please visit the wiki:" + elog " https://wiki.gentoo.org/wiki/SDDM" + if has_version x11-drivers/nvidia-drivers; then + elog + elog " Nvidia GPU owners in particular should pay attention" + elog " to the troubleshooting section." + fi + + optfeature "Weston DisplayServer support (EXPERIMENTAL)" dev-libs/weston + optfeature "KWin DisplayServer support (EXPERIMENTAL)" kde-plasma/kwin + + systemd_reenable sddm.service +} diff --git a/x11-misc/sent/metadata.xml b/x11-misc/sent/metadata.xml index 908ba0fce67e..be2ad39da9bb 100644 --- a/x11-misc/sent/metadata.xml +++ b/x11-misc/sent/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> -<use> -<flag name="savedconfig">Without a saved config.h, this package depends on <pkg>media-gfx/farbfeld</pkg> for image conversions</flag> -</use> + <!-- maintainer-needed --> + <use> + <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>media-gfx/farbfeld</pkg> for image conversions</flag> + </use> </pkgmetadata> diff --git a/x11-misc/sent/sent-1-r1.ebuild b/x11-misc/sent/sent-1-r1.ebuild index 6780cb174a4f..87fe2dfa950e 100644 --- a/x11-misc/sent/sent-1-r1.ebuild +++ b/x11-misc/sent/sent-1-r1.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit savedconfig toolchain-funcs DESCRIPTION="Simple plaintext presentation tool" HOMEPAGE="https://tools.suckless.org/sent/" SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" +S="${WORKDIR}" LICENSE="MIT" SLOT="0" @@ -21,7 +23,6 @@ RDEPEND=" ${DEPEND} !savedconfig? ( media-gfx/farbfeld ) " -S=${WORKDIR} src_prepare() { default diff --git a/x11-misc/sent/sent-9999.ebuild b/x11-misc/sent/sent-9999.ebuild deleted file mode 100644 index 08ec94ec84d1..000000000000 --- a/x11-misc/sent/sent-9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit git-r3 savedconfig toolchain-funcs - -DESCRIPTION="Simple plaintext presentation tool" -HOMEPAGE="https://tools.suckless.org/sent/" -EGIT_REPO_URI="https://git.suckless.org/sent/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" - -DEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXft -" -RDEPEND=" - ${DEPEND} - !savedconfig? ( media-gfx/farbfeld ) -" - -src_prepare() { - default - - sed -i \ - -e 's|^ @| |g' \ - -e 's|@${CC}|$(CC)|g' \ - -e '/^ echo/d' \ - Makefile || die - - restore_config config.h -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - save_config config.h -} diff --git a/x11-misc/set_opacity/metadata.xml b/x11-misc/set_opacity/metadata.xml index 4e4faa35cf5c..eb9043c9e743 100644 --- a/x11-misc/set_opacity/metadata.xml +++ b/x11-misc/set_opacity/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <maintainer> <email>anton.kochkov@gmail.com</email> diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest index 3585101d2d2f..58da0a861bb0 100644 --- a/x11-misc/shared-mime-info/Manifest +++ b/x11-misc/shared-mime-info/Manifest @@ -1,3 +1,5 @@ -DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0 DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e +DIST shared-mime-info-2.3.tar.bz2 6643480 BLAKE2B 2a3adc0568d1be5a17e5a1533f3c4620c6f9d97069ad9e0a0b26ac241c7b14f7d3b9200534df7e1c2295a561d5e049ce8edf8a1e96d2f4e2040508545172a351 SHA512 f1959933e93373ee6939b289d0c3c35d527ce6803865558e4a8bcb5a0183df2fc1148bbf58bfe9a97342e7125f2e0e39ac5dd3bae998510396d9b6c96a330762 +DIST shared-mime-info-2.4.tar.bz2 7096347 BLAKE2B 25ff086e4962f5ab0cb2b7155df02be4af7af63dd0267500b2b12b802680bbae04b9ed252ef5a004d0175f6b48956c5e4b9738af9ab5d2fa76a7a0b6eac067ad SHA512 712f414e80919bf2a0f5083ced44c54a350948a526850466a6e9f35365dcfd97fad8bcdbb29945de2715a8f9b70a108e931c8500209a4d6e3dddf97af02771cb +DIST xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2 28123 BLAKE2B ea107dba0819027e4a0a486db00e76f50a4e32e8e84f366b81490e213456e2c7e1c4a92cc4f92173dd6f94f257455bdcb77e3eb7d0ce8fb699c948d2d5b01f0d SHA512 efccff2672efb3ff0e44e83cfbaf6e2b926146e4a9d6132b14e2d7a88d602af340b3948793306ce5f720ac8b09e5d37d3b356a0cc269e8240b382558c9a3cf10 DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8 diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch deleted file mode 100644 index dedeb61e29cf..000000000000 --- a/x11-misc/shared-mime-info/files/shared-mime-info-2.1-itstool.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz@archlinux.org> -Date: Mon, 8 Nov 2021 18:22:47 -0500 -Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating - translated XML - -gettext upstream has supported this for a very long time (since 0.19.7 -via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015), -and itstool is (mostly) a legacy of the time before gettext had proper -support for these sorts of use cases. - -This is similar to the state of intltool, which is described at -https://wiki.gnome.org/MigratingFromIntltoolToGettext - -During the port from autotools to meson, the legacy use of itstool was -faithfully translated to meson in the only way possible: by jumping -through hoops to run ninja inside ninja in order to generate the .mo -files for itstool, because meson's i18n module used a flawed design and -there was no "real" target to create those files, only a .PHONY -run_target which other rules cannot depend on. - -Although meson 0.60.0 added support for real targets for the built .mo -files, this changed the rules for output filenames, breaking the script. - -But msgfmt does not care, and anyways comes with builtin meson functions -for convenient use with XML files. So let's take this opportunity to -drop legacy dependencies and use the modern, builtin tooling, which -fixes this bug as a side effect. - -Fixes #170 ---- - .gitlab-ci.yml | 2 -- - README.md | 2 +- - data/freedesktop_generate.sh | 12 ------------ - data/meson.build | 16 +++++----------- - meson.build | 1 - - 5 files changed, 6 insertions(+), 27 deletions(-) - delete mode 100755 data/freedesktop_generate.sh - -diff --git a/data/meson.build b/data/meson.build -index 24361c9..09ed7a9 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,18 +1,12 @@ - - install_man('update-mime-database.1') - --freedesktop_org_xml = custom_target('freedesktop.org.xml', -- input : files( -- 'freedesktop.org.xml.in', -- 'its/shared-mime-info.its', -- 'its/shared-mime-info.loc', -- ), -+freedesktop_org_xml = i18n.merge_file( -+ input: 'freedesktop.org.xml.in', - output: 'freedesktop.org.xml', -- command: [ -- find_program('freedesktop_generate.sh'), -- meson.source_root(), -- meson.build_root() -- ], -+ data_dirs: '.', -+ po_dir: '../po', -+ type: 'xml', - install: true, - install_dir: get_option('datadir') / 'mime' / 'packages', - ) -diff --git a/meson.build b/meson.build -index 0d08c8a..60f17ae 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,7 +20,6 @@ - ############################################################################### - # Find tools - --itstool = find_program('itstool') - xmllint = find_program('xmllint') - xmlto = find_program('xmlto') - --- -GitLab - diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch new file mode 100644 index 000000000000..fe868ad709f6 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/915859 +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/12a3a6b1141c704fc594379af1808bb9008d588c + +From 12a3a6b1141c704fc594379af1808bb9008d588c Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Sun, 8 Oct 2023 00:11:49 +0200 +Subject: [PATCH] Fix string literal concatenation + +Clang is not able to disambiguate between multiple string literatals +and C++11 user defined literals. Spaces help. +--- + src/update-mime-database.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 733ba063..29d82a9d 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; + dirs = g_strsplit(env, PATH_SEPARATOR, 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) +@@ -2170,7 +2170,7 @@ static void check_in_path_xdg_data(const char *mime_path) + dirs[n] = g_build_filename(g_get_home_dir(), ".local", + "share", NULL); + n++; +- ++ + for (i = 0; i < n; i++) + { + if (stat(dirs[i], &dir_info) == 0 && +-- +GitLab diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch new file mode 100644 index 000000000000..abf766c07f84 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch @@ -0,0 +1,55 @@ +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/7499ac1a85b2487b94e315e6b55c34bcf220295f + +From 7499ac1a85b2487b94e315e6b55c34bcf220295f Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Sat, 7 Oct 2023 23:45:47 +0200 +Subject: [PATCH] Fix false positive fdatasync detection on darwin + +The `has_function` feature in meson uses different detection methods +depending on the contents of the `prefix` kwarg [1]: + + * if it contains `#include` directives it will copy the prefix into + the test code and check if it compiles + * if it doesn't contain an include or isn't specified, `has_function` + will forward declare the function and test for it's existence by + trying to link it to the default libraries + +The latter approach wrongly succeeds for `fdatasync` on darwin because +the linker binds the function to a system call of the same name. Note +that this result really is wrong because that system call has not +the expected semantics of `fdatasync`. + +By adding an include for `unistd.h` we can get meson to use the +first approach and the detection fails. + +Note that this has gone unnoticed so far because only recent versions +of clang (the default compiler on darwin) started to treat implicit +function declarations as an error. + +[1] https://github.com/mesonbuild/meson/blob/583d2815d1a130227f0f4db47e4ab2e80ebb6a61/mesonbuild/compilers/mixins/clike.py#L839-L846 + +Fixes #211 +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 1780c443..7998a51b 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,12 +49,7 @@ endif + ############################################################################### + # Dependencies + +-check_functions = [ +- 'fdatasync', +-] +-foreach function : check_functions +- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) +-endforeach ++config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>')) + + + if get_option('build-translations') +-- +GitLab diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch new file mode 100644 index 000000000000..18470b3ced24 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch @@ -0,0 +1,282 @@ +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/157c16b09f54741aefbc4be6a3507455f0378389 + +From 157c16b09f54741aefbc4be6a3507455f0378389 Mon Sep 17 00:00:00 2001 +From: Biswapriyo Nath <nathbappai@gmail.com> +Date: Sun, 8 Oct 2023 13:26:43 +0000 +Subject: [PATCH] Fix missing sentinel warning with clang + +This fixes the compiler warnings similar as following. + +../src/update-mime-database.cpp:393:50: warning: missing sentinel in function call [-Wsentinel] + 393 | g_strconcat(namespaceURI, " ", localName, NULL), + | ^ + | , nullptr +--- + src/update-mime-database.cpp | 58 ++++++++++++++++++------------------ + 1 file changed, 29 insertions(+), 29 deletions(-) + +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 29d82a9d..7838a0eb 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -390,7 +390,7 @@ static void add_namespace(Type *type, const char *namespaceURI, + } + + g_hash_table_insert(namespace_hash, +- g_strconcat(namespaceURI, " ", localName, NULL), ++ g_strconcat(namespaceURI, " ", localName, nullptr), + type); + } + +@@ -1023,7 +1023,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data) + char *lower; + + lower = g_ascii_strdown(type->media, -1); +- media = g_strconcat(mime_dir, "/", lower, NULL); ++ media = g_strconcat(mime_dir, "/", lower, nullptr); + g_free(lower); + #ifdef _WIN32 + fs::create_directory(media); +@@ -1032,7 +1032,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data) + #endif + + lower = g_ascii_strdown(type->subtype, -1); +- filename = g_strconcat(media, "/", lower, ".xml.new", NULL); ++ filename = g_strconcat(media, "/", lower, ".xml.new", nullptr); + g_free(lower); + g_free(media); + media = NULL; +@@ -1622,7 +1622,7 @@ static Magic *magic_new(xmlNode *node, Type *type, GError **error) + magic_free(magic); + magic = NULL; + (*error)->message = g_strconcat( +- _("Error in <match> element: "), old, NULL); ++ _("Error in <match> element: "), old, nullptr); + g_free(old); + } else if (magic->matches == NULL) { + magic_free(magic); +@@ -1843,7 +1843,7 @@ static TreeMagic *tree_magic_new(xmlNode *node, Type *type, GError **error) + tree_magic_free(magic); + magic = NULL; + (*error)->message = g_strconcat( +- _("Error in <treematch> element: "), old, NULL); ++ _("Error in <treematch> element: "), old, nullptr); + g_free(old); + } + } +@@ -1960,7 +1960,7 @@ static void delete_old_types(const gchar *mime_dir) + + for (i = 0; i < G_N_ELEMENTS(media_types); i++) + { +- const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], NULL); ++ const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], nullptr); + + if (!fs::is_directory(fs::status(media_dir))) + continue; +@@ -1973,13 +1973,13 @@ static void delete_old_types(const gchar *mime_dir) + continue; + + char *type_name = g_strconcat(media_types[i], "/", +- dir_entry.path().filename().string().c_str(), NULL); ++ dir_entry.path().filename().string().c_str(), nullptr); + type_name[strlen(type_name) - 4] = '\0'; + if (!g_hash_table_lookup(types, type_name)) + { + char *path; + path = g_strconcat(mime_dir, "/", +- type_name, ".xml", NULL); ++ type_name, ".xml", nullptr); + #if 0 + g_warning("Removing old info for type %s", + path); +@@ -2002,7 +2002,7 @@ static void add_ns(gpointer key, gpointer value, gpointer data) + Type *type = (Type *) value; + + g_ptr_array_add(lines, g_strconcat(ns, " ", type->media, +- "/", type->subtype, "\n", NULL)); ++ "/", type->subtype, "\n", nullptr)); + } + + /* Write all the collected namespace rules to 'XMLnamespaces' */ +@@ -2038,7 +2038,7 @@ static void write_subclass(gpointer key, gpointer value, gpointer data) + + for (l = list; l; l = l->next) + { +- line = g_strconcat (static_cast<const gchar *>(key), " ", l->data, "\n", NULL); ++ line = g_strconcat (static_cast<const gchar *>(key), " ", l->data, "\n", nullptr); + fwrite(line, 1, strlen(line), stream); + g_free (line); + } +@@ -2061,7 +2061,7 @@ static void add_alias(gpointer key, gpointer value, gpointer data) + + g_ptr_array_add(lines, g_strconcat(alias, " ", type->media, + "/", type->subtype, "\n", +- NULL)); ++ nullptr)); + } + + /* Write all the collected aliases */ +@@ -2092,7 +2092,7 @@ static void add_type(gpointer key, gpointer value, gpointer data) + { + GPtrArray *lines = (GPtrArray *) data; + +- g_ptr_array_add(lines, g_strconcat((char *)key, "\n", NULL)); ++ g_ptr_array_add(lines, g_strconcat((char *)key, "\n", nullptr)); + } + + /* Write all the collected types */ +@@ -2127,7 +2127,7 @@ static void write_one_icon(gpointer key, gpointer value, gpointer data) + FILE *stream = (FILE *)data; + char *line; + +- line = g_strconcat (mimetype, ":", iconname, "\n", NULL); ++ line = g_strconcat (mimetype, ":", iconname, "\n", nullptr); + fwrite(line, 1, strlen(line), stream); + g_free (line); + } +@@ -2168,7 +2168,7 @@ static void check_in_path_xdg_data(const char *mime_path) + dirs[n] = g_strdup(env); + else + dirs[n] = g_build_filename(g_get_home_dir(), ".local", +- "share", NULL); ++ "share", nullptr); + n++; + + for (i = 0; i < n; i++) +@@ -3588,7 +3588,7 @@ newest_mtime(const char *packagedir) + while ((name = g_dir_read_name(dir))) { + char *path; + +- path = g_build_filename(packagedir, name, NULL); ++ path = g_build_filename(packagedir, name, nullptr); + retval = g_stat(path, &statbuf); + g_free(path); + if (retval < 0) +@@ -3609,7 +3609,7 @@ is_cache_up_to_date (const char *mimedir, const char *packagedir) + char *mimeversion; + int retval; + +- mimeversion = g_build_filename(mimedir, "/version", NULL); ++ mimeversion = g_build_filename(mimedir, "/version", nullptr); + retval = g_stat(mimeversion, &version_stat); + g_free(mimeversion); + if (retval < 0) +@@ -3694,7 +3694,7 @@ int main(int argc, char **argv) + } + } + +- package_dir = g_strconcat(mime_dir, "/packages", NULL); ++ package_dir = g_strconcat(mime_dir, "/packages", nullptr); + + if (!fs::exists(mime_dir) && !fs::is_directory(fs::status(mime_dir))) + { +@@ -3747,7 +3747,7 @@ int main(int argc, char **argv) + + g_hash_table_foreach(globs_hash, collect_glob2, &glob_list); + glob_list = g_list_sort(glob_list, (GCompareFunc)compare_glob_by_weight); +- globs_path = g_strconcat(mime_dir, "/globs.new", NULL); ++ globs_path = g_strconcat(mime_dir, "/globs.new", nullptr); + globs = fopen_gerror(globs_path, error); + if (!globs) + goto out; +@@ -3761,7 +3761,7 @@ int main(int argc, char **argv) + goto out; + g_free(globs_path); + +- globs_path = g_strconcat(mime_dir, "/globs2.new", NULL); ++ globs_path = g_strconcat(mime_dir, "/globs2.new", nullptr); + globs = fopen_gerror(globs_path, error); + if (!globs) + goto out; +@@ -3782,7 +3782,7 @@ int main(int argc, char **argv) + FILE *stream; + char *magic_path; + int i; +- magic_path = g_strconcat(mime_dir, "/magic.new", NULL); ++ magic_path = g_strconcat(mime_dir, "/magic.new", nullptr); + stream = fopen_gerror(magic_path, error); + if (!stream) + goto out; +@@ -3807,7 +3807,7 @@ int main(int argc, char **argv) + FILE *stream; + char *ns_path; + +- ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", NULL); ++ ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", nullptr); + stream = fopen_gerror(ns_path, error); + if (!stream) + goto out; +@@ -3823,7 +3823,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/subclasses.new", NULL); ++ path = g_strconcat(mime_dir, "/subclasses.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3839,7 +3839,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/aliases.new", NULL); ++ path = g_strconcat(mime_dir, "/aliases.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3855,7 +3855,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/types.new", NULL); ++ path = g_strconcat(mime_dir, "/types.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3871,7 +3871,7 @@ int main(int argc, char **argv) + FILE *stream; + char *icon_path; + +- icon_path = g_strconcat(mime_dir, "/generic-icons.new", NULL); ++ icon_path = g_strconcat(mime_dir, "/generic-icons.new", nullptr); + stream = fopen_gerror(icon_path, error); + if (!stream) + goto out; +@@ -3887,7 +3887,7 @@ int main(int argc, char **argv) + FILE *stream; + char *icon_path; + +- icon_path = g_strconcat(mime_dir, "/icons.new", NULL); ++ icon_path = g_strconcat(mime_dir, "/icons.new", nullptr); + stream = fopen_gerror(icon_path, error); + if (!stream) + goto out; +@@ -3903,7 +3903,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + int i; +- path = g_strconcat(mime_dir, "/treemagic.new", NULL); ++ path = g_strconcat(mime_dir, "/treemagic.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3928,7 +3928,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/mime.cache.new", NULL); ++ path = g_strconcat(mime_dir, "/mime.cache.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3944,7 +3944,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/version.new", NULL); ++ path = g_strconcat(mime_dir, "/version.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +-- +GitLab diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch new file mode 100644 index 000000000000..22d2349053f5 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/917561 +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/219 +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573 + +From c918fe77e255150938e83a6aec259f153d303573 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sun, 19 Nov 2023 11:18:11 +0100 +Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 + +Fixes #219 +--- a/src/test-subclassing.c ++++ b/src/test-subclassing.c +@@ -1,4 +1,5 @@ + #include <libxml/tree.h> ++#include <libxml/parser.h> + #include <stdio.h> + #include <string.h> + +-- +GitLab diff --git a/x11-misc/shared-mime-info/metadata.xml b/x11-misc/shared-mime-info/metadata.xml index d4390c2eb58e..b133711a480e 100644 --- a/x11-misc/shared-mime-info/metadata.xml +++ b/x11-misc/shared-mime-info/metadata.xml @@ -4,4 +4,7 @@ <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xdg/shared-mime-info</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild deleted file mode 100644 index 0957f1fa1a14..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -HASH=0ee50652091363ab0d17e335e5e74fbe # don't forget to update on version bumps -inherit meson xdg-utils - -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" -SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# requires installed xdgmime binary -RESTRICT="test" - -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 -" -DEPEND="${RDEPEND}" - -DOCS=( HACKING.md NEWS README.md ) - -PATCHES=( - "${FILESDIR}/shared-mime-info-2.1-itstool.patch" -) - -src_install() { - meson_src_install - - # in prefix, install an env.d entry such that prefix patch is used/added - if use prefix; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die - doenvd "${T}"/50mimeinfo - fi -} - -pkg_postinst() { - use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share - xdg_mimeinfo_database_update -} diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild index baf056de38bb..37199f3b2e5e 100644 --- a/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild +++ b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild @@ -16,7 +16,7 @@ SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDG LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild new file mode 100644 index 000000000000..e63535b1ac2d --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg-utils + +# xdgmime is used for tests but doesn't make releases nowadays; do what +# Fedora does and use a snapshot so we can run the test suite. +MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7" +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" +SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2" +SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 +" +DEPEND="${RDEPEND}" + +DOCS=( HACKING.md NEWS README.md ) + +PATCHES=( + "${FILESDIR}"/${P}-clang-string-literal.patch + "${FILESDIR}"/${P}-fsync-detection.patch + "${FILESDIR}"/${P}-wformat.patch +) + +src_prepare() { + default + + if use test ; then + # Drop empty dir (it's a submodule in upstream git repo) + rm -r "${S}"/xdgmime || die + # Lead Meson to our snapshot + mkdir "${WORKDIR}"/xdgmime_build || die + ln -s "${WORKDIR}"/xdgmime_build xdgmime || die + # Don't break parallel make + #sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die + fi +} + +src_configure() { + # We have to trick Meson into thinking it's there now so that + # we can run meson then emake to build xdgmime later, rather than + # building before running meson which would mean doing something + # unexpected in src_configure. + if use test ; then + # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 + mkdir xdgmime/src || die + touch xdgmime/src/{print,test}-mime{,-data} || die + chmod +x xdgmime/src/{print,test}-mime{,-data} || die + + BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure + fi + + local emesonargs=( + -Dbuild-tools=true + -Dupdate-mimedb=false + $(meson_use test build-tests) + ) + + meson_src_configure +} + +src_compile() { + if use test ; then + meson_src_compile -C "${WORKDIR}"/xdgmime_build + fi + + meson_src_compile +} + +src_install() { + meson_src_install + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + xdg_mimeinfo_database_update +} diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild new file mode 100644 index 000000000000..4416469b12f3 --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg-utils + +# xdgmime is used for tests but doesn't make releases nowadays; do what +# Fedora does and use a snapshot so we can run the test suite. +MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7" +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" +SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2" +SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 +" +DEPEND="${RDEPEND}" + +DOCS=( HACKING.md NEWS README.md ) + +PATCHES=( + "${FILESDIR}"/${P}-libxml2.12.patch +) + +src_prepare() { + default + + if use test ; then + # Drop empty dir (it's a submodule in upstream git repo) + rm -r "${S}"/xdgmime || die + # Lead Meson to our snapshot + mkdir "${WORKDIR}"/xdgmime_build || die + ln -s "${WORKDIR}"/xdgmime_build xdgmime || die + # Don't break parallel make + #sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die + fi +} + +src_configure() { + # We have to trick Meson into thinking it's there now so that + # we can run meson then emake to build xdgmime later, rather than + # building before running meson which would mean doing something + # unexpected in src_configure. + if use test ; then + # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 + mkdir xdgmime/src || die + touch xdgmime/src/{print,test}-mime{,-data} || die + chmod +x xdgmime/src/{print,test}-mime{,-data} || die + + BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure + fi + + local emesonargs=( + -Dbuild-tools=true + -Dupdate-mimedb=false + $(meson_use test build-tests) + ) + + meson_src_configure +} + +src_compile() { + if use test ; then + meson_src_compile -C "${WORKDIR}"/xdgmime_build + fi + + meson_src_compile +} + +src_install() { + meson_src_install + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + xdg_mimeinfo_database_update +} diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest index ab38e67eb736..d699fffab8e6 100644 --- a/x11-misc/shutter/Manifest +++ b/x11-misc/shutter/Manifest @@ -1 +1 @@ -DIST shutter-0.99.2.tar.gz 1733886 BLAKE2B 19596b5385a11f179c9fbbf81a97f2a5d9661d52d14f33be72595c26c096548095aa6cdbbc4932413f0a3103b30a78e2e870d2e7e904fb9cf0fd17ee43ad45fb SHA512 5fcb094f0e6f732da3648e58ef62aa1e5537132ffb0bff80972e1891f58fe5e63ec63bc7bec63e84268c095e3cd43d60d358be61e2d050dfcc49ffb042d34cfb +DIST shutter-0.99.4.tar.gz 1734992 BLAKE2B 410e73f784f0d83638867132669a00fe89c06af622f3024e52b5b5700c1a431b4ad50f9066c267cd76f9be48ce6ff88eab4348d2d4dff28b4ae7e0267eb7bc41 SHA512 57f7fdc1066375942bd1a9db381a8ba6f24fafbd5e0853a4dd19016438ec2f3cb039ebe90038d282bc07f6e45af9cdbb6f180f55e43357231b41818b8555347b diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml index dcca12cfc22d..1c759a0a2823 100644 --- a/x11-misc/shutter/metadata.xml +++ b/x11-misc/shutter/metadata.xml @@ -9,4 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">shutter-project/shutter</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/shutter/shutter-0.99.2.ebuild b/x11-misc/shutter/shutter-0.99.4-r1.ebuild index f428414ecaa2..c2b4f443b835 100644 --- a/x11-misc/shutter/shutter-0.99.2.ebuild +++ b/x11-misc/shutter/shutter-0.99.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,18 +11,20 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-lang/perl + dev-libs/libayatana-appindicator dev-perl/Carp-Always dev-perl/libxml-perl - dev-perl/libwww-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 - >=dev-perl/Gtk3-ImageView-10 + dev-perl/Gtk3-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which @@ -30,25 +32,32 @@ RDEPEND=" dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext + dev-perl/Moo dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally - dev-perl/WWW-Mechanize dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection] " -BDEPEND="sys-devel/gettext" +BDEPEND=" + sys-devel/gettext + test? ( dev-perl/Test-MockModule ) +" src_prepare() { hprefixify bin/shutter default } +src_test() { + prove -I share/shutter/resources/modules/ -I t/lib t -r || die +} + src_install() { dobin bin/shutter dodoc README @@ -62,7 +71,7 @@ src_install() { doins -r share/icons insinto /usr/share/metainfo - doins share/appdata/shutter.appdata.xml + doins share/metainfo/shutter.metainfo.xml # .po doesn't belong to installed system, only .mo rm -r "${ED}"/usr/share/shutter/resources/po || die @@ -78,5 +87,5 @@ pkg_postinst() { xdg_pkg_postinst optfeature "writing Exif information" media-libs/exiftool - optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class" + optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Path-Class" } diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest index d0638d550cf4..0236f4cb80fe 100644 --- a/x11-misc/slim/Manifest +++ b/x11-misc/slim/Manifest @@ -1 +1 @@ -DIST slim-1.3.6.tar.gz 232547 BLAKE2B 3df58fa128cdf2b2ab005e8f41fccc076cfcf8adf7767075539f2b8edf51a92660b031837b3cdaccb261f1c1eb24104100317fd4e68ad0298242502d4e6bb506 SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c +DIST slim-1.4.0.tar.gz 530318 BLAKE2B 507f22d09a3449b870bb5fd5a5f0ab1002ceee5372c82f702582809a5fc442088c17d79fedff6712e198cee672696388479604a194e5729c7bc12139770c833d SHA512 2ef38d39e2d5186f9342161d99740b0c8cd87f234deaf550ca1528c9a61c052d26123c7da26f4a0a5e658d01cb200b115cf7879d349ed51a6e8c729ee3fdf77f diff --git a/x11-misc/slim/files/slim-1.3.5-arm.patch b/x11-misc/slim/files/slim-1.3.5-arm.patch deleted file mode 100644 index 9438ce4a1caf..000000000000 --- a/x11-misc/slim/files/slim-1.3.5-arm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Ck.cpp 2012-06-26 04:20:14.000000000 -0400 -+++ b/Ck.cpp 2012-10-05 13:25:29.000000000 -0400 -@@ -91,7 +91,7 @@ - - vt = *((long *)return_value); - -- std::snprintf(device, 32, "/dev/tty%ld", vt); -+ std::sprintf(device, "/dev/tty%ld", vt); - - if(return_value) - XFree(return_value); diff --git a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch b/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch deleted file mode 100644 index f7e361767615..000000000000 --- a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff -Naur slim-1.3.5/app.cpp slim-1.3.5.new/app.cpp ---- slim-1.3.5/app.cpp 2012-12-31 08:03:42.000000000 -0500 -+++ slim-1.3.5.new/app.cpp 2013-08-22 14:16:37.994854259 -0400 -@@ -138,11 +138,14 @@ - daemonmode = false; - force_nodaemon = false; - firstlogin = true; -+#ifdef USE_CONSOLEKIT -+ consolekit_support_enabled = true; -+#endif - Dpy = NULL; - - /* Parse command line - Note: we force a option for nodaemon switch to handle "-nodaemon" */ -- while((tmp = getopt(argc, argv, "vhp:n:d?")) != EOF) { -+ while((tmp = getopt(argc, argv, "vhsp:n:d?")) != EOF) { - switch (tmp) { - case 'p': /* Test theme */ - testtheme = optarg; -@@ -163,6 +166,11 @@ - std::cout << APPNAME << " version " << VERSION << endl; - exit(OK_EXIT); - break; -+#ifdef USE_CONSOLEKIT -+ case 's': /* Disable consolekit support */ -+ consolekit_support_enabled = false; -+ break; -+#endif - case '?': /* Illegal */ - logStream << endl; - case 'h': /* Help */ -@@ -171,6 +179,9 @@ - << " -d: daemon mode" << endl - << " -nodaemon: no-daemon mode" << endl - << " -v: show version" << endl -+#ifdef USE_CONSOLEKIT -+ << " -s: start for systemd, disable consolekit support" << endl -+#endif - << " -p /path/to/theme/dir: preview theme" << endl; - exit(OK_EXIT); - break; -@@ -559,6 +570,7 @@ - #endif - - #ifdef USE_CONSOLEKIT -+ if (consolekit_support_enabled) { - /* Setup the ConsoleKit session */ - try { - ck.open_session(DisplayName, pw->pw_uid); -@@ -567,6 +579,7 @@ - logStream << APPNAME << ": " << e << endl; - exit(ERR_EXIT); - } -+ } - #endif - - /* Create new process */ -@@ -578,6 +591,7 @@ - char** child_env = pam.getenvlist(); - - # ifdef USE_CONSOLEKIT -+ if (consolekit_support_enabled) { - char** old_env = child_env; - - /* Grow the copy of the environment for the session cookie */ -@@ -590,6 +604,7 @@ - memcpy(child_env, old_env, sizeof(char*)*n+1); - child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); - child_env[n] = NULL; -+ } - # endif /* USE_CONSOLEKIT */ - #else - -@@ -611,6 +626,7 @@ - child_env[n++]=StrConcat("MAIL=", maildir.c_str()); - child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str()); - # ifdef USE_CONSOLEKIT -+ if (consolekit_support_enabled) - child_env[n++]=StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); - # endif /* USE_CONSOLEKIT */ - child_env[n++]=0; -@@ -656,12 +672,14 @@ - } - - #ifdef USE_CONSOLEKIT -+ if (consolekit_support_enabled) { - try { - ck.close_session(); - } - catch(Ck::Exception &e) { - logStream << APPNAME << ": " << e << endl; - }; -+ } - #endif - - #ifdef USE_PAM -diff -Naur slim-1.3.5/app.h slim-1.3.5.new/app.h ---- slim-1.3.5/app.h 2012-12-31 08:03:42.000000000 -0500 -+++ slim-1.3.5.new/app.h 2013-08-22 14:12:45.536850016 -0400 -@@ -108,6 +108,10 @@ - char *testtheme; - bool testing; - -+#ifdef USE_CONSOLEKIT -+ bool consolekit_support_enabled; -+#endif -+ - std::string themeName; - std::string mcookie; - -diff -Naur slim-1.3.5/slim.service slim-1.3.5.new/slim.service ---- slim-1.3.5/slim.service 2012-12-31 08:03:42.000000000 -0500 -+++ slim-1.3.5.new/slim.service 2013-08-22 14:15:39.186853186 -0400 -@@ -3,7 +3,7 @@ - After=systemd-user-sessions.service - - [Service] --ExecStart=/usr/bin/slim -nodaemon -+ExecStart=/usr/bin/slim -nodaemon -s - - [Install] - Alias=display-manager.service diff --git a/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch b/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch deleted file mode 100644 index f137d94e8367..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur slim-1.3.6.orig/panel.cpp slim-1.3.6/panel.cpp ---- slim-1.3.6.orig/panel.cpp 2014-06-18 11:04:57.958630814 -0400 -+++ slim-1.3.6/panel.cpp 2014-06-18 11:05:10.675631393 -0400 -@@ -11,6 +11,7 @@ - - #include <sstream> - #include <poll.h> -+#include <libgen.h> - #include <X11/extensions/Xrandr.h> - #include "panel.h" - diff --git a/x11-misc/slim/files/slim-1.3.6-config.diff b/x11-misc/slim/files/slim-1.3.6-config.diff deleted file mode 100644 index 561e6a99273c..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-config.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- a/slim.conf.orig 2010-08-25 11:52:23.000000000 -0400 -+++ b/slim.conf 2010-08-25 11:58:58.000000000 -0400 -@@ -2,7 +2,7 @@ - # Note: -xauth $authfile is automatically appended - default_path /bin:/usr/bin:/usr/local/bin - default_xserver /usr/bin/X --#xserver_arguments -dpi 75 -+xserver_arguments -nolisten tcp -br -deferglyphs 16 vt07 - - # Commands for halt, login, etc. - halt_cmd /sbin/shutdown -h now -@@ -18,7 +18,7 @@ - - - # Activate numlock when slim starts. Valid values: on|off --# numlock on -+numlock on - - # Hide the mouse cursor (note: does not work with some WMs). - # Valid values: true|false -@@ -33,7 +33,8 @@ - # to adjust the command according to your preferred shell, - # i.e. for freebsd use: - # login_cmd exec /bin/sh - ~/.xinitrc %session --login_cmd exec /bin/bash -login ~/.xinitrc %session -+# login_cmd exec /bin/bash -login ~/.xinitrc %session -+login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session - - # Commands executed when starting and exiting a session. - # They can be used for registering a X11 session with -@@ -41,20 +42,30 @@ - # - # sessionstart_cmd some command - # sessionstop_cmd some command -+sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user -+sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user - - # Start in daemon mode. Valid values: yes | no - # Note that this can be overriden by the command line - # options "-d" and "-nodaemon" --# daemon yes -+daemon yes - --# Available sessions (first one is the default). --# The current chosen session name is replaced in the login_cmd -+# Available sessions: -+# The current chosen session name replaces %session in the login_cmd - # above, so your login command can handle different sessions. -+# If no session is chosen (via F1), %session will be an empty string. - # see the xinitrc.sample file shipped with slim sources --sessions xfce4,icewm-session,wmaker,blackbox -+#sessions xfce4,icewm-session,wmaker,blackbox -+# Alternatively, read available sessions from a directory of scripts: -+#sessiondir /etc/X11/Sessions -+# Or, read available sessions from the xsessions desktop files -- -+# note that this may provide a full path to the session executable! -+sessiondir /usr/share/xsessions - --# Executed when pressing F11 (requires imagemagick) -+# Executed when pressing F11 (requires media-gfx/imagemagick for import) -+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info. - screenshot_cmd import -window root /slim.png -+#screenshot_cmd scrot /root/slim.png - - # welcome message. Available variables: %host, %domain - welcome_msg Welcome to %host -@@ -83,8 +91,8 @@ - # randomly choose from - current_theme default - --# Lock file --lockfile /var/run/slim.lock -+# Lock file, /etc/init.d/xdm expects slim.pid -+lockfile /run/slim.pid - - # Log file - logfile /var/log/slim.log diff --git a/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch b/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch deleted file mode 100644 index cf2106a8a8eb..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt 2014-02-28 10:38:48.655262163 -0500 -+++ b/CMakeLists.txt 2014-02-28 10:47:01.671271162 -0500 -@@ -96,7 +96,6 @@ - find_package(Freetype REQUIRED) - find_package(JPEG REQUIRED) - find_package(PNG REQUIRED) --find_package(ZLIB REQUIRED) - - # Fontconfig - set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH}) diff --git a/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch b/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch deleted file mode 100644 index b3787dd58459..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/app.cpp 2015-09-14 12:00:00.460481656 -0400 -+++ b/app.cpp 2015-09-14 14:41:10.970536588 -0400 -@@ -606,9 +606,9 @@ - - n++; - -- child_env = static_cast<char**>(malloc(sizeof(char*)*n)); -- memcpy(child_env, old_env, sizeof(char*)*n+1); -- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); -+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1))); -+ memcpy(child_env, old_env, sizeof(char*)*n); -+ child_env[n-1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); - child_env[n] = NULL; - } - # endif /* USE_CONSOLEKIT */ diff --git a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch deleted file mode 100644 index d5fc4db4838d..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/CMakeLists.txt 2013-10-27 21:24:21.193802669 -0400 -+++ b/CMakeLists.txt 2013-10-27 21:26:54.127806951 -0400 -@@ -220,7 +220,6 @@ - ####### install - # slim - install(TARGETS slim RUNTIME DESTINATION bin) --install(TARGETS slimlock RUNTIME DESTINATION bin) - - if (BUILD_SHARED_LIBS) - set_target_properties(libslim PROPERTIES -@@ -235,8 +234,14 @@ - - # man file - install(FILES slim.1 DESTINATION ${MANDIR}/man1/) --install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/) - # configure - install(FILES slim.conf DESTINATION ${SYSCONFDIR}) -+ -+#slimlock -+if(BUILD_SLIMLOCK) -+install(TARGETS slimlock RUNTIME DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID) -+install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/) -+endif(BUILD_SLIMLOCK) -+ - # themes directory - subdirs(themes) diff --git a/x11-misc/slim/files/slim-1.3.6-freetype.patch b/x11-misc/slim/files/slim-1.3.6-freetype.patch deleted file mode 100644 index fe2aa60ad1b6..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-freetype.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- a/CMakeLists.txt.orig 2014-11-11 20:38:40.706121207 +0100 -+++ b/CMakeLists.txt 2014-11-11 20:39:34.206120264 +0100 -@@ -165,7 +165,7 @@ include_directories( - ${X11_Xft_INCLUDE_PATH} - ${X11_Xrender_INCLUDE_PATH} - ${X11_Xrandr_INCLUDE_PATH} -- ${FREETYPE_INCLUDE_DIR_freetype2} -+ ${FREETYPE_INCLUDE_DIRS} - ${X11_Xmu_INCLUDE_PATH} - ${ZLIB_INCLUDE_DIR} - ${JPEG_INCLUDE_DIR} diff --git a/x11-misc/slim/files/slim-1.3.6-gcc11.patch b/x11-misc/slim/files/slim-1.3.6-gcc11.patch deleted file mode 100644 index a6b07c637780..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-gcc11.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/786498 ---- a/panel.cpp -+++ b/panel.cpp -@@ -48,7 +48,7 @@ - gcm = GCGraphicsExposures; - gcv.graphics_exposures = False; - WinGC = XCreateGC(Dpy, Win, gcm, &gcv); -- if (WinGC < 0) { -+ if (WinGC == 0) { - cerr << APPNAME - << ": failed to create pixmap\n."; - exit(ERR_EXIT); diff --git a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch deleted file mode 100644 index 2a43be75fb02..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt 2013-10-01 18:38:05.000000000 -0400 -+++ b/CMakeLists.txt.new 2013-10-15 11:33:18.975741094 -0400 -@@ -42,11 +42,6 @@ - set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"") - set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"") - --# Flags --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2") --set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2") --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2") -- - # source - set(slim_srcs - main.cpp diff --git a/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch b/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch deleted file mode 100644 index 11e39dc97628..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/CMakeLists.txt 2013-10-15 11:35:16.688739802 -0400 -+++ b/CMakeLists.txt 2013-10-15 11:53:46.185727620 -0400 -@@ -115,6 +115,7 @@ - message("\tPAM Found") - set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") - target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) -+ target_link_libraries(libslim ${PAM_LIBRARY}) - target_link_libraries(slimlock ${PAM_LIBRARY}) - include_directories(${PAM_INCLUDE_DIR}) - else(PAM_FOUND) -@@ -173,7 +174,10 @@ - ) - - target_link_libraries(libslim -- ${JPEG_LIBRARIES} -+ ${RT_LIB} -+ ${X11_Xft_LIB} -+ ${X11_Xrandr_LIB} -+ ${JPEG_LIBRARIES} - ${PNG_LIBRARIES} - ) - -@@ -228,8 +228,8 @@ - SOVERSION ${SLIM_VERSION}) - - install(TARGETS libslim -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SIFFUX} - ) - endif (BUILD_SHARED_LIBS) - diff --git a/x11-misc/slim/files/slim-1.3.6-session-chooser.patch b/x11-misc/slim/files/slim-1.3.6-session-chooser.patch deleted file mode 100644 index b43c9a307605..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-session-chooser.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- a/cfg.cpp 2013-10-01 18:38:05.000000000 -0400 -+++ b/cfg.cpp 2013-10-24 12:12:20.584103253 -0400 -@@ -274,14 +274,14 @@ - while (true) { - string::const_iterator begin = s; - while (*s != c && s != str.end()) { ++s; } -- tmp = string(begin, s); -- if (useEmpty || tmp.size() > 0) -+ tmp = string(begin, s); -+ if (useEmpty || tmp.size() > 0) - v.push_back(tmp); - if (s == str.end()) { - break; - } - if (++s == str.end()) { -- if (useEmpty) -+ if (useEmpty) - v.push_back(""); - break; - } -@@ -289,6 +289,7 @@ - } - - void Cfg::fillSessionList(){ -+ string strSessionList = getOption("sessions"); - string strSessionDir = getOption("sessiondir"); - - sessions.clear(); -@@ -307,29 +308,29 @@ - struct stat oFileStat; - - if (stat(strFile.c_str(), &oFileStat) == 0) { -- if (S_ISREG(oFileStat.st_mode) && -- access(strFile.c_str(), R_OK) == 0){ -- ifstream desktop_file( strFile.c_str() ); -- if (desktop_file){ -- string line, session_name = "", session_exec = ""; -- while (getline( desktop_file, line )) { -- if (line.substr(0, 5) == "Name=") { -- session_name = line.substr(5); -- if (!session_exec.empty()) -- break; -- } else -- if (line.substr(0, 5) == "Exec=") { -- session_exec = line.substr(5); -- if (!session_name.empty()) -- break; -- } -- } -- desktop_file.close(); -- pair<string,string> session(session_name,session_exec); -- sessions.push_back(session); -- cout << session_exec << " - " << session_name << endl; -- } -- -+ if (S_ISREG(oFileStat.st_mode) && -+ access(strFile.c_str(), R_OK) == 0){ -+ ifstream desktop_file( strFile.c_str() ); -+ if (desktop_file){ -+ string line, session_name = "", session_exec = ""; -+ while (getline( desktop_file, line )) { -+ if (line.substr(0, 5) == "Name=") { -+ session_name = line.substr(5); -+ if (!session_exec.empty()) break; -+ } else if (line.substr(0, 5) == "Exec=") { -+ session_exec = line.substr(5); -+ if (!session_name.empty()) break; -+ } -+ } -+ desktop_file.close(); -+ if (!session_name.empty() && !session_exec.empty()) { -+ pair<string,string> session(session_name,session_exec); -+ sessions.push_back(session); -+ } else if (access(strFile.c_str(), X_OK) == 0) { -+ pair<string,string> session(string(pDirent->d_name),strFile); -+ sessions.push_back(session); -+ } -+ } - } - } - } -@@ -338,8 +339,18 @@ - } - - if (sessions.empty()){ -- pair<string,string> session("",""); -- sessions.push_back(session); -+ if (strSessionList.empty()) { -+ pair<string,string> session("",""); -+ sessions.push_back(session); -+ } else { -+ // iterate through the split of the session list -+ vector<string> sessit; -+ split(sessit,strSessionList,',',false); -+ for (vector<string>::iterator it = sessit.begin(); it != sessit.end(); ++it) { -+ pair<string,string> session(*it,*it); -+ sessions.push_back(session); -+ } -+ } - } - } - ---- a/app.cpp 2013-10-24 12:16:59.870111072 -0400 -+++ b/app.cpp 2013-10-24 12:29:59.899132910 -0400 -@@ -377,10 +377,6 @@ - LoginPanel->SetName(cfg->getOption("default_user") ); - } - -- if (firstloop) { -- LoginPanel->SwitchSession(); -- } -- - if (!AuthenticateUser(focuspass && firstloop)){ - panelclosed = 0; - firstloop = false; diff --git a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch deleted file mode 100644 index 9ffa19ce0537..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt 2013-10-15 12:02:13.463722050 -0400 -+++ b/CMakeLists.txt 2013-10-17 09:41:41.602917345 -0400 -@@ -238,10 +238,6 @@ - install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/) - # configure - install(FILES slim.conf DESTINATION ${SYSCONFDIR}) --# systemd service file --if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -- install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system) --endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - # themes directory - subdirs(themes) - diff --git a/x11-misc/slim/files/slim-1.3.6-systemd-session.patch b/x11-misc/slim/files/slim-1.3.6-systemd-session.patch deleted file mode 100644 index 0639aeb5f185..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-systemd-session.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/app.cpp 2013-10-23 16:19:57.074100282 -0400 -+++ b/app.cpp 2013-10-23 16:33:13.302122574 -0400 -@@ -829,8 +829,13 @@ - - StopServer(); - RemoveLock(); -- while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */ -- Run(); -+ if (force_nodaemon) { -+ delete LoginPanel; -+ exit(ERR_EXIT); /* use ERR_EXIT so that systemd's RESTART=on-failure works */ -+ } else { -+ while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */ -+ Run(); -+ } - } - - void App::KillAllClients(Bool top) { ---- a/slim.service 2013-10-23 16:19:57.074100282 -0400 -+++ b/slim.service 2013-10-23 16:45:14.901142776 -0400 -@@ -4,6 +4,7 @@ - - [Service] - ExecStart=/usr/bin/slim -nodaemon -s -+Restart=on-failure - - [Install] - Alias=display-manager.service -Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes diff --git a/x11-misc/slim/files/slim-1.4.0-config.diff b/x11-misc/slim/files/slim-1.4.0-config.diff new file mode 100644 index 000000000000..1a92a66a6f43 --- /dev/null +++ b/x11-misc/slim/files/slim-1.4.0-config.diff @@ -0,0 +1,48 @@ +Index: slim-fork-code/slim.conf +Customize the configuration file to suit Gentoo practice +=================================================================== +--- a/slim.conf (revision 54) ++++ b/slim.conf (working copy) +@@ -21,7 +21,7 @@ + + # Activate numlock when slim starts. Valid values: on|off + # Default is to not change it +-#numlock on ++numlock on + + # Hide the mouse cursor (note: does not work with some WMs). + # Valid values: true|false +@@ -35,7 +35,8 @@ + # NOTE: if your system does not have bash you need to adjust the command + # according to your preferred shell, e.g. for freebsd use: + # login_cmd exec /bin/sh - ~/.xinitrc %session +-login_cmd exec /bin/bash -login ~/.xinitrc %session ++#login_cmd exec /bin/bash -login ~/.xinitrc %session ++login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session + + # Commands executed when starting and exiting a session. + # They can be used for registering a X11 session with +@@ -65,11 +66,12 @@ + # %session is the Exec= value -- note that this may provide a full + # path to the session executable! + #sessiondir /usr/share/xsessions ++sessiondir /etc/X11/Sessions + + +-# Executed when pressing F11 (requires imagemagick) ++# Executed when pressing F11 (requires media-gfx/imagemagick for import) + screenshot_cmd import -window root /slim.png +-# Alternative using scrot. ++# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info. + #screenshot_cmd scrot /root/slim.png + + # Delay after failed authentication before allowing another attempt +@@ -102,7 +104,7 @@ + # randomly choose from + current_theme default + +-# Lock file ++# Lock file, /etc/init.d/xdm expects slim.pid + lockfile /run/slim.pid + + # Log file - full path for a file, or just stderr (or /dev/stderr) to send diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml index d371e5ad92eb..1505068a165e 100644 --- a/x11-misc/slim/metadata.xml +++ b/x11-misc/slim/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>bugs.gentoo@flitspace.org.uk</email> + <name>Robert Pearce</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> - <remote-id type="sourceforge">slim.berlios</remote-id> + <remote-id type="sourceforge">slim-fork</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild deleted file mode 100644 index 6e80951c7dbd..000000000000 --- a/x11-misc/slim/slim-1.3.6-r5.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake pam systemd - -DESCRIPTION="Simple Login Manager" -HOMEPAGE="https://sourceforge.net/projects/slim.berlios/" -SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz" -KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86" - -LICENSE="GPL-2" -SLOT="0" -IUSE="branding pam" - -RDEPEND="x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXft - x11-libs/libXrandr - media-libs/libpng:0= - virtual/jpeg:= - x11-apps/sessreg - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" -PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" - -PATCHES=( - # Our Gentoo-specific config changes - "${FILESDIR}"/${P}-config.diff - "${FILESDIR}"/${PN}-1.3.5-arm.patch - "${FILESDIR}"/${P}-honour-cflags.patch - "${FILESDIR}"/${P}-libslim-cmake-fixes.patch - "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch - "${FILESDIR}"/${P}-strip-systemd-unit-install.patch - "${FILESDIR}"/${P}-systemd-session.patch - "${FILESDIR}"/${P}-session-chooser.patch - "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch - "${FILESDIR}"/${P}-drop-zlib.patch - "${FILESDIR}"/${P}-freetype.patch - "${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch - "${FILESDIR}"/${PN}-1.3.6-add-missing-libgen_h.patch - "${FILESDIR}"/${PN}-1.3.6-gcc11.patch -) - -src_prepare() { - cmake_src_prepare - - if use branding; then - sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die - fi -} - -src_configure() { - local mycmakeargs=( - -DUSE_PAM=$(usex pam) - -DUSE_CONSOLEKIT=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use pam ; then - pamd_mimic system-local-login slim auth account session - pamd_mimic system-local-login slimlock auth - fi - - systemd_dounit slim.service - - insinto /usr/share/slim - newins "${FILESDIR}/Xsession-r3" Xsession - - insinto /etc/logrotate.d - newins "${FILESDIR}/slim.logrotate" slim - - dodoc xinitrc.sample ChangeLog README TODO THEMES -} - -pkg_postinst() { - # massage ${REPLACING_VERSIONS} to come up with whether or not it's a new install - # or if it's older than 1.3.2-r7 - # Note - there should only ever be zero or one version as this package isn't slotted, - # so the logic doesn't worry about what happens if there's two, due to the case where - # a previous emerge attempt failed in the middle of qmerge. - local rv=none - for rv in ${REPLACING_VERSIONS} ; do - if ver_test "1.3.2-r7" -le "${rv}" ; then - rv=newer - break; - fi - - if ver_test "1.0" -le "${rv}" ; then - rv=older - break; - fi - done - - if [[ ${rv} == none ]]; then - elog - elog "The configuration file is located at /etc/slim.conf." - elog - elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " - elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." - fi - if [[ ${rv} != newer ]]; then - elog - elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession" - elog "support, as well as selection between sessions available in" - elog "/etc/X11/Sessions/ at login by pressing [F1]." - elog - elog "The XSESSION environment variable is still supported as a default" - elog "if no session has been specified by the user." - elog - elog "If you want to use .xinitrc in the user's home directory for session" - elog "management instead, see README and xinitrc.sample in" - elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" - elog "accordingly." - elog - fi - - if ! use pam; then - elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" - elog "the console when restarting your window manager. If this is not desired, then" - elog "please remerge ${PN} with USE=\"pam\"" - elog - fi -} diff --git a/x11-misc/slim/slim-1.4.0.ebuild b/x11-misc/slim/slim-1.4.0.ebuild new file mode 100644 index 000000000000..1a8b3bae8ce0 --- /dev/null +++ b/x11-misc/slim/slim-1.4.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake pam readme.gentoo-r1 systemd + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="https://svn.code.sf.net/p/slim-fork/code/trunk" + inherit subversion +else + SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86" +fi + +DESCRIPTION="Simple Login Manager resurrected" +HOMEPAGE="https://slim-fork.sourceforge.io/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="branding pam" + +RDEPEND="media-libs/libjpeg-turbo:= + media-libs/libpng:0= + virtual/libcrypt:= + x11-apps/sessreg + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXrandr + pam? ( + sys-libs/pam + x11-libs/libXext + )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" +PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" + +PATCHES=( + # Our Gentoo-specific config changes + "${FILESDIR}"/${PN}-1.4.0-config.diff +) + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=" +The configuration file is located at /etc/slim.conf. + +If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" +in /etc/conf.d/display-manager and run + + # rc-update add display-manager default. + +See also https://wiki.gentoo.org/wiki/SLiM +" + +src_prepare() { + cmake_src_prepare + + if use branding; then + sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_PAM=$(usex pam) + -DUSE_CONSOLEKIT=OFF + -DBUILD_SLIMLOCK=$(usex pam) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use pam ; then + pamd_mimic system-local-login slim auth account session + pamd_mimic system-local-login slimlock auth + fi + + systemd_dounit slim.service + + insinto /usr/share/slim + newins "${FILESDIR}/Xsession-r3" Xsession + + insinto /etc/logrotate.d + newins "${FILESDIR}/slim.logrotate" slim + + dodoc xinitrc.sample ChangeLog README TODO THEMES + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if ! use pam; then + elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" + elog "the console when restarting your window manager. If this is not desired, then" + elog "please remerge ${PN} with USE=\"pam\"" + elog + fi +} diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild new file mode 100644 index 000000000000..bf37ab145178 --- /dev/null +++ b/x11-misc/slim/slim-9999.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake pam readme.gentoo-r1 systemd + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="https://svn.code.sf.net/p/slim-fork/code/trunk" + inherit subversion +else + SRC_URI="mirror://sourceforge/project/${PN}-fork/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="Simple Login Manager resurrected" +HOMEPAGE="https://slim-fork.sourceforge.io/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="branding pam" + +RDEPEND="media-libs/libjpeg-turbo:= + media-libs/libpng:0= + virtual/libcrypt:= + x11-apps/sessreg + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXrandr + pam? ( + sys-libs/pam + x11-libs/libXext + )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" +PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" + +PATCHES=( + # Our Gentoo-specific config changes + "${FILESDIR}"/${PN}-1.4.0-config.diff +) + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=" +The configuration file is located at /etc/slim.conf. + +If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" +in /etc/conf.d/display-manager and run + + # rc-update add display-manager default. + +See also https://wiki.gentoo.org/wiki/SLiM +" + +src_prepare() { + cmake_src_prepare + + if use branding; then + sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die + fi +} + +src_configure() { + local mycmakeargs=( + -DUSE_PAM=$(usex pam) + -DUSE_CONSOLEKIT=OFF + -DBUILD_SLIMLOCK=$(usex pam) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use pam ; then + pamd_mimic system-local-login slim auth account session + pamd_mimic system-local-login slimlock auth + fi + + systemd_dounit slim.service + + insinto /usr/share/slim + newins "${FILESDIR}/Xsession-r3" Xsession + + insinto /etc/logrotate.d + newins "${FILESDIR}/slim.logrotate" slim + + dodoc xinitrc.sample ChangeLog README TODO THEMES + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if ! use pam; then + elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" + elog "the console when restarting your window manager. If this is not desired, then" + elog "please remerge ${PN} with USE=\"pam\"" + elog + fi +} diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml index 2f82d0bb8eb7..115e9d64a669 100644 --- a/x11-misc/slock/metadata.xml +++ b/x11-misc/slock/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild index 34bb4c6a6a2b..4893525a9c52 100644 --- a/x11-misc/slock/slock-1.5.ebuild +++ b/x11-misc/slock/slock-1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~hppa ppc64 x86" RDEPEND=" virtual/libcrypt:= diff --git a/x11-misc/slop/metadata.xml b/x11-misc/slop/metadata.xml index fab49513f1c3..41541e58b63e 100644 --- a/x11-misc/slop/metadata.xml +++ b/x11-misc/slop/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>nrk@disroot.org</email> + <name>NRK</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription> slop (Select Operation) is an application that queries for a selection from the user and prints the region to stdout. It grabs the mouse and diff --git a/x11-misc/slop/slop-7.6.ebuild b/x11-misc/slop/slop-7.6-r1.ebuild index eae133af55d8..c54f3ecfd4d0 100644 --- a/x11-misc/slop/slop-7.6.ebuild +++ b/x11-misc/slop/slop-7.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,10 +12,10 @@ KEYWORDS="amd64 ~x86" LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="opengl" +IUSE="opengl icu" RDEPEND=" - dev-libs/icu:= + icu? ( dev-libs/icu:= ) x11-libs/libX11 x11-libs/libXext opengl? ( @@ -37,6 +37,9 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}"-7.5-missing-header.patch ) src_configure() { - local mycmakeargs=( -DSLOP_OPENGL=$(usex opengl) ) + local mycmakeargs=( + -DSLOP_OPENGL=$(usex opengl) + -DSLOP_UNICODE=$(usex icu) + ) cmake_src_configure } diff --git a/x11-misc/spacefm/files/spacefm-dash.patch b/x11-misc/spacefm/files/spacefm-dash.patch new file mode 100644 index 000000000000..7b99fee4c320 --- /dev/null +++ b/x11-misc/spacefm/files/spacefm-dash.patch @@ -0,0 +1,47 @@ +https://github.com/IgnorantGuru/spacefm/pull/813 + +From 30fc0024a8f023277537db1e168294c21ca3b9b0 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sun, 7 May 2023 07:31:56 -0700 +Subject: [PATCH] configure.ac: fix bad substitutions with dash + +Uses POSIX compatible substitutions that is not specific to bash. + +Gentoo-Issue: https://bugs.gentoo.org/891181 +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 035da60e2..ec080e03f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,11 +40,11 @@ bash_path="$withval" + # bash v4. SpaceFM runs bash as root and you WILL open root exploits if you + # disable this check, or run bash based on $PATH. + if test ! -z "$bash_path"; then +- if test ! "${bash_path:0:1}" = "/"; then ++ if test "${bash_path%"${bash_path#?}"}" != "/"; then + AC_MSG_ERROR([Fatal Error: Option --with-bash-path requires absolute path.]) + fi + echo "Modifying spacefm-auth to use bash path..." +- bash_esc="${bash_path//\//\\/}" ++ bash_esc="$(printf %s "$bash_path" | sed "s|/|\\\/|g")" + sed "s/\(\/bin\/bash\)/$bash_esc/" src/spacefm-auth.bash > src/spacefm-auth + else + cp -pf src/spacefm-auth.bash src/spacefm-auth +@@ -308,12 +308,12 @@ data/Makefile + ]) + + resolve_datadir="$(eval echo "$datadir")" +-while [[ "${resolve_datadir:0:1}" == "$" ]]; do ++while test "${resolve_datadir%"${resolve_datadir#?}"}" = "\$"; do + resolve_datadir="$(eval echo "$resolve_datadir")" + done + + resolve_htmldir="$(eval echo "$htmldir")" +-while [[ "${resolve_htmldir:0:1}" == "$" ]]; do ++while test "${resolve_htmldir%"${resolve_htmldir#?}"}" = "\$"; do + resolve_htmldir="$(eval echo "$resolve_htmldir")" + done + diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild index bf27995498f1..0e63a546df0d 100644 --- a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild +++ b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,8 @@ EAPI=7 inherit linux-info optfeature xdg DESCRIPTION="A multi-panel tabbed file manager" -HOMEPAGE="https://ignorantguru.github.com/spacefm/" +HOMEPAGE="https://ignorantguru.github.io/spacefm/" + if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git" EGIT_BRANCH="next" diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild index bf27995498f1..c250bfeca80f 100644 --- a/x11-misc/spacefm/spacefm-9999.ebuild +++ b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-info optfeature xdg +inherit autotools linux-info optfeature xdg DESCRIPTION="A multi-panel tabbed file manager" -HOMEPAGE="https://ignorantguru.github.com/spacefm/" +HOMEPAGE="https://ignorantguru.github.io/spacefm/" + if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git" EGIT_BRANCH="next" @@ -40,8 +41,14 @@ BDEPEND="dev-util/intltool PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch "${FILESDIR}"/${PN}-fno-common.patch + "${FILESDIR}"/${PN}-dash.patch #891181 ) +src_prepare() { + default + eautoreconf +} + src_configure() { econf \ $(use_enable startup-notification) \ diff --git a/x11-misc/sprop/Manifest b/x11-misc/sprop/Manifest deleted file mode 100644 index 199275017935..000000000000 --- a/x11-misc/sprop/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sprop-0.1.tar.gz 2750 BLAKE2B 623a8668c49ef2e60398113bd49e036377bdd670a00c6bb5374fd106cd2757532ee2ce46f3d51e0ffef380d70c121733aa5df5a72db6abbdb6b202d9d10e2192 SHA512 74f918b2bbf627e269a674cabd8c4c26192ba67a7240061c0f0f6ddc8e86c32aff83352f2b2f4a2c6b2fcf7245cb1293ae98a2e7bd6189d632e20aa603764ddb diff --git a/x11-misc/sprop/metadata.xml b/x11-misc/sprop/metadata.xml deleted file mode 100644 index 2f82d0bb8eb7..000000000000 --- a/x11-misc/sprop/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> -</pkgmetadata> diff --git a/x11-misc/sprop/sprop-0.1-r1.ebuild b/x11-misc/sprop/sprop-0.1-r1.ebuild deleted file mode 100644 index d2d8ee1fd324..000000000000 --- a/x11-misc/sprop/sprop-0.1-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="a simple X property utility" -HOMEPAGE="https://tools.suckless.org/x/sprop" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - -RDEPEND=" - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -src_prepare() { - sed -i \ - -e '/^CC/d' \ - -e '/^CFLAGS/s| =| +=|;s| -Os||g' \ - -e '/^LDFLAGS/s|= -s|+=|g' \ - config.mk || die - - sed -i \ - -e 's|@${CC}|$(CC)|g' \ - Makefile || die - - sed -i \ - -e "s|VERSION|${PV}|g" \ - ${PN}.1 || die - - default - - tc-export CC -} - -src_compile() { emake sprop; } - -src_install() { - dobin ${PN} - doman ${PN}.1 -} diff --git a/x11-misc/sselp/Manifest b/x11-misc/sselp/Manifest deleted file mode 100644 index e118b8328f69..000000000000 --- a/x11-misc/sselp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sselp-0.2.tar.gz 2562 BLAKE2B e41b68931f7f386a57b13f08c4617fa84621bbd9ea7d8837adda3899ae06077e605382b1f58132afcb4ff24d9d55842c5012bf44970410db06ae0098c00a1e5a SHA512 f53163bd6bf257ef912d23dd813690a6a8700344bcc3caad73556917f12e76364b6ebc9bd11224fe8f4013d83518459440f113a313fc9721de2a124277270044 diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/x11-misc/sselp/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/x11-misc/sselp/sselp-0.2-r1.ebuild b/x11-misc/sselp/sselp-0.2-r1.ebuild deleted file mode 100644 index 3838b8ab647f..000000000000 --- a/x11-misc/sselp/sselp-0.2-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Simple X selection printer" -HOMEPAGE="https://tools.suckless.org/x/sselp" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86" - -DEPEND="x11-libs/libX11" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i \ - -e "s|^CFLAGS = -std=c99 -pedantic -Wall -Os|CFLAGS += -std=c99 -pedantic -Wall|" \ - -e "s|^LDFLAGS = -s|LDFLAGS +=|" \ - -e "s|^CC = cc|CC = $(tc-getCC)|" \ - config.mk || die "sed failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - einstalldocs -} diff --git a/x11-misc/sselp/sselp-9999.ebuild b/x11-misc/sselp/sselp-9999.ebuild deleted file mode 100644 index d44b336a1777..000000000000 --- a/x11-misc/sselp/sselp-9999.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit git-r3 toolchain-funcs - -DESCRIPTION="Simple X selection printer" -HOMEPAGE="https://tools.suckless.org/x/sselp" -EGIT_REPO_URI="https://git.suckless.org/sselp" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" - -DEPEND="x11-libs/libX11" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i \ - -e "s|^CFLAGS = -std=c99 -pedantic -Wall -Os|CFLAGS += -std=c99 -pedantic -Wall|" \ - -e "s|^LDFLAGS = -s|LDFLAGS +=|" \ - -e "s|^CC = cc|CC = $(tc-getCC)|" \ - config.mk || die "sed failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - einstalldocs -} diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest index da63190eaebf..eac5b685ec28 100644 --- a/x11-misc/stalonetray/Manifest +++ b/x11-misc/stalonetray/Manifest @@ -1 +1,2 @@ DIST stalonetray-0.8.4.tar.gz 94614 BLAKE2B 4def696bbd580960f2d7fd84516658e4b4112b40989523840566d34dac71ba92e3adf021796059db919515cc978ac0c5d7783a4ed41aa9f82c8cbcfd00bc958b SHA512 3afdeb7794171f490c5eca631c574003a00bbed863b9caf4024e1b064772d3c24ea3836f280eeab1d50def67928f4d08d3d375047f43bcc39f16a3250015ff2b +DIST stalonetray-0.8.5.tar.gz 102899 BLAKE2B abf70916cb762041c5eaaa3faaa3e96a89f0aa31bd72f285209bb29cc5138f2517d1fa00fda1c39da5ca12028b2e78a813fd15d62dfe7c6d312da52559eb3a2d SHA512 7fe1c2fcc5de06b89f4a5c182baeb0a98f0328ae6bf03a79e76c4af7ee4d86cd8f6967ec8b0123a831998cb075ef2b2f6bc6478bde0b73883fe37d2bd6a471d3 diff --git a/x11-misc/stalonetray/metadata.xml b/x11-misc/stalonetray/metadata.xml index d4578a7186a0..ac413e887dc0 100644 --- a/x11-misc/stalonetray/metadata.xml +++ b/x11-misc/stalonetray/metadata.xml @@ -13,6 +13,6 @@ <flag name="graceful-exit">use non-portable hack to exit gracefully on signal</flag> </use> <upstream> - <remote-id type="sourceforge">stalonetray</remote-id> + <remote-id type="github">kolbusa/stalonetray</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/stalonetray/stalonetray-0.8.5.ebuild b/x11-misc/stalonetray/stalonetray-0.8.5.ebuild new file mode 100644 index 000000000000..15991a24a54d --- /dev/null +++ b/x11-misc/stalonetray/stalonetray-0.8.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="System tray utility including support for KDE system tray icons" +HOMEPAGE="https://kolbusa.github.io/stalonetray/" +SRC_URI="https://github.com/kolbusa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="debug +graceful-exit" + +RDEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXpm" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="app-text/docbook-xml-dtd + dev-libs/libxslt" + +DOCS=( AUTHORS BUGS COPYING NEWS README.md TODO stalonetrayrc.sample stalonetray.html ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_enable debug) \ + $(use_enable graceful-exit) \ + --enable-native-kde +} + +src_compile() { + emake + emake dist +} diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml index c9c5dd7eb58e..93f00ab80dae 100644 --- a/x11-misc/sunflower/metadata.xml +++ b/x11-misc/sunflower/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">MeanEYE/Sunflower</remote-id> <remote-id type="gitlab">MeanEYE/Sunflower</remote-id> diff --git a/x11-misc/sunflower/sunflower-0.5-r1.ebuild b/x11-misc/sunflower/sunflower-0.5-r2.ebuild index 64f224e63fa2..927a7198f232 100644 --- a/x11-misc/sunflower/sunflower-0.5-r1.ebuild +++ b/x11-misc/sunflower/sunflower-0.5-r2.ebuild @@ -3,8 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" +DISTUTILS_USE_PEP517="setuptools" inherit distutils-r1 xdg MY_PN="Sunflower" @@ -17,7 +18,7 @@ SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" ${PYTHON_DEPS} diff --git a/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild b/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild index 2575cda3b485..0633cbd0bcf8 100644 --- a/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild +++ b/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="Simple Virtual Keyboard" HOMEPAGE="https://tools.suckless.org/x/svkbd/" SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" -LICENSE="MIT-with-advertising" +LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/x11-misc/sw-notify-send/Manifest b/x11-misc/sw-notify-send/Manifest deleted file mode 100644 index 0bb40474c188..000000000000 --- a/x11-misc/sw-notify-send/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tinynotify-send-1.2.1.tar.bz2 266078 BLAKE2B ac3c9510d89fdfd50f70fbfad14476e95e14616cfff9d29c9976af5459e2c73a8ddcf5cb578284b177e78743c46594126343933ae87f78a380bca3ce2350aaa9 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d diff --git a/x11-misc/sw-notify-send/metadata.xml b/x11-misc/sw-notify-send/metadata.xml deleted file mode 100644 index d17b2795134e..000000000000 --- a/x11-misc/sw-notify-send/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to> - <remote-id type="github">mgorny/tinynotify-send</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild deleted file mode 100644 index 89f5d2ea4b6e..000000000000 --- a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P=tinynotify-send-${PV} -DESCRIPTION="A system-wide variant of tinynotify-send" -HOMEPAGE="https://github.com/mgorny/tinynotify-send/" -SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libtinynotify:0= - ~x11-libs/libtinynotify-cli-${PV} - x11-libs/libtinynotify-systemwide:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( README ) -S=${WORKDIR}/${MY_P} - -src_configure() { - local myconf=( - --disable-library - --disable-regular - --enable-system-wide - ) - - econf "${myconf[@]}" -} diff --git a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild deleted file mode 100644 index a7650200395f..000000000000 --- a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git" -inherit autotools git-r3 - -MY_P=tinynotify-send-${PV} -DESCRIPTION="A system-wide variant of tinynotify-send" -HOMEPAGE="https://github.com/mgorny/tinynotify-send/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND="x11-libs/libtinynotify:0= - ~x11-libs/libtinynotify-cli-${PV} - x11-libs/libtinynotify-systemwide:0=" -DEPEND="${RDEPEND} - dev-util/gtk-doc - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-library - --disable-regular - --enable-system-wide - ) - - econf "${myconf[@]}" -} diff --git a/x11-misc/sxcs/Manifest b/x11-misc/sxcs/Manifest new file mode 100644 index 000000000000..3fd636a3a269 --- /dev/null +++ b/x11-misc/sxcs/Manifest @@ -0,0 +1,2 @@ +DIST sxcs-0.7.3.tar.gz 22204 BLAKE2B 04bb29188c89622dd2bc348dbc334963a807691ce6fda2f6a6eafedc860be5855d614aeab801dd6cba916dae67a5af92d37317420a04345f1aa8d9203cc44510 SHA512 dbd11ecae74e7a50a346efd0d919952cdd138ebcf75a369888c9f889fcc2752923152b07bcec5f7d4f259672e3af11762d88d9a0b7fe37342f9f5880ecd724ec +DIST sxcs-1.0.0.tar.gz 22787 BLAKE2B 3b36d13ed631c6b7686314f3be7ca4621c88fdf867b0dad02beff815d008fe23e75771f4bdb92a806a93e000d037cae8c12a2315cba74c154e6b94524b3038ae SHA512 dbcd20d894ac2d63f3c93dcee9881a068d40f33cbce5527de746dca2dc34fe264eb91d0849cff81a2730b78645ed421ccf763b544922fbd626361b8056f24d3a diff --git a/x11-misc/sxcs/metadata.xml b/x11-misc/sxcs/metadata.xml new file mode 100644 index 000000000000..5ed3aa71f526 --- /dev/null +++ b/x11-misc/sxcs/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>nrk@disroot.org</email> + <name>NRK</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="codeberg">NRK/sxcs</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/sxcs/sxcs-0.7.3.ebuild b/x11-misc/sxcs/sxcs-0.7.3.ebuild new file mode 100644 index 000000000000..f1fd68f0a646 --- /dev/null +++ b/x11-misc/sxcs/sxcs-0.7.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Color picker and magnifier for X11" +HOMEPAGE="https://codeberg.org/NRK/sxcs" + +SRC_URI="https://codeberg.org/NRK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + +KEYWORDS="amd64" +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXcursor +" +DEPEND="${RDEPEND}" + +src_compile() { + $(tc-getCC) -o sxcs sxcs.c ${CFLAGS} ${LDFLAGS} -l X11 -l Xcursor || die "Compilation failed" +} + +src_install() { + dobin sxcs + doman sxcs.1 + dodoc README.md +} diff --git a/x11-misc/sxcs/sxcs-1.0.0.ebuild b/x11-misc/sxcs/sxcs-1.0.0.ebuild new file mode 100644 index 000000000000..0ffac067fd37 --- /dev/null +++ b/x11-misc/sxcs/sxcs-1.0.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Color picker and magnifier for X11" +HOMEPAGE="https://codeberg.org/NRK/sxcs" + +SRC_URI="https://codeberg.org/NRK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + +KEYWORDS="~amd64" +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXcursor +" +DEPEND="${RDEPEND}" + +src_compile() { + $(tc-getCC) -o sxcs sxcs.c ${CFLAGS} ${LDFLAGS} -l X11 -l Xcursor || die "Compilation failed" +} + +src_install() { + dobin sxcs + doman sxcs.1 + dodoc README.md +} diff --git a/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch b/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch new file mode 100644 index 000000000000..655199f4b04a --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch @@ -0,0 +1,57 @@ +https://bugs.gentoo.org/898032 +https://github.com/symless/synergy-core/commit/ab8a7b5ed44a3aeadc7a20f0e4020d47ac258e14 + +From ab8a7b5ed44a3aeadc7a20f0e4020d47ac258e14 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Thu, 8 Dec 2022 09:16:44 +0000 +Subject: [PATCH] add missing <cstdint> includes for SIZE_MAX (#7237) + +Without the change the build on upcoming `gcc-13` ails as: + + src/lib/base/Log.cpp: In member function 'void Log::print(const char*, int, const char*, ...)': + src/lib/base/Log.cpp:128:23: + error: 'SIZE_MAX' was not declared in this scope + 128 | if ((strnlen(fmt, SIZE_MAX) > 2) && (fmt[0] == '%' && fmt[1] == 'z')) { + | ^~~~~~~~ + src/lib/base/Log.cpp:30:1: + note: 'SIZE_MAX' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'? + 29 | #include <ctime> + +++ |+#include <cstdint> + 30 | + +gcc-13 cleaned it's header dependencies and that exposes these failures. +--- a/src/lib/base/Log.cpp ++++ b/src/lib/base/Log.cpp +@@ -23,10 +23,11 @@ + #include "base/log_outputters.h" + #include "common/Version.h" + ++#include <cstdint> + #include <cstdio> + #include <cstring> + #include <iostream> +-#include <ctime> ++#include <ctime> + + // names of priorities + static const char* g_priority[] = { +--- a/src/lib/base/String.cpp ++++ b/src/lib/base/String.cpp +@@ -21,6 +21,7 @@ + #include "common/stdvector.h" + + #include <cctype> ++#include <cstdint> + #include <cstdio> + #include <cstdlib> + #include <cstring> +--- a/src/lib/synergy/IKeyState.cpp ++++ b/src/lib/synergy/IKeyState.cpp +@@ -19,6 +19,7 @@ + #include "synergy/IKeyState.h" + #include "base/EventQueue.h" + ++#include <cstdint> + #include <cstring> + #include <cstdlib> + diff --git a/x11-misc/synergy/synergy-1.14.1.32.ebuild b/x11-misc/synergy/synergy-1.14.1.32.ebuild index ed1586ea37b1..f12853d6d34b 100644 --- a/x11-misc/synergy/synergy-1.14.1.32.ebuild +++ b/x11-misc/synergy/synergy-1.14.1.32.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="gui test" RESTRICT="!test? ( test )" @@ -60,6 +60,10 @@ BDEPEND=" DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} ) +PATCHES=( + "${FILESDIR}"/${PN}-1.14.1.32-gcc13.patch +) + src_prepare() { # broken on Xvfb rm src/test/integtests/platform/XWindowsScreenTests.cpp || die diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest index 83972a7921ec..49f40ffafbf0 100644 --- a/x11-misc/tabbed/Manifest +++ b/x11-misc/tabbed/Manifest @@ -1 +1 @@ -DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553 +DIST tabbed-0.8.tar.gz 13970 BLAKE2B 289d3a94224d9c717a3a66a6ea10e34f744b49bf010e7bea6ddb4f8db92a89f8e2ca1d3bbc5c6ffa3402f85117b3bbb0a54140d1e70d6e1f0200c883f46fbe8f SHA512 aa81ee2a293110cdd7660c4643a21bb44573516ddd03657ab4cfd2be2f52f7dd5a4fcfce60fd2b4dac591d13e40f952985780cd8923394fc64e814152729a754 diff --git a/x11-misc/tabbed/metadata.xml b/x11-misc/tabbed/metadata.xml index 2f82d0bb8eb7..15cf2ff7a521 100644 --- a/x11-misc/tabbed/metadata.xml +++ b/x11-misc/tabbed/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <email>arkamar@gentoo.org</email> + <name>Petr Vaněk</name> </maintainer> </pkgmetadata> diff --git a/x11-misc/tabbed/tabbed-0.6-r1.ebuild b/x11-misc/tabbed/tabbed-0.6-r1.ebuild deleted file mode 100644 index 44798c1dea91..000000000000 --- a/x11-misc/tabbed/tabbed-0.6-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit savedconfig toolchain-funcs - -DESCRIPTION="Simple generic tabbed fronted to xembed aware applications" -HOMEPAGE="https://tools.suckless.org/tabbed" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 ~riscv x86" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND=" - x11-base/xorg-proto - ${RDEPEND} -" - -src_prepare() { - default - sed config.mk \ - -e '/^CC/d' \ - -e 's|/usr/local|/usr|g' \ - -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \ - -e 's|^LDFLAGS.*|LDFLAGS += $(CFLAGS) $(LIBS)|g' \ - -e 's|^LIBS.*|LIBS = -lX11|g' \ - -e 's|{|(|g;s|}|)|g' \ - -i || die - - sed Makefile \ - -e 's|{|(|g;s|}|)|g' \ - -e '/^[[:space:]]*@echo/d' \ - -e 's|^ @| |g' \ - -i || die - - restore_config config.h -} - -src_compile() { - emake CC="$(tc-getCC)" -} -src_install() { - default - save_config config.h -} diff --git a/x11-misc/tabbed/tabbed-0.8-r1.ebuild b/x11-misc/tabbed/tabbed-0.8-r1.ebuild new file mode 100644 index 000000000000..d86dcca418d1 --- /dev/null +++ b/x11-misc/tabbed/tabbed-0.8-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit savedconfig toolchain-funcs + +DESCRIPTION="Simple generic tabbed fronted to xembed aware applications" +HOMEPAGE="https://tools.suckless.org/tabbed/" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm64 ppc64 ~riscv x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXft +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig +" + +src_prepare() { + default + restore_config config.h +} + +src_compile() { + tc-export CC PKG_CONFIG + + local emakeargs=( + TABBED_CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags x11 xft)" + TABBED_LDFLAGS="${LDFLAGS} $("${PKG_CONFIG}" --libs x11 xft)" + ) + + emake "${emakeargs[@]}" +} + +src_install() { + local emakeargs=( + DESTDIR="${D}" + PREFIX="${EPREFIX}/usr" + DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" + ) + emake "${emakeargs[@]}" install + + save_config config.h +} diff --git a/x11-misc/tdrop/metadata.xml b/x11-misc/tdrop/metadata.xml index 00bdb75dd304..6489284c5d4a 100644 --- a/x11-misc/tdrop/metadata.xml +++ b/x11-misc/tdrop/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">noctuid/tdrop</remote-id> <changelog>https://github.com/noctuid/tdrop/blob/master/Changelog.org</changelog> diff --git a/x11-misc/tinynotify-send/metadata.xml b/x11-misc/tinynotify-send/metadata.xml index d17b2795134e..66d473d268b3 100644 --- a/x11-misc/tinynotify-send/metadata.xml +++ b/x11-misc/tinynotify-send/metadata.xml @@ -6,11 +6,6 @@ <name>Michał Górny</name> </maintainer> <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to> - <remote-id type="github">mgorny/tinynotify-send</remote-id> + <remote-id type="github">projg2/tinynotify-send</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild b/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild index c6c4bc1676d7..7e6c1580db40 100644 --- a/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild +++ b/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild @@ -1,22 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A notification sending utility (using libtinynotify)" -HOMEPAGE="https://github.com/mgorny/tinynotify-send/" -SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${P}/${P}.tar.bz2" +HOMEPAGE="https://github.com/projg2/tinynotify-send/" +SRC_URI="https://github.com/projg2/tinynotify-send/releases/download/${P}/${P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="app-eselect/eselect-notify-send +DEPEND=" x11-libs/libtinynotify:0= - ~x11-libs/libtinynotify-cli-${PV}" -DEPEND="${RDEPEND} - virtual/pkgconfig" + ~x11-libs/libtinynotify-cli-${PV} +" +RDEPEND=" + ${DEPEND} + app-eselect/eselect-notify-send +" +BDEPEND=" + virtual/pkgconfig +" src_configure() { local myconf=( diff --git a/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild b/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild deleted file mode 100644 index 7f7ee4ddbf61..000000000000 --- a/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" -inherit autotools git-r3 - -DESCRIPTION="A notification sending utility (using libtinynotify)" -HOMEPAGE="https://github.com/mgorny/tinynotify-send/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND="app-eselect/eselect-notify-send - x11-libs/libtinynotify:0= - ~x11-libs/libtinynotify-cli-${PV}" -DEPEND="${RDEPEND} - dev-util/gtk-doc - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-library - --enable-regular - --disable-system-wide - --with-system-wide-exec=/usr/bin/sw-notify-send - ) - - econf "${myconf[@]}" -} - -pkg_postinst() { - eselect notify-send update ifunset -} - -pkg_postrm() { - eselect notify-send update ifunset -} diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild index 66b135e9ea5f..2676ed677f88 100644 --- a/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild +++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}-trayer-${PV} LICENSE="MIT GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" x11-libs/gdk-pixbuf:2 diff --git a/x11-misc/trayer/trayer-1.0-r5.ebuild b/x11-misc/trayer/trayer-1.0-r5.ebuild index 051d15d92456..0eb7ae28ba83 100644 --- a/x11-misc/trayer/trayer-1.0-r5.ebuild +++ b/x11-misc/trayer/trayer-1.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" RDEPEND="dev-libs/glib:2 x11-libs/gdk-pixbuf:2 diff --git a/x11-misc/urxvt-perls/metadata.xml b/x11-misc/urxvt-perls/metadata.xml index 8dcf2d1a3afa..62384141e82d 100644 --- a/x11-misc/urxvt-perls/metadata.xml +++ b/x11-misc/urxvt-perls/metadata.xml @@ -6,6 +6,6 @@ <flag name="deprecated">Install scripts which have been marked as deprecated by upstream</flag> </use> <upstream> - <remote-id type="github">muennich/urxvt-perls</remote-id> + <remote-id type="github">xyb3rt/urxvt-perls</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild index e91ce98faa0c..8c551d4c2ada 100644 --- a/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild +++ b/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Perl extensions for rxvt-unicode" -HOMEPAGE="https://github.com/muennich/urxvt-perls" -SRC_URI="https://github.com/muennich/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/xyb3rt/urxvt-perls" +SRC_URI="https://github.com/xyb3rt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest index f3c30837f360..0630781c782e 100644 --- a/x11-misc/util-macros/Manifest +++ b/x11-misc/util-macros/Manifest @@ -1 +1 @@ -DIST util-macros-1.19.3.tar.bz2 84690 BLAKE2B 95f6bd6cca47111f973eef60915ab0b0a1c6a6b15facb08da138df100c27caacce28866c5ac05aae79116fe3bafa15f454ea6cb9997069f0b5fab7968777d383 SHA512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 +DIST util-macros-1.20.1.tar.xz 83124 BLAKE2B f80f6dd5823bd4264b4a6d50cb01cb0fca739a4d9c164d45fa5f9367f9ab7f6181c654859a3dcbea1e666ce12a1402b984eb028b47d71ce6c7b9bc95ce61474e SHA512 5f44d73c18ff87459cd94a68a961465b3970a36f0b55be65c0ec228320a675561eb24a1b1359745124302446a1a3fadc2f50d3378f439df5bd3e866cb8015286 diff --git a/x11-misc/util-macros/util-macros-1.19.3.ebuild b/x11-misc/util-macros/util-macros-1.20.1.ebuild index cd703a10a569..a8bf00a634cf 100644 --- a/x11-misc/util-macros/util-macros-1.19.3.ebuild +++ b/x11-misc/util-macros/util-macros-1.20.1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="X.Org autotools utility macros" HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros" -SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" +SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" # there is nothing to compile for this package, all its contents are produced by # configure. the only make job that matters is make install -src_compile() { true; } +src_compile() { :; } diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest index d9eec5b6ca96..11e76ff3e965 100644 --- a/x11-misc/virtualgl/Manifest +++ b/x11-misc/virtualgl/Manifest @@ -1,2 +1,2 @@ -DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f SHA512 d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4 SHA512 fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37 +DIST VirtualGL-3.1.tar.gz 1248818 BLAKE2B 556e2a05811b89ddfecc371d75888f09c7a59bb2c7e3f265eae4631627cf3e586114735b2616cd6292fbcea089e81326736013a7b1d47ad1746365e72e313627 SHA512 cd1109b4dee426918e61348b22b3bfb0c45102bbb0bcde9b78c36b607a396bbff7d7c72cf3bf9626128da0f1776c42bbb59be863239e60e0f7307d2a73de463b diff --git a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch deleted file mode 100644 index dd37d6c3b664..000000000000 --- a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 46d09529563127fef0d42a4fb2681ae8d65a856b Mon Sep 17 00:00:00 2001 -From: DRC <information@virtualgl.org> -Date: Thu, 7 Jul 2022 17:22:57 -0500 -Subject: [PATCH] Build: Fix compilation errors with libX11 1.8.x - -Fixes #205 ---- - ChangeLog.md | 2 ++ - server/CMakeLists.txt | 10 ++++++++++ - server/FakePbuffer.cpp | 2 +- - server/faker-sym.h | 6 ++++++ - server/faker-x11.cpp | 7 ++++++- - server/faker.cpp | 4 ++-- - 6 files changed, 27 insertions(+), 4 deletions(-) - -diff --git a/ChangeLog.md b/ChangeLog.md -index 292a5a94..4b9cc36f 100644 ---- a/ChangeLog.md -+++ b/ChangeLog.md -@@ -8,6 +8,8 @@ module when using recent versions of nVidia's proprietary drivers. In some - cases, this led to incorrect device permissions for **/dev/nvidia*** after the - display manager was restarted. - -+2. Fixed compilation errors when building with libX11 1.8.x. -+ - - 3.0.1 - ===== -diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt -index 574521a0..2ce92856 100644 ---- a/server/CMakeLists.txt -+++ b/server/CMakeLists.txt -@@ -91,6 +91,16 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile - > ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/faker-mapfile.c) - -+include(CheckPrototypeDefinition) -+set(CMAKE_REQUIRED_INCLUDES ${X11_X11_INCLUDE_PATH}) -+check_prototype_definition(XkbOpenDisplay -+ "Display *XkbOpenDisplay(_Xconst char *, int *, int *, int *, int *, int *)" -+ NULL X11/XKBlib.h LIBX11_18) -+unset(CMAKE_REQUIRED_INCLUDES) -+if(LIBX11_18) -+ add_definitions(-DLIBX11_18) -+endif() -+ - set(FAKER_SOURCES - backend.cpp - ContextHash.cpp -diff --git a/server/FakePbuffer.cpp b/server/FakePbuffer.cpp -index bfa55279..64aab775 100644 ---- a/server/FakePbuffer.cpp -+++ b/server/FakePbuffer.cpp -@@ -10,11 +10,11 @@ - // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - // wxWindows Library License for more details. - -+#include <X11/Xlibint.h> - #include "FakePbuffer.h" - #include "TempContextEGL.h" - #include "BufferState.h" - #include "ContextHashEGL.h" --#include <X11/Xlibint.h> - - using namespace util; - using namespace backend; -diff --git a/server/faker-sym.h b/server/faker-sym.h -index 0fa1e5cd..3c6f94e8 100644 ---- a/server/faker-sym.h -+++ b/server/faker-sym.h -@@ -704,9 +704,15 @@ FUNCDEF2(int, XNextEvent, Display *, dpy, XEvent *, xe, XNextEvent) - - FUNCDEF1(Display *, XOpenDisplay, _Xconst char *, name, XOpenDisplay) - -+#ifdef LIBX11_18 -+FUNCDEF6(Display *, XkbOpenDisplay, _Xconst char *, display_name, -+ int *, event_rtrn, int *, error_rtrn, int *, major_in_out, -+ int *, minor_in_out, int *, reason_rtrn, XkbOpenDisplay) -+#else - FUNCDEF6(Display *, XkbOpenDisplay, char *, display_name, int *, event_rtrn, - int *, error_rtrn, int *, major_in_out, int *, minor_in_out, - int *, reason_rtrn, XkbOpenDisplay) -+#endif - - FUNCDEF5(Bool, XQueryExtension, Display *, dpy, _Xconst char *, name, - int *, major_opcode, int *, first_event, int *, first_error, -diff --git a/server/faker-x11.cpp b/server/faker-x11.cpp -index 99e8bf17..a233f3b1 100644 ---- a/server/faker-x11.cpp -+++ b/server/faker-x11.cpp -@@ -1,6 +1,6 @@ - // Copyright (C)2004 Landmark Graphics Corporation - // Copyright (C)2005, 2006 Sun Microsystems, Inc. --// Copyright (C)2009, 2011-2016, 2018-2021 D. R. Commander -+// Copyright (C)2009, 2011-2016, 2018-2022 D. R. Commander - // - // This library is free software and may be redistributed and/or modified under - // the terms of the wxWindows Library License, Version 3.1 or (at your option) -@@ -586,8 +586,13 @@ Display *XOpenDisplay(_Xconst char *name) - // within libX11, VirtualGL cannot intercept it on some platforms. Thus we - // need to interpose XkbOpenDisplay(). - -+#ifdef LIBX11_18 -+Display *XkbOpenDisplay(_Xconst char *display_name, int *event_rtrn, -+ int *error_rtrn, int *major_in_out, int *minor_in_out, int *reason_rtrn) -+#else - Display *XkbOpenDisplay(char *display_name, int *event_rtrn, int *error_rtrn, - int *major_in_out, int *minor_in_out, int *reason_rtrn) -+#endif - { - Display *dpy = NULL; - -diff --git a/server/faker.cpp b/server/faker.cpp -index ec537a62..601cfa3e 100644 ---- a/server/faker.cpp -+++ b/server/faker.cpp -@@ -1,6 +1,6 @@ - // Copyright (C)2004 Landmark Graphics Corporation - // Copyright (C)2005, 2006 Sun Microsystems, Inc. --// Copyright (C)2009, 2011, 2013-2016, 2019-2021 D. R. Commander -+// Copyright (C)2009, 2011, 2013-2016, 2019-2022 D. R. Commander - // - // This library is free software and may be redistributed and/or modified under - // the terms of the wxWindows Library License, Version 3.1 or (at your option) -@@ -14,6 +14,7 @@ - - #include <unistd.h> - #include "Mutex.h" -+#include <X11/Xlibint.h> - #include "ContextHash.h" - #ifdef EGLBACKEND - #include "ContextHashEGL.h" -@@ -27,7 +28,6 @@ - #include "fakerconfig.h" - #include "threadlocal.h" - #include <dlfcn.h> --#include <X11/Xlibint.h> - #include "faker.h" - - diff --git a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch new file mode 100644 index 000000000000..5e7153c3c383 --- /dev/null +++ b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch @@ -0,0 +1,53 @@ +https://github.com/VirtualGL/virtualgl/pull/233 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Thu, 1 Jun 2023 14:45:17 +0530 +Subject: [PATCH] Dropping use of register keyword + +The usage of register keyword was deprecated in c++14 and it's +completely removed in c++17. Found will building virtualgl on gentoo +with clang-16. + +Bug: https://bugs.gentoo.org/898876 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/server/fltk/src/Fl_Text_Buffer.cxx ++++ b/server/fltk/src/Fl_Text_Buffer.cxx +@@ -1286,7 +1286,7 @@ int Fl_Text_Buffer::substitute_null_characters( char *string, int len ) { + ** routine if no substitution has been done. + */ + void Fl_Text_Buffer::unsubstitute_null_characters( char *string ) { +- register char * c, subsChar = mNullSubsChar; ++ char * c, subsChar = mNullSubsChar; + + if ( subsChar == '\0' ) + return; +--- a/server/fltk/src/Fl_arg.cxx ++++ b/server/fltk/src/Fl_arg.cxx +@@ -314,7 +314,7 @@ without express or implied warranty. + + static int ReadInteger(char* string, char** NextString) + { +- register int Result = 0; ++ int Result = 0; + int Sign = 1; + + if (*string == '+') +@@ -337,7 +337,7 @@ int XParseGeometry(const char* string, int* x, int* y, + unsigned int* width, unsigned int* height) + { + int mask = NoValue; +- register char *strind; ++ char *strind; + unsigned int tempWidth = 0, tempHeight = 0; + int tempX = 0, tempY = 0; + char *nextCharacter; +--- a/util/md5.c ++++ b/util/md5.c +@@ -193,7 +193,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) + */ + void MD5Transform(uint32 buf[4], uint32 in[16]) + { +- register uint32 a, b, c, d; ++ uint32 a, b, c, d; + + a = buf[0]; + b = buf[1]; diff --git a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild index b78a84a80c37..479f441ae5f9 100644 --- a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild +++ b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ else MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" @@ -21,12 +21,9 @@ HOMEPAGE="https://www.virtualgl.org/" SLOT="0" LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE="ssl" +IUSE="" RDEPEND=" - ssl? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] @@ -51,8 +48,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - # https://github.com/VirtualGL/virtualgl/issues/205 (from 'master') - "${FILESDIR}"/${P}-libX11-1.8.patch + "${FILESDIR}"/${PN}-3.1-drop-register.patch ) src_prepare() { @@ -70,7 +66,6 @@ src_configure() { abi_configure() { local mycmakeargs=( - -DVGL_USESSL="$(usex ssl)" -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" -DTJPEG_INCLUDE_DIR=/usr/include -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL diff --git a/x11-misc/virtualgl/virtualgl-3.1.ebuild b/x11-misc/virtualgl/virtualgl-3.1.ebuild new file mode 100644 index 000000000000..8b9679b59247 --- /dev/null +++ b/x11-misc/virtualgl/virtualgl-3.1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" + inherit git-r3 +else + MY_PN="VirtualGL" + MY_P="${MY_PN}-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" +HOMEPAGE="https://www.virtualgl.org/" + +SLOT="0" +LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" +IUSE="" + +RDEPEND=" + media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXtst[${MULTILIB_USEDEP}] + x11-libs/libXv[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] + virtual/opencl[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + amd64? ( abi_x86_32? ( + >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] + >=x11-libs/libX11-1.6.2[abi_x86_32] + >=x11-libs/libXext-1.3.2[abi_x86_32] + >=x11-libs/libXtst-1.2.3[abi_x86_32] + >=x11-libs/libXv-1.0.10[abi_x86_32] + x11-libs/xcb-util-keysyms[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32] + virtual/opencl[abi_x86_32] + >=virtual/opengl-7.0-r1[abi_x86_32] + ) ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + # Use /var/lib, bug #428122 + sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ + server/vglrun.in server/vglgenkey server/vglserver_config || die + + cmake_src_prepare +} + +src_configure() { + # Completely breaks steam/wine for discrete graphics otherwise + # see https://github.com/VirtualGL/virtualgl/issues/16 + append-ldflags "-Wl,--no-as-needed" + + abi_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" + -DTJPEG_INCLUDE_DIR=/usr/include + -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL + -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so + -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) + ) + cmake_src_configure + } + multilib_parallel_foreach_abi abi_configure +} + +src_install() { + cmake-multilib_src_install + + # Make config dir + keepdir /var/lib/VirtualGL + fowners root:video /var/lib/VirtualGL + fperms 0750 /var/lib/VirtualGL + newinitd "${FILESDIR}/vgl.initd-r4" vgl + newconfd "${FILESDIR}/vgl.confd-r2" vgl + + exeinto /usr/libexec + doexe "${FILESDIR}/vgl-helper.sh" + systemd_dounit "${FILESDIR}/vgl.service" + + # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + # and eglinfo to veglinto because of conflict with mesa-progs[egl] + mv "${D}"/usr/bin/{,v}glxinfo || die + mv "${D}"/usr/bin/{,v}eglinfo || die + + # Remove license files, bug 536284 + rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die +} diff --git a/x11-misc/wdm/files/wdm-1.28-remove-sigsetmask.patch b/x11-misc/wdm/files/wdm-1.28-remove-sigsetmask.patch new file mode 100644 index 000000000000..f76db846e597 --- /dev/null +++ b/x11-misc/wdm/files/wdm-1.28-remove-sigsetmask.patch @@ -0,0 +1,15 @@ +Please reffer https://www.openembedded.org/pipermail/openembedded-core/2011-July/044923.html +--- a/src/wdm/util.c ++++ b/src/wdm/util.c +@@ -113,8 +113,10 @@ CleanUpChild (void) + #ifdef CSRG_BASED + setsid(); + #else ++ sigset_t sigmask; + setpgid (0, getpid ()); +- sigsetmask (0); ++ sigemptyset(&sigmask); ++ sigprocmask(SIG_SETMASK, &sigmask, NULL); + #endif + #ifdef SIGCHLD + (void) Signal (SIGCHLD, SIG_DFL); diff --git a/x11-misc/wdm/wdm-1.28-r9.ebuild b/x11-misc/wdm/wdm-1.28-r9.ebuild new file mode 100644 index 000000000000..4e96488782ae --- /dev/null +++ b/x11-misc/wdm/wdm-1.28-r9.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools pam toolchain-funcs + +DESCRIPTION="WINGs Display Manager" +HOMEPAGE="https://github.com/voins/wdm" +SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" +IUSE="pam selinux truetype" + +DEPEND=" + virtual/libcrypt:= + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXmu + x11-wm/windowmaker + pam? ( sys-libs/pam ) + truetype? ( x11-libs/libXft ) +" +RDEPEND="${DEPEND} + pam? ( >=sys-auth/pambase-20080219.1 ) +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-terminateServer.patch + "${FILESDIR}"/${P}-remove-fakehome.patch + "${FILESDIR}"/${P}-remove-sigsetmask.patch + "${FILESDIR}"/${P}-pkg_config.patch + "${FILESDIR}"/${P}-ar.patch +) + +src_prepare() { + default + eautoreconf +} +src_configure() { + tc-export AR + econf \ + --with-wdmdir="${EPREFIX}"/etc/X11/wdm \ + $(use_enable pam) \ + $(use_enable selinux) +} + +src_install() { + default + + rm -f "${ED}"/etc/pam.d/wdm || die + + if use pam; then + pamd_mimic system-local-login wdm auth account password session + fi +} diff --git a/x11-misc/whaw/metadata.xml b/x11-misc/whaw/metadata.xml index 83679cab2f5a..6c80328c148f 100644 --- a/x11-misc/whaw/metadata.xml +++ b/x11-misc/whaw/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <maintainer> <email>john@repetae.net</email> diff --git a/x11-misc/wininfo/files/wininfo-0.7-desktop-entry.patch b/x11-misc/wininfo/files/wininfo-0.7-desktop-entry.patch index 478fb2e83481..9cdd6a26ed30 100644 --- a/x11-misc/wininfo/files/wininfo-0.7-desktop-entry.patch +++ b/x11-misc/wininfo/files/wininfo-0.7-desktop-entry.patch @@ -1,6 +1,5 @@ -diff -ur wininfo-0.7.orig/docs/xdg-wininfo.desktop wininfo-0.7/docs/xdg-wininfo.desktop ---- wininfo-0.7.orig/docs/xdg-wininfo.desktop 2004-08-26 07:15:35.000000000 +0300 -+++ wininfo-0.7/docs/xdg-wininfo.desktop 2008-02-02 14:46:55.000000000 +0200 +--- a/docs/xdg-wininfo.desktop ++++ b/docs/xdg-wininfo.desktop @@ -1,9 +1,8 @@ [Desktop Entry] -Encoding=UTF-8 diff --git a/x11-misc/wininfo/wininfo-0.7-r1.ebuild b/x11-misc/wininfo/wininfo-0.7-r2.ebuild index 17572aacec3f..9ac83c6ebbb0 100644 --- a/x11-misc/wininfo/wininfo-0.7-r1.ebuild +++ b/x11-misc/wininfo/wininfo-0.7-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="An X app that follows your pointer providing information about the windows below" HOMEPAGE="https://freedesktop.org/Software/wininfo" @@ -10,13 +12,18 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" -RDEPEND="x11-libs/gtk+:2 +RDEPEND=" + x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-desktop-entry.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/x11-misc/wmname/metadata.xml b/x11-misc/wmname/metadata.xml index 2f82d0bb8eb7..115e9d64a669 100644 --- a/x11-misc/wmname/metadata.xml +++ b/x11-misc/wmname/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/wmname/wmname-0.1-r1.ebuild b/x11-misc/wmname/wmname-0.1-r1.ebuild index 389f4774dffc..d7e6c152feab 100644 --- a/x11-misc/wmname/wmname-0.1-r1.ebuild +++ b/x11-misc/wmname/wmname-0.1-r1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -DESCRIPTION="utility to set the name of your window manager" +DESCRIPTION="Utility to set the name of your window manager" HOMEPAGE="https://tools.suckless.org/x/wmname" SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND}" diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch new file mode 100644 index 000000000000..c6d1c494bd23 --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-implicit-function-declaration.patch @@ -0,0 +1,26 @@ +From 351d27d4a846e3d0e5c724e067f44b52e04402f1 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Mon, 6 Mar 2023 00:57:20 +0300 +Subject: [PATCH] Drop AC_FUNC_STAT macro + +This macro is obsolescent and doesn't work with +-Werror=implicit-function-declaration compiler flag +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6b62ac5..5a386db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -474,7 +474,6 @@ if test $inaddrt = no ; then + fi + # Checks for library functions. + AC_FUNC_MEMCMP +-AC_FUNC_STAT + AC_FUNC_STRFTIME + AC_FUNC_VPRINTF + AC_FUNC_FORK +-- +2.39.2 + diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch new file mode 100644 index 000000000000..3a21f30d7f14 --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/903001 +https://github.com/LibVNC/x11vnc/pull/202 +https://github.com/LibVNC/x11vnc/commit/af63109a17f1b1ec8b1e332d215501f11c4a33a0 +https://github.com/LibVNC/x11vnc/pull/224 +https://github.com/LibVNC/x11vnc/commit/354602cffa8edcbe813da6dfd051b96d94b3efbc + +From af63109a17f1b1ec8b1e332d215501f11c4a33a0 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Tue, 5 Jul 2022 13:12:30 -0700 +Subject: [PATCH] Fix building w/ libreSSL + +When building x11vnc with LibreSSL the build fails with undefined +references for SSL_CTX_set_security_level which is currently only +available with OpenSSL. This can be fixed by disabling the code as +is already done for OpenSSL versions older than 1.1.0. + +This builds with LibreSSL 3.5.x. +--- + src/sslhelper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +From 354602cffa8edcbe813da6dfd051b96d94b3efbc Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Tue, 2 May 2023 12:16:21 -0700 +Subject: [PATCH] sslhelper: Update for LibreSSL >= 3.6.0 (#224) + +Since LibreSSL 3.6.0 SSL_CTX_set_security_level() has been available. +--- + src/sslhelper.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/sslhelper.c b/src/sslhelper.c +index 04c2e27..ae82cd9 100644 +--- a/src/sslhelper.c ++++ b/src/sslhelper.c +@@ -1596,7 +1596,8 @@ static int switch_to_anon_dh(void) { + if (ssl_client_mode) { + return 1; + } +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3060000fL) + /* Security level must be set to 0 for unauthenticated suites. */ + SSL_CTX_set_security_level(ctx, 0); + #endif diff --git a/x11-misc/x11vnc/files/x11vnc.init.d b/x11-misc/x11vnc/files/x11vnc.init.d deleted file mode 100644 index b6b16dafb943..000000000000 --- a/x11-misc/x11vnc/files/x11vnc.init.d +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="The x11vnc daemon init script" - -depend() { - need net - need xdm -} - -checkconfig() { - - # Set Defaults - X11VNC_RFBAUTH=${X11VNC_RFBAUTH:-/etc/x11vnc.pass} - X11VNC_RFBPORT=${X11VNC_RFBPORT:-5900} - X11VNC_DISPLAY=${X11VNC_DISPLAY:-:0} - X11VNC_LOG=${X11VNC_LOG:-/var/log/x11vnc} - - X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}" - - if [ -n "${X11VNC_AUTOPORT}" ]; then - X11VNC_PORT="" - fi - - if [ ! -f "${X11VNC_RFBAUTH}" -o ! -s "${X11VNC_RFBAUTH}" ]; then - eerror "VNC Password not set, please set one by running: \`x11vnc -storepasswd ${X11VNC_RFBAUTH}\`" - return 1 - fi - checkpath -q -f -m 0600 -o root:root "${X11VNC_RFBAUTH}" - - # Attempt to find X-Auth file - if ! type xauth > /dev/null 2>&1 || - ! xauth -f /root/.Xauthority extract - "${X11VNC_DISPLAY}" > "${X11VNC_AUTH}" 2>/dev/null || - [ ! -s "${X11VNC_AUTH}" ]; then - # Let x11vnc guess at auth - X11VNC_AUTH_OPTS="--env FD_XDM=1 -auth guess" - else - # We found the proper auth - X11VNC_AUTH_OPTS="-auth ${X11VNC_AUTH}" - fi - - if [ ! -f "${X11VNC_AUTH}" ]; then - eerror "Specified X-Authority file '${X11VNC_AUTH}' not found!" - return 1 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start \ - --exec /usr/bin/x11vnc -- \ - ${X11VNC_AUTH_OPTS} \ - -rfbauth ${X11VNC_RFBAUTH} \ - ${X11VNC_RFBPORT:+-rfbport} ${X11VNC_RFBPORT} \ - ${X11VNC_AUTOPORT:+-autoport} ${X11VNC_AUTOPORT} \ - -display ${X11VNC_DISPLAY} \ - -o ${X11VNC_LOG} \ - -bg -forever \ - ${X11VNC_OPTS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop /usr/bin/x11vnc - eend $? -} diff --git a/x11-misc/x11vnc/files/x11vnc.init.d-r1 b/x11-misc/x11vnc/files/x11vnc.init.d-r1 index 04c36ea361db..8907b3858a31 100644 --- a/x11-misc/x11vnc/files/x11vnc.init.d-r1 +++ b/x11-misc/x11vnc/files/x11vnc.init.d-r1 @@ -16,8 +16,8 @@ checkconfig() { X11VNC_RFBPORT=${X11VNC_RFBPORT:-5900} X11VNC_DISPLAY=${X11VNC_DISPLAY:-:0} X11VNC_LOG=${X11VNC_LOG:-/var/log/x11vnc} - - X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}" + + X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}" if [ -n "${X11VNC_AUTOPORT}" ]; then X11VNC_PORT="" @@ -30,7 +30,7 @@ checkconfig() { checkpath -q -f -m 0600 -o root:root "${X11VNC_RFBAUTH}" # Attempt to find X-Auth file - if ! type xauth > /dev/null 2>&1 || + if ! command -v xauth > /dev/null 2>&1 || ! xauth -f /root/.Xauthority extract - "${X11VNC_DISPLAY}" > "${X11VNC_AUTH}" 2>/dev/null || [ ! -s "${X11VNC_AUTH}" ]; then # Let x11vnc guess at auth @@ -43,7 +43,7 @@ checkconfig() { if [ ! -f "${X11VNC_AUTH}" ]; then eerror "Specified X-Authority file '${X11VNC_AUTH}' not found!" return 1 - fi + fi } start() { diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild deleted file mode 100644 index 74df787e2dd1..000000000000 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r6.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="VNC server for real X displays" -HOMEPAGE="https://libvnc.github.io/" -SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+-with-openssl-exception" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" - -COMMON_DEPEND=" - >=net-libs/libvncserver-0.9.8[ssl=] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXext - >=x11-libs/libXtst-1.1.0 - virtual/libcrypt:= - ssl? ( dev-libs/openssl:0= ) - xcomposite? ( x11-libs/libXcomposite ) - xdamage? ( x11-libs/libXdamage ) - xfixes? ( x11-libs/libXfixes ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr ) - zeroconf? ( >=net-dns/avahi-0.6.4 ) -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libXt -" -# https://bugzilla.redhat.com/show_bug.cgi?id=920554 -RDEPEND="${COMMON_DEPEND} - dev-lang/tk:0 -" - -PATCHES=( - "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 - "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-CVE-2020-29074.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --without-v4l because of missing video4linux 2.x support wrt #389079 - local myconf=( - --without-v4l - --without-xkeyboard - --without-fbpm - --without-dpms - $(use_with crypt) - $(use_with fbcon fbdev) - $(use_with ssl) - $(use_with ssl crypto) - $(use_with xcomposite) - $(use_with xdamage) - $(use_with xfixes) - $(use_with xinerama) - $(use_with xrandr) - $(use_with zeroconf avahi) - ) - econf "${myconf[@]}" -} - -src_install() { - default - newinitd "${FILESDIR}/x11vnc.init.d" x11vnc - newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc -} diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild index 74b94b9ee0ae..62b802f2bb43 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r7.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" COMMON_DEPEND=" @@ -43,6 +43,8 @@ PATCHES=( "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 "${FILESDIR}"/${P}-fno-common.patch "${FILESDIR}"/${P}-CVE-2020-29074.patch + "${FILESDIR}"/${P}-implicit-function-declaration.patch + "${FILESDIR}"/${P}-libressl.patch # 903001 ) src_prepare() { diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild index dd4c604ea3e3..e597035e043c 100644 --- a/x11-misc/xaos/xaos-3.6.ebuild +++ b/x11-misc/xaos/xaos-3.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux" IUSE="aalib doc gtk nls png svga threads X" RDEPEND=" diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml index d6616b3af88b..5f52a9e04c85 100644 --- a/x11-misc/xautolock/metadata.xml +++ b/x11-misc/xautolock/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>graaff@gentoo.org</email> -</maintainer> +<!-- maintainer-needed --> <longdescription lang="en"> If no user activity is detected after a set timeout, xautolock runs a program for you. If you want that program (with optional arguments) to be a screen diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild index fd84f8e1b114..caed08b01a48 100644 --- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild +++ b/x11-misc/xautolock/xautolock-2.2_p7.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=7 @@ -14,7 +14,7 @@ SRC_URI=" " LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86" RDEPEND=" x11-libs/libXScrnSaver diff --git a/x11-misc/xautomation/xautomation-1.09-r1.ebuild b/x11-misc/xautomation/xautomation-1.09-r2.ebuild index ee773eb1d6fb..e210038f66e1 100644 --- a/x11-misc/xautomation/xautomation-1.09-r1.ebuild +++ b/x11-misc/xautomation/xautomation-1.09-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Control X from command line and find things on screen" HOMEPAGE="https://hoopajoo.net/projects/xautomation.html" @@ -12,12 +12,10 @@ SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ppc x86" RDEPEND=" - >=media-libs/libpng-1.2:0 + media-libs/libpng:= x11-libs/libX11 x11-libs/libXi - x11-libs/libXtst -" + x11-libs/libXtst" DEPEND=" ${RDEPEND} - x11-base/xorg-proto -" + x11-base/xorg-proto" diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild index 3eba2a59a23a..a4c731642d2c 100644 --- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild +++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="amd64 ~arm ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="guile tk" RDEPEND=" diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest index 204d162f5530..087356dbd7f0 100644 --- a/x11-misc/xbitmaps/Manifest +++ b/x11-misc/xbitmaps/Manifest @@ -1 +1 @@ -DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d +DIST xbitmaps-1.1.3.tar.xz 109772 BLAKE2B e5ffeed910131fafe7346bc26920dc27a9ef55b069a36cc969183cc7b02a732a781e1fd295ec2577fbb472efc566f18aa2d534e18e94d4a8abc66db0177bd26e SHA512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814 diff --git a/x11-misc/xbitmaps/metadata.xml b/x11-misc/xbitmaps/metadata.xml index e17a5bccb78b..878ce12c5523 100644 --- a/x11-misc/xbitmaps/metadata.xml +++ b/x11-misc/xbitmaps/metadata.xml @@ -5,4 +5,7 @@ <email>x11@gentoo.org</email> <name>X11</name> </maintainer> +<upstream> + <remote-id type="freedesktop-gitlab">xorg/data/bitmaps</remote-id> +</upstream> </pkgmetadata> diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild index 26d847e1f7b8..d7c4977867a4 100644 --- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild +++ b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild @@ -1,19 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DESCRIPTION="X.Org bitmaps data" -HOMEPAGE="https://www.x.org/wiki/" -SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2" +XORG_MODULE=data/ +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" +DESCRIPTION="X.Org bitmaps data" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -RDEPEND="" -DEPEND="${RDEPEND}" # there is nothing to compile for this package, all its contents are produced by # configure. the only make job that matters is make install src_compile() { true; } diff --git a/x11-misc/xcalib/xcalib-0.10.ebuild b/x11-misc/xcalib/xcalib-0.10.ebuild index 93348fe9c4d1..74d0b6510315 100644 --- a/x11-misc/xcalib/xcalib-0.10.ebuild +++ b/x11-misc/xcalib/xcalib-0.10.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake diff --git a/x11-misc/xcape/files/xcape-1.2-makefile.patch b/x11-misc/xcape/files/xcape-1.2-makefile.patch new file mode 100644 index 000000000000..06d4d04cdf50 --- /dev/null +++ b/x11-misc/xcape/files/xcape-1.2-makefile.patch @@ -0,0 +1,27 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,19 +1,16 @@ + INSTALL=install +-PREFIX=/usr +-MANDIR?=/local/man/man1 ++PREFIX=$(EPREFIX)/usr ++MANDIR?=/share/man/man1 + + TARGET := xcape + + CFLAGS += -Wall +-CFLAGS += `pkg-config --cflags xtst x11` +-LDFLAGS += `pkg-config --libs xtst x11` +-LDFLAGS += -pthread ++CFLAGS += `$(PKG_CONFIG) --cflags xtst x11` ++LDLIBS += `$(PKG_CONFIG) --libs xtst x11` ++LDLIBS += -pthread + + all: $(TARGET) + +-$(TARGET): xcape.c +- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) +- + install: + $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)$(MANDIR) diff --git a/x11-misc/xcape/xcape-1.2-r1.ebuild b/x11-misc/xcape/xcape-1.2-r1.ebuild new file mode 100644 index 000000000000..8b524c8c6a55 --- /dev/null +++ b/x11-misc/xcape/xcape-1.2-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Utility to make modifier keys send custom key events when pressed on their own" +HOMEPAGE="https://github.com/alols/xcape" +SRC_URI="https://github.com/alols/xcape/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXtst" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) + +src_configure() { + tc-export CC PKG_CONFIG +} diff --git a/x11-misc/xcape/xcape-1.2.ebuild b/x11-misc/xcape/xcape-1.2.ebuild deleted file mode 100644 index 48e5ae1a3290..000000000000 --- a/x11-misc/xcape/xcape-1.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Utility to make modifier keys send custom key events when pressed on their own" -HOMEPAGE="https://github.com/alols/xcape" -SRC_URI="https://github.com/alols/xcape/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND="x11-libs/libX11 - x11-libs/libXtst" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - - # Fix path to man and to pkg-config - sed -i \ - -e '/MANDIR/s:local:share:' \ - -e 's/pkg-config/${PKG_CONFIG}/' \ - Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install -} diff --git a/x11-misc/xcb/files/xcb-modern-c-porting.patch b/x11-misc/xcb/files/xcb-modern-c-porting.patch new file mode 100644 index 000000000000..39c8173d53ba --- /dev/null +++ b/x11-misc/xcb/files/xcb-modern-c-porting.patch @@ -0,0 +1,342 @@ +diff --git a/xcb.c b/xcb.c +index 2c990a3..ac9fec2 100644 +--- a/xcb.c ++++ b/xcb.c +@@ -262,13 +262,8 @@ XCreateFontSetWithGuess (Display * d, const char *pattern, char ***miss, int *n_ + + static + Boolean +-CvtStringToFontSet (dpy, args, num_args, fromVal, toVal, closure_ret) +- Display *dpy; +- XrmValuePtr args; +- Cardinal *num_args; +- XrmValuePtr fromVal; +- XrmValuePtr toVal; +- XtPointer *closure_ret; ++CvtStringToFontSet (Display *dpy, XrmValuePtr args, Cardinal *num_args, ++ XrmValuePtr fromVal, XrmValuePtr toVal, XtPointer *closure_ret) + { + XFontSet f; + char **missing_charset_list; +@@ -299,10 +294,7 @@ CvtStringToFontSet (dpy, args, num_args, fromVal, toVal, closure_ret) + * Fetch the contents of cut buffer n from the root window. + */ + static char * +-fetch_buffer (a, nb, force_mb) +- Atom a; +- int *nb; +- int force_mb; ++fetch_buffer (Atom a, int *nb, int force_mb) + { + unsigned long after; + char **list; +@@ -338,11 +330,7 @@ fetch_buffer (a, nb, force_mb) + * Store the string p into cut buffer n on the root window. + */ + static void +-store_buffer (p, nb, atom, force_mb) +- char *p; +- int nb; +- Atom atom; +- int force_mb; ++store_buffer (char *p, int nb, Atom atom, int force_mb) + { + XTextProperty pt; + +@@ -359,8 +347,7 @@ store_buffer (p, nb, atom, force_mb) + * Add an atom to the program's atom cache. + */ + static Atom +-get_atom (n, ifexists) +- int n, ifexists; ++get_atom (int n, int ifexists) + { + char tmp[32]; + +@@ -403,10 +390,7 @@ initialize_properties (void) + * Draw a string in the window with top-left corner justification. + */ + static void +-place_text (cb, str, len, y) +- CbWidget cb; +- char *str; +- int len, y; ++place_text (CbWidget cb, char *str, int len, int y) + { + int cols; + GC gc; +@@ -439,10 +423,8 @@ place_text (cb, str, len, y) + */ + + static void +-cb_initialize (req, wdg, args, nargs) /*ARGSUSED */ +- Widget req, wdg; +- ArgList args; +- Cardinal *nargs; ++cb_initialize (Widget req, Widget wdg, ++ ArgList args, Cardinal *nargs) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + XFontSetExtents *xfe = XExtentsOfFontSet (cb->fontset); +@@ -455,10 +437,7 @@ cb_initialize (req, wdg, args, nargs) /*ARGSUSED */ + } + + static void +-cb_realize (wdg, mask, attrs) +- Widget wdg; +- XtValueMask *mask; +- XSetWindowAttributes *attrs; ++cb_realize (Widget wdg, XtValueMask *mask, XSetWindowAttributes *attrs) + { + CbWidget cb = (CbWidget) wdg; + XtGCMask v_mask = 0L; +@@ -487,10 +466,7 @@ cb_realize (wdg, mask, attrs) + * Keep it simple. + */ + static void +-cb_redisplay (wdg, event, region) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- Region region; ++cb_redisplay (Widget wdg, XEvent *event, Region region) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + char *p, *pp, *base; +@@ -513,8 +489,7 @@ cb_redisplay (wdg, event, region) /*ARGSUSED */ + } + + static void +-cb_destroy (wdg) +- Widget wdg; ++cb_destroy (Widget wdg) + { + CbWidget cb = (CbWidget) wdg; + +@@ -540,11 +515,8 @@ cb_destroy (wdg) + * This breaks all the rules for object oriented widgets. Disgusting, no? + */ + static void +-cb_cut (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_cut (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + Window win = cb->core.window; +@@ -572,11 +544,8 @@ cb_cut (wdg, event, parms, nparms) /*ARGSUSED */ + } + + static void +-cb_paste (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_paste (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + Window w; +@@ -596,11 +565,8 @@ cb_paste (wdg, event, parms, nparms) /*ARGSUSED */ + } + + static void +-cb_clear (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_clear (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + Window win = cb->core.window; +@@ -614,11 +580,8 @@ cb_clear (wdg, event, parms, nparms) /*ARGSUSED */ + } + + static void +-cb_rotate (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_rotate (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + int n = 0; + +@@ -630,11 +593,8 @@ cb_rotate (wdg, event, parms, nparms) /*ARGSUSED */ + } + + static void +-cb_quit (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_quit (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + exit (0); + } +@@ -643,11 +603,8 @@ cb_quit (wdg, event, parms, nparms) /*ARGSUSED */ + * Clear and redraw the widget's window. + */ + static void +-cb_refresh (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_refresh (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + XClearArea (dpy, wdg->core.window, 0, 0, 0, 0, False); + cb_redisplay (wdg, (XEvent *) 0, (Region) 0); +@@ -661,11 +618,8 @@ cb_refresh (wdg, event, parms, nparms) /*ARGSUSED */ + * of the cut buffer to the target window+atom. + */ + static void +-cb_selreq (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_selreq (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + int nbytes; + char *ptr; +@@ -739,11 +693,8 @@ cb_selreq (wdg, event, parms, nparms) /*ARGSUSED */ + * be redrawn without highlighting. + */ + static void +-cb_selclear (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_selclear (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + +@@ -858,18 +809,14 @@ usage () + * or in the xdm-errors file when forcibly destroying the client program. + */ + static int +-xioerror (d) /*ARGSUSED */ +- Display *d; ++xioerror (Display *d) /*ARGSUSED */ + { + exit (1); /*NOTREACHED */ + } + + static void +-wmdel (wdg, ptr, ep, cont) /*ARGSUSED */ +- Widget wdg; +- XtPointer ptr; +- XEvent *ep; +- Boolean *cont; ++wmdel (Widget wdg, XtPointer ptr, ++ XEvent *ep, Boolean *cont) /*ARGSUSED */ + { + if (ep->type == ClientMessage && ep->xclient.data.l[0] == delwin) + exit (0); +@@ -879,10 +826,7 @@ wmdel (wdg, ptr, ep, cont) /*ARGSUSED */ + * Print the contents of a cut buffer on stdout. + */ + static void +-doprint (n, ptr, nb) +- int n; +- char *ptr; +- int nb; ++doprint (int n, char *ptr, int nb) + { + Atom a; + +@@ -905,10 +849,7 @@ doprint (n, ptr, nb) + * Load a new value into one of the cut buffers. + */ + static void +-doset (n, ptr, nb) +- int n; +- char *ptr; +- int nb; ++doset (int n, char *ptr, int nb) + { + char *str = malloc (nb + 1); + +@@ -920,9 +861,7 @@ doset (n, ptr, nb) + } + + static void +-timeout (arg, id) +- char *arg; +- XtIntervalId *id; ++timeout (void *arg, XtIntervalId *id) + { + exit (2); + } +@@ -931,10 +870,7 @@ timeout (arg, id) + * Copy the PRIMARY selection into a cut buffer. + */ + static void +-dogetseln (n, ptr, nb) +- int n; +- char *ptr; +- int nb; ++dogetseln (int n, char *ptr, int nb) + { + char *data; + int nbytes; +@@ -981,11 +917,7 @@ dogetseln (n, ptr, nb) + * list ordering is significant. + */ + static void +-dolist (list, fn, data, nbytes) +- char *list; +- void (*fn) (); +- char *data; +- int nbytes; ++dolist (char *list, void (*fn)(int, char*, int), char *data, int nbytes) + { + int m, n, x; + +@@ -1027,9 +959,7 @@ dolist (list, fn, data, nbytes) + * without the need to create any X windows first. + */ + static void +-dotask (cmd, arg) +- int cmd; +- char *arg; ++dotask (int cmd, char *arg) + { + char *ptr; + int i, n, nb; +@@ -1122,9 +1052,7 @@ static XrmOptionDescRec opt[] = + * perform all the windows initializations. + */ + static void +-init (argc, argv) +- int argc; +- char **argv; ++init (int argc, char **argv) + { + int i, n; + char **p; +@@ -1350,9 +1278,8 @@ xevents () + } + } + +-main (argc, argv) +- int argc; +- char **argv; ++int ++main (int argc, char **argv) + { + init (argc, argv); + xevents (); diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r2.ebuild index 6e45fc992880..21ff1bbe9c2c 100644 --- a/x11-misc/xcb/xcb-2.4-r1.ebuild +++ b/x11-misc/xcb/xcb-2.4-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Marc Lehmann's improved X Cut Buffers" @@ -18,13 +19,17 @@ RDEPEND=" x11-libs/libXaw x11-libs/libXext x11-libs/libXt + motif? ( >=x11-libs/motif-2.3:0 ) " DEPEND=" ${RDEPEND} x11-base/xorg-proto - motif? ( >=x11-libs/motif-2.3:0 ) " +PATCHES=( + "${FILESDIR}"/${PN}-modern-c-porting.patch +) + src_compile() { local gui libs diff --git a/x11-misc/xclip/metadata.xml b/x11-misc/xclip/metadata.xml index 2af70f923454..7f3389a92687 100644 --- a/x11-misc/xclip/metadata.xml +++ b/x11-misc/xclip/metadata.xml @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> - <upstream> - <remote-id type="github">astrand/xclip</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>orbea@riseup.net</email> + <name>orbea</name> + </maintainer> + <maintainer type="person" proxied="proxy"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">astrand/xclip</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild index de004756c804..bb2a1cfa7bad 100644 --- a/x11-misc/xclip/xclip-0.13.ebuild +++ b/x11-misc/xclip/xclip-0.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,6 +19,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} + x11-base/xorg-proto x11-libs/libXt" src_prepare() { diff --git a/x11-misc/xclip/xclip-9999.ebuild b/x11-misc/xclip/xclip-9999.ebuild index ffdfc0010b13..61bcf329f7bf 100644 --- a/x11-misc/xclip/xclip-9999.ebuild +++ b/x11-misc/xclip/xclip-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,6 +19,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} + x11-base/xorg-proto x11-libs/libXt " diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest index 52cf3b050cb4..a75c1630179d 100644 --- a/x11-misc/xdaliclock/Manifest +++ b/x11-misc/xdaliclock/Manifest @@ -1,2 +1,2 @@ -DIST xdaliclock-2.44.tar.gz 17727649 BLAKE2B 170f1a7f9e5c10799b62b2ae76b33ab64230e4ade8f0b79c2aff7481536009e3e4e0f19239dd806d7b16c69225744fa381f5aabbeec6e0e92d8b875bd8ca0aeb SHA512 82082a8e16a85c7115bdd0a44e7845aedfad93f94226a14cf606493564829c7ffe55eb4d17cb43c41bd0e6c97c090457d6aa2d184f60462cea3a89f47ef72e00 DIST xdaliclock-2.47.tar.gz 3410612 BLAKE2B 64d2e98693f055887959c34021a3e595bd46fb8ba453c58af76d78977a2d7b6a0092c9c9e174c53d65b7af5723e9fb3c434a48e4d39f2986dac8d6b80f3fa9f7 SHA512 d51930240170bad5694cc502251aeb88aed8b78cee086bda704624c2599acf94e30368a971f26eb59a824df3273b6eb58c6fd2017684f8f421d678828e41db7f +DIST xdaliclock-2.48.tar.gz 3412476 BLAKE2B be2c7dfc5ffc39bd8310e24219d0057604b3f7c528b4cdfc96256bc840d0df5c2d62b70556cbeb9cc30518067283e3c14d61d806450d6cb97598ca420fe07c4d SHA512 e41810ef98a94b07fb233c397c13f8f9b9e69fd692b6c7737549c532466f37819e63aea3fcc6ed53d71269d4a32f5f602e686a46a1ce814ee4320a49717b0b17 diff --git a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild deleted file mode 100644 index d46ef2260afd..000000000000 --- a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape" -HOMEPAGE="https://www.jwz.org/xdaliclock" -SRC_URI="https://www.jwz.org/xdaliclock/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -S=${WORKDIR}/${P}/X11 - -src_install() { - dobin ${PN} - newman ${PN}.man ${PN}.1 - dodoc ../README -} diff --git a/x11-misc/xdaliclock/xdaliclock-2.47.ebuild b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild index 1fe477c682ff..70fb0b3ee3f2 100644 --- a/x11-misc/xdaliclock/xdaliclock-2.47.ebuild +++ b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/X11 LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xdaliclock/xdaliclock-2.48.ebuild b/x11-misc/xdaliclock/xdaliclock-2.48.ebuild new file mode 100644 index 000000000000..08ed1122de42 --- /dev/null +++ b/x11-misc/xdaliclock/xdaliclock-2.48.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils xdg + +DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape" +HOMEPAGE="https://www.jwz.org/xdaliclock" +SRC_URI="https://www.jwz.org/xdaliclock/${P}.tar.gz" +S="${WORKDIR}"/${P}/X11 + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:3 + x11-libs/libX11 + virtual/opengl +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/xdaliclock-2.47-DESTDIR.patch +) + +src_install() { + dodir /usr/bin /usr/share/pixmaps + dodir /usr/share/glib-2.0/schemas /usr/share/man/man1/ + dodir /usr/share/applications/ + + default + + # Will collide with dev-libs/glib + rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + + #dobin ${PN} + #newman ${PN}.man ${PN}.1 + #dodoc ../README + + #doicon xdaliclock.png + #domenu xdaliclock.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild index 1be0017af311..fe9e411845d7 100644 --- a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild +++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit desktop toolchain-funcs -DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water" -HOMEPAGE="http://xdesktopwaves.sourceforge.net/" +DESCRIPTION="Cellular automata setting the background of your X Windows desktop under water" +HOMEPAGE="https://xdesktopwaves.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" RDEPEND=" diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild index 5e0d63459257..60eaaae8aa09 100644 --- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild +++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild index b1201dddc1fd..c4747adf2ade 100644 --- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild +++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="gtk" BDEPEND="app-text/docbook-xml-dtd:4.3 diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest index a362143699c1..fcc0588cf220 100644 --- a/x11-misc/xdg-utils/Manifest +++ b/x11-misc/xdg-utils/Manifest @@ -1,2 +1,3 @@ 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/xdg-utils-1.1.3_p20210805-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild index 561fb1c79f9c..852bfc0c9eea 100644 --- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild +++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.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 @@ -16,7 +16,7 @@ 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" +IUSE="dbus doc gnome X" REQUIRED_USE="gnome? ( dbus )" RDEPEND=" @@ -30,8 +30,10 @@ RDEPEND=" ) ) x11-misc/shared-mime-info - x11-apps/xprop - x11-apps/xset + X? ( + x11-apps/xprop + x11-apps/xset + ) " BDEPEND=" >=app-text/xmlto-0.0.28-r3[text(+)] diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild new file mode 100644 index 000000000000..74b50cca06a6 --- /dev/null +++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild @@ -0,0 +1,88 @@ +# 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" + +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/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild index d651d779077d..deb5d693b990 100644 --- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild +++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild @@ -1,25 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -DESCRIPTION="user-friendly program to show you what is using up all your disk space" -HOMEPAGE="http://xdiskusage.sourceforge.net/" -SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz" +DESCRIPTION="User-friendly program to show you what is using up all your disk space" +HOMEPAGE="https://xdiskusage.sourceforge.net/" +SRC_URI="https://xdiskusage.sourceforge.net/${P}.tgz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~arm64 ~ppc x86" -RDEPEND=" - >=x11-libs/fltk-1.3:1 -" -BDEPEND=" - ${RDEPEND} -" -DEPEND=" - ${RDEPEND} -" +RDEPEND=">=x11-libs/fltk-1.3:1" +BDEPEND="${RDEPEND}" +DEPEND="${RDEPEND}" + PATCHES=( "${FILESDIR}"/${PN}-1.52-flags-order.patch "${FILESDIR}"/${PN}-1.52-pathbuf.patch diff --git a/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch b/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch new file mode 100644 index 000000000000..a4cd766c06e7 --- /dev/null +++ b/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch @@ -0,0 +1,11 @@ +#Bug https://bugs.gentoo.org/898894 +--- a/src/lib/network.c ++++ b/src/lib/network.c +@@ -16,6 +16,7 @@ + #include <stdarg.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <string.h>
+
+ int net_connect(char* host, int port)
+ {
diff --git a/x11-misc/xdock/xdock-0.3.0-r1.ebuild b/x11-misc/xdock/xdock-0.3.0-r2.ebuild index 4c830a3fe0f3..ce4411d6f6e6 100644 --- a/x11-misc/xdock/xdock-0.3.0-r1.ebuild +++ b/x11-misc/xdock/xdock-0.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,6 +23,7 @@ DOCS=( API AUTHORS ChangeLog README TODO ) PATCHES=( "${FILESDIR}"/${PN}-0.2.0-ldconfig.patch "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-clang16-memcpy.patch ) src_prepare() { diff --git a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild index b1799611bdbc..eadd29f568db 100644 --- a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild +++ b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="examples" # Many the tests want to manually start Xvfb regardless of whether there diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest index 4366ba8b9552..c200cd335b0b 100644 --- a/x11-misc/xfe/Manifest +++ b/x11-misc/xfe/Manifest @@ -1,2 +1,2 @@ -DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d DIST xfe-1.44.tar.xz 1444296 BLAKE2B 3ace2689adc2a4e2b24e44f8f416cad5e4904d38d2be7e275256714a707995368450e63c4cf2eee3f870be51c42f295a938ea6ecd159dd1a996aad53b5d119b3 SHA512 d02f0db46c5ca6e26cff447d7f11bbc5f03a9d28b8d492a783bb47f67431a022785d6f3b25013f82a6121a8675f86caf1a9154a7faa8186e05cf4de0bd2f1749 +DIST xfe-1.46.tar.xz 1431496 BLAKE2B d7b85e5280d1d9d6db3737f8ac14f4248ae4e99b52d843b51468299bdf71581003b21d0fb2be9949c7189481ed5f3fe88bbd146d2185c17dea3a4785edb876b7 SHA512 9fea984ebbfe4dada85e028bfbde1352392cb77462c238c77c6950aac2526db11d556c8187fd765fd935ba21088c1b551e88ee414dcac35d7c59f5411c4c145b diff --git a/x11-misc/xfe/xfe-1.43.2.ebuild b/x11-misc/xfe/xfe-1.43.2.ebuild deleted file mode 100644 index f2925f4b965c..000000000000 --- a/x11-misc/xfe/xfe-1.43.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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 plocale xdg-utils - -DESCRIPTION="MS-Explorer-like minimalist file manager for X" -HOMEPAGE="http://roland65.free.fr/xfe" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug nls startup-notification" - -RDEPEND=" - media-libs/libpng:0 - x11-libs/fox:1.6[png,truetype] - x11-libs/libX11 - x11-libs/libXft - startup-notification? ( x11-libs/startup-notification ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) -" - -DOCS=( AUTHORS BUGS ChangeLog README TODO ) - -src_prepare() { - default - - cat >po/POTFILES.skip <<-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() { - econf \ - $(use_enable debug) \ - $(use_enable nls) \ - $(use_enable startup-notification sn) \ - --enable-minimalflags -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/xfe/xfe-1.46.ebuild b/x11-misc/xfe/xfe-1.46.ebuild new file mode 100644 index 000000000000..f346e2fce311 --- /dev/null +++ b/x11-misc/xfe/xfe-1.46.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="mirror://sourceforge/${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/xflux-gui/xflux-gui-2.0-r1.ebuild b/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild index 04205646c15b..bae43d3357cd 100644 --- a/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild +++ b/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 gnome2-utils xdg-utils +inherit distutils-r1 gnome2-utils DESCRIPTION="A GUI for f.lux" HOMEPAGE="https://github.com/xflux-gui/fluxgui/" diff --git a/x11-misc/xfractint/xfractint-20.04_p16.ebuild b/x11-misc/xfractint/xfractint-20.04_p16.ebuild index 0e7b98b42567..af6790581497 100644 --- a/x11-misc/xfractint/xfractint-20.04_p16.ebuild +++ b/x11-misc/xfractint/xfractint-20.04_p16.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs MY_P=${P/_} @@ -28,6 +28,14 @@ PATCHES=( ) src_compile() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/864759 + # Reported to developer list at + # https://mailman.xmission.com/postorius/lists/fractdev.mailman.xmission.com/ + # + # Do not trust for LTO either + append-flags -fno-strict-aliasing + filter-lto emake CC="$(tc-getCC)" AS="$(tc-getAS)" OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}" } diff --git a/x11-misc/xgestures/metadata.xml b/x11-misc/xgestures/metadata.xml index c802054f4520..24630f758671 100644 --- a/x11-misc/xgestures/metadata.xml +++ b/x11-misc/xgestures/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">xgestures</remote-id> </upstream> diff --git a/x11-misc/xgestures/xgestures-0.4.ebuild b/x11-misc/xgestures/xgestures-0.4-r1.ebuild index 6d93d06237ae..e54e731d60d2 100644 --- a/x11-misc/xgestures/xgestures-0.4.ebuild +++ b/x11-misc/xgestures/xgestures-0.4-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="A mouse gesture recognition program for X11 desktops" HOMEPAGE="http://www.cs.bgu.ac.il/~tzachar/xgestures.html" @@ -11,7 +13,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND="x11-libs/libXmu +RDEPEND=" + x11-libs/libXmu x11-libs/libX11 x11-libs/libXrender x11-libs/libXtst @@ -19,7 +22,10 @@ RDEPEND="x11-libs/libXmu DEPEND="${RDEPEND} x11-base/xorg-proto" -DOCS=( AUTHORS ChangeLog NEWS README ) +src_prepare() { + default + eautoreconf +} src_install() { default diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1-r1.ebuild index 120fccb46e3f..3ccb080471da 100644 --- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild +++ b/x11-misc/xhkeys/xhkeys-2.2.1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="Assign particular actions to any key or key combination" HOMEPAGE="http://wmalms.tripod.com/#XHKEYS" @@ -26,6 +28,11 @@ PATCHES=( "${FILESDIR}"/${P}-CC.patch ) +src_prepare() { + default + eautoreconf +} + src_install() { dobin xhkeys xhkconf dodoc README VERSION diff --git a/x11-misc/xidle/xidle-26052015-r1.ebuild b/x11-misc/xidle/xidle-26052015-r1.ebuild index 39252add1d52..28de0ef6a81a 100644 --- a/x11-misc/xidle/xidle-26052015-r1.ebuild +++ b/x11-misc/xidle/xidle-26052015-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXScrnSaver " -DEPEND="${DEPEND}" +DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( diff --git a/x11-misc/xkblayout-state/Manifest b/x11-misc/xkblayout-state/Manifest index a23c24b233aa..fbfed7265a10 100644 --- a/x11-misc/xkblayout-state/Manifest +++ b/x11-misc/xkblayout-state/Manifest @@ -1 +1 @@ -DIST xkblayout-state-0_p20180118.tar.gz 6853 BLAKE2B 1a8b3a9c89d9647bb8b9f6a2261f2e06f44f408823939268d60364fe532b9501e3c36d8f66cc1160f0b5432874d48046f848159842d09135a6cb4af658a8b248 SHA512 7618e920f8044324b7f4eb58d4e22ce076056d2d911cd950e6a862303c4b37f31f5919fec69c63173a7ff181d51849def4f6a78a407baf3012232f2f423bed00 +DIST xkblayout-state-0_p20211106.tar.gz 7617 BLAKE2B 523a861c7cf79e2fc77ced1c411d54771f3ed4ed236ac89d8c89996a26e6fe4bf0d12f75ade9d9bebb1de9e233dcd6ca838dbf297df6f411caff0a27e47df5b5 SHA512 85d785ed767d1c29cd1710bc07894ebc94a18018afa211202929c82ac10e7efb06e5ce29d8de507cbd4c931d650e3c04e1452f63dad17a99a379e55761dbc15b diff --git a/x11-misc/xkblayout-state/metadata.xml b/x11-misc/xkblayout-state/metadata.xml index bef24d2c2337..c61bb6c88c0f 100644 --- a/x11-misc/xkblayout-state/metadata.xml +++ b/x11-misc/xkblayout-state/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">nonpop/xkblayout-state</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild b/x11-misc/xkblayout-state/xkblayout-state-0_p20211106.ebuild index afbeba66bacf..765479fe3bb9 100644 --- a/x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild +++ b/x11-misc/xkblayout-state/xkblayout-state-0_p20211106.ebuild @@ -1,23 +1,21 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -# Commit Date: 18 Jan 2018 -EGIT_COMMIT="45b752b130e077d5b1437d40b0a459e062aafa13" +# Commit Date: 06 Nov 2021 +EGIT_COMMIT="f311779ed95f43f1fdebed0f710ad84057e6fe19" -DESCRIPTION="A small program to get/set the current XKB layout" +DESCRIPTION="Small program to get/set the current XKB layout" HOMEPAGE="https://github.com/nonpop/xkblayout-state" SRC_URI="https://github.com/nonpop/xkblayout-state/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND}" diff --git a/x11-misc/xkblayout-state/xkblayout-state-9999.ebuild b/x11-misc/xkblayout-state/xkblayout-state-9999.ebuild deleted file mode 100644 index b92c94a33662..000000000000 --- a/x11-misc/xkblayout-state/xkblayout-state-9999.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit git-r3 toolchain-funcs - -DESCRIPTION="A small program to get/set the current XKB layout" -HOMEPAGE="https://github.com/nonpop/xkblayout-state" -EGIT_REPO_URI="https://github.com/nonpop/xkblayout-state.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" - -src_compile() { - emake CXX="$(tc-getCXX)" -} - -src_install() { - emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install -} diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index ef0114fb8d20..bfc8f0232e33 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1 +1 @@ -DIST xkeyboard-config-2.37.tar.xz 879744 BLAKE2B 58cc62d48a857b0935bfe7415b4a28921d02218402ca0125e8644be04a14f897e357a224fed12f9a85c6d147b4fa659241004bf49ac16c19b7f5fceb2b6d3295 SHA512 3b2da77996d48bf7b6a5f5784bbcb62070ba6ab8eabb6f255d1addd7fa58080a329464010050e894c9acc901e42e3669333db2966140c78802efb8a86620ac0e +DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild index 1441c0c806cd..fe824fdb32a2 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.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=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-any-r1 DESCRIPTION="X keyboard configuration database" @@ -14,23 +14,48 @@ if [[ ${PV} == 9999 ]]; then 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 ~sparc-solaris ~x86-solaris" + 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 )" -DEPEND="" -RDEPEND="" +# <dev-python/pycountry-23.12.7 bug #920278 BDEPEND=" - ${PYTHON_DEPS} 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() { - python-any-r1_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() { diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index a73d92e50be9..8dccf01c3ce0 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.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=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-any-r1 DESCRIPTION="X keyboard configuration database" @@ -14,23 +14,48 @@ if [[ ${PV} == 9999 ]]; then 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 ~sparc-solaris ~x86-solaris" + 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 )" -DEPEND="" -RDEPEND="" +# <dev-python/pycountry-23.12.7 bug #920278 BDEPEND=" - ${PYTHON_DEPS} 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() { - python-any-r1_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() { diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest index b3c8e55f3b59..7860d4448776 100644 --- a/x11-misc/xmobar/Manifest +++ b/x11-misc/xmobar/Manifest @@ -1 +1,2 @@ DIST xmobar-0.44.1.tar.gz 156756 BLAKE2B bee81627744146989b402ae04d36edb5e4a69686b546457afebad81cda96ece4ce0ace8a2855bd5136610be3fc396c2f62121ea062fffb1ad837145cf3238fdb SHA512 e04f3f9f40ffa4095df2b523916686d93d28b4cbb880f7732cf63d6f1915e721043764b9d723ed8b3c4938c3df749d0e5a9ddb9a9e64a2a015f8f0d6b3f46c97 +DIST xmobar-0.46.tar.gz 168197 BLAKE2B a1b0e94794232641574b0e6c1c55ab8c203fec800702896ab516f2df7d50ffec709385958ffd4098f79ac00a9c88c72c04088bca5f4523501cdb12cf39da8bb5 SHA512 37ebef56c3046b45ec83025ab8233827f50dcc3aa48691e06ac00c59b8bedeafd5860c94e36d54d3f499217a27a12641b0e98f6f0f248b9d56a22d1b103c50c8 diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml index 85386171573c..bcca3a0444db 100644 --- a/x11-misc/xmobar/metadata.xml +++ b/x11-misc/xmobar/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="alsa">Use alsa-mixer to get the volume from soundcards.</flag> + <flag name="datezone">Enables localized date support.</flag> <flag name="dbus">Publish a service on the session bus for controlling xmobar.</flag> <flag name="mpd">MPD support. Needs libmpd installed.</flag> <flag name="mpris">MPRIS v1, v2 support.</flag> @@ -17,5 +18,9 @@ <flag name="wifi">Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux, the kernel.</flag> <flag name="xft">Use Xft to render text. UTF-8 support included.</flag> <flag name="xpm">Enable usage of xpm for icons.</flag> + <flag name="xrender">Use XRender for alpha background pseudo-transparency.</flag> </use> + <upstream> + <remote-id type="hackage">xmobar</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xmobar/xmobar-0.44.1.ebuild b/x11-misc/xmobar/xmobar-0.44.1.ebuild index 4a7d43bb0054..365e5f2504d5 100644 --- a/x11-misc/xmobar/xmobar-0.44.1.ebuild +++ b/x11-misc/xmobar/xmobar-0.44.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="alsa dbus mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm" RDEPEND=">=dev-haskell/aeson-1.4.7.1:=[profile?] diff --git a/x11-misc/xmobar/xmobar-0.46.ebuild b/x11-misc/xmobar/xmobar-0.46.ebuild new file mode 100644 index 000000000000..30c801488862 --- /dev/null +++ b/x11-misc/xmobar/xmobar-0.46.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.8.0.0.9999 +#hackport: flags: -all_extensions,+with_threaded,+with_utf8,-with_iwlib,with_nl80211:wifi,+with_inotify + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="A Minimalistic Text Based Status Bar" +HOMEPAGE="https://codeberg.org/xmobar/xmobar" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="alsa datezone dbus mpd mpris +rtsopts uvmeter +weather wifi xpm +xrender" + +RDEPEND=">=dev-haskell/aeson-1.4.7.1:=[profile?] + dev-haskell/async:=[profile?] + >=dev-haskell/cairo-0.13:=[profile?] + >=dev-haskell/colour-2.3.6:=[profile?] + >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] + >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] + dev-haskell/old-locale:=[profile?] + >=dev-haskell/pango-0.13:=[profile?] + >=dev-haskell/parsec-numbers-0.1.0:=[profile?] + dev-haskell/regex-compat:=[profile?] + >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] + >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] + >=dev-haskell/x11-1.6.1:=[profile?] + >=dev-lang/ghc-8.4.3:= + x11-libs/libXrandr + x11-libs/libXrender + alsa? ( + >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] + >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] + ) + datezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] + >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) + dbus? ( >=dev-haskell/dbus-1:=[profile?] ) + mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) + mpris? ( >=dev-haskell/dbus-1:=[profile?] ) + uvmeter? ( dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) + weather? ( dev-haskell/http-client-tls:=[profile?] + dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) + wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] + >=dev-haskell/netlink-1.1.1.0:=[profile?] ) + xpm? ( x11-libs/libXpm ) + xrender? ( >=dev-haskell/x11-xft-0.2:=[profile?] ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 + test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 + dev-haskell/temporary ) +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-all_extensions \ + $(cabal_flag alsa with_alsa) \ + $(cabal_flag datezone with_datezone) \ + $(cabal_flag dbus with_dbus) \ + --flag=with_inotify \ + --flag=-with_iwlib \ + $(cabal_flag mpd with_mpd) \ + $(cabal_flag mpris with_mpris) \ + $(cabal_flag wifi with_nl80211) \ + $(cabal_flag rtsopts with_rtsopts) \ + --flag=with_threaded \ + --flag=with_utf8 \ + $(cabal_flag uvmeter with_uvmeter) \ + $(cabal_flag weather with_weather) \ + $(cabal_flag xpm with_xpm) \ + $(cabal_flag xrender with_xrender) +} + +src_install() { + cabal_src_install + +# dodoc readme.md + dodoc etc/xmobar.config etc/xmobar.hs changelog.md +} diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest index 671593617e28..017c98099822 100644 --- a/x11-misc/xorg-cf-files/Manifest +++ b/x11-misc/xorg-cf-files/Manifest @@ -1,2 +1 @@ -DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3 -DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531 SHA512 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e +DIST xorg-cf-files-1.0.8.tar.xz 290280 BLAKE2B b822839f2effa091d7e60aa82e0356dc6770116566d9c78a6c0915b8f9e89eb4a3bf78a3bd5380607b3b3e4c1670fb1c6ef0b3ac8ca342cfc1ef141a925c927d SHA512 cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9 diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch deleted file mode 100644 index 143aa53a0280..000000000000 --- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/Imake.cf -+++ b/Imake.cf -@@ -1037,6 +1037,17 @@ - # define AArch64Architecture - # undef __aarch64__ - # endif -+# if defined(__riscv) -+# undef __riscv -+# if __riscv_xlen == 64 -+# undef __riscv_xlen -+# define RV64Architecture -+# endif -+# if __riscv_xlen == 32 -+# undef __riscv_xlen -+# define RV32Architecture -+# endif -+# endif - #endif /* linux || __GLIBC__ */ - - #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) ---- a/linux.cf -+++ b/linux.cf -@@ -584,7 +584,7 @@ - #define MkdirHierCmd mkdir -p - - #ifndef HaveLib64 --# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) -+# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined (RV64Architecture) - # define HaveLib64 YES - # else - # define HaveLib64 NO -@@ -1000,6 +1000,24 @@ - # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 - #endif /* AArch64Architecture */ - -+#ifdef RV64Architecture -+# ifndef OptimizedCDebugFlags -+# define OptimizedCDebugFlags -O2 GccAliasingArgs -+# endif -+# define LinuxMachineDefines -D__riscv -D__riscv_xlen=64 -+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -+#endif /* RV64Architecture */ -+ -+#ifdef RV32Architecture -+# ifndef OptimizedCDebugFlags -+# define OptimizedCDebugFlags -O2 GccAliasingArgs -+# endif -+# define LinuxMachineDefines -D__riscv -D__riscv_xlen=32 -+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -+#endif /* RV32Architecture */ -+ - #ifndef StandardDefines - # ifdef __linux__ - # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild index 4d120a0e40a1..0e7054bcd5f2 100644 --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild +++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild @@ -1,26 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Old Imake-related build files" HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf" -SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2" +SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -BDEPEND=" - virtual/pkgconfig - app-arch/bzip2 -" - -PATCHES=( - "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch - "${FILESDIR}"/${PN}-1.0.7-linux-riscv.patch -) +BDEPEND="virtual/pkgconfig" src_install() { default diff --git a/x11-misc/xosview/files/xosview-1.23-musl.patch b/x11-misc/xosview/files/xosview-1.23-musl.patch new file mode 100644 index 000000000000..a2879f0b957f --- /dev/null +++ b/x11-misc/xosview/files/xosview-1.23-musl.patch @@ -0,0 +1,14 @@ +Musl does not have sys/perm.h. Luckily, sys/io.h has the required +definitions both for musl and glibc. + +diff -ruN xosview-1.23.orig/linux/serialmeter.cc xosview-1.23/linux/serialmeter.cc +--- xosview-1.23.orig/linux/serialmeter.cc 2020-07-11 14:10:34.000000000 +0200 ++++ xosview-1.23/linux/serialmeter.cc 2023-05-05 22:13:19.863489393 +0200 +@@ -25,7 +25,6 @@ + */ + #if defined(__i386__) || defined(__ia64__) || defined(__amd64__) + #include <sys/io.h> +-#include <sys/perm.h> + #define HAVE_IOPERM + #endif + diff --git a/x11-misc/xosview/xosview-1.23.ebuild b/x11-misc/xosview/xosview-1.23.ebuild index e47a5770c69b..0de8636ff4a8 100644 --- a/x11-misc/xosview/xosview-1.23.ebuild +++ b/x11-misc/xosview/xosview-1.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,6 +24,10 @@ DEPEND="${COMMON_DEPS} DOCS=( CHANGES README.linux TODO ) +PATCHES=( + "${FILESDIR}/${P}-musl.patch" +) + src_prepare() { default diff --git a/x11-misc/xowl/metadata.xml b/x11-misc/xowl/metadata.xml deleted file mode 100644 index 1e7482581ef7..000000000000 --- a/x11-misc/xowl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">seanpringle/xowl</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/xowl/xowl-9999.ebuild b/x11-misc/xowl/xowl-9999.ebuild deleted file mode 100644 index e563aab37668..000000000000 --- a/x11-misc/xowl/xowl-9999.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic git-r3 savedconfig toolchain-funcs - -DESCRIPTION="X11 Obstinate Window Lister" -HOMEPAGE="https://github.com/seanpringle/xowl" -EGIT_REPO_URI="https://github.com/seanpringle/xowl" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXinerama -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - default - restore_config config.h -} - -src_configure() { - tc-export CC PKG_CONFIG -} - -src_compile() { - XOAT_COMPILE=( - ${CC} -o ${PN} ${PN}.c ${CFLAGS} -std=c99 ${LDFLAGS} - $(${PKG_CONFIG} --cflags --libs x11 xft xinerama) - ) - echo ${XOAT_COMPILE[@]} - ${XOAT_COMPILE[@]} || die -} - -src_install() { - dobin xowl - dodoc xowl.md - doman xowl.1 - save_config config.h -} diff --git a/x11-misc/xpad/xpad-5.8.0-r1.ebuild b/x11-misc/xpad/xpad-5.8.0-r1.ebuild new file mode 100644 index 000000000000..1f09ce2c5800 --- /dev/null +++ b/x11-misc/xpad/xpad-5.8.0-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg-utils + +DESCRIPTION="A sticky note application for GTK" +HOMEPAGE="https://launchpad.net/xpad" +SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm x86" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + >=dev-libs/glib-2.58:2 + dev-libs/libayatana-appindicator + x11-libs/gdk-pixbuf + x11-libs/gtk+:3[X] + x11-libs/gtksourceview:4 + x11-libs/libICE + x11-libs/libSM + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/intltool-0.31 + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + + eautoreconf +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild index b38aaede7811..a67050ecb3fa 100644 --- a/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild +++ b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Render images of the earth into the X root window" -HOMEPAGE="http://xplanet.sourceforge.net/" +HOMEPAGE="https://xplanet.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/x11-misc/xrootconsole/xrootconsole-0.6-r2.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6-r2.ebuild new file mode 100644 index 000000000000..1ed3bf5912a3 --- /dev/null +++ b/x11-misc/xrootconsole/xrootconsole-0.6-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Utility that displays its input in a text box on your root window" +HOMEPAGE="https://sourceforge.net/projects/xrootconsole/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}.noversion.patch" + "${FILESDIR}/${P}.makefile.patch" + "${FILESDIR}/${P}.manpage.patch" +) + +src_compile() { + tc-export CC PKG_CONFIG + emake +} + +src_install() { + dodir /usr/bin + + emake \ + MANDIR="${ED}/usr/share/man/man1" \ + BINDIR="${ED}/usr/bin/" \ + install + + einstalldocs +} diff --git a/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch new file mode 100644 index 000000000000..533a72386d8c --- /dev/null +++ b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/924177 +--- a/xscreensaver.app.c ++++ b/xscreensaver.app.c +@@ -116,7 +116,7 @@ void popConfig() + + int main(int argc, char **argv) + { +- unsigned height, width; ++ unsigned short height, width; + char *st_command; + int status; + diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild index 702dcdc35505..3c5d21f8d5fc 100644 --- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild +++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ MY_PN=${MY_PN/xs/XS} MY_PN=${MY_PN/s/S} DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager" -HOMEPAGE="http://xscreensaverapp.sourceforge.net/" +HOMEPAGE="https://xscreensaverapp.sourceforge.net/" SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz" SLOT="0" diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild new file mode 100644 index 000000000000..fd5b64aef202 --- /dev/null +++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools + +MY_PN=${PN/-a/.A} +MY_PN=${MY_PN/xs/XS} +MY_PN=${MY_PN/s/S} + +DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager" +HOMEPAGE="https://xscreensaverapp.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" + +CDEPEND=" + x11-libs/libdockapp + x11-libs/libX11 +" +DEPEND=" + ${CDEPEND} + virtual/pkgconfig + x11-base/xorg-proto +" +RDEPEND=" + ${CDEPEND} + x11-misc/xscreensaver +" + +S=${WORKDIR}/${MY_PN}-${PV} + +PATCHES=( + "${FILESDIR}/${PN}-2.3-gcc14-build-fix.patch" +) + +src_prepare() { + rm configure.in || die + cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die + + default + + eautoreconf +} + +src_install() { + dobin ${MY_PN} + dodoc README NEWS ChangeLog TODO AUTHORS +} diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 34ec3cfca174..da4b46865a29 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1 +1,6 @@ DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3 +DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3 +DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5 +DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3 +DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5 +DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B 1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d SHA512 a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch deleted file mode 100644 index 72aa6535f139..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nru a/driver/prefsw.c b/driver/prefsw.c ---- a/driver/prefsw.c 2021-02-19 02:52:32.000000000 +0100 -+++ b/driver/prefsw.c 2021-05-07 15:20:09.280321274 +0200 -@@ -798,7 +798,10 @@ - sure that the bits actually land on the disk right away. */ - /* Update 2020: Apparently here in the future, this sometimes takes - 3+ seconds, so let's not. */ -+/* Interix has no sync() or alike. */ -+#ifndef __INTERIX - /* sync(); */ -+#endif - - status = 0; /* wrote and renamed successfully! */ - } -diff -Nru a/driver/setuid.c b/driver/setuid.c ---- a/driver/setuid.c 2021-02-05 16:16:23.000000000 +0100 -+++ b/driver/setuid.c 2021-05-07 15:21:05.987949943 +0200 -@@ -104,9 +104,12 @@ - if (uid == (uid_t) -1) uid = (uid_t) -2; - - errno = 0; -+ -+#ifndef __INTERIX - if (setgroups_needed_p (gid) && - setgroups (1, &gid) < 0) - sgs_errno = errno ? errno : -1; -+#endif - - errno = 0; - if (setgid (gid) != 0) diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch new file mode 100644 index 000000000000..454a9a7dd6bf --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-remove-Alias-org.jwz.xscreensav.patch @@ -0,0 +1,18 @@ +From f275dd14752d9dc6a2159008490c68bf968be025 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Sat, 29 Jul 2023 11:52:22 +0200 +Subject: xscreensaver.service: remove Alias=org.jwz.xscreensaver + +$ systemctl --user enable xscreensaver +Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver. +--- a/driver/xscreensaver.service.in ++++ b/driver/xscreensaver.service.in +@@ -14,5 +14,4 @@ Restart=on-failure + OOMScoreAdjust=-1000 + + [Install] +-Alias=org.jwz.xscreensaver + WantedBy=default.target +-- +2.41.0 + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch new file mode 100644 index 000000000000..ec4f85d373f9 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.06-service-start-xscreensaver-with-no-splash.patch @@ -0,0 +1,21 @@ +From d2ad34b94c01b4e41cac6c6181d2ee0cf332c583 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Sat, 29 Jul 2023 11:51:45 +0200 +Subject: xscreensaver.service: start xscreensaver with --no-splash + +Prevents the splash screen being shown when the user logs in. + +--- a/driver/xscreensaver.service.in ++++ b/driver/xscreensaver.service.in +@@ -9,7 +9,7 @@ ConditionUser=!@system + Conflicts=org.gnome.ScreenSaver org.cinnamon.ScreenSaver org.mate.ScreenSaver org.xfce.ScreenSaver light-locker + + [Service] +-ExecStart=/usr/bin/xscreensaver ++ExecStart=/usr/bin/xscreensaver --no-splash + Restart=on-failure + OOMScoreAdjust=-1000 + +-- +2.41.0 + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch new file mode 100644 index 000000000000..dd2ea676d443 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch @@ -0,0 +1,18 @@ +The use flag combination -pam +locking is not possible with that configure.ac. +Having a pam conf and a /etc/pam.d could be remnants from a previous installation +of pam and don't tell us for sure that the user does not want this. + +Bug: https://bugs.gentoo.org/908509 + +# Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/configure.ac ++++ b/configure.ac +@@ -4971,7 +4971,6 @@ elif test "$have_pam" = no -a "$enable_locking" = yes ; then + if test -d /etc/pam.d -o -f /etc/pam.conf ; then + warn "Your system seems to have PAM, but PAM is not being used." + warn2 "That is probably not going to work out well." +- CONF_STATUS=1 + fi + fi + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch new file mode 100644 index 000000000000..07474aec689b --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch @@ -0,0 +1,31 @@ +* xscreensaver-settings.desktop: error: value item "Screensaver" in key +* "Categories" in group "Desktop Entry" is a reserved category, so a +* "OnlyShowIn" key must be included +* xscreensaver.desktop: error: value item "Screensaver" in key "Categories" +* in group "Desktop Entry" is a reserved category, so a "OnlyShowIn" key +* must be included + +We just remove the category Screensaver then. + +Bug: https://bugs.gentoo.org/894700 + +# Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/driver/xscreensaver-settings.desktop.in ++++ b/driver/xscreensaver-settings.desktop.in +@@ -5,5 +5,5 @@ Icon=xscreensaver + _Name=XScreenSaver Settings + _Comment=Change screensaver properties + Type=Application +-Categories=Settings;DesktopSettings;Screensaver;Security;GNOME;GTK;KDE;Motif;Qt;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings ++Categories=Settings;DesktopSettings;Security;GNOME;GTK;KDE;Motif;Qt;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings + Terminal=false +--- a/driver/xscreensaver.desktop.in ++++ b/driver/xscreensaver.desktop.in +@@ -5,5 +5,5 @@ Icon=xscreensaver + _Name=XScreenSaver + _Comment=XScreenSaver daemon: screen saver and locker + Type=Application +-Categories=Screensaver;Security;GNOME;GTK;KDE;Motif;Qt ++Categories=Security;GNOME;GTK;KDE;Motif;Qt + Terminal=false diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch new file mode 100644 index 000000000000..05c0c014f412 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch @@ -0,0 +1,24 @@ +We want it to be possible to bulid with clang, so also check against that. + +# Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/configure.ac ++++ b/configure.ac +@@ -303,7 +303,7 @@ done + + AC_DEFUN([AC_CHECK_GCC_ARG], + [if test -n "$GCC"; then +- AC_CACHE_CHECK([whether gcc accepts [$2]], ++ AC_CACHE_CHECK([whether $[$CC] accepts [$2]], + ac_cv_gcc_accepts_[$1], + [rm -rf conftest.$ac_ext + touch conftest.$ac_ext +@@ -316,7 +316,7 @@ AC_DEFUN([AC_CHECK_GCC_ARG], + # earlier diagnostics". + # + without_no=`echo $2 | sed s/Wno-/W/` +- if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ ++ if ( ( $CC -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ + grep unrecognized >/dev/null ); then + ac_cv_gcc_accepts_[$1]=no diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml index 11a85b2711e6..9963b899eb86 100644 --- a/x11-misc/xscreensaver/metadata.xml +++ b/x11-misc/xscreensaver/metadata.xml @@ -22,6 +22,7 @@ <flag name="gles" restrict=">=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag> <flag name="glx" restrict=">=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag> <flag name="locking">Compile in support for locking the display</flag> + <flag name="logind-idle-hint">Send the session idle hint to logind once the screen saver blanks</flag> <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag> </use> </pkgmetadata> diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild index c724289feed1..a5ae58707410 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.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 @@ -72,12 +72,11 @@ DEPEND=" " BDEPEND=" dev-util/intltool - sys-devel/bc + app-alternatives/bc sys-devel/gettext virtual/pkgconfig " PATCHES=( - "${FILESDIR}"/${PN}-6.01-interix.patch "${FILESDIR}"/${PN}-5.31-pragma.patch "${FILESDIR}"/${PN}-6.01-gentoo.patch "${FILESDIR}"/${PN}-5.45-gcc.patch diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild index a8c07d03c410..8d3e14908a05 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.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 @@ -17,7 +17,7 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz" # SpecialElite.ttf -- Apache-2.0 LICENSE="BSD fonts? ( MIT Apache-2.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive pam +perl +png selinux suid systemd xinerama" REQUIRED_USE=" gles? ( !glx ) @@ -73,12 +73,11 @@ DEPEND=" " BDEPEND=" dev-util/intltool - sys-devel/bc + app-alternatives/bc sys-devel/gettext virtual/pkgconfig " PATCHES=( - "${FILESDIR}"/${PN}-6.01-interix.patch "${FILESDIR}"/${PN}-5.31-pragma.patch "${FILESDIR}"/${PN}-6.01-gentoo.patch "${FILESDIR}"/${PN}-5.45-gcc.patch diff --git a/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild new file mode 100644 index 000000000000..fc7dab387fcf --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.06-r2.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI=" + https://www.jwz.org/xscreensaver/${P}.tar.gz + logind-idle-hint? ( + https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> + ${PN}-6.06-logind-idle-hint.patch + ) +" + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" +REQUIRED_USE=" + gles? ( !glx ) + ?? ( elogind systemd ) + pam? ( locking ) + logind-idle-hint? ( || ( elogind systemd ) ) +" + +COMMON_DEPEND=" + >=dev-libs/libxml2-2.4.6 + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + >=x11-libs/gtk+-3.0.0:3 + jpeg? ( media-libs/libjpeg-turbo:= ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + virtual/glu + virtual/opengl + pam? ( sys-libs/pam ) + media-libs/libpng:= + systemd? ( >=sys-apps/systemd-221 ) + >=x11-libs/libXft-2.1.0 + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + app-alternatives/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-5.45-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch +# "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch +# "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch +# "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch + "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch +# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch +# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch + "${FILESDIR}"/${PN}-6.06-service-remove-Alias-org.jwz.xscreensav.patch + "${FILESDIR}"/${PN}-6.06-service-start-xscreensaver-with-no-splash.patch +) + +DOCS=( README{,.hacking} ) + +# see https://bugs.gentoo.org/898328 +QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) + +src_prepare() { + default + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" + fi + + if use logind-idle-hint; then + eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" + fi + + config_rpath_update "${S}"/config.rpath + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # /proc/interrupts won't always have the keyboard bits needed + # Not clear this does anything in 6.03+(?) but let's keep it for now in case. + # (See also: configure argument) + export ac_cv_have_proc_interrupts=yes + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + --with-pixbuf + $(use_with gles) + $(use_with glx) + --with-gtk + $(use_with new-login login-manager) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=yes + --with-xft=yes + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die + + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die + rmdir -v "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + # bugs #809599, #828869 + #if ! use gtk; then + # rm "${ED}/usr/bin/xscreensaver-demo" || die + #fi + if use systemd; then + systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" + fi + # Makefile installs xscreensaver.service regardless of + # --without-systemd, and if USE=systemd, we will have installed the + # unit file already. + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + + # bug #885989 + fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf + + xdg_icon_cache_update +} + +pkg_postrm() { + use fonts && font_pkg_postrm + xdg_icon_cache_update +} diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild new file mode 100644 index 000000000000..2134da5a04c9 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI=" + https://www.jwz.org/xscreensaver/${P}.tar.gz + logind-idle-hint? ( + https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> + ${PN}-6.06-logind-idle-hint.patch + ) + systemd? ( + https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> + ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch + ) +" + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" +REQUIRED_USE=" + gles? ( !glx ) + ?? ( elogind systemd ) + pam? ( locking ) + logind-idle-hint? ( || ( elogind systemd ) ) +" + +COMMON_DEPEND=" + >=dev-libs/libxml2-2.4.6 + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + >=x11-libs/gtk+-3.0.0:3 + jpeg? ( media-libs/libjpeg-turbo:= ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + virtual/glu + virtual/opengl + pam? ( sys-libs/pam ) + media-libs/libpng:= + systemd? ( >=sys-apps/systemd-221 ) + >=x11-libs/libXft-2.1.0 + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + app-alternatives/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-6.07-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch +# "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch +# "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch +# "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch + "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch +# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch +# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch + "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch + "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch +) + +DOCS=( README{,.hacking} ) + +# see https://bugs.gentoo.org/898328 +QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) + +src_prepare() { + default + + # bug #896440 + mv po/ca.po po/ca.po.old || die + iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + + if use systemd; then + # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." + # after "systemctl --user enable xscreensaver". + sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ + driver/xscreensaver.service.in || die + + eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" + fi + + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" + fi + + if use logind-idle-hint; then + eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" + fi + + config_rpath_update "${S}"/config.rpath + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # /proc/interrupts won't always have the keyboard bits needed + # Not clear this does anything in 6.03+(?) but let's keep it for now in case. + # (See also: configure argument) + export ac_cv_have_proc_interrupts=yes + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + --with-pixbuf + $(use_with gles) + $(use_with glx) + --with-gtk + $(use_with new-login login-manager) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=yes + --with-xft=yes + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die + + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -rfv "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + if use systemd; then + systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" + fi + # Makefile installs xscreensaver.service regardless of + # --without-systemd, and if USE=systemd, we will have installed the + # unit file already. + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + + # bug #885989 + fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf + + xdg_icon_cache_update +} + +pkg_postrm() { + use fonts && font_pkg_postrm + xdg_icon_cache_update +} diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild new file mode 100644 index 000000000000..2134da5a04c9 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI=" + https://www.jwz.org/xscreensaver/${P}.tar.gz + logind-idle-hint? ( + https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> + ${PN}-6.06-logind-idle-hint.patch + ) + systemd? ( + https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> + ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch + ) +" + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" +REQUIRED_USE=" + gles? ( !glx ) + ?? ( elogind systemd ) + pam? ( locking ) + logind-idle-hint? ( || ( elogind systemd ) ) +" + +COMMON_DEPEND=" + >=dev-libs/libxml2-2.4.6 + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + >=x11-libs/gtk+-3.0.0:3 + jpeg? ( media-libs/libjpeg-turbo:= ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + virtual/glu + virtual/opengl + pam? ( sys-libs/pam ) + media-libs/libpng:= + systemd? ( >=sys-apps/systemd-221 ) + >=x11-libs/libXft-2.1.0 + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + app-alternatives/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-6.07-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch +# "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch +# "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch +# "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch + "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch +# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch +# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch + "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch + "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch +) + +DOCS=( README{,.hacking} ) + +# see https://bugs.gentoo.org/898328 +QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) + +src_prepare() { + default + + # bug #896440 + mv po/ca.po po/ca.po.old || die + iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + + if use systemd; then + # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." + # after "systemctl --user enable xscreensaver". + sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ + driver/xscreensaver.service.in || die + + eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" + fi + + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" + fi + + if use logind-idle-hint; then + eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" + fi + + config_rpath_update "${S}"/config.rpath + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # /proc/interrupts won't always have the keyboard bits needed + # Not clear this does anything in 6.03+(?) but let's keep it for now in case. + # (See also: configure argument) + export ac_cv_have_proc_interrupts=yes + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + --with-pixbuf + $(use_with gles) + $(use_with glx) + --with-gtk + $(use_with new-login login-manager) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=yes + --with-xft=yes + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die + + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -rfv "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + if use systemd; then + systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" + fi + # Makefile installs xscreensaver.service regardless of + # --without-systemd, and if USE=systemd, we will have installed the + # unit file already. + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + + # bug #885989 + fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf + + xdg_icon_cache_update +} + +pkg_postrm() { + use fonts && font_pkg_postrm + xdg_icon_cache_update +} diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest index 65168a048074..4c89446690fa 100644 --- a/x11-misc/xsel/Manifest +++ b/x11-misc/xsel/Manifest @@ -1 +1,2 @@ DIST xsel-1.2.0.tar.gz 169155 BLAKE2B 59b5c2f03058be1a584f12bd5c129a008ae581545b7aed3a54240f6a0b9c29e857c7425cbf6fa6421ccd577a1907a9a6c1d7213e4ccc43309a5e8933e707847d SHA512 e28623e6cc180f2e2210c20697d21d336633f0a5272ca9b62150a1c535e8de89731acc07230a9977e391e37d3943a9d687f1f967765a15bca5092a6c6d8c4d8f +DIST xsel-1.2.1.tar.gz 51621 BLAKE2B c9c066e4032d71c8c9e717c1251ce929590a7e3be9a156f54eb2625b3877b683e1a3f53f88c405b3f9986160ec38a3a737fe919f703ab307d1e74c97ef81c9f8 SHA512 549874679a2d2979fca851ce762870165f5cbe60ba3f15e0690080506a78ea0b2c52833bbf7868eb3988fc377a103c31c62367fb9c5d1eb606e0660985f82ca4 diff --git a/x11-misc/xsel/files/xsel-1.2.0-Werror.patch b/x11-misc/xsel/files/xsel-1.2.0-Werror.patch new file mode 100644 index 000000000000..443dbb909cab --- /dev/null +++ b/x11-misc/xsel/files/xsel-1.2.0-Werror.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,7 @@ + dnl Add some useful warnings if we have gcc. + dnl changequote(,)dnl + if test "x$ac_cv_prog_gcc" = xyes ; then +- CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Werror -g -std=gnu99 -Wdeclaration-after-statement -Wno-unused" ++ CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wdeclaration-after-statement -Wno-unused" + fi + dnl changequote([,])dnl + diff --git a/x11-misc/xsel/metadata.xml b/x11-misc/xsel/metadata.xml index 410408b3d171..cede858ab636 100644 --- a/x11-misc/xsel/metadata.xml +++ b/x11-misc/xsel/metadata.xml @@ -1,6 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>erkiferenc@gmail.com</email> + <name>Ferenc Erki</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> <name>Gentoo Desktop Miscellaneous Project</name> diff --git a/x11-misc/xsel/xsel-1.2.0-r1.ebuild b/x11-misc/xsel/xsel-1.2.0-r1.ebuild deleted file mode 100644 index 41a76c336452..000000000000 --- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Command-line program for getting and setting the contents of the X selection" -HOMEPAGE="http://www.vergenet.net/~conrad/software/xsel" -SRC_URI="http://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/libXt" - -src_compile() { - emake CFLAGS="${CFLAGS}" -} diff --git a/x11-misc/xsel/xsel-1.2.0-r2.ebuild b/x11-misc/xsel/xsel-1.2.0-r2.ebuild new file mode 100644 index 000000000000..3f2c213b8b7e --- /dev/null +++ b/x11-misc/xsel/xsel-1.2.0-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Command-line program for getting and setting the contents of the X selection" +HOMEPAGE="https://www.vergenet.net/~conrad/software/xsel" +SRC_URI="https://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/libXt" + +PATCHES=( "${FILESDIR}"/${P}-Werror.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/x11-misc/xsel/xsel-1.2.1.ebuild b/x11-misc/xsel/xsel-1.2.1.ebuild new file mode 100644 index 000000000000..e7570554b3ad --- /dev/null +++ b/x11-misc/xsel/xsel-1.2.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Command-line program for getting and setting the contents of the X selection" +HOMEPAGE="https://vergenet.net/~conrad/software/xsel" +SRC_URI="https://github.com/kfish/xsel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + +DEPEND="x11-libs/libX11" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} diff --git a/x11-misc/xsel/xsel-9999.ebuild b/x11-misc/xsel/xsel-9999.ebuild deleted file mode 100644 index fbb8543c5cc5..000000000000 --- a/x11-misc/xsel/xsel-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="Command-line program for getting and setting the contents of the X selection" -HOMEPAGE="http://www.vergenet.net/~conrad/software/xsel" -EGIT_REPO_URI="https://github.com/kfish/xsel" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - x11-libs/libXt -" - -src_prepare() { - sed -i -e 's| -Werror -g||g' configure.ac || die - default - eautoreconf -} diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest index 947c76d9d527..3052526a82de 100644 --- a/x11-misc/xsnow/Manifest +++ b/x11-misc/xsnow/Manifest @@ -1,3 +1,4 @@ DIST xsnow-3.3.0.tar.gz 405967 BLAKE2B d2b6d87b781c894c09157ff2f06389d0b1cf401eff735b812ec324560d295195c5afaa3c9c755f569f10f4ff4cd9738dbcc393044dbdebc13454bfeb8e1a9065 SHA512 b2674039ed26c5788a137cf44396b18f07458e926ea0552034d2c78cefaeaffce35ef42f2da386ee48b8b4d8f98960a4a31edfcf737c6d269485785699f9227a -DIST xsnow-3.5.3.tar.gz 474540 BLAKE2B 8b7e841cb2cefe44787b8457d55cc526114b09d7f1f4c435d89519b49295ac89ca73d15a026e2d7095e0f450775ea59763c7d253026fefcc90241390b5d17142 SHA512 e1172660c4fd344454a7b1619321cfe773d35430311f108c6aa7b04f8da7fe4fdf2886a7cd8b4093ad7d2f6fbb0046a12b29598b6ab46d3ad35f8eadb76ff0a5 DIST xsnow-3.6.0.tar.gz 495875 BLAKE2B 9ebc87254ce81b7fd051bbc0170faa7198390679a8dbaccdfa3674b1f584ad298fa73506b7eb8ff63fe04f168ebafcd30bc2101510c4e912e029edefe4813c65 SHA512 e2684e6d011a8add8819e16b6b649f8d501525c41a4baa0ef32d90b7603e30910a77093c2d21f52a7adb72f0ba18076f9265557e70dc246b365e0fd2b8ed4ab1 +DIST xsnow-3.7.4.tar.gz 1381177 BLAKE2B 7ebc5bf2c64ddfebf1167fd6ceb29ed52f88273bccc4d8f679d102573bbd55f5da0c3b1c01a3157a4de515d1301451ada24539555c31afd5fc015228c35a0dd4 SHA512 ac58a7ea63126d61a8f01d06422db8f12b31d23ff2edf03967f4a12e146e2d5934a24643d8487e35f6f99d35ffcf188cbaafae49d587e6ffe5019f1476358663 +DIST xsnow-3.7.5.tar.gz 1375177 BLAKE2B 7ee2100abcff7d5224315f0fe1ce906c0d1cc24f0e695e3d3914d5eb58f50ab39c0d8e2dc89185c887175a018c3732ef3c943c3184fb10b87106105612bb37bb SHA512 68683d0de9380d990580049b300f326bd9ee6a3debbc3cb0323a21a26a2eda07e6475596070a7cbe8946074b781bc3b374ec3a5fdd587b851d9cdf55d768bffb diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml index bf0492280805..cb3f92949549 100644 --- a/x11-misc/xsnow/metadata.xml +++ b/x11-misc/xsnow/metadata.xml @@ -6,5 +6,6 @@ </maintainer> <upstream> <remote-id type='sourceforge'>xsnow</remote-id> + <changelog>https://www.ratrabbit.nl/ratrabbit/xsnow/changelog/</changelog> </upstream> </pkgmetadata> diff --git a/x11-misc/xsnow/xsnow-3.3.0.ebuild b/x11-misc/xsnow/xsnow-3.3.0.ebuild index 9f7a2365db3b..c9f5caa865ec 100644 --- a/x11-misc/xsnow/xsnow-3.3.0.ebuild +++ b/x11-misc/xsnow/xsnow-3.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" LICENSE="freedist" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" +KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc ~x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild index b1390bb2529c..ff9e83c41410 100644 --- a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild +++ b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz" LICENSE="freedist" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc ~x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xsnow/xsnow-3.5.3-r1.ebuild b/x11-misc/xsnow/xsnow-3.7.4.ebuild index d57c9e3051f7..27ff71302c85 100644 --- a/x11-misc/xsnow/xsnow-3.5.3-r1.ebuild +++ b/x11-misc/xsnow/xsnow-3.7.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,9 +17,14 @@ RDEPEND=" sci-libs/gsl:= sys-apps/dbus x11-libs/cairo + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama x11-libs/libXpm + x11-libs/libXtst + x11-libs/libxkbcommon " DEPEND=" ${RDEPEND} @@ -33,3 +38,17 @@ src_prepare() { default eautoreconf } + +src_install() { + default + + # Install xscreensaver hack, which calls xsnow with the correct + # arguments. xscreensaver calls all hacks with --root, however xsnow + # only understands -root and will exit with an error if an unknown + # argument (--root) is provided. + exeinto usr/$(get_libdir)/misc/xscreensaver + newexe - xsnow <<-EOF + #/usr/bin/env bash + exec "${EPREFIX}/usr/bin/xsnow" -nomenu -root +EOF +} diff --git a/x11-misc/xsnow/xsnow-3.7.5.ebuild b/x11-misc/xsnow/xsnow-3.7.5.ebuild new file mode 100644 index 000000000000..27ff71302c85 --- /dev/null +++ b/x11-misc/xsnow/xsnow-3.7.5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools xdg + +DESCRIPTION="let it snow on your desktop and windows" +HOMEPAGE="https://www.ratrabbit.nl/ratrabbit/xsnow/" +SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz" + +LICENSE="freedist" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + dev-libs/glib:2 + sci-libs/gsl:= + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXtst + x11-libs/libxkbcommon +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.7-gamesdir.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + # Install xscreensaver hack, which calls xsnow with the correct + # arguments. xscreensaver calls all hacks with --root, however xsnow + # only understands -root and will exit with an error if an unknown + # argument (--root) is provided. + exeinto usr/$(get_libdir)/misc/xscreensaver + newexe - xsnow <<-EOF + #/usr/bin/env bash + exec "${EPREFIX}/usr/bin/xsnow" -nomenu -root +EOF +} diff --git a/x11-misc/xsr/xsr-1.0.0.ebuild b/x11-misc/xsr/xsr-1.0.0-r1.ebuild index f933fb6d9645..d7271865771b 100644 --- a/x11-misc/xsr/xsr-1.0.0.ebuild +++ b/x11-misc/xsr/xsr-1.0.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="X Steps Recorder" HOMEPAGE="https://github.com/nonnymoose/xsr" @@ -21,8 +21,10 @@ RDEPEND=" )" src_install() { - dobin "${PN}" + dobin xsr + insinto /usr/share/xsr doins Cursor.png + einstalldocs } diff --git a/x11-misc/xssstate/metadata.xml b/x11-misc/xssstate/metadata.xml index 2f82d0bb8eb7..8a473e90e026 100644 --- a/x11-misc/xssstate/metadata.xml +++ b/x11-misc/xssstate/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> </maintainer> </pkgmetadata> diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest index ef075996f29b..c4adb4d731f2 100644 --- a/x11-misc/xvfb-run/Manifest +++ b/x11-misc/xvfb-run/Manifest @@ -1,2 +1,3 @@ -DIST xorg-server_1.20.10-3.diff.gz 152420 BLAKE2B e87d8800a905962cf3ddeb41e5e9cf0962c5b3ff16ee8ce4d31de96a3d94798fc70dee4ee3f05759d16758f2083436fb91c212ab22f719bd3f086fac51ee5d73 SHA512 16fffd2c92d30c985f55093f46249440388a1eeeca9bd70cd06883f75052170c9717925b18dd01b16ce55d03758bbbf5f2b10c76de00f752b3e7ff64e74e646d -DIST xorg-server_21.1.4-3.diff.gz 163364 BLAKE2B 66211f1b0c2332266af6e317ebbb2e21fe03e32b9c3f1ef7b71df045fe0694162aa62b27f2f7e6e6b72aaa365334a0acf98880674111e57d4042c49ac6521563 SHA512 e0a3805a4a4dce9e7851aca586d808723cbca09da4ce3191d1602497469a4240bffb68835a343e28b6eb2a50f7c815fac12378c08bdcc62b88cb488f13d6c966 +DIST xorg-server_21.1.10-1.diff.gz 168382 BLAKE2B ef41295c9f45836b99aa09f2bea632ff909796538d5f6adb42db78b7b57a4ff41ad997657923820d4c703f21ab43ad2f83998391d8090b30717c600ddf7b8162 SHA512 417b5dcc167b5b066802e70754817aa0c8b22294c779084fca0ca85d0ca926b5b59b633adb2794f31715ff6c36677ea61cb4c7ebd4f32f97471d9257f327c8fb +DIST xorg-server_21.1.11-2.diff.gz 169271 BLAKE2B 79318e2395e60c2deebaa456e5b43ae3a0f095ddd3e9ff179d9861d48166823e4ed4356ae60fafc8e7703ab10bade80d8fed773f636e0d2355f241d8e31ff809 SHA512 42a782544e674e0ae0b95093d65c0b66224ab12cdf08e47eff1f605d1f8bf149dcdc6267f29748823b529a045b6f994c6f6614ff38811fe6c25d6c7c6640cb40 +DIST xorg-server_21.1.7-1.diff.gz 168149 BLAKE2B 68011ab5d77efec6c42921c906ff1be4f7b3b2455025d5fb8f33270bddf02f1bd2c3fd0997b9ad356298d0ee4b8b2f1af6244b39281756259a737e3a5d7a6814 SHA512 433f8d19691f3d0f8bd04f4d8dbd201079da8503d4174d01894824b8239c032af35727e5502b4a2491d9975ba0c6ba6d55c504fbc23c0ca65cc7ba695594d143 diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild index 380ec9a48815..cc9e028b4a34 100644 --- a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN=xorg-server MY_PV="$(ver_cut 1-3)-$(ver_cut 4)" @@ -11,8 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff. LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" DEPEND="dev-util/patchutils" RDEPEND="x11-apps/xauth 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 new file mode 100644 index 000000000000..1191b6b39e1c --- /dev/null +++ b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=xorg-server +MY_PV="$(ver_cut 1-3)-$(ver_cut 4)" +DESCRIPTION="Run a command in a virtual X server environment" +HOMEPAGE="https://packages.debian.org/sid/xvfb" +SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + +DEPEND="dev-util/patchutils" +RDEPEND="x11-apps/xauth + x11-base/xorg-server[xvfb]" + +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 + eapply_user +} + +src_install() { + doman ${PN}.1 + dobin ${PN} +} diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.4.3.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild index 2d1dd7dabee1..b37ac978a797 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.4.3.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff. LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND="dev-util/patchutils" diff --git a/x11-misc/xvkbd/xvkbd-4.1.ebuild b/x11-misc/xvkbd/xvkbd-4.1.ebuild index 8ae5d116f165..d9ba69c3cbc9 100644 --- a/x11-misc/xvkbd/xvkbd-4.1.ebuild +++ b/x11-misc/xvkbd/xvkbd-4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" +KEYWORDS="amd64 ~arm ~arm64 ppc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xwallpaper/metadata.xml b/x11-misc/xwallpaper/metadata.xml index c42a2ebf5ded..43a27bb1aa2a 100644 --- a/x11-misc/xwallpaper/metadata.xml +++ b/x11-misc/xwallpaper/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> The xwallpaper utility allows you to set image files as your X wallpaper. JPEG, PNG, and XPM file formats are supported, all of them being configurable and therefore no fixed dependencies. diff --git a/x11-misc/xwrits/xwrits-2.26-r1.ebuild b/x11-misc/xwrits/xwrits-2.26-r2.ebuild index 5e94357dfc64..f9f3b1d1d1b2 100644 --- a/x11-misc/xwrits/xwrits-2.26-r1.ebuild +++ b/x11-misc/xwrits/xwrits-2.26-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Reminds you to take wrist breaks to help you prevent repetitive stress injury" HOMEPAGE="http://www.lcdf.org/xwrits/" @@ -10,9 +10,9 @@ SRC_URI="http://www.lcdf.org/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama" DEPEND="${RDEPEND} diff --git a/x11-misc/ydotool/Manifest b/x11-misc/ydotool/Manifest new file mode 100644 index 000000000000..9fe77b15836b --- /dev/null +++ b/x11-misc/ydotool/Manifest @@ -0,0 +1 @@ +DIST ydotool-1.0.4.tar.gz 29364 BLAKE2B d021d0bc6cea3118cb91bd1e0cf0eab6b808925902c29274a417f16b0727998904085ca725411371284f222d7a043b9f3460725a07a911d40d0bd477d4fe9fcb SHA512 bbf66d752aa1dce9173c930e3a71bc277b330763b1aa0e38f9fec1976c282c64330251ba5abe222a991f4bcafbabf1312a940eb4b40a34bf99f628c2a41bc4a2 diff --git a/x11-misc/ydotool/files/ydotool-openrc.patch b/x11-misc/ydotool/files/ydotool-openrc.patch new file mode 100644 index 000000000000..2a90087109e3 --- /dev/null +++ b/x11-misc/ydotool/files/ydotool-openrc.patch @@ -0,0 +1,25 @@ +diff -Naur ydotool-1.0.4-orig/Daemon/CMakeLists.txt ydotool-1.0.4/Daemon/CMakeLists.txt +--- ydotool-1.0.4-orig/Daemon/CMakeLists.txt 2023-01-30 03:53:24.000000000 -0800 ++++ ydotool-1.0.4/Daemon/CMakeLists.txt 2023-05-22 22:42:53.960568790 -0700 +@@ -2,4 +2,9 @@ + "${CMAKE_CURRENT_SOURCE_DIR}/ydotool.service.in" + "${PROJECT_BINARY_DIR}/ydotool.service" + @ONLY) ++configure_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/ydotool.service-openrc.in" ++ "${PROJECT_BINARY_DIR}/ydotool.openrc" ++ @ONLY) + install(FILES "${PROJECT_BINARY_DIR}/ydotool.service" DESTINATION ${SD_UNITDIR}) ++install(FILES "${PROJECT_BINARY_DIR}/ydotool.openrc" DESTINATION "/etc/init.d" RENAME ydotool) +diff -Naur ydotool-1.0.4-orig/Daemon/ydotool.service-openrc.in ydotool-1.0.4/Daemon/ydotool.service-openrc.in +--- ydotool-1.0.4-orig/Daemon/ydotool.service-openrc.in 2023-01-30 03:53:24.000000000 -0800 ++++ ydotool-1.0.4/Daemon/ydotool.service-openrc.in 2023-05-22 22:38:49.822064144 -0700 +@@ -3,7 +3,7 @@ + name=$RC_SVCNAME + description="Starts ydotoold service" + supervisor="supervise-daemon" +-command="/usr/local/bin/ydotoold" ++command="@CMAKE_INSTALL_FULL_BINDIR@/ydotoold" + + reload() { + ebegin "Reloading $RC_SVCNAME" diff --git a/x11-misc/ydotool/metadata.xml b/x11-misc/ydotool/metadata.xml new file mode 100644 index 000000000000..6144f457ca39 --- /dev/null +++ b/x11-misc/ydotool/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>zoltan@sinustrom.info</email> + <name>Zoltan Puskas</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> + Generic Linux command-line automation tool (no X!) ou can use it on + anything as long as it accepts keyboard/mouse/whatever input. For + example, X11, text console, "RetroArch OS", fbdev apps + (fbterm/mplayer/SDL1/LittleVGL/Qt Embedded), etc. + </longdescription> + <upstream> + <remote-id type="github">ReimuNotMoe/ydotool</remote-id> + <bugs-to>https://github.com/ReimuNotMoe/ydotool/issues</bugs-to> + </upstream> +</pkgmetadata> diff --git a/x11-misc/ydotool/ydotool-1.0.4-r2.ebuild b/x11-misc/ydotool/ydotool-1.0.4-r2.ebuild new file mode 100644 index 000000000000..c0834b3c51a3 --- /dev/null +++ b/x11-misc/ydotool/ydotool-1.0.4-r2.ebuild @@ -0,0 +1,21 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Generic command-line automation tool (no X!)" +HOMEPAGE="https://github.com/ReimuNotMoe/ydotool" +SRC_URI="https://github.com/ReimuNotMoe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="amd64" + +BDEPEND=" + app-text/scdoc + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${PN}-openrc.patch ) diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest index e2b02b40ab62..810472407ad9 100644 --- a/x11-misc/zim/Manifest +++ b/x11-misc/zim/Manifest @@ -1,2 +1 @@ -DIST zim-0.74.3.tar.gz 3108228 BLAKE2B fbaaddbd5522ccffcba87da2f4080e93e46dfcdc22771a414daa813cdbc2982738c2bf6f068f4bddf788965b4cf45594f2720a697c04d71194f513d1d9b43875 SHA512 9f885571800e3aba327a46b3bc8677ca596fb2d0a58e2f65190d9e2bc90f013655947d86c1fc869e2d79a5c0ba8a7a4d907a00f8d7563116291df47d8c2c677d -DIST zim-0.75.1.tar.gz 3212424 BLAKE2B 8db33315a8852b4efc5506cf94576f9b7cfa8574e77798d4e8bb61930a0d9ede5ea0bd2fc8c1ae479f49caee265981d70902b149e151e5f295cdcc5bbe98b131 SHA512 207d40af2342f16ba713a3809b06ddc6656bce22386fcaace65b0e04894218590d4c03b9c65d6eeb3c4edc46e85e103cfcf112e4298be07ba1f126d7732333c5 +DIST zim-0.75.2.tar.gz 3257345 BLAKE2B 452716cbc6c149645c5146d8fcef2449c7c316ac57da9870dbe26b9fec13b6827a6368295277dc3b2b7a7874a7c930da27612a8e8e00b295ae9ecb3942d0e65b SHA512 ea6f361047690dfb314a3510d34880a4831d142c94fc0ca08e1c29869fd42d5fd1182c47edc241edeb512fed601a474af6d9970f819e8a8b67135c7589ae461a diff --git a/x11-misc/zim/metadata.xml b/x11-misc/zim/metadata.xml index b6f64396fedb..00af9242199a 100644 --- a/x11-misc/zim/metadata.xml +++ b/x11-misc/zim/metadata.xml @@ -5,13 +5,16 @@ <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> -<longdescription lang="en"> -Zim is a graphical text editor used to maintain a collection of wiki pages. -Each page can contain links to other pages, simple formatting and images. Pages -are stored in a folder structure, like in an outliner, and can have -attachments. Creating a new page is as easy as linking to a nonexistent page. -All data is stored in plain text files with wiki formatting. Various plugins -provide additional functionality, like a task list manager, an equation editor, -a tray icon, and support for version control. -</longdescription> + <longdescription lang="en"> + Zim is a graphical text editor used to maintain a collection of wiki pages. + Each page can contain links to other pages, simple formatting and images. Pages + are stored in a folder structure, like in an outliner, and can have + attachments. Creating a new page is as easy as linking to a nonexistent page. + All data is stored in plain text files with wiki formatting. Various plugins + provide additional functionality, like a task list manager, an equation editor, + a tray icon, and support for version control. + </longdescription> + <upstream> + <remote-id type="github">zim-desktop-wiki/zim-desktop-wiki</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/zim/zim-0.74.3.ebuild b/x11-misc/zim/zim-0.74.3.ebuild deleted file mode 100644 index c29427e989c0..000000000000 --- a/x11-misc/zim/zim-0.74.3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{9,10} ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 virtualx xdg - -DESCRIPTION="A desktop wiki" -HOMEPAGE=" - https://zim-wiki.org/ - https://github.com/zim-desktop-wiki/zim-desktop-wiki -" -SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -RESTRICT="test" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - ') - x11-libs/gtk+:3[introspection] - x11-misc/xdg-utils -" -DEPEND=" - ${RDEPEND} -" -DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md ) -PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) -S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-} - -python_prepare_all() { - sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die - - if [[ ${LINGUAS} ]]; then - local lingua - for lingua in translations/*.po; do - lingua=${lingua/.po} - lingua=${lingua/translations\/} - has ${lingua} ${LINGUAS} || \ - { rm translations/${lingua}.po || die; } - done - fi - - distutils-r1_python_prepare_all - export XDG_RUNTIME_DIR=fakethis -} - -python_install() { - distutils-r1_python_install -} - -pkg_postinst() { - xdg_pkg_postinst - if ! has_version ${CATEGORY}/${PN}; then - elog "Please install these packages for additional functionality" - elog " app-text/gtkspell[introspection]" - elog " dev-lang/R" - elog " dev-vcs/bzr" - elog " media-gfx/graphviz" - elog " media-gfx/imagemagick" - elog " media-gfx/scrot" - elog " media-sound/lilypond" - elog " sci-visualization/gnuplot" - elog " virtual/latex-base app-text/dvipng" - fi -} diff --git a/x11-misc/zim/zim-0.75.1.ebuild b/x11-misc/zim/zim-0.75.2-r1.ebuild index c5d76bac3fa8..e72df1ffba7f 100644 --- a/x11-misc/zim/zim-0.75.1.ebuild +++ b/x11-misc/zim/zim-0.75.2-r1.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_{9..12} ) PYTHON_REQ_USE="sqlite" DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 @@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_ LICENSE="BSD GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~riscv ~x86" RDEPEND=" $(python_gen_cond_dep ' @@ -71,7 +71,7 @@ pkg_postinst() { optfeature "Spell checker" app-text/gtkspell[introspection] optfeature "GNU R Plot Editor" dev-lang/R - optfeature "Version control Bazaar support" dev-vcs/bzr + optfeature "Version control Bazaar support" dev-vcs/breezy optfeature "Diagram Editor" media-gfx/graphviz optfeature "Insert Screenshot" "media-gfx/imagemagick media-gfx/scrot" optfeature "Score Editor" media-sound/lilypond |