diff options
Diffstat (limited to 'x11-misc')
243 files changed, 2439 insertions, 3133 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/albert/Manifest b/x11-misc/albert/Manifest index 2f4fb01d3cc0..49b979c5661e 100644 --- a/x11-misc/albert/Manifest +++ b/x11-misc/albert/Manifest @@ -7,9 +7,15 @@ DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d 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-0.20.13.tar.gz 99022 BLAKE2B 14c0dee7690442ca9f587b275c904c01db50479bdb407bdbfaa88eaa6da7a0f2b43783c424dbc775d1525f64aacaf3a81c66929a23830071649756d07b5275d4 SHA512 36bebce820ebcf75ef56e9ff5cd94e6131335681070a267c9d5bfa39fbddcad3f426580c9346a56b36a247eb57348b8c749c687037174b07290571fcc59f5ac8 +DIST albert-0.20.14.tar.gz 99167 BLAKE2B e2d42c49fd76d24174d80bc2ddb1346af0390f7c45101b951387fa5a115d0eb4776cf24603d145362f66c34b8f98a2ab553339be4ef39aa48edbbbc840eeff17 SHA512 2a46c183690c187b93849ec436e95a5a2c229a8c994c0fb10adcff61415f86ac6123d7f991726945d5eb1f52cc6104e24e8e547a1cff90d26df8d1272fde0b24 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-6da6e51a1173e7b8eaa1de26475401bf7984ecdd.tar.gz 796106 BLAKE2B 0556baa4f7e82deeed2ae522e6778741ffc5f352495bbb15588db77001541be401477503d9fd4b03f92abd814ce37fd8024b996d32c7a2b05abbdc70a86259e4 SHA512 02e06b6291eee2b33dc65445eca75944a73b60590130649f2dc620382039021616896f2474555defa49cc78aa602b45651eb6fec902151229a0d9dfebcb558c0 +DIST albert-plugins-7eebb033005f2aab74f59cadecb7ec185a1cfcbe.tar.gz 795862 BLAKE2B 45bed1005bfed8f8eabb0ec59bcac98e53f1e69961e4eb0bcf27943f967fd5d97d4f85b9919d39463e9034d931c9ffe94487581f64d69a7a6894cac16b89366d SHA512 7ab04acd455cb0802de84b65291ef3051775509e55f33ef575659da039b7b212a92613ee9d2b6a2e206b07a2dca73793dc48a600cd5f4799c191f81bee15d4bf DIST albert-plugins-ee55048e138028b4889d71e0574e85b2c4d69541.tar.gz 548351 BLAKE2B 6433ccf690cc57a649e6bfabe378c4458e005306529c6f3a143c0e7c0fb64e2c4216a9f17b7283a69684b36f676c5a9e27bcba8a76fc04f5ea4d7d4812f62d1d SHA512 85c6c6cabbdad91b926c446e44c02684cc2f619ca041faf3a23b432046db1f02413fc82dea9eba9aece560ac442a3202d2e9246b98fd36bdadf47470ff160c5a +DIST albert-python-extensions-29582644bfc992f66d306ff91057b7fdb9d0682e.tar.gz 1238915 BLAKE2B e8b0b86e28fbe748511408e101579783c95ac61204315b09a12eb1e9b4e2e87b157cdc643e46b0fc05d4c7fdcaa253db53d1d96570cd978ebb9f73c7a9ad07b4 SHA512 66bc4f16e95a45fa73bc438bf134618cccc3b48b2ef6da6f36288397c5c3b2e7e18be2892c291097a16c04a6c5c8fbe0ae39e6d33215db66989b76dac0347390 DIST albert-python-extensions-7f571aceaf8e60eee8bb21e1ec4efa0e95523d13.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53 +DIST albert-python-extensions-962a832cc35377d5c719147800368a3e83703646.tar.gz 1234952 BLAKE2B bb1329344c96e9a0bcbb89884d89b103ca620fc4baad59b4376017f535888a3f1cfdf3c8fd2979b455a701d9b88684951cfb0209169ffa73590a191a23c2ae2d SHA512 4a609dde39bdad9542b1af52684af796f55519bf3c5e4fcec428db0e2962389fbb9f7092352dcf778b56112bc475d38650834f61e299dfa120dd7b95241d295d DIST albert-xkcd-python-extension-bf88a964473d65b39c9e09eb48dabb847206f06f.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402 diff --git a/x11-misc/albert/albert-0.20.13.ebuild b/x11-misc/albert/albert-0.20.13.ebuild new file mode 100644 index 000000000000..2ce799ce114d --- /dev/null +++ b/x11-misc/albert/albert-0.20.13.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10,11} ) + +inherit cmake python-single-r1 xdg-utils + +DESCRIPTION="A fast and flexible keyboard launcher" +HOMEPAGE="https://albertlauncher.github.io/" + +PLUGINS_HASH="7eebb033005f2aab74f59cadecb7ec185a1cfcbe" +PYTHON_EXTENSIONS_COMMIT="29582644bfc992f66d306ff91057b7fdb9d0682e" + +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 ) +" + +LICENSE="all-rights-reserved" # unclear licensing #766129 +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug +python +python-extensions" + +REQUIRED_USE=" + python-extensions? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + dev-cpp/muParser + dev-qt/qtbase:6[concurrent,dbus,gui,network,sql,sqlite,widgets] + dev-qt/qtscxml:6 + dev-qt/qtsvg:6 + python? ( + $(python_gen_cond_dep 'dev-python/urllib3[${PYTHON_USEDEP}]') + ${PYTHON_DEPS} + ) +" +DEPEND="${RDEPEND} + dev-libs/qhotkey[qt6] + python? ( $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') ) + sci-libs/libqalculate" + +PATCHES=("${FILESDIR}/${PN}-0.20.13-use-system-qhotkey-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/plugins + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_DEBUG=$(usex debug) + -DBUILD_PYTHON=$(usex python) + ) + + 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.20.14.ebuild b/x11-misc/albert/albert-0.20.14.ebuild new file mode 100644 index 000000000000..820d7709fee0 --- /dev/null +++ b/x11-misc/albert/albert-0.20.14.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10,11} ) + +inherit cmake python-single-r1 xdg-utils + +DESCRIPTION="A fast and flexible keyboard launcher" +HOMEPAGE="https://albertlauncher.github.io/" + +PLUGINS_HASH="6da6e51a1173e7b8eaa1de26475401bf7984ecdd" +PYTHON_EXTENSIONS_COMMIT="962a832cc35377d5c719147800368a3e83703646" + +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 ) +" + +LICENSE="all-rights-reserved" # unclear licensing #766129 +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug +python +python-extensions" + +REQUIRED_USE=" + python-extensions? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + dev-cpp/muParser + dev-libs/qhotkey[qt6] + dev-qt/qtbase:6[concurrent,dbus,gui,network,sql,sqlite,widgets] + dev-qt/qtscxml:6 + dev-qt/qtsvg:6 + sci-libs/libqalculate:= + python? ( + $(python_gen_cond_dep 'dev-python/urllib3[${PYTHON_USEDEP}]') + ${PYTHON_DEPS} + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + python? ( $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') )" + +PATCHES=("${FILESDIR}/${PN}-0.20.13-use-system-qhotkey-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/plugins + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_DEBUG=$(usex debug) + -DBUILD_PYTHON=$(usex python) + ) + + 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.20.13-use-system-qhotkey-libraries-and-headers.patch b/x11-misc/albert/files/albert-0.20.13-use-system-qhotkey-libraries-and-headers.patch new file mode 100644 index 000000000000..aaa3050b8079 --- /dev/null +++ b/x11-misc/albert/files/albert-0.20.13-use-system-qhotkey-libraries-and-headers.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a48c253..ae5a549 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,8 +45,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + + set(QT_DEFAULT_MAJOR_VERSION 6) + set(BUILD_SHARED_LIBS FALSE) +-add_subdirectory(lib/QHotkey EXCLUDE_FROM_ALL) +-target_compile_options(qhotkey PRIVATE -Wno-unused-parameter -Wno-shadow) + + set(TARGET_LIB ${PROJECT_NAME}) + 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..ab43a0525449 100644 --- a/x11-misc/arandr/arandr-0.1.11.ebuild +++ b/x11-misc/arandr/arandr-0.1.11.ebuild @@ -13,7 +13,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/autorandr-1.13.3.ebuild b/x11-misc/autorandr/autorandr-1.13.3.ebuild index 5a4cdc0e7c9f..3d8cfa33942d 100644 --- a/x11-misc/autorandr/autorandr-1.13.3.ebuild +++ b/x11-misc/autorandr/autorandr-1.13.3.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/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..c6f4cb2b093c 100644 --- a/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild +++ b/x11-misc/bbacpi/bbacpi-0.1.5-r4.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 inherit autotools @@ -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/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/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/compose-tables/Manifest b/x11-misc/compose-tables/Manifest index fa660d479356..37308f401e67 100644 --- a/x11-misc/compose-tables/Manifest +++ b/x11-misc/compose-tables/Manifest @@ -1 +1 @@ -DIST libX11-1.8.3.tar.xz 1811712 BLAKE2B 0adc92c13ba4bdec5d927349ca8c02adbb851eb376f19aa5f39e13caddb36c089be227c1f2dc61b34f882aae794f2b46ae237345c12c8e897be8df01e9fb3ef2 SHA512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325 +DIST libX11-1.8.4.tar.xz 1835316 BLAKE2B f9f5d1b97e8ac6f8f0edc490a270f98ff4fd901c2054c309bce1f1b3eb690704193e18cd470f682c663090210b14a9498b9259b6acc0e902053e7ab0ca9df076 SHA512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e diff --git a/x11-misc/compose-tables/compose-tables-1.8.3.ebuild b/x11-misc/compose-tables/compose-tables-1.8.4-r1.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.4-r1.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/copyq/Manifest b/x11-misc/copyq/Manifest index db723c3427ff..f83ff343f119 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-6.4.0.tar.gz 3316278 BLAKE2B 348fdc23a6d0d53ddcc8e2c32b194cfbf6c4d4d2374b972cb81d945e284c42d1e8f6b9ed30e657e43e69ed0f35661adc7875392b5daf653ce895d76afed7c09c SHA512 a97b4ac541ff73129a6283266fb8857d89d571d042829de5793b94e6423a2978f632b22728ca663bccd540bb90fed51c755b432d1d2545f75c227ea2cb0d9581 +DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4 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-6.4.0.ebuild b/x11-misc/copyq/copyq-6.4.0.ebuild new file mode 100644 index 000000000000..2103adde0559 --- /dev/null +++ b/x11-misc/copyq/copyq-6.4.0.ebuild @@ -0,0 +1,120 @@ +# 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 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug kde qt6 test" + +# Qt6 tests fail with "Failed to stop server" error +RESTRICT=" + qt6? ( test ) + !test? ( 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,test?,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:5 + !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 + + local plug + local plugins=( + itemencrypted + itemfakevim + itempinned + #itemsync -- failure in avoidDuplicateItemsAddedFromClipboard() + itemtags + ) + + ebegin "Starting IceWM" + icewm & + sleep 5 + eend 0 + + cd "${BUILD_DIR}" || die + mkdir -p "${HOME}"/.gnupg || die + for plug in "${plugins[@]}"; do + edo ./copyq tests PLUGINS:"${plug}" + done + + # 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.0.0.ebuild b/x11-misc/copyq/copyq-7.0.0.ebuild new file mode 100644 index 000000000000..be23a5c90760 --- /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 ~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,test?,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:5 + !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/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/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/dunst/Manifest b/x11-misc/dunst/Manifest index bcdd1211825f..d89fad77b99a 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.9.1.tar.gz 4614410 BLAKE2B f2d3b5ca28ac74461e31c09f7c5f8369dd6d05e8133d184625344b5445fac8e673cf5c57d44ea8bf0f3d320167663529ea49e8de0ed873afae327cb7db55d5ff SHA512 6045529196c2d8bd89d2976db9712bf15ec75923fdab414870e1ae2af2eb87afc2b5886cb707a19ea113ec746f90fde1e52631eec9b7a96f1af03acbe6445f32 +DIST dunst-1.9.2.tar.gz 4614703 BLAKE2B bcdb3f36dd9af546288c35ffc90f08b219b1b4d1d11233b09acfbe9e6287dcfd856200310d88115a6009485af5e9b0d4e2933bff9cade38969cea31b167c9b5b SHA512 fab14212dc41e8deed97320c18b88e0be576f0404406691dcedb9620a1382dfdfc501e4ff2005b1ce8b4a61b52f1a9cf161f20a1eae15aa2382f3fedc99a2dbc diff --git a/x11-misc/dunst/dunst-1.9.0.ebuild b/x11-misc/dunst/dunst-1.9.1.ebuild index 37336b25c793..f054ef05620c 100644 --- a/x11-misc/dunst/dunst-1.9.0.ebuild +++ b/x11-misc/dunst/dunst-1.9.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 @@ -75,5 +75,9 @@ src_install() { emake "${myemakeargs[@]}" install + insinto /usr/share/zsh/site-functions + newins contrib/_dunst.zshcomp _dunst + newins contrib/_dunstctl.zshcomp _dunstctl + systemd_newuserunit dunst.systemd.service.in dunst.service } diff --git a/x11-misc/dunst/dunst-1.9.2.ebuild b/x11-misc/dunst/dunst-1.9.2.ebuild new file mode 100644 index 000000000000..f054ef05620c --- /dev/null +++ b/x11-misc/dunst/dunst-1.9.2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit 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 + + insinto /usr/share/zsh/site-functions + newins contrib/_dunst.zshcomp _dunst + newins contrib/_dunstctl.zshcomp _dunstctl + + systemd_newuserunit dunst.systemd.service.in dunst.service +} diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild index bb3f803de889..20a5d5412e6f 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-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -75,5 +75,9 @@ src_install() { emake "${myemakeargs[@]}" install + insinto /usr/share/zsh/site-functions + newins contrib/_dunst.zshcomp _dunst + newins contrib/_dunstctl.zshcomp _dunstctl + systemd_newuserunit dunst.systemd.service.in dunst.service } 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/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/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/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.ebuild deleted file mode 100644 index 59e51f985f0d..000000000000 --- a/x11-misc/gammastep/gammastep-2.0.9.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 autotools systemd xdg-utils python-r1 - -DESCRIPTION="A screen color temperature adjusting software" -HOMEPAGE="https://gitlab.com/chinstrap/gammastep" -SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~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] ) - 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} )" - -S="${WORKDIR}"/${PN}-v${PV} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use gtk && python_setup - - econf \ - $(use_enable nls) \ - --enable-drm \ - $(use_enable wayland) \ - --enable-randr \ - --enable-vidmode \ - $(use_enable geoclue geoclue2) \ - $(use_enable gtk gui) \ - --enable-apparmor \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" -} - -_impl_specific_src_install() { - emake DESTDIR="${D}" \ - PYTHON="${PYTHON}" \ - pythondir="$(python_get_sitedir)" \ - -C src/gammastep_indicator 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/gammastep-indicator - - python_foreach_impl python_optimize - fi - - insinto /etc/gammastep/ - newins gammastep.conf.sample config.ini.example -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild index 9db630f28c56..911145b808dc 100644 --- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild +++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then 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" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" fi LICENSE="MIT" diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild index 09a01d23bf93..85e0055a1489 100644 --- a/x11-misc/gccmakedep/gccmakedep-9999.ebuild +++ b/x11-misc/gccmakedep/gccmakedep-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" fi LICENSE="MIT" 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/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/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest index 2f6acbb0ec62..eac30e433045 100644 --- a/x11-misc/grub2-theme-preview/Manifest +++ b/x11-misc/grub2-theme-preview/Manifest @@ -1 +1,2 @@ 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-r1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0-r1.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.7.0-r1.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/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild index 4fe300bbbd58..f766fadda4f0 100644 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild +++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild @@ -21,7 +21,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.8.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild new file mode 100644 index 000000000000..da256c221fe2 --- /dev/null +++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU" +HOMEPAGE="https://github.com/hartwork/grub2-theme-preview" +SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="grub_platforms_efi-64" + +RDEPEND="app-emulation/qemu + dev-libs/libisoburn + sys-fs/mtools + grub_platforms_efi-64? ( + sys-boot/grub:2[grub_platforms_efi-64] + || ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin ) + ) + !grub_platforms_efi-64? ( + sys-boot/grub:2[grub_platforms_pc] + ) +" +DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )" + +distutils_enable_tests pytest 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/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild index 104cad3b9417..2ee22731467a 100644 --- a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild +++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild @@ -13,8 +13,7 @@ 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 ) diff --git a/x11-misc/i3status/i3status-2.14.ebuild b/x11-misc/i3status/i3status-2.14.ebuild index 9a1390b6ee6a..4a7d1e2f875a 100644 --- a/x11-misc/i3status/i3status-2.14.ebuild +++ b/x11-misc/i3status/i3status-2.14.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 @@ -29,8 +29,18 @@ DEPEND=" " 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=( $(meson_use pulseaudio pulseaudio) 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/imake/imake-1.0.9.ebuild b/x11-misc/imake/imake-1.0.9.ebuild index 12436d8ee0ab..0850e3453c4f 100644 --- a/x11-misc/imake/imake-1.0.9.ebuild +++ b/x11-misc/imake/imake-1.0.9.ebuild @@ -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/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/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild index 5cbefb2fe18b..b2b199f8570b 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.7-r1.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 @@ -8,7 +8,7 @@ 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 )" + 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 )" diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild new file mode 100644 index 000000000000..2b73783e134c --- /dev/null +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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/~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 ~loong ppc ppc64 ~riscv x86" +IUSE="appindicator branding" + +DEPEND="x11-libs/gtk+:3 + >=x11-misc/lightdm-1.2.2 + appindicator? ( + dev-libs/ayatana-ido + dev-libs/libayatana-indicator:3 + )" + +BDEPEND=" + dev-util/intltool + dev-util/xfce4-dev-tools + sys-devel/gettext +" + +RDEPEND="${DEPEND} + x11-themes/gnome-themes-standard + >=x11-themes/adwaita-icon-theme-3.14.1" + +GENTOO_BG="gentoo-bg_65.jpg" + +src_prepare() { + # Ok, this has to be fixed in the tarball but I am too lazy to do it. + # I will fix this once I decide to update the tarball with a new gentoo + # background + # Bug #404467 + if use branding; then + sed \ + -e "/xft-hintstyle/s:slight:hintslight:" \ + -e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \ + -i "${WORKDIR}"/${PN}.conf || die + # Add back the reboot/shutdown buttons + echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \ + >> "${WORKDIR}"/${PN}.conf || die + fi + default + + # Fix docdir + sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die + eautoreconf +} + +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[@]}" +} + +src_install() { + default + + if use branding; then + insinto /etc/lightdm/ + doins "${WORKDIR}"/${PN}.conf + insinto /usr/share/lightdm/backgrounds/ + doins "${WORKDIR}"/${GENTOO_BG} + newdoc "${WORKDIR}"/README.txt README-background.txt + fi +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} 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.ebuild index 91860c1597e0..7cb2960c3068 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.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 @@ -8,7 +8,7 @@ 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 )" 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/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..a7165fa1effd 100644 --- a/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild +++ b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild @@ -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 ) diff --git a/x11-misc/makedepend/makedepend-1.0.8.ebuild b/x11-misc/makedepend/makedepend-1.0.8.ebuild index 8123954619ab..2305963e95de 100644 --- a/x11-misc/makedepend/makedepend-1.0.8.ebuild +++ b/x11-misc/makedepend/makedepend-1.0.8.ebuild @@ -7,7 +7,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" RDEPEND="" DEPEND="${RDEPEND} 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/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/mozo/Manifest b/x11-misc/mozo/Manifest index 23cdee565c11..2cabad745d42 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 diff --git a/x11-misc/mozo/mozo-1.26.2.ebuild b/x11-misc/mozo/mozo-1.26.2.ebuild new file mode 100644 index 000000000000..29f2da4774bc --- /dev/null +++ b/x11-misc/mozo/mozo-1.26.2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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+" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +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/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/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/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest index 6a1ee3deb049..65dd7008c78b 100644 --- a/x11-misc/pcmanfm-qt/Manifest +++ b/x11-misc/pcmanfm-qt/Manifest @@ -1,2 +1,2 @@ -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 diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.3.0.ebuild index 7b2b1951b854..015e9e09d605 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.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=8 @@ -15,7 +15,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+ LGPL-2.1+" @@ -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 diff --git a/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild b/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild new file mode 100644 index 000000000000..ed1c981c805d --- /dev/null +++ b/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +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+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" + +DEPEND="x11-libs/libX11 + x11-libs/libXt" + +PATCHES=( "${FILESDIR}/${P}-asneeded.patch" ) + +src_prepare() { + default + eautoreconf +} + +src_install() { + dobin src/peksystray + default +} 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/polybar/polybar-3.6.3-r2.ebuild b/x11-misc/polybar/polybar-3.6.3-r2.ebuild index 6abbfc9d38c9..ef368ca2f59a 100644 --- a/x11-misc/polybar/polybar-3.6.3-r2.ebuild +++ b/x11-misc/polybar/polybar-3.6.3-r2.ebuild @@ -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" 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/py3status/Manifest b/x11-misc/py3status/Manifest index 0d5750b09aca..c76b16e4e2e6 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.50.tar.gz 421152 BLAKE2B a53f6e67b98da7ebfd82797662c5fffdc44d119b48ee124ad858f0f2b1195bb6b9a1d3d1d0f38c66175886fb937410096a9146051acd755ddb996836d73bf9d4 SHA512 4b542f8724898836dfb5023a8a9230e2b6e5de3dba3d8115ac653251626706ea16d066dc2221a9b2688538425e12cd171e7db0bbe5178c642e97bb4170520c5d diff --git a/x11-misc/py3status/py3status-3.48.ebuild b/x11-misc/py3status/py3status-3.50.ebuild index c149a1d0f3dc..c149a1d0f3dc 100644 --- a/x11-misc/py3status/py3status-3.48.ebuild +++ b/x11-misc/py3status/py3status-3.50.ebuild diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest index 382ce368003f..e191b0d59a1f 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 diff --git a/x11-misc/qps/qps-2.5.0.ebuild b/x11-misc/qps/qps-2.7.0.ebuild index cddee09ea467..95159ca8e22e 100644 --- a/x11-misc/qps/qps-2.5.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 @@ -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.3:= " RDEPEND="${DEPEND}" diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index 40866f5b141a..b3d7b7781d3d 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.7.tar.bz2 85464 BLAKE2B fc39d489a0e1e2cb8e0caeb587ea9dd434dca4adefcc788fe3936a6f7bbc3c55b22072915580e1b0376d0b37433b59e355e220f3dc280a0de2d2600a37df237a SHA512 97f1afc137e750abbb8c4e442cb6e09d2aa0c4979de2117ea644d484e1f7489bec144332814aae961bfaa5f8ac9ddf027c7a665274a65aef26fc4bf7c45610c0 diff --git a/x11-misc/qt5ct/qt5ct-1.5.ebuild b/x11-misc/qt5ct/qt5ct-1.7.ebuild index ee2fded801ce..8be1a39d4b3c 100644 --- a/x11-misc/qt5ct/qt5ct-1.5.ebuild +++ b/x11-misc/qt5ct/qt5ct-1.7.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/redshift-1.12-r10.ebuild b/x11-misc/redshift/redshift-1.12-r10.ebuild index a63b6864529c..039d03ed4512 100644 --- a/x11-misc/redshift/redshift-1.12-r10.ebuild +++ b/x11-misc/redshift/redshift-1.12-r10.ebuild @@ -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-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/redshift/redshift-1.12-r9.ebuild b/x11-misc/redshift/redshift-1.12-r9.ebuild deleted file mode 100644 index 76823b834014..000000000000 --- a/x11-misc/redshift/redshift-1.12-r9.ebuild +++ /dev/null @@ -1,91 +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} )" - -PATCHES=( - "${FILESDIR}"/${P}-apparmor.patch -) - -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/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/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..aa90b0c02f84 100644 --- a/x11-misc/rofi/rofi-1.7.5.ebuild +++ b/x11-misc/rofi/rofi-1.7.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 @@ -7,11 +7,17 @@ inherit autotools 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 )" @@ -48,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=( @@ -59,15 +68,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..67b3f4e4a423 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 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.4-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild deleted file mode 100644 index a00135abf2fc..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild +++ /dev/null @@ -1,52 +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} ) -PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py - -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 -) - -src_prepare() { - default - find . -type f -name \*.pyc -delete # bug #864765 -} - -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.4.ebuild b/x11-misc/safeeyes/safeeyes-2.1.4.ebuild deleted file mode 100644 index 2e6849d06d75..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.1.4.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 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py - -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.5-r1.ebuild index debfe192fcfa..c5cb4ebcd177 100644 --- a/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.1.5-r1.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" diff --git a/x11-misc/safeeyes/safeeyes-2.1.5.ebuild b/x11-misc/safeeyes/safeeyes-2.1.5.ebuild deleted file mode 100644 index 5bbf7b03b886..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.1.5.ebuild +++ /dev/null @@ -1,44 +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} ) -PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py -DISTUTILS_USE_PEP517=setuptools - -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 - " - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest index ee6abdde4c3c..d50924fc4537 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 diff --git a/x11-misc/screengrab/screengrab-2.4.0.ebuild b/x11-misc/screengrab/screengrab-2.6.0.ebuild index 07c912db1240..31f49d4f7eff 100644 --- a/x11-misc/screengrab/screengrab-2.4.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 @@ -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.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/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/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.ebuild index 907a2a7510f5..d9ae207590c5 100644 --- a/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild +++ b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild @@ -16,16 +16,16 @@ if [[ ${PV} == *9999* ]]; then 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 + 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} fi - KEYWORDS="~amd64" + KEYWORDS="amd64" fi LICENSE="GPL-3+" 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/shared-mime-info-2.1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild index 0957f1fa1a14..e77479e728a4 100644 --- a/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild +++ b/x11-misc/shared-mime-info/shared-mime-info-2.1.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" # requires installed xdgmime binary RESTRICT="test" 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..9307a29db4af 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 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" 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..f2e460cb29dd --- /dev/null +++ b/x11-misc/slim/slim-1.4.0.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/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/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..75f2ba9b252c 100644 --- a/x11-misc/spacefm/spacefm-9999.ebuild +++ b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild @@ -1,18 +1,19 @@ -# 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" inherit git-r3 else - KEYWORDS="amd64 x86" + KEYWORDS="~amd64 ~x86" SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz" fi @@ -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/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/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/sw-notify-send/metadata.xml b/x11-misc/sw-notify-send/metadata.xml index d17b2795134e..66d473d268b3 100644 --- a/x11-misc/sw-notify-send/metadata.xml +++ b/x11-misc/sw-notify-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/sw-notify-send/sw-notify-send-1.2.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild index 89f5d2ea4b6e..d2711a3030c0 100644 --- 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 @@ -1,26 +1,32 @@ -# 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 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" +HOMEPAGE="https://github.com/projg2/tinynotify-send/" +SRC_URI="https://github.com/projg2/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2" +S=${WORKDIR}/${MY_P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="x11-libs/libtinynotify:0= +DEPEND=" + x11-libs/libtinynotify:0= ~x11-libs/libtinynotify-cli-${PV} - x11-libs/libtinynotify-systemwide:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" + x11-libs/libtinynotify-systemwide:0= +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig +" DOCS=( README ) -S=${WORKDIR}/${MY_P} src_configure() { local 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/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/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/util-macros/Manifest b/x11-misc/util-macros/Manifest index f3c30837f360..50aaa8165bcd 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.0.tar.xz 83324 BLAKE2B a19784078ff3043d9d54ef88738625a08285bb033e27713c05875135b39e9f5c1a38aa05c3d74c167d974a07611621f57c70e988e5fb024bb475575355c3f380 SHA512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb diff --git a/x11-misc/util-macros/util-macros-1.19.3.ebuild b/x11-misc/util-macros/util-macros-1.20.0.ebuild index cd703a10a569..2515ab084598 100644 --- a/x11-misc/util-macros/util-macros-1.19.3.ebuild +++ b/x11-misc/util-macros/util-macros-1.20.0.ebuild @@ -1,16 +1,16 @@ -# 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 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/virtualgl-3.0.1.ebuild b/x11-misc/virtualgl/virtualgl-3.1.ebuild index b78a84a80c37..8b9679b59247 100644 --- a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild +++ b/x11-misc/virtualgl/virtualgl-3.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 @@ 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}] @@ -50,11 +47,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( - # https://github.com/VirtualGL/virtualgl/issues/205 (from 'master') - "${FILESDIR}"/${P}-libX11-1.8.patch -) - 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 \ @@ -70,7 +62,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/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/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/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/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/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/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/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/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/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/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index ef0114fb8d20..3496b76a2900 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.38.tar.xz 884988 BLAKE2B 058543eb04917c785bbb02b5a11a2492c4ad3e1910e764f476e04fd2405e4c158d7e4942da00693efc683a39dd9fe11e55003c1c9ce10cc802744e98ebcd269d SHA512 20848a5a10cfa58265518add796fd97ddd2e39e7a87b18170cd9ebc3ec87268e92641f2cd8aaed1ed80cdbe3801b65a8a916321ffc20a419511b3d2a85b0dd2a diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild index 1441c0c806cd..b56e1cba57e2 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.38.ebuild @@ -14,7 +14,7 @@ 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" diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index a73d92e50be9..8e3848465906 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -14,7 +14,7 @@ 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" 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/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..4c5b67b4ce67 --- /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/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 34ec3cfca174..ed7fe38af259 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1 +1,2 @@ DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3 +DIST xscreensaver-6.06.tar.gz 26334374 BLAKE2B f15a439430bbca0852926c15716d3c4b22148d8c36d60b18ab033454d4df0d981400029b32e1f30a061592273deb648453db91813994b9bc4d6c66a61774a5d1 SHA512 988e30d422ef985ac348c275e098ddfe1ee034a2e916c91690ee2836c908801c1e017e22d828aca981b0f8bfc5491cd83ab7c45aabc155ba5013df8b149cbcb5 diff --git a/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild index a8c07d03c410..7dbfa69b04f5 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-2023 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 ) diff --git a/x11-misc/xscreensaver/xscreensaver-6.06.ebuild b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild new file mode 100644 index 000000000000..4b4247e5340a --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.06.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2023 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 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" + +# 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 new-login offensive pam +perl selinux suid systemd xinerama" +REQUIRED_USE=" + gles? ( !glx ) + ?? ( elogind systemd ) + pam? ( locking ) +" + +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 + sys-devel/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 + "${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 +) + +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 + + 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 + # Makefile installs xscreensaver.service regardless of --without-systemd + if ! use systemd; then + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + fi + + # 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-r2.ebuild index 41a76c336452..94d5107eb52e 100644 --- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild +++ b/x11-misc/xsel/xsel-1.2.0-r2.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="Command-line program for getting and setting the contents of the X selection" HOMEPAGE="http://www.vergenet.net/~conrad/software/xsel" @@ -9,15 +11,18 @@ 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="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/libXt" -src_compile() { - emake CFLAGS="${CFLAGS}" +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..515f19456db6 --- /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..247646e8e77a 100644 --- a/x11-misc/xsnow/Manifest +++ b/x11-misc/xsnow/Manifest @@ -1,3 +1,3 @@ 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 diff --git a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild index b1390bb2529c..e1ecded34ada 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/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/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest index ef075996f29b..181eceb917d2 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.7-1.diff.gz 168149 BLAKE2B 68011ab5d77efec6c42921c906ff1be4f7b3b2455025d5fb8f33270bddf02f1bd2c3fd0997b9ad356298d0ee4b8b2f1af6244b39281756259a737e3a5d7a6814 SHA512 433f8d19691f3d0f8bd04f4d8dbd201079da8503d4174d01894824b8239c032af35727e5502b4a2491d9975ba0c6ba6d55c504fbc23c0ca65cc7ba695594d143 diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild new file mode 100644 index 000000000000..bc324ffce716 --- /dev/null +++ b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 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 ~ppc64 ~riscv ~x86" +IUSE="" + +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/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/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..ff0493be7ad9 --- /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/zim-0.75.1.ebuild b/x11-misc/zim/zim-0.75.1.ebuild index c5d76bac3fa8..c7f34f25a5a3 100644 --- a/x11-misc/zim/zim-0.75.1.ebuild +++ b/x11-misc/zim/zim-0.75.1.ebuild @@ -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 x86" RDEPEND=" $(python_gen_cond_dep ' |