diff options
Diffstat (limited to 'x11-misc')
1409 files changed, 19242 insertions, 21164 deletions
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild deleted file mode 100644 index 9751760d13b8..000000000000 --- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="OpenGL virtual desktop switching" -HOMEPAGE="http://desk3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND=" - >=media-libs/freetype-2 - media-libs/freeglut - media-libs/imlib2[X] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXxf86vm -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc4.patch \ - "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-missing-include.patch \ - "${FILESDIR}"/${P}-gl_init.patch - - eautoreconf -} - -pkg_postinst() { - echo - elog "This ebuild installed a configuration file called /etc/3ddesktop.conf" - elog "The default configuration makes a screenshot of the virtual desktops" - elog "every X seconds. This is non-optimal behavior." - elog - elog "To enable a more intelligent way of updating the virtual desktops," - elog "execute the following:" - elog - elog " echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf" - elog - elog "This will cause 3ddesktop to update the virtual desktop snapshots" - elog "only when a 3d desktop switch is required." -} diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest deleted file mode 100644 index 07e15f9410f5..000000000000 --- a/x11-misc/3ddesktop/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST 3ddesktop-0.2.9.tar.gz 182278 BLAKE2B fb963a8bbfcea97da13cbc28890d74ac9d29655e298d76a485ceed5b67ac3557a8e731988e30d5a3009b774d66f8bfb270b0464ed6ffdf27070797ca8440d3d9 SHA512 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686 diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch deleted file mode 100644 index 2534535dee1f..000000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/206817 - ---- a/Makefile.am -+++ b/Makefile.am -@@ -37,7 +37,7 @@ - camera.cpp \ - config.cpp - --3ddeskd_LDFLAGS = $(imlib2_libs) @GL_LIBS@ -+3ddeskd_LDADD = $(imlib2_libs) @GL_LIBS@ - - noinst_HEADERS = 3ddesk.h \ - arrange.hpp \ diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch deleted file mode 100644 index a67753fcee39..000000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/118458 - ---- a/event.hpp -+++ b/event.hpp -@@ -74,7 +74,7 @@ - list<Event *>::iterator k; - for (k = events.begin(); k != events.end(); ++k) { - Event *e = *k; -- printf(":: Event %d 0x%x\n", e->type, (unsigned int)(e->function)); -+ printf(":: Event %d %p\n", e->type, e->function); - } - } - - diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch deleted file mode 100644 index d817cea54ece..000000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/123762 - ---- a/3ddeskd.cpp -+++ b/3ddeskd.cpp -@@ -2411,15 +2411,15 @@ - - // initialize opengl - -- // our own init function. -- gl_init(); -- - GLWin.open_display(); - - - GLWin.create_GL_window("Enhanced 3-dimensional workspace visualization magic machine", - cfg->options->do_fullscreen); - -+ // our own init function. -+ gl_init(); -+ - cfg->texture_size = GLWin.get_best_texture_size(cfg->texture_size); - - // Loads up the correct perspective matrix diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch deleted file mode 100644 index 328cbcad6d29..000000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentoo.org/228217 - ---- a/config.hpp -+++ b/config.hpp -@@ -24,6 +24,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <cstring> - - #include <errno.h> - #include <unistd.h> diff --git a/x11-misc/3ddesktop/metadata.xml b/x11-misc/3ddesktop/metadata.xml deleted file mode 100644 index 60a527c8f709..000000000000 --- a/x11-misc/3ddesktop/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <longdescription> -3d Destkop is an OpenGL program for switching virtual desktops in a seamless -3-dimensional manner. The current desktop is mapped into a 3D space where you -may choose other screens. Several different visualization modes are available. -</longdescription> - <upstream> - <remote-id type="sourceforge">desk3d</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild b/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild deleted file mode 100644 index a4c1a38b6260..000000000000 --- a/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="3D File Browser" -HOMEPAGE="https://sourceforge.net/projects/dz3d/" -SRC_URI="mirror://sourceforge/dz3d/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND="dev-libs/glib:2 - media-libs/freeglut - virtual/opengl - x11-libs/libXmu" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README WISHLIST ) - -src_prepare() { - epatch "${FILESDIR}/${PV}-gcc41.patch" \ - "${FILESDIR}/${P}-freeglut-compat.patch" - epatch_user -} diff --git a/x11-misc/3dfb/Manifest b/x11-misc/3dfb/Manifest deleted file mode 100644 index 2ea586f222a7..000000000000 --- a/x11-misc/3dfb/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST 3dfb-0.6.1.tar.gz 102343 BLAKE2B 220a9fc355f47e1b28a882be7dcfceac2b50be6ca89f5f5e1d6a2df5fe93141b09b7bf4c93e7af9fbbb24e58bc29e42a8cdd881a75154291eb2ca12461433410 SHA512 3eb43dd80d5ffaea8845e84e2cf21599ee36739ac99d558c4c11592363970795e60b30f444229c987f527a0765fa657111d7a54eef84b5d3d9375c7a812588f1 diff --git a/x11-misc/3dfb/files/0.6.1-gcc41.patch b/x11-misc/3dfb/files/0.6.1-gcc41.patch deleted file mode 100644 index 2a964f66c21d..000000000000 --- a/x11-misc/3dfb/files/0.6.1-gcc41.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur 3dfb-0.6.1.orig/src/gui.cpp 3dfb-0.6.1/src/gui.cpp ---- 3dfb-0.6.1.orig/src/gui.cpp 2004-07-28 22:32:21.000000000 +0000 -+++ 3dfb-0.6.1/src/gui.cpp 2006-09-18 21:35:01.271923722 +0000 -@@ -70,7 +70,7 @@ - - - static fileMap fileMap; --static levelLocation levels[fileMap.maxLevels]; -+static levelLocation levels[1024]; - - - diff --git a/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch b/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch deleted file mode 100644 index f05e3538120d..000000000000 --- a/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/main.cpp.bak 2014-03-13 12:24:32.155889466 +0400 -+++ src/main.cpp 2014-03-13 12:24:42.482890090 +0400 -@@ -7,6 +7,7 @@ - - int main(int argc, char **argv) - { -+ glutInit(&argc, argv); - gui_init(); - glutMainLoop(); - return(0); diff --git a/x11-misc/3dfb/metadata.xml b/x11-misc/3dfb/metadata.xml deleted file mode 100644 index a8831e3ae31e..000000000000 --- a/x11-misc/3dfb/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">dz3d</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/3dfm/3dfm-1.0-r1.ebuild b/x11-misc/3dfm/3dfm-1.0-r2.ebuild index d8ea37203cb5..54be311f2b58 100644 --- a/x11-misc/3dfm/3dfm-1.0-r1.ebuild +++ b/x11-misc/3dfm/3dfm-1.0-r2.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 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/" -SRC_URI="mirror://sourceforge/innolab/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/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/3dfm/metadata.xml b/x11-misc/3dfm/metadata.xml index 5a936625c766..c81697859594 100644 --- a/x11-misc/3dfm/metadata.xml +++ b/x11-misc/3dfm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/accessx/accessx-0951-r2.ebuild b/x11-misc/accessx/accessx-0951-r3.ebuild index 92dbd14e21e3..852c3f4ae74b 100644 --- a/x11-misc/accessx/accessx-0951-r2.ebuild +++ b/x11-misc/accessx/accessx-0951-r3.ebuild @@ -1,35 +1,44 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Interface to the XKEYBOARD extension in X11" HOMEPAGE="http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php" SRC_URI="http://cmos-eng.rehab.uiuc.edu/${PN}/software/${PN}${PV}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc sparc x86" -IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + dev-lang/tk:= + x11-libs/libX11 x11-libs/libXext - dev-lang/tk:0=" +" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -S=${WORKDIR}/${PN} -PATCHES=( "${FILESDIR}"/${P}-build.patch ) +PATCHES=( + "${FILESDIR}"/${P}-build.patch +) src_prepare() { default + sed -i \ -e 's:$(CC) $(OPTS) ax.C:$(CC) $(LDFLAGS) $(OPTS) ax.C:' \ Makefile || die } src_compile() { - emake CC="$(tc-getCXX)" OPTS="${CXXFLAGS}" XLIBDIR="-L/usr/$(get_libdir)" \ + emake \ + CC="$(tc-getCXX)" \ + OPTS="${CXXFLAGS}" \ + XLIBDIR="-L${ESYSROOT}/usr/$(get_libdir)" \ LLIBS="$($(tc-getPKG_CONFIG) --libs xext) $($(tc-getPKG_CONFIG) --libs x11)" } diff --git a/x11-misc/accessx/metadata.xml b/x11-misc/accessx/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/accessx/metadata.xml +++ b/x11-misc/accessx/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest index 2acc7ec0cda7..73e1781dceda 100644 --- a/x11-misc/alacarte/Manifest +++ b/x11-misc/alacarte/Manifest @@ -1 +1 @@ -DIST alacarte-3.36.0.tar.xz 201088 BLAKE2B 26c924a8a88c014358db38496cb8a20eca82e9b3d514a9feefa64db3674527cef454346c538a1cdb04ebbb384a64dee395738d8d2a19f4d2445e887f5714f8d6 SHA512 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9 +DIST alacarte-3.50.0.tar.xz 255404 BLAKE2B c22aeb83f707e4860c9a84311da2bf87e79db8b8859b8c45d5c1d0f6ead896f15b83cd112ac248fbb83b2bf839afbc90d2a24685c767ebaaaa850dfab8b26d35 SHA512 12578c35e8e68c83b46d81edc59444a92dc672a4a91bb4b443bbc0b26d94a3badf5598602dfc62dfbbabce7e3392c081c39055a201d60d4813b23e061014ee17 diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.50.0.ebuild index f6c2b3f3d3a7..40f4d74498a9 100644 --- a/x11-misc/alacarte/alacarte-3.36.0.ebuild +++ b/x11-misc/alacarte/alacarte-3.50.0.ebuild @@ -1,33 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="xml" +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" inherit gnome2 python-single-r1 DESCRIPTION="Simple GNOME menu editor" -HOMEPAGE="https://git.gnome.org/browse/alacarte" +HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPEND=" +DEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') >=gnome-base/gnome-menus-3.5.3:3[introspection] " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] " -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40.0 - sys-devel/gettext +BDEPEND=" + >=sys-devel/gettext-0.19.8 virtual/pkgconfig " diff --git a/x11-misc/alacarte/metadata.xml b/x11-misc/alacarte/metadata.xml index 39980802b1da..c6a01ca2cfa1 100644 --- a/x11-misc/alacarte/metadata.xml +++ b/x11-misc/alacarte/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/alacarte</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest deleted file mode 100644 index e59b05f9823f..000000000000 --- a/x11-misc/albert/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST albert-0.14.22-plugins.tar.gz 540446 BLAKE2B 22cf69698614a1b0e97fd1f5e3224b9097141c4a32c7999b9468c3c59b6af0d7a753de59a7abeb07f9ef9655abc05b8cb5e5079c9b41eb9f51dc09291b89b635 SHA512 4cce6ad717991a6a2293b491f17838a01ba51e4222deb78d5b793ab3390692131f4938027b96863c6cd61ec7a764fa6d52b3c3ef33cadd3183b2fe1498b6d344 -DIST albert-0.14.22.tar.gz 84925 BLAKE2B b009bd0420f2e5894e2e71e526361c6b177ceb0ed9339efd276228e3cb8aed52eba811b8f2f6ade8f39357017458f2cbfddec25f0df4de8d12397451bd98cb57 SHA512 91c131140f666dda665e07e617ce0d2af5c776233f9cf1430aedfc18299dcc22c6dcdec4d82f15fc2d81fa44679f9d3608a47128d33bfbddeb97481b430608c8 -DIST albert-0.16.1-plugins.tar.gz 534401 BLAKE2B e0713ee446b0c98a44489d8a45d60a1124cd45dd06af207ca8b8aeae4b6872a8705c3fa58e1636a4e0f95b4885253be4fd6f8376c12dc6b5110cbf2923af4d09 SHA512 3501efae9feeaf1090c1a1a3de9ed9e5788c8029dca76e06891683b43b69e5711f3c62187c273b11c418f824e9e0c0530bc5d248b37b96553fc5846c93c21224 -DIST albert-0.16.1.tar.gz 68739 BLAKE2B 4794c8aa4d2997ccf4c2d88a36c1e578ac3daa84fdd7dfebfa08941f692815a085ea2140aec9b3944c6ff8e71a4628510f9b28857137e39396be278606812640 SHA512 49dae5722982ba3fd4a25fcf5f398d8fe8d4bf66d15e2783a699174ff7196538c11ec9dde4201174c7fc7ac0852f2491b5b68abc196077305c89e22d8e1387ab diff --git a/x11-misc/albert/albert-0.14.22.ebuild b/x11-misc/albert/albert-0.14.22.ebuild deleted file mode 100644 index dddced7dd4ba..000000000000 --- a/x11-misc/albert/albert-0.14.22.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLUGINS_HASH="5dc169ce81002b4472cc55c0341f6ac52fe130f5" -inherit cmake-utils gnome2-utils - -DESCRIPTION="Desktop agnostic launcher" -HOMEPAGE="https://albertlauncher.github.io/" -# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag. -SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64" -IUSE="debug" - -RDEPEND=" - dev-cpp/muParser - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXext -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) - -src_prepare() { - mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DEBUG=$(usex debug) - -DBUILD_PYTHON=OFF #plugin directory is empty causing build failure - -DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/albert/albert-0.16.1.ebuild b/x11-misc/albert/albert-0.16.1.ebuild deleted file mode 100644 index c04869d05ca7..000000000000 --- a/x11-misc/albert/albert-0.16.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLUGINS_HASH="029bd8ccb58c4452bd82ab42be8739f1639e42d4" -inherit cmake-utils xdg-utils - -DESCRIPTION="Desktop agnostic launcher" -HOMEPAGE="https://albertlauncher.github.io/" -# plugins is a git submodule. the hash is taken from the submodule reference in the ${PV} tag. -SRC_URI="https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${P}-plugins.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug" - -RDEPEND=" - dev-cpp/muParser - dev-qt/qtcharts:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXext -" -DEPEND="${RDEPEND}" - -src_prepare() { - mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins/ || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DEBUG=$(usex debug) - -DBUILD_PYTHON=OFF #plugin directory is empty causing build failure - -DBUILD_VIRTUALBOX=OFF #plugin needs virtualbox installed to build, untested - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch b/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch deleted file mode 100644 index 1fa8a2fa7126..000000000000 --- a/x11-misc/albert/files/albert-0.14.22-qt-5.11.patch +++ /dev/null @@ -1,26 +0,0 @@ -Bug: https://bugs.gentoo.org/666998 - -From 97fdca06dc7f82c92e5bb71e05f4fd7e74bbc616 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Thu, 11 Oct 2018 23:09:51 +1100 -Subject: [PATCH] Add missing include. - ---- - lib/albertcore/src/core/telemetry.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/albertcore/src/core/telemetry.cpp b/lib/albertcore/src/core/telemetry.cpp -index 1fd6b06..09b7713 100644 ---- a/lib/albertcore/src/core/telemetry.cpp -+++ b/lib/albertcore/src/core/telemetry.cpp -@@ -2,6 +2,7 @@ - - #include <QApplication> - #include <QDateTime> -+#include <QDebug> - #include <QJsonDocument> - #include <QMessageBox> - #include <QNetworkAccessManager> --- -2.18.1 - diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml deleted file mode 100644 index 57e125768c28..000000000000 --- a/x11-misc/albert/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>kensington@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">albertlauncher/albert</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/alock/alock-1.0.0.ebuild b/x11-misc/alock/alock-1.0.0-r1.ebuild index 8488326f9503..476253fafdaa 100644 --- a/x11-misc/alock/alock-1.0.0.ebuild +++ b/x11-misc/alock/alock-1.0.0-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils toolchain-funcs +EAPI=7 -# we need this since there are no tagged releases yet +inherit toolchain-funcs + +# We need this since there are no tagged releases yet DESCRIPTION="locks the local X display until a password is entered" HOMEPAGE="https://darkshed.net/projects/alock https://github.com/mgumz/alock" @@ -15,15 +16,16 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="doc imlib pam" -DEPEND="x11-libs/libX11 +DEPEND="virtual/libcrypt:= + x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) - pam? ( sys-libs/pam ) - doc? ( app-text/asciidoc )" + pam? ( sys-libs/pam )" RDEPEND="${DEPEND}" +BDEPEND="doc? ( app-text/asciidoc )" PATCHES=( "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch @@ -31,6 +33,7 @@ PATCHES=( "${FILESDIR}"/tidy-printf.patch "${FILESDIR}"/fix-aliasing.patch "${FILESDIR}"/no-xf86misc.patch + "${FILESDIR}"/no-which.patch ) src_configure() { @@ -51,6 +54,7 @@ src_compile() { src_install() { dobin src/alock + if use doc; then # We need to generate the manpage... a2x -d manpage -f manpage ./"${PN}".txt || die "a2x conversion failed." diff --git a/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch b/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch index 1184ee73a612..b3172aa61841 100644 --- a/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch +++ b/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch @@ -1,7 +1,5 @@ -Index: alock-svn-94/src/auth_passwd.c -=================================================================== ---- alock-svn-94.orig/src/auth_passwd.c -+++ alock-svn-94/src/auth_passwd.c +--- a/src/auth_passwd.c ++++ b/src/auth_passwd.c @@ -43,7 +43,7 @@ \* ---------------------------------------------------------------- */ diff --git a/x11-misc/alock/files/no-which.patch b/x11-misc/alock/files/no-which.patch new file mode 100644 index 000000000000..1764be32c82d --- /dev/null +++ b/x11-misc/alock/files/no-which.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/844886 +--- a/configure ++++ b/configure +@@ -26,7 +26,7 @@ msg_chkfor() { + check_docs() { + + msg_chkfor "asciidoc" +- if which asciidoc 1> /dev/null 2>&3 ++ if command -v asciidoc 1> /dev/null 2>&3 + then + echo "ok." + echo "#_______________________" >&4 +@@ -40,7 +40,7 @@ check_docs() { + check_tools() { + + msg_chkfor "compiler $CC" +- if which "$CC" 1> /dev/null 2>&3 ++ if command -v "$CC" 1> /dev/null 2>&3 + then + echo "ok." + echo "---------------------------------" 1>&3 +@@ -56,7 +56,7 @@ check_tools() { + check_imlib2() { + + msg_chkfor "imlib2-config" +- if which imlib2-config 1> /dev/null 2>&3 ++ if command -v imlib2-config 1> /dev/null 2>&3 + then + echo "ok." + cat << EOF > tmp.c diff --git a/x11-misc/alock/metadata.xml b/x11-misc/alock/metadata.xml index 1a916c1e3772..ccba033a8d67 100644 --- a/x11-misc/alock/metadata.xml +++ b/x11-misc/alock/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription> diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest new file mode 100644 index 000000000000..a2be37478ac4 --- /dev/null +++ b/x11-misc/appmenu-gtk-module/Manifest @@ -0,0 +1 @@ +DIST appmenu-gtk-module-0.7.6.tar.xz 41212 BLAKE2B 7d37107e36502e44a38a1dc4e7ab02a761ec368b791182b223a4ae2631bad2eb52d9fec913ae0274f95f15a1cfbefb47f4807f1e83e8e3985fd4af7c6f0d075b SHA512 6efad2a13a04ae0a2a5e87fdc62eb7a37c8c85051339a3774fd8b579eea97b4633b10e064325205b3f10597530bab003deae24986c3175429a899c292e8786d5 diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild new file mode 100644 index 000000000000..a711dd4c2b59 --- /dev/null +++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils meson systemd + +DESCRIPTION="Application menu module for GTK" +HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu" +SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/e0b6a32a340922cd05060292b0757162/${P}.tar.xz" +S="${WORKDIR}/${PN}" + +LICENSE="LGPL-3+" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="gtk2 wayland" + +RDEPEND=" + dev-libs/glib[dbus] + >=x11-libs/gtk+-3.22.0:3[wayland=] + gtk2? ( >=x11-libs/gtk+-2.24.0:2 ) +" +DEPEND="${RDEPEND} + wayland? ( dev-libs/wayland ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-no-automagic-gtk.patch" + "${FILESDIR}/${P}-no-automagic-unitdir.patch" + "${FILESDIR}/${P}-fix-pkgconfig.patch" +) + +src_configure() { + # outputs [ '2', '3' ] OR [ '3' ] + local gtks="[$(usex gtk2 " '2'," '') '3' ]" + + meson_src_configure -Dgtk="${gtks}" -Duserunitdir="$(systemd_get_userunitdir)" +} + +src_install() { + meson_src_install + + exeinto /etc/X11/xinit/xinitrc.d + newexe "${FILESDIR}"/${PN} 85-${PN} +} + +pkg_postinst() { + gnome2_schemas_update +} diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module new file mode 100644 index 000000000000..e6520aabcd6f --- /dev/null +++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module @@ -0,0 +1,12 @@ +if [[ -n "$GTK_MODULES" ]]; then + GTK_MODULES="${GTK_MODULES}:appmenu-gtk-module" +else + GTK_MODULES="appmenu-gtk-module" +fi + +if [[ -z "$UBUNTU_MENUPROXY" ]]; then + UBUNTU_MENUPROXY=1 +fi + +export GTK_MODULES +export UBUNTU_MENUPROXY diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch new file mode 100644 index 000000000000..f8b5439b28cb --- /dev/null +++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch @@ -0,0 +1,10 @@ +--- a/meson.build 2020-10-28 22:05:23.000000000 +0100 ++++ b/meson.build 2022-07-17 09:53:55.047880112 +0200 +@@ -1,6 +1,6 @@ + project('appmenu-gtk-module', 'c', + meson_version: '>=0.49.0', +- version: '0.7', ++ version: '0.7.6', + license: ['LGPL-3.0-or-later'], + default_options: [ + 'c_std=gnu11', diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch new file mode 100644 index 000000000000..716aefa37612 --- /dev/null +++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch @@ -0,0 +1,28 @@ +From 59994f8b0a431f61786de5715c45c24b0dd76cd1 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Tue, 4 Jan 2022 18:33:12 -0800 +Subject: [PATCH] appmenu-gtk-module/meson.build: only build gtk if requested + +Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> +--- + subprojects/appmenu-gtk-module/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/subprojects/appmenu-gtk-module/meson.build b/subprojects/appmenu-gtk-module/meson.build +index 06ab76d..7279f97 100644 +--- a/meson.build ++++ b/meson.build +@@ -41,8 +41,8 @@ gtk3_ver = '>=3.22.0' + gtk2 = dependency('gtk+-2.0', version: gtk2_ver, required: gtk2_requested) + gtk3 = dependency('gtk+-3.0', version: gtk3_ver, required: gtk3_requested) + +-build_gtk2 = gtk2.found() +-build_gtk3 = gtk3.found() ++build_gtk2 = gtk2_requested and gtk2.found() ++build_gtk3 = gtk3_requested and gtk3.found() + + ################# + # Configuration # +-- +2.34.1 + diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch new file mode 100644 index 000000000000..e46fe74c0734 --- /dev/null +++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch @@ -0,0 +1,56 @@ +From c60d530583a8bd07aea22c4f3f3aa8b0aaf271c1 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Tue, 4 Jan 2022 19:06:37 -0800 +Subject: [PATCH] appmenu-gtk-module: add userunitdir option + +allows setting systemd unit on systemd-less systems + +Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> +--- + .../appmenu-gtk-module/data/meson.build | 19 ++++++++++++------- + .../appmenu-gtk-module/meson_options.txt | 1 + + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/subprojects/appmenu-gtk-module/data/meson.build b/subprojects/appmenu-gtk-module/data/meson.build +index 8378965..d0d1717 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,14 +2,19 @@ install_data([ + 'org.appmenu.gtk-module.gschema.xml' + ], install_dir: schema_dir) + ++userunitdir = get_option('userunitdir') + systemd = dependency('systemd', required: false) + +-if systemd.found() ++if userunitdir == '' ++ if systemd.found() + userunitdir = systemd.get_pkgconfig_variable('systemduserunitdir') +- configure_file( +- input: 'appmenu-gtk-module.service.in', +- output: 'appmenu-gtk-module.service', +- install_dir: userunitdir, +- configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))} +- ) ++ else ++ userunitdir = '/usr/lib/systemd/user' ++ endif + endif ++configure_file( ++ input: 'appmenu-gtk-module.service.in', ++ output: 'appmenu-gtk-module.service', ++ install_dir: userunitdir, ++ configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))} ++) +diff --git a/subprojects/appmenu-gtk-module/meson_options.txt b/subprojects/appmenu-gtk-module/meson_options.txt +index f93877a..ec0b3a6 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,4 @@ + option('gtk', type: 'array', choices : ['2','3'], value: ['2','3'], description: 'Supported GTK versions') + option('tests', type : 'boolean', value : false, description: 'Parser tests') + option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference') ++option('userunitdir', type: 'string', description: 'Installation path for user unit file (optional)') +-- +2.34.1 + diff --git a/x11-misc/appmenu-gtk-module/metadata.xml b/x11-misc/appmenu-gtk-module/metadata.xml new file mode 100644 index 000000000000..5d2727e6e6bf --- /dev/null +++ b/x11-misc/appmenu-gtk-module/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <remote-id type="gitlab">vala-panel-project/vala-panel-appmenu</remote-id> + </upstream> + <use> + <flag name="gtk2">Build module for GTK+2</flag> + </use> +</pkgmetadata> diff --git a/x11-misc/apwal/apwal-0.4.5-r2.ebuild b/x11-misc/apwal/apwal-0.4.5-r3.ebuild index 90f5f0196d25..1fd5a464954a 100644 --- a/x11-misc/apwal/apwal-0.4.5-r2.ebuild +++ b/x11-misc/apwal/apwal-0.4.5-r3.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="A simple application launcher and combined editor" HOMEPAGE="http://apwal.free.fr/" SRC_URI="http://apwal.free.fr/download/${P}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -RDEPEND="x11-libs/gtk+:2 - x11-libs/gdk-pixbuf +RDEPEND=" dev-libs/libxml2 - dev-libs/glib:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" + dev-libs/glib:2 + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -S=${WORKDIR}/${PN} src_configure() { - tc-export CC + tc-export CC PKG_CONFIG } diff --git a/x11-misc/apwal/files/apwal-0.4.5-makefile.patch b/x11-misc/apwal/files/apwal-0.4.5-makefile.patch index 2c278b278a03..0925087c0c1f 100644 --- a/x11-misc/apwal/files/apwal-0.4.5-makefile.patch +++ b/x11-misc/apwal/files/apwal-0.4.5-makefile.patch @@ -27,8 +27,8 @@ else -CFLAGS=-O2 `pkg-config --cflags gtk+-2.0 gthread-2.0` -LDFLAGS=-O2 `pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` -+CPPFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0` -+LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` ++CPPFLAGS=`${PKG_CONFIG} --cflags gtk+-2.0 gthread-2.0` ++LIBS=`${PKG_CONFIG} --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` endif OBJS=main.o app.o launcher.o editor.o property.o \ diff --git a/x11-misc/apwal/metadata.xml b/x11-misc/apwal/metadata.xml index 49c86a887b6a..3ab9b4a739d3 100644 --- a/x11-misc/apwal/metadata.xml +++ b/x11-misc/apwal/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest index 79536a1bd957..aa275d15bd43 100644 --- a/x11-misc/arandr/Manifest +++ b/x11-misc/arandr/Manifest @@ -1 +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.ebuild b/x11-misc/arandr/arandr-0.1.10.ebuild deleted file mode 100644 index dc86e38022b2..000000000000 --- a/x11-misc/arandr/arandr-0.1.10.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -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 x86" - -RDEPEND=" - dev-python/pygobject:3=[${PYTHON_USEDEP}] - x11-apps/xrandr -" -DEPEND=" - >=dev-python/docutils-0.6[${PYTHON_USEDEP}] -" - -src_prepare() { - local i p - # simulate gettext behavior: - # LINGUAS unset => install all - # LINGUAS="" => install none - # LINGUAS="de fr" => install de and fr - if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set - for i in $(cd "${S}"/data/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language - if ! has ${i} ${LINGUAS} ; then # if language is disabled - rm data/po/${i}.po || die - fi - done - fi - - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - gunzip "${D}"/usr/share/man/man1/{${PN},unxrandr}.1.gz || die -} diff --git a/x11-misc/arandr/arandr-0.1.11.ebuild b/x11-misc/arandr/arandr-0.1.11.ebuild new file mode 100644 index 000000000000..eea0a6c99bb8 --- /dev/null +++ b/x11-misc/arandr/arandr-0.1.11.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{10..12} ) + +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/files/arandr-0.1.10-manpages.patch b/x11-misc/arandr/files/arandr-0.1.10-manpages.patch new file mode 100644 index 000000000000..8e02c4928f36 --- /dev/null +++ b/x11-misc/arandr/files/arandr-0.1.10-manpages.patch @@ -0,0 +1,31 @@ +--- a/setup.py ++++ b/setup.py +@@ -101,8 +101,8 @@ + self.mkpath('build') + + for (sourcefile, gzfile) in [ +- ('data/arandr.1.txt', os.path.join('build', 'arandr.1.gz')), +- ('data/unxrandr.1.txt', os.path.join('build', 'unxrandr.1.gz')), ++ ('data/arandr.1.txt', os.path.join('build', 'arandr.1')), ++ ('data/unxrandr.1.txt', os.path.join('build', 'unxrandr.1')), + ]: + + if newer(sourcefile, gzfile): +@@ -111,7 +111,7 @@ + info('compressing man page to %s', gzfile) + + if not self.dry_run: +- compressed = gzip.open(gzfile, 'w', 9) ++ compressed = open(gzfile, 'wb') + compressed.write(manpage) + compressed.close() + +@@ -259,7 +259,7 @@ + }, + data_files = [ + ('share/applications', ['data/arandr.desktop']), # FIXME: use desktop-file-install? +- ('share/man/man1', ['build/arandr.1.gz', 'build/unxrandr.1.gz']), ++ ('share/man/man1', ['build/arandr.1', 'build/unxrandr.1']), + ], + scripts = ['arandr', 'unxrandr'], + ) diff --git a/x11-misc/arandr/metadata.xml b/x11-misc/arandr/metadata.xml index bc1b97e1eb76..1917a0e78ea1 100644 --- a/x11-misc/arandr/metadata.xml +++ b/x11-misc/arandr/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + ARandR is designed to provide a simple visual front end for XRandR. + Relative monitor positions are shown graphically and can be changed in a drag-and-drop way. + </longdescription> + <upstream> + <remote-id type="gitlab">arandr/arandr</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/autocutsel/Manifest b/x11-misc/autocutsel/Manifest index 941ddf97a6c0..b7fcf4604401 100644 --- a/x11-misc/autocutsel/Manifest +++ b/x11-misc/autocutsel/Manifest @@ -1 +1 @@ -DIST autocutsel-0.10.0.tar.gz 329527 BLAKE2B 1ab17fec1dde40fae6a98a9cc079f7080add2a30b3384e7a4cfbe7e85ca13a7394ce96ba1dd32a9d147f123ce44fc4ff7fbbf77a02eacd2301b91fafc3096232 SHA512 2d9b7114fde67ee217ceee673e32b407eef5b266a9d457a83b35d1c6227e5873cc7928aa10f7d84ce5e8c78d4940ee29985696f49b4015269584f1559f6b6d1d +DIST autocutsel-0.10.1.tar.gz 337872 BLAKE2B df1d924bf61c5e2b3dc2930b85f5b3b2f906892fa84932cfb4511be3e94dcc8763a8af1d4a6685da013d65b82e8f003f194fcb0522c35e43bc88269611132109 SHA512 a4f68342b389ef94fde8052f5d9e4b4585bab8fa8364985a2b0a3ec3e6f81ed58ba45be9349aa6e16c70ca623a7c315796cf0440ef6f4ffa9606ed7b7981a4a2 diff --git a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild b/x11-misc/autocutsel/autocutsel-0.10.1.ebuild index f7dec4fbc608..4f5b4c05363b 100644 --- a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild +++ b/x11-misc/autocutsel/autocutsel-0.10.1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 +inherit autotools DESCRIPTION="Synchronise the two copy/paste buffers mainly used by X applications" -HOMEPAGE="http://www.nongnu.org/autocutsel/ https://github.com/sigmike/autocutsel" +HOMEPAGE="https://www.nongnu.org/autocutsel/ https://github.com/sigmike/autocutsel" SRC_URI="https://github.com/sigmike/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" @@ -22,3 +23,8 @@ DEPEND=" ${RDEPEND} x11-base/xorg-proto " + +src_prepare() { + default + eautoreconf +} diff --git a/x11-misc/autocutsel/metadata.xml b/x11-misc/autocutsel/metadata.xml index c731dcd868fe..342aa9fb57f9 100644 --- a/x11-misc/autocutsel/metadata.xml +++ b/x11-misc/autocutsel/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <longdescription>autocutsel synchronizes the two copy/paste buffers mainly used by X applications. It unifies "clipboards" between VNC servers and Windows.</longdescription> <upstream> <remote-id type="github">sigmike/autocutsel</remote-id> diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest new file mode 100644 index 000000000000..026ae3b7c25c --- /dev/null +++ b/x11-misc/autorandr/Manifest @@ -0,0 +1,2 @@ +DIST autorandr-1.14.tar.gz 49234 BLAKE2B 3ff149d30b023bc54d83c4be1f81f67204d20d3e6a7a43e15009c1c4f1180fa920789ce84ae56f13946a9cec1f72bc7adb27be3c58ca8532235d0457b1f5aa92 SHA512 dc1ee4c28b06dde4a721fe564734e7a79c1c843986f7c84307ea60f19c2237ba53d1bcd2202e377363e7e0a5bf5dea95bea4490b3fa5ec5fa6738114646a502d +DIST autorandr-1.15.tar.gz 49352 BLAKE2B b7200eb7a77230076f1a9f8b1a21be883ae363cc41cff7f1191e034359cc8ebb52e9dd19dd5f2e415a34b9a3a89fda3d0d43a946b2f3401de0d279fb9d5ba1a2 SHA512 2837348b755f5c4b30ad2b68e191e1969a467401cf32dda495dd19867e391f8b8b4a9c0b4958ef33f75c71aace46686995e27bab805e1e40cc4a1af44e9f0405 diff --git a/x11-misc/autorandr/autorandr-1.14.ebuild b/x11-misc/autorandr/autorandr-1.14.ebuild new file mode 100644 index 000000000000..40586032d8fd --- /dev/null +++ b/x11-misc/autorandr/autorandr-1.14.ebuild @@ -0,0 +1,76 @@ +# 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 bash-completion-r1 distutils-r1 systemd udev + +if [[ "${PV}" = "9999" ]] ; then + inherit git-r3 + 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" +fi + +DESCRIPTION="Automatically select a display configuration based on connected devices" +HOMEPAGE="https://github.com/phillipberndt/autorandr" + +LICENSE="GPL-3" +SLOT="0" +IUSE="launcher systemd udev" + +RDEPEND=" + x11-apps/xrandr + launcher? ( x11-libs/libxcb ) + udev? ( virtual/udev ) +" +DEPEND="${RDEPEND}" +# desktop-file-util: uses desktop-file-edit in Makefile +BDEPEND=" + dev-util/desktop-file-utils + virtual/pkgconfig +" + +src_compile() { + distutils-r1_src_compile + + if use launcher; then + emake contrib/autorandr_launcher/autorandr-launcher + fi +} + +src_install() { + distutils-r1_src_install + + doman autorandr.1 + + local targets=( + autostart_config + bash_completion + $(usev launcher) + $(usev systemd) + $(usev udev) + ) + + emake DESTDIR="${D}" \ + BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \ + SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \ + UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ + $(printf "install_%s " "${targets[@]}") +} + +pkg_postinst() { + if use udev; then + udev_reload + fi +} + +pkg_postrm() { + if use udev; then + udev_reload + fi +} diff --git a/x11-misc/autorandr/autorandr-1.15.ebuild b/x11-misc/autorandr/autorandr-1.15.ebuild new file mode 100644 index 000000000000..fd13373441f5 --- /dev/null +++ b/x11-misc/autorandr/autorandr-1.15.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 systemd udev + +if [[ "${PV}" = "9999" ]] ; then + inherit git-r3 + 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" +fi + +DESCRIPTION="Automatically select a display configuration based on connected devices" +HOMEPAGE="https://github.com/phillipberndt/autorandr" + +LICENSE="GPL-3" +SLOT="0" +IUSE="launcher systemd udev" + +RDEPEND=" + x11-apps/xrandr + launcher? ( x11-libs/libxcb ) + udev? ( virtual/udev ) +" +DEPEND="${RDEPEND}" +# desktop-file-util: uses desktop-file-edit in Makefile +BDEPEND=" + dev-util/desktop-file-utils + virtual/pkgconfig +" + +src_compile() { + distutils-r1_src_compile + + if use launcher; then + emake contrib/autorandr_launcher/autorandr-launcher + fi +} + +src_install() { + distutils-r1_src_install + + doman autorandr.1 + + local targets=( + autostart_config + bash_completion + $(usev launcher) + $(usev systemd) + $(usev udev) + ) + + emake DESTDIR="${D}" \ + BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \ + SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \ + UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ + $(printf "install_%s " "${targets[@]}") +} + +pkg_postinst() { + if use udev; then + udev_reload + fi +} + +pkg_postrm() { + if use udev; then + udev_reload + fi +} diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild new file mode 100644 index 000000000000..0011c189d5ca --- /dev/null +++ b/x11-misc/autorandr/autorandr-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 systemd udev + +if [[ "${PV}" = "9999" ]] ; then + inherit git-r3 + 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" +fi + +DESCRIPTION="Automatically select a display configuration based on connected devices" +HOMEPAGE="https://github.com/phillipberndt/autorandr" + +LICENSE="GPL-3" +SLOT="0" +IUSE="launcher systemd udev" + +RDEPEND=" + x11-apps/xrandr + launcher? ( x11-libs/libxcb ) + udev? ( virtual/udev ) +" +DEPEND="${RDEPEND}" +# desktop-file-util: uses desktop-file-edit in Makefile +BDEPEND=" + dev-util/desktop-file-utils + virtual/pkgconfig +" + +src_compile() { + distutils-r1_src_compile + + if use launcher; then + emake contrib/autorandr_launcher/autorandr-launcher + fi +} + +src_install() { + distutils-r1_src_install + + doman autorandr.1 + + local targets=( + autostart_config + bash_completion + $(usev launcher) + $(usev systemd) + $(usev udev) + ) + + emake DESTDIR="${D}" \ + BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \ + SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \ + UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ + $(printf "install_%s " "${targets[@]}") +} + +pkg_postinst() { + if use udev; then + udev_reload + fi +} + +pkg_postrm() { + if use udev; then + udev_reload + fi +} diff --git a/x11-misc/autorandr/metadata.xml b/x11-misc/autorandr/metadata.xml new file mode 100644 index 000000000000..e3c132257120 --- /dev/null +++ b/x11-misc/autorandr/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>flow@gentoo.org</email> + <name>Florian Schmaus</name> + </maintainer> + <use> + <flag name="launcher">Install the launcher, i.e., an alternative to the udev/systemd hooks</flag> + </use> + <upstream> + <remote-id type="github">phillipberndt/autorandr</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest index 7630b04f56f7..c3e1ba046442 100644 --- a/x11-misc/barrier/Manifest +++ b/x11-misc/barrier/Manifest @@ -1 +1 @@ -DIST barrier-2.3.2.tar.gz 7244128 BLAKE2B 263be99ffb692e5b8e3e3450565fbaf5c5e2f23beca4beaf5d699547933be1bcdcbf1ed6b9ce8bd53f2a5dbb1eba3fc06490620555520fcff0e8d34ff2ad52cb SHA512 0452244afc3294aaafd89f18d2472e24fb2fc62426e7be91ab4ffceca4697c7acb8f4438fc299835f1312f0ada83911679abe6b8e1268631130c5877e193ff83 +DIST barrier-2.4.0.tar.gz 5572043 BLAKE2B e3eee306324a661a655b31e3179b7daf3fb199553a581059c67113f9597fb41d6af00fa3090d20c7d0b1d7420764454a512e91d8180ea663c3f99b89c663417f SHA512 dff8d95c358688952baee0bbbf56b818e40a6c0483d58f6cadd55558ab5d0cefc92a37b0751bfd70868686e1716c729871ae00a30ee9b0ba944f531dfb742449 diff --git a/x11-misc/barrier/barrier-2.3.2-r1.ebuild b/x11-misc/barrier/barrier-2.4.0.ebuild index 62b3dd6a5f97..0c587b0c8a91 100644 --- a/x11-misc/barrier/barrier-2.3.2-r1.ebuild +++ b/x11-misc/barrier/barrier-2.4.0.ebuild @@ -1,9 +1,9 @@ -# 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 desktop xdg cmake +inherit desktop virtualx xdg cmake DESCRIPTION="Share a mouse and keyboard between computers (fork of Synergy)" HOMEPAGE="https://github.com/debauchee/barrier" @@ -11,8 +11,9 @@ SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" -IUSE="gui libressl" +KEYWORDS="amd64 x86" +IUSE="gui test" +RESTRICT="!test? ( test )" RDEPEND=" net-misc/curl @@ -31,19 +32,18 @@ RDEPEND=" dev-qt/qtwidgets:5 net-dns/avahi[mdnsresponder-compat] ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= " DEPEND=" ${RDEPEND} + dev-cpp/gtest + dev-cpp/gulrak-filesystem x11-base/xorg-proto " PATCHES=( - "${FILESDIR}"/${P}-inf-loop.patch - "${FILESDIR}"/${P}-no-avahi.patch - "${FILESDIR}"/${P}-pthread.patch - "${FILESDIR}"/${P}-qt-gui-only.patch + "${FILESDIR}"/${P}-includes.patch + "${FILESDIR}"/${P}-gcc-13.patch ) DOCS=( @@ -56,13 +56,20 @@ src_configure() { local mycmakeargs=( -DBARRIER_BUILD_GUI=$(usex gui) -DBARRIER_BUILD_INSTALLER=OFF + -DBARRIER_BUILD_TESTS=$(usex test) -DBARRIER_REVISION=00000000 + -DBARRIER_USE_EXTERNAL_GTEST=ON -DBARRIER_VERSION_STAGE=gentoo ) cmake_src_configure } +src_test() { + "${BUILD_DIR}"/bin/unittests || die + virtx "${BUILD_DIR}"/bin/integtests || die +} + src_install() { cmake_src_install einstalldocs diff --git a/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch b/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch deleted file mode 100644 index 125b903e58eb..000000000000 --- a/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch +++ /dev/null @@ -1,132 +0,0 @@ -From c79120c049d825fedeed70d5a1a9dc64d17ce9f0 Mon Sep 17 00:00:00 2001 -From: Vasily Galkin <galkin-vv@ya.ru> -Date: Sun, 9 Feb 2020 23:27:26 +0300 -Subject: [PATCH] Fix infinite loop on fast TCP disconnection - -The commit a841b28 changed the condition for removing job from processing. -New flag MultiplexerJobStatus::continue_servicing become used -instead of checking pointer for NULL. -However for cases when TCPSocket::newJob() returns nullptr -the behaviour changed: earlier the job was removed, but after change -it is called again, since MultiplexerJobStatus equal to {true, nullptr} -means "run this job again". - -This leads to problem with eating CPU and RAM on linux -https://github.com/debauchee/barrier/issues/470 - -There is similar windows problem, but not sure it is related. -https://github.com/debauchee/barrier/issues/552 - -Since it looks that the goal of a841b28 was only clarifying -object ownership and not changing job deletion behaviour, -this commit tries to get original behaviour and fix the bugs above -by returning {false, nullptr} instead of {true, nullptr} -when TCPSocket::newJob() returns nullptr. ---- - src/lib/net/SecureSocket.cpp | 4 ++-- - src/lib/net/TCPSocket.cpp | 25 +++++++++++++------------ - src/lib/net/TCPSocket.h | 3 ++- - 3 files changed, 17 insertions(+), 15 deletions(-) - -diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp -index 99f626e8..92abea3c 100644 ---- a/src/lib/net/SecureSocket.cpp -+++ b/src/lib/net/SecureSocket.cpp -@@ -761,7 +761,7 @@ MultiplexerJobStatus SecureSocket::serviceConnect(ISocketMultiplexerJob* job, - // If status > 0, success - if (status > 0) { - sendEvent(m_events->forIDataSocket().secureConnected()); -- return {true, newJob()}; -+ return newJobOrStopServicing(); - } - - // Retry case -@@ -793,7 +793,7 @@ MultiplexerJobStatus SecureSocket::serviceAccept(ISocketMultiplexerJob* job, - // If status > 0, success - if (status > 0) { - sendEvent(m_events->forClientListener().accepted()); -- return {true, newJob()}; -+ return newJobOrStopServicing(); - } - - // Retry case -diff --git a/src/lib/net/TCPSocket.cpp b/src/lib/net/TCPSocket.cpp -index 4f4251ad..09a8f17e 100644 ---- a/src/lib/net/TCPSocket.cpp -+++ b/src/lib/net/TCPSocket.cpp -@@ -403,6 +403,15 @@ void TCPSocket::setJob(std::unique_ptr<ISocketMultiplexerJob>&& job) - } - } - -+MultiplexerJobStatus TCPSocket::newJobOrStopServicing() -+{ -+ auto new_job = newJob(); -+ if (new_job) -+ return {true, std::move(new_job)}; -+ else -+ return {false, {}}; -+} -+ - std::unique_ptr<ISocketMultiplexerJob> TCPSocket::newJob() - { - // note -- must have m_mutex locked on entry -@@ -519,22 +528,14 @@ MultiplexerJobStatus TCPSocket::serviceConnecting(ISocketMultiplexerJob* job, bo - catch (XArchNetwork& e) { - sendConnectionFailedEvent(e.what()); - onDisconnected(); -- auto new_job = newJob(); -- if (new_job) -- return {true, std::move(new_job)}; -- else -- return {false, {}}; -+ return newJobOrStopServicing(); - } - } - - if (write) { - sendEvent(m_events->forIDataSocket().connected()); - onConnected(); -- auto new_job = newJob(); -- if (new_job) -- return {true, std::move(new_job)}; -- else -- return {false, {}}; -+ return newJobOrStopServicing(); - } - - return {true, {}}; -@@ -548,7 +549,7 @@ MultiplexerJobStatus TCPSocket::serviceConnected(ISocketMultiplexerJob* job, - if (error) { - sendEvent(m_events->forISocket().disconnected()); - onDisconnected(); -- return {true, newJob()}; -+ return newJobOrStopServicing(); - } - - EJobResult writeResult = kRetry; -@@ -603,7 +604,7 @@ MultiplexerJobStatus TCPSocket::serviceConnected(ISocketMultiplexerJob* job, - if (writeResult == kBreak || readResult == kBreak) { - return {false, {}}; - } else if (writeResult == kNew || readResult == kNew) { -- return {true, newJob()}; -+ return newJobOrStopServicing(); - } else { - return {true, {}}; - } -diff --git a/src/lib/net/TCPSocket.h b/src/lib/net/TCPSocket.h -index 28891353..0b988886 100644 ---- a/src/lib/net/TCPSocket.h -+++ b/src/lib/net/TCPSocket.h -@@ -76,7 +76,8 @@ protected: - - void removeJob(); - void setJob(std::unique_ptr<ISocketMultiplexerJob>&& job); -- -+ MultiplexerJobStatus newJobOrStopServicing(); -+ - bool isReadable() { return m_readable; } - bool isWritable() { return m_writable; } - --- -2.24.1 - diff --git a/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch b/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch deleted file mode 100644 index 481a23a2d705..000000000000 --- a/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 93a4035409ed5a4349c9848c3dae3ec670884ee0 Mon Sep 17 00:00:00 2001 -From: Tetja Rediske <tetja+gitlab@tetja.de~> -Date: Sat, 19 Oct 2019 00:28:13 +0200 -Subject: [PATCH] make non-gui variants build without avahi - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7f9efac8..8e10776e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -175,7 +175,7 @@ if (UNIX) - link_directories("/usr/X11R6/lib") - endif() - -- if (${PKG_CONFIG_FOUND}) -+ if (BARRIER_BUILD_GUI AND ${PKG_CONFIG_FOUND}) - pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd) - include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS}) - set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}") --- -2.24.1 - diff --git a/x11-misc/barrier/files/barrier-2.3.2-pthread.patch b/x11-misc/barrier/files/barrier-2.3.2-pthread.patch deleted file mode 100644 index d29844843e45..000000000000 --- a/x11-misc/barrier/files/barrier-2.3.2-pthread.patch +++ /dev/null @@ -1,115 +0,0 @@ -From a0b3124f80f5696cbf070b3b714533ab4012398d Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Tue, 10 Mar 2020 21:10:48 +0000 -Subject: [PATCH] Use -pthread flag and simplify pthread build logic - -Sometimes -lpthread is not enough. This has caused build failures on -Gentoo Linux in the past. - -The logic also seems needlessly complex. We check for HAVE_PTHREAD on -UNIX platforms even though CMake errors out if pthreads are not -found. Similarly, we have a fallback for HAVE_PTHREAD_SIGNAL being -false even though we always set it to true. ---- - CMakeLists.txt | 11 ++++------- - res/config.h.in | 6 ------ - src/lib/arch/Arch.h | 4 +--- - src/lib/arch/unix/ArchMultithreadPosix.cpp | 13 ------------- - 4 files changed, 5 insertions(+), 29 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8e10776e..ae7ccb21 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -123,12 +123,10 @@ if (UNIX) - check_type_size (short SIZEOF_SHORT) - - # pthread is used on both Linux and Mac -- check_library_exists ("pthread" pthread_create "" HAVE_PTHREAD) -- if (HAVE_PTHREAD) -- list (APPEND libs pthread) -- else() -- message (FATAL_ERROR "Missing library: pthread") -- endif() -+ set (CMAKE_THREAD_PREFER_PTHREAD TRUE) -+ set (THREADS_PREFER_PTHREAD_FLAG TRUE) -+ find_package (Threads REQUIRED) -+ list (APPEND libs Threads::Threads) - - # curl is used on both Linux and Mac - find_package (CURL) -@@ -269,7 +267,6 @@ if (UNIX) - set (HAVE_CXX_EXCEPTIONS 1) - set (HAVE_CXX_MUTABLE 1) - set (HAVE_CXX_STDLIB 1) -- set (HAVE_PTHREAD_SIGNAL 1) - set (SELECT_TYPE_ARG1 int) - set (SELECT_TYPE_ARG234 " (fd_set *)") - set (SELECT_TYPE_ARG5 " (struct timeval *)") -diff --git a/res/config.h.in b/res/config.h.in -index f3a72449..2bd3b3bf 100644 ---- a/res/config.h.in -+++ b/res/config.h.in -@@ -55,12 +55,6 @@ - /* Define if you have a POSIX `sigwait` function. */ - #cmakedefine HAVE_POSIX_SIGWAIT ${HAVE_POSIX_SIGWAIT} - --/* Define if you have POSIX threads libraries and header files. */ --#cmakedefine HAVE_PTHREAD ${HAVE_PTHREAD} -- --/* Define if you have `pthread_sigmask` and `pthread_kill` functions. */ --#cmakedefine HAVE_PTHREAD_SIGNAL ${HAVE_PTHREAD_SIGNAL} -- - /* Define if your compiler defines socklen_t. */ - #cmakedefine HAVE_SOCKLEN_T ${HAVE_SOCKLEN_T} - -diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h -index c062d6f3..940a2e3a 100644 ---- a/src/lib/arch/Arch.h -+++ b/src/lib/arch/Arch.h -@@ -54,9 +54,7 @@ - # include "arch/unix/ArchConsoleUnix.h" - # include "arch/unix/ArchDaemonUnix.h" - # include "arch/unix/ArchLogUnix.h" --# if HAVE_PTHREAD --# include "arch/unix/ArchMultithreadPosix.h" --# endif -+# include "arch/unix/ArchMultithreadPosix.h" - # include "arch/unix/ArchNetworkBSD.h" - # include "arch/unix/ArchSleepUnix.h" - # include "arch/unix/ArchStringUnix.h" -diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp -index c9ddc6ce..4866edce 100644 ---- a/src/lib/arch/unix/ArchMultithreadPosix.cpp -+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp -@@ -36,17 +36,6 @@ - - #define SIGWAKEUP SIGUSR1 - --#if !HAVE_PTHREAD_SIGNAL -- // boy, is this platform broken. forget about pthread signal -- // handling and let signals through to every process. barrier -- // will not terminate cleanly when it gets SIGTERM or SIGINT. --# define pthread_sigmask sigprocmask --# define pthread_kill(tid_, sig_) kill(0, (sig_)) --# define sigwait(set_, sig_) --# undef HAVE_POSIX_SIGWAIT --# define HAVE_POSIX_SIGWAIT 1 --#endif -- - static - void - setSignalSet(sigset_t* sigset) -@@ -344,9 +333,7 @@ ArchMultithreadPosix::newThread(ThreadFunc func, void* data) - // can't tell the difference. - if (!m_newThreadCalled) { - m_newThreadCalled = true; --#if HAVE_PTHREAD_SIGNAL - startSignalHandler(); --#endif - } - - // note that the child thread will wait until we release this mutex --- -2.24.1 - diff --git a/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch b/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch deleted file mode 100644 index bcfe31386103..000000000000 --- a/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch +++ /dev/null @@ -1,45 +0,0 @@ -From af0ce63733e040d6220aaa2157190015d4a9b0fd Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Tue, 17 Mar 2020 22:45:20 +0000 -Subject: [PATCH] Only require Qt5 when building the GUI - -Commit 6c888437 made Qt5 mandatory for all builds when it is only -required for the GUI. There's already a find_package call in src/gui, -it just needed the REQUIRED flag to be added. ---- - CMakeLists.txt | 6 ------ - src/gui/CMakeLists.txt | 2 +- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8e10776e..ee0835ec 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -357,12 +357,6 @@ else() - set (OPENSSL_LIBS ${lib_ssl} ${lib_crypto}) - endif() - -- --# Check we have the *required* Qt5 libs. --find_package(Qt5Core REQUIRED) --find_package(Qt5Network REQUIRED) --find_package(Qt5Widgets REQUIRED) -- - # - # Configure_file... but for directories, recursively. - # -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 4988fe6a..f29fd910 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required (VERSION 3.4) - --find_package (Qt5 COMPONENTS Core Widgets Network) -+find_package (Qt5 REQUIRED COMPONENTS Core Widgets Network) - set (CMAKE_AUTOMOC ON) - set (CMAKE_AUTORCC ON) - set (CMAKE_AUTOUIC ON) --- -2.25.1 - 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/barrier/files/barrier-2.4.0-includes.patch b/x11-misc/barrier/files/barrier-2.4.0-includes.patch new file mode 100644 index 000000000000..048a3b068092 --- /dev/null +++ b/x11-misc/barrier/files/barrier-2.4.0-includes.patch @@ -0,0 +1,39 @@ +From aa0a2998e8894716644ea5fb29fc6f0165add956 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Tue, 2 Nov 2021 20:59:51 +0000 +Subject: [PATCH] Add missing cstddef includes for NULL + +--- + src/lib/base/Event.cpp | 2 ++ + src/lib/base/Event.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/lib/base/Event.cpp b/src/lib/base/Event.cpp +index cc548fc6..08c5e98f 100644 +--- a/src/lib/base/Event.cpp ++++ b/src/lib/base/Event.cpp +@@ -19,6 +19,8 @@ + #include "base/Event.h" + #include "base/EventQueue.h" + ++#include <cstddef> ++ + // + // Event + // +diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h +index 38a2cf11..cb00dccb 100644 +--- a/src/lib/base/Event.h ++++ b/src/lib/base/Event.h +@@ -21,6 +21,8 @@ + #include "common/basic_types.h" + #include "common/stdmap.h" + ++#include <cstddef> ++ + class EventData { + public: + EventData() { } +-- +2.32.0 + diff --git a/x11-misc/barrier/metadata.xml b/x11-misc/barrier/metadata.xml index 4ec6c623e4b2..70be39f73269 100644 --- a/x11-misc/barrier/metadata.xml +++ b/x11-misc/barrier/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>chewi@gentoo.org</email> diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r4.ebuild index e3fb13c155f1..af95439a9bd0 100644 --- a/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild +++ b/x11-misc/bbacpi/bbacpi-0.1.5-r4.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="ACPI monitor for X11" -HOMEPAGE="http://bbacpi.sourceforge.net" -SRC_URI="mirror://sourceforge/bbacpi/${P}.tar.gz" +HOMEPAGE="https://bbacpi.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/bbacpi/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 x86" @@ -23,7 +23,6 @@ RDEPEND=" ${DEPEND} media-fonts/font-adobe-100dpi" -DOCS=( AUTHORS ChangeLog NEWS README data/README.bbacpi ) PATCHES=( "${FILESDIR}"/${P}-noextraquals.diff "${FILESDIR}"/${P}-overflows.diff @@ -31,11 +30,12 @@ PATCHES=( src_prepare() { default - mv configure.{in,ac} || die eautoreconf } src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbacpi || die + dodoc data/README.bbacpi + + rm "${ED}"/usr/share/bbtools/README.bbacpi || die } diff --git a/x11-misc/bbacpi/metadata.xml b/x11-misc/bbacpi/metadata.xml index 5c53ec9ef9bf..48426c401c16 100644 --- a/x11-misc/bbacpi/metadata.xml +++ b/x11-misc/bbacpi/metadata.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> <name>Gentoo Desktop Miscellaneous Project</name> </maintainer> - <longdescription lang="en"> -Utility for viewing ACPI data via X11 -</longdescription> <upstream> <remote-id type="sourceforge">bbacpi</remote-id> </upstream> diff --git a/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild deleted file mode 100644 index 58d5201d0f0c..000000000000 --- a/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Basic CD Player for blackbox wm" -HOMEPAGE="http://tranber1.free.fr/bbcd.html" -SRC_URI="http://tranber1.free.fr/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="" - -RDEPEND="media-libs/libcdaudio - x11-libs/libX11" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}_${PV}a.diff - "${FILESDIR}"/${P}-gcc3.3.patch - "${FILESDIR}"/${P}-gcc4.3.patch -) - -src_install() { - default - rm "${ED%/}"/usr/share/bbtools/README.bbcd || die -} diff --git a/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild new file mode 100644 index 000000000000..250968d07f39 --- /dev/null +++ b/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Basic CD Player for blackbox wm" +HOMEPAGE="http://tranber1.free.fr/bbcd.html" +SRC_URI="http://tranber1.free.fr/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="" + +RDEPEND=">=media-libs/libcdaudio-0.99.12-r4 + x11-libs/libX11" +DEPEND="${RDEPEND} + x11-libs/libXt" + +PATCHES=( + "${FILESDIR}"/${P}_${PV}a.diff + "${FILESDIR}"/${P}-gcc3.3.patch + "${FILESDIR}"/${P}-gcc4.3.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++14 + econf \ + --with-x \ + --x-includes=/usr/include/X11 \ + --x-libraries=/usr/lib64/x86_64-linux-gnu +} + +src_install() { + default + rm "${ED}/usr/share/bbtools/README.bbcd" || die +} diff --git a/x11-misc/bbcd/metadata.xml b/x11-misc/bbcd/metadata.xml index abca1b86fad6..aa20bff17b1d 100644 --- a/x11-misc/bbcd/metadata.xml +++ b/x11-misc/bbcd/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription> - Basic CD Player app for Blackbox. - </longdescription> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild index 34d873c0c0b9..5b5873ffb5bd 100644 --- a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild +++ b/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="blackbox date display" HOMEPAGE="https://sourceforge.net/projects/bbtools" -SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/bbtools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -25,14 +25,17 @@ 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 } src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbdate || die + rm "${ED}"/usr/share/bbtools/README.bbdate || die # since multiple bbtools packages provide this file, install # it in /usr/share/doc/${PF} - mv "${ED%/}"/usr/share/bbtools/bbtoolsrc.in \ - "${ED%/}"/usr/share/doc/${PF}/bbtoolsrc.example || die + mv "${ED}"/usr/share/bbtools/bbtoolsrc.in \ + "${ED}"/usr/share/doc/${PF}/bbtoolsrc.example || die } diff --git a/x11-misc/bbdate/metadata.xml b/x11-misc/bbdate/metadata.xml index 492eb679996f..e4a916e7d28f 100644 --- a/x11-misc/bbdate/metadata.xml +++ b/x11-misc/bbdate/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription>A data display for Blackbox.</longdescription> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> <upstream> <remote-id type="sourceforge">bbtools</remote-id> </upstream> diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest index 2a71798ace53..8e2b3fb186c4 100644 --- a/x11-misc/bbkeys/Manifest +++ b/x11-misc/bbkeys/Manifest @@ -1 +1 @@ -DIST bbkeys-0.9.1.tar.gz 226941 BLAKE2B 43a946210f25679dfe7d5a383fbd3f938ae71b19a635a288590b958fc47f3588c690a1e901b44fdb1b31eb1a8ee7252ceeee85b5d012585b261de61cc0f012ab SHA512 c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd +DIST bbkeys-0.9.2.tar.gz 116313 BLAKE2B 03b9cb10b7a10380ef805f28605b0ed1969d2197ffc1a19704a3ae230d3555f265d721c800ec45e37af4fb28fa01587999c078d0122826589f688b146fbebef7 SHA512 3205bd37052589b6cba9447032e6906c09afc80b36d7f7869204d290faa7f5726b7b9de74ee06c73c25b794f88eb4e13663f8b096f78bd246d1764bc4ab8984d diff --git a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild deleted file mode 100644 index 642de9a75e6e..000000000000 --- a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Use keyboard shortcuts in the blackbox wm" -HOMEPAGE="http://bbkeys.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="" - -RDEPEND=">=x11-wm/blackbox-0.70.0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_install() { - emake DESTDIR="${D}" install - rm -rf "${ED%/}"/usr/share/doc || die - einstalldocs - - echo PRELINK_PATH_MASK=\""${EPREFIX}"/usr/bin/bbkeys\" > "${T}"/99bbkeys || die - doenvd "${T}"/99bbkeys -} diff --git a/x11-misc/bbkeys/bbkeys-0.9.2.ebuild b/x11-misc/bbkeys/bbkeys-0.9.2.ebuild new file mode 100644 index 000000000000..b3a7f7456fcb --- /dev/null +++ b/x11-misc/bbkeys/bbkeys-0.9.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_PV="rel-$(ver_cut 1)$(ver_cut 2)$(ver_cut 3)" + +DESCRIPTION="Use keyboard shortcuts in the blackbox wm" +HOMEPAGE="http://bbkeys.sourceforge.net" +SRC_URI="https://github.com/bbidulock/bbkeys/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="" + +RDEPEND=" + >=x11-wm/blackbox-0.70.0 + x11-libs/libXext + x11-libs/libXft + x11-libs/libX11 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + sed -i -e '/^bbkeys_LDADD/ s#/usr/lib/libbt.a#-lbt#' src/Makefile.am || die + default + eautoreconf +} + +src_install() { + default + rm -rf "${ED}"/usr/share/doc || die + + echo PRELINK_PATH_MASK=\""${EPREFIX}"/usr/bin/bbkeys\" > "${T}"/99bbkeys || die + doenvd "${T}"/99bbkeys +} diff --git a/x11-misc/bbkeys/metadata.xml b/x11-misc/bbkeys/metadata.xml index ca343e66c75c..afd6fad32584 100644 --- a/x11-misc/bbkeys/metadata.xml +++ b/x11-misc/bbkeys/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - A keygrabber for Blackbox. - </longdescription> - <upstream> - <remote-id type="sourceforge">bbkeys</remote-id> - </upstream> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> + <upstream> + <remote-id type="github">bbidulock/bbkeys</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/bblaunch/files/bblaunch-0.0.3.patch b/x11-misc/bblaunch/files/bblaunch-0.0.3.patch index 3c78fab2ec77..ab4ff7d5fede 100644 --- a/x11-misc/bblaunch/files/bblaunch-0.0.3.patch +++ b/x11-misc/bblaunch/files/bblaunch-0.0.3.patch @@ -1,5 +1,5 @@ ---- bblaunch.c.orig 2002-05-06 23:35:57.000000000 -0500 -+++ bblaunch.c 2004-06-15 07:21:11.080972712 -0500 +--- a/bblaunch.c ++++ b/bblaunch.c @@ -170,7 +170,7 @@ launchargs.iconic = False; launchargs.pause = 1000; diff --git a/x11-misc/bblaunch/metadata.xml b/x11-misc/bblaunch/metadata.xml index 374dfd611686..b4616e7b0bdd 100644 --- a/x11-misc/bblaunch/metadata.xml +++ b/x11-misc/bblaunch/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - An application launcher for Blackbox. - </longdescription> - <upstream> - <remote-id type="sourceforge">blackboxwm</remote-id> - </upstream> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">blackboxwm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r2.ebuild index 2a8ecbf0cd71..8cf1029b20f2 100644 --- a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild +++ b/x11-misc/bbmail/bbmail-0.9.3-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="blackbox mail notification" HOMEPAGE="https://sourceforge.net/projects/bbtools" -SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/bbtools/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" diff --git a/x11-misc/bbmail/metadata.xml b/x11-misc/bbmail/metadata.xml index 9c0a7fefd168..e4a916e7d28f 100644 --- a/x11-misc/bbmail/metadata.xml +++ b/x11-misc/bbmail/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - Mail notification for Blackbox. - </longdescription> - <upstream> - <remote-id type="sourceforge">bbtools</remote-id> - </upstream> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">bbtools</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild b/x11-misc/bbpager/bbpager-0.4.7-r2.ebuild index dd26ebbbdab7..bad6789ef308 100644 --- a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild +++ b/x11-misc/bbpager/bbpager-0.4.7-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="An understated pager for Blackbox" HOMEPAGE="http://bbtools.sourceforge.net/" -SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/bbtools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -15,8 +15,8 @@ KEYWORDS="amd64 ppc ppc64 x86" IUSE="" RDEPEND="x11-wm/blackbox" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS BUGS ChangeLog README TODO data/README.bbpager ) PATCHES=( @@ -31,5 +31,5 @@ src_prepare() { src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbpager || die + rm "${ED}"/usr/share/bbtools/README.bbpager || die } diff --git a/x11-misc/bbpager/metadata.xml b/x11-misc/bbpager/metadata.xml index ea5d7acd3406..e4a916e7d28f 100644 --- a/x11-misc/bbpager/metadata.xml +++ b/x11-misc/bbpager/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - An understated pager for Blackbox. - </longdescription> - <upstream> - <remote-id type="sourceforge">bbtools</remote-id> - </upstream> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">bbtools</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild index a8e1a0cdbba4..c0c325534a94 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-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,14 +7,16 @@ inherit autotools DESCRIPTION="blackbox ppp frontend/monitor" HOMEPAGE="https://sourceforge.net/projects/bbtools/" -SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/bbtools/${PN}/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -DEPEND="x11-libs/libX11" -RDEPEND="${DEPEND} +COMMON_DEPEND="x11-libs/libX11" +DEPEND="${COMMON_DEPEND} + elibc_musl? ( net-libs/ppp-defs )" +RDEPEND="${COMMON_DEPEND} media-fonts/font-adobe-100dpi" PATCHES=( @@ -26,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/bbppp/metadata.xml b/x11-misc/bbppp/metadata.xml index bc7abb1beac9..e4a916e7d28f 100644 --- a/x11-misc/bbppp/metadata.xml +++ b/x11-misc/bbppp/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - A PPP frontend/monitor for Blackbox. - </longdescription> - <upstream> - <remote-id type="sourceforge">bbtools</remote-id> - </upstream> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">bbtools</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild index 0ae88b552435..a6a1b752e378 100644 --- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild +++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,7 +29,14 @@ PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) +src_prepare() { + default + sed -i -e "/LIBDIR =/s:lib:$(get_libdir):" bbrun/Makefile || die +} + src_compile() { + tc-export PKG_CONFIG + emake -C ${PN} CC="$(tc-getCC)" } diff --git a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch index 21e855746d09..c33a0f44d21c 100644 --- a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch +++ b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch @@ -9,8 +9,8 @@ http://bugs.gentoo.org/367853 LIBDIR = -L/usr/lib -L/usr/X11R6/lib -LIBS = -lXpm `pkg-config --libs gtk+-2.0` -CFLAGS = `pkg-config --cflags gtk+-2.0` -+LIBS = `pkg-config --libs xext xpm gtk+-2.0` -+DEP_CFLAGS = `pkg-config --cflags xext xpm gtk+-2.0` ++LIBS = `${PKG_CONFIG} --libs xext xpm gtk+-2.0` ++DEP_CFLAGS = `${PKG_CONFIG} --cflags xext xpm gtk+-2.0` OBJS = bbrun.o \ ../wmgeneral/wmgeneral.o \ diff --git a/x11-misc/bbrun/metadata.xml b/x11-misc/bbrun/metadata.xml index 6f49eba8f496..aa20bff17b1d 100644 --- a/x11-misc/bbrun/metadata.xml +++ b/x11-misc/bbrun/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild b/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild index ec831a2a80ed..a0e287f7f93b 100644 --- a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild +++ b/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="blackbox time watcher" HOMEPAGE="https://sourceforge.net/projects/bbtools/" -SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/bbtools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND="x11-libs/libX11" @@ -23,14 +23,17 @@ PATCHES=( "${FILESDIR}"/${P}-asneeded.patch ) src_prepare() { default mv configure.{in,ac} || die + sed -i \ + -e 's|register ||' \ + Image.cc || die eautoreconf } src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbtime || die + rm "${ED}"/usr/share/bbtools/README.bbtime || die # since multiple bbtools packages provide this file, install # it in /usr/share/doc/${PF} - mv "${ED%/}/usr/share/bbtools/bbtoolsrc.in" \ - "${ED%/}/usr/share/doc/${PF}/bbtoolsrc.example" || die + mv "${ED}/usr/share/bbtools/bbtoolsrc.in" \ + "${ED}/usr/share/doc/${PF}/bbtoolsrc.example" || die } diff --git a/x11-misc/bbtime/metadata.xml b/x11-misc/bbtime/metadata.xml index 0970bb5e6587..e4a916e7d28f 100644 --- a/x11-misc/bbtime/metadata.xml +++ b/x11-misc/bbtime/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription>A time monitor for Blackbox.</longdescription> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> <upstream> <remote-id type="sourceforge">bbtools</remote-id> </upstream> diff --git a/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r2.ebuild index 12817b2e7546..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-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,27 +11,30 @@ SRC_URI="https://www.netmeister.org/apps/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 hppa ppc x86" +KEYWORDS="amd64 ~hppa ppc x86" IUSE="" DEPEND="dev-lang/perl x11-libs/libX11" RDEPEND="${DEPEND} net-misc/wget - x11-apps/xmessage - !<=x11-plugins/gkrellweather-2.0.7-r1" + x11-apps/xmessage" 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/bbweather/metadata.xml b/x11-misc/bbweather/metadata.xml index bdb57f8b3d53..aa20bff17b1d 100644 --- a/x11-misc/bbweather/metadata.xml +++ b/x11-misc/bbweather/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription> - Weather monitor for Blackbox. - </longdescription> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/birdtray/Manifest b/x11-misc/birdtray/Manifest index d2f52ad1eaf4..d351edd982e9 100644 --- a/x11-misc/birdtray/Manifest +++ b/x11-misc/birdtray/Manifest @@ -1,2 +1 @@ -DIST birdtray-1.7.0.tar.gz 398153 BLAKE2B 87e583ab55b828213f5da97a61c3fc710b381b46ab688f02b6d1c4d01a2577451375d7366f0406cf685f1366497204e985de7905b1635161e252c11b9456da61 SHA512 3c2940a3a0e405d3fce1cd0411437ffa56f76c458e42ea059de1bd3fca802621643be39c1a0df3fc3fb0deac2aa53f7631c4bee191efd4b48e591dd05b30a6ab -DIST birdtray-1.8.1.tar.gz 767821 BLAKE2B 343fb902381396df2a9d49b619a6eaea620447276ee1c6261b8bb9667ea40d945da37522e1ddeac529d032549f3ca3288d6b780ff95b6adbc98a1dbea8fdeb10 SHA512 464bdaf1820cecb0bb9b41721389f24ce447c65e25f857998c4de5d3fb2aa53f03223938974e9bbdbfd4d719fb6aaecdf8a27c6e2ab7075b451bc8e73d8f07e7 +DIST birdtray-1.11.4.gh.tar.gz 867399 BLAKE2B e3e5663bb343d991c66ff0bd774fdc1abf74a5e94f7ea42ecfe5e16f3c1be932fe8d91ae0d9a6e43d75475671f4f18df0a90f80a09e58892d9629c4cc464b729 SHA512 a3eeeb93fea3f32bbf6a43944d76d0c3990a26db0abbad52102aa72f15f9a32a746620ca347444dab0d90393785aeada7ffb9ec901f91b4701fb128c4e7e628c diff --git a/x11-misc/birdtray/birdtray-1.8.1.ebuild b/x11-misc/birdtray/birdtray-1.11.4.ebuild index bb684e4e0580..82afb728b6df 100644 --- a/x11-misc/birdtray/birdtray-1.8.1.ebuild +++ b/x11-misc/birdtray/birdtray-1.11.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git" else - SRC_URI="https://github.com/gyunaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/gyunaev/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64" fi @@ -22,16 +22,17 @@ SLOT="0" RDEPEND="dev-db/sqlite:= dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtnetwork:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${P}_qt515.patch -) +# https://github.com/gyunaev/birdtray/commit/74a97df3a17efd5ef679b8eed6999b97abc23f10 +# translations have been made optional, let's see how we would manage them +BDEPEND="dev-qt/linguist-tools:5" pkg_postinst() { xdg_icon_cache_update diff --git a/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild b/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild deleted file mode 100644 index 39890d9c3e53..000000000000 --- a/x11-misc/birdtray/birdtray-1.7.0-r1.ebuild +++ /dev/null @@ -1,43 +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="A new mail system tray notification icon for Thunderbird" -HOMEPAGE="https://github.com/gyunaev/birdtray" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git" -else - SRC_URI="https://github.com/gyunaev/${PN}/archive/RELEASE_${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/${PN}-RELEASE_${PV}" -fi - -LICENSE="GPL-3" -SLOT="0" - -RDEPEND="dev-db/sqlite:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11" - -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-desktop_file_deprecated_category.patch -) - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/birdtray/birdtray-9999.ebuild b/x11-misc/birdtray/birdtray-9999.ebuild index 4820733d2bcb..82afb728b6df 100644 --- a/x11-misc/birdtray/birdtray-9999.ebuild +++ b/x11-misc/birdtray/birdtray-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 cmake xdg-utils @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/gyunaev/birdtray.git" else - SRC_URI="https://github.com/gyunaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/gyunaev/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64" fi @@ -22,13 +22,18 @@ SLOT="0" RDEPEND="dev-db/sqlite:= dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtnetwork:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11" DEPEND="${RDEPEND}" +# https://github.com/gyunaev/birdtray/commit/74a97df3a17efd5ef679b8eed6999b97abc23f10 +# translations have been made optional, let's see how we would manage them +BDEPEND="dev-qt/linguist-tools:5" + pkg_postinst() { xdg_icon_cache_update } diff --git a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch b/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch deleted file mode 100644 index 104b24bf8de9..000000000000 --- a/x11-misc/birdtray/files/birdtray-1.7.0-desktop_file_deprecated_category.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/src/res/com.ulduzsoft.Birdtray.desktop -+++ b/src/res/com.ulduzsoft.Birdtray.desktop -@@ -28,5 +28,5 @@ - X-MultipleArgs=false - Type=Application - Icon=com.ulduzsoft.Birdtray --Categories=Application;Network;Email; -+Categories=Network;Email; - StartupNotify=true diff --git a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch b/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch deleted file mode 100644 index a7384f02a6d8..000000000000 --- a/x11-misc/birdtray/files/birdtray-1.8.1_qt515.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 38b333b5ff9318ae136d719c5fdd4c790c294833 Mon Sep 17 00:00:00 2001 -From: George Yunaev <gyunaev@ulduzsoft.com> -Date: Sun, 31 May 2020 13:36:14 -0700 -Subject: [PATCH] Fixed compilation on Qt 5.15 - fixes #375 - ---- - src/trayicon.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/trayicon.cpp b/src/trayicon.cpp -index 210c5da..72d80d2 100644 ---- a/src/trayicon.cpp -+++ b/src/trayicon.cpp -@@ -3,6 +3,7 @@ - #include <QPainter> - #include <QProcess> - #include <QMessageBox> -+#include <QPainterPath> - #include <QtNetwork/QNetworkSession> - - #include "trayicon.h" diff --git a/x11-misc/birdtray/metadata.xml b/x11-misc/birdtray/metadata.xml index 31836f413ff2..38a9dbf43516 100644 --- a/x11-misc/birdtray/metadata.xml +++ b/x11-misc/birdtray/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>ago@gentoo.org</email> diff --git a/x11-misc/blockdpy/blockdpy-1-r1.ebuild b/x11-misc/blockdpy/blockdpy-1-r2.ebuild index 37504c2a8993..a53a9f8c48af 100644 --- a/x11-misc/blockdpy/blockdpy-1-r1.ebuild +++ b/x11-misc/blockdpy/blockdpy-1-r2.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Tool to block access via the physical display while x11vnc is running" HOMEPAGE="http://www.karlrunge.com/x11vnc/blockdpy.c" SRC_URI="http://www.karlrunge.com/x11vnc/blockdpy.c" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" x11-libs/libX11 x11-libs/libXext" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR} +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_unpack() { cp "${DISTDIR}"/blockdpy.c blockdpy.c || die @@ -34,16 +32,16 @@ src_prepare() { sed -i '/#include <stdio.h>/i#include <string.h>' blockdpy.c || die } +src_configure() { + tc-export CC + append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xext) + export LDLIBS=$($(tc-getPKG_CONFIG) --libs x11 xext) +} + src_compile() { - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ - $($(tc-getPKG_CONFIG) --cflags x11) \ - $($(tc-getPKG_CONFIG) --cflags xext) \ - -o blockdpy blockdpy.c \ - $($(tc-getPKG_CONFIG) --libs x11) \ - $($(tc-getPKG_CONFIG) --libs xext) \ - || die "compile failed" + emake blockdpy - # Create README from head comment in source. + # Create README from head comment in source sed -n '1,/^ *\*\//s/^[ -]*\*[ \/]*//p' < blockdpy.c > README || die } @@ -55,7 +53,7 @@ src_install() { pkg_postinst() { # Just warn about missing xlock instead of requiring it in case # the user wants to use something else. - if [[ ! -x ${EPREFIX}/usr/bin/xlock ]]; then + if [[ ! -x ${EROOR}/usr/bin/xlock ]]; then ewarn 'The xlock executable was not found.' ewarn 'blockdpy runs "xlock" as the screen-lock program by default.' ewarn 'You should either install x11-misc/xlockmore or override the' diff --git a/x11-misc/blockdpy/metadata.xml b/x11-misc/blockdpy/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/x11-misc/blockdpy/metadata.xml +++ b/x11-misc/blockdpy/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest index 7f49a37de71a..f030cce1d873 100644 --- a/x11-misc/bumblebee/Manifest +++ b/x11-misc/bumblebee/Manifest @@ -1,2 +1 @@ -DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070 -DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec +DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild deleted file mode 100644 index eb6477c36832..000000000000 --- a/x11-misc/bumblebee/bumblebee-3.2.1_p20190421.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools readme.gentoo-r1 systemd user - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git" - EGIT_BRANCH="develop" - KEYWORDS="" -else - COMMIT="7aa457fe7b4fffc3b175ad36fdae00d7777065dc" - SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - - S="${WORKDIR}/Bumblebee-${COMMIT}" -fi - -DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets" -HOMEPAGE="https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee" - -SLOT="0" -LICENSE="GPL-3" - -IUSE="+bbswitch video_cards_nouveau video_cards_nvidia" - -COMMON_DEPEND=" - dev-libs/glib:2 - dev-libs/libbsd - sys-apps/kmod - x11-libs/libX11 -" - -RDEPEND="${COMMON_DEPEND} - virtual/opengl - x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] - bbswitch? ( sys-power/bbswitch ) -" - -DEPEND="${COMMON_DEPEND} - sys-apps/help2man - virtual/pkgconfig -" - -PDEPEND=" - || ( - x11-misc/primus - x11-misc/virtualgl - ) -" - -REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )" - -PATCHES=( - # https://github.com/Bumblebee-Project/Bumblebee/issues/1058 - "${FILESDIR}/${P}-gcc10.patch" -) - -pkg_setup() { - enewgroup bumblebee -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - if use video_cards_nvidia ; then - # Get paths to GL libs for all ABIs - local i nvlib="" - for i in $(get_all_libdirs) ; do - nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib" - done - - local nvpref="/usr/$(get_libdir)/opengl/nvidia" - local xorgpref="/usr/$(get_libdir)/xorg/modules" - ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \ - CONF_LDPATH_NVIDIA=${nvlib#:} \ - CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}" - fi - - econf \ - ${ECONF_PARAMS} -} - -src_install() { - default - - newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newenvd "${FILESDIR}"/${PN}.envd 99${PN} - systemd_dounit scripts/systemd/bumblebeed.service - - local DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group. - You may need to setup your /etc/bumblebee/bumblebee.conf" - readme.gentoo_create_doc -} diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild index 1099ff0e4161..b0690088fc3a 100644 --- a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild +++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools multilib readme.gentoo-r1 systemd user +inherit autotools readme.gentoo-r1 systemd udev if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git" EGIT_BRANCH="develop" - KEYWORDS="amd64 x86" else - COMMIT="d469a32fc0dfef5b3725c7a5331be2d04b870594" + COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec" SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 x86" @@ -33,13 +32,16 @@ COMMON_DEPEND=" x11-libs/libX11 " -RDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${COMMON_DEPEND} + acct-group/bumblebee virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch ) " -DEPEND="${COMMON_DEPEND} +DEPEND=" + ${COMMON_DEPEND} sys-apps/help2man virtual/pkgconfig " @@ -53,10 +55,6 @@ PDEPEND=" REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )" -pkg_setup() { - enewgroup bumblebee -} - src_prepare() { default eautoreconf @@ -85,7 +83,7 @@ src_install() { default newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} newenvd "${FILESDIR}"/${PN}.envd 99${PN} systemd_dounit scripts/systemd/bumblebeed.service @@ -93,3 +91,11 @@ src_install() { You may need to setup your /etc/bumblebee/bumblebee.conf" readme.gentoo_create_doc } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild index 65477c88d732..bd63a8594628 100644 --- a/x11-misc/bumblebee/bumblebee-9999.ebuild +++ b/x11-misc/bumblebee/bumblebee-9999.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools multilib readme.gentoo-r1 systemd user +inherit autotools readme.gentoo-r1 systemd udev if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git" EGIT_BRANCH="develop" - KEYWORDS="" else - COMMIT="c322bd849aabe6e48b4304b8d13cc4aadc36a30d" + COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec" SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" @@ -33,13 +32,16 @@ COMMON_DEPEND=" x11-libs/libX11 " -RDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${COMMON_DEPEND} + acct-group/bumblebee virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch ) " -DEPEND="${COMMON_DEPEND} +DEPEND=" + ${COMMON_DEPEND} sys-apps/help2man virtual/pkgconfig " @@ -53,10 +55,6 @@ PDEPEND=" REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )" -pkg_setup() { - enewgroup bumblebee -} - src_prepare() { default eautoreconf @@ -85,7 +83,7 @@ src_install() { default newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} newenvd "${FILESDIR}"/${PN}.envd 99${PN} systemd_dounit scripts/systemd/bumblebeed.service @@ -93,3 +91,11 @@ src_install() { You may need to setup your /etc/bumblebee/bumblebee.conf" readme.gentoo_create_doc } + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch deleted file mode 100644 index 7d02226521e4..000000000000 --- a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch +++ /dev/null @@ -1,66 +0,0 @@ -Author: Andreas Beckmann <anbe@debian.org> -Description: fix FTBFS with gcc-10 - gcc-10 defaults to -fno-common - see https://gcc.gnu.org/gcc-10/porting_to.html -Bug-Debian: https://bugs.debian.org/957058 - ---- a/src/bbconfig.h -+++ b/src/bbconfig.h -@@ -103,7 +103,7 @@ enum bb_pm_method { - PM_VGASWITCHEROO, - PM_METHODS_COUNT /* not a method but a marker for the end */ - }; --const char *bb_pm_method_string[PM_METHODS_COUNT]; -+extern const char *bb_pm_method_string[PM_METHODS_COUNT]; - - /* String buffer size */ - #define BUFFER_SIZE 1024 ---- a/src/switch/switching.h -+++ b/src/switch/switching.h -@@ -60,10 +60,10 @@ void switcheroo_off(void); - - /* number of switchers as defined in switching.c */ - #define SWITCHERS_COUNT 2 --struct switching_method switching_methods[SWITCHERS_COUNT]; -+extern struct switching_method switching_methods[SWITCHERS_COUNT]; - - /* A switching method that can be used or NULL if none */ --struct switching_method *switcher; -+extern struct switching_method *switcher; - - struct switching_method *switcher_detect(const char *name, struct switch_info); - enum switch_state switch_status(void); ---- a/src/bbsecondary.h -+++ b/src/bbsecondary.h -@@ -21,7 +21,7 @@ - #pragma once - - /* PCI Bus ID of the discrete video card */ --struct pci_bus_id *pci_bus_id_discrete; -+extern struct pci_bus_id *pci_bus_id_discrete; - - /// Start the X server by fork-exec, turn card on if needed. - bool start_secondary(bool); ---- a/src/switch/switching.c -+++ b/src/switch/switching.c -@@ -31,6 +31,8 @@ struct switching_method switching_method - switcheroo_on, switcheroo_off} - }; - -+struct switching_method *switcher = NULL; -+ - /** - * Enumerates through available switching methods and try a method - * ---- a/src/bbsecondary.c -+++ b/src/bbsecondary.c -@@ -37,6 +37,9 @@ - #include "pci.h" - #include "module.h" - -+/* PCI Bus ID of the discrete video card */ -+struct pci_bus_id *pci_bus_id_discrete; -+ - /** - * Substitutes DRIVER in the passed path - * @param x_conf_file A path to be processed diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd-r1 index 219f71010d84..0780fb902b48 100644 --- a/x11-misc/bumblebee/files/bumblebee.initd +++ b/x11-misc/bumblebee/files/bumblebee.initd-r1 @@ -1,9 +1,10 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 depend() { - need xdm vgl + need display-manager + want vgl } PIDFILE="${PIDFILE:-/var/run/bumblebee.pid}" diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml index 00460ee5c462..6499ab49525b 100644 --- a/x11-misc/bumblebee/metadata.xml +++ b/x11-misc/bumblebee/metadata.xml @@ -1,19 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>NP-Hardass@gentoo.org</email> - <name>NP-Hardass</name> - </maintainer> - <maintainer type="person"> <email>pacho@gentoo.org</email> <name>Pacho Ramos</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>rei4dan@gmail.com</email> <name>My Th</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild index 3cc8a83d4971..c0dfcca3fb9f 100644 --- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild +++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - +EAPI=7 inherit autotools DESCRIPTION="An analog clock displaying the system-time" @@ -12,19 +11,21 @@ SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="" -RDEPEND=">=dev-libs/glib-2.8 +RDEPEND=" + >=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 - >=x11-libs/pango-1.10" -DEPEND="${DEPEND} + >=x11-libs/pango-1.10 +" +DEPEND=" + ${RDEPEND} dev-util/intltool virtual/pkgconfig - sys-devel/gettext" - + sys-devel/gettext +" PATCHES=( "${FILESDIR}"/${P}-desktop.patch "${FILESDIR}"/${P}-linker.patch @@ -32,5 +33,12 @@ PATCHES=( src_prepare() { default + eautoreconf } + +src_install() { + default + + gzip -d "${ED}"/usr/share/man/man1/cairo-clock.1.gz || die +} diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild new file mode 100644 index 000000000000..d7bd5272ae0d --- /dev/null +++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="An analog clock displaying the system-time" +HOMEPAGE="https://launchpad.net/cairo-clock" +SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=dev-libs/glib-2.8 + >=gnome-base/libglade-2.6 + >=gnome-base/librsvg-2.14 + >=x11-libs/cairo-1.2 + >=x11-libs/gtk+-2.10:2 + >=x11-libs/pango-1.10 +" +DEPEND="${RDEPEND}" +# autoconf-archive for F_S patch +BDEPEND=" + dev-util/intltool + dev-build/autoconf-archive + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-desktop.patch + "${FILESDIR}"/${P}-linker.patch + "${FILESDIR}"/${P}-fortify-source.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + + gzip -d "${ED}"/usr/share/man/man1/cairo-clock.1.gz || die +} diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch new file mode 100644 index 000000000000..c10461b47f35 --- /dev/null +++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch @@ -0,0 +1,16 @@ +Don't clobber our toolchain defaults. + +https://bugs.gentoo.org/898240 +--- a/configure.ac ++++ b/configure.ac +@@ -96,7 +96,9 @@ CLOCK_DEFINES='-DDATA_DIR="\"$(datadir)\"" -DPKGDATA_DIR="\"$(pkgdatadir)\""' + AC_SUBST([CLOCK_DEFINES]) + + dnl CFLAGS +-CFLAGS="$CFLAGS -Wall -pedantic -std=c99 -fno-strict-aliasing -fmessage-length=0 -D_FORTIFY_SOURCE=2" ++CFLAGS="$CFLAGS -Wall -pedantic -std=c99 -fno-strict-aliasing -fmessage-length=0" ++ ++AX_ADD_FORTIFY_SOURCE + + AC_CONFIG_FILES([ + Makefile diff --git a/x11-misc/cairo-clock/metadata.xml b/x11-misc/cairo-clock/metadata.xml index 006499a6c366..6b8499f453d3 100644 --- a/x11-misc/cairo-clock/metadata.xml +++ b/x11-misc/cairo-clock/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest index a3ee03c97a67..fbb85b775724 100644 --- a/x11-misc/cbatticon/Manifest +++ b/x11-misc/cbatticon/Manifest @@ -1,3 +1 @@ -DIST cbatticon-1.6.10.tar.gz 32402 BLAKE2B 91ba6eb581b4cd0b31ae5a49b12970fc7d02d1ba790bffc80886c05ad2b0573ee1aca479d90591498dd6d816bb7e24bee6918e5a8fa8823cf376a3a3da598993 SHA512 cf499eb7ac1d775918a7af01700a9e8eeefd9e31a44fd63c9f38bff83945cea9fb21dde960052768f8d0a0c004caeea115f2d80cb3838789859d43e432eae055 -DIST cbatticon-1.6.5.tar.gz 27951 BLAKE2B 41d43bd7bfd5741e37365bed1541c88e255998a4ba69143f80a9c59ac4f51c280b7d07f3f9aba95063a8c3779c9637f7b4e27b771fade0e6092215b529813bd7 SHA512 5e1648cf3b31fe42aefd0a5e79c4e5dc22c3ce4b6f594f0933229494ca6f2e28e44a7e078ef839de1df0b8c1ba494fce8a58866ad70d056799320f4dea32713b -DIST cbatticon-1.6.9.tar.gz 32257 BLAKE2B de10cae916ddd80638e2f2ea4c64038d5141524c102abce0dcf090517eadd8e375a383d438778e06b9881e617d28cfb999476f75e37ce1ed2a04a811abf5ac4e SHA512 bbaef2b24eddc52e3ad63033e063620960aa791f6bcb06cd1b981ca2a4f38450ee2c2177426b171ece2b5fff0db8f360bd9ca9ef1a3351ec9ad1f5ea34f925f4 +DIST cbatticon-1.6.13.tar.gz 35330 BLAKE2B b4079be2158d1f776a0af086b2bf03b22d43b28ae4b92564af715d05def4b59bddce39b6ad235789114214256609b60b6708571b80be215197cb33610fc43ce7 SHA512 5f232dd96501e71c80fbdd1d722a8cedcdb12204655965b65e551aa8ab2bb10b8227c110aa5cc13070b03ad97e46ce907b9086cf808f7e79374f245f58b43a59 diff --git a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild b/x11-misc/cbatticon/cbatticon-1.6.10.ebuild deleted file mode 100644 index c50d042f8226..000000000000 --- a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -DESCRIPTION="A lightweight and fast battery icon that sits in your system tray" -HOMEPAGE="https://github.com/ColinJones/cbatticon" -SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libnotify" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:3 - libnotify? ( x11-libs/libnotify ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - default - - strip-linguas -i . -} - -src_compile() { - tc-export CC - emake \ - $(usex libnotify WITH_NOTIFY=1 WITH_NOTIFY=0) \ - V=1 \ - VERSION="${PF}" \ - WITH_GTK3=1 -} - -src_install() { - emake \ - DESTDIR="${D}" \ - DOCDIR="/usr/share/doc/${PF}" \ - LANGUAGES="${LINGUAS}" \ - V=1 VERSION="${PF}" \ - install - - dodoc Changelog -} diff --git a/x11-misc/cbatticon/cbatticon-1.6.9.ebuild b/x11-misc/cbatticon/cbatticon-1.6.13.ebuild index c50d042f8226..a39ecac5a485 100644 --- a/x11-misc/cbatticon/cbatticon-1.6.9.ebuild +++ b/x11-misc/cbatticon/cbatticon-1.6.13.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils toolchain-funcs +EAPI=8 + +inherit strip-linguas toolchain-funcs DESCRIPTION="A lightweight and fast battery icon that sits in your system tray" -HOMEPAGE="https://github.com/ColinJones/cbatticon" -SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/valr/cbatticon" +SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~riscv ~x86" IUSE="libnotify" -RDEPEND=" - dev-libs/glib:2 +RDEPEND="dev-libs/glib:2 x11-libs/gtk+:3 - libnotify? ( x11-libs/libnotify ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" + libnotify? ( x11-libs/libnotify )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( Changelog README ) src_prepare() { default @@ -46,5 +45,5 @@ src_install() { V=1 VERSION="${PF}" \ install - dodoc Changelog + einstalldocs } diff --git a/x11-misc/cbatticon/cbatticon-1.6.5.ebuild b/x11-misc/cbatticon/cbatticon-1.6.5.ebuild deleted file mode 100644 index cad0887551f5..000000000000 --- a/x11-misc/cbatticon/cbatticon-1.6.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -DESCRIPTION="A lightweight and fast battery icon that sits in your system tray" -HOMEPAGE="https://github.com/ColinJones/cbatticon" -SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="libnotify" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:3 - libnotify? ( x11-libs/libnotify ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - default - - strip-linguas -i . -} - -src_compile() { - tc-export CC - emake \ - $(usex libnotify WITH_NOTIFY=1 WITH_NOTIFY=0) \ - V=1 \ - VERSION="${PF}" \ - WITH_GTK3=1 -} - -src_install() { - emake \ - DESTDIR="${D}" \ - LANGUAGES="${LINGUAS}" \ - V=1 VERSION="${PF}" \ - install - - dodoc Changelog -} diff --git a/x11-misc/cbatticon/metadata.xml b/x11-misc/cbatticon/metadata.xml index 4f6f198a59ab..1e9f0b13d12e 100644 --- a/x11-misc/cbatticon/metadata.xml +++ b/x11-misc/cbatticon/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> </maintainer> <upstream> - <remote-id type="github">ColinJones/cbatticon</remote-id> + <remote-id type="github">valr/cbatticon</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/cdm/Manifest b/x11-misc/cdm/Manifest index 9c602834109d..027ce2546c69 100644 --- a/x11-misc/cdm/Manifest +++ b/x11-misc/cdm/Manifest @@ -1,2 +1 @@ -DIST cdm-0.6.1_pre20180107.tar.gz 16541 BLAKE2B 19b7a8f6ef7541333b96bb3c2d6a9d3b7ce3bffdcf6653a3799d963d3b3bab3fe3553469a9cbf0f493109ad5308c739b25ce9e5801d0904f5d7b6e78b680e2fc SHA512 dc5587debb304636be25afdf60e8328b1eb9b961694813b089df504567f63cfeac6de17df715d589cec597f51044b8c121242ebefbe5bfeccf6aa072b1c03a40 DIST cdm-0.7.tar.gz 16154 BLAKE2B ca240e253ad4ed6b5e634069b98c90c00852fc6d6550ca1f72b3399435264055cfca31f88f6061daa3e2e3445bd1a8ad9f950b44968df4c77d6c8150b2782a34 SHA512 51591b953ec83c06a5a4407c6d6083ac11e7095c7fb22e491ed3d6626217462529d3dd3590c2a256273b3668c7246b13bfd1f2f682f5bd860ca8a34aaca0b6f5 diff --git a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild b/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild deleted file mode 100644 index 9702b5d25cc7..000000000000 --- a/x11-misc/cdm/cdm-0.6.1_pre20180107.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit pam eutils - -DESCRIPTION="The Console Display Manager" -HOMEPAGE="https://github.com/evertiro/cdm" -SRC_URI="https://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="pam consolekit" -REQUIRED_USE="consolekit? ( pam )" - -DEPEND="" -RDEPEND="${DEPEND} - dev-util/dialog - x11-apps/xdpyinfo - x11-apps/xinit - consolekit? ( sys-auth/consolekit - sys-apps/dbus ) - pam? ( sys-libs/pam )" - -src_prepare() { - default - if ! use consolekit; then - sed -e 's@consolekit=yes@consolekit=no@' \ - -i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc" - fi -} - -src_install() { - if use pam ; then - pamd_mimic system-local-login cdm auth account session - fi - - insinto /usr/bin/ - insopts -m0755 - dobin src/${PN} src/${PN}-xlaunch - - insinto /etc - insopts -Dm644 - doins src/cdmrc - - insinto /etc/profile.d/ - insopts -Dm755 - newins src/profile.sh zzz-${PN}.sh - - # Install themes - insinto /usr/share/${PN}/themes - doins themes/* - # Copy documentation manually - dodoc ChangeLog-0.6 ChangeLog-before-0.6 README.md -} - -pkg_postinst() { - ewarn "In order to use CDM you must first edit your /etc/cdmrc" - ewarn "At least the binlist, namelist and flaglist entries should be added or edited" - ewarn "to specify the X window managers and console shells that you want before" - ewarn "you start CDM. Something like:" - ewarn "binlist=('xmonad' 'startkde' '/bin/zsh --login' '/bin/bash --login')" - ewarn "namelist=('XMonad' 'KDE' 'Console Zsh' 'Console Bash')" - ewarn "flaglist=(X X C C)" - ewarn "Ensure the flaglist X entries correspond to the X-Windows programs, and the" - ewarn "C entries correspond to console shells. Then just login with your username." - ewarn "Remove xdm from default runlevel." -} diff --git a/x11-misc/cdm/cdm-0.7.ebuild b/x11-misc/cdm/cdm-0.7.ebuild index ec83965c22fc..a11947101909 100644 --- a/x11-misc/cdm/cdm-0.7.ebuild +++ b/x11-misc/cdm/cdm-0.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit pam eutils +inherit pam DESCRIPTION="The Console Display Manager" HOMEPAGE="https://github.com/evertiro/cdm" @@ -12,24 +12,19 @@ SRC_URI="https://github.com/evertiro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="pam consolekit" -REQUIRED_USE="consolekit? ( pam )" +IUSE="pam" DEPEND="" RDEPEND="${DEPEND} dev-util/dialog x11-apps/xdpyinfo x11-apps/xinit - consolekit? ( sys-auth/consolekit - sys-apps/dbus ) pam? ( sys-libs/pam )" src_prepare() { default - if ! use consolekit; then - sed -e 's@consolekit=yes@consolekit=no@' \ + sed -e 's@consolekit=yes@consolekit=no@' \ -i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc" - fi } src_install() { diff --git a/x11-misc/cdm/metadata.xml b/x11-misc/cdm/metadata.xml index 76e6b001343e..bda2ea2392c5 100644 --- a/x11-misc/cdm/metadata.xml +++ b/x11-misc/cdm/metadata.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>gienah@gentoo.org</email> - <name>Mark Wright</name> -</maintainer> -<longdescription lang="en"> -CDM is a minimalistic, yet full-featured replacement for -login-managers like slim, kdm, gdm and qingy that provides a fast, -dialog-based login system without the overhead of the X Window System -or the instability of qingy. Written in pure bash, CDM has no other -dependencies, yet supports multiple users/sessions and can start -virtually any DE/WM. -</longdescription> -<use> - <flag name="consolekit">Enable native consolekit support</flag> -</use> + <!-- maintainer-needed --> + <longdescription lang="en"> + CDM is a minimalistic, yet full-featured replacement for + login-managers like slim, kdm, gdm and qingy that provides a fast, + dialog-based login system without the overhead of the X Window System + or the instability of qingy. Written in pure bash, CDM has no other + dependencies, yet supports multiple users/sessions and can start + virtually any DE/WM. + </longdescription> + <upstream> + <remote-id type="github">evertiro/cdm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/chgres/chgres-0.1-r2.ebuild b/x11-misc/chgres/chgres-0.1-r3.ebuild index af5228d50ea5..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-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,20 +12,23 @@ 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" +BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${P}-{flags,includes}.patch ) +PATCHES=( + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-includes.patch +) -src_prepare() { - default - tc-export CC +src_configure() { + tc-export CC PKG_CONFIG } src_install() { diff --git a/x11-misc/chgres/files/chgres-0.1-flags.patch b/x11-misc/chgres/files/chgres-0.1-flags.patch index 4045175dde09..74c37d7f101b 100644 --- a/x11-misc/chgres/files/chgres-0.1-flags.patch +++ b/x11-misc/chgres/files/chgres-0.1-flags.patch @@ -1,10 +1,10 @@ ---- a/Makefile 2001-04-18 23:07:56.000000000 +0200 -+++ b/Makefile 2010-09-17 03:08:55.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -1,9 +1,9 @@ -CFLAGS= -LDFLAGS= -L/usr/X11R6/lib -lXext -lX11 -lXxf86vm -lXxf86dga -+LIBS= $(shell pkg-config --libs xext x11 xxf86vm xxf86dga) -+INCLUDES= $(shell pkg-config --cflags xext x11 xxf86vm xxf86dga) ++LIBS= $(shell ${PKG_CONFIG} --libs xext x11 xxf86vm xxf86dga) ++INCLUDES= $(shell ${PKG_CONFIG} --cflags xext x11 xxf86vm xxf86dga) prefix=/usr chgres: chgres.o diff --git a/x11-misc/chgres/metadata.xml b/x11-misc/chgres/metadata.xml index 886d6c898ab5..beb3a7b877c2 100644 --- a/x11-misc/chgres/metadata.xml +++ b/x11-misc/chgres/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/clipmenu/Manifest b/x11-misc/clipmenu/Manifest new file mode 100644 index 000000000000..33b63f3f6407 --- /dev/null +++ b/x11-misc/clipmenu/Manifest @@ -0,0 +1 @@ +DIST clipmenu-6.2.0.tar.gz 9019 BLAKE2B 2dddd900483656a38b2335f994a46302af797b0f47509b0bd2c1a302e1c27729cd80091a4c8bfd587844f7ee8c271742aea668910553d9a4c54595d18e4f1ec7 SHA512 adfd649a120264552e2c05314ae2ad039055308f77d620dbb3fc206e4244a6f1f2e5ed4a7e86fd547a78692aebaec1761528e10408d838f80def99959ef58295 diff --git a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild new file mode 100644 index 000000000000..a3194cfe7320 --- /dev/null +++ b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +DESCRIPTION="Clipboard management" +HOMEPAGE="https://github.com/cdown/clipmenu" +SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+dmenu fzf rofi" +REQUIRED_USE="?? ( dmenu fzf rofi )" + +RDEPEND=" + x11-misc/clipnotify + x11-misc/xsel + dmenu? ( x11-misc/dmenu ) + fzf? ( app-shells/fzf ) + rofi? ( x11-misc/rofi ) +" + +src_prepare() { + default + + if use rofi ; then + sed -i 's|CM_LAUNCHER=dmenu|CM_LAUNCHER=rofi|' clipmenu || die "sed failed" + elif use fzf ; then + sed -i 's|CM_LAUNCHER=dmenu|CM_LAUNCHER=fzf|' clipmenu || die "sed failed" + fi +} + +src_compile() { + : +} + +src_install() { + local binfile + for binfile in clipctl clipdel clipfsck clipmenu clipmenud; do + dobin ${binfile} + done + + dodoc README.md + + systemd_douserunit "init/clipmenud.service" +} + +pkg_postinst() { + if ! use dmenu && ! use fzf && ! use rofi ; then + ewarn "Clipmenu has been installed without a launcher." + ewarn "You will need to set \$CM_LAUNCHER to a dmenu-compatible app for clipmenu to work." + ewarn "Please refer to the documents for more info." + fi +} diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml new file mode 100644 index 000000000000..ad77c07f77a8 --- /dev/null +++ b/x11-misc/clipmenu/metadata.xml @@ -0,0 +1,17 @@ +<?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> + <use> + <flag name="dmenu">Use dmenu as default launcher</flag> + <flag name="rofi">Use rofi as default launcher</flag> + <flag name="fzf">Use fzf as default launcher</flag> + </use> +</pkgmetadata> diff --git a/x11-misc/clipnotify/Manifest b/x11-misc/clipnotify/Manifest new file mode 100644 index 000000000000..222a5982b580 --- /dev/null +++ b/x11-misc/clipnotify/Manifest @@ -0,0 +1 @@ +DIST clipnotify-1.0.2.tar.gz 1318 BLAKE2B a418a1a25f43c033fd6457eabe926b0ebf911b233f9dd1cf6ff7a8399ab2660083bec969aef1f44edd583ee2cd1d097b71e7014b620efcdcb8c544a63612a17b SHA512 52277099d9543e0f550de63ff2e15e3e7ba63ea38f3928006e2b570bb1bcdd3f2f09892bd4efecc1f36fb5131e0567c28c2b0597123c90b9f78ab6fbd02dfc49 diff --git a/x11-misc/clipnotify/clipnotify-1.0.2.ebuild b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild new file mode 100644 index 000000000000..51099e860d15 --- /dev/null +++ b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Notify on new X clipboard events" +HOMEPAGE="https://github.com/cdown/clipnotify" +SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND=" + x11-libs/libX11 + x11-libs/libXfixes +" +RDEPEND="${DEPEND}" + +src_compile() { + # Running into parallel jobs issues with -j16 on v1.0.2. There's only one .c file + # to compile. Go figure... + emake -j1 +} + +src_install() { + dobin clipnotify +} diff --git a/x11-misc/clipnotify/metadata.xml b/x11-misc/clipnotify/metadata.xml new file mode 100644 index 000000000000..a057b342f48a --- /dev/null +++ b/x11-misc/clipnotify/metadata.xml @@ -0,0 +1,12 @@ +<?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> +</pkgmetadata> diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest index 44de5bad81b0..d4d19bcb59ed 100644 --- a/x11-misc/colord/Manifest +++ b/x11-misc/colord/Manifest @@ -1 +1 @@ -DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f +DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild deleted file mode 100644 index b6b210a9e649..000000000000 --- a/x11-misc/colord/colord-1.3.5.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit autotools bash-completion-r1 check-reqs gnome2 user systemd udev vala multilib-minimal - -DESCRIPTION="System service to accurately color manage input and output devices" -HOMEPAGE="https://www.freedesktop.org/software/colord/" -SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/2" # subslot = libcolord soname version -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" - -# We prefer policykit enabled by default, bug #448058 -IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala" -REQUIRED_USE=" - gusb? ( udev ) - scanner? ( udev ) - vala? ( introspection ) -" - -COMMON_DEPEND=" - dev-db/sqlite:3=[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}] - >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] - argyllcms? ( media-gfx/argyllcms ) - gusb? ( >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) - policykit? ( >=sys-auth/polkit-0.104 ) - scanner? ( - media-gfx/sane-backends - sys-apps/dbus ) - systemd? ( >=sys-apps/systemd-44:0= ) - udev? ( - dev-libs/libgudev:=[${MULTILIB_USEDEP}] - virtual/udev - virtual/libudev:=[${MULTILIB_USEDEP}] - ) -" -RDEPEND="${COMMON_DEPEND} - !media-gfx/shared-color-profiles - !<=media-gfx/colorhug-client-0.1.13 -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - extra-print-profiles? ( media-gfx/argyllcms ) - vala? ( $(vala_depend) ) -" - -# FIXME: needs pre-installed dbus service files -RESTRICT="test" - -# According to upstream comment in colord.spec.in, building the extra print -# profiles requires >=4G of memory -CHECKREQS_MEMORY="4G" - -pkg_pretend() { - use extra-print-profiles && check-reqs_pkg_pretend -} - -pkg_setup() { - use extra-print-profiles && check-reqs_pkg_setup - enewgroup colord - enewuser colord -1 -1 /var/lib/colord colord -} - -src_prepare() { - # Adapt to Gentoo paths - sed -i -e 's/spotread/argyll-spotread/' \ - src/sensors/cd-sensor-argyll.c \ - configure.ac || die - - eautoreconf - use vala && vala_src_prepare - gnome2_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - # Reverse tools require gusb - # bash-completion test does not work on gentoo - local myconf=( - --disable-bash-completion - --disable-examples - --disable-static - --enable-libcolordcompat - --with-daemon-user=colord - --localstatedir="${EPREFIX}"/var - $(multilib_native_use_enable argyllcms argyllcms-sensor) - $(multilib_native_use_enable extra-print-profiles print-profiles) - $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") - $(use_enable gusb) - $(multilib_native_use_enable gusb reverse) - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_enable scanner sane) - $(multilib_native_use_enable systemd systemd-login) - $(use_enable udev) - --with-udevrulesdir="$(get_udevdir)"/rules.d - $(multilib_native_use_enable vala) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - ECONF_SOURCE=${S} \ - gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - gnome2_src_compile - else - emake -C lib/colord - use gusb && emake -C lib/colorhug - emake -C lib/compat - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - default - else - emake -C lib/colord check - use gusb && emake -C lib/colorhug check - emake -C lib/compat check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - gnome2_src_install - else - gnome2_src_install -j1 -C lib/colord - use gusb && gnome2_src_install -j1 -C lib/colorhug - gnome2_src_install -j1 -C lib/compat - gnome2_src_install -j1 -C contrib/session-helper install-libcolord_includeHEADERS - fi -} - -multilib_src_install_all() { - einstalldocs - - newbashcomp data/colormgr colormgr - - # Ensure config and profile directories exist and /var/lib/colord/* - # is writable by colord user - keepdir /var/lib/color{,d}/icc - fowners colord:colord /var/lib/colord{,/icc} - - if use examples; then - docinto examples - dodoc examples/*.c - fi -} diff --git a/x11-misc/colord/colord-1.4.7-r1.ebuild b/x11-misc/colord/colord-1.4.7-r1.ebuild new file mode 100644 index 000000000000..ed40a24f368b --- /dev/null +++ b/x11-misc/colord/colord-1.4.7-r1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +VALA_USE_DEPEND="vapigen" + +inherit bash-completion-r1 meson-multilib tmpfiles udev vala + +DESCRIPTION="System service to accurately color manage input and output devices" +HOMEPAGE="https://www.freedesktop.org/software/colord/" +SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/2" # subslot = libcolord soname version +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" + +IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner selinux systemd test vala" +RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp +REQUIRED_USE="vala? ( introspection )" + +DEPEND=" + >=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] + dev-db/sqlite:3=[${MULTILIB_USEDEP}] + >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] + + dev-libs/libgudev:=[${MULTILIB_USEDEP}] + virtual/libudev:=[${MULTILIB_USEDEP}] + virtual/udev + + systemd? ( >=sys-apps/systemd-44:0= ) + scanner? ( + media-gfx/sane-backends + sys-apps/dbus + ) + >=sys-auth/polkit-0.114 + argyllcms? ( media-gfx/argyllcms ) + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) +" +RDEPEND="${DEPEND} + acct-group/colord + acct-user/colord + selinux? ( sec-policy/selinux-colord ) +" +BDEPEND=" + acct-group/colord + acct-user/colord + app-text/docbook-xsl-ns-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.17 + virtual/pkgconfig + extra-print-profiles? ( media-gfx/argyllcms ) + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 + ) + vala? ( $(vala_depend) ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.7-systemd-permissions.patch +) + +pkg_setup() { + use vala && vala_setup +} + +src_prepare() { + default + + # Test requires a running session + # https://github.com/hughsie/colord/issues/94 + sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die + + # Adapt to Gentoo paths + sed -i \ + -e "s|find_program('spotread'|find_program('argyll-spotread'|" \ + -e "s|find_program('colprof'|find_program('argyll-colprof'|" \ + meson.build || die + + # meson gnome.generate_vapi properly handles VAPIGEN and other vala + # environment variables. It is counter-productive to check for an + # unversioned vapigen, as that breaks versioned VAPIGEN usages. + sed -i -e "/find_program('vapigen')/d" meson.build || die +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_true daemon) + -Dbash_completion=false + $(meson_native_true udev_rules) # Install udev rules only from native build + $(meson_native_use_bool systemd) + -Dlibcolordcompat=true + $(meson_native_use_bool argyllcms argyllcms_sensor) + $(meson_native_use_bool scanner sane) + $(meson_native_use_bool introspection) + $(meson_native_use_bool vala vapi) + $(meson_native_use_bool extra-print-profiles print_profiles) + $(meson_use test tests) + -Dinstalled_tests=false + -Ddaemon_user=colord + $(meson_native_true man) + $(meson_use gtk-doc docs) + --localstatedir="${EPREFIX}"/var + ) + meson_src_configure +} + +multilib_src_install_all() { + newbashcomp data/colormgr colormgr + + # Ensure config and profile directories exist and /var/lib/colord/* + # is writable by colord user + keepdir /var/lib/color{,d}/icc + fowners colord:colord /var/lib/colord{,/icc} + + if use examples; then + docinto examples + dodoc examples/*.c + fi +} + +pkg_postinst() { + udev_reload + tmpfiles_process colord.conf +} + +pkg_postrm() { + udev_reload +} diff --git a/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch b/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch new file mode 100644 index 000000000000..0a97d8ac579d --- /dev/null +++ b/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch @@ -0,0 +1,51 @@ +https://github.com/hughsie/colord/commit/08a32b2379fb5582f4312e59bf51a2823df56276 +https://github.com/hughsie/colord/commit/9283abd9c00468edb94d2a06d6fa3681cae2700d + +From 08a32b2379fb5582f4312e59bf51a2823df56276 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Mon, 29 Jan 2024 10:37:11 +0000 +Subject: [PATCH] Fix writing to the database with ProtectSystem=strict + +Fixes https://github.com/hughsie/colord/issues/166 +--- a/data/colord.service.in ++++ b/data/colord.service.in +@@ -17,6 +17,10 @@ ProtectControlGroups=true + RestrictRealtime=true + RestrictAddressFamilies=AF_UNIX + ++ConfigurationDirectory=colord ++StateDirectory=colord ++CacheDirectory=colord ++ + # drop all capabilities + CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER CAP_NET_ADMIN CAP_SYS_RAWIO CAP_SYS_TIME CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE CAP_KILL CAP_MKNOD CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RESOURCE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_BOOT CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CAP_SYS_CHROOT CAP_BLOCK_SUSPEND CAP_LEASE CAP_SYS_PACCT CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM + + +From 9283abd9c00468edb94d2a06d6fa3681cae2700d Mon Sep 17 00:00:00 2001 +From: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at> +Date: Tue, 30 Jan 2024 12:44:18 +0100 +Subject: [PATCH] Fix USB scanners not working with RestrictAddressFamilies + +colord-sane scanner drivers using libusb can't initialize properly with +RestrictAddressFamilies set to AF_UNIX. Remove that line to ensure those +can work properly. + +This also avoids a crash in HPLIP due to unchecked calls to libusb_init(). + +Fixes #165 +--- + data/colord.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/data/colord.service.in b/data/colord.service.in +index c358dc4b..45ec5811 100644 +--- a/data/colord.service.in ++++ b/data/colord.service.in +@@ -15,7 +15,6 @@ ProtectKernelModules=true + ProtectKernelLogs=true + ProtectControlGroups=true + RestrictRealtime=true +-RestrictAddressFamilies=AF_UNIX + + ConfigurationDirectory=colord + StateDirectory=colord diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml index 2ca10f47e351..3e7d77091c27 100644 --- a/x11-misc/colord/metadata.xml +++ b/x11-misc/colord/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>gnome@gentoo.org</email> @@ -9,7 +9,8 @@ <flag name="argyllcms">Enable ArgyllCMS sensor</flag> <flag name="extra-print-profiles">Generate extra print profiles. Warning: significant build time and memory requirements.</flag> - <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for - colorimeter drivers</flag> </use> + <upstream> + <remote-id type="github">hughsie/colord</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest new file mode 100644 index 000000000000..cbcce5636e7c --- /dev/null +++ b/x11-misc/compose-tables/Manifest @@ -0,0 +1,2 @@ +DIST libX11-1.8.7.tar.xz 1859256 BLAKE2B 335d8af91c13aba11255c266c4687a7f66b021207a92485d723b4107601bbabb6a0e5535241a3bcff4ac9a99142730d2b3d2e2eaff86b507fee5b35a2590d792 SHA512 d53bfc18f38d339a6a695b09835b2ae96b323881678bfe7ddca697605e3bdf4102ff49cc3078880a6c55b5977fcdd0aadaf5429086132de3a5bda302f79a2fa6 +DIST libX11-1.8.9.tar.xz 1811900 BLAKE2B 8858157ac490d65e19500bfbb2ab773a3a30041f8a757ff22fff8fb0124044b8bb826f6dff4115230c757a175b61a3f7d596d976d98be760085749878d64f871 SHA512 737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96 diff --git a/x11-misc/compose-tables/compose-tables-1.8.7.ebuild b/x11-misc/compose-tables/compose-tables-1.8.7.ebuild new file mode 100644 index 000000000000..f8356e0b46b9 --- /dev/null +++ b/x11-misc/compose-tables/compose-tables-1.8.7.ebuild @@ -0,0 +1,43 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=no +XORG_TARBALL_SUFFIX=xz +inherit xorg-3 + +# Note: please bump this with x11-libs/libX11 +DESCRIPTION="X.Org Compose Key tables from libX11" +# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package +SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}" +S="${WORKDIR}/libX11-${PV}/" + +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# Only needed by configure +DEPEND=" + x11-base/xorg-proto + >=x11-libs/libxcb-1.11.1 + x11-libs/xtrans" +RDEPEND="" + +XORG_CONFIGURE_OPTIONS=( + --without-xmlto + --without-fop + --disable-specs + --disable-xkb + --with-keysymdefdir="${ESYSROOT}/usr/include/X11" +) + +src_compile() { + emake -C nls +} + +src_test() { + :; +} + +src_install() { + emake DESTDIR="${D}" -C nls install +} diff --git a/x11-misc/compose-tables/compose-tables-1.8.9.ebuild b/x11-misc/compose-tables/compose-tables-1.8.9.ebuild new file mode 100644 index 000000000000..fa28a7e28842 --- /dev/null +++ b/x11-misc/compose-tables/compose-tables-1.8.9.ebuild @@ -0,0 +1,46 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=no +XORG_TARBALL_SUFFIX=xz +inherit xorg-3 + +# Note: please bump this with x11-libs/libX11 +DESCRIPTION="X.Org Compose Key tables from libX11" +# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package +SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}" +S="${WORKDIR}/libX11-${PV}/" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# Only needed by configure +DEPEND=" + x11-base/xorg-proto + >=x11-libs/libxcb-1.11.1 + x11-libs/xtrans" +# RDEPEND="" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --without-xmlto + --without-fop + --disable-specs + --disable-xkb + --with-keysymdefdir="${ESYSROOT}/usr/include/X11" + ) + xorg-3_src_configure +} + +src_compile() { + emake -C nls +} + +src_test() { + :; +} + +src_install() { + emake DESTDIR="${D}" -C nls install +} diff --git a/x11-misc/compose-tables/metadata.xml b/x11-misc/compose-tables/metadata.xml new file mode 100644 index 000000000000..2e0798c98274 --- /dev/null +++ b/x11-misc/compose-tables/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id> + <remote-id type="freedesktop-gitlab">xorg/lib/libX11</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest deleted file mode 100644 index 100489929189..000000000000 --- a/x11-misc/compton/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535 diff --git a/x11-misc/compton/compton-0.1_beta2-r1.ebuild b/x11-misc/compton/compton-0.1_beta2-r1.ebuild deleted file mode 100644 index 1b4cdd3e8453..000000000000 --- a/x11-misc/compton/compton-0.1_beta2-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7,8,9} ) -inherit toolchain-funcs python-r1 - -DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana" -HOMEPAGE="https://github.com/chjj/compton" -SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="dbus +drm opengl +pcre xinerama" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/libconfig:= - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXrender - dbus? ( sys-apps/dbus ) - opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre:3 ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - x11-apps/xprop - x11-apps/xwininfo" -DEPEND="${COMMON_DEPEND} - app-text/asciidoc - virtual/pkgconfig - x11-base/xorg-proto - drm? ( x11-libs/libdrm )" - -nobuildit() { use $1 || echo yes ; } - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - tc-export CC - fi -} - -src_compile() { - emake docs - - NO_DBUS=$(nobuildit dbus) \ - NO_XINERAMA=$(nobuildit xinerama) \ - NO_VSYNC_DRM=$(nobuildit drm) \ - NO_VSYNC_OPENGL=$(nobuildit opengl) \ - NO_REGEX_PCRE=$(nobuildit pcre) \ - emake compton -} - -src_install() { - NO_DBUS=$(nobuildit dbus) \ - NO_VSYNC_DRM=$(nobuildit drm) \ - NO_VSYNC_OPENGL=$(nobuildit opengl) \ - NO_REGEX_PCRE=$(nobuildit pcre) \ - default - docinto examples - dodoc compton.sample.conf dbus-examples/* - python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen -} diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild deleted file mode 100644 index feff59e96fab..000000000000 --- a/x11-misc/compton/compton-0.1_beta2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -inherit toolchain-funcs python-r1 - -DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana" -HOMEPAGE="https://github.com/chjj/compton" -SRC_URI="https://github.com/chjj/compton/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="dbus +drm opengl +pcre xinerama" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/libconfig:= - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXrender - dbus? ( sys-apps/dbus ) - opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre:3 ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${COMMON_DEPEND} - x11-apps/xprop - x11-apps/xwininfo" -DEPEND="${COMMON_DEPEND} - app-text/asciidoc - virtual/pkgconfig - x11-base/xorg-proto - drm? ( x11-libs/libdrm )" - -nobuildit() { use $1 || echo yes ; } - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - tc-export CC - fi -} - -src_compile() { - emake docs - - NO_DBUS=$(nobuildit dbus) \ - NO_XINERAMA=$(nobuildit xinerama) \ - NO_VSYNC_DRM=$(nobuildit drm) \ - NO_VSYNC_OPENGL=$(nobuildit opengl) \ - NO_REGEX_PCRE=$(nobuildit pcre) \ - emake compton -} - -src_install() { - NO_DBUS=$(nobuildit dbus) \ - NO_VSYNC_DRM=$(nobuildit drm) \ - NO_VSYNC_OPENGL=$(nobuildit opengl) \ - NO_REGEX_PCRE=$(nobuildit pcre) \ - default - docinto examples - dodoc compton.sample.conf dbus-examples/* - python_foreach_impl python_newscript bin/compton-convgen.py compton-convgen -} diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml deleted file mode 100644 index c269c6f6ad71..000000000000 --- a/x11-misc/compton/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>johu@gentoo.org</email> - <name>Johannes Huber</name> - </maintainer> - <use> - <flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag> - <flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag> - </use> - <upstream> - <remote-id type="github">chjj/compton</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest new file mode 100644 index 000000000000..092518520b53 --- /dev/null +++ b/x11-misc/copyq/Manifest @@ -0,0 +1,2 @@ +DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4 +DIST copyq-7.1.0.tar.gz 3351093 BLAKE2B 758271f6bb54760372b8b5ab84de7c91af874bd72a22c8c22d338705869eab5500fde90808b4bf1288f8bdbad11163283637b81d85c09ccf0d734286dee605b6 SHA512 4320095ab75c361cc3d553c7817951eb6e74d47223f62bf6c1722e0f0b0d3ff59a1762354cf46fe0de064d516d60a467bff9ad9143b12016fc3f9e62139d3909 diff --git a/x11-misc/copyq/copyq-7.0.0.ebuild b/x11-misc/copyq/copyq-7.0.0.ebuild new file mode 100644 index 000000000000..d93363879bb5 --- /dev/null +++ b/x11-misc/copyq/copyq-7.0.0.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake edo optfeature virtualx xdg + +DESCRIPTION="Clipboard manager with advanced features" +HOMEPAGE="https://github.com/hluk/CopyQ" +SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CopyQ-${PV}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug kde qt6 test" +RESTRICT="test" + +RDEPEND=" + dev-libs/wayland + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXtst + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwayland:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + kde? ( kde-frameworks/knotifications:5 ) + test? ( dev-qt/qttest:5 ) + ) + qt6? ( + dev-qt/qtbase:6=[X,gui,network,widgets,xml(+)] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + dev-qt/qtwayland:6 + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + !qt6? ( + dev-qt/linguist-tools:5 + dev-qt/qtwaylandscanner:5 + ) + qt6? ( + dev-qt/qttools:6[linguist] + dev-qt/qtwayland:6 + dev-util/wayland-scanner + ) + test? ( + app-crypt/gnupg + x11-wm/icewm + ) +" + +src_configure() { + if use debug; then + # Add debug definitions + CMAKE_BUILD_TYPE="Debug" + fi + + local mycmakeargs=( + -DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" + -DWITH_NATIVE_NOTIFICATIONS=$(usex kde) + -DWITH_QT6=$(usex qt6) + -DWITH_TESTS=$(usex test) + ) + + cmake_src_configure +} + +my_src_test() { + local -x COPYQ_TESTS_RERUN_FAILED=0 + local -x COPYQ_TESTS_NO_NETWORK=1 + + ebegin "Starting IceWM" + icewm & + sleep 5 + eend 0 + + cd "${BUILD_DIR}" || die + mkdir -p "${HOME}"/.gnupg || die + + # ScriptError: Failed to send key presses + edo ./copyq tests +} + +src_test() { + virtx my_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "encryption support" app-crypt/gnupg +} diff --git a/x11-misc/copyq/copyq-7.1.0-r1.ebuild b/x11-misc/copyq/copyq-7.1.0-r1.ebuild new file mode 100644 index 000000000000..85ed9029ecee --- /dev/null +++ b/x11-misc/copyq/copyq-7.1.0-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake optfeature virtualx xdg + +DESCRIPTION="Clipboard manager with advanced features" +HOMEPAGE=" + https://hluk.github.io/CopyQ/ + https://github.com/hluk/CopyQ/ +" +SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CopyQ-${PV}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" + +IUSE="notification qt6 test" +# Native notifications are not supported with Qt 6 +# (Bumpers please check when this requirement is lifted). +# src/notifications.cmake +REQUIRED_USE="notification? ( !qt6 )" + +RDEPEND=" + dev-libs/wayland + x11-libs/libX11 + x11-libs/libXtst + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwayland:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + notification? ( kde-frameworks/knotifications:5 ) + test? ( dev-qt/qttest:5 ) + ) + qt6? ( + dev-qt/qtbase:6=[X,gui,network,widgets,xml(+)] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + dev-qt/qtwayland:6 + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + !qt6? ( + dev-qt/linguist-tools:5 + dev-qt/qtwaylandscanner:5 + ) + qt6? ( + dev-qt/qttools:6[linguist] + dev-util/wayland-scanner + ) + test? ( + app-crypt/gnupg + x11-wm/openbox + ) +" + +PATCHES=( + "${FILESDIR}/copyq-7.1.0-fix-qt-6.6.0-build.patch" + "${FILESDIR}/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch" + "${FILESDIR}/copyq-7.1.0-fix-gpg-2.1-support.patch" + "${FILESDIR}/copyq-7.1.0-support-plugin-dir-envvar-r1.patch" +) + +src_prepare() { + cmake_src_prepare + + # FAIL! : Tests::actionDialogAccept() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. + # FAIL! : Tests::actionDialogSelection() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. + # FAIL! : Tests::actionDialogSelectionInputOutput() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. + # FAIL! : Tests::commandShowAt() 'NO_ERRORS(m_test->waitOnOutput((Args() << "visible"), toByteArray("true\n")))' returned FALSE. + sed -Ei -e ' + /Tests::(actionDialog(Accept|Selection(|InputOutput))|commandShow)/,/}/ { + /^\s*\{/ a \ + #if QT_VERSION < QT_VERSION_CHECK(6,0,0)\ + SKIP("Broken on qt5");\ + #endif + }' src/tests/tests.cpp || die +} + +src_configure() { + local mycmakeargs=( + -DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" + -DWITH_NATIVE_NOTIFICATIONS=$(usex notification) + -DWITH_QT6=$(usex qt6) + -DWITH_TESTS=$(usex test) + ) + + cmake_src_configure +} + +my_src_test() { + # Don't rerun tests and more logs + local -x COPYQ_TESTS_RERUN_FAILED=0 + local -x COPYQ_LOG_LEVEL=DEBUG + + # Skip test that require network + local -x COPYQ_TESTS_NO_NETWORK=1 + + # Less noise from trying the wayland plugin + local -x QT_QPA_PLATFORM=xcb + + # Make sure copyq doesn't use system installed plugins which may be incompatible. + local -x COPYQ_PLUGIN_DIR="${BUILD_DIR}/plugins" + + # In case the users current system confuses the notification integration + unset KDE_FULL_SESSION XDG_CURRENT_DESKTOP + + mkdir "${HOME}"/.gnupg || die + + ebegin "Starting Openbox" + openbox & # upstream uses Openbox and it doesn't fail like IceWM + sleep 5 + eend 0 + + "${BUILD_DIR}"/copyq tests + + return $? +} + +src_test() { + virtx my_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "encryption support" app-crypt/gnupg +} diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch new file mode 100644 index 000000000000..b06e7e759b84 --- /dev/null +++ b/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch @@ -0,0 +1,558 @@ +https://github.com/hluk/CopyQ/pull/2471 +https://github.com/hluk/CopyQ/issues/2463 +https://github.com/hluk/CopyQ/commit/a7a891e1f84c6c046a7bfc904c5fc6ebb98dec94 + +From a7a891e1f84c6c046a7bfc904c5fc6ebb98dec94 Mon Sep 17 00:00:00 2001 +From: Lukas Holecek <hluk@email.cz> +Date: Wed, 20 Sep 2023 19:42:08 +0200 +Subject: [PATCH] itemencrypted: Fix managing keys with gpg 2.1 and above + (#2471) + +* itemencrypted: Fix managing keys with gpg 2.1 and above + +Fixes #2463, #1208 + +* Tests: Avoid skipping itemencrypted tests if gpg is not found + +* Windows: Fix running itemencrypted plugin tests + +* itemencrypted: Fix error logging + +* Ensure config directory exists + +* itemencrypted: Fix handling native/non-native key paths + +* Appveyor: Fix stuck job waiting on gpg-agent +--- a/plugins/itemencrypted/itemencrypted.cpp ++++ b/plugins/itemencrypted/itemencrypted.cpp +@@ -57,20 +57,23 @@ bool waitOrTerminate(QProcess *p, int timeoutMs) + bool verifyProcess(QProcess *p, int timeoutMs = 30000) + { + if ( !waitOrTerminate(p, timeoutMs) ) { +- log( "ItemEncrypt ERROR: Process timed out; stderr: " + p->readAllStandardError(), LogError ); ++ log( QStringLiteral("ItemEncrypt: Process timed out; stderr: %1") ++ .arg(QString::fromUtf8(p->readAllStandardError())), LogError ); + return false; + } + + const int exitCode = p->exitCode(); + if ( p->exitStatus() != QProcess::NormalExit ) { +- log( "ItemEncrypt ERROR: Failed to run GnuPG: " + p->errorString(), LogError ); ++ log( QStringLiteral("ItemEncrypt: Failed to run GnuPG: %1") ++ .arg(p->errorString()), LogError ); + return false; + } + + if (exitCode != 0) { + const QString errors = p->readAllStandardError(); + if ( !errors.isEmpty() ) +- log( "ItemEncrypt ERROR: GnuPG stderr:\n" + errors, LogError ); ++ log( QStringLiteral("ItemEncrypt: GnuPG stderr:\n%1") ++ .arg(errors), LogError ); + return false; + } + +@@ -88,55 +91,106 @@ QString getGpgVersionOutput(const QString &executable) { + return p.readAllStandardOutput(); + } + +-bool checkGpgExecutable(const QString &executable) ++struct GpgVersion { ++ int major; ++ int minor; ++}; ++ ++GpgVersion parseVersion(const QString &versionOutput) + { +- const auto versionOutput = getGpgVersionOutput(executable); +- return versionOutput.contains(" 2."); ++ const int lineEndIndex = versionOutput.indexOf('\n'); ++#if QT_VERSION < QT_VERSION_CHECK(5,15,2) ++ const QStringRef firstLine = versionOutput.midRef(0, lineEndIndex); ++#else ++ const auto firstLine = QStringView{versionOutput}.mid(0, lineEndIndex); ++#endif ++ const QRegularExpression versionRegex(QStringLiteral(R"( (\d+)\.(\d+))")); ++ const QRegularExpressionMatch match = versionRegex.match(firstLine); ++#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) ++ const int major = match.hasMatch() ? match.capturedView(1).toInt() : 0; ++ const int minor = match.hasMatch() ? match.capturedView(2).toInt() : 0; ++#else ++ const int major = match.hasMatch() ? match.capturedRef(1).toInt() : 0; ++ const int minor = match.hasMatch() ? match.capturedRef(2).toInt() : 0; ++#endif ++ return GpgVersion{major, minor}; + } + ++class GpgExecutable { ++public: ++ GpgExecutable() = default; ++ ++ explicit GpgExecutable(const QString &executable) ++ : m_executable(executable) ++ { ++ const auto versionOutput = getGpgVersionOutput(executable); ++ if ( !versionOutput.isEmpty() ) { ++ COPYQ_LOG_VERBOSE( ++ QStringLiteral("ItemEncrypt INFO: '%1 --version' output: %2") ++ .arg(executable, versionOutput) ); ++ ++ const GpgVersion version = parseVersion(versionOutput); ++ m_isSupported = version.major >= 2; ++ COPYQ_LOG( QStringLiteral("ItemEncrypt INFO: %1 gpg version: %2.%3") ++ .arg(m_isSupported ? "Supported" : "Unsupported") ++ .arg(version.major) ++ .arg(version.minor) ); ++ ++ const bool needsSecring = version.major == 2 && version.minor == 0; ++ ++ const QString path = getConfigurationFilePath(""); ++ m_pubring = path + ".pub"; ++ m_pubringNative = QDir::toNativeSeparators(m_pubring); ++ if (needsSecring) { ++ m_secring = path + ".sec"; ++ m_secringNative = QDir::toNativeSeparators(m_secring); ++ } ++ + #ifdef Q_OS_WIN +-bool checkUnixGpg(const QString &executable) +-{ +- static const auto unixGpg = getGpgVersionOutput(executable).contains("Home: /c/"); +- return unixGpg; +-} ++ const bool isUnixGpg = versionOutput.contains("Home: /c/"); ++ if (isUnixGpg) { ++ m_pubringNative = QString(m_pubring).replace(":", "").insert(0, '/'); ++ if (needsSecring) ++ m_secringNative = QString(m_secring).replace(":", "").insert(0, '/'); ++ } + #endif ++ } ++ } ++ ++ const QString &executable() const { return m_executable; } ++ bool isSupported() const { return m_isSupported; } ++ bool needsSecring() const { return !m_secring.isEmpty(); } ++ const QString &pubring() const { return m_pubring; } ++ const QString &secring() const { return m_secring; } ++ const QString &pubringNative() const { return m_pubringNative; } ++ const QString &secringNative() const { return m_secringNative; } ++ ++private: ++ QString m_executable; ++ QString m_pubring; ++ QString m_secring; ++ QString m_pubringNative; ++ QString m_secringNative; ++ bool m_isSupported = false; ++}; + +-QString findGpgExecutable() ++GpgExecutable findGpgExecutable() + { + for (const auto &executable : {"gpg2", "gpg"}) { +- if ( checkGpgExecutable(executable) ) +- return executable; ++ GpgExecutable gpg(executable); ++ if ( gpg.isSupported() ) ++ return gpg; + } + +- return QString(); ++ return GpgExecutable(); + } + +-const QString &gpgExecutable() ++const GpgExecutable &gpgExecutable() + { + static const auto gpg = findGpgExecutable(); + return gpg; + } + +-struct KeyPairPaths { +- KeyPairPaths() +- { +- const QString path = getConfigurationFilePath(""); +- sec = QDir::toNativeSeparators(path + ".sec"); +- pub = QDir::toNativeSeparators(path + ".pub"); +- +-#ifdef Q_OS_WIN +- if (checkUnixGpg(gpgExecutable())) { +- pub = QDir::fromNativeSeparators(pub).replace(":", "").insert(0, '/'); +- sec = QDir::fromNativeSeparators(sec).replace(":", "").insert(0, '/'); +- } +-#endif +- } +- +- QString sec; +- QString pub; +-}; +- + QStringList getDefaultEncryptCommandArguments(const QString &publicKeyPath) + { + return QStringList() << "--trust-model" << "always" << "--recipient" << "copyq" +@@ -146,16 +200,18 @@ QStringList getDefaultEncryptCommandArguments(const QString &publicKeyPath) + + void startGpgProcess(QProcess *p, const QStringList &args, QIODevice::OpenModeFlag mode) + { +- KeyPairPaths keys; +- p->start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) + args, mode); ++ const auto &gpg = gpgExecutable(); ++ p->start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) + args, mode); + } + + QString importGpgKey() + { +- KeyPairPaths keys; ++ const auto &gpg = gpgExecutable(); ++ if ( !gpg.needsSecring() ) ++ return QString(); + + QProcess p; +- p.start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) << "--import" << keys.sec); ++ p.start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) << "--import" << gpg.secringNative()); + if ( !verifyProcess(&p) ) + return "Failed to import private key (see log)."; + +@@ -164,18 +220,20 @@ QString importGpgKey() + + QString exportGpgKey() + { +- KeyPairPaths keys; ++ const auto &gpg = gpgExecutable(); ++ if ( !gpg.needsSecring() ) ++ return QString(); + + // Private key already created or exported. +- if ( QFile::exists(keys.sec) ) ++ if ( QFile::exists(gpg.secring()) ) + return QString(); + + QProcess p; +- p.start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) << "--export-secret-key" << "copyq"); ++ p.start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) << "--export-secret-key" << gpg.secringNative()); + if ( !verifyProcess(&p) ) + return "Failed to export private key (see log)."; + +- QFile secKey(keys.sec); ++ QFile secKey(gpg.secring()); + if ( !secKey.open(QIODevice::WriteOnly) ) + return "Failed to create private key."; + +@@ -240,7 +298,7 @@ bool encryptMimeData(const QVariantMap &data, const QModelIndex &index, QAbstrac + + void startGenerateKeysProcess(QProcess *process, bool useTransientPasswordlessKey = false) + { +- const KeyPairPaths keys; ++ const auto &gpg = gpgExecutable(); + + auto args = QStringList() << "--batch" << "--gen-key"; + +@@ -253,15 +311,19 @@ void startGenerateKeysProcess(QProcess *process, bool useTransientPasswordlessKe + } + + startGpgProcess(process, args, QIODevice::ReadWrite); +- process->write( "\nKey-Type: RSA" +- "\nKey-Usage: encrypt" +- "\nKey-Length: 4096" +- "\nName-Real: copyq" +- + transientOptions + +- "\n%secring " + keys.sec.toUtf8() + +- "\n%pubring " + keys.pub.toUtf8() + +- "\n%commit" +- "\n" ); ++ process->write( ++ "\nKey-Type: RSA" ++ "\nKey-Usage: encrypt" ++ "\nKey-Length: 4096" ++ "\nName-Real: copyq" ++ + transientOptions + ++ "\n%pubring " + gpg.pubringNative().toUtf8() ++ ); ++ ++ if ( gpg.needsSecring() ) ++ process->write("\n%secring " + gpg.secringNative().toUtf8()); ++ ++ process->write("\n%commit\n"); + process->closeWriteChannel(); + } + +@@ -276,7 +338,7 @@ QString exportImportGpgKeys() + + bool isGpgInstalled() + { +- return !gpgExecutable().isEmpty(); ++ return gpgExecutable().isSupported(); + } + + } // namespace +@@ -314,7 +376,7 @@ bool ItemEncryptedSaver::saveItems(const QString &, const QAbstractItemModel &mo + bytes = readGpgOutput(QStringList("--encrypt"), bytes); + if ( bytes.isEmpty() ) { + emitEncryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to read encrypted data"); ++ log("ItemEncrypt: Failed to read encrypted data", LogError); + return false; + } + +@@ -325,7 +387,7 @@ bool ItemEncryptedSaver::saveItems(const QString &, const QAbstractItemModel &mo + + if ( stream.status() != QDataStream::Ok ) { + emitEncryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to write encrypted data"); ++ log("ItemEncrypt: Failed to write encrypted data", LogError); + return false; + } + +@@ -510,17 +572,22 @@ void ItemEncryptedScriptable::pasteEncryptedItems() + + QString ItemEncryptedScriptable::generateTestKeys() + { +- const KeyPairPaths keys; +- for ( const auto &keyFileName : {keys.sec, keys.pub} ) { ++ const auto &gpg = gpgExecutable(); ++ ++ const QStringList keys = gpg.needsSecring() ++ ? QStringList{gpg.pubring(), gpg.secring()} ++ : QStringList{gpg.pubring()}; ++ ++ for (const auto &keyFileName : keys) { + if ( QFile::exists(keyFileName) && !QFile::remove(keyFileName) ) +- return QString("Failed to remove \"%1\"").arg(keys.sec); ++ return QString("Failed to remove \"%1\"").arg(keyFileName); + } + + QProcess process; + startGenerateKeysProcess(&process, true); + + if ( !verifyProcess(&process) ) { +- return QString("ItemEncrypt ERROR: %1; stderr: %2") ++ return QString("ItemEncrypt: %1; stderr: %2") + .arg( process.errorString(), + QString::fromUtf8(process.readAllStandardError()) ); + } +@@ -529,9 +596,9 @@ QString ItemEncryptedScriptable::generateTestKeys() + if ( !error.isEmpty() ) + return error; + +- for ( const auto &keyFileName : {keys.sec, keys.pub} ) { ++ for (const auto &keyFileName : keys) { + if ( !QFile::exists(keyFileName) ) +- return QString("Failed to create \"%1\"").arg(keys.sec); ++ return QString("Failed to create \"%1\"").arg(keyFileName); + } + + return QString(); +@@ -606,19 +673,29 @@ QWidget *ItemEncryptedLoader::createSettingsWidget(QWidget *parent) + m_encryptTabs.join('\n') ); + + if (status() != GpgNotInstalled) { +- KeyPairPaths keys; ++ const auto &gpg = gpgExecutable(); + ui->labelShareInfo->setTextFormat(Qt::RichText); +- ui->labelShareInfo->setText( ItemEncryptedLoader::tr( +- "To share encrypted items on other computer or" +- " session, you'll need public and secret key files:" +- "<ul>" +- "<li>%1</li>" +- "<li>%2<br />(Keep this secret key in a safe place.)</li>" +- "</ul>" +- ) +- .arg( quoteString(keys.pub), +- quoteString(keys.sec) ) +- ); ++ QString text = ItemEncryptedLoader::tr( ++ "To share encrypted items on other computer or" ++ " session, you'll need these secret key files (keep them in a safe place):" ++ ); ++ if (gpg.needsSecring()) { ++ text.append( QStringLiteral( ++ "<ul>" ++ "<li>%1</li>" ++ "<li>%2</li>" ++ "</ul>" ++ ).arg(quoteString(gpg.pubringNative()), quoteString(gpg.secringNative())) ++ ); ++ } else { ++ text.append( QStringLiteral( ++ "<ul>" ++ "<li>%1</li>" ++ "</ul>" ++ ).arg(quoteString(gpg.pubringNative())) ++ ); ++ } ++ ui->labelShareInfo->setText(text); + } + + updateUi(); +@@ -689,7 +766,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + const int bytesRead = stream.readRawData(encryptedBytes, 4096); + if (bytesRead == -1) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypted ERROR: Failed to read encrypted data"); ++ log("ItemEncrypted: Failed to read encrypted data", LogError); + return nullptr; + } + p.write(encryptedBytes, bytesRead); +@@ -708,7 +785,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + const QByteArray bytes = p.readAllStandardOutput(); + if ( bytes.isEmpty() ) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to read encrypted data."); ++ log("ItemEncrypt: Failed to read encrypted data", LogError); + verifyProcess(&p); + return nullptr; + } +@@ -719,7 +796,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + stream2 >> length; + if ( stream2.status() != QDataStream::Ok ) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to parse item count!"); ++ log("ItemEncrypt: Failed to parse item count", LogError); + return nullptr; + } + length = qMin(length, static_cast<quint64>(maxItems)) - static_cast<quint64>(model->rowCount()); +@@ -728,7 +805,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + for ( int i = 0; i < count && stream2.status() == QDataStream::Ok; ++i ) { + if ( !model->insertRow(i) ) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to insert item!"); ++ log("ItemEncrypt: Failed to insert item", LogError); + return nullptr; + } + QVariantMap dataMap; +@@ -738,7 +815,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel + + if ( stream2.status() != QDataStream::Ok ) { + emitDecryptFailed(); +- COPYQ_LOG("ItemEncrypt ERROR: Failed to decrypt item!"); ++ log("ItemEncrypt: Failed to decrypt item", LogError); + return nullptr; + } + +--- a/plugins/itemencrypted/tests/itemencryptedtests.cpp ++++ b/plugins/itemencrypted/tests/itemencryptedtests.cpp +@@ -25,6 +25,8 @@ void ItemEncryptedTests::cleanupTestCase() + void ItemEncryptedTests::init() + { + TEST(m_test->init()); ++ ++ QVERIFY(isGpgInstalled()); + } + + void ItemEncryptedTests::cleanup() +@@ -34,13 +36,10 @@ void ItemEncryptedTests::cleanup() + + void ItemEncryptedTests::encryptDecryptData() + { +- if ( !isGpgInstalled() ) +- SKIP("gpg2 is required to run the test"); +- +- RUN("-e" << "plugins.itemencrypted.generateTestKeys()", "\n"); ++ RUN("plugins.itemencrypted.generateTestKeys()", "\n"); + + // Test gpg errors first. +- RUN("-e" << "plugins.itemencrypted.encrypt(input());print('')", ""); ++ RUN("plugins.itemencrypted.encrypt(input());print('')", ""); + + const QByteArray input("\x00\x01\x02\x03\x04", 5); + QByteArray stdoutActual; +@@ -60,10 +59,7 @@ void ItemEncryptedTests::encryptDecryptItems() + SKIP("Ctrl+L shortcut doesn't seem work on OS X"); + #endif + +- if ( !isGpgInstalled() ) +- SKIP("gpg2 is required to run the test"); +- +- RUN("-e" << "plugins.itemencrypted.generateTestKeys()", "\n"); ++ RUN("plugins.itemencrypted.generateTestKeys()", "\n"); + + // Load commands from the plugin generating keys. + RUN("keys" << "Ctrl+P" << "ENTER", ""); +--- a/src/app/clipboardserver.cpp ++++ b/src/app/clipboardserver.cpp +@@ -124,6 +124,8 @@ ClipboardServer::ClipboardServer(QApplication *app, const QString &sessionName) + + QApplication::setQuitOnLastWindowClosed(false); + ++ ensureSettingsDirectoryExists(); ++ + m_sharedData = std::make_shared<ClipboardBrowserShared>(); + m_sharedData->itemFactory = new ItemFactory(this); + m_sharedData->notifications = new NotificationDaemon(this); +--- a/src/common/config.cpp ++++ b/src/common/config.cpp +@@ -157,6 +157,20 @@ QString getConfigurationFilePathHelper() + + } // namespace + ++bool ensureSettingsDirectoryExists() ++{ ++ QDir settingsDir( settingsDirectoryPath() ); ++ if ( !settingsDir.mkpath(".") ) { ++ log( QStringLiteral("Failed to create the directory for settings: %1") ++ .arg(settingsDir.path()), ++ LogError ); ++ ++ return false; ++ } ++ ++ return true; ++} ++ + const QString &getConfigurationFilePath() + { + static const QString path = getConfigurationFilePathHelper(); +--- a/src/common/config.h ++++ b/src/common/config.h +@@ -9,6 +9,8 @@ class QString; + class QVariant; + class QWidget; + ++bool ensureSettingsDirectoryExists(); ++ + const QString &getConfigurationFilePath(); + + QString getConfigurationFilePath(const char *suffix); +--- a/src/item/itemstore.cpp ++++ b/src/item/itemstore.cpp +@@ -22,20 +22,6 @@ QString itemFileName(const QString &id) + return getConfigurationFilePath("_tab_") + part + QLatin1String(".dat"); + } + +-bool createItemDirectory() +-{ +- QDir settingsDir( settingsDirectoryPath() ); +- if ( !settingsDir.mkpath(".") ) { +- log( QString("Cannot create directory for settings %1!") +- .arg(quoteString(settingsDir.path()) ), +- LogError ); +- +- return false; +- } +- +- return true; +-} +- + void printItemFileError( + const QString &action, const QString &id, const QFileDevice &file) + { +@@ -83,9 +69,6 @@ ItemSaverPtr createTab( + + ItemSaverPtr loadItems(const QString &tabName, QAbstractItemModel &model, ItemFactory *itemFactory, int maxItems) + { +- if ( !createItemDirectory() ) +- return nullptr; +- + const QString tabFileName = itemFileName(tabName); + if ( !QFile::exists(tabFileName) ) + return createTab(tabName, model, itemFactory, maxItems); +@@ -107,7 +90,7 @@ bool saveItems(const QString &tabName, const QAbstractItemModel &model, const It + { + const QString tabFileName = itemFileName(tabName); + +- if ( !createItemDirectory() ) ++ if ( !ensureSettingsDirectoryExists() ) + return false; + + // Save tab data to a new temporary file. diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch new file mode 100644 index 000000000000..2b149ab843bf --- /dev/null +++ b/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch @@ -0,0 +1,44 @@ +https://bugs.gentoo.org/916129 +https://github.com/hluk/CopyQ/pull/2508 +https://github.com/hluk/CopyQ/commit/19e9dd1c2ecb49b14a24159c5ac3bc1b77fdf250 + +From 19e9dd1c2ecb49b14a24159c5ac3bc1b77fdf250 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 17 Oct 2023 02:08:51 -0400 +Subject: [PATCH] itemfakevim: fix build with qt 6.6.0 (#2508) + +Reference: https://github.com/qt-creator/qt-creator/commit/e56e3b6f374e00179eb0537198437864dddc47f2 +--- a/plugins/itemfakevim/fakevim/fakevimhandler.cpp ++++ b/plugins/itemfakevim/fakevim/fakevimhandler.cpp +@@ -1057,14 +1057,6 @@ inline QString msgMarkNotSet(const QString &text) + return Tr::tr("Mark \"%1\" not set.").arg(text); + } + +-static void initSingleShotTimer(QTimer *timer, int interval, FakeVimHandler::Private *receiver, +- void (FakeVimHandler::Private::*slot)()) +-{ +- timer->setSingleShot(true); +- timer->setInterval(interval); +- QObject::connect(timer, &QTimer::timeout, receiver, slot); +-} +- + class Input + { + public: +@@ -2424,6 +2416,16 @@ class FakeVimHandler::Private : public QObject + FakeVimSettings &s = *fakeVimSettings(); + }; + ++static void initSingleShotTimer(QTimer *timer, ++ int interval, ++ FakeVimHandler::Private *receiver, ++ void (FakeVimHandler::Private::*slot)()) ++{ ++ timer->setSingleShot(true); ++ timer->setInterval(interval); ++ QObject::connect(timer, &QTimer::timeout, receiver, slot); ++} ++ + FakeVimHandler::Private::GlobalData FakeVimHandler::Private::g; + + FakeVimHandler::Private::Private(FakeVimHandler *parent, QWidget *widget) diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch new file mode 100644 index 000000000000..e526f3a89f0b --- /dev/null +++ b/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch @@ -0,0 +1,98 @@ +https://github.com/hluk/CopyQ/commit/42c02f2dc74b188ea7982a30c38acaf668bbf76a + +From 42c02f2dc74b188ea7982a30c38acaf668bbf76a Mon Sep 17 00:00:00 2001 +From: Lukas Holecek <hluk@email.cz> +Date: Mon, 4 Sep 2023 21:12:44 +0200 +Subject: [PATCH] Avoid showing warnings about invalid regex + +--- a/src/scriptable/scriptableitemselection.cpp ++++ b/src/scriptable/scriptableitemselection.cpp +@@ -46,10 +46,6 @@ QVector<int> toIntVector(const QJSValue &value) + + QRegularExpression toRegularExpression(const QJSValue &value) + { +- // If argument is invalid/not-regexp, create an invalid regex to match nothing. +- if ( !value.isRegExp() ) +- return QRegularExpression("("); +- + const QVariant variant = value.toVariant(); + QRegularExpression regexp = variant.toRegularExpression(); + +@@ -136,7 +132,7 @@ QJSValue ScriptableItemSelection::selectAll() + + QJSValue ScriptableItemSelection::select(const QJSValue &re, const QString &mimeFormat) + { +- const QVariant regexp = re.isUndefined() ? QVariant() : toRegularExpression(re); ++ const QVariant regexp = re.isRegExp() ? toRegularExpression(re) : QVariant(); + m_proxy->selectionSelect(m_id, regexp, mimeFormat); + return m_self; + } +--- a/src/tests/testinterface.h ++++ b/src/tests/testinterface.h +@@ -85,9 +85,6 @@ class TestInterface { + /// Clean up tabs and items. Return error string on error. + virtual QByteArray cleanup() = 0; + +- /// Ignore given text in logs for current unit test. +- virtual void setIgnoreError(const QByteArray &ignoreError) = 0; +- + /// Platform specific key to remove (usually Delete, Backspace on OS X). + virtual QString shortcutToRemove() = 0; + +--- a/src/tests/tests.cpp ++++ b/src/tests/tests.cpp +@@ -150,8 +150,6 @@ bool testStderr(const QByteArray &stderrData, TestInterface::ReadStderrFlag flag + // Ignore exceptions and errors from clients in application log + // (these are expected in some tests). + static const std::vector<QRegularExpression> ignoreList{ +- plain("[EXPECTED-IN-TEST]"), +- + regex(R"(CopyQ Note \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}\] <Client-[^\n]*)"), + + // X11 (Linux) +@@ -520,8 +518,6 @@ class TestInterfaceImpl final : public TestInterface { + if (m_server) { + QCoreApplication::processEvents(); + QByteArray output = readLogFile(maxReadLogSize); +- if ( !m_ignoreError.isEmpty() ) +- output.replace(m_ignoreError, "[EXPECTED-IN-TEST] " + m_ignoreError); + if ( flag == ReadAllStderr || !testStderr(output, flag) ) + return decorateOutput("Server STDERR", output); + } +@@ -645,16 +641,10 @@ class TestInterfaceImpl final : public TestInterface { + + QByteArray cleanup() override + { +- m_ignoreError.clear(); + addFailedTest(); + return QByteArray(); + } + +- void setIgnoreError(const QByteArray &ignoreError) override +- { +- m_ignoreError = ignoreError; +- } +- + QString shortcutToRemove() override + { + return ::shortcutToRemove(); +@@ -771,8 +761,6 @@ class TestInterfaceImpl final : public TestInterface { + QStringList m_failed; + + PlatformClipboardPtr m_clipboard; +- +- QByteArray m_ignoreError; + }; + + QString keyNameFor(QKeySequence::StandardKey standardKey) +@@ -2272,9 +2260,8 @@ void Tests::classItemSelection() + RUN(args << "ItemSelection().select(undefined, mimeItemNotes).str()", outRows.arg("0,2")); + + // Match nothing if select() argument is not a regular expression. +- m_test->setIgnoreError("QtWarning: QString::contains: invalid QRegularExpression object"); ++ RUN(args << "add" << "", ""); + RUN(args << "ItemSelection().select('A').str()", outRows.arg("")); +- m_test->setIgnoreError(QByteArray()); + } + + void Tests::classItemSelectionGetCurrent() diff --git a/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch b/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch new file mode 100644 index 000000000000..d2d0ec94b659 --- /dev/null +++ b/x11-misc/copyq/files/copyq-7.1.0-support-plugin-dir-envvar-r1.patch @@ -0,0 +1,26 @@ +From 6d20653b924481048fa017dc40cf9d7360f95a13 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Tue, 30 Jan 2024 20:44:18 +0200 +Subject: [PATCH] itemfactory: Add support for setting plugin dir in the + environment + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/src/item/itemfactory.cpp ++++ b/src/item/itemfactory.cpp +@@ -31,6 +31,13 @@ namespace { + + bool findPluginDir(QDir *pluginsDir) + { ++ QString pluginDirEnv = qEnvironmentVariable("COPYQ_PLUGIN_DIR"); ++ if ( !pluginDirEnv.isEmpty() ) { ++ pluginsDir->setPath(pluginDirEnv); ++ if ( pluginsDir->isReadable() ) ++ return true; ++ } ++ + #ifdef COPYQ_PLUGIN_PREFIX + pluginsDir->setPath(COPYQ_PLUGIN_PREFIX); + if ( pluginsDir->isReadable() ) +-- +2.43.0 + diff --git a/x11-misc/copyq/metadata.xml b/x11-misc/copyq/metadata.xml new file mode 100644 index 000000000000..195b1a447114 --- /dev/null +++ b/x11-misc/copyq/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <upstream> + <doc>https://copyq.readthedocs.io/</doc> + <remote-id type="github">hluk/CopyQ</remote-id> + </upstream> + <use> + <flag name="notification">Build with native notification support (requires <pkg>kde-frameworks/knotifications</pkg>:5)</flag> + </use> +</pkgmetadata> diff --git a/x11-misc/dclock/Manifest b/x11-misc/dclock/Manifest index d884a431fdb0..aae98ba4eba5 100644 --- a/x11-misc/dclock/Manifest +++ b/x11-misc/dclock/Manifest @@ -1,2 +1,2 @@ -DIST dclock_2.2.2-9.debian.tar.xz 15260 BLAKE2B dab41f4fe79d2ce6ef4effb466c3923c77a94bfaf4b6ca1dde5bd9b92e0d9ff9a5d89dd9b569f831e107bb62de691e24661609b61af84d1a64958de34304f9be SHA512 025d1d228930adb6e2b13226188b6c3d37aef59786f23826f301c7b22dabba5cfc24f76347fe2f199c239daea968cd043293bd60524110235855cb77c9e4d1f0 +DIST dclock_2.2.2-12.debian.tar.xz 16112 BLAKE2B 3da6a75834791cbba71d84c8d46d65b18db6a9aa97a085d984b598c8db41fe507965390568377a9167823d0b3856165e58115aa74b05da35fd6432b44ea877e9 SHA512 c6c468a378e421fb9ef2c6e84db991644888f8d2d9afe220142ea26914423387d3aed335b43fa69b38501c3d713d5540bb2efc2e52dd0db1fa1cd3d9c00c1531 DIST dclock_2.2.2.orig.tar.gz 63583 BLAKE2B b1208439e3a689ff1e00cbdbfa7e3a559b7ec7705ab0834cf350d1ba1e3dcd01d4746e90999f6215cfa9e101a4bd8cf42ff324a307c792028479077152b5414b SHA512 c43ba031fd0d9ba2bc7e8fe9becc73591bfc47cd4ca931df03fa55207cfb148e24e5d702a7de5af8b67e188c561eae2fb7da14162f6a982d0abbb3251c32372c diff --git a/x11-misc/dclock/dclock-2.2.2_p9.ebuild b/x11-misc/dclock/dclock-2.2.2_p12.ebuild index 748340c6f6ef..6ff7ea856b37 100644 --- a/x11-misc/dclock/dclock-2.2.2_p9.ebuild +++ b/x11-misc/dclock/dclock-2.2.2_p12.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="Digital clock for the X window system" @@ -17,39 +17,47 @@ KEYWORDS="amd64 ppc x86" IUSE="xft" RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt xft? ( media-libs/freetype x11-libs/libXft ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt " DEPEND=" ${RDEPEND} +" +BDEPEND=" app-text/rman - x11-misc/imake + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1 xft? ( virtual/pkgconfig ) " - S=${WORKDIR}/${P/_p*/} - PATCHES=( "${WORKDIR}"/debian/patches - "${FILESDIR}"/${PN}-2.2.2_p4-include.patch ) +src_prepare() { + default + sed -i -e '/CDEBUGFLAGS/d' Imakefile || die +} + src_configure() { + append-cflags -std=gnu89 # old codebase, incompatible with c2x + if use xft; then append-cppflags \ -DXFT_SUPPORT \ - $( $(tc-getPKG_CONFIG) --cflags freetype2) + $( $(tc-getPKG_CONFIG) --cflags freetype2 ) else append-cppflags -UXFT_SUPPORT sed -i -e '/EXTRA_LIBRARIES/s|^|#|g' Imakefile || die fi - xmkmf || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_compile() { diff --git a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch deleted file mode 100644 index 223cd9f55279..000000000000 --- a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/dclock.c -+++ b/dclock.c -@@ -7,6 +7,7 @@ - * manager: *Dclock.seconds: on - */ - #include <stdio.h> -+#include <stdlib.h> /* exit() */ - #include <locale.h> - #include <X11/Intrinsic.h> - #include "Dclock.h" diff --git a/x11-misc/dclock/metadata.xml b/x11-misc/dclock/metadata.xml index 66187a0f4213..d3e0f4631255 100644 --- a/x11-misc/dclock/metadata.xml +++ b/x11-misc/dclock/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/devilspie/devilspie-0.23-r1.ebuild b/x11-misc/devilspie/devilspie-0.23-r1.ebuild deleted file mode 100644 index 5711466aa402..000000000000 --- a/x11-misc/devilspie/devilspie-0.23-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools toolchain-funcs - -DESCRIPTION="A Window Matching utility similar to Sawfish's Matched Windows feature" -HOMEPAGE="http://www.burtonini.com/blog/tag/devilspie.html" -SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.10 - x11-libs/gtk+:3[X] - x11-libs/libwnck:3 - x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/intltool - sys-devel/gettext - gnome-base/gnome-common" # Required by eautoreconf - -src_prepare() { - default - sed -i -e "s:\(/usr/share/doc/devilspie\):\1-${PVR}:" devilspie.1 || die - sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am || die - mv configure.{in,ac} || die - eautoreconf - LIBS="$($(tc-getPKG_CONFIG) --libs x11)" -} - -src_configure() { - econf --disable-compile-warnings -} - -src_install() { - default - keepdir /etc/devilspie -} diff --git a/x11-misc/devilspie/devilspie-0.23-r2.ebuild b/x11-misc/devilspie/devilspie-0.23-r2.ebuild new file mode 100644 index 000000000000..985daf2b245f --- /dev/null +++ b/x11-misc/devilspie/devilspie-0.23-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Window matching utility similar to Sawfish's Matched Windows" +HOMEPAGE="https://www.burtonini.com/blog/tag/devilspie.html" +SRC_URI="https://www.burtonini.com/computing/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:3[X] + x11-libs/libX11 + x11-libs/libwnck:3" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig" + +src_prepare() { + default + + sed -i "/doc\//s@devilspie..@${PF}/@" devilspie.1 || die +} diff --git a/x11-misc/devilspie/devilspie-0.23.ebuild b/x11-misc/devilspie/devilspie-0.23.ebuild deleted file mode 100644 index 394a36351d3b..000000000000 --- a/x11-misc/devilspie/devilspie-0.23.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools toolchain-funcs - -DESCRIPTION="A Window Matching utility similar to Sawfish's Matched Windows feature" -HOMEPAGE="http://www.burtonini.com/blog/tag/devilspie.html" -SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.10 - x11-libs/gtk+:3[X] - x11-libs/libwnck:3 - x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/intltool - sys-devel/gettext - gnome-base/gnome-common" # Required by eautoreconf - -src_prepare() { - default - sed -i -e "s:\(/usr/share/doc/devilspie\):\1-${PVR}:" devilspie.1 || die - sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am || die - mv configure.{in,ac} || die - eautoreconf - LIBS="$($(tc-getPKG_CONFIG) --libs x11)" -} - -src_install() { - default - keepdir /etc/devilspie -} diff --git a/x11-misc/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml index 2ba8e9e851e4..06d84e396dc3 100644 --- a/x11-misc/devilspie/metadata.xml +++ b/x11-misc/devilspie/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> </pkgmetadata> diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest index e37adbef8d9a..0f51d753732b 100644 --- a/x11-misc/devilspie2/Manifest +++ b/x11-misc/devilspie2/Manifest @@ -1 +1 @@ -DIST devilspie2_0.42-src.tar.gz 48663 BLAKE2B a2340f64191ba31d554aaab8c1ce74ba2252ac4f1524446c88eb674d9bc49225298eaa64c9df649410cb8a07993e891491f7d885af0d917810143ecdb8916bbc SHA512 796b95ded542a76343ffcff25d7838ee3bc25f37d9a02d06785a71aeb7c0da3ef05279f9b88216124c5c9c64754fde59973445a954b0f446f5b4ebe6a25f3055 +DIST devilspie2-0.44.tar.xz 46028 BLAKE2B e9ec3115781575c331d91e982fd1c71361ea57004a1b7ff234957998d3d44fd4e9a0ca1fde9d133e9e4c2d01b6e8d192921554eae8b83acfb0e3fa44b0c9fd23 SHA512 f01f2d044a670dd9b1b97e896a3e8ebcac3e67daea9f08a14bce26fe8084b85f7fdaa0ed147aba91626200f882eddeba7e0ec18f0f565cb7557ffb2ac74a4a64 diff --git a/x11-misc/devilspie2/devilspie2-0.42.ebuild b/x11-misc/devilspie2/devilspie2-0.42.ebuild deleted file mode 100644 index 26fe55495aef..000000000000 --- a/x11-misc/devilspie2/devilspie2-0.42.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# check locales on version bump! -PLOCALES="fi fr it ja nl pt_BR ru sv" -inherit flag-o-matic toolchain-funcs l10n - -DESCRIPTION="Devilspie like window matching utility, using LUA for scripting" -HOMEPAGE="https://www.nongnu.org/devilspie2/" -SRC_URI="https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${PV}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug" - -RDEPEND=" - >=dev-lang/lua-5.1.5:0 - >=dev-libs/glib-2.32.4:2 - >=x11-libs/gtk+-3.4.4:3 - >=x11-libs/libwnck-3.4.4:3 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - default - use debug && append-cflags -D_DEBUG -} - -src_compile() { - emake CC=$(tc-getCC) PREFIX="/usr" LANGUAGES="$(l10n_get_locales)" -} - -src_install() { - emake PREFIX="/usr" DESTDIR="${D}" LANGUAGES="$(l10n_get_locales)" install - - dodoc AUTHORS ChangeLog README README.translators TODO VERSION - doman devilspie2.1 -} - -pkg_postinst() { - elog "Default directory for scripts is ~/.config/devilspie2/" -} diff --git a/x11-misc/devilspie2/devilspie2-0.44.ebuild b/x11-misc/devilspie2/devilspie2-0.44.ebuild new file mode 100644 index 000000000000..8f5a37e52d01 --- /dev/null +++ b/x11-misc/devilspie2/devilspie2-0.44.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +inherit lua-single plocale toolchain-funcs + +DESCRIPTION="Window matching utility with Lua scripting" +HOMEPAGE="https://www.nongnu.org/devilspie2/" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + dev-libs/glib:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXinerama + x11-libs/libwnck:3" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +src_compile() { + tc-export CC PKG_CONFIG + + local PLOCALES="fi fr it ja nl pt_BR ru sv" + + DEVILSPIE2_ARGS=( + PREFIX="${EPREFIX}"/usr + LANGUAGES="$(plocale_get_locales)" + LUA=${ELUA} + ) + + mkdir obj || die # race condition (bug #881473) + emake "${DEVILSPIE2_ARGS[@]}" +} + +src_install() { + emake DESTDIR="${D}" "${DEVILSPIE2_ARGS[@]}" install + einstalldocs + + dodoc -r doc/examples +} diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml index 2ba8e9e851e4..e02d812d6f06 100644 --- a/x11-misc/devilspie2/metadata.xml +++ b/x11-misc/devilspie2/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> + <upstream> + <remote-id type="github">dsalt/devilspie2</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest index 1dd247ef3213..eb6754035496 100644 --- a/x11-misc/dex/Manifest +++ b/x11-misc/dex/Manifest @@ -1 +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.9.0.ebuild index 16346ce8b262..007e212716ee 100644 --- a/x11-misc/dex/dex-0.8.0.ebuild +++ b/x11-misc/dex/dex-0.9.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-r1 @@ -14,20 +14,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 1d840ae4e792..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 "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">jceb/dex</remote-id> </upstream> diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest index 99bfcb51fc29..153676f0aeb1 100644 --- a/x11-misc/dmenu/Manifest +++ b/x11-misc/dmenu/Manifest @@ -1,3 +1,2 @@ -DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 -DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77 -DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65 +DIST dmenu-5.2.tar.gz 16196 BLAKE2B f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d SHA512 7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3 +DIST dmenu-5.3.tar.gz 16274 BLAKE2B fd76b0b11a153f98dd58ec888820bc8a0ebc67f814cdf2d13a35ea3addcc3ad423bb9b2f4f73897cf6293e61a507900e7b7fec65e4f0acd15cc8e425f5506faa SHA512 60f758134063ad7f304fbb0785c66dddc21461e5e5014f8735cf6d5c95dc22a177f069d48101e633ddffe5bbefc1118a2bf8b31daaf7b6438fdf6fe1bcb5d61c diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild deleted file mode 100644 index 1d874c2d3f67..000000000000 --- a/x11-misc/dmenu/dmenu-4.6.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" -HOMEPAGE="https://tools.suckless.org/dmenu/" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm hppa ppc ppc64 x86" -IUSE="xinerama" - -RDEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXft - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - sed -i \ - -e 's|^ @| |g' \ - -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \ - -e '/^ echo/d' \ - Makefile || die - - epatch "${FILESDIR}"/${PN}-4.6-gentoo.patch - - epatch_user -} - -src_compile() { - emake CC=$(tc-getCC) \ - "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ - "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ - "XINERAMAFLAGS=$( - usex xinerama "-DXINERAMA $( - $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null - )" '' - )" \ - "XINERAMALIBS=$( - usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' - )" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install -} diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild index 29be48084efc..9bc599cf5b83 100644 --- a/x11-misc/dmenu/dmenu-4.9.ebuild +++ b/x11-misc/dmenu/dmenu-5.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit savedconfig toolchain-funcs DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" @@ -10,21 +10,22 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="xinerama" RDEPEND=" media-libs/fontconfig x11-libs/libX11 - x11-libs/libXft + >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama ) " DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-4.9-gentoo.patch + "${FILESDIR}"/${PN}-5.2-gentoo.patch ) src_prepare() { @@ -39,7 +40,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) \ + emake CC="$(tc-getCC)" \ "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild index 9cd1cc2ea328..ba847486ffc0 100644 --- a/x11-misc/dmenu/dmenu-4.8.ebuild +++ b/x11-misc/dmenu/dmenu-5.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit savedconfig toolchain-funcs DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" @@ -10,21 +10,22 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="xinerama" RDEPEND=" media-libs/fontconfig x11-libs/libX11 - x11-libs/libXft + >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama ) " DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-4.7-gentoo.patch + "${FILESDIR}"/${PN}-5.2-gentoo.patch ) src_prepare() { @@ -32,7 +33,6 @@ src_prepare() { sed -i \ -e 's|^ @| |g' \ - -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \ -e '/^ echo/d' \ Makefile || die @@ -40,9 +40,11 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) \ + emake CC="$(tc-getCC)" \ "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ + "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ + "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \ "XINERAMAFLAGS=$( usex xinerama "-DXINERAMA $( $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild index 3401a00001e7..9fc2e0ca88da 100644 --- a/x11-misc/dmenu/dmenu-9999.ebuild +++ b/x11-misc/dmenu/dmenu-9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit git-r3 savedconfig toolchain-funcs DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" @@ -10,21 +11,21 @@ EGIT_REPO_URI="https://git.suckless.org/dmenu" LICENSE="MIT" SLOT="0" -KEYWORDS="" IUSE="xinerama" RDEPEND=" media-libs/fontconfig x11-libs/libX11 - x11-libs/libXft + >=x11-libs/libXft-2.3.5 xinerama? ( x11-libs/libXinerama ) " DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-4.9-gentoo.patch + "${FILESDIR}"/${PN}-5.2-gentoo.patch ) src_prepare() { @@ -39,7 +40,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) \ + emake CC="$(tc-getCC)" \ "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ diff --git a/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch deleted file mode 100644 index 0d826e0d5a92..000000000000 --- a/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -5,8 +5,8 @@ - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = -I/usr/X11R6/include -+X11LIB = -L/usr/X11R6/lib - - # Xinerama, comment if you don't want it - XINERAMALIBS = -lXinerama -@@ -14,18 +14,18 @@ - - # freetype - FREETYPELIBS = -lfontconfig -lXft --FREETYPEINC = /usr/include/freetype2 -+FREETYPEINC = -I/usr/include/freetype2 - # OpenBSD (uncomment) - FREETYPEINC = ${X11INC}/freetype2 - - # includes and libs --INCS = -I${X11INC} -I${FREETYPEINC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -+INCS = ${X11INC} ${FREETYPEINC} -+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} - - # flags --CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} -+CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -+CFLAGS += -ansi -pedantic -Wall $(INCS) $(CPPFLAGS) -+LDFLAGS += ${LIBS} - - # compiler and linker - CC = cc diff --git a/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch deleted file mode 100644 index 77f594155881..000000000000 --- a/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -5,8 +5,8 @@ - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = -I/usr/X11R6/include -+X11LIB = -L/usr/X11R6/lib - - # Xinerama, comment if you don't want it - XINERAMALIBS = -lXinerama -@@ -14,18 +14,18 @@ - - # freetype - FREETYPELIBS = -lfontconfig -lXft --FREETYPEINC = /usr/include/freetype2 -+FREETYPEINC = -I/usr/include/freetype2 - # OpenBSD (uncomment) - #FREETYPEINC = ${X11INC}/freetype2 - - # includes and libs --INCS = -I${X11INC} -I${FREETYPEINC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -+INCS = ${X11INC} ${FREETYPEINC} -+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} - - # flags --CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} -+CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -+CFLAGS += -ansi -pedantic -Wall $(INCS) $(CPPFLAGS) -+LDFLAGS += ${LIBS} - - # compiler and linker - CC = cc diff --git a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch index 25fd34ab4579..91ee6f353bda 100644 --- a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch +++ b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch @@ -1,7 +1,12 @@ +From 3c494e2289c93ab6262409f9498866bdfd57bcf4 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Fri, 7 Oct 2022 11:29:04 -0700 +Subject: [PATCH] gentoo patch + --- a/config.mk +++ b/config.mk -@@ -19,13 +19,13 @@ - #FREETYPEINC = $(X11INC)/freetype2 +@@ -20,13 +20,13 @@ FREETYPEINC = /usr/include/freetype2 + #MANPREFIX = ${PREFIX}/man # includes and libs -INCS = -I$(X11INC) -I$(FREETYPEINC) diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml index b4a38aa72629..c07e13d4a6bd 100644 --- a/x11-misc/dmenu/metadata.xml +++ b/x11-misc/dmenu/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jer@gentoo.org</email> - </maintainer> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/dsx/dsx-0.1-r1.ebuild b/x11-misc/dsx/dsx-0.1-r1.ebuild deleted file mode 100644 index 6b49cac790e8..000000000000 --- a/x11-misc/dsx/dsx-0.1-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="Command line selection of your X desktop environment" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="" -RDEPEND=" - ${PYTHON_DEPS} - x11-apps/xinit" - -S="${WORKDIR}" - -src_install() { - python_newscript "${FILESDIR}/${P}" "${PN}" -} diff --git a/x11-misc/dsx/files/dsx-0.1 b/x11-misc/dsx/files/dsx-0.1 deleted file mode 100644 index d8f5e7192928..000000000000 --- a/x11-misc/dsx/files/dsx-0.1 +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python -# dsx is Mandrakesoft's Xtart modified to work with a Gentoo Linux system. -# Gentoo doesn't use a wmsession.d directory, so we're going to accept the -# /etc/X11/Sessions executables as our menu and our command parameters. -# I also tried to increase the robustness of the entry checking and make the -# error messages less condescending. -# The 0 option for "no wm" was removed. I altered it to run option 1 instead. - -### Original copyright / license message from Xtart... ### -# This is an official linux-mandrake extension of the X windowing system for -# the benefit of Declan Moriarty Copyright 2001 by civileme@mandrakesoft all -# rights reserved. Use is hereby granted under the GNU General Publoic -# License version 2 or any future version of said license at the user's option -# -# No Warranty of course. -# This program is designed for those who want to work in concole and -# occasionally boot into window managers or who want to avoid theme -# persistence from one WM to another. -################ -import sys -import os -import popen2 -import string -import math -def complain(): - print 'X initiation aborted on invalid selection.' - sys.exit(0) - return -print -print 'Welcome to the Desktop Selector for X' -print -fspc=os.path.expanduser('~')+'/' -io=popen2.Popen3('ls /etc/X11/Sessions',1) -L=io.fromchild.readlines() -Sessions={} -Sessionkeys=[] -primekey=0 -for k in L: - primekey+=1 - name=k[:-1] - command='/etc/X11/Sessions/'+k[:-1] - Sessions[primekey]=(name, command) -Sessionkeys=Sessions.keys() -Sessionkeys.sort() -for j in Sessionkeys: - if os.system('[ -x '+Sessions[j][1]+' ]') == 0: - print j, Sessions[j][0] - pass -print -sys.stdin.flush() -s=raw_input('Enter the number of your desired desktop environment [1]: ') -if len(s)==0: - s='1' -if s=='0': - s='1' -for j in range(len(s)): - if string.find(string.digits,s[j]) == -1: - print "'" + s[j] + "' isn't a digit." - complain() -if len(s)>int(math.log10(primekey))+1: - print "That number is too big." - complain() -well=int(s) -wellformed=Sessions.has_key(well) -if wellformed: - os.execvp('xinit',Sessions[well]) -else: - print - print 'Your selection was invalid.' - print - complain() - diff --git a/x11-misc/dsx/metadata.xml b/x11-misc/dsx/metadata.xml deleted file mode 100644 index 49c86a887b6a..000000000000 --- a/x11-misc/dsx/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -</pkgmetadata> diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest index fe4139d51855..119ef44c3b9d 100644 --- a/x11-misc/dunst/Manifest +++ b/x11-misc/dunst/Manifest @@ -1 +1,2 @@ -DIST dunst-1.4.1.tar.gz 160124 BLAKE2B d618b3bffc8f4518f58d28e108a8aadf1ff71164f581632bc198b3d0a81f6efa0fff73513fa5d46ec4a7058bb1beb8d8a51cb01e4621c76f8d3f8653cc6e2270 SHA512 43667898e123ef0dea59e2ca55a76686785906e44b453b2a86bdf361045b3f6b751a2e81fa9f562127f80bf47f8c9248960c37f8365dbbe409d72ddc3deb34fb +DIST dunst-1.10.0.tar.gz 4639084 BLAKE2B 29056b55aa53e20d4d9f0be5ff560aaad3829a933f30fd6a6f17f5e6adb9f4ca3b659dc977959f69224a2847a116043215e05097e9eaae4556ec02c1852c4a05 SHA512 e7e453c9470a063cdee4602315b22c1c8bcbf1405d3c295bccf01ae4e1b535e11b7323313b63cfc510e38ea8243117d550e6057df15924bbd4efb7e0b7f9a709 +DIST dunst-1.11.0.tar.gz 4645279 BLAKE2B 0daa8d098f032a0e3b16872bc2e33c8411e8eed543fc13533e649935d2d0796ad74b3fb27769f839972b335b7a2f7ae6b5efd9f324a8bb807ac2f82fa8611a5d SHA512 84c9edccddd183fb867233cb5377115d96735f4c1be84007194ac39dd48d913e5bb021d2952057aecdb978564c2471a8974c4ee4eeccfb188e5345527007a5c4 diff --git a/x11-misc/dunst/dunst-1.10.0.ebuild b/x11-misc/dunst/dunst-1.10.0.ebuild new file mode 100644 index 000000000000..5ac47fb06765 --- /dev/null +++ b/x11-misc/dunst/dunst-1.10.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit shell-completion systemd toolchain-funcs + +DESCRIPTION="Lightweight replacement for common notification daemons" +HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst" +SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" +IUSE="wayland" + +DEPEND=" + dev-libs/glib:2 + sys-apps/dbus + x11-libs/cairo[X,glib] + x11-libs/gdk-pixbuf:2 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXScrnSaver + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libnotify + x11-libs/pango[X] + x11-misc/xdg-utils + wayland? ( dev-libs/wayland ) +" + +RDEPEND="${DEPEND}" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + wayland? ( dev-libs/wayland-protocols ) +" + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-Os//' -i config.mk || die + + # Use correct path for dbus and system unit + sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die + sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die +} + +src_configure() { + tc-export CC PKG_CONFIG + + default +} + +src_compile() { + local myemakeargs=( + SYSCONFDIR="${EPREFIX}/etc/xdg" + SYSTEMD="0" + WAYLAND="$(usex wayland 1 0)" + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + local myemakeargs=( + PREFIX="${ED}/usr" + SYSCONFDIR="${ED}/etc/xdg" + SYSTEMD="0" + WAYLAND="$(usex wayland 1 0)" + ) + + emake "${myemakeargs[@]}" install + + newbashcomp contrib/dunst.bashcomp dunst + newbashcomp contrib/dunstctl.bashcomp dunstctl + newfishcomp contrib/dunst.fishcomp dunst + newfishcomp contrib/dunstctl.fishcomp dunstctl + newfishcomp contrib/dunstify.fishcomp dunstify + newzshcomp contrib/_dunst.zshcomp _dunst + newzshcomp contrib/_dunstctl.zshcomp _dunstctl + + systemd_newuserunit dunst.systemd.service.in dunst.service +} diff --git a/x11-misc/dunst/dunst-1.11.0.ebuild b/x11-misc/dunst/dunst-1.11.0.ebuild new file mode 100644 index 000000000000..37b4346e96b7 --- /dev/null +++ b/x11-misc/dunst/dunst-1.11.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 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 + + systemd_newuserunit dunst.systemd.service.in dunst.service +} diff --git a/x11-misc/dunst/dunst-1.4.1.ebuild b/x11-misc/dunst/dunst-1.4.1.ebuild deleted file mode 100644 index 6bd70a292b88..000000000000 --- a/x11-misc/dunst/dunst-1.4.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Customizable and lightweight notification-daemon" -HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst" -SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="dunstify" - -CDEPEND=" - dev-libs/glib:2 - sys-apps/dbus - x11-libs/cairo[X,glib] - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/pango[X] - dunstify? ( x11-libs/libnotify ) -" -DEPEND=" - ${CDEPEND} - dev-lang/perl - virtual/pkgconfig -" -RDEPEND="${CDEPEND}" - -src_prepare() { - sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die - - default -} - -src_compile() { - tc-export CC - emake - use dunstify && emake dunstify -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - - use dunstify && dobin dunstify - - dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES -} diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild index e756b3ec1f81..901f3e6a33b9 100644 --- a/x11-misc/dunst/dunst-9999.ebuild +++ b/x11-misc/dunst/dunst-9999.ebuild @@ -1,53 +1,78 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit git-r3 toolchain-funcs +EAPI=8 -DESCRIPTION="Customizable and lightweight notification-daemon" +inherit git-r3 systemd toolchain-funcs + +EGIT_REPO_URI="https://github.com/dunst-project/dunst" + +DESCRIPTION="Lightweight replacement for common notification daemons" HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst" -EGIT_REPO_URI="https://github.com/${PN}-project/${PN}" LICENSE="BSD" SLOT="0" -KEYWORDS="" -IUSE="dunstify" +IUSE="wayland" -CDEPEND=" +DEPEND=" dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] - x11-libs/gdk-pixbuf + 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] - dunstify? ( x11-libs/libnotify ) + x11-misc/xdg-utils + wayland? ( dev-libs/wayland ) " -DEPEND=" - ${CDEPEND} + +RDEPEND="${DEPEND}" + +BDEPEND=" dev-lang/perl virtual/pkgconfig + wayland? ( dev-libs/wayland-protocols ) " -RDEPEND="${CDEPEND}" src_prepare() { - sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die + default + + # Respect users CFLAGS + sed -e 's/-Os//' -i config.mk || die + + # Use correct path for system unit + sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die +} + +src_configure() { + tc-export CC PKG_CONFIG default } src_compile() { - tc-export CC - emake - use dunstify && emake dunstify + local myemakeargs=( + SYSCONFDIR="${EPREFIX}/etc/xdg" + SYSTEMD="0" + WAYLAND="$(usex wayland 1 0)" + ) + + emake "${myemakeargs[@]}" } src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install + local myemakeargs=( + PREFIX="${ED}/usr" + SYSCONFDIR="${ED}/etc/xdg" + SYSTEMD="0" + WAYLAND="$(usex wayland 1 0)" + ) - use dunstify && dobin dunstify + emake "${myemakeargs[@]}" install - dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES + systemd_newuserunit dunst.systemd.service.in dunst.service } diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml index de3681ee1319..47e53e6187f7 100644 --- a/x11-misc/dunst/metadata.xml +++ b/x11-misc/dunst/metadata.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type='project'> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> - <use> - <flag name="dunstify">Experimental replacement for notify-send.</flag> - </use> <upstream> <remote-id type="github">dunst-project/dunst</remote-id> </upstream> 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/dxpc/metadata.xml b/x11-misc/dxpc/metadata.xml index 66187a0f4213..d3e0f4631255 100644 --- a/x11-misc/dxpc/metadata.xml +++ b/x11-misc/dxpc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest index 4f53d592b690..40b595bf9e69 100644 --- a/x11-misc/dzen/Manifest +++ b/x11-misc/dzen/Manifest @@ -1,2 +1 @@ -DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667ca832de70a2bf43faea4b5e7beb147a454d7ced5be4e53085f4eaf15d752888ee019d799cd3bb8fcbdb6ba SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916 -DIST dzen-0.9.5_p1.tar.gz 38178 BLAKE2B 9ec81747d6eec9b7cca58b11096e00548cdca7ba21a179599979cf9b22ff84100d266d98e7a3e419960a56fee788ae96158650884a1b1322def6a98a70d6683b SHA512 239acfcacbc871ded5755ee0d5cca3185fcd93142bcf81552974f2ffc19d9f5ebdc02956108931f58b35c68ac57ec6e748bdb9cdbf7791ec6e224ef270bda300 +DIST dzen-0.9.5_p2.tar.gz 38181 BLAKE2B 0e34228c3795864a1b6ac5a3ac9d0ab4a1b90e065a649caa34d704951007bb1239db920f7ed3e35303f614c6572b6232768d59302b23edab0c11793574fcde3d SHA512 e750ab9c62dad311bf478d79c15ffdc1ef108fe2c3ed5df82316d879aad000bee785d304048f5daae237468f6fe018f14fc05d0114d68d873f766dbf1dfebbc9 diff --git a/x11-misc/dzen/dzen-0.9.5-r1.ebuild b/x11-misc/dzen/dzen-0.9.5-r1.ebuild deleted file mode 100644 index 9addccdf4bb7..000000000000 --- a/x11-misc/dzen/dzen-0.9.5-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs vcs-snapshot - -COMMITID="f7907da3a42a6d59e27ede88f5f01e4e41c4c9e0" - -DESCRIPTION="a general purpose messaging, notification and menuing program for X11" -HOMEPAGE="https://github.com/robm/dzen" -SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="amd64 x86" -IUSE="minimal xft xinerama xpm" -SLOT="2" - -RDEPEND=" - x11-libs/libX11 - xft? ( x11-libs/libXft ) - xinerama? ( x11-libs/libXinerama ) - xpm? ( x11-libs/libXpm ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -DOCS=( README ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-config-default.patch \ - "${FILESDIR}"/${P}-off-by-one.patch - - sed -i \ - -e '/strip/d' \ - -e 's:^ @: :g' \ - -e 's:{CC}:(CC):g' \ - Makefile gadgets/Makefile || die - - tc-export CC PKG_CONFIG -} - -src_configure() { - if use xinerama ; then - sed -e '/^LIBS/s|$| -lXinerama|' \ - -e '/^CFLAGS/s|$| -DDZEN_XINERAMA|' \ - -i config.mk || die - fi - if use xpm ; then - sed -e '/^LIBS/s|$| -lXpm|' \ - -e '/^CFLAGS/s|$| -DDZEN_XPM|' \ - -i config.mk || die - fi - if use xft ; then - sed -e '/^LIBS/s|$| $(shell ${PKG_CONFIG} --libs xft)|' \ - -e '/^CFLAGS/s|$| -DDZEN_XFT $(shell ${PKG_CONFIG} --cflags xft)|' \ - -i config.mk || die - fi -} - -src_compile() { - default - use minimal || emake -C gadgets -} - -src_install() { - default - - if ! use minimal ; then - emake -C gadgets DESTDIR="${D}" install - dobin gadgets/*.sh - dodoc gadgets/README* - fi -} diff --git a/x11-misc/dzen/dzen-0.9.5_p1.ebuild b/x11-misc/dzen/dzen-0.9.5_p1.ebuild deleted file mode 100644 index f8b22d1c4b8d..000000000000 --- a/x11-misc/dzen/dzen-0.9.5_p1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -COMMITID="488ab66019f475e35e067646621827c18a879ba1" - -DESCRIPTION="A general purpose messaging, notification and menuing program for X11" -HOMEPAGE="https://github.com/robm/dzen" -SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -IUSE="minimal xft xinerama xpm" -SLOT="2" - -RDEPEND=" - x11-libs/libX11 - xft? ( x11-libs/libXft ) - xinerama? ( x11-libs/libXinerama ) - xpm? ( x11-libs/libXpm ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-unused-but-set.patch -) -DOCS=( README ) -S=${WORKDIR}/robm-${PN}-${COMMITID:0:7} - -src_configure() { - tc-export CC PKG_CONFIG - - if use xinerama ; then - sed -e '/^LIBS/s|$| -lXinerama|' \ - -e '/^CFLAGS/s|$| -DDZEN_XINERAMA|' \ - -i config.mk || die - fi - if use xpm ; then - sed -e '/^LIBS/s|$| -lXpm|' \ - -e '/^CFLAGS/s|$| -DDZEN_XPM|' \ - -i config.mk || die - fi - if use xft ; then - sed -e '/^LIBS/s|$| $(shell ${PKG_CONFIG} --libs xft)|' \ - -e '/^CFLAGS/s|$| -DDZEN_XFT $(shell ${PKG_CONFIG} --cflags xft)|' \ - -i config.mk || die - fi -} - -src_compile() { - default - use minimal || emake -C gadgets -} - -src_install() { - default - - if ! use minimal ; then - emake -C gadgets DESTDIR="${D}" install - dobin gadgets/*.sh - dodoc gadgets/README* - fi -} diff --git a/x11-misc/dzen/dzen-0.9.5_p2.ebuild b/x11-misc/dzen/dzen-0.9.5_p2.ebuild new file mode 100644 index 000000000000..ff606eb36623 --- /dev/null +++ b/x11-misc/dzen/dzen-0.9.5_p2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +HASH_DZEN=488ab66019f475e35e067646621827c18a879ba1 + +DESCRIPTION="General purpose messaging, notification, and menu utility" +HOMEPAGE="https://github.com/robm/dzen/" +SRC_URI="https://github.com/robm/dzen/archive/${HASH_DZEN}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${HASH_DZEN} + +LICENSE="MIT" +SLOT="2" +KEYWORDS="amd64 x86" +IUSE="xinerama xpm" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXft + xinerama? ( x11-libs/libXinerama ) + xpm? ( x11-libs/libXpm ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig +" + +src_prepare() { + default + + sed -i '/strip/d; /@echo/d; s/\t@/\t/; s/-L.*/$(X11LIBS)/' \ + Makefile gadgets/Makefile || die +} + +src_compile() { + local cflags="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags x11 || die)" + local libs="$($(tc-getPKG_CONFIG) --libs x11 || die)" + + emake -C gadgets \ + CC="$(tc-getCC)" CFLAGS="${cflags}" \ + LDFLAGS="${LDFLAGS}" X11LIBS="${libs}" + + local flag + # xft always-enabled wrt bug #477656 + for flag in xft $(usev xinerama) $(usev xpm); do + cflags+=" $($(tc-getPKG_CONFIG) --cflags ${flag}) -DDZEN_${flag^^}" + libs+=" $($(tc-getPKG_CONFIG) --libs ${flag})" + done + + cflags+=" -DVERSION='\"$(ver_cut 1-3)\"'" + + emake CC="$(tc-getCC)" CFLAGS="${cflags}" LIBS="${LDFLAGS} ${libs}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C gadgets install + + dobin gadgets/*.sh + + dodoc gadgets/README* + + einstalldocs +} diff --git a/x11-misc/dzen/files/dzen-0.9.5-config-default.patch b/x11-misc/dzen/files/dzen-0.9.5-config-default.patch deleted file mode 100644 index 2fcdddbf6a68..000000000000 --- a/x11-misc/dzen/files/dzen-0.9.5-config-default.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -4,7 +4,7 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = /usr - MANPREFIX = ${PREFIX}/share/man - - X11INC = /usr/X11R6/include -@@ -19,55 +19,12 @@ - # Comment : Add # to the beginning of the respective lines - - ## Option 1: No Xinerama no XPM no XFT --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -- -- --## Option 2: No Xinerama with XPM --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -- -- --# Option 3: With Xinerama no XPM --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -- -- --## Option 4: With Xinerama and XPM --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -- -- --## Option 5: With XFT --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft` --CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft` -- -- --## Option 6: With XPM and XFT --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm `pkg-config --libs xft` --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft` -- -- --## Option 7: With Xinerama and XPM and XFT --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft` --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft` -- -- -+LIBS = -lX11 -+CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\" - - # END of feature configuration - -- --LDFLAGS = ${LIBS} -- --# Solaris, uncomment for Solaris --#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" --#LDFLAGS = ${LIBS} --#CFLAGS += -xtarget=ultra -- --# Debugging --#CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" -std=gnu89 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -O2 -pipe -DDZEN_XFT `pkg-config --cflags xft` --#LDFLAGS = ${LIBS} -+LDFLAGS += ${LIBS} - - # compiler and linker --CC = gcc --LD = ${CC} -+LD = $(CC) ---- a/gadgets/config.mk -+++ b/gadgets/config.mk -@@ -1,7 +1,7 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = /usr - MANPREFIX = ${PREFIX}/share/man - - X11INC = /usr/X11R6/include -@@ -10,9 +10,8 @@ - X11LIB = /usr/X11R6/lib - LIBS = -L/usr/lib - --CFLAGS = -Os ${INCS} --LDFLAGS = ${LIBS} -+CFLAGS += ${INCS} -+LDFLAGS += ${LIBS} - - # compiler and linker --CC = gcc --LD = ${CC} -+LD = $(CC) diff --git a/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch b/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch deleted file mode 100644 index 008fd6455014..000000000000 --- a/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/main.c -+++ b/main.c -@@ -109,7 +109,7 @@ - rem = NULL; - } - while(off < len) { -- if(i > MAX_LINE_LEN) { -+ if(i == MAX_LINE_LEN - 1) { - outbuf[i] = '\0'; - return ++off; - } diff --git a/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch b/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch deleted file mode 100644 index 9ac204e6b28e..000000000000 --- a/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch +++ /dev/null @@ -1,252 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -12,45 +12,44 @@ - @echo dzen2 build options: - @echo "CFLAGS = ${CFLAGS}" - @echo "LDFLAGS = ${LDFLAGS}" -- @echo "CC = ${CC}" -+ @echo "CC = $(CC)" - @echo "LD = ${LD}" - - .c.o: - @echo CC $< -- @${CC} -c ${CFLAGS} $< -+ $(CC) -c ${CFLAGS} $< - - ${OBJ}: dzen.h action.h config.mk - - dzen2: ${OBJ} - @echo LD $@ -- @${LD} -o $@ ${OBJ} ${LDFLAGS} -- @strip $@ -+ ${LD} -o $@ ${OBJ} ${LDFLAGS} - @echo "Run ./help for documentation" - - clean: - @echo cleaning -- @rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz -+ rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz - - dist: clean - @echo creating dist tarball -- @mkdir -p dzen2-${VERSION} -- @mkdir -p dzen2-${VERSION}/gadgets -- @mkdir -p dzen2-${VERSION}/bitmaps -- @cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION} -- @cp -R gadgets/Makefile gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets -- @cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm dzen2-${VERSION}/bitmaps -- @tar -cf dzen2-${VERSION}.tar dzen2-${VERSION} -- @gzip dzen2-${VERSION}.tar -- @rm -rf dzen2-${VERSION} -+ mkdir -p dzen2-${VERSION} -+ mkdir -p dzen2-${VERSION}/gadgets -+ mkdir -p dzen2-${VERSION}/bitmaps -+ cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION} -+ cp -R gadgets/Makefile gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets -+ cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm dzen2-${VERSION}/bitmaps -+ tar -cf dzen2-${VERSION}.tar dzen2-${VERSION} -+ gzip dzen2-${VERSION}.tar -+ rm -rf dzen2-${VERSION} - - install: all - @echo installing executable file to ${DESTDIR}${PREFIX}/bin -- @mkdir -p ${DESTDIR}${PREFIX}/bin -- @cp -f dzen2 ${DESTDIR}${PREFIX}/bin -- @chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2 -+ mkdir -p ${DESTDIR}${PREFIX}/bin -+ cp -f dzen2 ${DESTDIR}${PREFIX}/bin -+ chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2 - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin -- @rm -f ${DESTDIR}${PREFIX}/bin/dzen2 -+ rm -f ${DESTDIR}${PREFIX}/bin/dzen2 - - .PHONY: all options clean dist install uninstall ---- a/config.mk -+++ b/config.mk -@@ -4,7 +4,7 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = /usr - MANPREFIX = ${PREFIX}/share/man - - X11INC = /usr/X11R6/include -@@ -18,61 +18,12 @@ - # Uncomment: Remove # from the beginning of respective lines - # Comment : Add # to the beginning of the respective lines - --## Option 1: No Xinerama no XPM no XFT --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -- -- --## Option 2: No Xinerama with XPM --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -- -- --# Option 3: With Xinerama no XPM --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -- -- --## Option 4: With Xinerama and XPM --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -- -- --## Option 5: With XFT --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft` --CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft` -- -- --## Option 6: With XPM and XFT --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm `pkg-config --libs xft` --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft` -- -- --## Option 7: With Xinerama and XFT --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama `pkg-config --libs xft` --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XFT `pkg-config --cflags xft` -- -- --## Option 8: With Xinerama and XPM and XFT --#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft` --#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft` -- -- -+LIBS = -lX11 -+CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\" - - # END of feature configuration - -- --LDFLAGS = ${LIBS} -- --# Solaris, uncomment for Solaris --#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" --#LDFLAGS = ${LIBS} --#CFLAGS += -xtarget=ultra -- --# Debugging --#CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" -std=gnu89 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -O2 -pipe -DDZEN_XFT `pkg-config --cflags xft` --#LDFLAGS = ${LIBS} -+LDFLAGS += ${LIBS} - - # compiler and linker --CC = gcc --LD = ${CC} -+LD = $(CC) ---- a/gadgets/Makefile -+++ b/gadgets/Makefile -@@ -12,61 +12,57 @@ - @echo dzen2 gadgets build options: - @echo "CFLAGS = ${CFLAGS}" - @echo "LDFLAGS = ${LDFLAGS}" -- @echo "CC = ${CC}" -+ @echo "CC = $(CC)" - @echo "LD = ${LD}" - - .c.o: - @echo CC $< -- @${CC} -c ${CFLAGS} $< -+ $(CC) -c ${CFLAGS} $< - - ${OBJ}: dbar.h config.mk - - dbar: ${OBJ} - @echo LD $@ -- @${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS} -- @strip $@ -+ ${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS} - - gdbar: ${OBJ} - @echo LD $@ - # @${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} -L${X11LIB} -lX11 -- @${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} -- @strip $@ -+ ${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} - - gcpubar: ${OBJ} - @echo LD $@ - # @${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} -L${X11LIB} -- @${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} -- @strip $@ -+ ${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} - - textwidth: ${OBJ} - @echo LD $@ -- @${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11 -- @strip $@ -+ ${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11 - - clean: - @echo cleaning -- @rm -f ${OBJ} dbar -- @rm -f ${OBJ} gdbar -- @rm -f ${OBJ} gcpubar -- @rm -f ${OBJ} textwidth -+ rm -f ${OBJ} dbar -+ rm -f ${OBJ} gdbar -+ rm -f ${OBJ} gcpubar -+ rm -f ${OBJ} textwidth - - install: all - @echo installing executable file to ${DESTDIR}${PREFIX}/bin -- @mkdir -p ${DESTDIR}${PREFIX}/bin -- @cp -f dbar ${DESTDIR}${PREFIX}/bin -- @chmod 755 ${DESTDIR}${PREFIX}/bin/dbar -- @cp -f gdbar ${DESTDIR}${PREFIX}/bin -- @chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar -- @cp -f gcpubar ${DESTDIR}${PREFIX}/bin -- @chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar -- @cp -f textwidth ${DESTDIR}${PREFIX}/bin -- @chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth -+ mkdir -p ${DESTDIR}${PREFIX}/bin -+ cp -f dbar ${DESTDIR}${PREFIX}/bin -+ chmod 755 ${DESTDIR}${PREFIX}/bin/dbar -+ cp -f gdbar ${DESTDIR}${PREFIX}/bin -+ chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar -+ cp -f gcpubar ${DESTDIR}${PREFIX}/bin -+ chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar -+ cp -f textwidth ${DESTDIR}${PREFIX}/bin -+ chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin -- @rm -f ${DESTDIR}${PREFIX}/bin/dbar -- @rm -f ${DESTDIR}${PREFIX}/bin/gdbar -- @rm -f ${DESTDIR}${PREFIX}/bin/gcpubar -- @rm -f ${DESTDIR}${PREFIX}/bin/textwidth -+ rm -f ${DESTDIR}${PREFIX}/bin/dbar -+ rm -f ${DESTDIR}${PREFIX}/bin/gdbar -+ rm -f ${DESTDIR}${PREFIX}/bin/gcpubar -+ rm -f ${DESTDIR}${PREFIX}/bin/textwidth - - .PHONY: all options clean install uninstall ---- a/gadgets/config.mk -+++ b/gadgets/config.mk -@@ -1,7 +1,7 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = /usr - MANPREFIX = ${PREFIX}/share/man - - X11INC = /usr/X11R6/include -@@ -10,9 +10,8 @@ - X11LIB = /usr/X11R6/lib - LIBS = -L/usr/lib - --CFLAGS = -Os ${INCS} --LDFLAGS = ${LIBS} -+CFLAGS += ${INCS} -+LDFLAGS += ${LIBS} - - # compiler and linker --CC = gcc - LD = ${CC} diff --git a/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch b/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch deleted file mode 100644 index 70116ff66d2b..000000000000 --- a/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/main.c -+++ b/main.c -@@ -293,7 +293,6 @@ - static void - set_docking_ewmh_info(Display *dpy, Window w, int dock) { - unsigned long strut[12] = { 0 }; -- unsigned long strut_s[4] = { 0 }; - XWindowAttributes wa; - Atom type; - unsigned int desktop; -@@ -339,8 +338,6 @@ - strut[2] = si.y + wa.height; - strut[8] = wa.x; - strut[9] = wa.x + wa.width - 1; -- -- strut_s[2] = strut[2]; - } - else if((wa.y - si.y + wa.height) == si.height) { - #ifdef DZEN_XINERAMA -@@ -358,8 +355,6 @@ - #endif - strut[10] = wa.x; - strut[11] = wa.x + wa.width - 1; -- -- strut_s[3] = strut[3]; - } - - if(strut[2] != 0 || strut[3] != 0) { -@@ -832,11 +827,9 @@ - XFreeStringList(missing); - - if(dzen.fnpl[p].set) { -- XFontSetExtents *font_extents; - XFontStruct **xfonts; - char **font_names; - dzen.fnpl[p].ascent = dzen.fnpl[p].descent = 0; -- font_extents = XExtentsOfFontSet(dzen.fnpl[p].set); - n = XFontsOfFontSet(dzen.fnpl[p].set, &xfonts, &font_names); - for(i = 0, dzen.fnpl[p].ascent = 0, dzen.fnpl[p].descent = 0; i < n; i++) { - if(dzen.fnpl[p].ascent < (*xfonts)->ascent) ---- a/gadgets/textwidth.c -+++ b/gadgets/textwidth.c -@@ -62,11 +62,9 @@ - if(missing) - XFreeStringList(missing); - if(font.set) { -- XFontSetExtents *font_extents; - XFontStruct **xfonts; - char **font_names; - font.ascent = font.descent = 0; -- font_extents = XExtentsOfFontSet(font.set); - n = XFontsOfFontSet(font.set, &xfonts, &font_names); - for(i = 0, font.ascent = 0, font.descent = 0; i < n; i++) { - if(font.ascent < (*xfonts)->ascent) ---- a/gadgets/gcpubar.c -+++ b/gadgets/gcpubar.c -@@ -40,7 +40,6 @@ - - int main(int argc, char *argv[]) { - int i, t; -- double total; - struct cpu_info mcpu; - FILE *statfp; - char buf[256], *ep; -@@ -149,7 +148,6 @@ - while(fgets(buf, sizeof buf, statfp)) { - if(!strncmp(buf, "cpu ", 4)) { - unsigned long long unice; -- double myload; - /* linux >= 2.6 */ - if((sscanf(buf, "cpu %llu %llu %llu %llu %llu", - &ncpu.user, &unice, &ncpu.sys, &ncpu.idle, &ncpu.iowait)) < 5) { diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml index 3319f73334bb..212e88bc18d0 100644 --- a/x11-misc/dzen/metadata.xml +++ b/x11-misc/dzen/metadata.xml @@ -1,15 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <longdescription>Dzen is a general purpose messaging, notification and menuing - program for X11. It was designed to be scriptable in any language and - integrate well with window managers like dwm, wmii and xmonad though it will - work with any window manager.</longdescription> - <upstream> - <remote-id type="github">robm/dzen</remote-id> - </upstream> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> + <upstream> + <remote-id type="github">robm/dzen</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/e16-keyedit/e16-keyedit-0.9.ebuild b/x11-misc/e16-keyedit/e16-keyedit-0.9-r1.ebuild index 5e260218fef3..af2bd6118610 100644 --- a/x11-misc/e16-keyedit/e16-keyedit-0.9.ebuild +++ b/x11-misc/e16-keyedit/e16-keyedit-0.9-r1.ebuild @@ -1,28 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Key binding editor for Enlightenment DR16" HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/" -SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz" KEYWORDS="~amd64 ~x86" LICENSE="MIT-with-advertising" SLOT="0" -IUSE="gtk2" BDEPEND=" virtual/pkgconfig " DEPEND=" - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) + x11-libs/gtk+:3 " RDEPEND="${DEPEND} !x11-misc/e16keyedit " src_configure() { - econf --with-gtk=$(usex gtk2 gtk2 gtk3) + econf --with-gtk=gtk3 } diff --git a/x11-misc/e16-keyedit/metadata.xml b/x11-misc/e16-keyedit/metadata.xml index 3f0fe746899d..c742aaa36aa6 100644 --- a/x11-misc/e16-keyedit/metadata.xml +++ b/x11-misc/e16-keyedit/metadata.xml @@ -1,17 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> - <use> - <flag name="gtk2">Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3</flag> - </use> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">enlightenment</remote-id> </upstream> - <longdescription> - e16-keyedit provides a graphical interface for managing keybindings in Enlightenment E16 - </longdescription> </pkgmetadata> diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3-r1.ebuild index e0d251548c59..d9c48dc6cbeb 100644 --- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild +++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3-r1.ebuild @@ -1,32 +1,29 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 GNOME2_EAUTORECONF="yes" inherit gnome2 DESCRIPTION="Menu editor for Enlightenment DR16 written in GTK2" HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/" -SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz" LICENSE="MIT-with-advertising" SLOT="0" +KEYWORDS="~amd64 ~x86" -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" +RDEPEND=" >=gnome-base/libglade-2.4 x11-libs/gtk+:2 x11-wm/e16 " -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-no-default-docs.patch" ) +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -src_prepare() { - sed -i '1i#include <glib/gstdio.h>' src/e16menuedit2.c || die - gnome2_src_prepare -} +PATCHES=( + "${FILESDIR}"/${PN}-missing-include.patch + "${FILESDIR}"/${PN}-autotools.patch + "${FILESDIR}"/${PN}-no-common.patch +) diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-default-docs.patch b/x11-misc/e16menuedit2/files/e16menuedit2-autotools.patch index bb456d52b0d7..98ae4d6fbd99 100644 --- a/x11-misc/e16menuedit2/files/e16menuedit2-no-default-docs.patch +++ b/x11-misc/e16menuedit2/files/e16menuedit2-autotools.patch @@ -1,5 +1,5 @@ ---- e16menuedit2-0.0.3/Makefile.am.orig 2019-03-08 00:52:08.000000000 +0300 -+++ e16menuedit2-0.0.3/Makefile.am 2019-03-08 00:52:31.930201552 +0300 +--- a/Makefile.am ++++ b/Makefile.am @@ -2,15 +2,8 @@ SUBDIRS = src po pixmaps help @@ -18,3 +18,13 @@ GLADE_FILES = e16menuedit2.glade +--- a/configure.in ++++ b/configure.in +@@ -1,6 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(configure.in) ++AC_INIT(configure.ac) + AM_INIT_AUTOMAKE(e16menuedit2, 0.0.3) + AM_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch b/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch new file mode 100644 index 000000000000..25cc8908177c --- /dev/null +++ b/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch @@ -0,0 +1,10 @@ +--- a/src/e16menuedit2.c ++++ b/src/e16menuedit2.c +@@ -31,6 +31,7 @@ + #include <sys/types.h> + #include <string.h> + #include <stdarg.h> ++#include <glib/gstdio.h> + #include "callbacks.h" + #include "e16menuedit2.h" + #include "file.h" diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch new file mode 100644 index 000000000000..521be7df2b0d --- /dev/null +++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch @@ -0,0 +1,20 @@ +--- a/src/e16menu.h ++++ b/src/e16menu.h +@@ -45,6 +45,6 @@ + gboolean table_check_func (GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer user_data); + +-gchar *menu_file[MAX_RECURSION]; ++extern gchar *menu_file[MAX_RECURSION]; + + #endif /* _E16MENU_H */ +--- a/src/e16menu.c ++++ b/src/e16menu.c +@@ -34,6 +34,7 @@ + #include "treeview.h" + + extern struct global_variables gv; ++gchar *menu_file[MAX_RECURSION]; + + GtkTreeModel *load_menus_from_disk (void) + { diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml index 2f0f4890caf3..c742aaa36aa6 100644 --- a/x11-misc/e16menuedit2/metadata.xml +++ b/x11-misc/e16menuedit2/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">enlightenment</remote-id> </upstream> diff --git a/x11-misc/easystroke/Manifest b/x11-misc/easystroke/Manifest deleted file mode 100644 index 86b94c17967f..000000000000 --- a/x11-misc/easystroke/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST easystroke-0.6.0.tar.gz 121358 BLAKE2B 9a4bec134f44620b10e1af9959ac4d82cb0a7ae8ea1e33ebfdafd2bb8367b7f431e48be4386803dc498b30f11a51b448570331d544fe089523ae710ffa8625ce SHA512 a74cbdfd2b56e6b20d895297e80fb63f3d8ac938235ecf7067f984d087004af22a5ea0116ae20b948e238b02a06b14044a7025d65840f0c8d00542332387c921 diff --git a/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild deleted file mode 100644 index 74b40179af2b..000000000000 --- a/x11-misc/easystroke/easystroke-0.6.0-r3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="a gesture-recognition application for X11" -HOMEPAGE="https://sourceforge.net/apps/trac/easystroke/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-cpp/gtkmm:3.0 - dev-libs/boost:= - dev-libs/dbus-glib - dev-libs/glib:2 - x11-base/xorg-server - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXtst -" -DEPEND=" - ${RDEPEND} - dev-util/intltool - sys-devel/gettext -" -PATCHES=( - "${FILESDIR}"/${P}-cellrendertextish.patch - "${FILESDIR}"/${P}-desktop.patch - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-reinstate-signal-handlers.patch - "${FILESDIR}"/${P}-buttons-scroll-send.patch - "${FILESDIR}"/${P}-cxx11.patch - "${FILESDIR}"/${P}-abs.patch -) - -src_prepare() { - default - - tc-export CC CXX PKG_CONFIG - - if ! [[ -z ${LINGUAS} ]]; then - strip-linguas -i po/ - - local es_lingua lang - for es_lingua in $( printf "%s\n" po/*.po ); do - lang=${es_lingua/po\/} - has ${lang/.po/} ${LINGUAS} || rm ${es_lingua} - done - fi -} - -src_compile() { - append-cxxflags -std=c++11 - emake \ - AOFLAGS='' \ - LDFLAGS="${LDFLAGS}" \ - PREFIX=/usr -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install -} diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch b/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch deleted file mode 100644 index 9b4ab63828db..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-abs.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/handler.cc -+++ b/handler.cc -@@ -533,7 +533,7 @@ - virtual Grabber::State grab_mode() { return parent->grab_mode(); } - }; - --static inline float abs(float x) { return x > 0 ? x : -x; } -+static inline float easystroke_abs(float x) { return x > 0 ? x : -x; } - - class AbstractScrollHandler : public Handler { - bool have_x, have_y; -@@ -559,7 +559,7 @@ - xstate->fake_click(b2); - } - static float curve(float v) { -- return v * exp(log(abs(v))/3); -+ return v * exp(log(easystroke_abs(v))/3); - } - protected: - void move_back() { -@@ -597,8 +597,8 @@ - offset_x += factor * curve(dx/dt)*dt/20.0; - offset_y += factor * curve(dy/dt)*dt/10.0; - int b1 = 0, n1 = 0, b2 = 0, n2 = 0; -- if (abs(offset_x) > 1.0) { -- n1 = (int)floor(abs(offset_x)); -+ if (easystroke_abs(offset_x) > 1.0) { -+ n1 = (int)floor(easystroke_abs(offset_x)); - if (offset_x > 0) { - b1 = 7; - offset_x -= n1; -@@ -607,10 +607,10 @@ - offset_x += n1; - } - } -- if (abs(offset_y) > 1.0) { -- if (abs(offset_y) < 1.0) -+ if (easystroke_abs(offset_y) > 1.0) { -+ if (easystroke_abs(offset_y) < 1.0) - return; -- n2 = (int)floor(abs(offset_y)); -+ n2 = (int)floor(easystroke_abs(offset_y)); - if (offset_y > 0) { - b2 = 5; - offset_y -= n2; diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch b/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch deleted file mode 100644 index 27bfa4cfee66..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 5388934e722308cd314d65e362ddfaf6e5ab6c94 Mon Sep 17 00:00:00 2001 -From: Thomas Jaeger <ThJaeger@gmail.com> -Date: Sat, 13 Apr 2013 14:10:35 -0400 -Subject: Make buttons and scroll work properly with 'send' - ---- - handler.cc | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/handler.cc b/handler.cc -index f47aae3..c1bd279 100644 ---- a/handler.cc -+++ b/handler.cc -@@ -545,7 +545,7 @@ class AbstractScrollHandler : public Handler { - - protected: - AbstractScrollHandler() : last_t(0), offset_x(0.0), offset_y(0.0) { -- if (!prefs.move_back.get() || xstate->current_dev->absolute) -+ if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute)) - return; - Window dummy1, dummy2; - int dummy3, dummy4; -@@ -563,7 +563,7 @@ protected: - } - protected: - void move_back() { -- if (!prefs.move_back.get() || xstate->current_dev->absolute) -+ if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute)) - return; - XTestFakeMotionEvent(dpy, DefaultScreen(dpy), orig_x, orig_y, 0); - } -@@ -1115,6 +1115,8 @@ XState::XState() : current_dev(NULL), in_proximity(false), accepted(true) { - - void XState::run_action(RAction act) { - RModifiers mods = act->prepare(); -+ IF_BUTTON(act, b) -+ return handler->replace_child(new ButtonHandler(mods, b)); - if (IS_IGNORE(act)) - return handler->replace_child(new IgnoreHandler(mods)); - if (IS_SCROLL(act)) --- -1.8.4 - diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch deleted file mode 100644 index 8664ed736bae..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-cellrendertextish.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/cellrenderertextish.c -+++ b/cellrenderertextish.c -@@ -599,7 +599,7 @@ - _g_free0 (self->priv->path); - self->priv->path = _tmp3_; - g_signal_connect_object ((GtkCellEditable*) self, "editing-done", (GCallback) _cell_editable_accel_on_editing_done_gtk_cell_editable_editing_done, self, 0); -- _tmp4_ = _ ("Key combination..."); -+ _tmp4_ = ("Key combination..."); - _tmp5_ = (GtkLabel*) gtk_label_new (_tmp4_); - g_object_ref_sink (_tmp5_); - label = _tmp5_; -@@ -907,7 +907,7 @@ - const gchar* _tmp10_; - const gchar* _tmp11_ = NULL; - _tmp10_ = item; -- _tmp11_ = _ (_tmp10_); -+ _tmp11_ = (_tmp10_); - gtk_combo_box_text_append_text ((GtkComboBoxText*) self, _tmp11_); - _g_free0 (item); - } diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch deleted file mode 100644 index 8619e8e9fbdc..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/actions.cc -+++ b/actions.cc -@@ -51,10 +51,11 @@ - context->set_icon(pb, pb->get_width(), pb->get_height()); - } - --bool negate(bool b) { return !b; } -- - TreeViewMulti::TreeViewMulti() : Gtk::TreeView(), pending(false) { -- get_selection()->set_select_function(sigc::group(&negate, sigc::ref(pending))); -+ get_selection()->set_select_function( -+ [this](Glib::RefPtr<Gtk::TreeModel> const&, Gtk::TreeModel::Path const&, bool) { -+ return !pending; -+ }); - } - - enum Type { COMMAND, KEY, TEXT, SCROLL, IGNORE, BUTTON, MISC }; diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch b/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch deleted file mode 100644 index c9a75a2c4b78..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/easystroke.desktop.in -+++ b/easystroke.desktop.in -@@ -6,7 +6,7 @@ - Exec=easystroke - Icon=easystroke - Categories=GTK;Utility;Accessibility; --Actions=About;Enable;Disable;Quit -+Actions=About;Enable;Disable;Quit; - _Comment=Control your desktop using mouse gestures - - [Desktop Action About] diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch b/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch deleted file mode 100644 index ee95b21486c1..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-gentoo.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -19,14 +19,14 @@ - MENUDIR = $(PREFIX)/share/applications - LOCALEDIR= $(PREFIX)/share/locale - DFLAGS = --OFLAGS = -O2 --AOFLAGS = -O3 -+#OFLAGS = -O2 -+#AOFLAGS = -O3 - STROKEFLAGS = -Wall -std=c99 $(DFLAGS) --CXXFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags` --CFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtk+-3.0 --cflags` -DGETTEXT_PACKAGE='"easystroke"' --LDFLAGS = $(DFLAGS) -+CXXFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --cflags) -+CFLAGS += -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" $(shell $(PKG_CONFIG) gtk+-3.0 --cflags) -DGETTEXT_PACKAGE='"easystroke"' -+#LDFLAGS = $(DFLAGS) - --LIBS = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst `pkg-config gtkmm-3.0 dbus-glib-1 --libs` -+LIBS = $(DFLAGS) -lboost_serialization -lX11 -lXext -lXi -lXfixes -lXtst $(shell $(PKG_CONFIG) gtkmm-3.0 dbus-glib-1 --libs) - - BINARY = easystroke - ICON = easystroke.svg -@@ -60,7 +60,7 @@ - include $(DEPFILES) - - $(BINARY): $(OFILES) -- $(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) -+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) - - stroke.o: stroke.c - $(CC) $(STROKEFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $< -@@ -119,7 +119,7 @@ - help2man -N -n "X11 gesture recognition application" ./$(BINARY) > $@ - - install: all -- install -Ds $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY) -+ install -D $(BINARY) $(DESTDIR)$(BINDIR)/$(BINARY) - install -D -m 644 $(ICON) $(DESTDIR)$(ICONDIR)/$(ICON) - install -D -m 644 $(MENU) $(DESTDIR)$(MENUDIR)/$(MENU) - for f in $(MOFILES); do \ diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch b/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch deleted file mode 100644 index 2e96346459a8..000000000000 --- a/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7bda4bd9c705413598ee9b534884bc7f23704932 Mon Sep 17 00:00:00 2001 -From: Thomas Jaeger <ThJaeger@gmail.com> -Date: Thu, 20 Jun 2013 01:45:20 -0400 -Subject: Reinstate signal handlers that got lost in the gtk3 transition - -Also, fix a segfault when handling SIGINT. ---- - main.cc | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/main.cc b/main.cc -index 55d0b3c..8cd9c56 100644 ---- a/main.cc -+++ b/main.cc -@@ -161,7 +161,12 @@ void quit() { - xstate->bail_out(); - dead = true; - win->hide(); -- xstate->queue(sigc::ptr_fun(&Gtk::Main::quit)); -+ Glib::RefPtr<Gio::Application> app = Gio::Application::get_default(); -+ xstate->queue(sigc::mem_fun(*app.operator->(), &Gio::Application::quit)); -+} -+ -+void sig_int(int) { -+ quit(); - } - - class App : public Gtk::Application, Base { -@@ -371,6 +376,10 @@ void App::on_activate() { - - create_config_dir(); - unsetenv("DESKTOP_AUTOSTART_ID"); -+ -+ signal(SIGINT, &sig_int); -+ signal(SIGCHLD, SIG_IGN); -+ - dpy = XOpenDisplay(NULL); - if (!dpy) { - printf(_("Couldn't open display.\n")); --- -1.8.4 - diff --git a/x11-misc/easystroke/metadata.xml b/x11-misc/easystroke/metadata.xml deleted file mode 100644 index a03902e2222a..000000000000 --- a/x11-misc/easystroke/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">easystroke</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest index 4b4503716c4d..710870329cfb 100644 --- a/x11-misc/efax-gtk/Manifest +++ b/x11-misc/efax-gtk/Manifest @@ -1,3 +1 @@ -DIST efax-gtk-3.2.14.src.tgz 1241132 BLAKE2B 8907907681076d9238219a42c7a490f15b988019be2dd291131fd48122421f8f9476ae59f4832395ff56c44b0981490f3c38c49df643dbc1125f33e735392bbf SHA512 28e0814c209c4c398a27b4f421b0902942fb2088e94d992c344093d755a74176cedce2912ad6f5c0a21fde1fc57acd8c5bb97bd98c42b76bdf2ab1b5919a595e DIST efax-gtk-3.2.15.src.tgz 1253414 BLAKE2B 1cd5eadced1e1ad03cb3d05b2068ce232c5632cebdba3320b721b773685f9ba4f1c69f4f0f0f0e261fce127ccaeb2f8eb5b95a4f6cbcc7adcc36c4a22729acb8 SHA512 83ba678162c2ec5c62eeba941a712f507aaeef3a42dfffe8a7dedca72af5ee46626e9c709d7617fc3bf62191ce0f6b10bac2498e1996cc45270db638fdfb7e63 -DIST efax-gtk-3.2.9.src.tgz 1176921 BLAKE2B 327ee205a747bc6f3909143b79ae9754009bb29ca35a755581d7a1a6604a76deb0b17ae9c3a679652d2216668c540e2074432c88bb31ef5322d9723c8382fa2f SHA512 a2a4a648b95f9143f8ad3b42c3f8f86323a2b312fed87616eddeaebe06742a5a4ae841d79f3078bf9e819288252ad4d79ec429a66116c1d2b8df8a8a13cac806 diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild deleted file mode 100644 index 226321974658..000000000000 --- a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A graphical frontend for the 'efax' application" -HOMEPAGE="http://efax-gtk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -RDEPEND=" - >=dev-libs/glib-2.10 - media-libs/tiff:0= - x11-libs/libX11 - x11-libs/c++-gtk-utils:0[gtk] - x11-libs/gtk+:3 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - sys-devel/gettext -" - -DOCS="AUTHORS BUGS ChangeLog README" -PATCHES=( - "${FILESDIR}"/${PN}-3.2.13-fno-common.patch -) - -src_prepare() { - default - # Prevent sandbox violation with chown/chgrp and existing spooldir - sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die - - sed -i \ - -e '/^Categories/s:Office;::' \ - ${PN}.desktop || die -} - -src_configure() { - econf \ - --with-gtk-version=gtk3 -} - -src_install() { - default - # File collision with net-misc/efax wrt #401221 - mv "${ED}"/usr/share/man/man1/efax{,-0.9a}.1 || die - mv "${ED}"/usr/share/man/man1/efix{,-0.9a}.1 || die -} - -pkg_postinst() { - local spooldir="${EROOT}"/var/spool/fax - [[ -d ${spooldir} ]] && chown lp:lp "${spooldir}" -} diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.15-r1.ebuild index 1f8dcfaca924..88562cec60f5 100644 --- a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild +++ b/x11-misc/efax-gtk/efax-gtk-3.2.15-r1.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A graphical frontend for the 'efax' application" HOMEPAGE="http://efax-gtk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.src.tgz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" RDEPEND=" >=dev-libs/glib-2.10 - media-libs/tiff:0= + media-libs/tiff:= x11-libs/libX11 x11-libs/c++-gtk-utils:0[gtk] x11-libs/gtk+:3 diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild deleted file mode 100644 index 42e3dab12b44..000000000000 --- a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="A graphical frontend for the 'efax' application" -HOMEPAGE="http://efax-gtk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="nls" - -RDEPEND=">=dev-libs/glib-2.10 - media-libs/tiff:0 - x11-libs/libX11 - x11-libs/c++-gtk-utils:3 - x11-libs/gtk+:3" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -DOCS="AUTHORS BUGS ChangeLog README" - -src_prepare() { - # Prevent sandbox violation with chown/chgrp and existing spooldir - sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die - - sed -i \ - -e '/^Encoding/d' \ - -e '/^Icon/s:.png::' \ - -e '/^Categories/s:Application;::' \ - ${PN}.desktop || die -} - -src_configure() { - econf \ - $(use_enable nls) \ - --with-gtk-version=gtk3 -} - -src_install() { - default - # https://bugs.gentoo.org/401221 - mv -vf "${ED}"usr/share/man/man1/efax{,-0.9a}.1 || die - mv -vf "${ED}"usr/share/man/man1/efix{,-0.9a}.1 || die -} - -pkg_postinst() { - local spooldir="${EROOT}"/var/spool/fax - [[ -d ${spooldir} ]] && chown lp:lp "${spooldir}" -} diff --git a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch deleted file mode 100644 index 4cfd79afd164..000000000000 --- a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/efax/efaxos.h -+++ b/efax/efaxos.h -@@ -11,10 +11,6 @@ - #define UNIXSIGS SIGHUP, SIGQUIT, SIGIOT, SIGALRM - #define CATCHSIGS ANSISIGS, UNIXSIGS - --/* Bit order reversal table. */ -- --extern unsigned char normalbits [ ] ; -- - typedef enum ttymodes /* serial port modes: */ - { - COMMAND, /* 19200 8N1, no f/c, DTR high */ ---- a/efax/efaxlib.h -+++ b/efax/efaxlib.h -@@ -208,7 +208,7 @@ - /* Bit reversal lookup tables (note that the `normalbits' array - is the one actually used for the bit reversal. */ - --uchar reversebits [ 256 ], normalbits [ 256 ] ; -+extern uchar reversebits [ 256 ], normalbits [ 256 ] ; - - void initbittab(void) ; - ---- a/efax/efaxlib.c -+++ b/efax/efaxlib.c -@@ -48,6 +48,8 @@ - return n < 0 ; - } - -+uchar reversebits [ 256 ], normalbits [ 256 ] ; -+ - /* Provide dummy gettext() function if there is no internationalisation support */ - - #ifndef ENABLE_NLS diff --git a/x11-misc/efax-gtk/metadata.xml b/x11-misc/efax-gtk/metadata.xml index e052016ab934..a4c4439f0b67 100644 --- a/x11-misc/efax-gtk/metadata.xml +++ b/x11-misc/efax-gtk/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">efax-gtk</remote-id> </upstream> diff --git a/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.2.ebuild b/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.2.ebuild new file mode 100644 index 000000000000..aa83394f2032 --- /dev/null +++ b/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +NEED_EMACS=28 + +inherit elisp desktop xdg-utils + +DESCRIPTION="Desktop entries for handling mailto URIs with GNU Emacs" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs" +S="${WORKDIR}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_compile() { :; } + +src_install() { + newmenu - emacs-mail.desktop <<-EOF + [Desktop Entry] + Type=Application + Name=GNU Emacs (mail) + NoDisplay=true + Exec=${EPREXIX}/usr/bin/emacs -f message-mailto %u + Terminal=false + MimeType=x-scheme-handler/mailto; + EOF + + # The Desktop Entry Specification does not allow field codes like %u + # inside a quoted argument, therefore we need a shell wrapper. + # 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 + [Desktop Entry] + Type=Application + Name=Emacsclient (mail) + NoDisplay=true + 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 +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/x11-misc/emacs-desktop-mail/metadata.xml b/x11-misc/emacs-desktop-mail/metadata.xml new file mode 100644 index 000000000000..986088003fe1 --- /dev/null +++ b/x11-misc/emacs-desktop-mail/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnu-emacs@gentoo.org</email> + <name>Gentoo GNU Emacs project</name> +</maintainer> +<stabilize-allarches/> +</pkgmetadata> diff --git a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild index dd964488f2e3..db0ada949b3a 100644 --- a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild +++ b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit qmake-utils DESCRIPTION="Generative art image evolver" -HOMEPAGE=" - http://www.bottlenose.net/share/evolvotron/index.htm - https://sourceforge.net/projects/evolvotron/ -" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://sourceforge.net/projects/evolvotron/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="GPL-2" SLOT="0" @@ -19,17 +18,17 @@ RDEPEND=" dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtwidgets:5 dev-qt/qtxml:5 " DEPEND="${RDEPEND}" -DOCS=( - BUGS NEWS README TODO USAGE -) -HTML_DOCS=( - evolvotron.html +DOCS=( BUGS NEWS README TODO USAGE ) +HTML_DOCS=( evolvotron.html ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.7.1-gcc11-predicate-decl.patch ) -S=${WORKDIR}/${PN} src_configure() { eqmake5 main.pro @@ -37,9 +36,9 @@ src_configure() { src_compile() { local etsubdir - for etsubdir in \ - libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate - do + local targets=( libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate ) + + for etsubdir in ${targets[@]}; do emake sub-${etsubdir} done } @@ -49,6 +48,7 @@ src_install() { for bin in ${PN}{,_mutate,_render}; do dobin ${bin}/${bin} done + doman man/man1/* einstalldocs } diff --git a/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch b/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch new file mode 100644 index 000000000000..e21de137f746 --- /dev/null +++ b/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/787101 +--- a/libevolvotron/mutatable_image_computer_farm.h ++++ b/libevolvotron/mutatable_image_computer_farm.h +@@ -45,7 +45,7 @@ class MutatableImageComputerFarm + { + public: + //! Compare task priorities. +- bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) ++ bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) const + { + return (t0->priority() < t1->priority()); + } +@@ -56,7 +56,7 @@ class MutatableImageComputerFarm + { + public: + //! Compare task priorities. +- bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) ++ bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) const + { + return (t0->priority() > t1->priority()); + } diff --git a/x11-misc/evolvotron/metadata.xml b/x11-misc/evolvotron/metadata.xml index d46b00e11a9a..154ded0b9b65 100644 --- a/x11-misc/evolvotron/metadata.xml +++ b/x11-misc/evolvotron/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">evolvotron</remote-id> </upstream> diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild index 8676ac0f523f..896d9f96a7f7 100644 --- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild +++ b/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit flag-o-matic DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop" HOMEPAGE="http://fluxbox.sourceforge.net/fbdesk/" @@ -30,6 +32,8 @@ PATCHES=( ) src_configure() { + append-cxxflags -std=c++14 + econf \ $(use_enable debug) \ $(use_enable png) diff --git a/x11-misc/fbdesk/metadata.xml b/x11-misc/fbdesk/metadata.xml index e440ee530e1f..fab0a929d499 100644 --- a/x11-misc/fbdesk/metadata.xml +++ b/x11-misc/fbdesk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/fbpager/fbpager-20090221-r1.ebuild b/x11-misc/fbpager/fbpager-20090221-r2.ebuild index 8ab9daa7f17e..c56f9d59fa29 100644 --- a/x11-misc/fbpager/fbpager-20090221-r1.ebuild +++ b/x11-misc/fbpager/fbpager-20090221-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit flag-o-matic DESCRIPTION="A Pager for fluxbox" HOMEPAGE="http://git.fluxbox.org/fbpager.git/" @@ -16,6 +18,12 @@ DEPEND="x11-libs/libX11 xrender? ( x11-libs/libXrender )" RDEPEND="${DEPEND}" +src_prepare() { + append-cxxflags "-std=c++14" + + default +} + src_configure() { econf $(use_enable xrender) } diff --git a/x11-misc/fbpager/metadata.xml b/x11-misc/fbpager/metadata.xml index 5aaddd4e60a9..df7dfc288c87 100644 --- a/x11-misc/fbpager/metadata.xml +++ b/x11-misc/fbpager/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <use> diff --git a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r3.ebuild index b468b2a537e8..ded711fabf0b 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r1.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r3.ebuild @@ -1,55 +1,66 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python2_7 ) +EAPI=8 -inherit python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{9..11} ) -DESCRIPTION="light-weight X11 desktop panel" +inherit edo python-any-r1 toolchain-funcs + +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" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86" IUSE="alsa" RDEPEND=" dev-libs/glib:2 - alsa? ( media-libs/alsa-lib ) - x11-libs/gdk-pixbuf:2[X] + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 + alsa? ( media-libs/alsa-lib ) " DEPEND=" ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig - x11-base/xorg-proto " PATCHES=( "${FILESDIR}"/${PN}-6.1-underlinking.patch "${FILESDIR}"/${PN}-7.0-clang.patch - "${FILESDIR}"/${PN}-7.0-images.patch - "${FILESDIR}"/${PN}-7.0-shebangs.patch "${FILESDIR}"/${PN}-7.0-fno-common.patch + "${FILESDIR}"/${PN}-7.0-images.patch + "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch + "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch + "${FILESDIR}"/${PN}-7.0-python3.10.patch ) +src_prepare() { + default + 2to3 -n -w --no-diffs configure .config/*.py || die +} + src_configure() { tc-export CC + # not autotools based - local myconfigure=( - ./configure V=1 + local confargs=( + V=1 --mandir="${EPREFIX}"/usr/share/man/man1 --datadir="${EPREFIX}"/usr/share/${PN} --prefix="${EPREFIX}"/usr --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} $(usex alsa --sound --no-sound) ) - echo ${myconfigure[@]} || die - ${myconfigure[@]} || die + + edo ./configure "${confargs[@]}" } pkg_postinst() { diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild index 81e254f58b80..04f05780e684 100644 --- a/x11-misc/fbpanel/fbpanel-7.0.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild @@ -1,53 +1,66 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=8 -inherit python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{10..12} ) -DESCRIPTION="light-weight X11 desktop panel" +inherit edo python-any-r1 toolchain-funcs + +DESCRIPTION="Light-weight X11 desktop panel" HOMEPAGE="https://aanatoly.github.io/fbpanel/" SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="MIT LGPL-2+ GPL-2+" # bug #795591 SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86" +KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" IUSE="alsa" RDEPEND=" dev-libs/glib:2 - alsa? ( media-libs/alsa-lib ) - x11-libs/gdk-pixbuf:2[X] + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 + alsa? ( media-libs/alsa-lib ) " DEPEND=" ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig - x11-base/xorg-proto " PATCHES=( "${FILESDIR}"/${PN}-6.1-underlinking.patch - "${FILESDIR}"/${P}-shebangs.patch - "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${PN}-7.0-clang.patch + "${FILESDIR}"/${PN}-7.0-fno-common.patch + "${FILESDIR}"/${PN}-7.0-images.patch + "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch + "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch + "${FILESDIR}"/${PN}-7.0-python3.10.patch ) +src_prepare() { + default + 2to3 -n -w --no-diffs configure .config/*.py || die +} + src_configure() { tc-export CC + # not autotools based - local myconfigure=( - ./configure V=1 + local confargs=( + V=1 --mandir="${EPREFIX}"/usr/share/man/man1 --datadir="${EPREFIX}"/usr/share/${PN} --prefix="${EPREFIX}"/usr --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} $(usex alsa --sound --no-sound) ) - echo ${myconfigure[@]} || die - ${myconfigure[@]} || die + + edo ./configure "${confargs[@]}" } pkg_postinst() { diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch b/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch index cdbe998e0660..5f98657b42c2 100644 --- a/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch +++ b/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch @@ -2,7 +2,7 @@ +++ b/.config/help @@ -1,4 +1,4 @@ -#!/usr/bin/python -+#!/usr/bin/env python2 ++#!/usr/bin/env python3 import re, os, sys, textwrap # Formats help message @@ -10,7 +10,7 @@ +++ b/.config/repl.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -+#!/usr/bin/env python2 ++#!/usr/bin/env python3 import re, sys @@ -18,7 +18,7 @@ +++ b/.config/tar.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -+#!/usr/bin/env python2 ++#!/usr/bin/env python3 import subprocess as sp import re, tempfile @@ -26,7 +26,7 @@ +++ b/configure @@ -1,4 +1,4 @@ -#!/usr/bin/python -+#!/usr/bin/env python2 ++#!/usr/bin/env python3 import sys if sys.version_info < (2, 7): diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch b/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch new file mode 100644 index 000000000000..1c7a5c0ac38e --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch @@ -0,0 +1,9 @@ +python3.10 does not allow concatenating a string with None and +this shouldn't be ran either way if None. +--- a/configure ++++ b/configure +@@ -75,3 +75,3 @@ + self).add_argument_group(title, description) +- if name != 'help' and len(name.split()) == 1: ++ if name != 'help' and len(name.split()) == 1 and title is not None: + self.add_argument("--help-" + name, group = 'help', diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch b/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch new file mode 100644 index 000000000000..b2a0375bbb11 --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/753908 + +--- a/panel/plugin.c 2015-12-05 01:34:19.000000000 -0500 ++++ b/panel/plugin.c 2020-11-10 13:35:27.794816516 -0500 +@@ -3,5 +3,4 @@ + + #include <gdk-pixbuf/gdk-pixbuf.h> +-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h> + #include <gdk/gdk.h> + #include <string.h> +--- a/plugins/icons/icons.c 2015-12-05 01:34:19.000000000 -0500 ++++ b/plugins/icons/icons.c 2020-11-10 13:35:49.852850997 -0500 +@@ -9,5 +9,4 @@ + + #include <gdk-pixbuf/gdk-pixbuf.h> +-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h> + #include <gdk/gdk.h> + +--- a/plugins/taskbar/taskbar.c 2015-12-05 01:34:19.000000000 -0500 ++++ b/plugins/taskbar/taskbar.c 2020-11-10 13:35:35.950782862 -0500 +@@ -9,5 +9,4 @@ + + #include <gdk-pixbuf/gdk-pixbuf.h> +-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h> + #include <gdk/gdk.h> + diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml index 725beec5cb42..c48026bff669 100644 --- a/x11-misc/fbpanel/metadata.xml +++ b/x11-misc/fbpanel/metadata.xml @@ -1,12 +1,8 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> - <remote-id type="sourceforge">fbpanel</remote-id> <remote-id type="github">aanatoly/fbpanel</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/fireflies/fireflies-2.08-r1.ebuild b/x11-misc/fireflies/fireflies-2.08-r1.ebuild index e317d91ac42e..7858232ef416 100644 --- a/x11-misc/fireflies/fireflies-2.08-r1.ebuild +++ b/x11-misc/fireflies/fireflies-2.08-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools multilib +EAPI=8 + +inherit autotools toolchain-funcs DESCRIPTION="Fireflies screensaver: Wicked cool eye candy" HOMEPAGE="https://github.com/mpcomplete/fireflies" @@ -11,29 +12,29 @@ SRC_URI="https://github.com/mpcomplete/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2 icu" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -RDEPEND="media-libs/libsdl[X,opengl,video] +RDEPEND=" + media-libs/libsdl[X,opengl,video] virtual/glu virtual/opengl - x11-libs/libX11" -DEPEND="${RDEPEND} - sys-devel/autoconf-archive" # for AX_CXX_BOOL macro - -DOCS=( ChangeLog README.md TODO ) + x11-libs/libX11 + elibc_musl? ( sys-libs/argp-standalone )" +DEPEND="${RDEPEND}" +BDEPEND="dev-build/autoconf-archive" # for AX_CXX_BOOL macro src_prepare() { + default eautoreconf } src_configure() { + tc-export AR econf \ - --with-confdir=/usr/share/xscreensaver/config \ - --with-bindir="/usr/$(get_libdir)/misc/xscreensaver" + --with-confdir="${EPREFIX}"/usr/share/xscreensaver/config \ + --with-bindir="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver } src_install() { - newbin {,${PN}-}add-xscreensaver - default + newbin {,${PN}-}add-xscreensaver } diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml index f52f7efd2581..6237463911e4 100644 --- a/x11-misc/fireflies/metadata.xml +++ b/x11-misc/fireflies/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="github">mpcomplete/fireflies</remote-id> - </upstream> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="github">mpcomplete/fireflies</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-respect-CXXFLAGS.patch b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-respect-CXXFLAGS.patch new file mode 100644 index 000000000000..0da271d43b06 --- /dev/null +++ b/x11-misc/flow-pomodoro/files/flow-pomodoro-1.2.0-respect-CXXFLAGS.patch @@ -0,0 +1,23 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,15 +12,16 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) + include_directories(${Qt5Core_INCLUDES}) + include_directories(${Qt5Gui_INCLUDES}) + +-set(CMAKE_CXX_FLAGS "${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}") ++set(CMAKE_CXX_FLAGS "${Qt5Gui_EXECUTABLE_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS}") + + include(CheckCXXCompilerFlag) ++ + CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) + CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) ++set(CMAKE_CXX_STANDARD_REQUIRED on) ++ + if(COMPILER_SUPPORTS_CXX11) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +-elseif(COMPILER_SUPPORTS_CXX0X) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") ++ set(CMAKE_CXX_STANDARD 11) + else() + message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") + endif() diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild index 114dc4f5294b..ec465111b73a 100644 --- a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild +++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake -DESCRIPTION="A pomodoro app that blocks distractions while you work" +DESCRIPTION="Pomodoro app that blocks distractions while you work" HOMEPAGE="https://github.com/iamsergio/flow-pomodoro" SRC_URI="https://github.com/iamsergio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -25,4 +25,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-qt-5.12.patch" ) +PATCHES=( + "${FILESDIR}"/${PN}-1.2.0-qt-5.12.patch + "${FILESDIR}"/${PN}-1.2.0-respect-CXXFLAGS.patch +) diff --git a/x11-misc/flow-pomodoro/metadata.xml b/x11-misc/flow-pomodoro/metadata.xml index b60f3a4d6b09..a3e6cef1e5e2 100644 --- a/x11-misc/flow-pomodoro/metadata.xml +++ b/x11-misc/flow-pomodoro/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/fluxter/fluxter-0.1.0-r1.ebuild b/x11-misc/fluxter/fluxter-0.1.0-r1.ebuild new file mode 100644 index 000000000000..a171049f9525 --- /dev/null +++ b/x11-misc/fluxter/fluxter-0.1.0-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools 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" + +DEPEND=" + x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-asneeded.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++14 + + econf --datadir="${EPREFIX}"/usr/share/commonbox +} diff --git a/x11-misc/fluxter/fluxter-0.1.0.ebuild b/x11-misc/fluxter/fluxter-0.1.0.ebuild deleted file mode 100644 index daadac869e34..000000000000 --- a/x11-misc/fluxter/fluxter-0.1.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -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 - x11-libs/libSM - x11-libs/libICE" - -PATCHES=( "${FILESDIR}/${P}-asneeded.patch" ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --datadir="${EPREFIX}"/usr/share/commonbox -} diff --git a/x11-misc/fluxter/metadata.xml b/x11-misc/fluxter/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/x11-misc/fluxter/metadata.xml +++ b/x11-misc/fluxter/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest index 970a205926d3..e3b4e237cc07 100644 --- a/x11-misc/fpm2/Manifest +++ b/x11-misc/fpm2/Manifest @@ -1 +1 @@ -DIST fpm2-0.79.tar.bz2 230189 BLAKE2B 6e444dbed72a139fd7cecaa3669c0da042d17dc1adc72ff0350b4b094f990e9d19a953328319ade692088536673ca04df50624919c3a2d087486f09c8dff7fa4 SHA512 2310f69df323c172954932f9a3454fab95d1389854110c1d18bfbb0dff59f0da937cbc2641abe98c7be85b7c5a65234a925acd9f82b5643079864ce529dc92b2 +DIST fpm2-0.90.tar.xz 212972 BLAKE2B 2608b40fd39db18407da5625f07534021dee72456fe168ffcb0c7b1f0a86fae0c69cdec5a9bfbfd09838622afcf575051326b9be5c47eb69e0b089abc205f99f SHA512 e02ebbc7af4202538b85394ef2e91d6fe7b11fbe6aaec5c5bd521d473b557db4ca8426810d1bef69967496071c936a789112307fbf028a8e3771d792c97495b6 diff --git a/x11-misc/fpm2/fpm2-0.79-r1.ebuild b/x11-misc/fpm2/fpm2-0.79-r1.ebuild deleted file mode 100644 index d10f34560837..000000000000 --- a/x11-misc/fpm2/fpm2-0.79-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A GUI password manager utility with password generator" -HOMEPAGE="https://als.regnet.cz/fpm2/" -SRC_URI="https://als.regnet.cz/${PN}/download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2.10.14:2 - dev-libs/libxml2 - >=dev-libs/glib-2.16 - x11-libs/libX11" - -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/intltool" - -src_prepare() { - default - # fix tests - local x - for x in ${PN}.glade data/${PN}.desktop.in; do - echo "${x}" >> "${S}"/po/POTFILES.in || die - done -} diff --git a/x11-misc/fpm2/fpm2-0.90.ebuild b/x11-misc/fpm2/fpm2-0.90.ebuild new file mode 100644 index 000000000000..d4ee0e2a7259 --- /dev/null +++ b/x11-misc/fpm2/fpm2-0.90.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg + +DESCRIPTION="A GUI password manager utility with password generator" +HOMEPAGE="https://als.regnet.cz/fpm2/" +SRC_URI="https://als.regnet.cz/${PN}/download/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="amd64 x86" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/nettle + x11-libs/gtk+:3 + x11-libs/libX11" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig" + +src_prepare() { + default + # gettext make check failure + echo "data/fpm2.desktop.in" >> po/POTFILES.in || die +} diff --git a/x11-misc/fpm2/metadata.xml b/x11-misc/fpm2/metadata.xml index 15fd2f3a22be..115e9d64a669 100644 --- a/x11-misc/fpm2/metadata.xml +++ b/x11-misc/fpm2/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>johu@gentoo.org</email> - <name>Johannes Huber</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch b/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch new file mode 100644 index 000000000000..ddd64f4a386d --- /dev/null +++ b/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch @@ -0,0 +1,12 @@ +--- a/common.h ++++ b/common.h +@@ -44,6 +44,9 @@ + #include <boost/scoped_array.hpp> + #include <boost/scoped_ptr.hpp> + ++#ifndef __STRING ++#define __STRING(x) #x ++#endif + #define stringify(S) __STRING(S) + + typedef unsigned int uint; diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild index d7c7c844b28a..3c2f4e2c9752 100644 --- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild +++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild @@ -1,16 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils DESCRIPTION="Fractal planet and terrain generator" -HOMEPAGE=" - http://www.bottlenose.net/share/fracplanet/index.htm - https://sourceforge.net/projects/fracplanet/ -" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://sourceforge.net/projects/fracplanet/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -21,13 +18,17 @@ RDEPEND=" dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtopengl:5 + dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5 virtual/glu virtual/opengl " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-0.5.1-musl.patch +) + HTML_DOCS=( fracplanet.{htm,css} ) src_configure() { diff --git a/x11-misc/fracplanet/metadata.xml b/x11-misc/fracplanet/metadata.xml index 3d9147f83aa8..0566d2147873 100644 --- a/x11-misc/fracplanet/metadata.xml +++ b/x11-misc/fracplanet/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> </maintainer> <upstream> <remote-id type="sourceforge">fracplanet</remote-id> diff --git a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild index 0b5059a75c4d..afb5f4538267 100644 --- a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild +++ b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,8 +6,8 @@ EAPI=7 inherit qmake-utils toolchain-funcs xdg DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals" -HOMEPAGE="https://fraqtive.mimec.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +HOMEPAGE="https://fraqtive.mimec.org/ https://github.com/mimecorg/fraqtive" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/x11-misc/fraqtive/metadata.xml b/x11-misc/fraqtive/metadata.xml index bc3bafc915e7..ee82dad00b2a 100644 --- a/x11-misc/fraqtive/metadata.xml +++ b/x11-misc/fraqtive/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">fraqtive</remote-id> - </upstream> +<!-- 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..00c64acedb9c 100644 --- a/x11-misc/ftmenu/ftmenu-0.4.0-r1.ebuild +++ b/x11-misc/ftmenu/ftmenu-0.4.0-r2.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 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/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${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/ftmenu/metadata.xml b/x11-misc/ftmenu/metadata.xml index 3b38ef54089f..994762e79f9f 100644 --- a/x11-misc/ftmenu/metadata.xml +++ b/x11-misc/ftmenu/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/gammastep/Manifest b/x11-misc/gammastep/Manifest new file mode 100644 index 000000000000..8271eaf5c96d --- /dev/null +++ b/x11-misc/gammastep/Manifest @@ -0,0 +1 @@ +DIST gammastep-v2.0.9.tar.bz2 540120 BLAKE2B cfc29b157ad2dbd3d6bb0ac4bdb26c958ba07cad3e817931c2ee4c2e4d15c157b7c0b8b891869ddcc2cdfc39c1d52afb8437991ae60501afee84500e1f28c694 SHA512 d8b23e5890d6135cef79057408e1b7c1dbc36444dfbfaf7c80a3f36c46df19eaded1829c2cd52365413779cc752d0911a44669b5abce16d7e266b92b15c035fb diff --git a/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild new file mode 100644 index 000000000000..92f8e6965471 --- /dev/null +++ b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild @@ -0,0 +1,85 @@ +# 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/libayatana-appindicator ) + 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/gammastep/gammastep-2.0.9-r2.ebuild b/x11-misc/gammastep/gammastep-2.0.9-r2.ebuild new file mode 100644 index 000000000000..a23136d111fb --- /dev/null +++ b/x11-misc/gammastep/gammastep-2.0.9-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +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 ~arm64 ~ppc64 ~x86" +IUSE="appindicator geoclue gtk nls wayland" + +COMMON_DEPEND=">=x11-libs/libX11-1.4 + x11-libs/libXxf86vm + x11-libs/libxcb + x11-libs/libdrm + appindicator? ( dev-libs/libayatana-appindicator ) + 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/gammastep/metadata.xml b/x11-misc/gammastep/metadata.xml new file mode 100644 index 000000000000..e737ed459914 --- /dev/null +++ b/x11-misc/gammastep/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>sping@gentoo.org</email> + </maintainer> + <use> + <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag> + </use> + <upstream> + <remote-id type="gitlab">chinstrap/gammastep</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/gbase/files/gbase-0.5-gtk.patch b/x11-misc/gbase/files/gbase-0.5-gtk.patch index 38936e79738c..55a1dfff9b95 100644 --- a/x11-misc/gbase/files/gbase-0.5-gtk.patch +++ b/x11-misc/gbase/files/gbase-0.5-gtk.patch @@ -1,26 +1,22 @@ -diff -ur gbase-0.5.orig/Makefile gbase-0.5/Makefile ---- gbase-0.5.orig/Makefile 1999-10-28 00:23:51.000000000 +0300 -+++ gbase-0.5/Makefile 2008-01-16 14:24:55.000000000 +0200 -@@ -1,15 +1,15 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,15 +1,7 @@ -CC = gcc -CCFLAGS = `gtk-config --cflags` -LDFLAGS = `gtk-config --libs` -+CC ?= gcc -+CFLAGS += `pkg-config --cflags gtk+-2.0` -+LIBS = `pkg-config --libs gtk+-2.0` ++CPPFLAGS += `${PKG_CONFIG} --cflags gtk+-2.0` ++LDLIBS = `${PKG_CONFIG} --libs gtk+-2.0` - gbase: gbase.o +-gbase: gbase.o - $(CC) gbase.o $(LDFLAGS) -o gbase -+ $(CC) $(LDFLAGS) gbase.o $(LIBS) -o gbase ++all: gbase clean: rm -f gbase gbase.o gbase.c~ - - # Make object files: - %.o: +- +-# Make object files: +-%.o: - $(CC) $(CCFLAGS) -c $*.c -+ $(CC) $(CFLAGS) -c $*.c - +- -gbase.o: gbase.c \ No newline at end of file -+gbase.o: gbase.c diff --git a/x11-misc/gbase/gbase-0.5-r1.ebuild b/x11-misc/gbase/gbase-0.5-r2.ebuild index 2a57e0d299c5..c24962442fd6 100644 --- a/x11-misc/gbase/gbase-0.5-r1.ebuild +++ b/x11-misc/gbase/gbase-0.5-r2.ebuild @@ -1,31 +1,30 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs -DESCRIPTION="a convert program for decimal, hexadecimal, octal and binary values" +DESCRIPTION="A convert program for decimal, hexadecimal, octal and binary values" HOMEPAGE="http://www.fluxcode.net" SRC_URI="http://www.fluxcode.net/files/${P}.tar.gz" LICENSE="Artistic" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RESTRICT="test" #424671 RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-gtk.patch ) -src_compile() { - tc-export CC - default +src_configure() { + tc-export CC PKG_CONFIG } src_install() { - dobin ${PN} + dobin gbase einstalldocs } diff --git a/x11-misc/gbase/metadata.xml b/x11-misc/gbase/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/gbase/metadata.xml +++ b/x11-misc/gbase/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch b/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch new file mode 100644 index 000000000000..20c8f3856de8 --- /dev/null +++ b/x11-misc/gbdfed/files/gbdfed-1.6-makefile.patch @@ -0,0 +1,13 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs + CC = @CC@ + CFLAGS = @XX_CFLAGS@ @CFLAGS@ + +-DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++DEFINES = @DEFINES@ + + SRCS = bdf.c \ + bdfcons.c \ diff --git a/x11-misc/gbdfed/gbdfed-1.6.ebuild b/x11-misc/gbdfed/gbdfed-1.6.ebuild index 2166c768e873..3f72a17df64b 100644 --- a/x11-misc/gbdfed/gbdfed-1.6.ebuild +++ b/x11-misc/gbdfed/gbdfed-1.6.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=8 DESCRIPTION="gbdfed Bitmap Font Editor" HOMEPAGE="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/" @@ -11,19 +10,15 @@ SRC_URI="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND=">=x11-libs/gtk+-2.6:2 +RDEPEND=" >=media-libs/freetype-2 + >=x11-libs/gtk+-2.6:2 x11-libs/libX11 x11-libs/pango" DEPEND="${RDEPEND}" -src_prepare() { - sed "s:-D.*_DISABLE_DEPRECATED::" -i Makefile.in || die #248562 -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README NEWS -} +PATCHES=( + # bug 248562 + "${FILESDIR}"/${P}-makefile.patch +) diff --git a/x11-misc/gbdfed/metadata.xml b/x11-misc/gbdfed/metadata.xml index cc081897d48c..ad76811405bf 100644 --- a/x11-misc/gbdfed/metadata.xml +++ b/x11-misc/gbdfed/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>fonts@gentoo.org</email> diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest index 4705b7ca2038..3eb7172a5770 100644 --- a/x11-misc/gccmakedep/Manifest +++ b/x11-misc/gccmakedep/Manifest @@ -1 +1 @@ -DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc +DIST gccmakedep-1.0.4.tar.xz 102704 BLAKE2B 2efb17475bb2d4b36f5387483b189dcc62cdddc9ed66d4c737ffa4726ea94480c67e498aaf65762dac6cdeab6596c30249aeb78703dd3e6c808b78196956f79b SHA512 7665923de51256720e7ae73c09f3c8c908c5cda2e204afac60e3c1ef45c7211cee303629ab9e53171df2a37765944a8a85a654bb1b2e90df9f497dff7d9d29a8 diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild deleted file mode 100644 index 633115b67ad5..000000000000 --- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.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 - -DESCRIPTION="create dependencies in makefiles using 'gcc -M'" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/gccmakedep" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/gccmakedep.git" - inherit autotools git-r3 - # x11-misc/util-macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -DEPEND=" - ${LIVE_DEPEND} - x11-base/xorg-proto -" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild new file mode 100644 index 000000000000..27c6ffeb9cb8 --- /dev/null +++ b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild @@ -0,0 +1,10 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="create dependencies in makefiles using 'gcc -M'" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild deleted file mode 100644 index 667579e11771..000000000000 --- a/x11-misc/gccmakedep/gccmakedep-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 - -DESCRIPTION="create dependencies in makefiles using 'gcc -M'" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/gccmakedep" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/gccmakedep.git" - inherit autotools git-r3 - # x11-misc/util-macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -DEPEND=" - ${LIVE_DEPEND} - x11-base/xorg-proto -" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} diff --git a/x11-misc/gccmakedep/metadata.xml b/x11-misc/gccmakedep/metadata.xml index e943b72b8a48..956fda190a14 100644 --- a/x11-misc/gccmakedep/metadata.xml +++ b/x11-misc/gccmakedep/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/util/gccmakedep</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest deleted file mode 100644 index 1e52ffdd565e..000000000000 --- a/x11-misc/gcolor2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gcolor2-0.4.tar.gz 375217 BLAKE2B c8bc8581c9790106a9461cda03e40c201faec95c9c0d7890dbb8903346a85208c506dd8c9cd0735036b4a294205f44c857edbae8282574d195e77f4954bae91c SHA512 9b9677b4be8797c9b03deef9bf1b96e6497d2adf85f74d01f1b478f04d92cb912790c4d5fb74f403295219cac6c0d3fcabaa7de340975bbcdb68b0347f6042a3 -DIST gcolor2.svg 12742 BLAKE2B 40f5e6624a0a90d8d8c81dd5814d836741bab04f19d73cfbd96f224baa78165447d1642c18a55ef282771a02de4bddd77d975c4aa75bb74b98d63227f87031ea SHA512 377dbd494e5a3f881df65415ee66310cd96b4e4ac668101aa068bfe6f575b694c930817cec942e885f93465d05ccc604950f2154e26be95618d6f272d81ffe1b diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch b/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch deleted file mode 100644 index cd06a8315f98..000000000000 --- a/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c ---- gcolor2-0.4.orig/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 -+++ gcolor2-0.4/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 -@@ -4,6 +4,9 @@ - - #include <gtk/gtk.h> - #include <stdio.h> -+#include <string.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - #include "callbacks.h" - #include "interface.h" -@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate - gtk_clipboard_set_text (cb, hex, strlen (hex)); - } - -+void add_rgb_file (gchar *filename, gchar *type); -+gchar* get_system_file (void); -+ - void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data) - { - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) -@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton * - gtk_widget_destroy (savedialog); - } - -+void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color); -+ - void add_color_to_treeview () - { - GtkTreeView *treeview; -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c ---- gcolor2-0.4.orig/src/main.c 2005-07-11 10:55:49.000000000 -0400 -+++ gcolor2-0.4/src/main.c 2007-02-17 19:18:23.000000000 -0500 -@@ -4,6 +4,10 @@ - - #include <gtk/gtk.h> - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - #include "interface.h" - #include "support.h" diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch deleted file mode 100644 index ee904746f147..000000000000 --- a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.old 2008-01-08 09:36:24.000000000 +0100 -+++ configure.ac 2008-01-08 09:37:06.000000000 +0100 -@@ -26,6 +26,7 @@ - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - AC_PROG_INTLTOOL([0.27]) -+PKG_PROG_PKG_CONFIG - - - GETTEXT_PACKAGE=gcolor2 diff --git a/x11-misc/gcolor2/files/modular-rgb.patch b/x11-misc/gcolor2/files/modular-rgb.patch deleted file mode 100644 index eec5668c2bc7..000000000000 --- a/x11-misc/gcolor2/files/modular-rgb.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/callbacks.h.orig 2006-01-10 21:26:19.000000000 -0500 -+++ src/callbacks.h 2006-01-10 21:26:44.000000000 -0500 -@@ -12,6 +12,7 @@ - #define SYSTEM_FILE_2 "/usr/lib/X11/rgb.txt" - #define SYSTEM_FILE_3 "/etc/X11/rgb.txt" - #define SYSTEM_FILE_4 "/usr/openwin/lib/X11/rgb.txt" -+#define SYSTEM_FILE_5 "/usr/share/X11/rgb.txt" - - /* about dialog text */ - #define ABOUT_CREDITS_TEXT "Developer:\n" \ ---- src/main.c.orig 2006-01-10 21:43:20.000000000 -0500 -+++ src/main.c 2006-01-10 21:42:14.000000000 -0500 -@@ -36,6 +36,8 @@ - sys_filename = SYSTEM_FILE_3; - else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS)) - sys_filename = SYSTEM_FILE_4; -+ else if (g_file_test (SYSTEM_FILE_5, G_FILE_TEST_EXISTS)) -+ sys_filename = SYSTEM_FILE_5; - else - return FALSE; - return TRUE; diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild deleted file mode 100644 index 0b164ecf00f6..000000000000 --- a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 - -DESCRIPTION="A GTK+ color selector" -HOMEPAGE="http://gcolor2.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - https://dev.gentoo.org/~pacho/gnome/${PN}.svg" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2.4:2" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.27 - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/modular-rgb.patch - epatch "${FILESDIR}"/${P}-amd64.patch - epatch "${FILESDIR}"/${P}-pkg-config-macro.patch - - # To check at each bump. - sed "s/^#.*/[encoding: UTF-8]/" -i po/POTFILES.in || die "sed failed" - echo "gcolor2.glade" >> po/POTFILES.in - - eautoreconf - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - # Icon from https://sourceforge.net/p/gcolor2/patches/5/ - doicon -s scalable "${DISTDIR}/${PN}.svg" - make_desktop_entry ${PN} Gcolor2 ${PN} Graphics -} diff --git a/x11-misc/gcolor2/metadata.xml b/x11-misc/gcolor2/metadata.xml deleted file mode 100644 index ed5571e57d2e..000000000000 --- a/x11-misc/gcolor2/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">gcolor2</remote-id> - </upstream> -</pkgmetadata> 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/genmenu/metadata.xml b/x11-misc/genmenu/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/x11-misc/genmenu/metadata.xml +++ b/x11-misc/genmenu/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest index bc3c6d6f994d..1d05e1f5d05d 100644 --- a/x11-misc/gigolo/Manifest +++ b/x11-misc/gigolo/Manifest @@ -1 +1 @@ -DIST gigolo-0.5.1.tar.bz2 246788 BLAKE2B 524307017a5d07107ded81af71e7758c60538abec2e75e5ab4e4f3c57ff82ea557e6f7b009ecbd6d7cd42fdf8fe8a8872ff973fc5051753dcc70341fee953bc5 SHA512 a21e2e808db4a16b7bcd9019e936cac57f67a76d6a9a9e34ed3eb7faa4cd5997bc561d1e9817d8e77efbf8ab0a954bc7f25719941672f604cc415caf0cb61e09 +DIST gigolo-0.5.3.tar.bz2 304664 BLAKE2B 958e2cdbd043adf1e4f166ca6435462ee2621d7f7bc4918505715bc3240f5ee2a60fb5a27f23a607a1ffd862d41123dfd5977aa87f7c4fe1c7a085d05aac3b2a SHA512 46d93d4c2654a91724208f144098f0a870465823a516339c8455345b5d32be6efe2b7fb13d3e5c89daf2cd919e07e5fcbdc8c8e93bce03c78dbe1907ea5edfcd diff --git a/x11-misc/gigolo/gigolo-0.5.1.ebuild b/x11-misc/gigolo/gigolo-0.5.1.ebuild deleted file mode 100644 index f68f937a31cb..000000000000 --- a/x11-misc/gigolo/gigolo-0.5.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg-utils - -DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs" -HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo" -SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.16 - >=x11-libs/gtk+-3.14:3" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig" - -src_prepare() { - rm COPYING || die - default -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/gigolo/gigolo-0.5.3.ebuild b/x11-misc/gigolo/gigolo-0.5.3.ebuild new file mode 100644 index 000000000000..294595709b70 --- /dev/null +++ b/x11-misc/gigolo/gigolo-0.5.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg-utils + +DESCRIPTION="A frontend to easily manage connections to remote filesystems using GIO/GVfs" +HOMEPAGE=" + https://www.uvena.de/gigolo/ + https://docs.xfce.org/apps/gigolo/start + https://gitlab.xfce.org/apps/gigolo/ +" +SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86" + +DEPEND=" + >=dev-libs/glib-2.38.0 + >=x11-libs/gtk+-3.14.0:3 +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig +" + +src_prepare() { + rm COPYING || die + default +} + +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/gigolo/metadata.xml b/x11-misc/gigolo/metadata.xml index 359901b31db4..2b8ef06e9a39 100644 --- a/x11-misc/gigolo/metadata.xml +++ b/x11-misc/gigolo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>xfce@gentoo.org</email> diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest index 0c1fd75d5ce5..9c3720eb890c 100644 --- a/x11-misc/gmrun/Manifest +++ b/x11-misc/gmrun/Manifest @@ -1 +1 @@ -DIST gmrun-0.9.2.tar.gz 66097 BLAKE2B 3b8f253e8d683d02c8b6cc8da3d54103b53c6b9ebd4d90b4675325809f592f407a32532e6f0d3d3a112f5c7b9304eaae75bc3ba7f1e1b372614d95206edf0da3 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422 +DIST gmrun-1.4w.tar.xz 43304 BLAKE2B 14c4ffc0770b37d851ad101c7967f691801bf2e95abb8c7fc06abc7c39f94ffac289253febb51bdba6e5237abdea38981e8072ceb997fb410620f691b8fc7ae7 SHA512 3e36304782d4d288abf2e81b4dee60230d262fa9e3ca8ab236d52619f0a226cfa95c8cc830e6506308ed65191ff7295501a9dfe162b54d67ce1f9154d33d9473 diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch deleted file mode 100644 index e1d4d6d211ac..000000000000 --- a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/gtkcompletionline.cc -+++ b/src/gtkcompletionline.cc -@@ -29,6 +29,7 @@ - #include <set> - #include <sstream> - #include <string> -+#include <cstring> - #include <vector> - using namespace std; - ---- a/src/ci_string.h -+++ b/src/ci_string.h -@@ -7,6 +7,7 @@ - #define __CI_STRING_H__ - - #include <string> -+#include <cstring> - #include <ctype.h> - - struct ci_char_traits : public std::char_traits<char> ---- a/src/prefs.cc -+++ b/src/prefs.cc -@@ -13,6 +13,7 @@ - #include <fstream> - #include <iostream> - #include <stdio.h> -+#include <stdlib.h> - - #include <list> - ---- a/src/main.cc -+++ b/src/main.cc -@@ -14,6 +14,7 @@ - #include <gdk/gdkkeysyms.h> - - #include <string> -+#include <cstring> - #include <iostream> - #include <sstream> - #include <vector> diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch deleted file mode 100644 index 3ef46c7bd653..000000000000 --- a/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 351d355835532dbea8430902977873e887dd1c12 Mon Sep 17 00:00:00 2001 -From: Lucian Poston <lucian.poston@gmail.com> -Date: Wed, 6 Dec 2017 04:22:28 -0800 -Subject: [PATCH] fix segfault in gcc-6 - ---- - src/gtkcompletionline.cc | 27 +++++++++++++++------------ - src/gtkcompletionline.h | 2 +- - 2 files changed, 16 insertions(+), 13 deletions(-) - -diff --git a/src/gtkcompletionline.cc b/src/gtkcompletionline.cc -index eb324b5..537fafb 100644 ---- a/src/gtkcompletionline.cc -+++ b/src/gtkcompletionline.cc -@@ -77,22 +77,25 @@ static gboolean - on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data); - - /* get_type */ --guint gtk_completion_line_get_type(void) -+GType gtk_completion_line_get_type(void) - { -- static guint type = 0; -+ static GType type = 0; - if (type == 0) - { -- GtkTypeInfo type_info = -+ static const GTypeInfo type_info = - { -- "GtkCompletionLine", -- sizeof(GtkCompletionLine), - sizeof(GtkCompletionLineClass), -- (GtkClassInitFunc)gtk_completion_line_class_init, -- (GtkObjectInitFunc)gtk_completion_line_init, -- /*(GtkArgSetFunc)*/NULL /* reserved */, -- /*(GtkArgGetFunc)*/NULL /* reserved */ -+ NULL, -+ NULL, -+ (GClassInitFunc)gtk_completion_line_class_init, -+ NULL, -+ NULL, -+ sizeof(GtkCompletionLine), -+ 0, -+ (GInstanceInitFunc)gtk_completion_line_init, -+ NULL - }; -- type = gtk_type_unique(gtk_entry_get_type(), &type_info); -+ type = g_type_register_static(GTK_TYPE_ENTRY, "GtkCompletionLine", &type_info, (GTypeFlags)0); - } - return type; - } -@@ -114,7 +117,7 @@ gtk_completion_line_class_init(GtkCompletionLineClass *klass) - - gtk_completion_line_signals[NOTUNIQUE] = - gtk_signal_new("notunique", -- GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class), -+ GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class), - GTK_SIGNAL_OFFSET(GtkCompletionLineClass, - notunique), - gtk_signal_default_marshaller, GTK_TYPE_NONE, 0); -@@ -778,7 +781,7 @@ complete_line(GtkCompletionLine *object) - GtkWidget * - gtk_completion_line_new() - { -- return GTK_WIDGET(gtk_type_new(gtk_completion_line_get_type())); -+ return GTK_WIDGET(g_object_new(gtk_completion_line_get_type(), NULL)); - } - - static void -diff --git a/src/gtkcompletionline.h b/src/gtkcompletionline.h -index 5e14cd7..0d7f2dc 100644 ---- a/src/gtkcompletionline.h -+++ b/src/gtkcompletionline.h -@@ -76,7 +76,7 @@ extern "C++" { - void (* cancel)(GtkCompletionLine *cl); - }; - -- guint gtk_completion_line_get_type(void); -+ GType gtk_completion_line_get_type(void); - GtkWidget *gtk_completion_line_new(); - - void gtk_completion_line_last_history_item(GtkCompletionLine*); --- -2.13.6 - diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch deleted file mode 100644 index 6e12a56f431d..000000000000 --- a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/gtkcompletionline.cc -+++ b/src/gtkcompletionline.cc -@@ -376,7 +377,7 @@ - return 0; - } - --int my_alphasort(const void* va, const void* vb) { -+int my_alphasort(const dirent** va, const dirent** vb) { - const struct dirent** a = (const struct dirent**)va; - const struct dirent** b = (const struct dirent**)vb; - diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch b/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch deleted file mode 100644 index 426f652a0c2b..000000000000 --- a/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=164339 - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in - - INCLUDES = \ -- @GTK_CFLAGS@ @STLPORT_CXXFLAGS@ -+ @GTK_CFLAGS@ - - bin_PROGRAMS = gmrun - -@@ -13,7 +13,7 @@ - - # gmrun_LDFLAGS = -s - --gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@ -+gmrun_LDADD = @GTK_LIBS@ - - AM_CPPFLAGS = \ - -DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"' ---- a/configure.in -+++ b/configure.in -@@ -37,8 +37,8 @@ - AC_HEADER_DIRENT - AC_HEADER_STDC - AC_PROG_CXX --AC_PATH_STLPORT_LIB --AC_PATH_STLPORT_INC -+dnl REMOVED _LIB -+dnl REMOVED _INC - - - AC_CHECK_FUNC( poptGetContext, diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch deleted file mode 100644 index 92db743a8df5..000000000000 --- a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -http://bugs.gentoo.org/292856 - ---- a/config/Makefile.am -+++ b/config/Makefile.am -@@ -1,6 +1,6 @@ - # $Id$ - --myrcdir = @PACKAGE_DATA_DIR@ -+myrcdir = $(sysconfdir) - myrc_DATA = gmrunrc - - EXTRA_DIST = gmrunrc ---- a/config.h.in -+++ b/config.h.in -@@ -10,7 +10,6 @@ - #undef HAVE_STPCPY - #undef HAVE_LIBSM - #undef PACKAGE_LOCALE_DIR --#undef PACKAGE_DATA_DIR - #undef PACKAGE_SOURCE_DIR - - /* Define if you have the <dirent.h> header file. */ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -15,3 +15,5 @@ - - gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@ - -+AM_CPPFLAGS = \ -+ -DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"' ---- a/src/prefs.cc -+++ b/src/prefs.cc -@@ -30,7 +30,7 @@ - - Prefs::Prefs() - { -- string file_name = PACKAGE_DATA_DIR"/"; -+ string file_name = PACKAGE_SYSCONF_DIR"/"; - file_name += GMRUNRC; - init(file_name); - diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild deleted file mode 100644 index 4a0f55c5db3e..000000000000 --- a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!" -HOMEPAGE="https://sourceforge.net/projects/gmrun/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-1" -SLOT="0" -KEYWORDS="amd64 ~mips ppc x86" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/popt - x11-libs/gtk+:2 -" -DEPEND=" - ${RDEPEND} - elibc_glibc? ( >=sys-libs/glibc-2.10 ) - sys-apps/sed - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-sysconfdir.patch \ - "${FILESDIR}"/${P}-glibc210.patch \ - "${FILESDIR}"/${P}-stlport.patch - - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog README NEWS -} diff --git a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild deleted file mode 100644 index b2ce6fb13cbd..000000000000 --- a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!" -HOMEPAGE="https://sourceforge.net/projects/gmrun/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-1" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~x86" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/popt - x11-libs/gtk+:2 -" -DEPEND=" - ${RDEPEND} - elibc_glibc? ( >=sys-libs/glibc-2.10 ) - sys-apps/sed - virtual/pkgconfig -" - -src_prepare() { - eapply \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc6-pie.patch \ - "${FILESDIR}"/${P}-sysconfdir.patch \ - "${FILESDIR}"/${P}-glibc210.patch \ - "${FILESDIR}"/${P}-stlport.patch - - eapply_user - eautoreconf -} diff --git a/x11-misc/gmrun/gmrun-1.4w-r1.ebuild b/x11-misc/gmrun/gmrun-1.4w-r1.ebuild new file mode 100644 index 000000000000..7f630b5887ad --- /dev/null +++ b/x11-misc/gmrun/gmrun-1.4w-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/WdesktopX/${PN}.git" + EGIT_BRANCH="master" +else + SRC_URI="https://github.com/wdlkmpx/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~mips ppc x86" +fi + +DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!" +HOMEPAGE="https://github.com/wdlkmpx/gmrun" + +LICENSE="ISC" +SLOT="0" +IUSE="nls xdg" + +RDEPEND="x11-libs/gtk+:3" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + econf \ + --disable-gtk2 \ + $(use_enable nls) \ + $(use_enable xdg) +} diff --git a/x11-misc/gmrun/metadata.xml b/x11-misc/gmrun/metadata.xml index 16bf22d5a663..de0dd23ad806 100644 --- a/x11-misc/gmrun/metadata.xml +++ b/x11-misc/gmrun/metadata.xml @@ -1,15 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person" proxied="yes"> + <email>henning@hennsch.de</email> + <name>Henning Schild</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription> - A run utility intended to replace grun or gnome-run. Most prominent + A run utility intended to replace <pkg>x11-misc/grun</pkg> or gnome-run. Most prominent features include slim design and bash style auto-completion. </longdescription> <upstream> - <remote-id type="sourceforge">gmrun</remote-id> + <remote-id type="github">wdlkmpx/gmrun</remote-id> </upstream> + <use> + <flag name="xdg">Enable xdg spec for configuration and history files location</flag> + </use> </pkgmetadata> diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest index 2cabf769016e..40da6f970f63 100644 --- a/x11-misc/gpaste/Manifest +++ b/x11-misc/gpaste/Manifest @@ -1 +1 @@ -DIST gpaste-3.20.3.tar.gz 157869 BLAKE2B 02b52b8023c875bd3c651cc5864603812f0cfd49cfac774ee4e27eae63c66e46f34d5128b717af514cc1c57fb93a775ff01f827210bd7cfa5e9ab5de9a87fd07 SHA512 08b7c52d16e630ac57e4d583ae985763b536728ef9997ce5ecc8a8ffb9be8745e1e5aed9003a4ab522ba76a276855c6a095fef7a73b4f4d80b54c7a9c3e6e9d1 +DIST gpaste-3.42.5.tar.gz 301630 BLAKE2B bb1151ab67a798322a2c23cdc12581bf7c660dd9d7769725afe30d34619dabc6550f2ad1b22ed00f350ed8ef07230ca1de9cbd777e816959849f71d59d8cdd82 SHA512 e9ef9403131aefc5c8b5452053feaad1061274e6b2b77efd9012da418d154017833789764d8e834fcd82164948111d21000909943bd102cc9932770af7e58ebb diff --git a/x11-misc/gpaste/gpaste-3.20.3.ebuild b/x11-misc/gpaste/gpaste-3.20.3.ebuild deleted file mode 100644 index 01387a0ecc27..000000000000 --- a/x11-misc/gpaste/gpaste-3.20.3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -VALA_MIN_API_VERSION="0.30" -VALA_USE_DEPEND="vapigen" - -inherit eutils autotools gnome2-utils ltprune vala vcs-snapshot - -DESCRIPTION="Clipboard management system" -HOMEPAGE="https://github.com/Keruspe/GPaste" -SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+applet gnome vala" - -CDEPEND=" - dev-libs/appstream-glib - >=dev-libs/glib-2.48:2 - >=dev-libs/gobject-introspection-1.48.0 - sys-apps/dbus - >=x11-libs/gdk-pixbuf-2.34:2 - >=x11-libs/gtk+-3.20:3 - x11-libs/libX11 - x11-libs/libXi - gnome? ( - gnome-base/gnome-control-center:2 - media-libs/clutter - x11-libs/pango - ) -" -RDEPEND="${CDEPEND} - gnome? ( - gnome-base/gnome-shell - ) -" -DEPEND="${CDEPEND} - dev-util/intltool - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -src_prepare() { - eautoreconf - intltoolize --force --automake || die "intltoolize error" - vala_src_prepare - - if ! use gnome ; then - echo "" > data/control-center.mk || die - fi -} - -src_configure() { - econf \ - $(use_enable vala) \ - $(use_enable applet) \ - --disable-unity \ - $(use_enable gnome gnome-shell-extension) \ - --disable-static \ - --disable-schemas-compile -} - -src_install() { - default - prune_libtool_files -} - -pkg_preinst() { - gnome2_schemas_savelist -} - -pkg_postinst() { - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/x11-misc/gpaste/gpaste-3.42.5.ebuild b/x11-misc/gpaste/gpaste-3.42.5.ebuild new file mode 100644 index 000000000000..f435b161cbe4 --- /dev/null +++ b/x11-misc/gpaste/gpaste-3.42.5.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VALA_USE_DEPEND="vapigen" + +inherit meson vala gnome2-utils + +DESCRIPTION="Clipboard management system" +HOMEPAGE="https://github.com/Keruspe/GPaste" +SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+gnome +introspection systemd vala" +REQUIRED_USE=" + gnome? ( introspection ) + vala? ( introspection ) +" + +DEPEND=" + dev-libs/appstream-glib + >=dev-libs/glib-2.7:2 + sys-apps/dbus + >=x11-libs/gdk-pixbuf-2.34:2 + >=x11-libs/gtk+-3.24:3 + x11-libs/libX11 + x11-libs/libXi + x11-libs/pango + gnome? ( + >=x11-wm/mutter-41.3 + ) + introspection? ( + dev-libs/gjs + >=dev-libs/gobject-introspection-1.48.0 + >=x11-wm/mutter-41.3[introspection] + ) +" +BDEPEND=" + virtual/pkgconfig + gnome? ( + gnome-base/gnome-control-center:2 + ) + systemd? ( + sys-apps/systemd + ) + vala? ( $(vala_depend) ) +" +RDEPEND="${DEPEND} + gnome? ( + gnome-base/gnome-control-center:2 + gnome-base/gnome-shell + ) + systemd? ( + sys-apps/systemd + ) +" + +S="${WORKDIR}/GPaste-${PV}" + +src_prepare() { + use vala && vala_src_prepare + default +} + +src_configure() { + local emesonargs=( + $(meson_use systemd systemd) + -Dbash-completion=true + -Dzsh-completion=true + -Dx-keybinder=true + -Dcontrol-center-keybindings-dir=$(usex gnome '' \ + '/usr/share/gnome-control-center/keybindings') + $(meson_use introspection introspection) + $(meson_use vala vapi) + $(meson_use gnome gnome-shell) + ) + meson_src_configure +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/x11-misc/gpaste/metadata.xml b/x11-misc/gpaste/metadata.xml index 306c2a798778..ef9759095d73 100644 --- a/x11-misc/gpaste/metadata.xml +++ b/x11-misc/gpaste/metadata.xml @@ -1,16 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>leho@kraav.com</email> - <name>Leho Kraav </name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <use> - <flag name="applet">Enable gpaste-applet</flag> <flag name="gnome">Enable proper gnome support and enable gnome shell extension.</flag> </use> diff --git a/x11-misc/grabc/files/grabc-1.1-makefile.patch b/x11-misc/grabc/files/grabc-1.1-makefile.patch index 4815ae5675c5..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 @@ ---- grabc1.1/Makefile.org 1997-03-17 06:51:39.000000000 +0100 -+++ grabc1.1/Makefile 2010-02-08 12:18:34.000000000 +0100 -@@ -2,17 +2,15 @@ +--- a/Makefile ++++ b/Makefile +@@ -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 236e8510f814..d655831fd8a1 100644 --- a/x11-misc/grabc/grabc-1.1-r2.ebuild +++ b/x11-misc/grabc/grabc-1.1-r3.ebuild @@ -1,28 +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 +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" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}${PV}" PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) -src_compile() { - tc-export CC - default +src_configure() { + tc-export CC PKG_CONFIG } src_install() { diff --git a/x11-misc/grabc/metadata.xml b/x11-misc/grabc/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/grabc/metadata.xml +++ b/x11-misc/grabc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/gromit/files/gromit-20041213-build.patch b/x11-misc/gromit/files/gromit-20041213-build.patch index f61a13bcccd6..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 e14be1452ea6..a5597d8987db 100644 --- a/x11-misc/gromit/gromit-20041213-r1.ebuild +++ b/x11-misc/gromit/gromit-20041213-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="GRaphics Over MIscellaneous Things, a presentation helper" @@ -11,21 +12,19 @@ SRC_URI="http://www.home.unix-ag.org/simon/gromit/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="" RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-build.patch ) -src_compile() { - 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/gromit/metadata.xml b/x11-misc/gromit/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/x11-misc/gromit/metadata.xml +++ b/x11-misc/gromit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest index a342125ea8a5..34c75a3e0a8d 100644 --- a/x11-misc/grsync/Manifest +++ b/x11-misc/grsync/Manifest @@ -1,2 +1,2 @@ -DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d -DIST grsync-1.2.8.tar.gz 352885 BLAKE2B fc63db9b2739bc7a253b64cb1820a7c51c7408ebbe5bb950672b6ab08942726467a4966eea3da67c7c7e21e0acc703a06183d58e2fbcd1ec38370257b57bad63 SHA512 7feee6c405b20f147641e9a9a114645a7132345fcfc33c656a190aba0d2b7fedcd40f98328dfb0b123f38d8648d041a2f53cabbae0b8d53a243d3a6029bf0963 +DIST grsync-1.3.0.tar.gz 304725 BLAKE2B 4e58eb7db8082b733468b95db995a2e7f7f970cebe2b3eb614e0a828d2fb34bc20fc2163f8bca7d5d87e648cfe0dd45a0cd22319d6504e9bd491a6da462ee8a3 SHA512 2d2d9e7910f18e061c5259f51510cd5e3c14c1c15b649618ea096777531780c2d5821a7bb415cd762a695302146b4835d793d31c032667431e227ac11a7aa108 +DIST grsync-1.3.1.tar.gz 302904 BLAKE2B 26bfdc0787ed3340df866f21cad79bba6ad6bb91abc834338be1dfcbe8ae464b755b4d5832586dafb416e8e88ef97a06074b5018d14ba415f625e24c66c42bef SHA512 af3e70108085ad240b8f692f4fd389e7df42448291b721e923fb7e7309e52a673a034583e68684820b47e520386c382efe56820da7b0e7146407bd3d09f2dc72 diff --git a/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch b/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch deleted file mode 100644 index 4460f1ac94a5..000000000000 --- a/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur grsync-1.2.6.orig/src/callbacks.h grsync-1.2.6/src/callbacks.h ---- grsync-1.2.6.orig/src/callbacks.h 2013-04-30 13:48:54.000000000 +0200 -+++ grsync-1.2.6/src/callbacks.h 2020-02-27 11:34:50.861824303 +0100 -@@ -7,11 +7,11 @@ - #define ICON_PACKAGE PACKAGE_DATA_DIR "/" ICON_SOURCE - #define ICON_PACKAGE_BUSY PACKAGE_DATA_DIR "/" ICON_SOURCE_BUSY - --GtkBuilder *builder; --GtkWidget *main_window; --gchar *argv_session, *argv_filename, *icon, *icon_busy; --gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import; --GtkListStore *liststore_session; -+extern GtkBuilder *builder; -+extern GtkWidget *main_window; -+extern gchar *argv_session, *argv_filename, *icon, *icon_busy; -+extern gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import; -+extern GtkListStore *liststore_session; - - void save_settings(gchar *session, gchar *filename); - gboolean load_groups(gchar *session); -diff -Naur grsync-1.2.6.orig/src/main.c grsync-1.2.6/src/main.c ---- grsync-1.2.6.orig/src/main.c 2013-04-30 13:48:54.000000000 +0200 -+++ grsync-1.2.6/src/main.c 2020-02-27 11:35:08.548834429 +0100 -@@ -10,6 +10,12 @@ - # include <libosso.h> - #endif - -+GtkBuilder *builder; -+GtkWidget *main_window; -+gchar *argv_session, *argv_filename, *icon, *icon_busy; -+gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import; -+GtkListStore *liststore_session; -+ - int main (int argc, char *argv[]) { - #ifdef ENABLE_NLS - bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); diff --git a/x11-misc/grsync/files/grsync-1.3.0-desktop.patch b/x11-misc/grsync/files/grsync-1.3.0-desktop.patch new file mode 100644 index 000000000000..5cdc49194371 --- /dev/null +++ b/x11-misc/grsync/files/grsync-1.3.0-desktop.patch @@ -0,0 +1,24 @@ +diff -Naur grsync-1.3.0.orig/configure.in grsync-1.3.0/configure.in +--- grsync-1.3.0.orig/configure.in 2020-05-28 10:16:05.000000000 +0200 ++++ grsync-1.3.0/configure.in 2020-12-04 09:30:40.082105813 +0100 +@@ -30,7 +30,7 @@ + GTK_API_VERSION="2.0" + fi + pkg_modules="gtk+-$GTK_API_VERSION >= 2.16.0" +-OTHER_DESKTOP_ENTRIES="Icon=grsync.png" ++OTHER_DESKTOP_ENTRIES="Icon=grsync" + MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'" + MIME_OSSOCAT="" + +diff -Naur grsync-1.3.0.orig/grsync.desktop.in grsync-1.3.0/grsync.desktop.in +--- grsync-1.3.0.orig/grsync.desktop.in 2015-09-11 13:21:28.000000000 +0200 ++++ grsync-1.3.0/grsync.desktop.in 2020-12-04 09:30:50.473110946 +0100 +@@ -4,7 +4,7 @@ + Terminal=false + Type=Application + MimeType=application/x-grsync-session; +-Categories=Application;System; ++Categories=System; + GenericName=Synchronize files with rsync + GenericName[fr]=Interface GTK pour rsync + GenericName[it]=Sincronizza file con rsync diff --git a/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch b/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch new file mode 100644 index 000000000000..6d135674bac8 --- /dev/null +++ b/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch @@ -0,0 +1,21 @@ +diff -Naur grsync-1.3.0.orig/src/callbacks.c grsync-1.3.0/src/callbacks.c +--- grsync-1.3.0.orig/src/callbacks.c 2020-11-23 14:52:42.000000000 +0100 ++++ grsync-1.3.0/src/callbacks.c 2020-12-04 09:18:27.573776667 +0100 +@@ -40,12 +40,12 @@ + gboolean more = FALSE, first = TRUE; + + +-void dialog_set_labels_selectable(GtkWidget *dialog) { +- void _set_label_selectable(gpointer data, gpointer user_data) { +- GtkWidget *widget = GTK_WIDGET(data); +- if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE); +- } ++void _set_label_selectable(gpointer data, gpointer user_data) { ++ GtkWidget *widget = GTK_WIDGET(data); ++ if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE); ++} + ++void dialog_set_labels_selectable(GtkWidget *dialog) { + GtkWidget *area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog)); + GtkContainer *box = (GtkContainer *) area; + GList *children = gtk_container_get_children(box); diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild deleted file mode 100644 index 53875ffebdac..000000000000 --- a/x11-misc/grsync/grsync-1.2.6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A gtk frontend to rsync" -HOMEPAGE="http://www.opbyte.it/grsync/" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" -SRC_URI="http://www.opbyte.it/release/${P}.tar.gz" - -RDEPEND=">=x11-libs/gtk+-2.16:2 - net-misc/rsync" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/intltool" - -DOCS="AUTHORS NEWS README" - -PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) - -src_configure() { - econf --disable-unity -} diff --git a/x11-misc/grsync/grsync-1.3.0.ebuild b/x11-misc/grsync/grsync-1.3.0.ebuild new file mode 100644 index 000000000000..2fc9967fc91b --- /dev/null +++ b/x11-misc/grsync/grsync-1.3.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools xdg + +DESCRIPTION="A gtk frontend to rsync" +HOMEPAGE="http://www.opbyte.it/grsync/" +SRC_URI="http://www.opbyte.it/release/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="+gtk3" + +DEPEND=" + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( >=x11-libs/gtk+-2.16:2 )" +RDEPEND="${DEPEND} + net-misc/rsync" +BDEPEND="virtual/pkgconfig + dev-util/intltool" + +DOCS="AUTHORS NEWS README" + +PATCHES=( "${FILESDIR}"/${P}-desktop.patch + "${FILESDIR}"/${P}-nested_func.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf --disable-unity $(use_enable gtk3) +} diff --git a/x11-misc/grsync/grsync-1.2.8.ebuild b/x11-misc/grsync/grsync-1.3.1.ebuild index 9a17e6b5c3f0..20da83187937 100644 --- a/x11-misc/grsync/grsync-1.2.8.ebuild +++ b/x11-misc/grsync/grsync-1.3.1.ebuild @@ -1,17 +1,21 @@ -# 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 xdg DESCRIPTION="A gtk frontend to rsync" HOMEPAGE="http://www.opbyte.it/grsync/" +SRC_URI="http://www.opbyte.it/release/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" -SRC_URI="http://www.opbyte.it/release/${P}.tar.gz" +IUSE="+gtk3" -DEPEND=">=x11-libs/gtk+-2.16:2" +DEPEND=" + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( >=x11-libs/gtk+-2.16:2 )" RDEPEND="${DEPEND} net-misc/rsync" BDEPEND="virtual/pkgconfig @@ -19,8 +23,15 @@ BDEPEND="virtual/pkgconfig DOCS="AUTHORS NEWS README" -PATCHES=( "${FILESDIR}"/${PN}-1.2.6-gcc-10.patch ) +src_prepare() { + default + + if ! use gtk3; then + sed -e "s/gtk_widget_override_font/gtk_widget_modify_font/" \ + -i src/callbacks.c || die + fi +} src_configure() { - econf --disable-unity + econf --disable-unity $(use_enable gtk3) } diff --git a/x11-misc/grsync/metadata.xml b/x11-misc/grsync/metadata.xml index dc71e24a084b..a3e477085709 100644 --- a/x11-misc/grsync/metadata.xml +++ b/x11-misc/grsync/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> + <use> + <flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag> + </use> </pkgmetadata> diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest index ee83f7a9fec1..01aeb87985e4 100644 --- a/x11-misc/grub2-theme-preview/Manifest +++ b/x11-misc/grub2-theme-preview/Manifest @@ -1 +1 @@ -DIST grub2-theme-preview-1.4.2.tar.gz 197383 BLAKE2B e380b63fd700352fa769b86da4aa9204f0f6e375f91134cc306d2bc0b108637c17127cb22ea06259338552cf04c9087a77defa3809c759e6b8931435da79ce98 SHA512 5f53d5da1ac3fa2d6597ee88df28a4e406eb5c824ea126d4386dca3718bfe4350bf399c5a4055479d34d5dd75b947e0f0af19c1533a0ee6474fea550387f676a +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-1.4.2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild deleted file mode 100644 index 87db4a2d4a93..000000000000 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.4.2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -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="" - -RDEPEND="app-emulation/qemu - dev-libs/libisoburn - sys-fs/mtools - sys-boot/grub:2[grub_platforms_pc]" diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild new file mode 100644 index 000000000000..3ec8fd8085ea --- /dev/null +++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.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..12} ) +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/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/grub2-theme-preview/metadata.xml b/x11-misc/grub2-theme-preview/metadata.xml index 6c8025189792..41dd7b362eee 100644 --- a/x11-misc/grub2-theme-preview/metadata.xml +++ b/x11-misc/grub2-theme-preview/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> diff --git a/x11-misc/grun/grun-0.9.3-r1.ebuild b/x11-misc/grun/grun-0.9.3-r1.ebuild index 46abc996d141..e354f70eaec1 100644 --- a/x11-misc/grun/grun-0.9.3-r1.ebuild +++ b/x11-misc/grun/grun-0.9.3-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="A GTK based Run dialog resembling the Windows Run dialog, just like xexec" HOMEPAGE="https://github.com/lrgc/grun" @@ -18,15 +17,15 @@ RDEPEND=" x11-libs/gdk-pixbuf x11-libs/gtk+:2 " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) " -src_prepare() { - epatch "${FILESDIR}"/${P}-no_nls.patch -} +PATCHES=( + "${FILESDIR}"/${P}-no_nls.patch +) src_configure() { [[ -z ${TERM} ]] && TERM=xterm diff --git a/x11-misc/grun/metadata.xml b/x11-misc/grun/metadata.xml index 72895b864a21..67cdd26b910f 100644 --- a/x11-misc/grun/metadata.xml +++ b/x11-misc/grun/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/gtk2fontsel/Manifest b/x11-misc/gtk2fontsel/Manifest deleted file mode 100644 index 468d1af26032..000000000000 --- a/x11-misc/gtk2fontsel/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gtk2fontsel-0.1.tar.gz 60706 BLAKE2B e1269d0dadf09fb7332dff983aa13bc42d30860acb55779e1ffdc0079d71f500f33d0db213afc1bf6cf931a59fd9ce7464d180aab5c7c34f6a80a9141316830a SHA512 5854777853bd41da7465321bf0f73062b98979bbecc727c3a611aa193e4d436d388fea9492b8bb11f26fa97cd4a7716c34b6a621c0a6448708ca207493998294 diff --git a/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild b/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild deleted file mode 100644 index 56c2a137042b..000000000000 --- a/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A font selection tool similar to xfontsel" -HOMEPAGE="http://gtk2fontsel.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" diff --git a/x11-misc/gtk2fontsel/metadata.xml b/x11-misc/gtk2fontsel/metadata.xml deleted file mode 100644 index 1f35961e1ad6..000000000000 --- a/x11-misc/gtk2fontsel/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">gtk2fontsel</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest index 72634e172256..374ad2814200 100644 --- a/x11-misc/gtkdialog/Manifest +++ b/x11-misc/gtkdialog/Manifest @@ -1,2 +1 @@ -DIST gtkdialog-0.8.3.tar.gz 571974 BLAKE2B cfd5062ec6c255ade5467b9d6435d7529c5a55f911db8e549b19c26032aebcd1b83f2cf4ac7e2bcc9c71f9f37725c9285bbb22505ec021e7eded28ab7d382113 SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7 DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch new file mode 100644 index 000000000000..21697cfc78f7 --- /dev/null +++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch @@ -0,0 +1,11 @@ +--- a/src/variables.c ++++ b/src/variables.c +@@ -1113,7 +1113,7 @@ + actual = root; + + if (actual == NULL) +- return; ++ return 0; + + if (actual->left != NULL) + n = do_variables_count_widgets(actual->left, n); diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch new file mode 100644 index 000000000000..fd6ff011f810 --- /dev/null +++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch @@ -0,0 +1,202 @@ +Clang16 will not allow implicit function declarations and implicit integers etc. +This patch overhauls the source code for modern C. + +Bug: https://bugs.gentoo.org/875704 +Upstream PR: https://github.com/oshazard/gtkdialog/pull/81 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/src/actions.c ++++ b/src/actions.c +@@ -36,6 +36,7 @@ + #include "attributes.h" + #include "variables.h" + #include "tag_attributes.h" ++#include "gtkdialog_parser.h" + + extern gchar *option_include_file; + +--- a/src/automaton.c ++++ b/src/automaton.c +@@ -35,6 +35,7 @@ + */ + + #include <gtk/gtk.h> ++#include <glib/gprintf.h> + + #include "config.h" + #include "gtkdialog.h" +@@ -87,6 +88,8 @@ + #undef TOOLTIPS + + extern gboolean option_no_warning; ++extern void push_widget(GtkWidget * widget, int widgettype); ++int instruction_execute(instruction command); + + instruction *program = NULL; + int instruction_counter = 0; /* The first available memory cell */ +@@ -323,8 +326,7 @@ void print_command(instruction command) + fflush(stdout); + } + +-void +-print_program() ++void print_program() + { + gint pc; + instruction command; +@@ -580,8 +582,7 @@ finalize: + } + + +-int +-instruction_execute(instruction command) ++int instruction_execute(instruction command) + { + GList *element; + token Token; +@@ -911,9 +912,11 @@ gboolean widget_moved(GtkWidget *widget, + //gtk_widget_set_usize(window, + // configure->width -20, + // configure->height); ++#if HAVE_GTK==2 + gtk_widget_set_uposition(GTK_WIDGET(window), + configure->x, + configure->y); ++#endif + } + + fflush(stderr); +--- a/src/gtkdialog.h ++++ b/src/gtkdialog.h +@@ -65,5 +65,6 @@ gint get_program_from_variable(gchar *name); + void set_program_name(gchar *name); + gchar *get_program_name(void); + void load_styles_file(gchar *filename); ++int getnextchar(void); + + #endif +--- a/src/gtkdialog_parser.h ++++ b/src/gtkdialog_parser.h +@@ -385,3 +385,8 @@ typedef union YYSTYPE + extern YYSTYPE gtkdialog_lval; + + ++extern int gtkdialog_error(char *c); ++extern void run_program(void); ++extern void print_program(); ++extern int gtkdialog_lex (void); ++extern int gtkdialog_parse (void); +--- a/src/printing.c ++++ b/src/printing.c +@@ -25,6 +25,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <gtk/gtk.h> ++#include <glib/gprintf.h> + #include "gtkdialog.h" + #include "printing.h" + +--- a/src/signals.c ++++ b/src/signals.c +@@ -40,6 +40,8 @@ + //#define DEBUG_CONTENT + //#define DEBUG_TRANSITS + ++extern gboolean variables_is_avail_by_name(const char *name); ++ + /* Local variables */ + char *condexpr[] = { + "active_is_true(", "active_is_false(", "active_is_true (", "active_is_false (", +--- a/src/stringman.c ++++ b/src/stringman.c +@@ -30,6 +30,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <ctype.h> + #include <unistd.h> + #include <string.h> + #include <gtk/gtk.h> +--- a/src/variables.c ++++ b/src/variables.c +@@ -59,6 +59,7 @@ + #endif + + extern gboolean option_no_warning; ++extern int yywarning(char *c); + + /* Local function prototypes */ + #ifdef DEBUG +--- a/src/widget_notebook.c ++++ b/src/widget_notebook.c +@@ -28,6 +28,7 @@ + #include "automaton.h" + #include "widgets.h" + #include "tag_attributes.h" ++#include "signals.h" + + /* Defines */ + //#define DEBUG_CONTENT +--- a/src/widget_timer.c ++++ b/src/widget_timer.c +@@ -28,6 +28,7 @@ + #include "automaton.h" + #include "widgets.h" + #include "tag_attributes.h" ++#include "signals.h" + + /* Defines */ + //#define DEBUG_CONTENT +--- a/src/widgets.h ++++ b/src/widgets.h +@@ -38,6 +38,38 @@ + #include "variables.h" + #include "automaton.h" + ++#include "widget_window.h" ++#include "widget_vbox.h" ++#include "widget_tree.h" ++#include "widget_timer.h" ++#include "widget_text.h" ++#include "widget_terminal.h" ++#include "widget_template.h" ++#include "widget_table.h" ++#include "widget_statusbar.h" ++#include "widget_spinbutton.h" ++#include "widget_radiobutton.h" ++#include "widget_progressbar.h" ++#include "widget_pixmap.h" ++#include "widget_notebook.h" ++#include "widget_menuitem.h" ++#include "widget_menubar.h" ++#include "widget_list.h" ++#include "widget_hseparator.h" ++#include "widget_hscale.h" ++#include "widget_hbox.h" ++#include "widget_frame.h" ++#include "widget_fontbutton.h" ++#include "widget_expander.h" ++#include "widget_eventbox.h" ++#include "widget_entry.h" ++#include "widget_edit.h" ++#include "widget_comboboxtext.h" ++#include "widget_combobox.h" ++#include "widget_colorbutton.h" ++#include "widget_checkbox.h" ++#include "widget_button.h" ++ + char *widget_get_text_value(GtkWidget *widget, int type); + FILE *widget_opencommand(const char *command); + char *widgets_to_str(int itype); +--- a/src/gtkdialog.c ++++ b/src/gtkdialog.c +@@ -345,7 +345,7 @@ get_program_from_file(char *name) + * required because the #! is not included in the language. + */ + program_src = NULL; +- result = getline(&program_src, &tmp, sourcefile); ++ result = getline(&program_src, (size_t*)&tmp, sourcefile); + if (program_src[0] != '#') { + fclose(sourcefile); + sourcefile = fopen(name, "r"); diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch deleted file mode 100644 index e032c1290215..000000000000 --- a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -25,32 +25,40 @@ - AC_PROG_YACC - AC_SUBST(YACC) - -+PKG_PROG_PKG_CONFIG([0.24]) -+ - # Checks for libraries. --pkg_modules="gtk+-2.0 >= 2.0.0" --PKG_CHECK_MODULES(GTK, [$pkg_modules]) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - --pkg_modules="gthread-2.0" --PKG_CHECK_MODULES(GTHREAD, [$pkg_modules]) -+PKG_CHECK_MODULES(GTHREAD, [gthread-2.0]) - AC_SUBST(GTHREAD_CFLAGS) - AC_SUBST(GTHREAD_LIBS) - --glade_lib="libglade-2.0" --PKG_CHECK_MODULES([GLADE_LIB], \ -- [$glade_lib], \ -- AC_SUBST(HAVE_GLADE_LIB, 1),\ -- AC_SUBST(HAVE_GLADE_LIB, 0)) --AC_SUBST(GLADE_LIB_CFLAGS) --AC_SUBST(GLADE_LIB_LIBS) -- --vte_lib="vte >= 0.23.5" --PKG_CHECK_MODULES([VTE], \ -- [$vte_lib], \ -- AC_SUBST(HAVE_VTE, 1),\ -- AC_SUBST(HAVE_VTE, 0)) --AC_SUBST(VTE_CFLAGS) --AC_SUBST(VTE_LIBS) -+AC_ARG_WITH([glade], -+ AS_HELP_STRING([--with-glade], [enable support for libglade]) -+) -+ -+AC_ARG_WITH([vte], -+ AS_HELP_STRING([--with-vte], [enable support for vte]) -+) -+ -+AS_IF( -+ [test "x$with_glade" = "xyes"], -+ [PKG_CHECK_MODULES([GLADE_LIB], [libglade-2.0], [have_glade_lib=1], AC_MSG_ERROR([glade requested but not found]))], -+ [test "x$with_glade" = "xno"], -+ [have_glade_lib=0] -+) -+AC_SUBST([HAVE_GLADE_LIB], [$have_glade_lib]) -+ -+AS_IF( -+ [test "x$with_vte" = "xyes"], -+ [PKG_CHECK_MODULES([VTE], [vte >= 0.23.5], [have_vte=1], AC_MSG_ERROR([vte requested but not found]))], -+ [test "x$with_vte" = "xno"], -+ [have_vte=0] -+) -+AC_SUBST([HAVE_VTE], [$have_vte]) - - # Checks for header files. - AC_CHECK_HEADERS([locale.h]) diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild deleted file mode 100644 index 5e5b48165a4b..000000000000 --- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="A small utility for fast and easy GUI building" -HOMEPAGE="https://code.google.com/p/gtkdialog/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="glade vte" - -RDEPEND=" - x11-libs/gtk+:2 - glade? ( gnome-base/libglade ) - vte? ( x11-libs/vte:0= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - sys-devel/flex - virtual/yacc -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.3-fno-common.patch - "${FILESDIR}"/${PN}-0.8.3-optdeps.patch -) - -src_prepare() { - mv configure.{in,ac} || die - default - eautoreconf -} - -src_configure() { - econf $(use_with glade) $(use_with vte) -} - -src_install() { - # Stop make install from running gtk-update-icon-cache - emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install - einstalldocs -} diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild deleted file mode 100644 index f6947de49587..000000000000 --- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools xdg-utils - -DESCRIPTION="A small utility for fast and easy GUI building" -HOMEPAGE="https://code.google.com/p/gtkdialog/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="glade vte" - -RDEPEND=" - x11-libs/gtk+:2 - glade? ( gnome-base/libglade ) - vte? ( x11-libs/vte:0= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - sys-devel/flex - virtual/yacc -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.3-fno-common.patch - "${FILESDIR}"/${PN}-0.8.3-optdeps.patch -) - -src_prepare() { - mv configure.{in,ac} || die - default - eautoreconf -} - -src_configure() { - econf $(use_with glade) $(use_with vte) -} - -src_install() { - # Stop make install from running gtk-update-icon-cache - emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install - einstalldocs -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild index 5c51b9d790bf..74b3a58f0d7f 100644 --- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild +++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild @@ -1,37 +1,41 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools xdg-utils +EAPI=8 + +inherit autotools xdg + +if [[ "${PV}" == "99999" ]]; then + EGIT_REPO_URI="https://github.com/oshazard/gtkdialog" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz" + KEYWORDS="amd64 ppc x86" +fi DESCRIPTION="A small utility for fast and easy GUI building" HOMEPAGE="https://github.com/oshazard/gtkdialog" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gtk2" RDEPEND=" - gtk2? ( - x11-libs/gtk+:2 - x11-libs/vte:0= - ) - !gtk2? ( - x11-libs/gtk+:3 - x11-libs/vte:2.91= - ) + dev-libs/glib + x11-libs/gtk+:3 + x11-libs/vte:2.91= " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-apps/texinfo - sys-devel/flex + app-alternatives/lex virtual/pkgconfig - virtual/yacc + app-alternatives/yacc " + PATCHES=( "${FILESDIR}"/${PN}-0.8.3-fno-common.patch + "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch + "${FILESDIR}"/${PN}-0.8.3-fix-build-for-clang16.patch ) src_prepare() { @@ -40,8 +44,7 @@ src_prepare() { } src_configure() { - econf \ - $(usex gtk2 --disable-gtk3 --enable-gtk3) + econf --enable-gtk3 } src_compile() { @@ -54,11 +57,3 @@ src_install() { emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install einstalldocs } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild index 131519d09a46..4e8729405cba 100644 --- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild +++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild @@ -1,37 +1,41 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools git-r3 xdg-utils +EAPI=8 + +inherit autotools xdg + +if [[ "${PV}" == "99999" ]]; then + EGIT_REPO_URI="https://github.com/oshazard/gtkdialog" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~x86" +fi DESCRIPTION="A small utility for fast and easy GUI building" HOMEPAGE="https://github.com/oshazard/gtkdialog" -EGIT_REPO_URI="https://github.com/oshazard/gtkdialog" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="gtk2" RDEPEND=" - gtk2? ( - x11-libs/gtk+:2 - x11-libs/vte:0= - ) - !gtk2? ( - x11-libs/gtk+:3 - x11-libs/vte:2.91= - ) + dev-libs/glib + x11-libs/gtk+:3 + x11-libs/vte:2.91= " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-apps/texinfo - sys-devel/flex + app-alternatives/lex virtual/pkgconfig - virtual/yacc + app-alternatives/yacc " + PATCHES=( "${FILESDIR}"/${PN}-0.8.3-fno-common.patch + "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch + "${FILESDIR}"/${PN}-0.8.3-fix-build-for-clang16.patch ) src_prepare() { @@ -40,8 +44,7 @@ src_prepare() { } src_configure() { - econf \ - $(usex gtk2 --disable-gtk3 --enable-gtk3) + econf --enable-gtk3 } src_compile() { @@ -54,11 +57,3 @@ src_install() { emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install einstalldocs } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml index 7d0ca79e2c46..97441428731f 100644 --- a/x11-misc/gtkdialog/metadata.xml +++ b/x11-misc/gtkdialog/metadata.xml @@ -1,25 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>desktop-misc@gentoo.org</email> -<name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -<longdescription> -gtkdialog is a GUI-creation utility that can be used with an arbitrary -interpreter. It enables the programmer to describe a graphical user interface -in a simple XML-like language, and use it with any interpreter that supports -either files, standard I/O, or environment variables. It can be called as an -external program from the interpreter, but can be used as a stand-alone -framework for the application as well. Stand-alone, bash, and awk examples are -provided. -</longdescription> -<upstream> -<remote-id type="google-code">gtkdialog</remote-id> -</upstream> -<use> -<flag name="glade">Enable support for <pkg>gnome-base/libglade</pkg></flag> -<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag> -<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg></flag> -</use> + <!-- maintainer-needed --> + <longdescription> + gtkdialog is a GUI-creation utility that can be used with an arbitrary + interpreter. It enables the programmer to describe a graphical user interface + in a simple XML-like language, and use it with any interpreter that supports + either files, standard I/O, or environment variables. It can be called as an + external program from the interpreter, but can be used as a stand-alone + framework for the application as well. Stand-alone, bash, and awk examples are + provided. + </longdescription> + <upstream> + <remote-id type="github">oshazard/gtkdialog</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest index 2d117bb19988..cd0bf9b42abb 100644 --- a/x11-misc/gxmessage/Manifest +++ b/x11-misc/gxmessage/Manifest @@ -1,3 +1 @@ -DIST gxmessage-2.20.3.tar.gz 274110 BLAKE2B 9863e680b1d23ba3d69c35e2de826106f1078f585c0be36d1ad51946abbeef8637bc2f872f9fee20738c978146adebfbe47548de48be6b12b92c314ed93d9c32 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27 -DIST gxmessage-2.20.4.tar.gz 274356 BLAKE2B f3325f870e63429934514d2e1bf3debd2827591e776c43213aae84543623484f912b61f7541e37622a28b1e4dfd5044f0b85e664cae2cb8610b3f77c32a9f4be SHA512 43891fc44d9125921150f9330c7ebafd9086866bde27a635ef0f6b30f2d2fa49b01dcd9a6bf65d6dcdec11de07748993057871c77387f51894c150550e3c160f DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a diff --git a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild deleted file mode 100644 index 3de3cbc42142..000000000000 --- a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit gnome2-utils - -DESCRIPTION="A GTK+ based xmessage clone" -HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz - http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz" - -LICENSE="GPL-3 public-domain" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2.20:2" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=dev-util/intltool-0.40.1 - sys-devel/gettext" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO ) - -src_install() { - default - - docinto examples - dodoc examples/* -} - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } diff --git a/x11-misc/gxmessage/gxmessage-2.20.4.ebuild b/x11-misc/gxmessage/gxmessage-2.20.4.ebuild deleted file mode 100644 index e02454624a6c..000000000000 --- a/x11-misc/gxmessage/gxmessage-2.20.4.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 -inherit xdg-utils - -DESCRIPTION="A GTK+ based xmessage clone" -HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3 public-domain" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -RDEPEND=" - >=x11-libs/gtk+-2.20:2 -" -DEPEND=" - ${RDEPEND} - >=dev-util/intltool-0.40.1 - sys-devel/gettext - virtual/pkgconfig -" -DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO ) - -src_install() { - default - - docinto examples - dodoc examples/* -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild index 48f933861c53..1bc2df08afe8 100644 --- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild +++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild @@ -1,28 +1,31 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit gnome2-utils +EAPI=7 + +inherit xdg DESCRIPTION="A GTK+ based xmessage clone" -HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage" +HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/ + http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage" SRC_URI="mirror://gnu/${PN}/${P}.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz" LICENSE="GPL-3 public-domain" SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="" RDEPEND=" dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango " -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-util/intltool-0.40.1 - sys-devel/gettext" + sys-devel/gettext + virtual/pkgconfig +" DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO ) @@ -32,7 +35,3 @@ src_install() { docinto examples dodoc examples/* } - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } diff --git a/x11-misc/gxmessage/metadata.xml b/x11-misc/gxmessage/metadata.xml index 2ba8e9e851e4..eb26924f8f45 100644 --- a/x11-misc/gxmessage/metadata.xml +++ b/x11-misc/gxmessage/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <maintainer type="project"> + <email>desktop-misc@gentoo.org</email> + <name>Gentoo Desktop Miscellaneous Project</name> + </maintainer> + <upstream> + <remote-id type="savannah">gxmessage</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest deleted file mode 100644 index e3fc36262dca..000000000000 --- a/x11-misc/habak/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST habak-0.2.5-sourceforge.tar.gz 28747 BLAKE2B 60c6f60e0a16dca2091f41c9e4f419e5fb4be88a3ce44de98d91740f94e468fb7bd64bbf0b399b64035c21547b50fccf2e40954e0ff59ab1f1c0ce8dc6e56670 SHA512 4b1ff1484c65f74441b297e558360a8f2ea8f12ac63c4b74f846e41328dd84a1d619bde55e81224c3bd527897625e17bc07a6bb0d4cc3bd0eec6f4e787201277 -DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188 diff --git a/x11-misc/habak/files/README.en b/x11-misc/habak/files/README.en deleted file mode 100644 index 0bdbc259119f..000000000000 --- a/x11-misc/habak/files/README.en +++ /dev/null @@ -1,165 +0,0 @@ -Habak - "Ha" Background -========= - -Compilation: - We need a compiler, X server and Imlib2. Just run make, that's all. - -Installation: - Well, place a ready binary where you want. - -A short review: - - -Habak is using layers. The lowest layer is just a black screen. -On this you can place other objects, called habaks. There are -three kinds of habaks: graphic files (images), fonts and "internal objects" -(internals). Wallaper is created by putting on a black screen -one or more habaks. An order of habaks in command line is an order -of putting them on desktop, so the last habak will be drawed above -previous habaks. - -Kinds of habaks: - - -Files (images) are included by -i option, ie: - -./habak -i ~/graphics/wallpaper.jpg - -will include to desktop wallpaper.jpg file. If you typed after -i not a file, -but a directory, habak would create a list of files contained within, randomly -select any one of them, and then try to load it. In other words, -if you have a lot of pictures in ~/gfx/nice_wallpapers/ then habak -can choose random image. You only need to run './habak -i ~/gfx/nice_wallpapers/' - -Aside from files, you can use fonts (TrueType). Option -f will be useful in this -case. By means of -f option you have to point a file with TrueType font, ie. - -./habak -f ~/.fonts/nice_font.ttf - -You can set a size of font, by typing it following slash after font name, ie -'./habak -f ~/.fonts/nice_font.ttf/50' - -Third (and last) type of habaks are internal habaks. You can enable them -by the -I option. They are not adopting any external data, but -themself generate some patterns. At this moment only two patterns -are available, "int" and "INT", which do an interlacing. For example: - -./habak -I int - -Internal habak "int" do an interlacing, by turning out even lines -of image. Very nice effect, especially if wallpaper is gaudy. -"INT" habak works identical as "int", but turns out odd lines -(by putting together "int" and "INT" you can turn out all lines of screen). - -By default lines aren't turned out in fact, but darked (in my opinion -it generates a better effect), but you can control it by --c color modifier (i will tell about it later). - - -USAGE PHILOSOPHY -You can (and you should to) put habaks together, ie. - -./habak -i ~/gfx/cool.jpg -I int -i ~/gfx/small_logo.png -f ~/.fonts/deltafont.ttf -f ~/.fonts/deltafont.ttf/10 - -that syntax means, that habak will firstly draw coll.jpg file, -then put on internal habak "interlace", and then will draw small_logo.png -image, then deltafont.ttf font, and eventually one more time deltafont.ttf -file, but this time with size of 10 pixels. Simple. - -MODIFIERS -Obviously, alone habaks wouldn't be so elastic, so there are available a lot -of modifiers that affect on them look. Some modifiers are even -necessary. Modifiers are options, that are given following -a definition of any habak - they affect only just followed habak. - -Modifier -C --C is a centering modifier. Habak that is followed by this modifier will be -centered on the screen. - -Modifier -S --S is a scaling modifier. Habak treated by this modifier will be scaled -to fill whole screen (but with proportions saved). Using it have a sense -only for file habaks (images). - -Modifier -p --p is a position modifier. It precisely determines position of habak -on desktop. This modifier requires also additional parameter, in the -form of 'x,y', ie. - -./habak -i ~/gfx/meggy.jpg -p 10,50 - -will render meggy.jpg file with upper-left corner in point 10,50 on desktop. -Coortinates can be negative, so position will be calculated from the -opposite side of screen, ie. - -./habak -i ~/gfx/meggy.jpg -p -10,50 - -will calculate "the beggining" position of habak to a ten pixels from -right and 50 pixels from upper side of screen. To place habak for example -in upper-right corner, you should use '-p -0,0' - -Modifier -c --c is a color modifier. Some habaks supports choosing a color -(at this time only font habaks and internal habaks). -C option -require parameter, that describe color in form of R,G,B,A, ie. - -./habak -I int -c 50,60,70,190 - -means using "int" habak with color: -- red component set to 50 -- green component set to 60 -- blue component set to 70 -- alpha channel set to 190 - -All numbers accepts numbers from 0 (minimal saturation) to 255 -(maximal saturation). - -For example '-c 0,0,0,255' means black, fully not transparent color, -'-c 255,255,255,0' means white, fully transparent color (so just -not visible), and '-c 200,0,0,128' is a strong red and transparent -in 50% color. - -Modifier -t -This modifier is a text modifier, works only with font habak. -As parameter accepts only one line of text, that is rendered -by the font habak. Any text is accepted, you can write kernel -version, date, your name, name of favourite distribution or -image of cat that have a lie-in on your printer. Select something, -i like a date, text will be nicely antialiased, if you want to use -not ASCII characters, you have to use utf-8 encoding. - -For example. - -./habak -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-0 -c 240,240,240,200 - -will render on a black screen for example text "User gregory on day -2003-12-21", using deltafont.ttf font in size of 15 pixels. Text -will be placed in lower-left corner of screen, gray color and will -be transparent a little. - -Obviously it is a so simple example, you can complicate it: - -./habak -i /usr/local/share/backgrounds/lens -C -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-0 -c 240,240,240,200 - -Now on the background firstly will be placed centered image -from /usr/local/share/backgrounds/lens directory, and that -text will be rendered on it. You can complicate it yet: - -./habak -i /usr/local/share/backgrounds/lens -C -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 5,-0 -c 240,240,240,100 -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-5 -c 240,240,240,255 - -This situation is simpilar, but i complicated text a little - -i generats *two* font habaks with the same content, but -one of it is displacemented a little, and have smaller -transparency. It gives so nice effect of shadow under text. By -putting together *several* such shadows differenced in size of font -and intensivity of transparency you can achieve fantastic effects. - -Finally, fire up: - -./habak -i /usr/local/share/backgrounds/lens -C -I int -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 5,-0 -c 240,240,240,100 -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-5 -c 240,240,240,255 - -Here i added an internal habak "interlace", between picture -from /usr/local/share/backgrounds/lens and font habaks, so -image is faced by small grid of interlacing, but text is not -(because it is placed above interlacing). - diff --git a/x11-misc/habak/files/habak-0.2.5-fno-common.patch b/x11-misc/habak/files/habak-0.2.5-fno-common.patch deleted file mode 100644 index 0fad5f4df563..000000000000 --- a/x11-misc/habak/files/habak-0.2.5-fno-common.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/random.c -+++ b/src/random.c -@@ -8,12 +8,15 @@ - #include <regex.h> - - #include <errno.h> -+ -+#include "i.h" -+ - extern int errno; - int syserr; - - #define ALLOC_STEP 1000 - regex_t regexp; --int size_files=0, used_files=0, i=0; -+int size_files=0, used_files=0; - char **files, *wyjscie; - regmatch_t matchpos; - ---- a/src/habak.c -+++ b/src/habak.c -@@ -14,6 +14,7 @@ - #include <Imlib2.h> - #include "types.h" - #include "proto.h" -+#include "i.h" - - habak_l *current_list_item=NULL, *first_list_item=NULL; - habak_t *current_habak; ---- /dev/null -+++ b/src/i.h -@@ -0,0 +1 @@ -+extern int i; diff --git a/x11-misc/habak/files/habak-0.2.5-gentoo.patch b/x11-misc/habak/files/habak-0.2.5-gentoo.patch deleted file mode 100644 index 2dd77451f8ad..000000000000 --- a/x11-misc/habak/files/habak-0.2.5-gentoo.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/Makefile ---- b/src/Makefile -@@ -2,22 +2,22 @@ - #LDFLAGS = -L/usr/X11R6/lib -lImlib2 -lm -g -ggdb - - CFLAGS += -I/usr/X11R6/include -Wall --LDFLAGS += -L/usr/X11R6/lib -lImlib2 -lm -+LIBS = -lm $(shell $(PKG_CONFIG) --libs imlib2 x11) - - all: habak - ln -f habak ../habak - - habak: xcore.o random.o habak.o -- gcc $(LDFLAGS) -o habak xcore.o random.o habak.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -o habak xcore.o random.o habak.o $(LIBS) - - habak.o: habak.c types.h defaults.h proto.h -- gcc $(CFLAGS) -c habak.c -o habak.o -+ $(CC) $(CFLAGS) -c habak.c -o habak.o - - random.o: random.c proto.h -- gcc $(CFLAGS) -c random.c -o random.o -+ $(CC) $(CFLAGS) -c random.c -o random.o - - xcore.o: xcore.c -- gcc $(CFLAGS) -c xcore.c -o xcore.o -+ $(CC) $(CFLAGS) -c xcore.c -o xcore.o - - clean: - rm habak *.o diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild deleted file mode 100644 index 9c1d05f55dc5..000000000000 --- a/x11-misc/habak/habak-0.2.5-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A simple but powerful tool to set desktop wallpaper" -HOMEPAGE="http://home.gna.org/fvwm-crystal/" -SRC_URI="http://download.gna.org/fvwm-crystal/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="media-libs/imlib2[X] - x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -# Skip into the src directory so we avoid a recursive make call that -# is going to break parallel make. -S="${WORKDIR}/${P}/src" - -DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en ) - -src_prepare() { - default - sed -i \ - -e '/(LDFLAGS)/s:$: -lImlib2 -lm -lX11:' \ - -e 's:gcc:$(CC):' \ - "${S}"/Makefile || die "Makefile fixing failed" -} - -src_compile() { - emake CC="$(tc-getCC)" ${PN} -} - -src_install() { - dobin ${PN} - cd "${WORKDIR}/${P}" || die - einstalldocs -} diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild deleted file mode 100644 index 4279398d92db..000000000000 --- a/x11-misc/habak/habak-0.2.5-r3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="A simple but powerful tool to set desktop wallpaper" -HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/" -SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=" - media-libs/imlib2[X] - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en ) -PATCHES=( - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-gentoo.patch -) - -src_compile() { - tc-export CC PKG_CONFIG - emake -C src ${PN} -} - -src_install() { - dobin src/${PN} - einstalldocs -} diff --git a/x11-misc/habak/metadata.xml b/x11-misc/habak/metadata.xml deleted file mode 100644 index 49c86a887b6a..000000000000 --- a/x11-misc/habak/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -</pkgmetadata> diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest index a110d242c4e7..560ae13f6941 100644 --- a/x11-misc/hsetroot/Manifest +++ b/x11-misc/hsetroot/Manifest @@ -1,3 +1 @@ -DIST hsetroot-1.0.2.tar.gz 125535 BLAKE2B 351c022e11e3d82118db451eb6d64ff765018a09fe1ac9cc3b437f7a351d575fca66619fde9671d297b346af7c7f265442d18115388d984554bf1f9af9fbe82d SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3 -DIST hsetroot_1.0.2-5.debian.tar.xz 4384 BLAKE2B 5ea72b6017a90bdf36030334c021cef1000ca29370f359f2596feea69365ebe5bd6b58286b109ca63a16dc953aea1f873ee4a7eadd50432655093d2dd7e6249d SHA512 5f1dbb00daebf6b8c9db77a51dbc463ea92b4564e0d7a2dac1ea9c316dd2e2126fb8c6454f4d1eddfd19533297e29651444987a7eacb7c0080e26c14383c827d -DIST hsetroot_1.0.2.orig.tar.gz 125621 BLAKE2B 932acda46653d2211c528008dad14c8877b0b6ace0888da19e1316af58a39b0cde0464f5dd058b752d7d95dd6d69deefc254a0a445e37077c4b177ddedf74809 SHA512 cac98cc602fd8825dbfce27d289dc4ba47805c99c78de804e95c539e83ffae6984601a535cdb90658536a007a5f17c71e27e4c31af562ade6610f11f0d0d2ca5 +DIST hsetroot-1.0.5.tar.gz 12878 BLAKE2B 54e80f00d140a83a950d98663db6555a00ac770bd85826b17d8293e3af27cba2a45c2da5e4c185ca90c6adc35bbf2ccdaa3722d015b31654d5e35f4e65a61366 SHA512 b43f7cd75886e72cb6134446d383d7d9a684c818f2d8a0f829670c8dfca5eaaa1eb6c25f30dda41f3483609b25e8a44a3a3cb3a969bba7f77a9b9df712fa2167 diff --git a/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch b/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch deleted file mode 100644 index cb18ac472306..000000000000 --- a/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -38,6 +38,8 @@ - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - -+PKG_CHECK_MODULES(X11, [x11]) -+ - # Check for imlib2 - AC_CHECK_PROGS(imlib2config_cmd, imlib2-config) - if test x$imlib2config_cmd = "x"; then ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,7 +1,7 @@ - bin_PROGRAMS = hsetroot - - AM_CFLAGS = @CFLAGS@ @IMLIB2_CFLAGS@ -Wall --LIBS = @IMLIB2_LIBS@ -+LIBS = @IMLIB2_LIBS@ $(X11_LIBS) - - hsetroot_SOURCES = hsetroot.c - diff --git a/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch b/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch new file mode 100644 index 000000000000..0585072538f2 --- /dev/null +++ b/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch @@ -0,0 +1,15 @@ +--- a/hsr-outputs.c ++++ b/hsr-outputs.c +@@ -47,7 +47,11 @@ + int + main(int argc, char **argv) + { +- Display *display = XOpenDisplay(NULL); ++ Display *display; ++ if (!(display = XOpenDisplay(NULL))) { ++ fprintf(stderr, "Cannot open X display!\n"); ++ exit(123); ++ } + + enum Format format = TEXT; + void (*print)(XineramaScreenInfo*) = print_text; diff --git a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild deleted file mode 100644 index b5f7777a34b9..000000000000 --- a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="http://cdn.thegraveyard.org/releases/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -RDEPEND="x11-libs/libX11 - >=media-libs/imlib2-1.0.6.2003[X]" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto" - -DOCS="AUTHORS ChangeLog NEWS README" - -src_prepare() { - epatch "${FILESDIR}"/${P}-underlinking.patch - # The pre-generated configure script contains unneeded deps - eautoreconf -} diff --git a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild deleted file mode 100644 index 691121fea2e5..000000000000 --- a/x11-misc/hsetroot/hsetroot-1.0.2_p5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils - -DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI=" - mirror://debian/pool/main/h/${PN}/${PN}_${PV/_p*/}.orig.tar.gz - mirror://debian/pool/main/h/${PN}/${PN}_${PV/_p*/}-${PV/*_p/}.debian.tar.xz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" - -RDEPEND=" - >=media-libs/imlib2-1.0.6.2003[X] - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -DOCS="AUTHORS ChangeLog NEWS README" -PATCHES=( - "${FILESDIR}"/${P/_p*/}-underlinking.patch - "${WORKDIR}"/debian/patches/01_fix-no-display-crash.patch - "${WORKDIR}"/debian/patches/02_extend-mode.patch - "${WORKDIR}"/debian/patches/03_cover-mode.patch -) -S=${WORKDIR}/${P/_p*/}.orig - -src_prepare() { - default - - eautoreconf -} diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild new file mode 100644 index 000000000000..36bafb0ed9cb --- /dev/null +++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X" +HOMEPAGE="https://github.com/himdel/hsetroot/" +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" + +RDEPEND=">=media-libs/imlib2-1.0.6.2003[X] + x11-libs/libX11 + x11-libs/libXinerama" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.5-XOpenDisplay.patch +) + +src_compile() { + # Avoid the Makefile that replaced autotools + tc-export CC PKG_CONFIG + local tgt hsr_comp_args + for tgt in ${PN} hsr-outputs; do + hsr_comp_args=( + ${CFLAGS} + $("${PKG_CONFIG}" --cflags x11 imlib2 xinerama) + ${LDFLAGS} + ${tgt}.c + $("${PKG_CONFIG}" --libs x11 imlib2 xinerama) + -o ${tgt} + ) + echo ${hsr_comp_args[@]} + "${CC}" ${hsr_comp_args[@]} || die + done + +} + +src_install() { + dobin ${PN} hsr-outputs + einstalldocs +} diff --git a/x11-misc/hsetroot/metadata.xml b/x11-misc/hsetroot/metadata.xml index fdbc1f83706c..d67039230924 100644 --- a/x11-misc/hsetroot/metadata.xml +++ b/x11-misc/hsetroot/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -<longdescription> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <longdescription> hsetroot is a tool which allows you to compose wallpapers ("root pixmaps") for X. It has a lot of options like rendering gradients, solids, images but it also allows you to perform manipulations on those things, or chain them together. @@ -19,5 +19,5 @@ maximum aspect). It supports the following manipulations: tinting (overlaying a color mask), blurring, sharpening, flipping (horizontally, diagonally, vertically) it also allows you to adjust brightness, contrast and gamma-level. hsetroot also supports alpha-channels when rendering things. -</longdescription> + </longdescription> </pkgmetadata> diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest new file mode 100644 index 000000000000..8691957b4ef4 --- /dev/null +++ b/x11-misc/i3blocks-contrib/Manifest @@ -0,0 +1 @@ +DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835 diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch new file mode 100644 index 000000000000..bf92d791df55 --- /dev/null +++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-fix-build-on-clang-llvm.patch @@ -0,0 +1,25 @@ +From 230f42f5bc5ebc44062820bde1e9e40ae0746c00 Mon Sep 17 00:00:00 2001 +From: Corentin Rondier <contact@rondier.io> +Date: Sun, 24 Sep 2023 23:22:58 +0200 +Subject: [PATCH] cpu_usage2: fix build failures on clang/llvm + +Remove a non-standard suffix on a floating-point literal, causing build failures on clang/LLVM + +fixes #504 +--- + cpu_usage2/cpu_usage2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpu_usage2/cpu_usage2.c b/cpu_usage2/cpu_usage2.c +index 72709037..483c4c81 100644 +--- a/cpu_usage2/cpu_usage2.c ++++ b/cpu_usage2/cpu_usage2.c +@@ -124,7 +124,7 @@ int main(int argc, char *argv[]) + sleep(t); + total = get_usage(&used); + +- display(label, 100.0D * (used - old_used) / (total - old_total), ++ display(label, 100.0 * (used - old_used) / (total - old_total), + warning, critical, decimals); + fflush(stdout); + old_total = total; diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch new file mode 100644 index 000000000000..764cd4b2b73c --- /dev/null +++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch @@ -0,0 +1,68 @@ +--- a/bandwidth2/Makefile ++++ b/bandwidth2/Makefile +@@ -1,6 +1,6 @@ + P=bandwidth2 + OBJECTS= +-CFLAGS=-g -Wall -Werror -O2 -std=c11 ++CFLAGS ?= -g -Wall -Werror -O2 -std=c11 + LDLIBS= + + $(P): $(OBJECTS) +--- a/brightness/Makefile ++++ b/brightness/Makefile +@@ -1,6 +1,6 @@ +-CC=gcc +-AS=as +-LD=ld ++CC ?= gcc ++AS ?= as ++LD ?= ld + OBJDUMP=objdump + OBJCOPY=objcopy + SIZE=size +@@ -16,14 +16,14 @@ + + PRG = brightness + INCLUDES := -Iinc +-CFLAGS := $(INCLUDES) $(DEFS) $(WARN_LEVEL) -pipe -O0 -g3 -std=c11 ++CFLAGS ?= -pipe -O0 -g3 -std=c11 + + debug: CFLAGS += -O0 -g3 + debug: all + + release: CFLAGS += -O2 + release: all +-LDFLAGS = $(LIBS) -ffunction-sections -Wl,--gc-sections ++LDFLAGS ?= -ffunction-sections -Wl,--gc-sections + + SRC_C := $(wildcard *.c) $(wildcard src/*.c) + SRC_A := $(wildcard src/*.s) +@@ -41,7 +41,7 @@ + + $(OBJ_DIR)/%.o: %.c + @mkdir -p $(@D) +- $(CC) $(CFLAGS) -o $@ -c $< ++ $(CC) $(CFLAGS) $(INCLUDES) $(DEFS) $(WARN_LEVEL) -o $@ -c $< + + $(BIN_DIR)/$(PRG): $(OBJECTS) + @mkdir -p $(@D) +--- a/cpu_usage2/Makefile ++++ b/cpu_usage2/Makefile +@@ -1,6 +1,6 @@ + P=cpu_usage2 + OBJECTS= +-CFLAGS=-g -Wall -Werror -O2 -std=gnu11 ++CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11 + LDLIBS= + + $(P): $(OBJECTS) +--- a/memory2/Makefile ++++ b/memory2/Makefile +@@ -1,6 +1,6 @@ + P=memory2 + OBJECTS= +-CFLAGS=-g -Wall -Werror -O2 -std=c11 ++CFLAGS ?= -g -Wall -Werror -O2 -std=c11 + LDLIBS= + + $(P): $(OBJECTS) diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild new file mode 100644 index 000000000000..8d3664dbaec5 --- /dev/null +++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit optfeature toolchain-funcs + +DESCRIPTION="A set of scripts for i3blocks, contributed by the community" +HOMEPAGE="https://github.com/vivien/i3blocks-contrib" +SRC_URI="https://github.com/vivien/i3blocks-contrib/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" + +DEPEND="" +RDEPEND=">=x11-misc/i3blocks-1.5" +BDEPEND="" + +PATCHES=( + "${FILESDIR}"/${P}-respect-CFLAGS.patch + "${FILESDIR}"/${P}-fix-build-on-clang-llvm.patch +) + +src_prepare() { + sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile + default +} + +src_compile() { + tc-export AR CC LD + default +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install +} + +pkg_postinst() { + optfeature_header "The following deps may be required for certain ${PN} scripts:" + optfeature "backlight" sys-power/acpilight x11-apps/xbacklight + optfeature "battery{,2,bar}" sys-power/acpi + optfeature "colorpicker" x11-misc/grabc x11-misc/xdotool + optfeature "cpu_usage" app-admin/sysstat + optfeature "disk-io" app-admin/sysstat + optfeature "email" dev-python/keyring gnome-base/gnome-keyring + optfeature "eyedropper" media-fonts/fontawesome x11-misc/grabc x11-misc/xclip + optfeature "github" dev-util/github-cli media-fonts/fontawesome + optfeature "gpu-load" x11-drivers/nvidia-drivers app-misc/radeontop + optfeature "i3-focusedwindow" x11-apps/xprop + optfeature "kbdd_layout" x11-misc/kbdd + optfeature "key_light" sys-power/upower + optfeature "kubernetes" sys-cluster/kubectl + optfeature "monitor_manager" "dev-lang/python[tk] media-fonts/fontawesome x11-apps/xrandr" + optfeature "purpleair" app-misc/jq net-misc/curl + optfeature "rofi-calendar" x11-misc/rofi + optfeature "ssid and wlan-dbm" net-wireless/iw + optfeature "temperature" sys-apps/lm-sensors + optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv[lua] x11-misc/xclip net-misc/yt-dlp" +} diff --git a/x11-misc/i3blocks-contrib/metadata.xml b/x11-misc/i3blocks-contrib/metadata.xml new file mode 100644 index 000000000000..734430d1fe4b --- /dev/null +++ b/x11-misc/i3blocks-contrib/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> + <upstream> + <remote-id type="github">vivien/i3blocks-contrib</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest index 21bd03633fd3..40dac9e344e9 100644 --- a/x11-misc/i3blocks/Manifest +++ b/x11-misc/i3blocks/Manifest @@ -1,2 +1 @@ -DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578 DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534 diff --git a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch b/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch deleted file mode 100644 index 04d625dcb47f..000000000000 --- a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- i3blocks-1.4/~Makefile 2017-02-20 18:56:06.340061271 +0100 -+++ i3blocks-1.4/Makefile 2017-02-20 18:56:27.518915055 +0100 -@@ -4,11 +4,7 @@ ifndef PREFIX - PREFIX=/usr/local - endif - ifndef SYSCONFDIR -- ifeq ($(PREFIX),/usr) -- SYSCONFDIR=/etc -- else -- SYSCONFDIR=$(PREFIX)/etc -- endif -+ SYSCONFDIR=/etc - endif - ifndef LIBEXECDIR - LIBEXECDIR=$(PREFIX)/libexec diff --git a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch index bfca548e06f1..bc7c065eea8e 100644 --- a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch +++ b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch @@ -1,5 +1,5 @@ ---- a/Makefile.am 2019-10-20 22:46:55.603462157 +0200 -+++ b/Makefile.am 2019-10-20 22:47:29.893461028 +0200 +--- a/Makefile.am ++++ b/Makefile.am @@ -29,14 +29,3 @@ dist_sysconf_DATA = \ diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild deleted file mode 100644 index 165a389c483e..000000000000 --- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 -fi - -DESCRIPTION="highly flexible status line for the i3 window manager" -HOMEPAGE="https://github.com/vivien/i3blocks" -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/vivien/${PN}" -else - SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -SLOT="0" -LICENSE="GPL-3" - -RDEPEND="app-admin/sysstat - media-sound/playerctl - sys-apps/lm-sensors - sys-power/acpi - || ( x11-wm/i3 x11-wm/i3-gaps )" - -DEPEND="app-text/ronn" - -PATCHES=( "${FILESDIR}/${PN}-default-sysconfdir.patch" ) #610090 - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install -} diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild index d8ceeacffbb7..8bd169120d36 100644 --- a/x11-misc/i3blocks/i3blocks-1.5.ebuild +++ b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild @@ -1,25 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools bash-completion-r1 -if [[ ${PV} = 9999 ]]; then - inherit git-r3 -fi - DESCRIPTION="highly flexible status line for the i3 window manager" HOMEPAGE="https://github.com/vivien/i3blocks" -if [[ ${PV} = 9999 ]]; then - EGIT_REPO_URI="https://github.com/vivien/${PN}" -else - SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi +SRC_URI="https://github.com/vivien/i3blocks/archive/${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="+contrib" + +PDEPEND="contrib? ( x11-misc/i3blocks-contrib )" PATCHES=( "${FILESDIR}"/${PN}-disable-bash-completion.patch ) diff --git a/x11-misc/i3blocks/metadata.xml b/x11-misc/i3blocks/metadata.xml index c6de48eeb14f..d4fc1ce5bb5e 100644 --- a/x11-misc/i3blocks/metadata.xml +++ b/x11-misc/i3blocks/metadata.xml @@ -1,11 +1,14 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>mudler@gentoo.org</email> - <name>Ettore Di Giacinto</name> + <email>jsmolic@gentoo.org</email> + <name>Jakov Smolić</name> </maintainer> <upstream> <remote-id type="github">vivien/i3blocks</remote-id> </upstream> + <use> + <flag name="contrib">Install contrib modules</flag> + </use> </pkgmetadata> diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest index 488e459ee41d..963a57ad07c0 100644 --- a/x11-misc/i3lock/Manifest +++ b/x11-misc/i3lock/Manifest @@ -1,3 +1,2 @@ -DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517 -DIST i3lock-2.11.1.tar.bz2 145434 BLAKE2B 9a2ff0be922162710f9dbbf597f93ad939684641d2264c6ed38dc8a7eeb77c253f61aa1a2e873f03de2c8cc6d661e79ff166e4302c423261a65f66582749c962 SHA512 8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c -DIST i3lock-2.12.tar.bz2 147521 BLAKE2B 38ae5b4d6a92f918bc432e425301e8d04f9cc3bf8569e5f4e443dafed5aba19abf6604bfa102bc00ea5db87052583f1e9927a4f8e55906545b501829d95081e7 SHA512 84f1558368381bcad9a64f41ab6134a6614dea453d1ee5ecfe886185b9e1baebeeca446c4635158deb8dae5b25c09d47d3990239d76c44e5325ca5bfaad9b2ad +DIST i3lock-2.14.1.tar.xz 28756 BLAKE2B b38a3fafeebb5f8cebb643baeb875922659b556a5f919c2a837923e45e8f91a5f3ce297a424414ec9f05255e5888b91723617d837e5ffdbdf81aded42edc34cb SHA512 63b6bd73f66654fe52639434f7d3da64006144ec2ed685ba8683186730d4cc2c10d5aa66174f965030030243f59afaf6def3ff732f710ae441410218f84d6deb +DIST i3lock-2.15.tar.xz 29100 BLAKE2B e84622e34a54681e162a3012c21fea4cc8b93a66e466647d65cc85f1a874d2be4d9988d54db74165b3dd1eccca1ca257a74b64ddbce08d681c9fc1c78701ee88 SHA512 6079f5233c0820c6e38f3cd8f3732d585e95e7d670408e4fb18ab580a2e1face8f3d6ea13eaaeedc8671f74def917183667e736b35306bf7c630d40625b41ac2 diff --git a/x11-misc/i3lock/files/i3lock-2.11-version.patch b/x11-misc/i3lock/files/i3lock-2.11-version.patch deleted file mode 100644 index df133cb91cdb..000000000000 --- a/x11-misc/i3lock/files/i3lock-2.11-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ - # Run autoreconf -fi to generate a configure script from this file. - - AC_PREREQ([2.69]) --AC_INIT([i3lock], [2.10], [https://github.com/i3/i3lock/issues]) -+AC_INIT([i3lock], [2.11], [https://github.com/i3/i3lock/issues]) - # For AX_EXTEND_SRCDIR - AX_ENABLE_BUILDDIR - AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2]) - diff --git a/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch b/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch deleted file mode 100644 index 09003b165919..000000000000 --- a/x11-misc/i3lock/files/i3lock-2.12-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/unlock_indicator.c -+++ b/unlock_indicator.c -@@ -35,7 +35,7 @@ - - /* The current position in the input buffer. Useful to determine if any - * characters of the password have already been entered or not. */ --int input_position; -+extern int input_position; - - /* The lock window. */ - extern xcb_window_t win; diff --git a/x11-misc/i3lock/i3lock-2.10-r1.ebuild b/x11-misc/i3lock/i3lock-2.10-r1.ebuild deleted file mode 100644 index e3f2050116b9..000000000000 --- a/x11-misc/i3lock/i3lock-2.10-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Simple screen locker" -HOMEPAGE="https://i3wm.org/i3lock/" -SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="" - -RDEPEND=" - >=x11-libs/libxkbcommon-0.5.0[X] - dev-libs/libev - sys-libs/pam - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb[xkb] - x11-libs/xcb-util -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -DOCS=( CHANGELOG README.md ) - -src_prepare() { - default - - sed -i -e 's:login:system-auth:' ${PN}.pam || die - - tc-export CC -} - -src_install() { - default - doman ${PN}.1 -} diff --git a/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild b/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild deleted file mode 100644 index 5d706ccac8b5..000000000000 --- a/x11-misc/i3lock/i3lock-2.11.1-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -DESCRIPTION="Simple screen locker" -HOMEPAGE="https://i3wm.org/i3lock/" -SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -RDEPEND=" - >=x11-libs/libxkbcommon-0.5.0[X] - dev-libs/libev - sys-libs/pam - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb[xkb] - x11-libs/xcb-util - x11-libs/xcb-util-xrm -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -DOCS=( CHANGELOG README.md ) -PATCHES=( - "${FILESDIR}"/${PN}-2.11-version.patch -) - -src_prepare() { - default - - echo ${PV} > I3LOCK_VERSION - - sed -i -e 's:login:system-auth:' pam/${PN} || die - - eautoreconf - - tc-export CC -} - -src_install() { - default - doman ${PN}.1 -} diff --git a/x11-misc/i3lock/i3lock-2.12-r1.ebuild b/x11-misc/i3lock/i3lock-2.12-r1.ebuild deleted file mode 100644 index c2510a4767eb..000000000000 --- a/x11-misc/i3lock/i3lock-2.12-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -DESCRIPTION="Simple screen locker" -HOMEPAGE="https://i3wm.org/i3lock/" -SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -RDEPEND=" - >=x11-libs/libxkbcommon-0.5.0[X] - dev-libs/libev - sys-libs/pam - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb[xkb] - x11-libs/xcb-util - x11-libs/xcb-util-xrm -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -DOCS=( CHANGELOG README.md ) - -src_prepare() { - default - - echo ${PV} > I3LOCK_VERSION - - sed -i -e 's:login:system-auth:' pam/${PN} || die - - eautoreconf - - tc-export CC -} - -src_install() { - default - doman ${PN}.1 -} diff --git a/x11-misc/i3lock/i3lock-2.12-r2.ebuild b/x11-misc/i3lock/i3lock-2.12-r2.ebuild deleted file mode 100644 index 07a68eb55c25..000000000000 --- a/x11-misc/i3lock/i3lock-2.12-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Simple screen locker" -HOMEPAGE="https://i3wm.org/i3lock/" -SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -RDEPEND=" - >=x11-libs/libxkbcommon-0.5.0[X] - dev-libs/libev - sys-libs/pam - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb[xkb] - x11-libs/xcb-util - x11-libs/xcb-util-xrm -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -DOCS=( CHANGELOG README.md ) -PATCHES=( - "${FILESDIR}"/${PN}-2.12-fno-common.patch -) - -src_prepare() { - default - - sed -i -e 's:login:system-auth:g' pam/${PN} || die -} - -src_configure() { - tc-export CC - default -} - -src_install() { - default - doman ${PN}.1 -} diff --git a/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild b/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild new file mode 100644 index 000000000000..ce0e41df1a3b --- /dev/null +++ b/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Simple screen locker" +HOMEPAGE="https://i3wm.org/i3lock/" +SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" + +RDEPEND=" + dev-libs/libev + sys-libs/pam + x11-libs/cairo[X,xcb(+)] + x11-libs/libxcb + x11-libs/libxkbcommon[X] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-xrm" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + sed -i -e 's:login:system-auth:g' pam/${PN} || die +} diff --git a/x11-misc/i3lock/i3lock-2.15.ebuild b/x11-misc/i3lock/i3lock-2.15.ebuild new file mode 100644 index 000000000000..512d70eb36e7 --- /dev/null +++ b/x11-misc/i3lock/i3lock-2.15.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Simple screen locker" +HOMEPAGE="https://i3wm.org/i3lock/" +SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +RDEPEND=" + dev-libs/libev + sys-libs/pam + x11-libs/cairo[X,xcb(+)] + x11-libs/libxcb + x11-libs/libxkbcommon[X] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-xrm" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + sed -i -e 's:login:system-auth:g' pam/${PN} || die +} diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml index 2ba8e9e851e4..808603e364cb 100644 --- a/x11-misc/i3lock/metadata.xml +++ b/x11-misc/i3lock/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>jsmolic@gentoo.org</email> + <name>Jakov Smolić</name> </maintainer> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <upstream> + <remote-id type="github">i3/i3lock</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest index 8f7a097491c0..3b335da31c78 100644 --- a/x11-misc/i3status/Manifest +++ b/x11-misc/i3status/Manifest @@ -1,2 +1 @@ -DIST i3status-2.12.tar.bz2 57162 BLAKE2B d3225581b628640bfb6084b390a135562c2ce052078cf014a63e106c83beb14b38270eee28d01898d478a9593ce542684252e420ffe37d07f392509ac9b2a749 SHA512 687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3 -DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2 +DIST i3status-2.14.tar.xz 68900 BLAKE2B e85019c2a95d50b6bd4adc6bc9dafb85c3a3d8cdaa93602a9c2af54e6818a4e58ad26f47e2c85b38744c12c08f52c4b5c1216e6f3215f8ee2f4152b42a547905 SHA512 10a1235cc314f5fc4dde4e1369a30f49118c95271f636c5803caa52d94d99ad8565b89fcd602d0c8aa7c830a79d3a3bb08e5ac8123cf07cfddc8ef0126b10f80 diff --git a/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch b/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch deleted file mode 100644 index 2447f16f9339..000000000000 --- a/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Makefile b/Makefile -index 3084ae7..7ea1964 100644 ---- a/Makefile -+++ b/Makefile -@@ -58,6 +57,10 @@ ifeq ($(OS),NetBSD) - LIBS+=-lprop - endif - -+ifeq ($(OS),OpenBSD) -+LIBS+=-lpthread -+endif -+ - # This probably applies for any pkgsrc based system - ifneq (, $(filter $(OS), NetBSD DragonFly)) - CFLAGS+=-I/usr/pkg/include/ -@@ -79,9 +82,12 @@ CFLAGS += -idirafter yajl-fallback - OBJS:=$(sort $(wildcard src/*.c *.c)) - OBJS:=$(OBJS:.c=.o) - --ifeq ($(OS),OpenBSD) -+PULSE ?= 1 -+ifeq ($(PULSE),0) - OBJS:=$(filter-out src/pulse.o, $(OBJS)) - LIBS:=$(filter-out -lpulse, $(LIBS)) -+else -+CPPFLAGS+=-DPULSE - endif - - src/%.o: src/%.c include/i3status.h -diff --git a/src/print_volume.c b/src/print_volume.c -index 51e84f3..9e015c0 100644 ---- a/src/print_volume.c -+++ b/src/print_volume.c -@@ -61,7 +61,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * - free(instance); - } - --#ifndef __OpenBSD__ -+#if !defined(__OpenBSD__) && defined(PULSE) - /* Try PulseAudio first */ - - /* If the device name has the format "pulse[:N]" where N is the diff --git a/x11-misc/i3status/i3status-2.12.ebuild b/x11-misc/i3status/i3status-2.12.ebuild deleted file mode 100644 index 81f9ba7f6c6f..000000000000 --- a/x11-misc/i3status/i3status-2.12.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fcaps toolchain-funcs - -DESCRIPTION="generates a status bar for dzen2, xmobar or similar" -HOMEPAGE="https://i3wm.org/i3status/" -SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="pulseaudio" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - dev-libs/confuse:= - dev-libs/libnl:3 - >=dev-libs/yajl-2.0.2 - media-libs/alsa-lib - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-2.11-pulseaudio.patch ) - -src_prepare() { - default - sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \ - -e '/CFLAGS+=-g/d' -i Makefile || die -} - -src_compile() { - emake V=1 CC="$(tc-getCC)" PULSE=$(usex pulseaudio 1 0) -} - -pkg_postinst() { - fcaps cap_net_admin usr/bin/${PN} - einfo "${PN} can be used with any of the following programs:" - einfo " i3bar (x11-wm/i3)" - einfo " x11-misc/xmobar" - einfo " x11-misc/dzen" - einfo "Please refer to manual: man ${PN}" -} diff --git a/x11-misc/i3status/i3status-2.13.ebuild b/x11-misc/i3status/i3status-2.13.ebuild deleted file mode 100644 index 06ad9dcfa46f..000000000000 --- a/x11-misc/i3status/i3status-2.13.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit fcaps - -DESCRIPTION="generates a status bar for dzen2, xmobar or similar" -HOMEPAGE="https://i3wm.org/i3status/" -SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - >=dev-libs/yajl-2.0.2 - dev-libs/confuse:= - dev-libs/libnl:3 - media-libs/alsa-lib - || ( media-sound/pulseaudio media-sound/apulse[sdk] ) -" -DEPEND=" - ${RDEPEND} - app-text/asciidoc - app-text/xmlto -" - -src_compile() { - pushd "${S}/${CHOST}" || die - default -} - -src_install() { - pushd "${S}/${CHOST}" || die - default -} - -pkg_postinst() { - fcaps cap_net_admin usr/bin/${PN} - einfo "${PN} can be used with any of the following programs:" - einfo " i3bar (x11-wm/i3)" - einfo " x11-misc/xmobar" - einfo " x11-misc/dzen" - einfo "Please refer to manual: man ${PN}" -} diff --git a/x11-misc/i3status/i3status-2.14-r1.ebuild b/x11-misc/i3status/i3status-2.14-r1.ebuild new file mode 100644 index 000000000000..4197471f91fa --- /dev/null +++ b/x11-misc/i3status/i3status-2.14-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps meson + +DESCRIPTION="Generates a status bar for dzen2, xmobar or similar" +HOMEPAGE="https://i3wm.org/i3status/" +SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" +IUSE="pulseaudio" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=dev-libs/yajl-2.0.2 + dev-libs/confuse:= + dev-libs/libnl:3 + media-libs/alsa-lib + pulseaudio? ( || ( media-libs/libpulse media-sound/apulse[sdk] ) ) +" + +DEPEND="${RDEPEND} + app-text/asciidoc + app-text/xmlto +" + +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) + ) + meson_src_configure +} + +pkg_postinst() { + fcaps cap_net_admin usr/bin/${PN} + + elog "${PN} can be used with any of the following programs:" + elog " i3bar (x11-wm/i3)" + elog " x11-misc/xmobar" + elog " x11-misc/dzen" + elog "Please refer to manual: man ${PN}" +} diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml index 59a2a28f64b5..e16cefd50de7 100644 --- a/x11-misc/i3status/metadata.xml +++ b/x11-misc/i3status/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>ultrabug@gentoo.org</email> + <name>Alexys Jacob</name> </maintainer> <longdescription> i3status is a small program (about 1500 SLOC) for generating a status bar for @@ -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/i855crt/Manifest b/x11-misc/i855crt/Manifest deleted file mode 100644 index f043529d5eea..000000000000 --- a/x11-misc/i855crt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST i855crt-0.4.tar.gz 65209 BLAKE2B a7c8e041cb66cd711e1cdf7ac1ee0d6d218377b5c1183c11c658d3345de814a21b9eab0c4579c56db316a3b5fb3e430774174100f989c921e86650bc59adc1ee SHA512 8bd6d05334bcbe75f85c128ffe1179368fcf94bb0ba07c2ea7ce9b6ed38252ffc5dcd7a3208f6524be064bea595abda5a29f6a2960ad9f2f7b6f6ba528c36290 diff --git a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch deleted file mode 100644 index e7deffb4d30a..000000000000 --- a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,11 +1,6 @@ --i855crt: i855crt.o vmodes.o -- gcc $(LDFLAGS) -o i855crt i855crt.o vmodes.o -L /usr/X11R6/lib -lXext -lXv -+LDLIBS = -lXv -lX11 - --i855crt.o: i855crt.c i855crt.h vmodes.h hw.h -- gcc $(CFLAGS) -c i855crt.c -- --vmodes.o: vmodes.c vmodes.h -- gcc $(CFLAGS) -c vmodes.c -+i855crt: vmodes.o - - clean: - rm *.o -f diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff deleted file mode 100644 index 5aea3a7dd96c..000000000000 --- a/x11-misc/i855crt/files/i855crt-i915support.diff +++ /dev/null @@ -1,70 +0,0 @@ ---- a/dumpreg.c -+++ b/dumpreg.c -@@ -36,10 +36,11 @@ - (p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL || - (p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL || - (p = strstr(*buff_ptr, I810_IGSTR)) != NULL || -- (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL; -+ (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL || - (p = strstr(*buff_ptr, I830STR)) != NULL || - (p = strstr(*buff_ptr, I845STR)) != NULL || -- (p = strstr(*buff_ptr, I865STR)) != NULL ; -+ (p = strstr(*buff_ptr, I865STR)) != NULL || -+ (p = strstr(*buff_ptr, I915STR)) != NULL ; - - if(i) - { -@@ -89,7 +90,7 @@ - chip = i810_chip(&buff, &len, pci_f); - if (chip == NULL) - { -- fprintf(stderr, "No know videocard has been found.\n"); -+ fprintf(stderr, "No known videocard has been found.\n"); - exit(1); - } - pclose(pci_f); ---- a/i855crt.c -+++ b/i855crt.c -@@ -254,14 +254,15 @@ - (p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL || - (p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL || - (p = strstr(*buff_ptr, I810_IGSTR)) != NULL || -- (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL; -+ (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL || - (p = strstr(*buff_ptr, I830STR)) != NULL || - (p = strstr(*buff_ptr, I845STR)) != NULL || -- (p = strstr(*buff_ptr, I865STR)) != NULL ; -+ (p = strstr(*buff_ptr, I865STR)) != NULL || -+ (p = strstr(*buff_ptr, I915STR)) != NULL ; - - if(i) - { -- fprintf(stderr,"This driver is untested with your videocard !\n"); -+ fprintf(stderr,"This driver is untested with your video card !\n"); - return p; - } - -@@ -493,7 +494,7 @@ - chip = i810_chip(&buff, &len, pci_f); - if (chip == NULL) - { -- fprintf(stderr, "No know videocard has been found.\n"); -+ fprintf(stderr, "No known videocard has been found.\n"); - exit(1); - } - pclose(pci_f); ---- a/i855crt.h -+++ b/i855crt.h -@@ -1,3 +1,4 @@ -+ - /* - * This is part of the source for i855crt driver - * copyright(c) Merello Andrea 2004 -@@ -45,6 +46,7 @@ - #define I845STR "8086:2562" - #define I855STR "8086:3582" - #define I865STR "8086:2572" -+#define I915STR "8086:2592" - #define MEMSTR "Memory at" - #define NONPRSTR "32-bit, non-prefetchable" - diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild deleted file mode 100644 index 25df8327c91c..000000000000 --- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver" -HOMEPAGE="http://i855crt.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXv" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-i915support.diff - "${FILESDIR}"/${PN}-0.4-makefile.patch -) - -src_prepare() { - default - - # upstream ships it with the binary, we want to make sure we compile it - emake clean -} - -src_configure() { - tc-export CC -} - -src_install() { - dobin i855crt - insinto /etc - doins i855crt.conf - einstalldocs -} diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml deleted file mode 100644 index 97cfac8d1cf7..000000000000 --- a/x11-misc/i855crt/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <longdescription lang="en"> -i855crt is a tool to send the output of a i855-based graphic card to the -external VGA, primarily used for presentations. -</longdescription> - <upstream> - <remote-id type="sourceforge">i855crt</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 b332c0fd6790..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-2020 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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/icon-naming-utils/metadata.xml b/x11-misc/icon-naming-utils/metadata.xml index 95e86c12108a..d4390c2eb58e 100644 --- a/x11-misc/icon-naming-utils/metadata.xml +++ b/x11-misc/icon-naming-utils/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> diff --git a/x11-misc/iconbox/iconbox-0.2.ebuild b/x11-misc/iconbox/iconbox-0.2.ebuild index 5e38129b6e8d..3e0ccd702c27 100644 --- a/x11-misc/iconbox/iconbox-0.2.ebuild +++ b/x11-misc/iconbox/iconbox-0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 MY_P=${P/-/_} DESCRIPTION="App for placing icons in a menu which auto-hides" -HOMEPAGE="https://packages.gentoo.org/" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${MY_P}.tar.gz" LICENSE="GPL-2" diff --git a/x11-misc/iconbox/metadata.xml b/x11-misc/iconbox/metadata.xml index 5c8d0eabf9df..54cdadd31b33 100644 --- a/x11-misc/iconbox/metadata.xml +++ b/x11-misc/iconbox/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/idesk-extras/idesk-extras-1.37-r2.ebuild b/x11-misc/idesk-extras/idesk-extras-1.37-r3.ebuild index 326a880a51d5..505f802b4a62 100644 --- a/x11-misc/idesk-extras/idesk-extras-1.37-r2.ebuild +++ b/x11-misc/idesk-extras/idesk-extras-1.37-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Graphical configuration for iDesk plus icons" HOMEPAGE="https://web.archive.org/web/20070828214007/http://www.jmurray.id.au/idesk-extras.html" @@ -10,9 +10,9 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="app-shells/bash +RDEPEND=" + app-shells/bash x11-misc/idesk x11-misc/xdialog" @@ -21,7 +21,8 @@ HTML_DOCS=( ${PN}.html ) src_install() { dobin idesktool + einstalldocs + insinto /usr/share/idesk doins -r icons - einstalldocs } diff --git a/x11-misc/idesk-extras/metadata.xml b/x11-misc/idesk-extras/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/x11-misc/idesk-extras/metadata.xml +++ b/x11-misc/idesk-extras/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest index 17e39822aad5..5648bdfbefba 100644 --- a/x11-misc/idesk/Manifest +++ b/x11-misc/idesk/Manifest @@ -1 +1 @@ -DIST idesk-0.7.5.tar.bz2 185858 BLAKE2B b1cc2e423ff7f9f9db12fcfd46c0d9b03e29ad6b4b44f79ab6fca76b356b7df798532261364e30991dfacef9d377b69bf3dc9b5f44baf817b44629eb3805f3e6 SHA512 42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475 +DIST idesk-0.7.8.tar.gz 202949 BLAKE2B 93f902ab8b073d5b8e4a03d65ce99379e4adcf7ae6220be858ef7f1ce1f326cbbcc50c6d99424d8153ad498c9498939f39c51de1aa231c392a18636ee53788ee SHA512 0456646788ab70d1fc05ee0fc5f9d811f9f67c2420039ec525f42b6634ec92c1e3f8f061af5c407a22ab81db873efde216ad5c4fccba6fb27f1777d2e66a5535 diff --git a/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch b/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch deleted file mode 100644 index c4ac03e206e9..000000000000 --- a/x11-misc/idesk/files/idesk-0.7.5-glibc-2.12.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fixes build with glibc-2.12 - -http://bugs.gentoo.org/333515 -https://bugs.launchpad.net/ubuntu/+source/idesk/+bug/592602 - -Patch written by Bhavani Shankar <bhavi@ubuntu.com> ---- idesk-0.7.5/src/DesktopConfig.cpp -+++ idesk-0.7.5/src/DesktopConfig.cpp -@@ -24,6 +24,8 @@ - - #include "DesktopConfig.h" - #include "Util.h" -+#include <sys/types.h> // For stat() -+#include <sys/stat.h> // For stat() - - //the initilizer list just sets the program defaults for non-necessary options - DesktopConfig::DesktopConfig(Database db, string ideskrcFile) : diff --git a/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch b/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch new file mode 100644 index 000000000000..7f062c94280f --- /dev/null +++ b/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch @@ -0,0 +1,40 @@ +https://github.com/antonialoytorrens/idesk/pull/1 +https://github.com/neagix/idesk/pull/9 +https://github.com/neagix/idesk/issues/7 + +From b13626bbe2669b8a267ad53df93f1060379a462e Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 15 Jul 2022 08:22:12 +0100 +Subject: [PATCH] build: use pkg-config to find imlib2 + +imlib2 1.7.5+ drops imlib2-config, hence pkg-config +must now be used to find it. + +Bug: https://bugs.gentoo.org/828962 +--- a/configure.in ++++ b/configure.in +@@ -94,19 +94,10 @@ LIBS="$LIBS $Xext_lib" + + dnl Imlib2 detection + +-AC_PATH_GENERIC(imlib2, , [ +- AC_SUBST(IMLIB_LIBS) +- AC_SUBST(IMLIB_CXXFLAGS) ], +- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path? +- You need Imlib2 to build Idesk. Verify that you have Imlib2-dev)) +- +-dnl the above doesn't work for some reason :/ +-IMLIB_LIBS=`imlib2-config --libs` +-IMLIB_CFLAGS=`imlib2-config --cflags` +-AC_SUBST(IMLIB_LIBS) +-AC_SUBST(IMLIB_CXXFLAGS) +- +-CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS" ++PKG_PROG_PKG_CONFIG ++PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0]) ++ ++CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS" + LIBS="$LIBS $IMLIB_LIBS" + + + diff --git a/x11-misc/idesk/idesk-0.7.5-r3.ebuild b/x11-misc/idesk/idesk-0.7.5-r3.ebuild deleted file mode 100644 index 3a6373426c22..000000000000 --- a/x11-misc/idesk/idesk-0.7.5-r3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Utility to place icons on the root window" -HOMEPAGE="http://idesk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" -IUSE="" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 - media-libs/freetype - >=media-libs/imlib2-1.4[X] - media-libs/libart_lgpl - x11-libs/gtk+:2 - x11-libs/pango - x11-libs/startup-notification" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - # bug 333515 - "${FILESDIR}"/${P}-glibc-2.12.patch -) - -src_prepare() { - default - sed -i \ - -e 's,/usr/local/,/usr/,' \ - examples/default.lnk || die -} - -src_configure() { - econf --enable-libsn -} diff --git a/x11-misc/idesk/idesk-0.7.8.ebuild b/x11-misc/idesk/idesk-0.7.8.ebuild new file mode 100644 index 000000000000..b6e6b14254a7 --- /dev/null +++ b/x11-misc/idesk/idesk-0.7.8.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Utility to place icons on the root window" +HOMEPAGE="https://github.com/neagix/idesk" +SRC_URI="https://github.com/neagix/idesk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" +IUSE="svg" + +RDEPEND=" + dev-libs/glib + dev-libs/libxml2 + media-libs/freetype + media-libs/imlib2[X] + media-libs/libart_lgpl + x11-libs/libXft + x11-libs/gtk+:3 + x11-libs/pango + x11-libs/startup-notification + svg? ( + gnome-base/librsvg + x11-libs/gdk-pixbuf + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.7.8-use-pkg-config-imlib2.patch +) + +src_prepare() { + default + + sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die + + eautoreconf +} + +src_configure() { + econf \ + --enable-libsn \ + $(use_enable svg) +} diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml index 6ae5edb8732a..03c3aedb73c9 100644 --- a/x11-misc/idesk/metadata.xml +++ b/x11-misc/idesk/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> - <remote-id type="sourceforge">idesk</remote-id> + <remote-id type="github">neagix/idesk</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest index 766a015901e0..fc7452893316 100644 --- a/x11-misc/imake/Manifest +++ b/x11-misc/imake/Manifest @@ -1 +1 @@ -DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728 +DIST imake-1.0.10.tar.xz 155284 BLAKE2B 85ea5d14280b0e4e3d07f806b1ebc777f1c6f431af05e94571e1d7908028f1497c4b5edb6e808c858429e98f314fe6c3cee84e265a30fce02d7ebeaa2111ab8d SHA512 ea96db27a6da13ea2d64652936e508b5e3d5d712347a2eb248376dc1f262c18720d9934b8ae69b4c0fc65b135c847be42da084fe924e4825ce1d359f4ef7e60f diff --git a/x11-misc/imake/files/imake-1.0.8-cpp-args.patch b/x11-misc/imake/files/imake-1.0.8-cpp-args.patch new file mode 100644 index 000000000000..4fb382b0a19c --- /dev/null +++ b/x11-misc/imake/files/imake-1.0.8-cpp-args.patch @@ -0,0 +1,18 @@ +Copy code from IMAKEINCLUDE to IMAKECPP to handle arguments +such as -E. Lets IMAKECPP=$(tc-getCPP) be usable. +--- a/imake.c ++++ b/imake.c +@@ -532,6 +532,12 @@ + } + } +- if ((p = getenv("IMAKECPP"))) ++ if ((p = getenv("IMAKECPP"))) { + cpp = p; ++ for (; *p; p++) ++ if (*p == ' ') { ++ *p++ = '\0'; ++ AddCppArg(p); ++ } ++ } + if ((p = getenv("IMAKEMAKE"))) + make_argv[0] = p; diff --git a/x11-misc/imake/files/imake-1.0.8-respect-LD.patch b/x11-misc/imake/files/imake-1.0.8-respect-LD.patch new file mode 100644 index 000000000000..a53808625c95 --- /dev/null +++ b/x11-misc/imake/files/imake-1.0.8-respect-LD.patch @@ -0,0 +1,15 @@ +Use LD env if available, other tests already do similar for CC. +https://bugs.gentoo.org/729630 +--- a/imake.c ++++ b/imake.c +@@ -1110,5 +1110,9 @@ + signed char c; + int ldmajor, ldminor; +- const char *ld = "ld -v"; ++ char ld[PATH_MAX]; ++ const char *ldenv; ++ if (!(ldenv = getenv("LD"))) ++ ldenv = "ld"; ++ snprintf(ld, PATH_MAX, "%s -v", ldenv); + + # ifdef CROSSCOMPILE diff --git a/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch b/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch new file mode 100644 index 000000000000..a27c1ac04ba0 --- /dev/null +++ b/x11-misc/imake/files/imake-1.0.8-xmkmf-pass-cc-ld.patch @@ -0,0 +1,15 @@ +Makefile calls imake again but with ignored CC/LD. +Passing only if set rather than use defaults. +--- a/xmkmf.cpp ++++ b/xmkmf.cpp +@@ -56,7 +56,7 @@ + echo "make Makefiles" && +- make Makefiles && ++ make ${CC:+CC="$CC"} ${LD:+LD="$LD"} Makefiles && + echo "make includes" && +- make includes && ++ make ${CC:+CC="$CC"} ${LD:+LD="$LD"} includes && + echo "make depend" && +- make depend ++ make ${CC:+CC="$CC"} ${LD:+LD="$LD"} depend + ;; diff --git a/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch b/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch new file mode 100644 index 000000000000..131b7978165b --- /dev/null +++ b/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch @@ -0,0 +1,44 @@ +If /usr/bin/cc exists then get_gcc() is always true on Linux (and many +others), but will fail in the event it's missing (-native-symlinks). + +get_gcc_version does not execute gcc and merely sets defines, so +call it without using get_gcc(). Validity of using NULL should be +verified if there's ever a new version. +--- a/imake.c ++++ b/imake.c +@@ -1331,6 +1331,7 @@ get_gcc_version(FILE *inFile, char *name) + } + #endif + ++#if defined CROSSCOMPILE + static boolean + get_gcc(char *cmd) + { +@@ -1384,7 +1385,6 @@ get_gcc(char *cmd) + return FALSE; + } + +-#ifdef CROSSCOMPILE + static void + get_gcc_incdir(FILE *inFile, char* name) + { +@@ -1630,14 +1630,16 @@ define_os_defaults(FILE *inFile) + if (gnu_c) + # endif + { ++# if defined CROSSCOMPILE + char gcc_name[PATH_MAX]; + if (get_gcc(gcc_name)) { + get_gcc_version (inFile, gcc_name); +-# if defined CROSSCOMPILE + if (sys != emx) + get_gcc_incdir(inFile, gcc_name); +-# endif + } ++# else ++ get_gcc_version(inFile,NULL); ++# endif + } + # endif + # if defined __FreeBSD__ +-- diff --git a/x11-misc/imake/imake-1.0.10.ebuild b/x11-misc/imake/imake-1.0.10.ebuild new file mode 100644 index 000000000000..c5519695461d --- /dev/null +++ b/x11-misc/imake/imake-1.0.10.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +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 ~x64-solaris" + +RDEPEND="x11-misc/xorg-cf-files" +DEPEND="x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.8-cpp-args.patch + "${FILESDIR}"/${PN}-1.0.9-no-get-gcc.patch + "${FILESDIR}"/${PN}-1.0.8-respect-LD.patch + "${FILESDIR}"/${PN}-1.0.8-xmkmf-pass-cc-ld.patch +) + +src_configure() { + econf CPP="$(tc-getPROG CPP cpp)" #722046 +} diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild deleted file mode 100644 index 4ace6394603e..000000000000 --- a/x11-misc/imake/imake-1.0.8.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_STATIC=no -inherit toolchain-funcs xorg-3 - -DESCRIPTION="C preprocessor interface to the make utility" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="x11-misc/xorg-cf-files" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -src_configure() { - econf CPP="$(tc-getPROG CPP cpp)" -} diff --git a/x11-misc/imake/metadata.xml b/x11-misc/imake/metadata.xml index e943b72b8a48..10f1cbc5c6a0 100644 --- a/x11-misc/imake/metadata.xml +++ b/x11-misc/imake/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/util/imake</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild index b2028583345f..d6db068fc05b 100644 --- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild +++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit autotools DESCRIPTION="mouse tool for advanced features such as wheels and 3+ buttons" -HOMEPAGE="http://imwheel.sourceforge.net/" +HOMEPAGE="https://imwheel.sourceforge.net/" SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" diff --git a/x11-misc/imwheel/metadata.xml b/x11-misc/imwheel/metadata.xml index fb4aea0bc42c..fe3a35cdf162 100644 --- a/x11-misc/imwheel/metadata.xml +++ b/x11-misc/imwheel/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/ipager/Manifest b/x11-misc/ipager/Manifest deleted file mode 100644 index ceacf784c2a7..000000000000 --- a/x11-misc/ipager/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ipager-1.1.0.tar.gz 30499 BLAKE2B 75644cbc2e6cca9af82589c7dbed4f0244870ec104cc8df9d294a6efe52f7dd19da2e5f0008cbeb72fbfe56f33acc6b921038faf00082c478f6a5c208f3fc09b SHA512 34f2982b4378e8de7479803d205c2d9157b71863278382c91d0c3daaee57352f2f6678fa338f34dc9e6bd70081e5f0bc03634632a7b6ab20a507b6fad3c2e5e3 diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch deleted file mode 100644 index ca7752ac99d0..000000000000 --- a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix ipager to compile with GCC 4.3. - -Patch taken from Gentoo bug #173562. - -X-Gentoo-Bug: 173562 -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - ---- a/iconfig.cpp 2008-08-22 21:35:16.000000000 +0600 -+++ b/iconfig.cpp 2008-08-22 21:35:20.000000000 +0600 -@@ -30,7 +30,7 @@ - #include <iostream> - #include <fstream> - #include <sstream> -- -+#include <stdlib.h> - #include <sys/stat.h> - #include <sys/types.h> - ---- a/wm.cpp 2008-08-22 21:52:36.000000000 +0600 -+++ b/wm.cpp 2008-08-22 21:52:40.000000000 +0600 -@@ -27,7 +27,7 @@ - - #include <time.h> - #include "atoms.h" -- -+#include <stdlib.h> - - WM * WM::m_instance = 0; - bool WM::x_error = false; diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch deleted file mode 100644 index f4c899302aeb..000000000000 --- a/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/423215 - ---- a/ipager.cpp -+++ b/ipager.cpp -@@ -29,6 +29,7 @@ - #include <config.h> - #endif - -+#include <unistd.h> - #include <iostream> - #include <string> - using namespace std; diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch deleted file mode 100644 index 6eb8b1ff4f53..000000000000 --- a/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch +++ /dev/null @@ -1,24 +0,0 @@ -Make sure Scons takes the CFLAGS/CXXFLAGS/LDFLAGS etc for the system. - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -diff -Nuar ipager-1.1.0.orig/SConstruct ipager-1.1.0/SConstruct ---- ipager-1.1.0.orig/SConstruct 2008-09-08 20:32:23.007016555 -0700 -+++ ipager-1.1.0/SConstruct 2008-09-08 20:32:05.103267940 -0700 -@@ -30,6 +30,16 @@ - # environment - ipager_env = Environment(options = ipager_options, ENV = os.environ) - -+# process env variables -+for K in ['CPPFLAGS', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CC', 'CXX']: -+ if K in os.environ.keys(): -+ dict = ipager_env.ParseFlags(os.environ[K]) -+ # These headers are supposed static. Don't check at each build. -+ for i in dict['CPPPATH']: -+ dict['CCFLAGS'].append('-I' + i) -+ dict['CPPPATH'] = [] -+ ipager_env.MergeFlags(dict) -+ - ipager_env.Append( - CPPFLAGS = [ '-Wall' ], - CPPPATH = [ '/usr/X11R6/include' ], diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch deleted file mode 100644 index 283dec348ab1..000000000000 --- a/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ipager-1.1.0/SConstruct 2005-11-06 06:23:24.000000000 -0500 -+++ ipager-1.1.0-gentoo/SConstruct 2008-09-08 15:18:07.000000000 -0400 -@@ -115,12 +115,14 @@ - else: - print "yes" - ipager_env.AppendUnique( -- CPPPATH = imlib2_env.Dictionary()['CPPPATH'], - CCFLAGS = imlib2_env.Dictionary()['CCFLAGS'], - LIBPATH = imlib2_env.Dictionary()['LIBPATH'], - LIBS = imlib2_env.Dictionary()['LIBS'] -- - ) -+ if imlib2_env.Dictionary().has_key('CPPPATH'): -+ ipager_env.AppendUnique( -+ CPPPATH = imlib2_env.Dictionary()['CPPPATH'], -+ ) - - conf.Finish() - diff --git a/x11-misc/ipager/ipager-1.1.0-r1.ebuild b/x11-misc/ipager/ipager-1.1.0-r1.ebuild deleted file mode 100644 index 6727bc321a0c..000000000000 --- a/x11-misc/ipager/ipager-1.1.0-r1.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 - -DESCRIPTION="A themable desktop pager for fluxbox and other window managers" -HOMEPAGE="http://www.useperl.ru/ipager/index.en.html" -SRC_URI="http://www.useperl.ru/ipager/src/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="xinerama" - -RDEPEND="media-libs/imlib2[X] - x11-libs/libXmu - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND} - dev-util/scons" - -PATCHES=( "${FILESDIR}/${P}-scons_imlib2.patch" - "${FILESDIR}/${P}-scons_flags.patch" - "${FILESDIR}/${P}-gcc43.patch" - "${FILESDIR}/${P}-gcc47.patch" ) - -src_compile() { - CONFIG_OPTS="xinerama=false" - use xinerama && CONFIG_OPTS="${CONFIG_OPTS} xinerama=true" - # FYI: Passing debug=true only adds -ggdb inside the SConstruct - - scons \ - --cache-disable \ - PREFIX="/usr" \ - ${CONFIG_OPTS} \ - || die "scons configure failed" -} - -src_install() { - scons \ - --cache-disable \ - PREFIX="/usr" \ - DESTDIR="${D}" \ - install \ - || die "scons install failed" - dodoc ToDo ChangeLog README - dodoc themes/*.conf -} diff --git a/x11-misc/ipager/metadata.xml b/x11-misc/ipager/metadata.xml deleted file mode 100644 index 20682188b90e..000000000000 --- a/x11-misc/ipager/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - A themeable desktop pager for fluxbox and other window managers. - </longdescription> -</pkgmetadata> diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest index cae85a9f5479..0f75d6cf1999 100644 --- a/x11-misc/j4-dmenu-desktop/Manifest +++ b/x11-misc/j4-dmenu-desktop/Manifest @@ -1 +1 @@ -DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e +DIST j4-dmenu-desktop-2.18.tar.gz 34785 BLAKE2B 26d5861d6d7ddcd9653a464d1175d19532001705de193811087fd42fddbdead89b8d49bd14f8e323288d6a7ba37bd4e11f4c7c52dd9b0a454f95a83a14853bcb SHA512 f8b0c825d567d60da0fb418e6f0b24a6d9daa9fb142b194b0a8b249303f4e09b6694fce72bf031007ac67253e488fc7666d4ba7beb032bc74cc2a32aca0f6c96 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.17.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild index d95530d4b3ed..0e03d6f0d6be 100644 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake-utils +inherit cmake MY_PV="r${PV}" DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop" HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop" SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="test" +IUSE="+dmenu test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-cpp/catch:1 )" -RDEPEND="x11-misc/dmenu" +RDEPEND="dmenu? ( x11-misc/dmenu )" -S="${WORKDIR}/${PN}-${MY_PV}" +PATCHES=( + "${FILESDIR}"/${PN}-2.18-gcc13.patch +) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Respect users CFLAGS sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die @@ -32,14 +35,25 @@ src_prepare() { src_configure() { local mycmakeargs=( -DWITH_GIT_CATCH="no" - -DWITH_TESTS=$(usex test) + -DWITH_TESTS="$(usex test)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install doman j4-dmenu-desktop.1 } + +pkg_postinst() { + if ! use dmenu; then + elog "As you have disabled the 'dmenu' use flag," + elog "x11-misc/dmenu won't be installed by default." + elog "" + elog "Since x11-misc/j4-dmenu-desktop uses x11-misc/dmenu as default," + elog "you must configure your own replacement with --dmenu=<command>," + elog "as otherwise it won't work." + fi +} diff --git a/x11-misc/j4-dmenu-desktop/metadata.xml b/x11-misc/j4-dmenu-desktop/metadata.xml index 4e3a92938dfe..b7c48e82da90 100644 --- a/x11-misc/j4-dmenu-desktop/metadata.xml +++ b/x11-misc/j4-dmenu-desktop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>conikost@gentoo.org</email> @@ -10,6 +10,9 @@ The purpose is to find .desktop files, but shell commands can also be executed. </longdescription> + <use> + <flag name="dmenu">Use <pkg>x11-misc/dmenu</pkg> as default. Disable to use a different implementation.</flag> + </use> <upstream> <bugs-to>https://github.com/enkore/j4-dmenu-desktop/issues</bugs-to> <remote-id type="github">enkore/j4-dmenu-desktop</remote-id> diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest index 2fb720194c7b..f1083bb1484f 100644 --- a/x11-misc/kapow/Manifest +++ b/x11-misc/kapow/Manifest @@ -1,2 +1 @@ DIST kapow-1.5.10-src.tar.bz2 834452 BLAKE2B 0ca2eb71a13119689ba878b6981bb66d26565035441f0a02d20097becd19a539742b37989543d18db6438f5cdccfa1aed1c698a94a0287b3d0b0b316cb9bd8b4 SHA512 6aa47bcf7ccb0a4c3dba4d675786ed63bd27ef7b6ed4d62074ae8409fcc640574d264c9c4952f764792b8280f11cd3a736f46389db2239b68589595e4424e518 -DIST kapow-1.5.9-src.tar.bz2 834677 BLAKE2B ed02b76e8c764ccf7f9fb752322dad61113c82348bc4e75af2858136369423a02114b312637460cfa1127fa0389f50ea951aed5e69b3e90d276aa10ea7e52be2 SHA512 a026b2254835b4eb2d211bb8b56d68e6f07c07beb79e2b019d2ce108b6197e812222b5964f889fe31b856a0081107f3fca314684883b3eb3f778f6fe7cceb0b6 diff --git a/x11-misc/kapow/kapow-1.5.10.ebuild b/x11-misc/kapow/kapow-1.5.10.ebuild index f9dd263d6279..99d2b1b4ae5d 100644 --- a/x11-misc/kapow/kapow-1.5.10.ebuild +++ b/x11-misc/kapow/kapow-1.5.10.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit qmake-utils xdg-utils DESCRIPTION="A punch clock program designed to easily keep track of your hours" @@ -19,13 +20,10 @@ RDEPEND=" dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 " -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 -" -K_LANGS=" - ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk -" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +K_LANGS="ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk" for K_LANG in ${K_LANGS}; do IUSE+=" l10n_${K_LANG/_/-}" done diff --git a/x11-misc/kapow/kapow-1.5.9.ebuild b/x11-misc/kapow/kapow-1.5.9.ebuild deleted file mode 100644 index 82f1e9777440..000000000000 --- a/x11-misc/kapow/kapow-1.5.9.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit qmake-utils xdg-utils - -DESCRIPTION="A punch clock program designed to easily keep track of your hours" -HOMEPAGE="https://gottcode.org/kapow/" -SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 -" -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 -" -K_LANGS=" - ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk -" -for K_LANG in ${K_LANGS}; do - IUSE+=" l10n_${K_LANG/_/-}" -done -DOCS=( ChangeLog README ) - -src_prepare() { - default - - count() { echo ${#}; } - local lang_count=$(count ${K_LANGS}) - local locale_count=$(count translations/${PN}_*.ts) - [[ ${lang_count} = ${locale_count} ]] \ - || die "Number of LANGS does not match number of locales" - unset count - - local lang - for lang in ${K_LANGS}; do - if ! use l10n_${lang/_/-}; then - rm translations/${PN}_${lang}.* || die - fi - done -} - -src_configure() { - eqmake5 kapow.pro PREFIX=/usr -} - -src_install() { - export INSTALL_ROOT="${D}" - default -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/kapow/metadata.xml b/x11-misc/kapow/metadata.xml index bc1b97e1eb76..02ab588d0b09 100644 --- a/x11-misc/kapow/metadata.xml +++ b/x11-misc/kapow/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml index add378847a17..09c91ebffc3d 100644 --- a/x11-misc/kaqaz/metadata.xml +++ b/x11-misc/kaqaz/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">sialan-labs/kaqaz</remote-id> </upstream> diff --git a/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch b/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch new file mode 100644 index 000000000000..1715a7d2c6b7 --- /dev/null +++ b/x11-misc/kbdd/files/kbdd-0.7.1-AM_PROG_AR.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -12,6 +12,7 @@ + # Checks for programs. + AC_PROG_CC + AC_PROG_RANLIB ++AM_PROG_AR + + #check for pkg-config + PKG_PROG_PKG_CONFIG diff --git a/x11-misc/kbdd/kbdd-0.7.1.ebuild b/x11-misc/kbdd/kbdd-0.7.1.ebuild index 32b3f011cfb1..5914a9a50443 100644 --- a/x11-misc/kbdd/kbdd-0.7.1.ebuild +++ b/x11-misc/kbdd/kbdd-0.7.1.ebuild @@ -1,29 +1,33 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools eutils vcs-snapshot +inherit autotools vcs-snapshot DESCRIPTION="Very simple layout switcher" HOMEPAGE="https://github.com/qnikst/kbdd" -SRC_URI="https://github.com/qnikst/kbdd/tarball/v${PV} -> ${PN}-${PV}.tar.gz" +SRC_URI="https://github.com/qnikst/kbdd/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="dbus" -DEPEND="dev-libs/glib:2= - x11-libs/libX11:0= +RDEPEND=" + dev-libs/glib:2 + x11-libs/libX11 dbus? ( - sys-apps/dbus:0= - >=dev-libs/dbus-glib-0.86:0= - ) -" -RDEPEND="${DEPEND}" + sys-apps/dbus + dev-libs/dbus-glib + )" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/glib-utils" #669674 + +PATCHES=( "${FILESDIR}"/${P}-AM_PROG_AR.patch ) src_prepare() { + default eautoreconf } diff --git a/x11-misc/kbdd/metadata.xml b/x11-misc/kbdd/metadata.xml index 497b16ac9a56..e651029b2337 100644 --- a/x11-misc/kbdd/metadata.xml +++ b/x11-misc/kbdd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> <upstream> diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest index ef201b6237d8..f8ca7508572e 100644 --- a/x11-misc/kdocker/Manifest +++ b/x11-misc/kdocker/Manifest @@ -1,2 +1,2 @@ -DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398525aea4e38fadabd23a10cc91648a55f800afd2ad398b744ad450d9c7bc26dd5bae994603f6ea4b322b5804 SHA512 1a98bf7b6360f4ce042b3e5330798076d42bd463c16e41b259706811f11516a34acfb0ace59f2c10c07aa6b2ff8fc57b1b1fa3ccdd33d452e220ec46446e8b64 DIST KDocker-5.3.tar.gz 180861 BLAKE2B b9ee9c2b035fb477e947b1b451d55e76fb4d9ae8788469fc2d05e1721b5ab71657e00e31331b5be6cf8776b37b7032720d4609df29f57e5c66a44d9fc5d38318 SHA512 8e5af389c402f337c75f861b4cc83036486903a9728fbcb6ea812392c297203fad7eec4e7b11eb1db83514fd615094ab9826277b73312ae8ea13b012d82524c4 +DIST KDocker-5.4.tar.gz 181166 BLAKE2B 7a301cd36f73112f5a6df6ce65fc11c30b16089ccec98f46d435694b2bfb373eac11c2ba3be5c4e56a56cec1f5fad9bc17b014e47e55f886f0685b6f11707c51 SHA512 1bc1bc445ccc2406f3fe21deb68d9654b3d384ab88bce4bc49f123c343ece3dcc3dfdc49b796f6ad5251d050e57b4ad13e1900851519b3643263137550f0ccc9 diff --git a/x11-misc/kdocker/files/qt-5.14.patch b/x11-misc/kdocker/files/qt-5.14.patch deleted file mode 100644 index ca1237965aaf..000000000000 --- a/x11-misc/kdocker/files/qt-5.14.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1579ee388749a7b056ccdd8ef2d4deafe21bd3e7 Mon Sep 17 00:00:00 2001 -From: Nikos Chantziaras <realnc@gmail.com> -Date: Mon, 30 Dec 2019 16:03:16 +0200 -Subject: [PATCH] Fix building with Qt 5.14 - -Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a -'None' macro. Work around the resulting mess by temporarily undefining the -macro. ---- - src/trayitem.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/trayitem.h b/src/trayitem.h -index 7698ea4..4b54cdd 100644 ---- a/src/trayitem.h -+++ b/src/trayitem.h -@@ -21,6 +21,10 @@ - #ifndef _TRAYITEM_H - #define _TRAYITEM_H - -+// Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a 'None' macro. -+#pragma push_macro("None") -+#undef None -+ - #include <QAction> - #include <QEvent> - #include <QIcon> -@@ -32,6 +36,10 @@ - - #include "xlibutil.h" - -+#ifndef None -+#pragma pop_macro("None") -+#endif -+ - #define DEFAULT_CustomIcon QString() - #define DEFAULT_BalloonTimeout 4000 // 4 seconds - #define DEFAULT_SkipTaskbar false diff --git a/x11-misc/kdocker/kdocker-5.3.ebuild b/x11-misc/kdocker/kdocker-5.3.ebuild index 30bfc104e846..67fc17c6af22 100644 --- a/x11-misc/kdocker/kdocker-5.3.ebuild +++ b/x11-misc/kdocker/kdocker-5.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.ta LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=" diff --git a/x11-misc/kdocker/kdocker-5.2.ebuild b/x11-misc/kdocker/kdocker-5.4.ebuild index e75cbf9228cc..d307e8c299a0 100644 --- a/x11-misc/kdocker/kdocker-5.2.ebuild +++ b/x11-misc/kdocker/kdocker-5.4.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 bash-completion-r1 qmake-utils xdg @@ -29,10 +29,6 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO ) -PATCHES=( - "${FILESDIR}"/qt-5.14.patch -) - S=${WORKDIR}/${MY_P} src_prepare() { @@ -40,6 +36,8 @@ src_prepare() { sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \ kdocker.pro || die "sed failed" + sed -i -e 's|/usr/share/appdata|/usr/share/metainfo|g' kdocker.pro \ + || die "sed failed" } src_configure() { diff --git a/x11-misc/kdocker/metadata.xml b/x11-misc/kdocker/metadata.xml index 99f3bac21a25..53285e099fbe 100644 --- a/x11-misc/kdocker/metadata.xml +++ b/x11-misc/kdocker/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>realnc@gmail.com</email> <name>Nikos Chantziaras</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest index c23babb047a8..6a32cca715ac 100644 --- a/x11-misc/kronometer/Manifest +++ b/x11-misc/kronometer/Manifest @@ -1 +1 @@ -DIST kronometer-2.2.3.tar.xz 124208 BLAKE2B f9d91bf19ba64e2c337b8181e2529b409a450c1e821c6b1358a1d57627959c65b5c4db0acd15a4c8f4cd3fb12197ce6a1bf3b95d4dc4922409223b528f5f62aa SHA512 77f948ae3a03b15a0cd49bc1048897bff0788a4831beff8f336270d8af6ee1a245d2174f5a3adc224257e9f319958197af7900ce8389b312f8fe7cd6c53a71d1 +DIST kronometer-2.3.0.tar.xz 136140 BLAKE2B b5ae57711b06ff53d3d096b6ce004620951132f4ab451aeaf67ac679e5154a4942d3cb910ed1d64ac32473b7fde59da0fd3b143171bb6f81ff29b81b29eceb2d SHA512 23321db24a0850be744765dc5eb17b3848d82b20e0bcc0520b5ee9bce6537650405aafeb435248459fd924fcfcd8acc113d8ca440edadd1d7c8f86dc282dd2e2 diff --git a/x11-misc/kronometer/kronometer-2.2.3.ebuild b/x11-misc/kronometer/kronometer-2.3.0.ebuild index f4e6e80c584b..0c50aa9f6fd0 100644 --- a/x11-misc/kronometer/kronometer-2.2.3.ebuild +++ b/x11-misc/kronometer/kronometer-2.3.0.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 +KFMIN=5.96.0 +QTMIN=5.15.5 VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Stopwatch application" -HOMEPAGE="https://kde.org/applications/utilities/org.kde.kronometer https://userbase.kde.org/Kronometer" +HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer" SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" LICENSE="GPL-2+" diff --git a/x11-misc/kronometer/metadata.xml b/x11-misc/kronometer/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/x11-misc/kronometer/metadata.xml +++ b/x11-misc/kronometer/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> </pkgmetadata> diff --git a/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch b/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch new file mode 100644 index 000000000000..e0763c688a62 --- /dev/null +++ b/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/874540 +--- a/src/ktsuss.c ++++ b/src/ktsuss.c +@@ -38,2 +38,3 @@ + #include <sys/types.h> ++#include <err.h> + #include <errno.h> +--- a/src/su_backend.c ++++ b/src/su_backend.c +@@ -40,2 +40,3 @@ + #include <sys/types.h> ++#include <err.h> + #include <errno.h> +@@ -54,2 +55,4 @@ + ++void tty_raw(int ttyfd); ++ + static struct termios orig_termios; +--- a/src/sudo_backend.c ++++ b/src/sudo_backend.c +@@ -40,2 +40,3 @@ + #include <sys/types.h> ++#include <err.h> + #include <errno.h> +@@ -55,2 +56,4 @@ + ++void tty_raw(int ttyfd); ++ + static struct termios orig_termios; diff --git a/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch b/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch new file mode 100644 index 000000000000..12909025c18c --- /dev/null +++ b/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/781185 +--- a/configure.ac ++++ b/configure.ac +@@ -25,3 +25,3 @@ + AC_MSG_CHECKING([whether we can locate the su program]) +- supath=`which su 2>/dev/null` ++ supath=`command -v su 2>/dev/null` + if test "x$supath" = "x"; then +@@ -36,3 +36,3 @@ + AC_MSG_CHECKING([whether we can locate the sudo program]) +- sudopath=`which sudo 2>/dev/null` ++ sudopath=`command -v sudo 2>/dev/null` + if test "x$sudopath" = "x"; then diff --git a/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild b/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild new file mode 100644 index 000000000000..87718a586671 --- /dev/null +++ b/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Graphical version of su written in C and GTK+ 2" +HOMEPAGE="https://github.com/nomius/ktsuss/" +SRC_URI="https://github.com/nomius/ktsuss/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~mips ppc ppc64 x86" +IUSE="sudo" + +RDEPEND=" + x11-libs/gtk+:2 + dev-libs/glib:2 + sudo? ( app-admin/sudo ) + !sudo? ( + || ( + sys-apps/util-linux[su] + sys-apps/shadow[su] + ) + )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( Changelog CREDITS README.md ) + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-no-which.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf $(use_enable sudo) +} diff --git a/x11-misc/ktsuss/ktsuss-2.1.ebuild b/x11-misc/ktsuss/ktsuss-2.1.ebuild deleted file mode 100644 index 957f0076fb18..000000000000 --- a/x11-misc/ktsuss/ktsuss-2.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Graphical version of su written in C and GTK+ 2" -HOMEPAGE="https://github.com/nomius/ktsuss" -SRC_URI="https://github.com/nomius/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~mips ppc ppc64 x86" -IUSE="sudo" - -RDEPEND=">=x11-libs/gtk+-2.12.11:2 - >=dev-libs/glib-2.16.5:2 - sudo? ( app-admin/sudo )" -DEPEND="virtual/pkgconfig - ${RDEPEND}" - -DOCS=( Changelog CREDITS README.md ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_enable sudo) -} diff --git a/x11-misc/ktsuss/metadata.xml b/x11-misc/ktsuss/metadata.xml index d08a10d01810..3131a2d29707 100644 --- a/x11-misc/ktsuss/metadata.xml +++ b/x11-misc/ktsuss/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <use> diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest index 844d864cb122..f8c64f82b33f 100644 --- a/x11-misc/libinput-gestures/Manifest +++ b/x11-misc/libinput-gestures/Manifest @@ -1 +1 @@ -DIST libinput-gestures-2.48.tar.gz 22858 BLAKE2B 67fada253a0d02791e14c6c2175f37f75c2e4ff04b04360070d1c045cf064a9d7b362c28a1e8130e6cc435bd487370c69ded3af41d53b935f7024d722aca9593 SHA512 6ad510f2067ab6cef9c9a94f1c300fe91aa811904a0e85209dc06b3afdd4a2be8ae7bda8ccb40210cc59c3758e3b14b53285f7c3c29c6982a3894952b678a840 +DIST libinput-gestures-2.73.tar.gz 28771 BLAKE2B 9f3c546b637b0038431517e2df5e3dfba4fbb7db708f108dd7a979e6674b2bdd44b2b877b5e200c05373a57bfeffefadfde59bc6c403f7188e349c2e051d8683 SHA512 8e46931c76541eb836b1bd79295f05fdc0e22091d1693eac1cc9c16407830806f9e56819e5fb8ba3eed7a26664946010d24d62d99131bcf71b1d8a3682f34ec6 diff --git a/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch b/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch new file mode 100644 index 000000000000..4d14f13f2b8d --- /dev/null +++ b/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch @@ -0,0 +1,13 @@ +diff --git a/internal b/internal +index 432179d..6898173 100755 +--- a/internal ++++ b/internal +@@ -1,7 +1,7 @@ + #!/usr/bin/env python3 + 'Command line program to exercise/test/debug the _internal command.' + # Mark Blakeney, Oct 2019 +-import sys, importlib, argparse ++import sys, importlib.util, importlib.machinery, argparse + from pathlib import Path + + CMD = '_internal' diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild deleted file mode 100644 index e1af99e98ebe..000000000000 --- a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..7} ) - -inherit python-single-r1 xdg-utils - -DESCRIPTION="Actions gestures on your touchpad using libinput" -HOMEPAGE="https://github.com/bulletmark/libinput-gestures" -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git" -else - SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/libinput-1.8.0 - x11-misc/wmctrl - x11-misc/xdotool" -DEPEND=">=dev-libs/libinput-1.8.0 - dev-util/desktop-file-utils" - -src_prepare() { - default - - # Fix docdir installation path - sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \ - || die "sed failed for libinput-gestures-setup" -} - -src_test() { :; } - -pkg_postinst() { - xdg_icon_cache_update - - elog "You must be in the input group to read the touchpad device." - - if ! has_version x11-libs/gtk+:3 ; then - elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3." - fi - if ! has_version kde-plasma/kde-cli-tools:5 ; then - elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5." - fi -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild index e1af99e98ebe..93c9ae3b00fb 100644 --- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild +++ b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6..7} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit python-single-r1 xdg-utils +inherit python-single-r1 xdg DESCRIPTION="Actions gestures on your touchpad using libinput" HOMEPAGE="https://github.com/bulletmark/libinput-gestures" @@ -19,15 +19,23 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# This is completely broken +RESTRICT="test" RDEPEND="${PYTHON_DEPS} - >=dev-libs/libinput-1.8.0 + dev-libs/libinput x11-misc/wmctrl - x11-misc/xdotool" -DEPEND=">=dev-libs/libinput-1.8.0 - dev-util/desktop-file-utils" + x11-misc/xdotool +" +DEPEND=" + dev-libs/libinput + dev-util/desktop-file-utils +" + +PATCHES=( + "${FILESDIR}/${P}-python-39-tests.patch" +) src_prepare() { default @@ -37,7 +45,15 @@ src_prepare() { || die "sed failed for libinput-gestures-setup" } -src_test() { :; } +src_test() { + emake test +} + +src_install() { + default + # Actually respect the python target setting + python_doscript "${PN}" +} pkg_postinst() { xdg_icon_cache_update @@ -45,13 +61,9 @@ pkg_postinst() { elog "You must be in the input group to read the touchpad device." if ! has_version x11-libs/gtk+:3 ; then - elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3." + elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3." fi if ! has_version kde-plasma/kde-cli-tools:5 ; then elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5." fi } - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/libinput-gestures/metadata.xml b/x11-misc/libinput-gestures/metadata.xml index 60f4aae4717f..bb7f9a08a603 100644 --- a/x11-misc/libinput-gestures/metadata.xml +++ b/x11-misc/libinput-gestures/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest index cef115de5602..f39b02aeefcc 100644 --- a/x11-misc/light-locker/Manifest +++ b/x11-misc/light-locker/Manifest @@ -1,2 +1 @@ -DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5 DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4 diff --git a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch deleted file mode 100644 index 511e730f434e..000000000000 --- a/x11-misc/light-locker/files/light-locker-1.8.0-elogind.patch +++ /dev/null @@ -1,257 +0,0 @@ -diff --git a/README b/README -index 330ec82..d16cc6b 100644 ---- a/README -+++ b/README -@@ -34,6 +34,7 @@ Most of these configurations will be enabled automatically when their dependenci - Here is a list of the different dependencies and there configuration flags: - --with-gtk2: This decides between the Gtk+-3.0 and Gtk+-2.0 dependency. - --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed. -+ --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above. - --with-console-kit: This adds the support for ConsoleKit. - --with-upower: This adds the support for UPower. - --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed. -diff --git a/configure.ac.in b/configure.ac.in -index 929befd..8639583 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -447,6 +447,42 @@ fi - AC_SUBST(SYSTEMD_CFLAGS) - AC_SUBST(SYSTEMD_LIBS) - -+dnl --------------------------------------------------------------------------- -+dnl elogind -+dnl --------------------------------------------------------------------------- -+ -+AC_ARG_WITH(elogind, -+ AS_HELP_STRING([--with-elogind], -+ [Add elogind support]), -+ [with_elogind=$withval], [with_elogind=auto]) -+ -+if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then -+ AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind]) -+fi -+ -+PKG_CHECK_MODULES(ELOGIND, -+ [libelogind], -+ [have_elogind=yes], [have_elogind=no]) -+ -+if test "x$with_elogind" = "xauto" ; then -+ if test x$have_elogind = xno ; then -+ use_elogind=no -+ else -+ use_elogind=yes -+ fi -+else -+ use_elogind=$with_elogind -+fi -+ -+if test "x$use_elogind" = "xyes"; then -+ if test "x$have_elogind" = "xno"; then -+ AC_MSG_ERROR([Elogind support explicitly required, but elogind not found]) -+ fi -+ AC_DEFINE(WITH_ELOGIND, 1, [elogind support]) -+fi -+AC_SUBST(ELOGIND_CFLAGS) -+AC_SUBST(ELOGIND_LIBS) -+ - dnl --------------------------------------------------------------------------- - dnl UPower - dnl --------------------------------------------------------------------------- -@@ -668,6 +704,7 @@ echo " - systemd: ${use_systemd} - ConsoleKit: ${use_console_kit} - UPower: ${use_upower} -+ elogind: ${use_elogind} - - Features: - --------- -diff --git a/src/Makefile.am b/src/Makefile.am -index 0fa4ef9..7c6a46f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -90,7 +90,8 @@ light_locker_SOURCES = \ - light_locker_LDADD = \ - $(LIGHT_LOCKER_LIBS) \ - $(SAVER_LIBS) \ -- $(SYSTEMD_LIBS) \ -+ $(SYSTEMD_LIBS) \ -+ $(ELOGIND_LIBS) \ - $(NULL) - - light_locker_LDFLAGS = -export-dynamic -diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c -index cab6a9e..8928cbf 100644 ---- a/src/gs-listener-dbus.c -+++ b/src/gs-listener-dbus.c -@@ -47,6 +47,10 @@ - #include <systemd/sd-login.h> - #endif - -+#ifdef WITH_ELOGIND -+#include <elogind/systemd/sd-login.h> -+#endif -+ - #include "gs-listener-dbus.h" - #include "gs-marshal.h" - #include "gs-debug.h" -@@ -82,7 +86,7 @@ struct GSListenerPrivate - char *session_id; - char *seat_path; - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - gboolean have_systemd; - char *sd_session_id; - int delay_fd; -@@ -138,7 +142,7 @@ gs_listener_send_switch_greeter (GSListener *listener) - - gs_debug ("Send switch greeter"); - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - /* Compare with 0. On failure this will return < 0. - * In the later case we probably aren't using systemd. - */ -@@ -179,7 +183,7 @@ gs_listener_send_lock_session (GSListener *listener) - - gs_debug ("Send lock session"); - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - /* Compare with 0. On failure this will return < 0. - * In the later case we probably aren't using systemd. - */ -@@ -363,7 +367,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle) - - gs_debug ("Send idle hint: %d", idle); - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - if (listener->priv->have_systemd) { - - if (listener->priv->system_connection == NULL) { -@@ -436,7 +440,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle) - void - gs_listener_delay_suspend (GSListener *listener) - { --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - DBusMessage *message; - DBusMessage *reply; - DBusError error; -@@ -509,7 +513,7 @@ gs_listener_delay_suspend (GSListener *listener) - void - gs_listener_resume_suspend (GSListener *listener) - { --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd); - - if (listener->priv->delay_fd >= 0) { -@@ -1112,7 +1116,7 @@ _listener_message_path_is_our_session (GSListener *listener, - return FALSE; - } - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - static gboolean - query_session_active (GSListener *listener) - { -@@ -1248,7 +1252,7 @@ query_lid_closed (GSListener *listener) - #endif - #endif - --#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID)) -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID)) - static gboolean - properties_changed_match (DBusMessage *message, - const char *property) -@@ -1343,7 +1347,7 @@ listener_dbus_handle_system_message (DBusConnection *connection, - dbus_message_get_destination (message)); - #endif - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - - if (listener->priv->have_systemd) { - -@@ -1963,7 +1967,7 @@ gs_listener_acquire (GSListener *listener, - listener_dbus_system_filter_function, - listener, - NULL); --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - if (listener->priv->have_systemd) { - dbus_bus_add_match (listener->priv->system_connection, - "type='signal'" -@@ -2075,7 +2079,7 @@ query_session_id (GSListener *listener) - - dbus_error_init (&error); - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - if (listener->priv->have_systemd) { - dbus_uint32_t pid = getpid(); - -@@ -2164,7 +2168,7 @@ query_session_id (GSListener *listener) - #endif - } - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - static char * - query_sd_session_id (GSListener *listener) - { -@@ -2192,7 +2196,7 @@ init_session_id (GSListener *listener) - listener->priv->session_id = query_session_id (listener); - gs_debug ("Got session-id: %s", listener->priv->session_id); - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - g_free (listener->priv->sd_session_id); - listener->priv->sd_session_id = query_sd_session_id (listener); - gs_debug ("Got sd-session-id: %s", listener->priv->sd_session_id); -@@ -2284,7 +2288,7 @@ gs_listener_init (GSListener *listener) - { - listener->priv = GS_LISTENER_GET_PRIVATE (listener); - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - /* check if logind is running */ - listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0); - listener->priv->delay_fd = -1; -@@ -2313,7 +2317,7 @@ gs_listener_finalize (GObject *object) - g_free (listener->priv->session_id); - g_free (listener->priv->seat_path); - --#ifdef WITH_SYSTEMD -+#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) - g_free (listener->priv->sd_session_id); - #endif - -diff --git a/src/light-locker.c b/src/light-locker.c -index 264b033..79de29a 100644 ---- a/src/light-locker.c -+++ b/src/light-locker.c -@@ -144,7 +144,8 @@ main (int argc, - "gtk: %d\n" - "systemd: %s\n" - "ConsoleKit: %s\n" -- "UPower: %s", -+ "UPower: %s\n" -+ "elogind: %s", - GTK_MAJOR_VERSION, - #ifdef WITH_SYSTEMD - "yes", -@@ -160,6 +161,11 @@ main (int argc, - "yes" - #else - "no" -+#endif -+#ifdef WITH_ELOGIND -+ "yes" -+#else -+ "no" - #endif - ); - gs_debug ("Features:\n" diff --git a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild deleted file mode 100644 index 3421ccb6d2df..000000000000 --- a/x11-misc/light-locker/light-locker-1.8.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools gnome2-utils - -DESCRIPTION="A simple locker using lightdm" -HOMEPAGE="https://github.com/the-cavalry/light-locker" -SRC_URI="https://github.com/the-cavalry/light-locker/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="consolekit +dpms elogind gtk3 +screensaver systemd +upower" - -BDEPEND="dev-lang/perl - dev-perl/XML-Parser - dev-util/intltool - sys-devel/gettext" -DEPEND="dev-libs/dbus-glib - dev-libs/glib - sys-apps/dbus - x11-libs/cairo - x11-libs/libX11 - x11-libs/pango - x11-libs/libXxf86vm - consolekit? ( sys-auth/consolekit ) - dpms? ( x11-libs/libXext ) - elogind? ( sys-auth/elogind ) - !gtk3? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - screensaver? ( x11-libs/libXScrnSaver ) - systemd? ( sys-apps/systemd ) - upower? ( sys-power/upower )" -RDEPEND="${DEPEND} - x11-misc/lightdm" - -REQUIRED_USE="?? ( consolekit elogind systemd )" - -DOCS=( AUTHORS HACKING NEWS README ) - -PATCHES=( - "${FILESDIR}/${PN}-${PV}-elogind.patch" -) - -src_prepare() { - default - # remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf - sed -si -e "/XDT_I18N/d" configure.ac || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with consolekit console-kit) - $(use_with dpms dpms-ext) - $(use_with !gtk3 gtk2) - $(use_with screensaver x) - $(use_with screensaver mit-ext) - $(use_with systemd) - $(use_with elogind) - $(use_with upower) - ) - econf "${myeconfargs[@]}" -} - -pkg_postinst() { - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/x11-misc/light-locker/metadata.xml b/x11-misc/light-locker/metadata.xml index 3b85524b066f..1f74a49f81fb 100644 --- a/x11-misc/light-locker/metadata.xml +++ b/x11-misc/light-locker/metadata.xml @@ -1,14 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>calchan@gentoo.org</email> - <name>Denis Dupeyron</name> - </maintainer> + <!-- maintainer-needed --> <use> - <flag name="consolekit">Keep track of the various users, sessions, and seats present on the system.</flag> <flag name="dpms">Turn on the display on screensaver deactivation.</flag> - <flag name="gtk3">Build with GTK+ 3 instead of GTK+ 2.</flag> <flag name="screensaver">Lock the screen on screensaver activation.</flag> </use> <upstream> diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest index 2ac027d641ab..dc00e0ef1e3a 100644 --- a/x11-misc/lightdm-gtk-greeter/Manifest +++ b/x11-misc/lightdm-gtk-greeter/Manifest @@ -1,3 +1,3 @@ DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274 -DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944 DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db +DIST lightdm-gtk-greeter-2.0.9.tar.gz 602540 BLAKE2B 33c7df912ee9faa46c97e7a458f400b13d7d746521de58b1c63ec845574c45374a27fe21718ac78a33a729617941cff01802c4736d1d3066d001065a57acc264 SHA512 05d786d31e447cacc28ddb06e89e91623b137665badcebd82ac7f9e8ff745a01aadf406e25ebd2c6594915fe8a90a242ef065ad46fd9ee73cd6e8c2879f70158 diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild index 8824bc8e07e2..3d8d49a1c38b 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8-r1.ebuild @@ -1,28 +1,31 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools xdg-utils DESCRIPTION="LightDM GTK+ Greeter" HOMEPAGE="https://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 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" IUSE="appindicator branding" -DEPEND="appindicator? ( dev-libs/libindicator:3 ) - x11-libs/gtk+:3 - >=x11-misc/lightdm-1.2.2" +DEPEND="x11-libs/gtk+:3 + >=x11-misc/lightdm-1.2.2 + appindicator? ( + dev-libs/ayatana-ido + dev-libs/libayatana-indicator:3 + )" BDEPEND=" + dev-build/xfce4-dev-tools dev-util/intltool - dev-util/xfce4-dev-tools sys-devel/gettext " @@ -57,6 +60,7 @@ src_configure() { local myeconfargs=( --enable-kill-on-sigterm --enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately" + --with-libindicator=ayatana $(use_enable appindicator libindicator) ) econf "${myeconfargs[@]}" diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.9.ebuild index 5cbefb2fe18b..40ca5f48ebff 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.9.ebuild @@ -1,35 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools xdg-utils DESCRIPTION="LightDM GTK+ Greeter" -HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter" -SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz - branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )" +HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter" +SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz + branding? ( https://dev.gentoo.org/~marecki/dists/x11-misc/lightdm-gtk-greeter/lightdm-gentoo-patch-2.tar.gz )" LICENSE="GPL-3 LGPL-3 branding? ( CC-BY-3.0 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="appindicator branding" -COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 ) - x11-libs/gtk+:3 - >=x11-misc/lightdm-1.2.2" +DEPEND="x11-libs/gtk+:3 + >=x11-misc/lightdm-1.2.2 + appindicator? ( + dev-libs/ayatana-ido + dev-libs/libayatana-indicator:3 + )" -DEPEND=" - ${COMMON_DEPEND} - xfce-base/exo -" BDEPEND=" + dev-build/xfce4-dev-tools dev-util/intltool sys-devel/gettext " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1" @@ -60,6 +60,7 @@ src_configure() { local myeconfargs=( --enable-kill-on-sigterm --enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately" + --with-libindicator=ayatana $(use_enable appindicator libindicator) ) econf "${myeconfargs[@]}" diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml index f10733f1b734..bea26602d3d4 100644 --- a/x11-misc/lightdm-gtk-greeter/metadata.xml +++ b/x11-misc/lightdm-gtk-greeter/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> </maintainer> <upstream> + <remote-id type="github">Xubuntu/lightdm-gtk-greeter</remote-id> <remote-id type="launchpad">lightdm-gtk-greeter</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/lightdm-mini-greeter/Manifest b/x11-misc/lightdm-mini-greeter/Manifest index fc366967a628..323f97c635c9 100644 --- a/x11-misc/lightdm-mini-greeter/Manifest +++ b/x11-misc/lightdm-mini-greeter/Manifest @@ -1,2 +1,4 @@ DIST lightdm-mini-greeter-0.3.4.tar.gz 27327 BLAKE2B 5f16b3d785e6773c127927caccfcd53089f3f31a8f1cc4c34ab09baf3cfebf9aabff45b5c76b1efdb850cde550e9335f3b8e8cd00d623a501346b9fe4e0d8e70 SHA512 dd605aaed14ead44962ef34d1d42bb350abc25f2975b2d1ed0b58e852b8f75805015ab4908a2414ebee3339e087f7d1e757f09345affb6a69bcac250ce47914f DIST lightdm-mini-greeter-0.4.0.tar.gz 28761 BLAKE2B 3f35a0d6c50ef96e995b0d96a509ec0cd2feb68dc262aaf1dc353f5cac6677abd79a0f1cf4c1119f4d96c8193b5f58f5938801503979682f85037cc2d6330ce9 SHA512 c195d16f2650a1680e6fd13493c666d5bdfd2badf2dc8c3f09a4cb973eeaf1412bf7d4c9d38c28d408ad83d65f3a4bd27b2bb7071182ca108bd2bcb94164d202 +DIST lightdm-mini-greeter-0.5.0.tar.gz 32039 BLAKE2B 7fbef14d96e7ca5b80377069d8c4240142a8e6fc312ea9aa48343810375009dc416adb20f6a3bc113fcc4fb5a48d00e80dd410847c1b30b9030da2981ee19438 SHA512 4d1a34d78759562ef42237028e5de07e0d807f1effd2a65b0f7a735fe9ae78acb6fb6f51111ecf371b307e7973ec64c9dddd85013ea1ce0b2ea6376bce320c12 +DIST lightdm-mini-greeter-0.5.1.tar.gz 32132 BLAKE2B 851b4e1ee9d5205575adb2b81cbaa61eac10bd977dd8f30771a9e7f968802115ac57a09401e6931cd3292f36fdabd0333e9c0729d2246a6394fb71c61311a9dc SHA512 231845c79da5e938d4ab3045a17b9c7a7becde491ea64a19934d42495bdbafd7b329c07a72162b9b1514b7895fe59186296f8157a711a46f14b05f21c7c90eaf diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild new file mode 100644 index 000000000000..a8f82dec16b8 --- /dev/null +++ b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="A Minimal, Configurable, Single-User GTK3 LightDM Greeter" +HOMEPAGE="https://github.com/prikhi/lightdm-mini-greeter" +SRC_URI="https://github.com/prikhi/lightdm-mini-greeter/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + >=x11-libs/gtk+-3.14:3 + >=x11-misc/lightdm-1.12 +" +DEPEND="${RDEPEND}" + +DOCS="CHANGELOG.md README.md" + +src_prepare() { + sed -i -e 's/-Werror//' Makefile.am || die + + eapply_user + eautoreconf +} diff --git a/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.1.ebuild b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.1.ebuild new file mode 100644 index 000000000000..a8f82dec16b8 --- /dev/null +++ b/x11-misc/lightdm-mini-greeter/lightdm-mini-greeter-0.5.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="A Minimal, Configurable, Single-User GTK3 LightDM Greeter" +HOMEPAGE="https://github.com/prikhi/lightdm-mini-greeter" +SRC_URI="https://github.com/prikhi/lightdm-mini-greeter/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + >=x11-libs/gtk+-3.14:3 + >=x11-misc/lightdm-1.12 +" +DEPEND="${RDEPEND}" + +DOCS="CHANGELOG.md README.md" + +src_prepare() { + sed -i -e 's/-Werror//' Makefile.am || die + + eapply_user + eautoreconf +} diff --git a/x11-misc/lightdm-mini-greeter/metadata.xml b/x11-misc/lightdm-mini-greeter/metadata.xml index 31c9c51c2562..d06d17c29f64 100644 --- a/x11-misc/lightdm-mini-greeter/metadata.xml +++ b/x11-misc/lightdm-mini-greeter/metadata.xml @@ -1,10 +1,7 @@ -<?xml version = '1.0' encoding = 'UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>graaff@gentoo.org</email> - <name>Hans de Graaff</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">prikhi/lightdm-mini-greeter</remote-id> </upstream> diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index d4211aad442b..d830b4edeb81 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -1,2 +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-r1 index 1fe0110c9d9b..c0968ea2803f 100644 --- a/x11-misc/lightdm/files/Xsession +++ b/x11-misc/lightdm/files/Xsession-r1 @@ -60,7 +60,8 @@ fi # Load Xsession scripts xsessionddir="/etc/X11/Xsession.d" if [ -d "${xsessionddir}" ] ; then - for i in $(ls ${xsessionddir}) ; do + for script in "${xsessionddir}"/* ; do + local i=$(basename ${script}) script="${xsessionddir}/${i}" if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then echo "Loading X session script ${script}" diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch new file mode 100644 index 000000000000..46c65d79f764 --- /dev/null +++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch @@ -0,0 +1,42 @@ +https://github.com/canonical/lightdm/pull/261 + +# Fix LC_IDENTIFICATION undeclared on musl or other libc that doesn't have it defined +# Patch is taken from Alpine linux [1] +# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-language.patch +# Closes: https://bugs.gentoo.org/766866 +diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c +index 3d4fa96..e38f5ce 100644 +--- a/liblightdm-gobject/language.c ++++ b/liblightdm-gobject/language.c +@@ -210,6 +210,7 @@ lightdm_language_get_name (LightDMLanguage *language) + + if (!priv->name) + { ++#if HAVE_LC_IDENTIFICATION + g_autofree gchar *locale = get_locale_name (priv->code); + if (locale) + { +@@ -223,6 +224,7 @@ lightdm_language_get_name (LightDMLanguage *language) + + setlocale (LC_ALL, current); + } ++#endif + if (!priv->name) + { + g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2); +@@ -250,6 +252,7 @@ lightdm_language_get_territory (LightDMLanguage *language) + + if (!priv->territory && strchr (priv->code, '_')) + { ++#if HAVE_LC_IDENTIFICATION + g_autofree gchar *locale = get_locale_name (priv->code); + if (locale) + { +@@ -263,6 +266,7 @@ lightdm_language_get_territory (LightDMLanguage *language) + + setlocale (LC_ALL, current); + } ++#endif + if (!priv->territory) + { + g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3); diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch new file mode 100644 index 000000000000..0df9bd4f051e --- /dev/null +++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch @@ -0,0 +1,26 @@ +https://github.com/canonical/lightdm/pull/261 + +# A little bit modified version of Alpine linux patch [1]. On musl the default +# implementation of updwtmpx will give conflicting types error and build will +# fail. This patch should fix that. This issue is noticed together with bug +# 766866 [2]. +# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-updwtmpx.patch +# [2]: https://bugs.gentoo.org/766866 +diff --git a/src/session-child.c b/src/session-child.c +index eef51e4..0052904 100644 +--- a/src/session-child.c ++++ b/src/session-child.c +@@ -193,8 +193,13 @@ read_xauth (void) + } + + /* GNU provides this but we can't rely on that so let's make our own version */ ++#if defined(__GLIBC__) + static void + updwtmpx (const gchar *wtmp_file, struct utmpx *ut) ++#else // use this version in libc's other than glibc ++void ++updwtmpx (const char *wtmp_file, const struct utmpx *ut) ++#endif + { + struct utmp u; + memset (&u, 0, sizeof (u)); diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin index decfba3438b7..9063a82f2819 100644 --- a/x11-misc/lightdm/files/lightdm-autologin +++ b/x11-misc/lightdm/files/lightdm-autologin @@ -2,5 +2,5 @@ auth optional pam_env.so auth required pam_nologin.so auth required pam_permit.so -account include system-local-login -session include system-local-login +account substack system-local-login +session substack system-local-login diff --git a/x11-misc/lightdm/files/lightdm.service b/x11-misc/lightdm/files/lightdm.service-r1 index 7eb46cebaa10..d843cac90a7f 100644 --- a/x11-misc/lightdm/files/lightdm.service +++ b/x11-misc/lightdm/files/lightdm.service-r1 @@ -5,7 +5,6 @@ After=systemd-user-sessions.service [Service] ExecStart=/usr/sbin/lightdm -StandardOutput=syslog Restart=always IgnoreSIGPIPE=no BusName=org.freedesktop.DisplayManager diff --git a/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild index ea3868227341..b0ae015ea719 100644 --- a/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild +++ b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild @@ -1,22 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils +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 +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 ppc ppc64 x86" -IUSE="audit +gnome +gtk +introspection non_root qt5 vala" +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 ) + 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 @@ -31,12 +37,17 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} - >=sys-auth/pambase-20101024-r2" + acct-group/lightdm + acct-group/video + acct-user/lightdm + >=sys-auth/pambase-20101024-r2 + elogind? ( sys-auth/elogind[pam] ) + systemd? ( sys-apps/systemd[pam] )" DEPEND="${COMMON_DEPEND} gnome? ( gnome-base/gnome-common ) " BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig @@ -44,18 +55,16 @@ BDEPEND=" " 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 ) -RESTRICT="test" -REQUIRED_USE="vala? ( introspection )" pkg_setup() { export LIGHTDM_USER=${LIGHTDM_USER:-lightdm} - if use non_root ; then - enewgroup ${LIGHTDM_USER} - enewgroup video # Just in case it hasn't been created yet - enewuser ${LIGHTDM_USER} -1 -1 /var/lib/${LIGHTDM_USER} ${LIGHTDM_USER},video - esethome ${LIGHTDM_USER} /var/lib/${LIGHTDM_USER} - fi + vala_setup } src_prepare() { @@ -83,8 +92,6 @@ src_prepare() { else AT_M4DIR=${WORKDIR} eautoreconf fi - - use vala && vala_src_prepare } src_configure() { @@ -92,15 +99,13 @@ src_configure() { local _greeter _session _user _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} _session=${LIGHTDM_SESSION:=gnome} - _user="$(usex non_root "${LIGHTDM_USER}" root)" + _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}" - use qt5 && append-cxxflags -std=c++11 - # also disable tests because libsystem.c does not build. Tests are # restricted so it does not matter anyway. local myeconfargs=( @@ -109,7 +114,6 @@ src_configure() { --disable-tests $(use_enable audit libaudit) $(use_enable introspection) - --disable-liblightdm-qt $(use_enable qt5 liblightdm-qt5) $(use_enable vala) --with-user-session=${_session} @@ -131,7 +135,7 @@ src_install() { insinto /etc/${PN} doins data/{${PN},keys}.conf - doins "${FILESDIR}"/Xsession + newins "${FILESDIR}"/Xsession-r1 Xsession fperms +x /etc/${PN}/Xsession # /var/lib/lightdm-data could be useful. Bug #522228 keepdir /var/lib/${PN}-data @@ -147,9 +151,17 @@ src_install() { readme.gentoo_create_doc - systemd_dounit "${FILESDIR}/${PN}.service" + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service } pkg_postinst() { systemd_reenable "${PN}.service" + + # Bug #886607 + ewarn + ewarn "If you have a Nvidia GPU and ${PN} fails to launch X, edit /etc/${PN}/${PN}.conf to include the line" + ewarn + ewarn "logind-check-graphical=false" + ewarn + ewarn "in the section [LightDM]. See https://github.com/canonical/lightdm/issues/263 for details." } diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml index 65cd70df4916..3371b6a35b8a 100644 --- a/x11-misc/lightdm/metadata.xml +++ b/x11-misc/lightdm/metadata.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> </maintainer> <use> <flag name="gtk">Pull in the gtk+ greeter</flag> - <flag name="non_root">Use non-root user by default</flag> + <flag name="non-root">Use non-root user by default</flag> </use> <upstream> - <remote-id type="github">CanonicalLtd/lightdm</remote-id> + <remote-id type="github">canonical/lightdm</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-configure-clang16.patch b/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-configure-clang16.patch new file mode 100644 index 000000000000..17818dc42cf5 --- /dev/null +++ b/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-configure-clang16.patch @@ -0,0 +1,14 @@ +autoreconf fails and it's a trivial fix to the generated configure, so let's +just patch that instead. This is fixed in autoconf itself in newer versions. + +https://bugs.gentoo.org/879781 +--- a/configure ++++ b/configure +@@ -7685,6 +7685,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ctype.h> ++#include <stdlib.h> + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild deleted file mode 100644 index 454c50ad61e5..000000000000 --- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils multilib - -MY_P=${P/.0/} - -DESCRIPTION="Mute/unmute and other macros for LINEAK" -HOMEPAGE="http://lineak.sourceforge.net" -SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug" - -RDEPEND=" - =x11-misc/lineakd-${PV}* -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc47.patch - - sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' default_plugin/Makefile.in || die -} - -src_configure() { - econf USER_LDFLAGS="${LDFLAGS}" $(use_enable debug) -} - -src_install() { - emake \ - DESTDIR="${D}" \ - PLUGINDIR=/usr/$(get_libdir)/lineakd/plugins \ - install - dodoc AUTHORS README -} diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild index 16aac45e5d34..9049a6bda73b 100644 --- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild +++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild @@ -1,34 +1,32 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit multilib +EAPI=8 MY_P=${P/.0/} DESCRIPTION="Mute/unmute and other macros for LINEAK" -HOMEPAGE="http://lineak.sourceforge.net" -SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" +HOMEPAGE="https://lineak.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/lineak/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug" -RDEPEND=" - =x11-misc/lineakd-${PV}* -" +RDEPEND="=x11-misc/lineakd-${PV}*" DEPEND=" ${RDEPEND} x11-base/xorg-proto " -S=${WORKDIR}/${MY_P} -DOCS=( - AUTHORS README -) + +DOCS=( AUTHORS README ) + PATCHES=( "${FILESDIR}"/${P}-gcc43.patch "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-configure-clang16.patch ) src_prepare() { @@ -40,6 +38,6 @@ src_prepare() { src_configure() { econf \ $(use_enable debug) \ - --with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \ + --with-lineak-plugindir="${EPREFIX}/usr/$(get_libdir)/lineakd" \ USER_LDFLAGS="${LDFLAGS}" } diff --git a/x11-misc/lineak-defaultplugin/metadata.xml b/x11-misc/lineak-defaultplugin/metadata.xml index f0c930bcee26..a7cda6700ceb 100644 --- a/x11-misc/lineak-defaultplugin/metadata.xml +++ b/x11-misc/lineak-defaultplugin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-configure-clang16.patch b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-configure-clang16.patch new file mode 100644 index 000000000000..256903d502ee --- /dev/null +++ b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-configure-clang16.patch @@ -0,0 +1,14 @@ +autoreconf fails and it's a trivial fix to the generated configure, so let's +just patch that instead. This is fixed in autoconf itself in newer versions. + +https://bugs.gentoo.org/879783 +--- a/configure ++++ b/configure +@@ -7153,6 +7153,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <ctype.h> ++#include <stdlib.h> + #if ((' ' & 0x0FF) == 0x020) + # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild index 5499b6eedf13..c9c63566472b 100644 --- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild +++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit multilib +EAPI=8 MY_P=${P/.0/} - DESCRIPTION="Xosd plugin for LINEAK" -HOMEPAGE="http://lineak.sourceforge.net/" -SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" +HOMEPAGE="https://lineak.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/lineak/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="debug" @@ -19,19 +18,17 @@ DEPEND=" =x11-misc/lineakd-${PV}* x11-libs/xosd " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-configure-clang16.patch ) src_configure() { econf \ $(use_enable debug) \ - --with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \ + --with-lineak-plugindir="${EPREFIX}/usr/$(get_libdir)/lineakd" \ --with-x } diff --git a/x11-misc/lineak-xosdplugin/metadata.xml b/x11-misc/lineak-xosdplugin/metadata.xml index c9ddf4376f41..70081a0cac61 100644 --- a/x11-misc/lineak-xosdplugin/metadata.xml +++ b/x11-misc/lineak-xosdplugin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch b/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch new file mode 100644 index 000000000000..a3587e42426f --- /dev/null +++ b/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch @@ -0,0 +1,58 @@ +* configure.in change from Debian to fix autoreconf: https://sources.debian.org/src/lineakd/1%253A0.9-6/debian/patches/005_configure_in.diff/#L19 +* Rest is to fix libdl linkage (and general LDFLAGS issues): https://bugs.gentoo.org/722372 +--- a/configure.in ++++ b/configure.in +@@ -28,10 +28,12 @@ + + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(acinclude.m4) dnl a source file from your sub dir +- ++AC_INIT + dnl This is so we can use kde-common + AC_CONFIG_AUX_DIR(admin) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++LT_INIT + + dnl This ksh/zsh feature conflicts with `cd blah ; pwd` + unset CDPATH + +--- a/configure.in ++++ b/configure.in +@@ -81,7 +81,7 @@ KDE_PROG_LIBTOOL + + dnl activate the next macro call for DLOPEN tests and setting LIBDL + dnl (n.b. KDE_MISC_TESTS does the same to you, so use either this or the next one) +-dnl KDE_CHECK_DLOPEN ++KDE_CHECK_DLOPEN + + dnl activate the next macro call for some additional tests + dnl (compat, crypt, socket, nsl, dlopen, ...) + +--- a/lineak/Makefile.am ++++ b/lineak/Makefile.am +@@ -19,8 +19,8 @@ liblineak_la_SOURCES = pluginmanager.cpp globals.cpp displayctrl.cpp xmgr.cpp cd + # liblineak_la_LDFLAGS = -version-info 8:0:8 $(all_libraries); \ + #fi; + +-liblineak_la_LIBADD = -lX11 -lXext $(X_LIBS) -lXt -lSM -lICE -L/usr/X11R6/lib +-liblineak_la_LDFLAGS = -version-info 8:0:8 $(all_libraries) -L/usr/X11R6/lib @X_LIBS@ @X_PRE_LIBS@ -lpthread ++liblineak_la_LIBADD = -lX11 -lXext $(X_LIBS) -lXt -lSM -lICE -L/usr/X11R6/lib $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ $(PTHREAD_LIBS) @LIBDL@ ++liblineak_la_LDFLAGS = -version-info 8:0:8 + + lineak_HEADERS = configdirectives.h configloader.h definitions.h defloader.h lconfig.h lconfigdata.h ldef.h lobject.h lkbd.h lkey.h lbutton.h loader.h msgpasser.h saver.h lcommand.h lockctrl.h lineak_util_functions.h lineak_core_functions.h cdromctrl.h xmgr.h displayctrl.h plugin_definitions.h commandexec.h pluginmanager.h + +--- a/lineakd/Makefile.am ++++ b/lineakd/Makefile.am +@@ -1,8 +1,8 @@ + bin_PROGRAMS = lineakd + + lineakd_SOURCES = lineakd_core_functions.cpp cmdprefs.cpp main.cpp +-lineakd_LDADD = -lpthread -llineak -lXext -lX11 -ldl +-lineakd_LDFLAGS = -rdynamic -L../lineak $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ ++lineakd_LDADD = -llineak -lXext -lX11 $(PTHREAD_LIBS) @LIBDL@ $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ ++lineakd_LDFLAGS = -rdynamic -L../lineak + + EXTRA_DIST = main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def lineakd.1.bz2 OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp + diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild index 4848da2c45c0..dfab8288f667 100644 --- a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild +++ b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,11 +8,11 @@ MY_P=${P/.0/} DESCRIPTION="Linux support for Easy Access and Internet Keyboards" HOMEPAGE="http://lineak.sourceforge.net" -SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/lineak/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="debug" RDEPEND=" @@ -36,7 +36,10 @@ PATCHES=( ) src_configure() { - econf $(use_enable debug) --with-x + econf \ + $(use_enable debug) \ + --with-x \ + --disable-static } src_install() { diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild index a87eac2fc117..97f6004a03d5 100644 --- a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild +++ b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild @@ -1,57 +1,65 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils ltprune multilib +EAPI=8 -MY_P=${P/.0/} +inherit autotools +MY_P=${P/.0/} DESCRIPTION="Linux support for Easy Access and Internet Keyboards" HOMEPAGE="http://lineak.sourceforge.net" -SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/lineak/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc sparc x86" IUSE="debug" -RDEPEND=" - x11-libs/libICE +RDEPEND="x11-libs/libICE x11-libs/libSM x11-libs/libX11 - x11-libs/libXext -" -DEPEND=" - ${RDEPEND} + x11-libs/libXext" +DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/libxkbfile x11-libs/libXt - x11-libs/libXtst -" + x11-libs/libXtst" -S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}"/${P}-gcc43.patch "${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch + "${FILESDIR}"/${P}-automake-linking-libdl.patch ) +src_prepare() { + default + + eautoreconf +} + src_configure() { - econf $(use_enable debug) --with-x + # admin/lineakd.m4.in contains Bashisms but fixes it causes a confusing + # autotools avalanche, so workaround it with CONFIG_SHELL as bash. + CONFIG_SHELL="${BROOT}/bin/bash" econf \ + $(use_enable debug) \ + --with-x } src_install() { - sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile + sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile || die dodir /usr/share/man/man8 emake -j1 DESTDIR="${D}" install - prune_libtool_files - dodoc AUTHORS README TODO keepdir /usr/$(get_libdir)/lineakd/plugins insinto /etc/lineak doins lineakd.conf.example lineakd.conf.kde.example + + find "${ED}"/usr/share/man -name '*.bz2' -exec bunzip2 {} \; || die + find "${ED}" -name '*.la' -delete || die } diff --git a/x11-misc/lineakd/metadata.xml b/x11-misc/lineakd/metadata.xml index c9ddf4376f41..c2ee77af29e1 100644 --- a/x11-misc/lineakd/metadata.xml +++ b/x11-misc/lineakd/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">lineak</remote-id> </upstream> diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest index f6b17c474d3d..b6bbf4d33fcd 100644 --- a/x11-misc/lndir/Manifest +++ b/x11-misc/lndir/Manifest @@ -1 +1 @@ -DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289 +DIST lndir-1.0.5.tar.xz 121460 BLAKE2B 1d51789c47e8958bcfca9f356e6cbc34916a6164024c3d33e684479b50773e806f85d0aad3558ab2704115f10408a69d709043543fd7adeafd28f354a2edca20 SHA512 f6c1498ed0d867d4aa98ef098a9ab57027ac4e852f688b2c1695a3c9ca571b927bc401925e3bd7951fbf0db54798a55f838c4a4ad113dafd95d811ba61551061 diff --git a/x11-misc/lndir/lndir-1.0.3-r2.ebuild b/x11-misc/lndir/lndir-1.0.3-r2.ebuild deleted file mode 100644 index 57a38b96a8c8..000000000000 --- a/x11-misc/lndir/lndir-1.0.3-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="create a shadow directory of symbolic links to another directory tree" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/lndir" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/lndir.git" - inherit autotools git-r3 - # x11-misc-util/macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" - KEYWORDS="amd64 ppc ppc64 sparc x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND="" -DEPEND=" - ${LIVE_DEPEND} - ${RDEPEND} - x11-base/xorg-proto -" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} diff --git a/x11-misc/lndir/lndir-1.0.5.ebuild b/x11-misc/lndir/lndir-1.0.5.ebuild new file mode 100644 index 000000000000..784bc50925af --- /dev/null +++ b/x11-misc/lndir/lndir-1.0.5.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="create a shadow directory of symbolic links to another directory tree" +KEYWORDS="amd64 ppc ppc64 sparc x86" + +RDEPEND=" + elibc_glibc? ( + || ( >=sys-libs/glibc-2.38 dev-libs/libbsd ) + ) + !elibc_glibc? ( + dev-libs/libbsd + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-misc/lndir/lndir-9999.ebuild b/x11-misc/lndir/lndir-9999.ebuild deleted file mode 100644 index 14cec61a311d..000000000000 --- a/x11-misc/lndir/lndir-9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="create a shadow directory of symbolic links to another directory tree" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/lndir" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/lndir.git" - inherit autotools git-r3 - # x11-misc-util/macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" - KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND="" -DEPEND=" - ${LIVE_DEPEND} - ${RDEPEND} - x11-base/xorg-proto -" - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} diff --git a/x11-misc/lndir/metadata.xml b/x11-misc/lndir/metadata.xml index e943b72b8a48..c115b9d12d7e 100644 --- a/x11-misc/lndir/metadata.xml +++ b/x11-misc/lndir/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/util/lndir</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/lsw/lsw-0.3.ebuild b/x11-misc/lsw/lsw-0.3.ebuild index 8d3f62603016..006e0b543d2e 100644 --- a/x11-misc/lsw/lsw-0.3.ebuild +++ b/x11-misc/lsw/lsw-0.3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="list window names" @@ -10,13 +11,15 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} x11-base/xorg-proto" src_prepare() { + default + sed -i config.mk \ -e '/^CC/d' \ -e '/^CFLAGS/{s| -Os||;s|=|+=|}' \ @@ -28,7 +31,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/lsw/metadata.xml b/x11-misc/lsw/metadata.xml index bc1b97e1eb76..115e9d64a669 100644 --- a/x11-misc/lsw/metadata.xml +++ b/x11-misc/lsw/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest index 62b2cb2f5ac8..a43d64dec426 100644 --- a/x11-misc/macopix/Manifest +++ b/x11-misc/macopix/Manifest @@ -1,4 +1,4 @@ -DIST macopix-1.7.4.tar.bz2 725481 BLAKE2B 1712dba8efe53fa78077d77faf7a84654bb87c72b6d9067484ce8b54da448326543082e2a245fbe1b61c824084744f51c0de321076a0e23586514c694840a040 SHA512 6010f98ecd3aad4325e81f037589cc4e79d857d513687f5243adb6ef3768ace5cddf4f5cdce977a75a4dc769b52bb541bdeefe92cdc012471de950ee81592db7 +DIST macopix-3.4.0.tar.gz 2854634 BLAKE2B 95ecb17588562a86db7e2c7b8c0832ebaea5b56e2c80814c365058954ce2655ac91f0109b1b0db4f7b8c1a98fde7162ee6c23fe3b2187cbeb22681714df2a595 SHA512 99b9dbbc7ca0cb3fa9c1881800e019ccae1c6439f300f479625a5b4877a0578b4a68b131ecbc0adc4a4393a867fd0ac9df7b52adaf2057f14142d1ddaf54fd53 DIST macopix-mascot-HxB-euc-ja-0.30.tar.gz 803473 BLAKE2B 943f30f19bf2108a7e412ca0404f8c47324fc2e9bac5c13c9fcf35d6a4c9944f25afee3754898e6449f46247572c35a42cbe9f7c1b123f3e9e00fc0f33a0a260 SHA512 8897bd6d30fe3372e91d00add2a1af5d7fd7384ce7668aa9b21952d5be863d04c63af8bb98846c59f54a87af3b60acbd008f6c62b68a22038f29a07e7ba19333 DIST macopix-mascot-comic_party-euc-ja-1.02.tar.gz 20656 BLAKE2B d2a7022cad1856dcebc7594acad449d4de1909ab7f33788b69c562c2d376427d91e993b2c4300a968566d7fed8d3a7e6f7596ef3adcc7897ed6a1c8fd3bb5815 SHA512 b71a586faef6b878c150e7e8e412c70d8d08919736695108efe2f119aaa01347befcaf222990fbaba10daa57120645e5c77b5534df0e4224feddbaa15c80ecf2 DIST macopix-mascot-cosmos-euc-ja-1.02.tar.gz 329269 BLAKE2B 87d2357778f6e5d91232054dca16abc71224c1837a7a66569c8891d0720e0ffb2e9ab8745c76f44d0c8827a89afc412d703a1e66e2e46b3c8d7e49940d8c7880 SHA512 05b126b872c7ddf7dfe5b6fdd9654b8f97f6e005d8fa8ad30277a379c333cb0defaad43f9165db4712fc7e4d755fdddd34dce49a99f89c56f4dc951340fc7b1b diff --git a/x11-misc/macopix/files/macopix-1.7.4-windres.patch b/x11-misc/macopix/files/macopix-1.7.4-windres.patch deleted file mode 100644 index e26bf62e7b74..000000000000 --- a/x11-misc/macopix/files/macopix-1.7.4-windres.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -145,26 +145,10 @@ - [use Gtk+1.2 insted of Gtk+2]), - [use_gtk1=yes]) - --if test x"${use_gtk1}" = "xyes"; then --AM_PATH_GLIB(1.2.6,, -- AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.), -- gthread) --AM_PATH_GTK(1.2.0, , -- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)) --AM_PATH_GDK_PIXBUF(0.7.0, , -- AC_MSG_ERROR(Cannot find GdkPixbuf: Is gdk-pixbuf-config in path?)) --dnl for libpng (In the case of Gtk+2, gdk_pixbuf_save are used.) --AC_CHECK_LIB(png,png_create_write_struct, -- [PNGLIB_LIBS="-lz -lpng -lm"], -- [AC_MSG_ERROR(libpng is required.)], -- -lz -lm) -- --else - AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([glib-2.x is required]), gthread gobject) - AM_PATH_GTK_2_0(2.0.0,, AC_MSG_ERROR([gtk+-2.x is required]), gthread gobject) - AC_DEFINE(USE_GTK2,[], [Use Gtk+2.x instead of Gtk+1.x]) - PNGLIB_LIBS="" --fi - AC_SUBST(PNGLIB_LIBS) - - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -9,14 +9,6 @@ - bmp.h sockmsg.h codeconv.h unmime.h base64.h quoted-printable.h\ - macopix_icon.h tar32api.h ssl.h - --if HAVE_WINDRES --MACOPIX_RES = macopix.res --macopix.res: macopix_res.rc -- $(WINDRES) $< -O coff -o $@ --else --MACOPIX_RES = --endif -- - EXTRA_DIST = \ - macopix_res.rc.in\ - macopix.ico\ -@@ -25,9 +17,9 @@ - tar32.dll\ - libtar32.a - --INCLUDES = @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ $(GNUTLS_CFLAGS)\ -+INCLUDES = @GTK_CFLAGS@ $(GNUTLS_CFLAGS)\ - $(DISABLE_DEPRECATED) --LDADD = @GTK_LIBS@ @GDK_PIXBUF_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\ -+LDADD = @GTK_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\ - $(MACOPIX_RES) $(WINSOCK_LIBS) $(UNLHA32_LIBS) $(TAR32_LIBS) $(GNUTLS_LIBS) $(WIN32_ICONV_LIBS) - CLEANFILES = *~ - DISTCLEANFILES = .deps/*.P diff --git a/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch b/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch new file mode 100644 index 000000000000..9bd9d9ecbd96 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch @@ -0,0 +1,143 @@ +From c3bbb22f131ea6e273d4921bd60c73e78a13e00b Mon Sep 17 00:00:00 2001 +From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org> +Date: Sat, 8 Aug 2020 03:45:19 +0800 +Subject: [PATCH] src/codeconv.c: Fix CVE-2015-8614 + +This code comes from the latest claws-mail upstream which fixes +the security issue. + +Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org> +--- + src/codeconv.c | 74 ++++++++++++++++++++++++++++++++------------------ + 1 file changed, 48 insertions(+), 26 deletions(-) + +diff --git a/src/codeconv.c b/src/codeconv.c +index 254843e..0efbc13 100644 +--- a/src/codeconv.c ++++ b/src/codeconv.c +@@ -128,10 +128,14 @@ typedef enum + void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) + { + const guchar *in = inbuf; +- guchar *out = outbuf; ++ gchar *out = outbuf; + JISState state = JIS_ASCII; + +- while (*in != '\0') { ++ /* ++ * Loop outputs up to 3 bytes in each pass (aux kanji) and we ++ * need 1 byte to terminate the output ++ */ ++ while (*in != '\0' && (out - outbuf) < outlen - 4) { + if (*in == ESC) { + in++; + if (*in == '$') { +@@ -192,6 +196,7 @@ void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) + } + + *out = '\0'; ++ return ; + } + + #define JIS_HWDAKUTEN 0x5e +@@ -263,10 +268,15 @@ static gint conv_jis_hantozen(guchar *outbuf, guchar jis_code, guchar sound_sym) + void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf) + { + const guchar *in = inbuf; +- guchar *out = outbuf; ++ gchar *out = outbuf; + JISState state = JIS_ASCII; + +- while (*in != '\0') { ++ /* ++ * Loop outputs up to 6 bytes in each pass (aux shift + aux ++ * kanji) and we need up to 4 bytes to terminate the output ++ * (ASCII shift + null) ++ */ ++ while (*in != '\0' && (out - outbuf) < outlen - 10) { + if (isascii(*in)) { + K_OUT(); + *out++ = *in++; +@@ -286,26 +296,32 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf) + } + } else if (iseuchwkana1(*in)) { + if (iseuchwkana2(*(in + 1))) { +- guchar jis_ch[2]; +- gint len; +- +- if (iseuchwkana1(*(in + 2)) && +- iseuchwkana2(*(in + 3))) +- len = conv_jis_hantozen +- (jis_ch, +- *(in + 1), *(in + 3)); +- else +- len = conv_jis_hantozen +- (jis_ch, +- *(in + 1), '\0'); +- if (len == 0) +- in += 2; +- else { +- K_IN(); +- in += len * 2; +- *out++ = jis_ch[0]; +- *out++ = jis_ch[1]; +- } ++ if (0) { ++ HW_IN(); ++ in++; ++ *out++ = *in++ & 0x7f; ++ } else { ++ guchar jis_ch[2]; ++ gint len; ++ ++ if (iseuchwkana1(*(in + 2)) && ++ iseuchwkana2(*(in + 3))) ++ len = conv_jis_hantozen ++ (jis_ch, ++ *(in + 1), *(in + 3)); ++ else ++ len = conv_jis_hantozen ++ (jis_ch, ++ *(in + 1), '\0'); ++ if (len == 0) ++ in += 2; ++ else { ++ K_IN(); ++ in += len * 2; ++ *out++ = jis_ch[0]; ++ *out++ = jis_ch[1]; ++ } ++ } + } else { + K_OUT(); + in++; +@@ -340,14 +356,19 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf) + + K_OUT(); + *out = '\0'; ++ return ; + } + + void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) + { + const guchar *in = inbuf; +- guchar *out = outbuf; ++ gchar *out = outbuf; + +- while (*in != '\0') { ++ /* ++ * Loop outputs up to 2 bytes in each pass and we need 1 byte ++ * to terminate the output ++ */ ++ while (*in != '\0' && (out - outbuf) < outlen - 3) { + if (isascii(*in)) { + *out++ = *in++; + } else if (issjiskanji1(*in)) { +@@ -386,6 +407,7 @@ void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) + } + + *out = '\0'; ++ return ; + } + + void conv_anytoeuc(gchar *outbuf, gint outlen, const gchar *inbuf) diff --git a/x11-misc/macopix/files/macopix-3.4.0-Werror.patch b/x11-misc/macopix/files/macopix-3.4.0-Werror.patch new file mode 100644 index 000000000000..e3f84dba8e37 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-Werror.patch @@ -0,0 +1,11 @@ +--- a/m4/visibility.m4 ++++ b/m4/visibility.m4 +@@ -32,7 +32,7 @@ + AC_MSG_CHECKING([whether the -Werror option is usable]) + AC_CACHE_VAL([gl_cv_cc_vis_werror], [ + gl_save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -Werror" ++ CFLAGS="$CFLAGS -Werror -setthisupforfailure" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[]], [[]])], + [gl_cv_cc_vis_werror=yes], diff --git a/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch b/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch new file mode 100644 index 000000000000..745997046461 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch @@ -0,0 +1,357 @@ +From f29175b892026dbc4a8ad321e426f22e0a09b248 Mon Sep 17 00:00:00 2001 +From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org> +Date: Sat, 8 Aug 2020 03:48:43 +0800 +Subject: [PATCH] Porting to gcc 10 + +GCC will reject multiple definitions of global variables starting +from gcc-10. We need to move the definitions to a real object file. +And in headers we only extern it. + +Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org> +--- + src/main.c | 42 ++++++++++++++++++ + src/main.h | 123 +++++++++++++++++++++++++++++++---------------------- + 2 files changed, 113 insertions(+), 52 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 7944618..ce187a1 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -35,6 +35,48 @@ + // *** GLOBAL ARGUMENT *** + + gboolean FlagInstalledMenu; ++enum MENU_EXT_t MENU_EXT; ++enum MaCoPiXFolder_t MaCoPiXFolder; ++enum ClockMode_t ClockMode; ++enum HomePos_t HomePos; ++enum MoveMode_t MoveMode; ++#ifdef USE_OSX ++enum MAC_LAYER_MODE_t MAC_LAYER_MODE; ++#endif ++enum FFPos_t FFPos; ++enum AutoBar_t AutoBar; ++enum PosBalloon_t PosBalloon; ++enum TypBalloon_t TypBalloon; ++enum DuetAnimeMode_t DuetAnimeMode; ++enum TypInterpolate_t TypInterpolate; ++enum ClockType_t ClockType; ++enum MenuSelect_t MenuSelect; ++enum GuiFontConf_t GuiFontConf; ++enum GuiColorConf_t GuiColorConf; ++enum SetReleaseData_t SetReleaseData; ++enum MailStatus0_t MailStatus0; ++enum MailPixPos_t MailPixPos; ++enum MailStatus_t MailStatus; ++enum SignalAction_t SignalAction; ++enum ConsMode_t ConsMode; ++enum ScanMenuDir_t ScanMenuDir; ++enum CompositeFlag_t CompositeFlag; ++#ifdef USE_GTK3 ++GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal; ++#ifdef USE_WIN32 ++GdkPixbuf *pixbuf_sdw; ++#endif ++#else // USE_GTK3 ++GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal; ++#ifdef USE_WIN32 ++GdkPixmap *pixmap_sdw; ++#endif ++#endif // USE_GTK3 ++gint window_x, window_y; ++gboolean supports_alpha; ++gboolean flag_balloon; ++ ++pid_t http_pid; + + // Prototype of functions in this file + #ifdef USE_GTK3 +diff --git a/src/main.h b/src/main.h +index 496815e..42577a6 100644 +--- a/src/main.h ++++ b/src/main.h +@@ -217,10 +217,11 @@ + #define MENU_EXTRACT_GTAR_COMMAND "tar -zxf %s -C %s " + + // MENU +-enum{ MENU_MENU, ++enum MENU_EXT_t { MENU_MENU, + MENU_LHA, + MENU_TAR +- }MENU_EXT; ++}; ++extern enum MENU_EXT_t MENU_EXT; + + + // ²èÁü¥Õ¥¡¥¤¥ëÍѳÈÄ¥»Ò +@@ -252,11 +253,12 @@ enum{ MENU_MENU, + #define SOUNDDIR "sound" G_DIR_SEPARATOR_S + + // Folder +-enum{ FOLDER_DEFAULT, ++enum MaCoPiXFolder_t { FOLDER_DEFAULT, + FOLDER_PIX, + FOLDER_SOUND, + FOLDER_CURRENT +- }MaCoPiXFolder; ++}; ++extern enum MaCoPiXFolder_t MaCoPiXFolder; + + // ¸Ä¿ÍÍÑ¥»¡¼¥Ö¥Õ¥¡¥¤¥ë + // (USER_DIRÃæ¤ËºîÀ® : ¥Þ¥¹¥³¥Ã¥ÈÈó°Í¸¥Ñ¥é¥á¡¼¥¿¤òÊݸ) +@@ -292,10 +294,11 @@ enum{ FOLDER_DEFAULT, + + + // CLOCK_MODE +-enum{ CLOCK_NO, ++enum ClockMode_t { CLOCK_NO, + CLOCK_PIXMAP, + CLOCK_PANEL +-}ClockMode; ++}; ++extern enum ClockMode_t ClockMode; + + //ANIME + #define MAX_PIXMAP 64 +@@ -330,47 +333,54 @@ enum{ CLOCK_NO, + #define ROOTOFF_Y (-10) + + // Home Position Mode +-enum{ HOMEPOS_NEVER, HOMEPOS_VANISH, HOMEPOS_BAR } HomePos; ++enum HomePos_t { HOMEPOS_NEVER, HOMEPOS_VANISH, HOMEPOS_BAR }; ++extern enum HomePos_t HomePos; + + // Titlebar Offset for Focus Follow + enum{ FF_BAR_ABS, FF_BAR_REL }; + + + // MOVE mode +-enum{ ++enum MoveMode_t { + MOVE_FIX, + MOVE_FOCUS +-}MoveMode; ++}; ++extern enum MoveMode_t MoveMode; + + #ifdef USE_OSX +-enum { ++enum MAC_LAYER_MODE_t { + MAC_LAYER_DEFAULT, + MAC_LAYER_TOP, + NUM_MAC_LAYER +-}MAC_LAYER_MODE; ++}; ++extern enum MAC_LAYER_MODE_t MAC_LAYER_MODE; + #endif + + // Focus Follow ´ð½à°ÌÃÖ +-enum{ FF_SIDE_LEFT, FF_SIDE_RIGHT } FFPos; ++enum FFPos_t { FF_SIDE_LEFT, FF_SIDE_RIGHT }; ++extern enum FFPos_t FFPos; + + // Focus Autobar ¥¿¥¤¥È¥ë¥Ð¡¼»»½ÐË¡ +-enum{ AUTOBAR_MANUAL, AUTOBAR_ORDINAL, AUTOBAR_COMPIZ } AutoBar; ++enum AutoBar_t { AUTOBAR_MANUAL, AUTOBAR_ORDINAL, AUTOBAR_COMPIZ }; ++extern enum AutoBar_t AutoBar; + + + // Balloon Position +-enum{ ++enum PosBalloon_t{ + BAL_POS_LEFT, + BAL_POS_RIGHT +- } PosBalloon; ++ }; ++extern enum PosBalloon_t PosBalloon; + + // Balloon Mode +-enum{BALLOON_NORMAL, ++enum TypBalloon_t {BALLOON_NORMAL, + BALLOON_MAIL, + BALLOON_POPERROR, + BALLOON_SOCKMSG, + BALLOON_DUET, + BALLOON_SYS +- } TypBalloon; ++ }; ++extern enum TypBalloon_t TypBalloon; + + // BiffÍÑ Balloon¤Î¼«Á³¾ÃÌÇ¥³¥Þ¿ô + #define BALLOON_EXPIRE 150 +@@ -394,39 +404,41 @@ typedef enum { + #define DEF_DUET_DELAY 20 + + // Duet Anime mode +-enum{ ++enum DuetAnimeMode_t { + DUET_CLICK, + DUET_RANDOM +- }DuetAnimeMode; +- ++ }; ++extern enum DuetAnimeMode_t DuetAnimeMode; + + // Interpolation Style for Magnification +-enum{ MAG_IP_NEAREST, ++enum TypInterpolate_t { MAG_IP_NEAREST, + MAG_IP_TILES, + MAG_IP_BILINEAR, + MAG_IP_HYPER +- } TypInterpolate; +- ++ }; ++extern enum TypInterpolate_t TypInterpolate; + + //Clock ¥¿¥¤¥× +-enum{ CLOCK_TYPE_24S, ++enum ClockType_t { CLOCK_TYPE_24S, + CLOCK_TYPE_24M, + CLOCK_TYPE_12S, +- CLOCK_TYPE_12M } ClockType; +- ++ CLOCK_TYPE_12M }; ++extern enum ClockType_t ClockType; + + // Font size ratio for AM/PM sign + #define CLOCK_AMPM_RATIO 0.6 + + // Install mode +-enum{ MENU_SELECT, ++enum MenuSelect_t { MENU_SELECT, + MENU_INSTALL_USER, + MENU_INSTALL_COMMON, + START_MENU_SELECT, + START_MENU_INSTALL_USER, + START_MENU_INSTALL_COMMON, + NUM_INSTALL_MODE +- } MenuSelect; ++ }; ++extern enum MenuSelect_t MenuSelect; ++ + + //DEFAULT Alpha + #define DEF_ALPHA_MAIN 100 +@@ -542,14 +554,15 @@ static GdkColor color_lred= {0, 0xFFFF, 0xBBBB, 0xBBBB}; + + + // for Callback of Configuration Dialog +-enum{CONF_FONT_CLK, ++enum GuiFontConf_t {CONF_FONT_CLK, + CONF_FONT_BAL, + CONF_DEF_FONT_CLK, + CONF_DEF_FONT_BAL, + INIT_DEF_FONT_CLK, +- INIT_DEF_FONT_BAL} GuiFontConf; ++ INIT_DEF_FONT_BAL}; ++extern enum GuiFontConf_t GuiFontConf; + +-enum{CONF_COLOR_CLK, ++enum GuiColorConf_t {CONF_COLOR_CLK, + CONF_COLOR_CLKBG, + CONF_COLOR_CLKBD, + CONF_COLOR_CLKSD, +@@ -568,19 +581,21 @@ enum{CONF_COLOR_CLK, + CONF_COLOR_FS_BG0, + CONF_COLOR_FS_BG1, + NUM_CONF_COLOR +-} GuiColorConf; +- +-enum{ SET_RELEASE_BALLOON, SET_RELEASE_CLOCK } SetReleaseData; +- ++}; ++extern enum GuiColorConf_t GuiColorConf; + ++enum SetReleaseData_t { SET_RELEASE_BALLOON, SET_RELEASE_CLOCK }; ++extern enum SetReleaseData_t SetReleaseData; + + // Setting for BIFF + #define DEF_MAIL_INTERVAL 60 + + +-enum{ MAIL_NO, MAIL_LOCAL, MAIL_POP3, MAIL_APOP, MAIL_QMAIL, MAIL_PROCMAIL } MailStatus0; ++enum MailStatus0_t { MAIL_NO, MAIL_LOCAL, MAIL_POP3, MAIL_APOP, MAIL_QMAIL, MAIL_PROCMAIL }; ++extern enum MailStatus0_t MailStatus0; + +-enum{ MAIL_PIX_LEFT, MAIL_PIX_RIGHT } MailPixPos; ++enum MailPixPos_t { MAIL_PIX_LEFT, MAIL_PIX_RIGHT }; ++extern enum MailPixPos_t MailPixPos; + + #undef POP_DEBUG /* pop3 debugging mode */ + +@@ -609,7 +624,8 @@ enum{ MAIL_PIX_LEFT, MAIL_PIX_RIGHT } MailPixPos; + #define BIFF_TOOLTIPS TRUE + + +-enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus; ++enum MailStatus_t { NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL }; ++extern enum MailStatus_t MailStatus; + + // mail status; array subscripts + +@@ -637,14 +653,17 @@ enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus; + + + // »þÊóÍÑÀßÄê +-enum{ SIGACT_NO, SIGACT_CLICK, SIGACT_CHANGE } SignalAction; ++enum SignalAction_t { SIGACT_NO, SIGACT_CLICK, SIGACT_CHANGE }; ++extern enum SignalAction_t SignalAction; + + + // Consistency Check +-enum{ CONS_MANUAL, CONS_AUTOOW, CONS_IGNORE } ConsMode; ++enum ConsMode_t { CONS_MANUAL, CONS_AUTOOW, CONS_IGNORE }; ++extern enum ConsMode_t ConsMode; + + // ¥á¥Ë¥å¡¼¤Î¾ì½ê +-enum{ SMENU_DIR_COMMON, SMENU_DIR_USER } ScanMenuDir; ++enum ScanMenuDir_t { SMENU_DIR_COMMON, SMENU_DIR_USER }; ++extern enum ScanMenuDir_t ScanMenuDir; + + + typedef enum { +@@ -661,11 +680,11 @@ typedef enum { + + + // COMPOSITE_FLAG +-enum{ COMPOSITE_FALSE, ++enum CompositeFlag_t { COMPOSITE_FALSE, + COMPOSITE_TRUE, + COMPOSITE_UNKNOWN +-}CompositeFlag; +- ++}; ++extern enum CompositeFlag_t CompositeFlag; + + + +@@ -1137,21 +1156,21 @@ typedef struct{ + + /////////// Global Arguments ////////// + #ifdef USE_GTK3 +-GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal; ++extern GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal; + #ifdef USE_WIN32 +-GdkPixbuf *pixbuf_sdw; ++extern GdkPixbuf *pixbuf_sdw; + #endif + #else // USE_GTK3 +-GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal; ++extern GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal; + #ifdef USE_WIN32 +-GdkPixmap *pixmap_sdw; ++extern GdkPixmap *pixmap_sdw; + #endif + #endif // USE_GTK3 +-gint window_x, window_y; +-gboolean supports_alpha; +-gboolean flag_balloon; ++extern gint window_x, window_y; ++extern gboolean supports_alpha; ++extern gboolean flag_balloon; + +-pid_t http_pid; ++extern pid_t http_pid; + + + /////////// Proto types ////////// diff --git a/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch new file mode 100644 index 000000000000..7d816e7d5e50 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch @@ -0,0 +1,10 @@ +--- a/src/http-client.c ++++ b/src/http-client.c +@@ -516,7 +516,6 @@ + SSL_shutdown(ssl); + SSL_free(ssl); + SSL_CTX_free(ctx); +- ERR_free_strings(); + + close(command_socket); + diff --git a/x11-misc/macopix/files/macopix-3.4.0-windres.patch b/x11-misc/macopix/files/macopix-3.4.0-windres.patch new file mode 100644 index 000000000000..39d509bcd355 --- /dev/null +++ b/x11-misc/macopix/files/macopix-3.4.0-windres.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -57,7 +57,7 @@ + AC_PROG_YACC + AM_PROG_LIBTOOL + +-AC_CHECK_PROG(WINDRES, windres, windres) ++AC_CHECK_PROG(WINDRES, windres-does-not-exist, windres) + AM_CONDITIONAL(HAVE_WINDRES, test x"$WINDRES" != x) + + # Checks for header files. diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild deleted file mode 100644 index 2d547a63583e..000000000000 --- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic - -DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application" -HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html" - -BASE_URI="http://rosegray.sakura.ne.jp/macopix" -SRC_URI="${BASE_URI}/${P}.tar.bz2" - -# NOTE: These mascots are not redistributable on commercial CD-ROM. -# The author granted to use them under Gentoo Linux. -MY_MASCOTS=" - macopix-mascot-HxB-euc-ja-0.30 - macopix-mascot-marimite-euc-ja-2.20 - macopix-mascot-cosmos-euc-ja-1.02 - macopix-mascot-mizuiro-euc-ja-1.02 - macopix-mascot-pia2-euc-ja-1.02 - macopix-mascot-tsukihime-euc-ja-1.02 - macopix-mascot-triangle_heart-euc-ja-1.02 - macopix-mascot-comic_party-euc-ja-1.02 - macopix-mascot-kanon-euc-ja-1.02 - macopix-mascot-one-euc-ja-1.02 -" - -for i in ${MY_MASCOTS} ; do - SRC_URI+=" ${BASE_URI}/${i}.tar.gz" -done - -# programme itself is GPL-2, and mascots are free-noncomm -LICENSE="GPL-2 free-noncomm" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="gnutls nls" - -RDEPEND=" - dev-libs/glib:2 - media-libs/libpng:0= - sys-devel/gettext - x11-libs/gtk+:2 - gnutls? ( net-libs/gnutls ) - !gnutls? ( dev-libs/openssl:0= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-windres.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - append-libs -lX11 - - econf $(use_with gnutls) -} - -src_install() { - default - - dodoc AUTHORS ChangeLog* NEWS *README* - - # install mascots - for d in ${MY_MASCOTS} ; do - einfo "Installing ${d}..." - cd "${WORKDIR}/${d}" || die - insinto /usr/share/"${PN}" - for i in *.mcpx *.menu ; do - doins "$i" - done - insinto /usr/share/"${PN}"/pixmap - for i in *.png ; do - doins "$i" - done - docinto "${d}" - dodoc README.jp - done -} diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild index 21fa93789d0b..530a80225d7f 100644 --- a/x11-misc/macopix/macopix-1.7.4-r2.ebuild +++ b/x11-misc/macopix/macopix-3.4.0.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic + +inherit autotools DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application" -HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html" +HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html https://github.com/chimari/MaCoPiX" BASE_URI="http://rosegray.sakura.ne.jp/macopix" -SRC_URI="${BASE_URI}/${P}.tar.bz2" +SRC_URI="${BASE_URI}/${P}.tar.gz" # NOTE: These mascots are not redistributable on commercial CD-ROM. # The author granted to use them under Gentoo Linux. @@ -29,26 +30,31 @@ for i in ${MACOPIX_MASCOTS} ; do SRC_URI+=" ${BASE_URI}/${i}.tar.gz" done -# programme itself is GPL-2, and mascots are free-noncomm +# program itself is GPL-2, and mascots are free-noncomm LICENSE="GPL-2 free-noncomm" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="gnutls nls" RDEPEND=" dev-libs/glib:2 media-libs/libpng:0= sys-devel/gettext - x11-libs/gtk+:2 gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl:0= ) + x11-libs/gtk+:3 " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig " + PATCHES=( - "${FILESDIR}"/${P}-windres.patch + "${FILESDIR}"/${PN}-3.4.0-CVE-2015-8614.patch + "${FILESDIR}"/${PN}-3.4.0-Werror.patch + "${FILESDIR}"/${PN}-3.4.0-fno-common.patch + "${FILESDIR}"/${PN}-3.4.0-windres.patch + "${FILESDIR}"/${PN}-3.4.0-openssl-1.1.0.patch ) src_prepare() { @@ -58,10 +64,8 @@ src_prepare() { } src_configure() { - append-cflags -fcommon - append-libs -lX11 - - econf $(use_with gnutls) + econf \ + $(use_with gnutls) } src_install() { diff --git a/x11-misc/macopix/metadata.xml b/x11-misc/macopix/metadata.xml index 49c86a887b6a..304da270888c 100644 --- a/x11-misc/macopix/metadata.xml +++ b/x11-misc/macopix/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">chimari/MaCoPiX</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest index 2e4f1d9077a4..c7cdad3b3938 100644 --- a/x11-misc/makedepend/Manifest +++ b/x11-misc/makedepend/Manifest @@ -1 +1 @@ -DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42 +DIST makedepend-1.0.9.tar.xz 145080 BLAKE2B 7f8b2c0a3992a7c87a37f152eb5df1e6a881c0523f4cc4e69fd0ec3aa9aee37b6a0b32c548ad246151c938596b6d4a6c32d956aa9be1ed6c81978d313644f9a3 SHA512 68d289656314dc9f12c792d0e394cfbc95404a0d01155dbcb38313d451b506da48a3d44183f568a2cbb2b1d1da9e26703a0d92f2bb658f72fc968eeb03bf2fe8 diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild deleted file mode 100644 index 35c73a35bd18..000000000000 --- a/x11-misc/makedepend/makedepend-1.0.6.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -XORG_STATIC=no -inherit xorg-3 - -DESCRIPTION="create dependencies in makefiles" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - x11-base/xorg-proto" diff --git a/x11-misc/makedepend/makedepend-1.0.9.ebuild b/x11-misc/makedepend/makedepend-1.0.9.ebuild new file mode 100644 index 000000000000..cbda29127cd3 --- /dev/null +++ b/x11-misc/makedepend/makedepend-1.0.9.ebuild @@ -0,0 +1,10 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +DESCRIPTION="create dependencies in makefiles" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" diff --git a/x11-misc/makedepend/metadata.xml b/x11-misc/makedepend/metadata.xml index e943b72b8a48..2ddc5a9641c7 100644 --- a/x11-misc/makedepend/metadata.xml +++ b/x11-misc/makedepend/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/util/makedepend</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r2.ebuild index b98376f666de..8017cd6c4e34 100644 --- a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild +++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r2.ebuild @@ -1,27 +1,34 @@ -# 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 versionator eutils +inherit autotools DESCRIPTION="Matchbox-keyboard is an on screen 'virtual' or 'software' keyboard" HOMEPAGE="http://matchbox-project.org/" -SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2" +SRC_URI="http://matchbox-project.org/sources/${PN}/$(ver_cut 1-2)/${P}.tar.bz2" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="amd64 ~arm ~hppa ppc x86" IUSE="debug cairo" -DOCS=( AUTHORS ChangeLog INSTALL NEWS README ) -PATCHES=( "${FILESDIR}"/${PN}-0.1-r1-modernize_desktop.patch ) - -DEPEND="x11-libs/libfakekey +DEPEND=" + x11-libs/libfakekey cairo? ( x11-libs/cairo[X] ) !cairo? ( x11-libs/libXft )" -RDEPEND="$DEPEND" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-0.1-r1-modernize_desktop.patch ) + +src_prepare() { + default + eautoreconf # bug 898250 +} src_configure() { - econf $(use_enable debug) $(use_enable cairo) + econf \ + $(use_enable debug) \ + $(use_enable cairo) } diff --git a/x11-misc/matchbox-keyboard/metadata.xml b/x11-misc/matchbox-keyboard/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/x11-misc/matchbox-keyboard/metadata.xml +++ b/x11-misc/matchbox-keyboard/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest index b7b30b9f16a2..4181e806b6d2 100644 --- a/x11-misc/mate-notification-daemon/Manifest +++ b/x11-misc/mate-notification-daemon/Manifest @@ -1,2 +1,3 @@ -DIST mate-notification-daemon-1.22.1.tar.xz 340472 BLAKE2B 09a4fd8f14ffcde530bf3f95aa5d38f5ab1d105dd854464eb698fa3f42594e4559a48d034a0e25a021f2cd2382d02fbe357269636ea2603f940d666467ba4058 SHA512 5faec84a2c25b3d17db5e0e564081a5712a0ae9a648b61e7d6233f7c6671a137cb9e0d2328eccad4e634eb99cae72cf235589f3667b9bf29e66c3734f7ed8bc7 -DIST mate-notification-daemon-1.24.0.tar.xz 392588 BLAKE2B 480272848b3403d34eaa1f555a573dbf74a4e8e45e76c4726943bda4c29d7002f00d1a828e318d51dd07a44df1c64902c38bbe41c1c14339e8cb8710f7008f36 SHA512 0fd2da98001c60672d4833e974ac74dd561f54ca6f3fd74f8d6620e3b28768add46dd891d7446b01426b6aed09d4966d902cbde45aac3498fdcbb837e531a147 +DIST mate-notification-daemon-1.26.0.tar.xz 421032 BLAKE2B 3f55a281cc51e63245371a1bf4ddadb2be4fa09bf16a4ffac701d4530f519a65e2ff69c7e58e6589fa923d3af86315e36d5445a6a1915a6857271933605eaaac SHA512 5249cf14ba93f2e74b9774226c5d0f5e90a517df07569e16a23af7053f5ef160afe98c8a3452baf80c243272763eee1fde0b84f434f55df1f9de26298361a1dc +DIST mate-notification-daemon-1.26.1.tar.xz 428836 BLAKE2B 78b852f8b6f6f2cdae46831c527ccca24fddf0c12660a886e5eb1b31c1046f1fcaa64de42915038306288f6baef6071ef4347f32b5cce30e4d2488e7bdc6c6d0 SHA512 c7aaef499acb2829f9833734a57e77a11a321369cb5134a4c49bb3c1e9899951c6c3702d3aac1dff6ce1bb8e60e41fc7ac31046e3346852d2da5d4dacf849a1e +DIST mate-notification-daemon-1.28.0.tar.xz 433572 BLAKE2B 89c386fb7707b87de61e5346ab018227864427d590e2908f0c85b8697d2d19d3528870f701adfa8f9657ea395718724d6398baf325d0b1d68284eb855f16df3f SHA512 dba0989945b81ff0fed5e77ac8ef7c96bf52ee854c9dc0f46549697e0d0537a8ff4a9491839076768443cc62140d1dfbf911aee489ab568c2975b67c52c78d2e diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0-r1.ebuild index 1fffb1ccaec2..0a02cc9cd01d 100644 --- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.0.ebuild +++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0-r1.ebuild @@ -1,37 +1,40 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 MATE_LA_PUNT="yes" inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" fi DESCRIPTION="MATE Notification daemon" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="" +IUSE="nls X wayland" +REQUIRED_USE="|| ( X wayland )" COMMON_DEPEND="dev-libs/atk >=dev-libs/glib-2.50:2 + >=dev-libs/libxml2-2.9.0 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 - x11-libs/libX11 - virtual/libintl >=x11-libs/gtk+-3.22:3 - >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] + X? ( + x11-libs/libX11 + >=x11-libs/libwnck-3:3 + ) + wayland? ( gui-libs/gtk-layer-shell ) " RDEPEND="${COMMON_DEPEND} - virtual/libintl !x11-misc/notify-osd !x11-misc/qtnotifydaemon !x11-misc/notification-daemon @@ -39,14 +42,17 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} app-arch/xz-utils - dev-libs/libxml2 dev-util/gdbus-codegen - >=sys-devel/gettext-0.19.8:* - >=sys-devel/libtool-2.2.6:2 - virtual/pkgconfig:*" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + mate-base/mate-panel +" src_configure() { - mate_src_configure + mate_src_configure \ + $(use_enable nls) \ + $(use_enable X x11) \ + $(use_enable wayland) } src_install() { diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.1.ebuild new file mode 100644 index 000000000000..737071d3f840 --- /dev/null +++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MATE_LA_PUNT="yes" + +inherit mate + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +fi + +DESCRIPTION="MATE Notification daemon" +LICENSE="GPL-2+ GPL-3+" +SLOT="0" + +IUSE="nls X wayland" +REQUIRED_USE="|| ( X wayland )" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + >=dev-libs/glib-2.50:2 + >=dev-libs/libxml2-2.9.0 + >=sys-apps/dbus-1 + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.22:2 + >=x11-libs/libnotify-0.7 + >=x11-libs/gtk+-3.22:3 + >=media-libs/libcanberra-0.4:0[gtk3] + X? ( + x11-libs/libX11 + >=x11-libs/libwnck-3:3 + ) + wayland? ( gui-libs/gtk-layer-shell ) +" + +RDEPEND="${COMMON_DEPEND} + !x11-misc/notify-osd + !x11-misc/notification-daemon +" + +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + dev-util/gdbus-codegen + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + mate-base/mate-panel +" + +src_configure() { + mate_src_configure \ + $(use_enable nls) \ + $(use_enable X x11) \ + $(use_enable wayland) +} + +src_install() { + mate_src_install + + insinto /usr/share/dbus-1/services + doins "${FILESDIR}/org.freedesktop.Notifications.service" +} diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.28.0.ebuild index aafe19993722..a1e84c301f57 100644 --- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.1.ebuild +++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.28.0.ebuild @@ -1,49 +1,59 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MATE_LA_PUNT="yes" inherit mate -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" fi DESCRIPTION="MATE Notification daemon" LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="" +IUSE="nls X wayland" +REQUIRED_USE="|| ( X wayland )" COMMON_DEPEND="dev-libs/atk >=dev-libs/glib-2.50:2 + >=dev-libs/libxml2-2.9.0 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 - x11-libs/libX11 - virtual/libintl >=x11-libs/gtk+-3.22:3 - >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] + X? ( + x11-libs/libX11 + >=x11-libs/libwnck-3:3 + ) + wayland? ( gui-libs/gtk-layer-shell ) +" + +RDEPEND="${COMMON_DEPEND} !x11-misc/notify-osd !x11-misc/qtnotifydaemon - !x11-misc/notification-daemon" - -RDEPEND="${COMMON_DEPEND}" + !x11-misc/notification-daemon +" DEPEND="${COMMON_DEPEND} app-arch/xz-utils dev-util/gdbus-codegen - >=dev-util/intltool-0.50.1 - sys-devel/gettext:* - >=sys-devel/libtool-2.2.6:2 - virtual/pkgconfig:*" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + mate-base/mate-panel +" src_configure() { - mate_src_configure + mate_src_configure \ + $(use_enable nls) \ + $(use_enable X x11) \ + $(use_enable wayland) } src_install() { diff --git a/x11-misc/mate-notification-daemon/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml index 249738c0cd36..e215d24b5b1b 100644 --- a/x11-misc/mate-notification-daemon/metadata.xml +++ b/x11-misc/mate-notification-daemon/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">mate-desktop/mate-notification-daemon</remote-id> </upstream> diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest index d61f580d46b9..b7551ede605b 100644 --- a/x11-misc/menulibre/Manifest +++ b/x11-misc/menulibre/Manifest @@ -1,3 +1,2 @@ -DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a -DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb -DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f +DIST menulibre-2.2.3.tar.gz 488117 BLAKE2B 2bb157f6f8fb1af8c5059bfa2f93dbf99eb3a0cf9b3072cae28284d50c6a7d847da7a7dc5905ff59386f7d69029f7ffd7c39cb9137e029355fea2f52741283c6 SHA512 bd554606ad35cdd41272ed656427ae3f610d6aacfc9e91e4de6ed342034e1bb6070812017a1372d04b0df4008ae1cd7207ca243142a874b6abb0a00893740da3 +DIST menulibre-2.4.0.tar.gz 520920 BLAKE2B c55dbb077db2af477dc9c1882449981ff15cb66b9c12ea4433ed11a1649f9dedfa8c743ca15f54b5cfd9993c8d8ae3398fd0c87c4b5e3199f5e291029f9c81af SHA512 0c520d9cab6d9eccaa9119c4ff771dbef913909202b3f2d600f4b71f5b2db87c71df35c6d8374099fda07b33b6c02686bd6b53ca0fa3d4dbd439b3c5cdcb2839 diff --git a/x11-misc/menulibre/menulibre-2.1.3.ebuild b/x11-misc/menulibre/menulibre-2.1.3.ebuild deleted file mode 100644 index dd50aff51167..000000000000 --- a/x11-misc/menulibre/menulibre-2.1.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{3_6,3_7} ) -PYTHON_REQ_USE="xml" -DISTUTILS_IN_SOURCE_BUILD=1 -inherit distutils-r1 eutils gnome2-utils versionator - -DESCRIPTION="Advanced freedesktop.org compliant menu editor" -HOMEPAGE="http://www.smdavis.us/projects/menulibre/" -SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - dev-python/python-distutils-extra[${PYTHON_USEDEP}] -" -RDEPEND=" - dev-libs/gobject-introspection - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - gnome-base/gnome-menus[introspection] - x11-libs/gdk-pixbuf[X,introspection] - x11-libs/gtk+:3[X,introspection] - x11-libs/gtksourceview:3.0[introspection] - x11-themes/hicolor-icon-theme -" - -python_prepare_all() { - # too many categories - sed -i \ - -e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \ - menulibre.desktop.in || die - - local i - # fix incorrect behavior when LINGUAS is set to an empty string - # https://bugs.launchpad.net/python-distutils-extra/+bug/1133594 - if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set - for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language - if ! has ${i} ${LINGUAS} ; then # if language is disabled - rm po/${i}.po || die - fi - done - fi - - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/menulibre/menulibre-2.2.0.ebuild b/x11-misc/menulibre/menulibre-2.2.0.ebuild deleted file mode 100644 index 5cf36a0a2080..000000000000 --- a/x11-misc/menulibre/menulibre-2.2.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{3_6,3_7} ) -PYTHON_REQ_USE="xml" -DISTUTILS_IN_SOURCE_BUILD=1 -inherit distutils-r1 eutils gnome2-utils versionator - -DESCRIPTION="Advanced freedesktop.org compliant menu editor" -HOMEPAGE="https://bluesabre.org/projects/menulibre/" -SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-python/python-distutils-extra[${PYTHON_USEDEP}] -" -RDEPEND=" - dev-libs/gobject-introspection - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - gnome-base/gnome-menus[introspection] - x11-libs/gdk-pixbuf[X,introspection] - x11-libs/gtk+:3[X,introspection] - x11-libs/gtksourceview:3.0[introspection] - x11-themes/hicolor-icon-theme -" - -python_prepare_all() { - # too many categories - sed -i \ - -e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \ - -e '/^OnlyShowIn/d' \ - menulibre.desktop.in || die - - local i - # fix incorrect behavior when LINGUAS is set to an empty string - # https://bugs.launchpad.net/python-distutils-extra/+bug/1133594 - if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set - for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language - if ! has ${i} ${LINGUAS} ; then # if language is disabled - rm po/${i}.po || die - fi - done - fi - - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild deleted file mode 100644 index c6a12203f650..000000000000 --- a/x11-misc/menulibre/menulibre-2.2.1-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7} ) -PYTHON_REQ_USE="xml" -DISTUTILS_IN_SOURCE_BUILD=1 -inherit desktop distutils-r1 xdg-utils - -DESCRIPTION="Advanced freedesktop.org compliant menu editor" -HOMEPAGE="https://bluesabre.org/projects/menulibre/" -SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-python/python-distutils-extra[${PYTHON_USEDEP}] -" -RDEPEND=" - dev-libs/gobject-introspection - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - gnome-base/gnome-menus[introspection] - x11-libs/gdk-pixbuf[X,introspection] - x11-libs/gtk+:3[X,introspection] - x11-libs/gtksourceview:3.0[introspection] - x11-themes/hicolor-icon-theme -" - -python_prepare_all() { - # too many categories - sed -i \ - -e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \ - -e '/^OnlyShowIn/d' \ - menulibre.desktop.in || die - - local i - # fix incorrect behavior when LINGUAS is set to an empty string - # https://bugs.launchpad.net/python-distutils-extra/+bug/1133594 - if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set - for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language - if ! has ${i} ${LINGUAS} ; then # if language is disabled - rm po/${i}.po || die - fi - done - fi - - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - python_optimize - rm -r "${ED}"/usr/share/doc/${PN} || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/menulibre/menulibre-2.2.3.ebuild b/x11-misc/menulibre/menulibre-2.2.3.ebuild new file mode 100644 index 000000000000..edeabe5b03f5 --- /dev/null +++ b/x11-misc/menulibre/menulibre-2.2.3.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" +inherit distutils-r1 xdg + +DESCRIPTION="Advanced freedesktop.org compliant menu editor" +HOMEPAGE="https://bluesabre.org/projects/menulibre" +SRC_URI="https://github.com/bluesabre/menulibre/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]') + gnome-base/gnome-menus:3[introspection] + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] + x11-themes/hicolor-icon-theme" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/python-distutils-extra[${PYTHON_USEDEP}]') + dev-util/intltool" + +python_prepare_all() { + distutils-r1_python_prepare_all + + # show desktop entry in all DEs + sed -i '/^OnlyShowIn/d' menulibre.desktop.in || die + + # workaround incorrect behavior when LINGUAS is set to an empty string + # https://bugs.launchpad.net/python-distutils-extra/+bug/1133594 + ! [[ -v LINGUAS && -z ${LINGUAS} ]] || rm po/*.po || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -r "${ED}"/usr/share/doc/${PN} || die +} diff --git a/x11-misc/menulibre/menulibre-2.4.0.ebuild b/x11-misc/menulibre/menulibre-2.4.0.ebuild new file mode 100644 index 000000000000..b3658ab5b65b --- /dev/null +++ b/x11-misc/menulibre/menulibre-2.4.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" +inherit distutils-r1 xdg + +DESCRIPTION="Advanced freedesktop.org compliant menu editor" +HOMEPAGE="https://bluesabre.org/projects/menulibre" +SRC_URI="https://github.com/bluesabre/menulibre/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + gnome-base/gnome-menus:3[introspection] + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] + x11-themes/hicolor-icon-theme +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/python-distutils-extra[${PYTHON_USEDEP}] + ') + dev-util/intltool +" + +python_prepare_all() { + distutils-r1_python_prepare_all + + # show desktop entry in all DEs + sed -i '/^OnlyShowIn/d' menulibre.desktop.in || die + + # workaround incorrect behavior when LINGUAS is set to an empty string + # https://bugs.launchpad.net/python-distutils-extra/+bug/1133594 + ! [[ -v LINGUAS && -z ${LINGUAS} ]] || rm po/*.po || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -r "${ED}"/usr/share/doc/${PN} || die +} diff --git a/x11-misc/menulibre/metadata.xml b/x11-misc/menulibre/metadata.xml index 79cb8248024a..dad0ffbbf1e1 100644 --- a/x11-misc/menulibre/metadata.xml +++ b/x11-misc/menulibre/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> + <stabilize-allarches/> <upstream> - <remote-id type="launchpad">menulibre</remote-id> + <remote-id type="github">bluesabre/menulibre</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest index 199c44262ce5..4fcd2e61d58e 100644 --- a/x11-misc/menumaker/Manifest +++ b/x11-misc/menumaker/Manifest @@ -1,2 +1,2 @@ -DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a 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/files/menumaker-0.99.11-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.11-AM_PATH_PYTHON.patch deleted file mode 100644 index 73cf9b6ff80f..000000000000 --- a/x11-misc/menumaker/files/menumaker-0.99.11-AM_PATH_PYTHON.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index b00b7bc..1c6f12b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,15 +1,53 @@ --ACLOCAL_AMFLAGS = -I m4 -- - SUBDIRS = doc - - dist_bin_SCRIPTS = mmaker - --nobase_dist_pkgdata_DATA = *.py MenuMaker/*.py Prophet/*.py Prophet/Desktop/*.py Prophet/Legacy/*.py Prophet/Debian/*.py Prophet/Debian/menu/* -+python_PYTHON = \ -+ Config.py \ -+ Keywords.py \ -+ Paths.py -+ -+pythonMenuMakerdir = $(pythondir)/MenuMaker -+pythonMenuMaker_PYTHON = \ -+ MenuMaker/BlackBox.py \ -+ MenuMaker/CLI.py \ -+ MenuMaker/Deskmenu.py \ -+ MenuMaker/FluxBox.py \ -+ MenuMaker/IceWM.py \ -+ MenuMaker/__init__.py \ -+ MenuMaker/OpenBox3.py \ -+ MenuMaker/PekWM.py \ -+ MenuMaker/WindowMaker.py \ -+ MenuMaker/xBox.py \ -+ MenuMaker/Xfce4.py -+ -+pythonProphetdir = $(pythondir)/Prophet -+pythonProphet_PYTHON = \ -+ Prophet/Categories.py \ -+ Prophet/__init__.py -+ -+pythonProphetDesktopdir = $(pythondir)/Prophet/Desktop -+pythonProphetDesktop_PYTHON = \ -+ Prophet/Desktop/__init__.py -+ -+pythonProphetLegacydir = $(pythondir)/Prophet/Legacy -+pythonProphetLegacy_PYTHON = \ -+ Prophet/Legacy/Development.py \ -+ Prophet/Legacy/Editor.py \ -+ Prophet/Legacy/Emulator.py \ -+ Prophet/Legacy/Graphics.py \ -+ Prophet/Legacy/__init__.py \ -+ Prophet/Legacy/Multimedia.py \ -+ Prophet/Legacy/Network.py \ -+ Prophet/Legacy/Shell.py - --install-exec-local : -- echo "#!/usr/bin/env $(PYTHON_BIN)" > $(DESTDIR)/$(bindir)/mmaker -- echo "import sys; sys.path = ['$(pkgdatadir)'] + sys.path" >> $(DESTDIR)/$(bindir)/mmaker -- echo "import MenuMaker.CLI" >> $(DESTDIR)/$(bindir)/mmaker -+pythonProphetDebiandir = $(pythondir)/Prophet/Debian -+pythonProphetDebian_PYTHON = \ -+ Prophet/Debian/__init__.py - --install-data-local : -- $(PYTHON) -c 'import compileall; compileall.compile_dir(dir="$(DESTDIR)/$(pkgdatadir)", ddir="$(pkgdatadir)")' -+pythonProphetDebianMenudir = $(pythondir)/Prophet/Debian/menu -+dist_pythonProphetDebianMenu_DATA = \ -+ Prophet/Debian/menu/debian-2.2r5 \ -+ Prophet/Debian/menu/debian-8.1 \ -+ Prophet/Debian/menu/ubuntu-5.04 \ -+ Prophet/Debian/menu/ubuntu-5.10 -diff --git a/configure.ac b/configure.ac -index 248ffcb..1bde23b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,22 +2,12 @@ AC_INIT(MenuMaker, 0.99.11) - - AM_INIT_AUTOMAKE - --#AZ_PYTHON_DEFAULT -+AM_PATH_PYTHON - --#AZ_PYTHON_WITH -- --#if test -z "$PYTHON"; then --# AZ_PYTHON_PATH --#fi -- --#AZ_PYTHON_VERSION_ENSURE([2.7]) -- --#AZ_PYTHON_RUN -- --AX_PYTHON -- --AC_CONFIG_FILES([Makefile]) --AC_CONFIG_FILES([doc/Makefile]) --AC_CONFIG_FILES([Config.py]) -+AC_CONFIG_FILES([ -+ Makefile -+ doc/Makefile -+ Config.py -+]) - - AC_OUTPUT diff --git a/x11-misc/menumaker/menumaker-0.99.11.ebuild b/x11-misc/menumaker/menumaker-0.99.11.ebuild deleted file mode 100644 index ee23f561bd82..000000000000 --- a/x11-misc/menumaker/menumaker-0.99.11.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools python-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}"/${P}-AM_PATH_PYTHON.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - configure() { - ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}" - } - python_foreach_impl run_in_build_dir configure -} - -src_compile() { - compile() { - default - use doc && emake html - } - python_foreach_impl run_in_build_dir compile -} - -src_install() { - compile() { - default - use doc && emake DESTDIR="${D}" install-html - } - python_foreach_impl run_in_build_dir compile - python_replicate_script "${ED}"/usr/bin/mmaker - einstalldocs -} diff --git a/x11-misc/menumaker/menumaker-0.99.12.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild index 311238de9188..236df97b16f1 100644 --- a/x11-misc/menumaker/menumaker-0.99.12.ebuild +++ b/x11-misc/menumaker/menumaker-0.99.12.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_10 ) 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" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="doc" 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..cce59403426d --- /dev/null +++ b/x11-misc/menumaker/menumaker-0.99.14.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..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="https://downloads.sourceforge.net/${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/menumaker/metadata.xml b/x11-misc/menumaker/metadata.xml index fd651f75dd2c..ea99a111413a 100644 --- a/x11-misc/menumaker/metadata.xml +++ b/x11-misc/menumaker/metadata.xml @@ -1,14 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>aklhfex@gmail.com</email> - <name>Chris Mayo</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> + <stabilize-allarches/> <upstream> <remote-id type="sourceforge">menumaker</remote-id> </upstream> diff --git a/x11-misc/metadata.xml b/x11-misc/metadata.xml index dfa319ee8104..c51d7e99683f 100644 --- a/x11-misc/metadata.xml +++ b/x11-misc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The x11-misc category contains miscellaneous X11 applications which do @@ -15,7 +15,7 @@ </longdescription> <longdescription lang="ja"> x11-miscカテゴリーã«ã¯ä»–ã®ã‚«ãƒ†ã‚´ãƒªãƒ¼ã«åˆ†é¡žã•ã‚Œãªã‹ã£ãŸ - 多種多様ãªX11アプリケーションãŒå«ã¾ã‚Œã¦>ã„ã¾ã™ã€‚ + 多種多様ãªX11アプリケーションãŒå«ã¾ã‚Œã¦>ã„ã¾ã™ã€‚ </longdescription> <longdescription lang="nl"> De categorie x11-misc bevat allerlei X11-applicaties die niet in andere @@ -40,4 +40,3 @@ z pozostaÅ‚ych kategorii. </longdescription> </catmetadata> - diff --git a/x11-misc/meteo/Manifest b/x11-misc/meteo/Manifest new file mode 100644 index 000000000000..fc55cb8a38d4 --- /dev/null +++ b/x11-misc/meteo/Manifest @@ -0,0 +1,2 @@ +DIST meteo-0.9.9.1.tar.gz 598205 BLAKE2B ac66e84a04f087cf75f9101da0c80e68c132e0e5064aec4cb2ea609e93f48a2ef3eb51266805b2547b4839c82496b470d4bb07e4fa0538e2ebc691a9491606d8 SHA512 d148393acc47dab1886a25600adb2a3e2ff5cb313c0004d50a54106c61f3cbd26ff95d526d13a77a1d33ede2622ff2ea9277a8fdc1899ebf34581a5a6b36c861 +DIST meteo-0.9.9.2.tar.bz2 609059 BLAKE2B 77557c28c755065f5b2da6cef429df96342c67217650f3ca3e5282f14c93d095b0e4c3f7b5cdfd62374f41e543cce14080d85291019e4336acc5d9f8f09e06c9 SHA512 96f05fb2b84d0be73eb26e101edf2a03345a06c79a86ec6c9f5acbe8b32e4fbaf6f4d7b59b65eb69f4db8667e1178d5641792b259cf23c46d4dcaee8a2243a5a diff --git a/x11-misc/meteo/metadata.xml b/x11-misc/meteo/metadata.xml new file mode 100644 index 000000000000..82e7a6d88640 --- /dev/null +++ b/x11-misc/meteo/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> + <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-r3.ebuild b/x11-misc/meteo/meteo-0.9.9.1-r3.ebuild new file mode 100644 index 000000000000..65d2e2cb6ad8 --- /dev/null +++ b/x11-misc/meteo/meteo-0.9.9.1-r3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit gnome2-utils meson python-any-r1 vala xdg + +DESCRIPTION="Forecast application using OpenWeatherMap API" +HOMEPAGE="https://gitlab.com/bitseater/meteo" +SRC_URI="https://gitlab.com/bitseater/meteo/-/archive/${PV}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +# One test needs network (#828052), the other simply checks desktop file +# validation, that we also test with our QA tests +RESTRICT="test" + +DEPEND=" + dev-libs/libayatana-appindicator:0 + dev-libs/glib:2 + dev-libs/json-glib + net-libs/libsoup:2.4 + net-libs/webkit-gtk:4 + x11-libs/gtk+:3 +" +RDEPEND="${DEPEND} + gnome-base/gsettings-desktop-schemas + x11-themes/hicolor-icon-theme +" +BDEPEND="${PYTHON_DEPS} + dev-libs/appstream-glib + virtual/pkgconfig + $(vala_depend) +" + +src_configure() { + vala_setup + meson_src_configure +} + +src_install() { + meson_src_install + dosym com.gitlab.bitseater.meteo /usr/bin/meteo +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/x11-misc/meteo/meteo-0.9.9.2.ebuild b/x11-misc/meteo/meteo-0.9.9.2.ebuild new file mode 100644 index 000000000000..043a307df6fa --- /dev/null +++ b/x11-misc/meteo/meteo-0.9.9.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +inherit gnome2-utils meson python-any-r1 vala xdg + +DESCRIPTION="Forecast application using OpenWeatherMap API" +HOMEPAGE="https://gitlab.com/bitseater/meteo" +SRC_URI="https://gitlab.com/bitseater/meteo/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +# One test needs network (#828052), the other simply checks desktop file +# validation, that we also test with our QA tests +RESTRICT="test" + +DEPEND=" + dev-libs/libayatana-appindicator:0 + dev-libs/glib:2 + dev-libs/json-glib + net-libs/libsoup:2.4 + net-libs/webkit-gtk:4 + x11-libs/gtk+:3 +" +RDEPEND="${DEPEND} + gnome-base/gsettings-desktop-schemas + x11-themes/hicolor-icon-theme +" +BDEPEND="${PYTHON_DEPS} + dev-libs/appstream-glib + virtual/pkgconfig + $(vala_depend) +" + +src_configure() { + vala_setup + meson_src_configure +} + +src_install() { + meson_src_install + dosym com.gitlab.bitseater.meteo /usr/bin/meteo +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/x11-misc/mgm/metadata.xml b/x11-misc/mgm/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/mgm/metadata.xml +++ b/x11-misc/mgm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/mgm/mgm-1.2-r1.ebuild b/x11-misc/mgm/mgm-1.2-r2.ebuild index 63774cf206e7..cdf7c850095b 100644 --- a/x11-misc/mgm/mgm-1.2-r1.ebuild +++ b/x11-misc/mgm/mgm-1.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Moaning Goat Meter: load and status meter written in Perl" HOMEPAGE="http://www.linuxmafia.com/mgm" @@ -10,18 +10,20 @@ SRC_URI="http://downloads.xiph.org/releases/mgm/${P}.tgz" LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="" -RDEPEND=">=dev-lang/perl-5.6.1 - >=dev-perl/Tk-800.024" +RDEPEND=" + dev-lang/perl + dev-perl/Tk" HTML_DOCS=( doc/. ) src_install() { exeinto /usr/share/mgm doexe mgm - dosym /usr/share/mgm/mgm /usr/bin/mgm + dosym ../share/mgm/mgm /usr/bin/mgm + insinto /usr/share/mgm doins -r lib modules + einstalldocs } diff --git a/x11-misc/mixer_app/metadata.xml b/x11-misc/mixer_app/metadata.xml index 7d273a80ff68..8a473e90e026 100644 --- a/x11-misc/mixer_app/metadata.xml +++ b/x11-misc/mixer_app/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>voyageur@gentoo.org</email> diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest index 65afca0ef6ce..7c89dca04af0 100644 --- a/x11-misc/mozo/Manifest +++ b/x11-misc/mozo/Manifest @@ -1,2 +1,2 @@ -DIST mozo-1.22.2.tar.xz 172644 BLAKE2B 15e643cfdceb1d62f7fd1499a42bb92a4dd8485adc764d304a2b3f31ffac962fa48f2af402564a6c1598fc97ae19288f4281bc19e9ba6855aeb329ec09bbe4ab SHA512 c5122b37036291ea7a2ecdb2a2ca37bf63d88404f8fb608c45917a28f4e5996d862764ea5e33544027f8f1f144387de40e204aa69b07d5a590b76aca29e1ad71 -DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193 +DIST mozo-1.26.2.tar.xz 249672 BLAKE2B 95e9a04fc91424e8ce95e870253bf1d2eddfbbf1b78b632b15d057a3ffa86068bb2c89442cfc50c4f74a76e75b345c6b06cf47d5891eed3ffce460697fb0094b SHA512 c4ea00f97f4dd5c9b33b78e1b438ba80a5e23b69d05f6ea59c522a580c1b07c280cddc0591f266c16f39bbe5f3e07ca28cdbd33753162a02584b551a9857b904 +DIST mozo-1.28.0.tar.xz 251512 BLAKE2B 79248acfb03bde54414399f832402cd40e05ccd6ea47ca239691b1c4856a301b5c20874399fa6e27ca098a73021ed4cd4fa573d94f4c2d9926c58257b29be0a8 SHA512 7576bcf275f3dc402db7a436094fe9e601529f5d9827c14b658caca82393ce71075977e523550ab15986eb32ff30718431dc6fcbbb6ae8e9d332ebb3f220beec diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml index dae74193c803..ae5e541c57d8 100644 --- a/x11-misc/mozo/metadata.xml +++ b/x11-misc/mozo/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">mate-desktop/mozo</remote-id> </upstream> diff --git a/x11-misc/mozo/mozo-1.24.0.ebuild b/x11-misc/mozo/mozo-1.26.2.ebuild index ac2cdefbe6e3..29f50e52fa7b 100644 --- a/x11-misc/mozo/mozo-1.24.0.ebuild +++ b/x11-misc/mozo/mozo-1.26.2.ebuild @@ -1,38 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" -inherit python-r1 mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi +inherit mate python-r1 DESCRIPTION="Mozo menu editor for MATE" LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+" + SLOT="0" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} +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.22:3[introspection] - !!x11-misc/mate-menu-editor + >=x11-libs/gtk+-3.12:3[introspection] " RDEPEND="${COMMON_DEPEND} virtual/libintl " - DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.19.8:* - virtual/pkgconfig:* + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig " src_prepare() { diff --git a/x11-misc/mozo/mozo-1.22.2.ebuild b/x11-misc/mozo/mozo-1.28.0.ebuild index 2aef03eb2fc2..6496e4d89d96 100644 --- a/x11-misc/mozo/mozo-1.22.2.ebuild +++ b/x11-misc/mozo/mozo-1.28.0.ebuild @@ -1,37 +1,40 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -PYTHON_COMPAT=( python{3_6,3_7} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" -inherit python-r1 mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi +inherit mate python-r1 DESCRIPTION="Mozo menu editor for MATE" LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+" + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" +else + KEYWORDS="" +fi + SLOT="0" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} +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.22:3[introspection] - virtual/libintl - !!x11-misc/mate-menu-editor" - -RDEPEND="${COMMON_DEPEND}" + >=x11-libs/gtk+-3.12:3[introspection] +" +RDEPEND="${COMMON_DEPEND} + virtual/libintl +" DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40 - sys-devel/gettext:* - virtual/pkgconfig:*" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" src_prepare() { mate_src_prepare @@ -60,6 +63,7 @@ src_install() { -i mozo || die python_doscript mozo + python_optimize } python_foreach_impl run_in_build_dir installing diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest index 8d2ac1852297..166650ae51c6 100644 --- a/x11-misc/mugshot/Manifest +++ b/x11-misc/mugshot/Manifest @@ -1 +1 @@ -DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1 +DIST mugshot-0.4.3.tar.gz 128500 BLAKE2B 88ed4a9a0efa70a14d90b831d00ad8c98d7c6dc4eff0e319e5ad08e904b0c0cf2c15bb26198f4ae1248e85959c08af165c9b6dc917dce35d986fdd73ff67eed8 SHA512 b5e91288b4de30124bd84c44b8f2a70e043af12e1f9580d07b13344b6c0343399037aadf153ea216d61cd12e4891ebb15557f1ad62c3b4d7c49584fa004ae65c diff --git a/x11-misc/mugshot/metadata.xml b/x11-misc/mugshot/metadata.xml index d3d7bd83c151..acd53d257462 100644 --- a/x11-misc/mugshot/metadata.xml +++ b/x11-misc/mugshot/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>conikost@gentoo.org</email> diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild index c547ba1e9538..8915f623113a 100644 --- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild +++ b/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DISTUTILS_USE_SETUPTOOLS="no" -PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 gnome2-utils xdg-utils +inherit distutils-r1 gnome2-utils DESCRIPTION="A lightweight user-configuration application" HOMEPAGE="https://github.com/bluesabre/mugshot" SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="GPL-3+" SLOT="0" @@ -57,8 +58,6 @@ BDEPEND=" dev-util/intltool " -S="${WORKDIR}/${PN}-${P}" - python_install() { distutils-r1_python_install diff --git a/x11-misc/mygestures/Manifest b/x11-misc/mygestures/Manifest new file mode 100644 index 000000000000..de2cb5f29a57 --- /dev/null +++ b/x11-misc/mygestures/Manifest @@ -0,0 +1 @@ +DIST mygestures-2.0.tar.gz 54613 BLAKE2B e0dbb120e4adf74a0624e5d3acb04a5af4775a84b0b8fdb2df992ed9f0b3de3907b456f9008f7df154956372dbc17acd5c3080e06857c5336e89fb1c08cc98b4 SHA512 eda75e2429b671c5ff15435b3ce3ae78e95069b17f6d2ea0d279c7c100a72e4b6dc4f452f9c003b432266d8d1047cd6ae47dc544e2f1b4f86f02fabe8c70e6dd diff --git a/x11-misc/mygestures/files/mygestures-2.0-gcc14.patch b/x11-misc/mygestures/files/mygestures-2.0-gcc14.patch new file mode 100644 index 000000000000..e2f228f80479 --- /dev/null +++ b/x11-misc/mygestures/files/mygestures-2.0-gcc14.patch @@ -0,0 +1,7 @@ +https://bugs.gentoo.org/923585 +--- a/src/configuration_parser.c ++++ b/src/configuration_parser.c +@@ -18,2 +18,3 @@ + ++#include <stdlib.h> + #include <string.h> diff --git a/x11-misc/mygestures/metadata.xml b/x11-misc/mygestures/metadata.xml new file mode 100644 index 000000000000..795ad3ce7774 --- /dev/null +++ b/x11-misc/mygestures/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> + <upstream> + <remote-id type="github">deters/mygestures</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/mygestures/mygestures-2.0-r1.ebuild b/x11-misc/mygestures/mygestures-2.0-r1.ebuild new file mode 100644 index 000000000000..2a4e45a2e732 --- /dev/null +++ b/x11-misc/mygestures/mygestures-2.0-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Mouse gestures for X" +HOMEPAGE="https://github.com/deters/mygestures/" +SRC_URI=" + https://github.com/deters/mygestures/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/libxml2 + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0-gcc14.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dobin src/mygestures #814482 + + dodoc README.md + + insinto /etc + doins mygestures.xml +} diff --git a/x11-misc/netwmpager/metadata.xml b/x11-misc/netwmpager/metadata.xml index 9809f23e9c1a..607db0ba4da5 100644 --- a/x11-misc/netwmpager/metadata.xml +++ b/x11-misc/netwmpager/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild index 027b1dcf1cbf..a2bdfe1ca0f1 100644 --- a/x11-misc/netwmpager/netwmpager-2.05.ebuild +++ b/x11-misc/netwmpager/netwmpager-2.05.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Pager that works with Openbox and other EWMH compliant window managers" HOMEPAGE="https://sourceforge.net/projects/sf-xpaint/files/netwmpager/" -SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/sf-xpaint/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="" RDEPEND=" x11-libs/libX11 @@ -20,7 +20,8 @@ RDEPEND=" x11-libs/libXdmcp x11-libs/libXau " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig x11-base/xorg-proto " @@ -34,8 +35,3 @@ src_configure() { src_compile() { emake V=2 } - -src_install() { - default - dodoc Changelog -} diff --git a/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch b/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch new file mode 100644 index 000000000000..f9a86056b4a9 --- /dev/null +++ b/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch @@ -0,0 +1,35 @@ +From d7816bc17d03c018e532a4a1b37bd9190f7b65ef Mon Sep 17 00:00:00 2001 +From: Dylan Wolf <etc404@protonmail.com> +Date: Wed, 12 Oct 2022 17:07:43 -0600 +Subject: [PATCH] Updated appdata installation location to + /usr/share/metainfo/nitrogen.metainfo.xml (appdata is deprecated) + +Signed-off-by: Dylan Wolf <etc404@protonmail.com> +--- + data/Makefile.am | 6 +++--- + data/{nitrogen.appdata.xml => nitrogen.metainfo.xml} | 0 + 2 files changed, 3 insertions(+), 3 deletions(-) + rename data/{nitrogen.appdata.xml => nitrogen.metainfo.xml} (100%) + +diff --git a/data/Makefile.am b/data/Makefile.am +index 7fa36c5..961b761 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -1,9 +1,9 @@ + SUBDIRS = icons + +-appdatadir = $(datarootdir)/appdata ++metainfodir = $(datarootdir)/metainfo + desktopdir = $(datadir)/applications + desktop_DATA = nitrogen.desktop +-appdata_DATA = nitrogen.appdata.xml ++metainfo_DATA = nitrogen.metainfo.xml + + UPDATE_DESKTOP = update-desktop-database $(datadir)/applications || : + +@@ -12,5 +12,5 @@ install-data-hook: + uninstall-hook: + $(UPDATE_DESKTOP) + +-EXTRA_DIST = icon-theme-installer nitrogen.appdata.xml ++EXTRA_DIST = icon-theme-installer nitrogen.metainfo.xml diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml index bc1b97e1eb76..11058dd6ade6 100644 --- a/x11-misc/nitrogen/metadata.xml +++ b/x11-misc/nitrogen/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <maintainer type="person" proxied="yes"> + <email>etc404@protonmail.com</email> + <name>Dylan Wolf</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild index 68f5dd2023f7..4c91440c9442 100644 --- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild +++ b/x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools flag-o-matic gnome2-utils xdg-utils +EAPI=8 + +inherit autotools flag-o-matic xdg-utils DESCRIPTION="A background browser and setter for X" HOMEPAGE="https://github.com/l3ib/nitrogen" SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz" +KEYWORDS="amd64 ~ppc x86" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" IUSE="nls xinerama" +BDEPEND="virtual/pkgconfig" RDEPEND=" >=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 @@ -21,13 +23,17 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) " +PATCHES=( + "${FILESDIR}/${P}-fix-appdata-install-location.patch" # https://github.com/l3ib/nitrogen/pull/156 +) + src_prepare() { default + mv data/nitrogen.{appdata,metainfo}.xml || die sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die @@ -42,11 +48,11 @@ src_configure() { } pkg_postinst() { - gnome2_icon_cache_update xdg_desktop_database_update + xdg_icon_cache_update } pkg_postrm() { - gnome2_icon_cache_update xdg_desktop_database_update + xdg_icon_cache_update } diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild deleted file mode 100644 index aee77e158ce4..000000000000 --- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic xdg-utils - -DESCRIPTION="A background browser and setter for X" -HOMEPAGE="http://projects.l3ib.org/nitrogen/" -SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="nls xinerama" - -RDEPEND=" - >=dev-cpp/gtkmm-2.10:2.4 - >=gnome-base/librsvg-2.20:2 - >=x11-libs/gtk+-2.10:2 - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - xinerama? ( x11-base/xorg-proto ) -" - -src_prepare() { - default - - sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die - - eautoreconf -} - -src_configure() { - append-cxxflags -std=c++11 - econf \ - $(use_enable nls) \ - $(use_enable xinerama) -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/nitrogen/nitrogen-99999.ebuild b/x11-misc/nitrogen/nitrogen-99999.ebuild index dec80fb27a1d..ce8061fea451 100644 --- a/x11-misc/nitrogen/nitrogen-99999.ebuild +++ b/x11-misc/nitrogen/nitrogen-99999.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic git-r3 xdg-utils DESCRIPTION="A background browser and setter for X" HOMEPAGE="https://github.com/l3ib/nitrogen" EGIT_REPO_URI="https://github.com/l3ib/${PN}" -IUSE="nls xinerama" -KEYWORDS="" LICENSE="GPL-2" SLOT="0" +IUSE="nls xinerama" +BDEPEND="virtual/pkgconfig" RDEPEND=" >=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) " -BDEPEND=" +DEPEND=" ${RDEPEND} - virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) " diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest index f4c4233fa570..d121b7a2d84b 100644 --- a/x11-misc/notification-daemon/Manifest +++ b/x11-misc/notification-daemon/Manifest @@ -1,4 +1 @@ -DIST notification-daemon-0.5.0.tar.bz2 330034 BLAKE2B af201d3084716fbac02095140f88a4f8528548005996b18ea9a6ef3022ad9865f5bcc1cb7b8bc75d3e97de61fafc34ac98dd5a85066a52a96e908153b61b040f SHA512 abdc86732afebbbe819db779924b82642fee7d29c005564dc890918849e2af11dbff5ba36e1d089c35318236e5950ac69df7e379fc48e7d696d27facce203b5a -DIST notification-daemon-3.14.1.tar.xz 280344 BLAKE2B 8e965cd52f97129f8f6116c9e21ffe73213b80f0652b7b00732c1afe3817e57a96c094a2ab8cef1628ef0e941aa90c759ff641d5d9fb3e5be8d4c8c26f27678a SHA512 977d028206d6a2005d346f697af5790b404f56399c451774037db25e37724f0cfbd558ae413c9ada40d2d7f399c1911392b19194e8fd093de74f65a6783ccc05 -DIST notification-daemon-3.18.2.tar.xz 329196 BLAKE2B cc4b00474ea20435fa412c1c27a95614baea06bfc00bf09c25b539e44ec8c41621eb7903a9245407e23a2a098290160d970e66dfe9cabc3bdf1ce3663a418f06 SHA512 962d84eb1970451d12d07027d4ee6843a96dc42c7d954dcb79bac55cd9918dcc84a2903b4ee032a0fd8f25d269e5e965a1deaab3da34b4181ea304df2adbae3c DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8 diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch deleted file mode 100644 index 63765ee79e69..000000000000 --- a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- src/capplet/notification-properties.c -+++ src/capplet/notification-properties.c -@@ -27,6 +27,10 @@ - #include <string.h> - #include <libnotify/notify.h> - -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - #include "stack.h" - - #define GCONF_KEY_DAEMON "/apps/notification-daemon" -@@ -402,8 +406,12 @@ - - dialog->preview = notify_notification_new (_("Notification Test"), - _("Just a test"), -- "gnome-util", -- NULL); -+ "gnome-util" -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); -+#endif - - if (!notify_notification_show (dialog->preview, &error)) { - char *message; diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch deleted file mode 100644 index 306ffd9cf991..000000000000 --- a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentoo.org/468522 - ---- configure.ac -+++ configure.ac -@@ -98,6 +98,7 @@ - dbus-1 >= $REQ_DBUS_VERSION, \ - dbus-glib-1 >= $REQ_DBUS_VERSION, \ - libcanberra-gtk >= $REQ_LIBCANBERRA_GTK_VERSION, \ -+ gmodule-2.0, \ - gconf-2.0, \ - libwnck-1.0 \ - x11 \ diff --git a/x11-misc/notification-daemon/metadata.xml b/x11-misc/notification-daemon/metadata.xml index f843557871de..c5cdb4f50232 100644 --- a/x11-misc/notification-daemon/metadata.xml +++ b/x11-misc/notification-daemon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild deleted file mode 100644 index 807ee0da169f..000000000000 --- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG=no -GNOME2_LA_PUNT=yes -GNOME_TARBALL_SUFFIX=bz2 - -inherit autotools eutils gnome2 - -DESCRIPTION="Notification daemon" -HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND=">=dev-libs/glib-2 - >=x11-libs/gtk+-2.18:2 - >=gnome-base/gconf-2 - >=dev-libs/dbus-glib-0.100 - >=sys-apps/dbus-1 - >=media-libs/libcanberra-0.4[gtk] - x11-libs/libnotify - x11-libs/libwnck:1 - x11-libs/libX11 - !x11-misc/notify-osd - !x11-misc/qtnotifydaemon" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.50 - gnome-base/gnome-common - >=sys-devel/gettext-0.18 - virtual/pkgconfig" - -DOCS="AUTHORS ChangeLog NEWS" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-libnotify-0.7.patch \ - "${FILESDIR}"/${P}-underlinking.patch - - eautoreconf - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure --disable-static -} diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild deleted file mode 100644 index 5fe49103da47..000000000000 --- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit gnome.org - -DESCRIPTION="Notification daemon" -HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.28 - >=x11-libs/gtk+-3.8:3 - sys-apps/dbus - media-libs/libcanberra[gtk3] - >=x11-libs/libnotify-0.7 - x11-libs/libX11 - !x11-misc/notify-osd - !x11-misc/qtnotifydaemon -" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog NEWS ) - -src_install() { - default - - cat <<-EOF > "${T}"/org.freedesktop.Notifications.service - [D-BUS Service] - Name=org.freedesktop.Notifications - Exec=/usr/libexec/notification-daemon - EOF - - insinto /usr/share/dbus-1/services - doins "${T}"/org.freedesktop.Notifications.service -} diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild deleted file mode 100644 index 15fde45bfb77..000000000000 --- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit gnome.org - -DESCRIPTION="Notification daemon" -HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.28:2 - >=x11-libs/gtk+-3.15.2:3[X] - sys-apps/dbus - x11-libs/libX11 - !x11-misc/notify-osd - !x11-misc/qtnotifydaemon -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog NEWS ) - -src_install() { - default - - cat <<-EOF > "${T}"/org.freedesktop.Notifications.service - [D-BUS Service] - Name=org.freedesktop.Notifications - Exec=/usr/libexec/notification-daemon - EOF - - insinto /usr/share/dbus-1/services - doins "${T}"/org.freedesktop.Notifications.service -} diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild index 22fef2824ddd..4ab64e577887 100644 --- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild +++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit gnome.org @@ -10,8 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="" +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 @@ -19,9 +18,9 @@ RDEPEND=" sys-apps/dbus x11-libs/libX11 !x11-misc/notify-osd - !x11-misc/qtnotifydaemon " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/gdbus-codegen >=sys-devel/gettext-0.19.4 virtual/pkgconfig @@ -32,12 +31,10 @@ DOCS=( AUTHORS ChangeLog NEWS ) src_install() { default - cat <<-EOF > "${T}"/org.freedesktop.Notifications.service + insinto /usr/share/dbus-1/services + newins <<-EOF - org.freedesktop.Notifications.service [D-BUS Service] Name=org.freedesktop.Notifications Exec=/usr/libexec/notification-daemon EOF - - insinto /usr/share/dbus-1/services - doins "${T}"/org.freedesktop.Notifications.service } diff --git a/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch b/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch new file mode 100644 index 000000000000..3dffeebf497b --- /dev/null +++ b/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch @@ -0,0 +1,24 @@ +Clang16 will not allow implicit pointer to integer +conversions by default. (-Werror=int-conversion by default) +This patch fixes the pointer to integer conversion. + +Bug: https://bugs.gentoo.org/879035 +Patch is upstreamed here: https://answers.launchpad.net/notify-osd/+question/704024 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> +--- a/src/bubble-window.c ++++ b/src/bubble-window.c +@@ -78,8 +78,8 @@ bubble_window_get_accessible (GtkWidget *widget) + { + AtkObjectFactory *factory = NULL; + AtkRegistry *registry = NULL; +- GType derived_type = NULL; +- GType derived_atk_type = NULL; ++ GType derived_type = 0; ++ GType derived_atk_type = 0; + + /* + * Figure out whether accessibility is enabled by looking at the +-- +2.38.1 + diff --git a/x11-misc/notify-osd/metadata.xml b/x11-misc/notify-osd/metadata.xml index 64dfa5cdb7f0..f3f2db90e3ea 100644 --- a/x11-misc/notify-osd/metadata.xml +++ b/x11-misc/notify-osd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild index 6a1096cc8f5b..37513942a8c4 100644 --- a/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild +++ b/x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools gnome2-utils savedconfig DESCRIPTION="Canonical's on-screen-display notification agent" @@ -13,7 +13,15 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="minimal" -COMMON_DEPEND=" +RDEPEND=" + gnome-base/gsettings-desktop-schemas + !minimal? ( x11-themes/notify-osd-icons ) +" +DEPEND=" + dev-util/glib-utils + gnome-base/gnome-common + x11-base/xorg-proto + virtual/pkgconfig >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 @@ -24,19 +32,12 @@ COMMON_DEPEND=" !x11-misc/notification-daemon !x11-misc/qtnotifydaemon " -RDEPEND="${COMMON_DEPEND} - gnome-base/gsettings-desktop-schemas - !minimal? ( x11-themes/notify-osd-icons ) -" -DEPEND="${COMMON_DEPEND} - dev-util/glib-utils - gnome-base/gnome-common - x11-base/xorg-proto - virtual/pkgconfig -" RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules +# Patch is upstreamed here: https://answers.launchpad.net/notify-osd/+question/704024 +PATCHES=( "${FILESDIR}/${P}-fix-integer-conversion.patch" ) + src_prepare() { default sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die diff --git a/x11-misc/nts/Manifest b/x11-misc/nts/Manifest deleted file mode 100644 index f27a7832eb01..000000000000 --- a/x11-misc/nts/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nts-82.tar.gz 155819 BLAKE2B f5f6ab561b754c450f41a8e929fe54d59de6430adfefe65fee17ab1a71766c6f4dd16ed8f4a6ae1e927814f42e6461eaca5744ad8fdf3143771949cd76c3fb5c SHA512 03ec801a550668c8654240823f63e4793d54d12630181e38031872f8d5e6cf01e151be1a5762c7013941701a679d361951f271e0f4cf0d90da54ed1db2ea61fd diff --git a/x11-misc/nts/metadata.xml b/x11-misc/nts/metadata.xml deleted file mode 100644 index 17a66d0a724b..000000000000 --- a/x11-misc/nts/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - nts is an acronym for Note Taking Simplified. It provides a simple, - intuitive format for using plain text files to store notes, a command - line interface for viewing notes in a variety of convenient ways and a - cross-platform, wx(python)-based GUI for creating and modifying notes as - well as viewing them. Displayed items can be grouped by path or tag and - can be filtered in various ways. - </longdescription> -</pkgmetadata> diff --git a/x11-misc/nts/nts-82-r1.ebuild b/x11-misc/nts/nts-82-r1.ebuild deleted file mode 100644 index 8aeaa2feba33..000000000000 --- a/x11-misc/nts/nts-82-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 - -DESCRIPTION="Note Taking made Simple, an intuitive note taking application" -HOMEPAGE="http://www.duke.edu/~dgraham/NTS/" -SRC_URI="http://www.duke.edu/~dgraham/NTS/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/wxpython:3.0[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - || ( dev-python/docutils[${PYTHON_USEDEP}] app-text/pandoc ) -" diff --git a/x11-misc/numlockx/metadata.xml b/x11-misc/numlockx/metadata.xml index 2ba8e9e851e4..06d84e396dc3 100644 --- a/x11-misc/numlockx/metadata.xml +++ b/x11-misc/numlockx/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> </pkgmetadata> diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild index bd6dcd1d7a2a..a1eb8fc18389 100644 --- a/x11-misc/numlockx/numlockx-1.2.ebuild +++ b/x11-misc/numlockx/numlockx-1.2.ebuild @@ -1,38 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 + inherit autotools -DESCRIPTION="Turns on numlock in X" -HOMEPAGE="https://home.kde.org/~seli/numlockx/" +DESCRIPTION="Changes keyboard's numlock state under X" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86" -IUSE="" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~riscv sparc x86" RDEPEND=" x11-libs/libX11 x11-libs/libXext - x11-libs/libXtst -" + x11-libs/libXtst" DEPEND=" ${RDEPEND} - x11-base/xorg-proto -" + x11-base/xorg-proto" src_prepare() { - sed -i \ - -e '/^K_.*$/d' \ - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ - configure.in || die - sed -i -e 's,@X_[_A-Z]\+@,,g' Makefile.am || die + default + + sed -i '/^K_/d; s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in || die + sed -i 's/@X_.*@//g' Makefile.am || die + eautoreconf } -src_install() { - dobin ${PN} - dodoc AUTHORS README +src_configure() { + econf X_LDFLAGS="${LDFLAGS}" } diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest index 53e04af4d9c8..578ebc2bfcea 100644 --- a/x11-misc/obconf-qt/Manifest +++ b/x11-misc/obconf-qt/Manifest @@ -1,2 +1,3 @@ -DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed -DIST obconf-qt-0.15.0.tar.xz 99976 BLAKE2B 7c7aede61cfc7a26c56de7e6ab49410dc82f4f9fb4f293fa0f0896f1b14cff63d34d00dd56347ec8daca375e226fed4ebb58c633061129708fd5107daa97d074 SHA512 a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279 +DIST obconf-qt-0.16.2.tar.xz 111080 BLAKE2B 1ea6d4f5afb3e34db288bb1cfeb0c76345704b592230ebbaaff464206b13b9dfde7ff0ae07dd164e1d925e93e51a9a9bd6c571f55b81f3bbfc1537bfa620f521 SHA512 bd91a5669f07471966d296b91d78e2a40e2e3640405de2179513457088eb7d6cb063dbfaff623db6f404985734e986b52c1e3155a050f374b7afa58f7d720c0d +DIST obconf-qt-0.16.3.tar.xz 116488 BLAKE2B 9c710ee521e014ece480ffe9b5d7f13d9ce6fc8fe164003ec8512261a884fa3e00da4720813a19c0f6bc8879c91e869d47117630b5994fabeecb7ab28888c51c SHA512 617b0b1e7ddd6efaf8f3d771fbddd88ede5fe3daf6a5c5233cffdb2cf44ecc27731c4860f38e156c49953a369f07c93db0a88c48dae83f526461da34066f6c84 +DIST obconf-qt-0.16.4.tar.xz 118780 BLAKE2B 5f8ffc2eddbd2c9fc7c019716256c5ae27c7d5ed3ffa1d221ca876d323f4833845908f2180895985ad94fcfe1596e773a3dfbdd7076350e7bc7bc00766040587 SHA512 4f75a5275e14cd7e8f0abc1bfcd40b4d860d613bc37c06c0e68d6f622ed126dce2fea98b5dd8e629b5de472ab5e668a5b0af7f6621d09fcb0b2287a11b0fb662 diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml index 08d5c58e8bbc..f230ecc2b6c2 100644 --- a/x11-misc/obconf-qt/metadata.xml +++ b/x11-misc/obconf-qt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>lxqt@gentoo.org</email> diff --git a/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild index 4979e3f9df38..5e05c035e154 100644 --- a/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild +++ b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils @@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="GPL-2 GPL-2+" @@ -21,22 +21,19 @@ SLOT="0" BDEPEND=" dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.7.0 + >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig " -DEPEND=" +RDEPEND=" dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - sys-apps/sed - x11-wm/openbox:3 x11-libs/libX11 + x11-wm/openbox:3 " -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n -" +DEPEND="${RDEPEND}" pkg_postinst() { xdg_desktop_database_update diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.3.ebuild index 27965776487c..7c66c3dd88fd 100644 --- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild +++ b/x11-misc/obconf-qt/obconf-qt-0.16.3.ebuild @@ -1,42 +1,39 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils -DESCRIPTION="Openbox window manager configuration tool" +DESCRIPTION="Qt GUI Openbox Configuration Tool" HOMEPAGE="https://lxqt.github.io/" if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi -LICENSE="GPL-2+" +LICENSE="GPL-2 GPL-2+" SLOT="0" BDEPEND=" dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.6.0 + >=dev-util/lxqt-build-tools-0.8.0 virtual/pkgconfig " -DEPEND=" +RDEPEND=" dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - sys-apps/sed - x11-wm/openbox:3 x11-libs/libX11 + x11-wm/openbox:3 " -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n -" +DEPEND="${RDEPEND}" pkg_postinst() { xdg_desktop_database_update diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.4.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.4.ebuild new file mode 100644 index 000000000000..582c6577d826 --- /dev/null +++ b/x11-misc/obconf-qt/obconf-qt-0.16.4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI Openbox Configuration Tool" +HOMEPAGE="https://lxqt.github.io/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +LICENSE="GPL-2 GPL-2+" +SLOT="0" + +BDEPEND=" + dev-qt/linguist-tools:5 + >=dev-util/lxqt-build-tools-0.8.0 + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-wm/openbox:3 +" +DEPEND="${RDEPEND}" + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest index d3f8c0f552db..72ea36463913 100644 --- a/x11-misc/obconf/Manifest +++ b/x11-misc/obconf/Manifest @@ -1 +1 @@ -DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294 +DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30 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 new file mode 100644 index 000000000000..943c812e9b79 --- /dev/null +++ b/x11-misc/obconf/files/obconf-2.0.4_p20150213-clang16.patch @@ -0,0 +1,20 @@ +https://bugzilla.icculus.org/show_bug.cgi?id=6671 +https://bugs.gentoo.org/870538 +--- a/src/appearance.c ++++ b/src/appearance.c +@@ -19,2 +19,3 @@ + ++#include <ctype.h> + #include "main.h" +--- a/src/desktops.h ++++ b/src/desktops.h +@@ -26,2 +26,3 @@ + void desktops_setup_names(GtkWidget *w); ++void desktops_setup_tab(void); + +--- a/src/main.c ++++ b/src/main.c +@@ -26,2 +26,3 @@ + #include "mouse.h" ++#include "moveresize.h" + #include "desktops.h" diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml index 15fd2f3a22be..115e9d64a669 100644 --- a/x11-misc/obconf/metadata.xml +++ b/x11-misc/obconf/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>johu@gentoo.org</email> - <name>Johannes Huber</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild deleted file mode 100644 index ac99cce34b26..000000000000 --- a/x11-misc/obconf/obconf-2.0.4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit xdg-utils - -DESCRIPTION="ObConf is a tool for configuring the Openbox window manager" -HOMEPAGE="http://openbox.org/wiki/ObConf:About" -SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux" -IUSE="nls" - -RDEPEND="gnome-base/libglade:2.0 - x11-libs/gtk+:2 - x11-libs/startup-notification - >=x11-wm/openbox-3.5.2" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_configure() { - econf \ - $(use_enable nls) -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/x11-misc/obconf/obconf-2.0.4_p20150213-r1.ebuild b/x11-misc/obconf/obconf-2.0.4_p20150213-r1.ebuild new file mode 100644 index 000000000000..18c3479ac255 --- /dev/null +++ b/x11-misc/obconf/obconf-2.0.4_p20150213-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg + +HASH_OBCONF=63ec47c5e295ad4f09d1df6d92afb7e10c3fec39 + +DESCRIPTION="Tool for configuring the Openbox window manager" +HOMEPAGE="http://openbox.org/wiki/ObConf:About" +SRC_URI="http://git.openbox.org/?p=dana/obconf.git;a=snapshot;h=${HASH_OBCONF};sf=tgz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${HASH_OBCONF::7}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux" +IUSE="nls" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11 + x11-libs/startup-notification + x11-wm/openbox:3" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf $(use_enable nls) +} diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild deleted file mode 100644 index 182f34ce49f0..000000000000 --- a/x11-misc/obconf/obconf-9999.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools xdg-utils git-r3 - -DESCRIPTION="ObConf is a tool for configuring the Openbox window manager" -HOMEPAGE="http://openbox.org/wiki/ObConf:About" -EGIT_REPO_URI="git://git.openbox.org/dana/obconf.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="nls" - -RDEPEND="x11-libs/gtk+:3 - x11-libs/startup-notification - =x11-wm/openbox-9999" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_enable nls) -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest index 3b02ee9a6ae9..a5a79ee63853 100644 --- a/x11-misc/obmenu-generator/Manifest +++ b/x11-misc/obmenu-generator/Manifest @@ -1 +1 @@ -DIST obmenu-generator-0.88.tar.gz 20569 BLAKE2B 0b17a3d379f6a92e08dd1f2e6d943e4d30f669c11847ad1354f44c41e8d3714b174fe6194a4b952664e9cc8408080ba236871b83e9f2498f5d337bc6498e92ec SHA512 650915562792b20cb39175cf2e7d11141eba24e3345cb54e5400a18f324f6fdacc4008d57d091a3ee64a36ebcf4548d0c8328e6a2dbc62613c7001b97e10332a +DIST obmenu-generator-0.93.tar.gz 20893 BLAKE2B 19fca5960ab423c9df145d3f8f7fc47a07bdfa0302d62d6565d3218296da0f24a93476e73e21413430ec4842bae64432aabbff930968d13c1ebc2f95da389ab1 SHA512 f63b7b2be80703ad3fbb1d8a6a35b74c3747035ecb19bcfb3b07a109e20a51b2d2576dbc71828e00854c331906d6d7c6e18049aa547e802bdc983a134c357515 diff --git a/x11-misc/obmenu-generator/metadata.xml b/x11-misc/obmenu-generator/metadata.xml index fccc2dd74f08..3da14741b96c 100644 --- a/x11-misc/obmenu-generator/metadata.xml +++ b/x11-misc/obmenu-generator/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>bkohler@gentoo.org</email> diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.93.ebuild index d00c2b742b88..1c13fd072ed2 100644 --- a/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild +++ b/x11-misc/obmenu-generator/obmenu-generator-0.93.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils +inherit optfeature DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager" HOMEPAGE="https://github.com/trizen/obmenu-generator" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P} LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-lang/perl[gdbm] @@ -30,7 +30,7 @@ src_install() { } pkg_postinst() { - elog "For icon (-i) functionality, install:" - optfeature "support via gtk+:2 (default)" dev-perl/Gtk2 - optfeature "support via gtk+:3 (enabled via config)" dev-perl/Gtk3 + optfeature_header "For icon (-i) functionality, install:" + optfeature "support via gtk+:2 (enabled via config)" dev-perl/Gtk2 + optfeature "support via gtk+:3 (default)" dev-perl/Gtk3 } diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest index d0f1e833ff7a..64735ae9fe99 100644 --- a/x11-misc/openbox-menu/Manifest +++ b/x11-misc/openbox-menu/Manifest @@ -1 +1 @@ -DIST openbox-menu-0.8.0.tar.bz2 24229 BLAKE2B 8950d1bf55454f239a92cf17f8676295f7c769b73fce34ee2786b0a5dd18bd81b3dddfec7f5fcf77f697072abaea758d1d5c9d0f80d41c0a9d80709b845161c2 SHA512 955a5e16e7be001aec030358d3568aa6a3303d7138d6eb998494cd9ffa77de14ecf4bee163a9d49faf67939c85e303cbae51461f04f7eeaf44167a377c0f352d +DIST openbox-menu-0.8.1.tar.gz 27960 BLAKE2B f4c78956c163b0d8ca2d601b05354217071e93307a0abc1536d1d373a3d402384b0a4d3c15252aaf9aae7c20b76b5b8aa69edfacbe11cfaa76b1aba8a7a4834e SHA512 de6454e88ac30b5cb1094ae427116808ad9dd2f37c8d2ae20dea77aa60d414a47149c09e8ea7d3c5c31182b728b8a4f13283f33c6e2a34d3cd4b64f91d4ef8da diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch deleted file mode 100644 index 5750e982be10..000000000000 --- a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch +++ /dev/null @@ -1,81 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Wed Aug 21 14:26:38 UTC 2013 -Subject: several QA fixes - ---- a/Makefile -+++ b/Makefile -@@ -1,17 +1,27 @@ --LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache` --CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache` --CC=gcc -+CC ?= gcc -+PKG_CONFIG ?= pkg-config -+ -+CFLAGS ?= -O2 -g -+CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-2.0 libmenu-cache) -+LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-2.0 libmenu-cache) - #-DG_DISABLE_DEPRECATED - --# Comment this line if you don't want icons to appear in menu --CFLAGS+=-DWITH_ICONS --# Uncomment this line if Openbox can display SVG icons --# Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear.. --# CFLAGS+=-DWITH_SVG -- --prefix= /usr/local --DESTDIR ?= $(prefix) --BINDIR= ${DESTDIR}/bin -+# set to 0 to turn off icons in menus -+ICONS=1 -+ -+# set to 0 to turn off svg icons in menus -+SVG_ICONS=1 -+ -+ifeq ($(SVG_ICONS),1) -+CPPFLAGS += -DWITH_SVG -+endif -+ -+ifeq ($(ICONS),1) -+CPPFLAGS += -DWITH_ICONS -+endif -+ -+prefix = /usr -+BINDIR = ${prefix}/bin - - SRC= $(shell ls *.c 2> /dev/null) - OBJ= $(SRC:.c=.o) -@@ -19,26 +29,29 @@ - all: $(OBJ) openbox-menu - - %.o: %.c -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - - openbox-menu: $(OBJ) -- $(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS) -+ $(CC) $(CFLAGS) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS) - --.PHONY: clean install doc changelog check -+.PHONY: clean install install-strip doc changelog check - - clean: - @rm -f *.o openbox-menu - @rm -rf doc - - install: -+ @install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu" -+ -+install-strip: - @strip -s openbox-menu -- @install -Dm 755 openbox-menu $(BINDIR)/openbox-menu -+ @install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu" - - doc: - robodoc --src . --doc doc/ --multidoc --index --html --cmode - - check: openbox-menu -- ./openbox-menu > test.xml -+ ./openbox-menu > test.xml - xmllint test.xml - rm test.xml - diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch new file mode 100644 index 000000000000..ea66efb12903 --- /dev/null +++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-build.patch @@ -0,0 +1,20 @@ +From e3989a504d9713d0de8b236b1f8d21c74d1fcd00 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Thu, 11 Feb 2021 21:12:52 +0300 +Subject: [PATCH 1/2] Fix compilation + +icon_theme is needed in menu.c +--- a/src/openbox-menu.h ++++ b/src/openbox-menu.h +@@ -82,4 +82,8 @@ gboolean context_get_persistent (OB_Menu*); + + void context_free(OB_Menu *); + ++#ifdef WITH_ICONS ++extern GtkIconTheme *icon_theme; ++#endif ++ + #endif // __OPENBOXMENU_APP__ +-- +2.26.2 + diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch new file mode 100644 index 000000000000..de8e28189a25 --- /dev/null +++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-gtk3.patch @@ -0,0 +1,77 @@ +From 8fe1e7fa9239ed8b604a59ef2202f183f1f56eb6 Mon Sep 17 00:00:00 2001 +From: Fabrice THIROUX <fabrice.thiroux@net-c.com> +Date: Sat, 13 Feb 2021 14:46:53 +0100 +Subject: [PATCH] Updated for gtk3. Remove icon_theme annoying variable + +--- +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ +-LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache` +-CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache` ++LIBS= `pkg-config --libs glib-2.0 gtk+-3.0 libmenu-cache` ++CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-3.0 libmenu-cache` + CC=gcc + #-DG_DISABLE_DEPRECATED + +--- a/src/menu.c ++++ b/src/menu.c +@@ -240,7 +240,6 @@ main (int argc, char **argv) + + #ifdef WITH_ICONS + gtk_init (&argc, &argv); +- icon_theme = gtk_icon_theme_get_default (); + #endif + + if ((ob_context = configure (argc, argv)) == NULL) +--- a/src/openbox-menu.h ++++ b/src/openbox-menu.h +@@ -19,6 +19,7 @@ + + #ifndef __OPENBOXMENU_APP__ + #define __OPENBOXMENU_APP__ ++ + #include <menu-cache.h> + + #ifdef WITH_ICONS +--- a/src/utils.c ++++ b/src/utils.c +@@ -169,8 +169,6 @@ clean_exec (MenuCacheApp *app) + + #if WITH_ICONS + +-extern GtkIconTheme *icon_theme; +- + /****f* utils/item_icon_path + * OUTPUT + * return the path for the themed icon if item. +@@ -199,23 +197,21 @@ item_icon_path (MenuCacheItem *item) + if (g_path_is_absolute (name)) + return g_strdup (name); + +- /* We remove the file extension as gtk_icon_theme_lookup_icon can't +- * lookup a theme icon for, ie, 'geany.png'. It has to be 'geany'. +- */ +- tmp_name = strndup (name, strrchr (name, '.') - name); + #ifdef WITH_SVG +- icon_info = gtk_icon_theme_lookup_icon (icon_theme, tmp_name, 16, GTK_ICON_LOOKUP_GENERIC_FALLBACK); ++ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default(), name, 16, GTK_ICON_LOOKUP_GENERIC_FALLBACK); + #else +- icon_info = gtk_icon_theme_lookup_icon (icon_theme, tmp_name, 16, GTK_ICON_LOOKUP_NO_SVG | GTK_ICON_LOOKUP_GENERIC_FALLBACK); ++ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default(), name, 16, GTK_ICON_LOOKUP_NO_SVG | GTK_ICON_LOOKUP_GENERIC_FALLBACK); + #endif + g_free (tmp_name); + } + ++ ++ + if (!icon_info) /* 2nd fallback */ +- icon_info = gtk_icon_theme_lookup_icon (icon_theme, "empty", 16, GTK_ICON_LOOKUP_NO_SVG); ++ icon_info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), "empty", 16, GTK_ICON_LOOKUP_NO_SVG); + + icon = g_strdup (gtk_icon_info_get_filename (icon_info)); +- gtk_icon_info_free (icon_info); ++ g_object_unref (icon_info); + + return icon; + } diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch new file mode 100644 index 000000000000..a2848bf464bf --- /dev/null +++ b/x11-misc/openbox-menu/files/openbox-menu-0.8.1-makefile.patch @@ -0,0 +1,106 @@ +From fa18093783ec77102c304134626bf3b4ddc07ec8 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Thu, 11 Feb 2021 21:47:47 +0300 +Subject: [PATCH 2/2] Update Makefile build + +Introduce CC and PKG_CONFIG variables that can be redefined by user. +Added variables WITH_ICONS and WITH_SVG that can be also redefined by user. +Misc enhancements to file globbing. + +* 2021-03-15 asturm: Fix BINDIR path, add DESTDIR, adapt to GTK3 change + +--- a/Makefile ++++ b/Makefile +@@ -1,19 +1,31 @@ +-LIBS= `pkg-config --libs glib-2.0 gtk+-3.0 libmenu-cache` +-CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-3.0 libmenu-cache` +-CC=gcc ++CC ?= gcc ++PKG_CONFIG ?= pkg-config ++ ++CFLAGS ?= -O2 -g ++CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-3.0 libmenu-cache) ++LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-3.0 libmenu-cache) ++ + #-DG_DISABLE_DEPRECATED + +-# Comment this line if you don't want icons to appear in menu +-CFLAGS+=-DWITH_ICONS +-# Uncomment this line if Openbox can display SVG icons ++# set to 0 to turn off icons in menus ++WITH_ICONS=1 ++ ++ifeq ($(WITH_ICONS),1) ++CFLAGS += -DWITH_ICONS ++endif ++ ++# set to 0 to turn off svg icons in menus + # Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear.. +-# CFLAGS+=-DWITH_SVG ++WITH_SVG=0 ++ ++ifeq ($(WITH_SVG),1) ++CFLAGS += -DWITH_SVG ++endif + +-prefix= /usr/local +-DESTDIR ?= $(prefix) +-BINDIR= ${DESTDIR}/bin ++prefix = /usr ++BINDIR = ${prefix}/bin + +-SRC= $(shell ls src/*.c 2> /dev/null) ++SRC= $(wildcard src/*.c) + OBJ= $(SRC:.c=.o) + + all: $(OBJ) check openbox-menu +@@ -25,15 +37,18 @@ + openbox-menu: $(OBJ) + $(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS) + +-.PHONY: clean install doc changelog check xmllint ++.PHONY: clean install install-strip doc changelog check xmllint + + clean: + @rm -f $(OBJ) $(TEST_OBJ) openbox-menu check + @rm -rf doc + + install: ++ @install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu" ++ ++install-strip: + @strip -s openbox-menu +- @install -Dm 755 openbox-menu $(BINDIR)/openbox-menu ++ @install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu" + + doc: + robodoc --src . --doc doc/ --multidoc --index --html --cmode + +diff --git a/README.md b/README.md +--- a/README.md ++++ b/README.md +@@ -6,17 +6,17 @@ Type `make` then, with superuser privileges, `make install` to install it. openb + + ## Compile openbox-menu without icons ## + +-Openbox-menu shows icons before categories name and applications name (in fact, the menu and the icons are displayed by Openbox; Openbox-menu only outputs text content). You can remove icon support by editing the Makefile and commenting the following line (add a # in the begining) ++Openbox-menu shows icons before categories name and applications name (in fact, the menu and the icons are displayed by Openbox; Openbox-menu only outputs text content). You can enable icon support by running `make` with `WITH_ICONS=1` option (pass `WITH_ICONS=0` to disable it): + +-> CFLAGS+=-DWITH_ICONS ++> make WITH_ICONS=1 + + If errors occur while compiling, remove gtk+-2.0 from lines above the one previously commented. + + ## SVG support + +-Openbox can display SVG icons since version 3.5.1. SVG support in openbox-menu has to be activated in Makefile by uncommenting the following line ++Openbox can display SVG icons since version 3.5.1. SVG support in openbox-menu can be enabled by running `make` with `WITH_SVG=1` option (pass `WITH_SVG=0` to disable it): + +-> CFLAGS+=-DWITH_SVG ++> make WITH_SVG=1 + + SVG suport will be activated by default in the future. + +-- +2.26.2 + diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml index 1636af995109..7093064bf28c 100644 --- a/x11-misc/openbox-menu/metadata.xml +++ b/x11-misc/openbox-menu/metadata.xml @@ -1,17 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <maintainer status="active"> <email>fabrice.thiroux@free.fr</email> <name>Fabrice Thiroux</name> </maintainer> - <doc lang="en">https://bitbucket.org/fabriceT/openbox-menu</doc> - <remote-id type="bitbucket">fabriceT/openbox-menu</remote-id> + <remote-id type="github">fabriceT/openbox-menu</remote-id> </upstream> <use> <flag name="icons">Enable support for icons in menus</flag> diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild deleted file mode 100644 index e7513e44be67..000000000000 --- a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Another dynamic menu generator for Openbox" -HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html" -SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+icons svg" -REQUIRED_USE="svg? ( icons )" - -COMMON_DEPEND=" - dev-libs/glib:2 - lxde-base/menu-cache - x11-libs/gtk+:2 -" -RDEPEND=" - ${COMMON_DEPEND} - icons? ( x11-wm/openbox[imlib,svg?] ) - !icons? ( x11-wm/openbox ) -" -DEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.0-build.patch - epatch_user - tc-export CC PKG_CONFIG -} - -src_compile() { - emake \ - $(usex icons 'ICONS=1' 'ICONS=0') \ - $(usex svg 'SVG_ICONS=1' 'SVG_ICONS=0') -} diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild new file mode 100644 index 000000000000..1feb6e43a525 --- /dev/null +++ b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Another dynamic menu generator for Openbox" +HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html" +SRC_URI="https://github.com/fabriceT/openbox-menu/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+icons svg" +REQUIRED_USE="svg? ( icons )" + +DEPEND=" + dev-libs/glib:2 + lxde-base/menu-cache + x11-libs/gtk+:3 +" +RDEPEND="${DEPEND} + icons? ( x11-wm/openbox[imlib,svg?] ) + !icons? ( x11-wm/openbox ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # git master + "${FILESDIR}/${P}-gtk3.patch" + # downstream patches + "${FILESDIR}/${P}-build.patch" + "${FILESDIR}/${P}-makefile.patch" +) + +src_compile() { + emake CC="$(tc-getCC)" PKG_CONFIG=$(tc-getPKG_CONFIG) \ + WITH_ICONS=$(usex icons '1' '0') \ + WITH_SVG=$(usex svg '1' '0') +} diff --git a/x11-misc/oroborus-deskmenu/files/oroborus-deskmenu-1.4.5-Wimplicit-function-declaration.patch b/x11-misc/oroborus-deskmenu/files/oroborus-deskmenu-1.4.5-Wimplicit-function-declaration.patch new file mode 100644 index 000000000000..80e83a3a9c88 --- /dev/null +++ b/x11-misc/oroborus-deskmenu/files/oroborus-deskmenu-1.4.5-Wimplicit-function-declaration.patch @@ -0,0 +1,12 @@ +--- a/src/deskmenu.c ++++ b/src/deskmenu.c +@@ -146,6 +146,9 @@ + return value; + } + ++int ++decode_switches (int argc, char **argv); ++ + void + initialize (int argc, char *argv[]) + { diff --git a/x11-misc/oroborus-deskmenu/metadata.xml b/x11-misc/oroborus-deskmenu/metadata.xml index c546bdcab7d7..13f54c18facf 100644 --- a/x11-misc/oroborus-deskmenu/metadata.xml +++ b/x11-misc/oroborus-deskmenu/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription> + <!-- maintainer-needed --> + <longdescription> DeskMenu is a root menu program which is activated by clicking the root window. It is configured from a .deskmenurc file in your home directory. DeskMenu is useful for window managers which do not provide a menu such as Oroborus. diff --git a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild deleted file mode 100644 index 69756f240669..000000000000 --- a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN=${PN/oroborus-//} - -DESCRIPTION="root menu program for Oroborus" -HOMEPAGE="https://www.oroborus.org" -SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_PN}_${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="=x11-libs/gtk+-2* - !x11-wm/oroborus-extras" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_PN}-${PV} - -DOCS=( AUTHORS ChangeLog NEWS README TODO example_rc ) diff --git a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r2.ebuild b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r2.ebuild new file mode 100644 index 000000000000..ff4450b199aa --- /dev/null +++ b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN="${PN/oroborus-//}" + +DESCRIPTION="root menu program for Oroborus" +HOMEPAGE="https://www.oroborus.org" +SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_PN}_${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="x11-libs/gtk+:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # bug 875131 + "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch +) + +src_prepare() { + default + eautoreconf # bug 898252 +} + +src_install() { + default + dodoc example_rc +} diff --git a/x11-misc/oroborus-keylaunch/files/oroborus-keylaunch-1.3.9-makefile.patch b/x11-misc/oroborus-keylaunch/files/oroborus-keylaunch-1.3.9-makefile.patch new file mode 100644 index 000000000000..523fd85aa0eb --- /dev/null +++ b/x11-misc/oroborus-keylaunch/files/oroborus-keylaunch-1.3.9-makefile.patch @@ -0,0 +1,44 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -14,7 +14,7 @@ + DOC_DIR = $(INSTDIR)/share/doc/$(PROG) + + +-VERBOSE = ++VERBOSE = 1 + ifeq ($(VERBOSE), 1) + Q = + else +@@ -22,7 +22,8 @@ + endif + + CC = @CC@ +-CFLAGS = @CFLAGS@ @X_CFLAGS@ -g -O2 -Wall ++CFLAGS = @CFLAGS@ @X_CFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + LIBS = @LIBS@ @X_LIBS@ + LDFLAGS = @LDFLAGS@ + RCFILE = .$(PROG)rc +@@ -55,11 +56,11 @@ + + $(PROG): $(OBJS) + @echo "[ linking $< ]" +- $Q$(CC) $< $(LDFLAGS) $(LIBS) -o $@ ++ $Q$(CC) $(LDFLAGS) $(CFLAGS) $< -o $@ $(LIBS) + + $(OBJS): %.o: %.c $(HEADERS) + @echo "[ compiling $< ]" +- $Q$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@ ++ $Q$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o $@ + + install-mans: + @echo "[ installing manpages. (section 1) ]" +@@ -71,7 +72,7 @@ + $Q$(INSTALL) $(INST_CREATEDIR) $(DOC_DIR) + $Q$(INSTALL) $(INST_DOC_OPTS) $(DOCS) $(DOC_DIR) + +-install: all install-mans install-docs ++install: all install-mans + @echo "[ installing $(PROG) ]" + $Q$(INSTALL) $(INST_PROG_OPTS) $(PROG) $(BIN_DIR)/$(PROG) + diff --git a/x11-misc/oroborus-keylaunch/metadata.xml b/x11-misc/oroborus-keylaunch/metadata.xml index 62de778f459e..328cab6b7778 100644 --- a/x11-misc/oroborus-keylaunch/metadata.xml +++ b/x11-misc/oroborus-keylaunch/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<longdescription> + <!-- maintainer-needed --> + <longdescription> KeyLaunch is a small utility for binding commands to a hot key. It reads a configuration file in ~/.keylaunchrc. KeyLaunch uses Ctrl, Alt and Shift as modifier keys, the hotkey is up to the user. diff --git a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r2.ebuild index aade3f2ad749..e3907005102c 100644 --- a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r1.ebuild +++ b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9-r2.ebuild @@ -1,34 +1,29 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +WANT_AUTOMAKE=none +inherit autotools MY_PN=${PN/oroborus-//} DESCRIPTION="utility for binding keys in Oroborus" HOMEPAGE="https://www.oroborus.org" SRC_URI="mirror://debian/pool/main/k/${MY_PN}/${MY_PN}_${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="x11-libs/libX11 - !x11-wm/oroborus-extras" -RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_PN}-${PV} +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) DOCS=( README docs/example_rc debian/changelog ) src_prepare() { default - sed -e "s: -g -O2 -Wall::" \ - -e "/^install:/s/install-docs//" \ - -i Makefile.in || die -} - -src_compile() { - emake VERBOSE=1 + eautoconf # bug 898254 } diff --git a/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch b/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch new file mode 100644 index 000000000000..1590a76505bf --- /dev/null +++ b/x11-misc/parcellite/files/parcellite-1.2.1-desktop-QA.patch @@ -0,0 +1,9 @@ +--- a/data/parcellite.desktop.in ++++ b/data/parcellite.desktop.in +@@ -6,5 +6,5 @@ + Exec=parcellite + Terminal=false + Type=Application +-Categories=GTK;GNOME;Application;Utility; ++Categories=GTK;GNOME;Utility; + OnlyShowIn=GNOME;KDE;LXDE;MATE;Razor;ROX;TDE;Unity;XFCE;Old; diff --git a/x11-misc/parcellite/metadata.xml b/x11-misc/parcellite/metadata.xml index 14527414d664..89081e538da7 100644 --- a/x11-misc/parcellite/metadata.xml +++ b/x11-misc/parcellite/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/parcellite/parcellite-1.2.1.ebuild b/x11-misc/parcellite/parcellite-1.2.1.ebuild index b89ab441c540..9174510d68a5 100644 --- a/x11-misc/parcellite/parcellite-1.2.1.ebuild +++ b/x11-misc/parcellite/parcellite-1.2.1.ebuild @@ -1,51 +1,41 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit autotools eutils xdg-utils +inherit autotools xdg MY_P=${PN}-${PV/_} -DESCRIPTION="A lightweight GTK+ based clipboard manager" -HOMEPAGE="http://parcellite.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +DESCRIPTION="Lightweight GTK+ based clipboard manager" +HOMEPAGE="https://parcellite.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="nls" -RDEPEND=">=dev-libs/glib-2.14 - >=x11-libs/gtk+-2.10:2 +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:2 x11-misc/xdotool" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )" -S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}"/${P}-desktop-QA.patch ) src_prepare() { - sed -i data/${PN}.desktop.in -e 's:Application;::g' || die - - sed -i -e '/^ALL_LINGUAS=/d' configure.ac || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - + default eautoreconf } src_configure() { econf $(use_enable nls) } - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest index 8cecd17ee890..5fc3bb6d3ea8 100644 --- a/x11-misc/pcmanfm-qt/Manifest +++ b/x11-misc/pcmanfm-qt/Manifest @@ -1,2 +1,3 @@ -DIST pcmanfm-qt-0.14.1.tar.xz 227360 BLAKE2B 2401238ad53838c9f6e45d596c43b09eecf555bfe069a5cef633c0442867f04b636bebf29241cae8b5a1161a9dad5648390badcd6a3d8b756ac6438acac4961f SHA512 f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e -DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a498d8a1f68f8f24ab756eeda9b35d8d998b42d87f78e4a8fb6725bf3e812dca74bc1464f285a6a984dae1996b43f46 SHA512 db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559 +DIST pcmanfm-qt-1.3.0.tar.xz 358932 BLAKE2B e3f9104758ea0a1b4d20c400010d13a79b0d9f8071978a8a0ae17b5b8c85931217cae84f3cdaf01cbeefbfb44ee0f7a66f5f9f14f8a83fb33611ea74a8a65e07 SHA512 c656b89258b8156863057a6f99932174f6f2f4d85ffae85b18ff3f0e3c199624aff29866df3b5f78e826918321cc3298bfe492119e6e01aaf5495cc9500ea3e3 +DIST pcmanfm-qt-1.4.0.tar.xz 377652 BLAKE2B 50d0c01cbc7557989196251fce7a9b43296fcfc33dc437afc4a9b9799818797659c849174937a042023bea8fe8aa2ffc825a24a35a1125760697884d052c16e2 SHA512 dbc24092b5ea7f13d484caf4cbefd2267f65db4c5d3b43cecf46114d149f91e58e977bed9fa3dc128e54e0b2bcb1043b8a234d16a7a211a94ae5f123e73ff117 +DIST pcmanfm-qt-1.4.1.tar.xz 390960 BLAKE2B 8a7e8dae9faefd77284a03526304e90f94fc0a4993f78a615e07cf466d12a10e0361e41f80275d7a5537702ca9b648ce8834917a4025c1d0d08453ed303179d4 SHA512 3c0186ba2defe3ce440345bfe17635613e9fa2a511dc8309810799cbac931266ea9a42a9a3ebed7bd7bb2f7ec4383dc7d1526b7c689424c5aefcc295bfa2845d diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml index f0e3eb36bf10..30e871a17937 100644 --- a/x11-misc/pcmanfm-qt/metadata.xml +++ b/x11-misc/pcmanfm-qt/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>lxqt@gentoo.org</email> diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild deleted file mode 100644 index e7ec85088df3..000000000000 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -fi - -DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)" -HOMEPAGE="https://lxqt.github.io/" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.6.0 -" -DEPEND=" - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - =x11-libs/libfm-qt-$(ver_cut 1-2)* - x11-libs/libxcb:= - x11-misc/xdg-utils - virtual/eject - virtual/freedesktop-icon-theme -" -RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n -" - -pkg_postinst() { - xdg_desktop_database_update - - if ! has_version lxqt-base/lxqt-meta && ! has_version gnome-base/gvfs; then - elog - elog "To make use of the 'trash' functionality, please install" - elog "the 'gnome-base/gvfs' package." - elog - fi -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.3.0.ebuild index 4852d019e3c9..93d96dca9935 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.3.0.ebuild @@ -1,43 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake eutils xdg-utils +MY_PV="$(ver_cut 1-2)" + +inherit cmake optfeature xdg-utils DESCRIPTION="Qt GUI Tabbed Filemanager" -HOMEPAGE="https://lxqt.github.io/" +HOMEPAGE="https://lxqt-project.org/" if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="GPL-2 GPL-2+ LGPL-2.1+" SLOT="0" BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.7.0 + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - =x11-libs/libfm-qt-$(ver_cut 1-2)* + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + sys-apps/util-linux + virtual/freedesktop-icon-theme + =x11-libs/libfm-qt-${MY_PV}*:= x11-libs/libxcb:= x11-misc/xdg-utils - virtual/eject - virtual/freedesktop-icon-theme " RDEPEND="${DEPEND} - !lxqt-base/lxqt-l10n + >=lxde-base/lxmenu-data-0.1.5 " pkg_postinst() { diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.0.ebuild new file mode 100644 index 000000000000..4a1afc34ba63 --- /dev/null +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake optfeature xdg-utils + +DESCRIPTION="Qt GUI Tabbed Filemanager" +HOMEPAGE="https://lxqt-project.org/" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +LICENSE="GPL-2 GPL-2+ LGPL-2.1+" +SLOT="0" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 +" +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + sys-apps/util-linux + virtual/freedesktop-icon-theme + =x11-libs/libfm-qt-${MY_PV}*:= + x11-libs/libxcb:= + x11-misc/xdg-utils +" +RDEPEND="${DEPEND} + =lxqt-base/lxqt-menu-data-${MY_PV}* +" + +pkg_postinst() { + xdg_desktop_database_update + + optfeature "mount password storing" gnome-base/gnome-keyring + ! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.1-r1.ebuild new file mode 100644 index 000000000000..40ec293d1661 --- /dev/null +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.4.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake optfeature xdg-utils + +DESCRIPTION="Qt GUI Tabbed Filemanager" +HOMEPAGE="https://lxqt-project.org/" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2 GPL-2+ LGPL-2.1+" +SLOT="0" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 +" +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + sys-apps/util-linux + virtual/freedesktop-icon-theme + =x11-libs/libfm-qt-${MY_PV}*:= + x11-libs/libxcb:= + x11-misc/xdg-utils +" +RDEPEND="${DEPEND} + =lxqt-base/lxqt-menu-data-${MY_PV}* +" + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + + optfeature "mount password storing" gnome-base/gnome-keyring + ! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest index fb8f8b08509a..ac1a6b752d6b 100644 --- a/x11-misc/pcmanfm/Manifest +++ b/x11-misc/pcmanfm/Manifest @@ -1 +1 @@ -DIST pcmanfm-1.3.1.tar.xz 423380 BLAKE2B c117f789d88b8c776f09dd598256bc889bf1d1ea2854a646da30e57e8e3b4a1410cf8411841e1b3c303f7f0cf4ec3d4046c0e05ad9c453efd1589592415119f3 SHA512 68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4 +DIST pcmanfm-1.3.2.tar.xz 424236 BLAKE2B 7d13383cd2b61905bdf14b4b4df8c3d8043a340b597f4d43e40148f61451f82ad3ca36c4c199d81a41dc7e07dde6ed5832aeff985112fae352bc49e873bb67a0 SHA512 bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9 diff --git a/x11-misc/pcmanfm/metadata.xml b/x11-misc/pcmanfm/metadata.xml index 52a019f53ec6..c568a312ad63 100644 --- a/x11-misc/pcmanfm/metadata.xml +++ b/x11-misc/pcmanfm/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">pcmanfm</remote-id> + <remote-id type="github">lxde/pcmanfm</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild deleted file mode 100644 index 235920582b53..000000000000 --- a/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id -is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv -te th tr tt_RU ug uk vi zh_CN zh_TW" -PLOCALE_BACKUP="en_GB" - -inherit eutils xdg-utils l10n readme.gentoo-r1 - -MY_PV="${PV/_/}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Fast lightweight tabbed filemanager" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86" -IUSE="debug" - -RDEPEND=">=dev-libs/glib-2.18:2 - >=x11-libs/gtk+-2.16:2 - >=lxde-base/menu-cache-0.3.2 - x11-misc/shared-mime-info - >=x11-libs/libfm-${PV}:=[gtk(+)] - virtual/eject - virtual/freedesktop-icon-theme" -DEPEND="${RDEPEND} - app-arch/xz-utils - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - default - - export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}" - l10n_get_locales > po/LINGUAS || die -} - -src_configure() { - econf \ - --sysconfdir="${EPREFIX}"/etc \ - $(use_enable debug) -} - -src_install() { - default - - local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ - location. You should install lxde-base/lxmenu-data for that functionality." - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild new file mode 100644 index 000000000000..61d5a505343b --- /dev/null +++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN}-${PV/_/}" +inherit xdg readme.gentoo-r1 + +DESCRIPTION="Fast lightweight tabbed filemanager" +HOMEPAGE="https://github.com/lxde/pcmanfm" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~riscv ~x86" +IUSE="debug" + +RDEPEND=" + dev-libs/atk + >=dev-libs/glib-2.18:2 + >=lxde-base/menu-cache-1.1.0-r1 + sys-apps/util-linux + virtual/freedesktop-icon-theme + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + >=x11-libs/libfm-${PV}:=[gtk] + x11-libs/libX11 + x11-libs/pango + x11-misc/shared-mime-info +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + econf \ + --sysconfdir="${EPREFIX}"/etc \ + --with-gtk=3 \ + $(use_enable debug) +} + +src_install() { + default + + local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ + location. You should install lxde-base/lxmenu-data for that functionality." + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild deleted file mode 100644 index c23a058f92d1..000000000000 --- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id -is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv -te th tr tt_RU ug uk vi zh_CN zh_TW" -PLOCALE_BACKUP="en_GB" - -inherit autotools eutils xdg-utils l10n readme.gentoo-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86" -fi - -MY_PV="${PV/_/}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Fast lightweight tabbed filemanager" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" - -RDEPEND=">=dev-libs/glib-2.18:2 - >=x11-libs/gtk+-2.16:2 - >=lxde-base/menu-cache-0.3.2 - x11-misc/shared-mime-info - >=x11-libs/libfm-${PV}:=[gtk(+)] - virtual/eject - virtual/freedesktop-icon-theme" -DEPEND="${RDEPEND} - app-arch/xz-utils - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - default - - intltoolize --force --copy --automake || die - eautoreconf - - export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}" - l10n_get_locales > po/LINGUAS || die -} - -src_configure() { - econf \ - --sysconfdir="${EPREFIX}"/etc \ - $(use_enable debug) -} - -src_install() { - default - - local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ - location. You should install lxde-base/lxmenu-data for that functionality." - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml index 4a233d3d903a..786486b128da 100644 --- a/x11-misc/peksystray/metadata.xml +++ b/x11-misc/peksystray/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">peksystray</remote-id> - <remote-id type="freshmeat">peksystray</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild index 34b24b34d3ce..201676c4825e 100644 --- a/x11-misc/peksystray/peksystray-0.4.0.ebuild +++ b/x11-misc/peksystray/peksystray-0.4.0-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools -DESCRIPTION="A system tray dockapp for window managers supporting docking" -HOMEPAGE="http://peksystray.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +DESCRIPTION="System tray dockapp for window managers supporting docking" +HOMEPAGE="https://peksystray.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ppc x86" -IUSE="" DEPEND="x11-libs/libX11 x11-libs/libXt" diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest index 4d1db30768fb..2b746ee310bf 100644 --- a/x11-misc/picom/Manifest +++ b/x11-misc/picom/Manifest @@ -1,2 +1,3 @@ -DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a -DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a +DIST picom-10.2.tar.gz 287166 BLAKE2B feaa07fc5f0a53396675dfd4d8f2507caf6ce355b2db242b25b3559b287845b0505c48194e51c9c7fc6809dd10b871be6adf3e9fc87d91a41f01ccfeb87803ab SHA512 9c0351fbe8a9e76533243c8e76f8e7d10c1e49292f1c8e6c06f31fb0b512542a67970abe803d061c953546ff8d3e704488c263002a5a831f68deb010caee481d +DIST picom-11.1.tar.gz 308617 BLAKE2B cb100ec8d7ae9a9b43d59fb6d8eaf7079f1a1ea8da6eddea4bfc67f0180d2d43da30bb63049d685da71d424cb9bc091216331d3f54678da6c6379ed4de2e6347 SHA512 94c3a17a51f4749453d7d6334f8041bd1ee9f676f94f93c9368f02783ac86650031421c3d2fdd05d177c4c8535a76a6aff2c8e3cae4ae99bff7c458bd921b536 +DIST picom-11.2.tar.gz 308679 BLAKE2B d592dce3e67bc3df68cbece00cd4446ea6214b994d9ceffdd3d43a983e4a520f7a92c9c09bec12f49f18b4e581a4122c363f8de0c156bfe2e99fa09b04ec2196 SHA512 df8fc1a593e108b37be185129ac1f3a23c2ae648a04352c45b9d5888838e5754c68f2eb684f12f1ed4d973eca0aef83a61789f028c63bc2d0f0f38902232aadc diff --git a/x11-misc/picom/files/picom-7.5-no_opengl.patch b/x11-misc/picom/files/picom-7.5-no_opengl.patch deleted file mode 100644 index ca9f715140ee..000000000000 --- a/x11-misc/picom/files/picom-7.5-no_opengl.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bd5a5fb56812ee5644e4c4bd1fdd82b9899317a7 Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Sat, 12 Oct 2019 13:29:10 +0000 -Subject: [PATCH] Unbreak -Dopengl=false clean build - -In file included from ../src/x.c:17: -../src/backend/gl/glx.h:10:10: fatal error: 'GL/glx.h' file not found - #include <GL/glx.h> - ^~~~~~~~~~ ---- - src/x.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/x.c b/src/x.c -index ed6668a8..2f802f1e 100644 ---- a/src/x.c -+++ b/src/x.c -@@ -14,7 +14,9 @@ - #include <xcb/xfixes.h> - - #include "atom.h" -+#ifdef CONFIG_OPENGL - #include "backend/gl/glx.h" -+#endif - #include "common.h" - #include "compiler.h" - #include "kernel.h" diff --git a/x11-misc/picom/metadata.xml b/x11-misc/picom/metadata.xml index 4cd1bd6f8bcb..39747de42516 100644 --- a/x11-misc/picom/metadata.xml +++ b/x11-misc/picom/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>voyageur@gentoo.org</email> diff --git a/x11-misc/picom/picom-8.ebuild b/x11-misc/picom/picom-10.2.ebuild index 2530591a444a..5500bc0c290b 100644 --- a/x11-misc/picom/picom-8.ebuild +++ b/x11-misc/picom/picom-10.2.ebuild @@ -1,9 +1,9 @@ -# 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 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-any-r1 virtualx xdg DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" @@ -12,14 +12,13 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0 MIT" SLOT="0" -KEYWORDS="amd64 ~ppc64 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!" RESTRICT="test" # but tests require dbus_next -RDEPEND=" - dev-libs/libev +RDEPEND="dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb @@ -28,8 +27,7 @@ RDEPEND=" x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( - dev-libs/libconfig - dev-libs/libxdg-basedir + dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) @@ -43,6 +41,16 @@ BDEPEND="virtual/pkgconfig test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') ) " +DOCS=( README.md picom.sample.conf ) + +python_check_deps() { + python_has_version "dev-python/xcffib[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_configure() { local emesonargs=( $(meson_use config-file config_file) diff --git a/x11-misc/picom/picom-11.1.ebuild b/x11-misc/picom/picom-11.1.ebuild new file mode 100644 index 000000000000..e122ab5870bb --- /dev/null +++ b/x11-misc/picom/picom-11.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +inherit meson python-any-r1 virtualx xdg + +DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" +HOMEPAGE="https://github.com/yshui/picom" +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" +IUSE="+config-file dbus +doc +drm opengl pcre test" + +REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!" +RESTRICT="test" # but tests require dbus_next + +RDEPEND="dev-libs/libev + dev-libs/uthash + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXext + x11-libs/pixman + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-renderutil + config-file? ( + dev-libs/libconfig:= + ) + dbus? ( sys-apps/dbus ) + drm? ( x11-libs/libdrm ) + opengl? ( virtual/opengl ) + pcre? ( dev-libs/libpcre2:= )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig + doc? ( app-text/asciidoc ) + test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') ) +" + +DOCS=( README.md picom.sample.conf ) + +python_check_deps() { + python_has_version "dev-python/xcffib[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_use config-file config_file) + $(meson_use dbus) + $(meson_use doc with_docs) + $(meson_use opengl) + $(meson_use pcre regex) + ) + + meson_src_configure +} + +src_test() { + virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}" +} diff --git a/x11-misc/picom/picom-11.2.ebuild b/x11-misc/picom/picom-11.2.ebuild new file mode 100644 index 000000000000..05fd95b68772 --- /dev/null +++ b/x11-misc/picom/picom-11.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +inherit meson python-any-r1 virtualx xdg + +DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" +HOMEPAGE="https://github.com/yshui/picom" +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" +IUSE="+config-file dbus +doc +drm opengl pcre test" + +REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!" +RESTRICT="test" # but tests require dbus_next + +RDEPEND="dev-libs/libev + dev-libs/uthash + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXext + x11-libs/pixman + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-renderutil + config-file? ( + dev-libs/libconfig:= + ) + dbus? ( sys-apps/dbus ) + drm? ( x11-libs/libdrm ) + opengl? ( + media-libs/libepoxy + virtual/opengl + ) + pcre? ( dev-libs/libpcre2:= )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig + doc? ( app-text/asciidoc ) + test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') ) +" + +DOCS=( README.md picom.sample.conf ) + +python_check_deps() { + python_has_version "dev-python/xcffib[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_use config-file config_file) + $(meson_use dbus) + $(meson_use doc with_docs) + $(meson_use opengl) + $(meson_use pcre regex) + ) + + meson_src_configure +} + +src_test() { + virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}" +} diff --git a/x11-misc/picom/picom-7.5-r1.ebuild b/x11-misc/picom/picom-7.5-r1.ebuild deleted file mode 100644 index b2473732a34a..000000000000 --- a/x11-misc/picom/picom-7.5-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit meson python-r1 xdg - -DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" -HOMEPAGE="https://github.com/yshui/picom" -SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-2.0 MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+config-file dbus +doc +drm opengl pcre" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-libs/libev - dev-libs/uthash - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXext - x11-libs/pixman - x11-libs/xcb-util-image - x11-libs/xcb-util-renderutil - config-file? ( - dev-libs/libconfig - dev-libs/libxdg-basedir - ) - dbus? ( sys-apps/dbus ) - drm? ( x11-libs/libdrm ) - opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre ) - !x11-misc/compton" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig - doc? ( app-text/asciidoc )" - -PATCHES=( - "${FILESDIR}"/${P}-no_opengl.patch - ) - -src_configure() { - local emesonargs=( - $(meson_use config-file config_file) - $(meson_use dbus) - $(meson_use doc build_docs) - $(meson_use opengl) - $(meson_use pcre regex) - ) - - meson_src_configure - -} - -src_install() { - meson_src_install - - python_replicate_script "${ED}"/usr/bin/compton-convgen.py -} diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild index 34d4a6e2fb59..a5dd11d9c8ba 100644 --- a/x11-misc/picom/picom-9999.ebuild +++ b/x11-misc/picom/picom-9999.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit git-r3 meson xdg +PYTHON_COMPAT=( python3_{9..12} ) +inherit git-r3 meson python-any-r1 virtualx xdg DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" HOMEPAGE="https://github.com/yshui/picom" @@ -11,8 +12,10 @@ EGIT_REPO_URI="https://github.com/yshui/picom.git" LICENSE="MPL-2.0 MIT" SLOT="0" -KEYWORDS="" -IUSE="+config-file dbus +doc +drm opengl pcre" +IUSE="+config-file dbus +doc +drm opengl pcre test" + +REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!" +RESTRICT="test" # but tests require dbus_next RDEPEND="dev-libs/libev dev-libs/uthash @@ -20,21 +23,35 @@ RDEPEND="dev-libs/libev x11-libs/libxcb x11-libs/libXext x11-libs/pixman + x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( - dev-libs/libconfig - dev-libs/libxdg-basedir + dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) - opengl? ( virtual/opengl ) - pcre? ( dev-libs/libpcre ) - !x11-misc/compton" + opengl? ( + media-libs/libepoxy + virtual/opengl + ) + pcre? ( dev-libs/libpcre2:= )" DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig - doc? ( app-text/asciidoc )" + doc? ( app-text/asciidoc ) + test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') ) +" + +DOCS=( README.md picom.sample.conf ) + +python_check_deps() { + python_has_version "dev-python/xcffib[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} src_configure() { local emesonargs=( @@ -46,5 +63,8 @@ src_configure() { ) meson_src_configure +} +src_test() { + virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}" } diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest index 29fbdbf47b8a..7f2d1091f8f4 100644 --- a/x11-misc/piedock/Manifest +++ b/x11-misc/piedock/Manifest @@ -1,3 +1 @@ -DIST piedock-1.6.6-gcc6.patch 134783 BLAKE2B 74774aae06a865f03405b5a4939089a2521ec6c41387a90517135e82d2efa80cc18ec081640c1277bd4e8218fec267b64731de9633a514923b80d34312927d3b SHA512 a9460400f4447fe8c38b2d994c083e7c564b32b9a2e77f0b3497ca0f704f6a650781c3e00b37d52bbc4e9c202b02dd6bb3dd442ab13ece173a7b18c0592379bc -DIST piedock-1.6.6.tar.bz2 254634 BLAKE2B 51c347edaa3cfb556f233fcc62e11e030d3fd2a25ada4ddec5bee6fe16def9605ca80cc254f72aed4c9353502ffa4fab1461af3e6b067f51e6057e7d63c81507 SHA512 4bad03387a21c75cf48b80ef2bf6ccc3553097fa41115a40689ec2c8e00ee9fadddbe43226f90012667eb8545e1209e5c9f6308f436bdf1d12d73de30764f1be DIST piedock-1.6.9.tar.gz 290491 BLAKE2B 492c56d106616323a7f661e3c5d016755bdb421668bfe5251811df62ab1243838380395888c3e874c211069c30fdc7ea9141c245e907fa4c2eeea6d0a583329e SHA512 1244cc26d47c39c27c583f24aedf3dcdf0d879003f96a7cb1b512255384f0d81bf7c07dafa1b21ae1e6762bb7b41158cd20740b12b83f2d49daf7f24fbc96b69 diff --git a/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff b/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff new file mode 100644 index 000000000000..b32832f10e10 --- /dev/null +++ b/x11-misc/piedock/files/piedock-1.6.9-clang16-register-narrowing.diff @@ -0,0 +1,108 @@ +# Fix build with clang 16. There were two main issues: +# 1. Usage of regiter keyword, which has been removed since C++17 +# 2. Non-constant-expression cannot be narrowed +# This patch fixes both the issues. +# Bug: https://bugs.gentoo.org/898888 +--- a/src/Blender.cpp ++++ b/src/Blender.cpp +@@ -147,20 +147,20 @@ void Blender::blendInto32Bit(Details &details) { + a >>= 24; + mod = alphaMax / static_cast<double>(a); + +- register int d = (*dest) & 0xff; +- register int blue = (*src) & 0xff; ++ int d = (*dest) & 0xff; ++ int blue = (*src) & 0xff; + blue -= d; + blue /= mod; + blue += d; + + d = (*dest>>8) & 0xff; +- register int green = (*src >> 8) & 0xff; ++ int green = (*src >> 8) & 0xff; + green -= d; + green /= mod; + green += d; + + d = (*dest >> 16) & 0xff; +- register int red = (*src >> 16) & 0xff; ++ int red = (*src >> 16) & 0xff; + red -= d; + red /= mod; + red += d; +@@ -282,9 +282,9 @@ void Blender::blendInto16Bit(Details &details) { + src += 4; + dest += 2; + } else if (a == 0xff && !useGlobalAlpha) { +- register int blue = *(src++); +- register int green = *(src++); +- register int red = *(src++); ++ int blue = *(src++); ++ int green = *(src++); ++ int red = *(src++); + + *(reinterpret_cast<uint16_t *>(dest)) = + static_cast<uint16_t>((blue & 0xf8) >> 3) | +@@ -297,21 +297,21 @@ void Blender::blendInto16Bit(Details &details) { + mod = alphaMax/static_cast<double>(a); + + uint16_t pixel = *(reinterpret_cast<uint16_t *>(dest)); +- register int db = (pixel << 3) & 0xf8; +- register int dg = (pixel >> 3) & 0xf8; +- register int dr = (pixel >> 8) & 0xf8; ++ int db = (pixel << 3) & 0xf8; ++ int dg = (pixel >> 3) & 0xf8; ++ int dr = (pixel >> 8) & 0xf8; + +- register int blue = *src++; ++ int blue = *src++; + blue -= db; + blue /= mod; + blue += db; + +- register int green = *src++; ++ int green = *src++; + green -= dg; + green /= mod; + green += dg; + +- register int red = *src++; ++ int red = *src++; + red -= dr; + red /= mod; + red += dr; +--- a/src/Cartouche.cpp ++++ b/src/Cartouche.cpp +@@ -110,7 +110,7 @@ void Cartouche::drawRoundedRectangle( + bottom - radius - 1, + right - radius - 1, + getBytesPerLine(), +- color, ++ static_cast<int>( color ), + getData() + top * getBytesPerLine() + }; + +--- a/src/Settings.cpp ++++ b/src/Settings.cpp +@@ -614,7 +614,7 @@ void Settings::load(Display *d) { + !((*ki).modifier & (*mi))) { + Trigger trigger = { + (*ki).modifier | (*mi), +- (*ki).keySym, ++ static_cast<unsigned int>( (*ki).keySym ), + (*ki).menuName, + (*ki).eventMask + }; +--- a/src/WildcardCompare.cpp ++++ b/src/WildcardCompare.cpp +@@ -91,8 +91,8 @@ const bool WildcardCompare::match( + return false; + } + } else { +- register unsigned char p = *pattern; +- register unsigned char l = *literal; ++ unsigned char p = *pattern; ++ unsigned char l = *literal; + + if (p > 64 && p < 91) { + p += 32; diff --git a/x11-misc/piedock/files/piedock-1.6.9-gcc12-time.patch b/x11-misc/piedock/files/piedock-1.6.9-gcc12-time.patch new file mode 100644 index 000000000000..5b8a2ea9feb9 --- /dev/null +++ b/x11-misc/piedock/files/piedock-1.6.9-gcc12-time.patch @@ -0,0 +1,31 @@ +https://github.com/markusfisch/PieDock/pull/19 + +From c57d9fad9726086dafbc05abb243c14dcd1bab23 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sun, 12 Jun 2022 11:08:19 +0100 +Subject: [PATCH] Fix build with GCC 12 (missing <time.h> include) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes the following build failure w/ GCC 12: +``` +WindowManager.cpp: In static member function ‘static void PieDock::WindowManager::activate(Display*, Window)’: +WindowManager.cpp:83:29: error: ‘time’ was not declared in this scope; did you mean ‘Time’? + 83 | for (time_t start = time(0) + 2; + | ^~~~ + | Time +``` + +Bug: https://bugs.gentoo.org/851516 +--- a/src/WindowManager.cpp ++++ b/src/WindowManager.cpp +@@ -10,6 +10,7 @@ + + #include <stdint.h> + #include <string.h> ++#include <time.h> + #include <unistd.h> + + using namespace PieDock; + diff --git a/x11-misc/piedock/metadata.xml b/x11-misc/piedock/metadata.xml index 8d6384de1b01..f6df5c2fbf14 100644 --- a/x11-misc/piedock/metadata.xml +++ b/x11-misc/piedock/metadata.xml @@ -1,11 +1,8 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="github">markusfisch/PieDock</remote-id> - </upstream> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">markusfisch/PieDock</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/piedock/piedock-1.6.6-r1.ebuild b/x11-misc/piedock/piedock-1.6.6-r1.ebuild deleted file mode 100644 index 26e1db0a646a..000000000000 --- a/x11-misc/piedock/piedock-1.6.6-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A little bit like the famous OS X dock but in shape of a pie menu" -HOMEPAGE="http://markusfisch.de/PieDock" -SRC_URI="http://markusfisch.de/downloads/${P}.tar.bz2 - https://github.com/markusfisch/PieDock/commit/a7fda1896f1cc6966ba0fa8912e9b404c1b0be97.patch -> ${P}-gcc6.patch" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk" - -RDEPEND=" - media-libs/libpng:0= - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXmu - x11-libs/libXrender - gtk? ( - dev-libs/atk - dev-libs/glib - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - ) -" -DEPEND="${RDEPEND}" - -DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-signals.patch - "${DISTDIR}"/${P}-gcc6.patch -) - -src_configure() { - econf \ - $(use_enable gtk) \ - --disable-kde \ - --bindir="${EPREFIX}"/usr/bin \ - --enable-xft \ - --enable-xmu \ - --enable-xrender -} diff --git a/x11-misc/piedock/piedock-1.6.9.ebuild b/x11-misc/piedock/piedock-1.6.9-r1.ebuild index 8a2ea62a1509..f458b11594b0 100644 --- a/x11-misc/piedock/piedock-1.6.9.ebuild +++ b/x11-misc/piedock/piedock-1.6.9-r1.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=7 inherit autotools @@ -10,15 +10,15 @@ HOMEPAGE=" http://markusfisch.de/PieDock https://github.com/markusfisch/PieDock " -SRC_URI=" - https://github.com/markusfisch/PieDock/archive/${PV}.tar.gz -> ${P}.tar.gz -" +SRC_URI="https://github.com/markusfisch/PieDock/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/PieDock-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="gtk" +BDEPEND="virtual/pkgconfig" RDEPEND=" media-libs/libpng:0= x11-libs/libX11 @@ -26,24 +26,23 @@ RDEPEND=" x11-libs/libXmu x11-libs/libXrender gtk? ( - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0 dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) " -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS ) PATCHES=( "${FILESDIR}"/${PN}-1.6.1-signals.patch "${FILESDIR}"/${PN}-1.6.9-freetype_pkgconfig.patch + "${FILESDIR}"/${PN}-1.6.9-gcc12-time.patch + "${FILESDIR}"/${PN}-1.6.9-clang16-register-narrowing.diff ) -S="${WORKDIR}/PieDock-${PV}" - src_prepare() { default eautoreconf diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest index 27c5484ab41a..a0f2cfe13f4c 100644 --- a/x11-misc/polybar/Manifest +++ b/x11-misc/polybar/Manifest @@ -1,3 +1,2 @@ -DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425 -DIST polybar-3.4.2.tar.gz 253194 BLAKE2B 136dd32d524902fccbf9db2b2fa8ed582d45565aa0e834af9610e6f692ef70d3e5e066c6021060df9cedf2e1aa2c92753e4fc4ce9c0935795ef4b0056c273687 SHA512 2205847ebc03040e8d2a2581d2c70e940157c5dba71e0c2d086c0f0971a6ffd83c42846a85dd93165512f35710e3f3af8b4494bcd695f71ef0ac501f74753dfd -DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f +DIST polybar-3.6.3.tar.gz 439838 BLAKE2B 522e95bb11e947008f0909401a769ba7ef44733e7edb4a067185bad610ac70077e1370e0e9da9fbff27b9f981b5285561f7c86e12fc5da79c383d794da6b4a86 SHA512 d8e08d2b217a353b967f58eb61907b05ed7b9c2b9e1b3a891f4cac91b37f1cf751b10b1e93e74e6414eb0beb1696f4ae64a0a43bfc6c0afa3863b72293217c2e +DIST polybar-3.7.1.tar.gz 495162 BLAKE2B 33ffb3bb3595a41cb82a5ee70c79f5a31f23b6463c156a704546c803f0f006780c59b04fe2d1479f52dd15a44534687f130dfde794ac08218df2b634b34838de SHA512 cb248fd904a89dbd88d2d1ab71aeaf31e2b5781304f126aeb489da1238681e354d5347555076e814751ef5bb6717a3a6742d1726cf4721697e75694c7643bed4 diff --git a/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch b/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch new file mode 100644 index 000000000000..1007d7237af7 --- /dev/null +++ b/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f71801c8..0979f8af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,7 +63,7 @@ endif() + + if(BUILD_CONFIG) + install(FILES ${CMAKE_SOURCE_DIR}/doc/config.ini +- DESTINATION /etc/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME} + COMPONENT config) + endif() + diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml index 39fc36198607..f53f395dde65 100644 --- a/x11-misc/polybar/metadata.xml +++ b/x11-misc/polybar/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>johu@gentoo.org</email> - <name>Johannes Huber</name> + <email>ajak@gentoo.org</email> + <name>John Helmert III</name> </maintainer> <use> <flag name="i3wm">Add support for i3 window manager</flag> diff --git a/x11-misc/polybar/polybar-3.4.2-r1.ebuild b/x11-misc/polybar/polybar-3.4.2-r1.ebuild deleted file mode 100644 index 1e8fb05ec227..000000000000 --- a/x11-misc/polybar/polybar-3.4.2-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -XPP_COMMIT="8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33" -I3IPCPP_COMMIT="21ce9060ac7c502225fdbd2f200b1cbdd8eca08d" -inherit cmake-utils python-single-r1 - -DESCRIPTION="A fast and easy-to-use tool for creating status bars" -HOMEPAGE="https://github.com/polybar/polybar" -SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz - https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz" - -KEYWORDS="amd64 x86" -LICENSE="MIT" -SLOT="0" - -IUSE="alsa curl i3wm ipc mpd network pulseaudio" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_MULTI_USEDEP}]') - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb[xkb] - x11-libs/xcb-util-image - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm - alsa? ( media-libs/alsa-lib ) - curl? ( net-misc/curl ) - i3wm? ( - dev-libs/jsoncpp - || ( x11-wm/i3 x11-wm/i3-gaps ) - ) - mpd? ( media-libs/libmpdclient ) - network? ( net-wireless/wireless-tools ) - pulseaudio? ( media-sound/pulseaudio ) -" - -RDEPEND="${DEPEND}" - -src_prepare() { - rmdir "${S}"/lib/xpp || die - mv "${WORKDIR}"/xpp-$XPP_COMMIT "${S}"/lib/xpp || die - - rmdir "${S}"/lib/i3ipcpp || die - mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_COMMIT "${S}"/lib/i3ipcpp || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_ALSA="$(usex alsa)" - -DENABLE_CURL="$(usex curl)" - -DENABLE_I3="$(usex i3wm)" - -DBUILD_IPC_MSG="$(usex ipc)" - -DENABLE_MPD="$(usex mpd)" - -DENABLE_NETWORK="$(usex network)" - -DENABLE_PULSEAUDIO="$(usex pulseaudio)" - ) - - cmake-utils_src_configure -} diff --git a/x11-misc/polybar/polybar-3.6.3-r3.ebuild b/x11-misc/polybar/polybar-3.6.3-r3.ebuild new file mode 100644 index 000000000000..09507ab90029 --- /dev/null +++ b/x11-misc/polybar/polybar-3.6.3-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 + +DESCRIPTION="A fast and easy-to-use tool for creating status bars" +HOMEPAGE="https://github.com/polybar/polybar" +SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" + +KEYWORDS="amd64 ~riscv x86" +LICENSE="MIT" +SLOT="0" +IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]') + dev-libs/libuv:= + media-libs/fontconfig + media-libs/freetype + x11-libs/cairo[X,xcb(+)] + x11-libs/libxcb:= + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm + alsa? ( media-libs/alsa-lib ) + curl? ( net-misc/curl ) + doc? ( dev-python/sphinx ) + i3wm? ( + dev-libs/jsoncpp:= + x11-wm/i3 + ) + mpd? ( media-libs/libmpdclient ) + network? ( dev-libs/libnl:3 ) + pulseaudio? ( media-libs/libpulse ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-fix-prefix.patch" ) + +src_configure() { + local mycmakeargs=( + -DENABLE_ALSA="$(usex alsa)" + -DENABLE_CURL="$(usex curl)" + -DBUILD_DOC="$(usex doc)" + -DENABLE_I3="$(usex i3wm)" + -DBUILD_POLYBAR_MSG="$(usex ipc)" + -DENABLE_MPD="$(usex mpd)" + -DENABLE_NETWORK="$(usex network)" + -DENABLE_PULSEAUDIO="$(usex pulseaudio)" + # Bug 767949 + -DENABLE_CCACHE="OFF" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc/" + ) + + cmake_src_configure +} diff --git a/x11-misc/polybar/polybar-3.7.1-r1.ebuild b/x11-misc/polybar/polybar-3.7.1-r1.ebuild new file mode 100644 index 000000000000..e6bbf888dce8 --- /dev/null +++ b/x11-misc/polybar/polybar-3.7.1-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 + +DESCRIPTION="A fast and easy-to-use tool for creating status bars" +HOMEPAGE="https://github.com/polybar/polybar" +SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" + +KEYWORDS="amd64 ~riscv x86" +LICENSE="MIT" +SLOT="0" +IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]') + dev-libs/libuv:= + media-libs/fontconfig + media-libs/freetype + x11-base/xorg-proto + x11-libs/cairo[X,xcb(+)] + x11-libs/libxcb:= + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm + alsa? ( media-libs/alsa-lib ) + curl? ( net-misc/curl ) + doc? ( dev-python/sphinx ) + i3wm? ( + dev-libs/jsoncpp:= + x11-wm/i3 + ) + mpd? ( media-libs/libmpdclient ) + network? ( dev-libs/libnl:3 ) + pulseaudio? ( media-libs/libpulse ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_ALSA="$(usex alsa)" + -DENABLE_CURL="$(usex curl)" + -DBUILD_DOC="$(usex doc)" + -DENABLE_I3="$(usex i3wm)" + -DBUILD_POLYBAR_MSG="$(usex ipc)" + -DENABLE_MPD="$(usex mpd)" + -DENABLE_NETWORK="$(usex network)" + -DENABLE_PULSEAUDIO="$(usex pulseaudio)" + # Bug 767949 + -DENABLE_CCACHE="OFF" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc/" + ) + + cmake_src_configure +} diff --git a/x11-misc/prime-run/Manifest b/x11-misc/prime-run/Manifest new file mode 100644 index 000000000000..1256812b414f --- /dev/null +++ b/x11-misc/prime-run/Manifest @@ -0,0 +1 @@ +DIST prime-run-1.0 112 BLAKE2B d4b69c9eef04201554f18a7fbcf741fd8712792f06d5a94e31bb5424479df6bbcdf4399c8f9d0f911b12999794ef6f88ab54e38145c41d4cc53e5f5922cac203 SHA512 d9158ddee6ec105796d86ac42b32c6c925cfa866d5e25c64d5a29be47fe393ace0efb4ef8a3e7cff699abc599d28ee46866dcbfdfd1920122e426ee262c562e6 diff --git a/x11-misc/prime-run/metadata.xml b/x11-misc/prime-run/metadata.xml new file mode 100644 index 000000000000..572c7daf2ccf --- /dev/null +++ b/x11-misc/prime-run/metadata.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>pacho@gentoo.org</email> + </maintainer> +</pkgmetadata> diff --git a/x11-misc/prime-run/prime-run-1.0.ebuild b/x11-misc/prime-run/prime-run-1.0.ebuild new file mode 100644 index 000000000000..7f1956bce524 --- /dev/null +++ b/x11-misc/prime-run/prime-run-1.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Run programs on the discrete nVidia video card" +HOMEPAGE="https://github.com/archlinux/svntogit-packages/tree/packages/nvidia-prime/trunk https://archlinux.org/packages/extra/any/nvidia-prime/" +SRC_URI="https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/nvidia-prime/trunk/prime-run -> ${P}" + +# https://github.com/archlinux/svntogit-packages/blob/packages/nvidia-prime/trunk/PKGBUILD +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="amd64" + +S="${WORKDIR}" + +src_install() { + newbin "${DISTDIR}"/${P} ${PN} +} diff --git a/x11-misc/primus/files/primus-0.2-libglvnd-workaround.patch b/x11-misc/primus/files/primus-0.2-libglvnd-workaround.patch new file mode 100644 index 000000000000..f64757b7e340 --- /dev/null +++ b/x11-misc/primus/files/primus-0.2-libglvnd-workaround.patch @@ -0,0 +1,23 @@ +From 6ff7b3ee8c38830a72b5fc087d6f4f12cf421920 Mon Sep 17 00:00:00 2001 +From: Gary Gatling <gsgatlin@ncsu.edu> +Date: Thu, 2 Mar 2017 14:50:47 -0500 +Subject: [PATCH] primus needs this variable workaround for libglvnd enabled + mesa + +--- + primusrun | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/primusrun b/primusrun +index 81e2dc0..33f0eef 100755 +--- a/primusrun ++++ b/primusrun +@@ -1,5 +1,8 @@ + #!/bin/bash + ++# primus needs this variable workaround for libglvnd enabled mesa ++export __GLVND_DISALLOW_PATCHING=1 ++ + # Readback-display synchronization method + # 0: no sync, 1: D lags behind one frame, 2: fully synced + # export PRIMUS_SYNC=${PRIMUS_SYNC:-0} diff --git a/x11-misc/primus/files/primus-0.2-respect-ldflags.patch b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch new file mode 100644 index 000000000000..5d9804517437 --- /dev/null +++ b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch @@ -0,0 +1,19 @@ +From b4663367d16190cf57b632cd59425b1b8b43f2f3 Mon Sep 17 00:00:00 2001 +From: Vincent Cheng <vcheng@debian.org> +Date: Sat, 25 Jul 2015 21:10:10 -0700 +Subject: [PATCH] build with LDFLAGS defined by environment + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ab37e6e..a83e465 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,4 +30,4 @@ CXXFLAGS += -DPRIMUS_libGLd='"$(PRIMUS_libGLd)"' + + $(LIBDIR)/libGL.so.1: libglfork.cpp + mkdir -p $(LIBDIR) +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< -lX11 -lpthread -lrt ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< $(LDFLAGS) -lX11 -lpthread -lrt diff --git a/x11-misc/primus/metadata.xml b/x11-misc/primus/metadata.xml index 7eea5579ed48..4b4e02216790 100644 --- a/x11-misc/primus/metadata.xml +++ b/x11-misc/primus/metadata.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zx2c4@gentoo.org</email> - <name>Jason A. Donenfeld</name> - </maintainer> + <!-- maintainer-needed --> + <use> + <flag name="libglvnd">Use <pkg>media-libs/libglvnd</pkg> for dispatch</flag> + </use> <upstream> <remote-id type="github">amonakov/primus</remote-id> </upstream> diff --git a/x11-misc/primus/primus-0.2-r3.ebuild b/x11-misc/primus/primus-0.2-r3.ebuild new file mode 100644 index 000000000000..3a4c0197ea9a --- /dev/null +++ b/x11-misc/primus/primus-0.2-r3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib-build + +DESCRIPTION="Faster OpenGL offloading for Bumblebee" +HOMEPAGE="https://github.com/amonakov/primus" +SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/amonakov/${PN}.git" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+libglvnd" + +RDEPEND=" + x11-misc/bumblebee + x11-drivers/nvidia-drivers[libglvnd(+)=] +" +DEPEND="virtual/opengl" + +PATCHES=( + "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" + "${FILESDIR}/primus-0.2-respect-ldflags.patch" +) + +src_prepare() { + default + # Exported values don't always seem to be used. Until source fixed, + # patch primusrun script + if use libglvnd; then + sed -i "/libGLa/a export PRIMUS_libGLa='\/usr\/\$LIB\/libGLX_nvidia.so.0'" primusrun || die + sed -i "/libGLd/a export PRIMUS_libGLd='\/usr\/\$LIB\/libGLX.so.0'" primusrun || die + else + sed -i "/libGLa/a export PRIMUS_libGLa='\/usr\/$$LIB\/opengl\/nvidia\/lib/libGL.so.1'" primusrun || die + fi +} + +src_compile() { + if use libglvnd; then + export PRIMUS_libGLa='/usr/$$LIB/libGLX_nvidia.so.0' + export PRIMUS_libGLd='/usr/$$LIB/libGLX.so.0' + else + export PRIMUS_libGLa='/usr/$$LIB/opengl/nvidia/lib/libGL.so.1' + fi + mymake() { + emake LIBDIR=$(get_libdir) + } + multilib_parallel_foreach_abi mymake +} + +src_install() { + sed -i -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun + dobin primusrun + myinst() { + insinto /usr/$(get_libdir)/primus + doins "${S}"/$(get_libdir)/libGL.so.1 + } + multilib_foreach_abi myinst +} diff --git a/x11-misc/primus/primus-0.2.ebuild b/x11-misc/primus/primus-0.2.ebuild deleted file mode 100644 index 6cd89d1ee185..000000000000 --- a/x11-misc/primus/primus-0.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib-build - -DESCRIPTION="Faster OpenGL offloading for Bumblebee" -HOMEPAGE="https://github.com/amonakov/primus" -SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/amonakov/${PN}.git" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - x11-misc/bumblebee - x11-drivers/nvidia-drivers[compat] -" -DEPEND="virtual/opengl" - -src_compile() { - export PRIMUS_libGLa='/usr/$$LIB/opengl/nvidia/lib/libGL.so.1' - mymake() { - emake LIBDIR=$(get_libdir) - } - multilib_parallel_foreach_abi mymake -} - -src_install() { - sed -i -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun - dobin primusrun - myinst() { - insinto /usr/$(get_libdir)/primus - doins "${S}"/$(get_libdir)/libGL.so.1 - } - multilib_foreach_abi myinst -} diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest index dfb4fe2202ed..8905babc8b9c 100644 --- a/x11-misc/projecteur/Manifest +++ b/x11-misc/projecteur/Manifest @@ -1,2 +1 @@ -DIST projecteur-0.7.tar.gz 296252 BLAKE2B fb20de48ee5f89e66701fc8d6cad036aed48ed862994b82431a8a14f3ec95dccb863c4c35a5de01c932150b3b311511ef01af093ddbcd23a2413ebb882152bab SHA512 9af54e47883cd3d9368edef173b9c0eb522f947f7d72f759388e2ecdf275524bdf56d3562506a383bba32c0fd2ec5c76c232a7b523e13b79caeb4d6d76bbbac0 -DIST projecteur-0.8.tar.gz 379203 BLAKE2B b2171bd6120c9f6245c129519e33adbb4661ea4cd0df5f30c6c90fbefb8b7c5024da5c6d920d4e162b818bc0fc6417731dcf0c540103ed6f12976123c45c69eb SHA512 e892e87f442cfa7f0102efa01b43e63ed7ea9c30c875496dd3d683ee769de66f0a4ccfae149f060924e5613dfd7758a0b19d565232fb6db75b9228cee4a956de +DIST projecteur-0.10.tar.gz 464761 BLAKE2B 51488cd9f4380f3164ea8c186aeb2389917a1cfb7a5046fc90cc8e75ff5c33ecaa8224cf56c0dcfc0ba1c54741f5ae0d98ec1061318f439801a2b959832b0da4 SHA512 fae7bb6af1fe24ff5e2c98610a768ed93ed968fa8a78dee59fe2c0e7217880ad54e98b6bd0da4defd0297c959bc10e53c476d004c1847c50bc843816359b58a7 diff --git a/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch b/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch deleted file mode 100644 index 841005968123..000000000000 --- a/x11-misc/projecteur/files/projecteur-0.7-fix-git-detection.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 259be1617f1b0b92e53440d95fa88aa4bf3fe25b Mon Sep 17 00:00:00 2001 -From: Jahn <jahnf@users.noreply.github.com> -Date: Sun, 10 May 2020 19:34:19 +0200 -Subject: [PATCH] Make sure version_distance is always valid, fixes build with - not git available. #73 - ---- - cmake/modules/GitVersion.cmake | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/GitVersion.cmake b/cmake/modules/GitVersion.cmake -index 1cbbd09..fcb77bc 100644 ---- a/cmake/modules/GitVersion.cmake -+++ b/cmake/modules/GitVersion.cmake -@@ -282,6 +282,7 @@ function(get_version_info prefix directory) - set(${prefix}_VERSION_MAJOR ${${prefix}_VERSION_MAJOR} PARENT_SCOPE) - set(${prefix}_VERSION_MINOR ${${prefix}_VERSION_MINOR} PARENT_SCOPE) - set(${prefix}_VERSION_PATCH ${${prefix}_VERSION_PATCH} PARENT_SCOPE) -+ set(${prefix}_VERSION_DISTANCE ${${prefix}_VERSION_DISTANCE} PARENT_SCOPE) - - # Build version string... - set(VERSION_STRING "${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR}") -@@ -412,8 +413,8 @@ function(add_version_info_custom_prefix target prefix directory) - - get_target_property(type ${target} TYPE) - if(type STREQUAL "SHARED_LIBRARY") -- set_target_properties(${target} PROPERTIES SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}") -- set_property(TARGET ${target} PROPERTY VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -+ set_target_properties(${target} PROPERTIES SOVERSION "${VERSION_MAJOR}.${VERSION_MINOR}") -+ set_property(TARGET ${target} PROPERTY VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") - endif() - set_property(TARGET ${target} APPEND PROPERTY SOURCES ${output_files}) - target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${output_dir}>) diff --git a/x11-misc/projecteur/metadata.xml b/x11-misc/projecteur/metadata.xml index 429e23db7082..3bb200e6f9d8 100644 --- a/x11-misc/projecteur/metadata.xml +++ b/x11-misc/projecteur/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>conikost@gentoo.org</email> diff --git a/x11-misc/projecteur/projecteur-0.7-r2.ebuild b/x11-misc/projecteur/projecteur-0.10.ebuild index 26072768e67e..4d34d681c673 100644 --- a/x11-misc/projecteur/projecteur-0.7-r2.ebuild +++ b/x11-misc/projecteur/projecteur-0.10.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="${PN/p/P}" @@ -10,13 +10,12 @@ inherit cmake udev xdg-utils DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device" HOMEPAGE="https://github.com/jahnf/Projecteur" SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86" -S="${WORKDIR}/${MY_PN}-${PV}" - RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdeclarative:5 @@ -34,7 +33,21 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES="${FILESDIR}/${P}-fix-git-detection.patch" +src_prepare() { + cmake_src_prepare + + # Don't treat all warnings as errors + sed -e '/add_compile_options/d' -i CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DCOMPRESS_MAN_PAGE="OFF" + -DPROJECTEUR_QT_VERSION=5 + ) + + cmake_src_configure +} pkg_postinst() { udev_reload diff --git a/x11-misc/projecteur/projecteur-0.8.ebuild b/x11-misc/projecteur/projecteur-0.8.ebuild deleted file mode 100644 index d727e882f0f2..000000000000 --- a/x11-misc/projecteur/projecteur-0.8.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/p/P}" - -inherit cmake udev xdg-utils - -DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device" -HOMEPAGE="https://github.com/jahnf/Projecteur" -SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - || ( - dev-qt/qtgui:5[X(-)] - dev-qt/qtgui:5[xcb(-)] - ) - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - virtual/udev - x11-libs/libX11 -" -DEPEND="${RDEPEND}" - -BDEPEND="virtual/pkgconfig" - -pkg_postinst() { - udev_reload - xdg_icon_cache_update -} - -pkg_postrm() { - udev_reload - xdg_icon_cache_update -} diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest index bcbd9f0a57a5..7db61c553a9d 100644 --- a/x11-misc/py3status/Manifest +++ b/x11-misc/py3status/Manifest @@ -1 +1 @@ -DIST py3status-3.28.tar.gz 403839 BLAKE2B bc41418d38d8a5d55e2af67c4b68993db69bfa40d5f047fc47bf3e5cda28f56b808b8687ab5081c666398660b837f8c944138094112457eaa0c230cd1f1fa28e SHA512 19447a8afeeb39371551337fbfa62b6cd8b1cb8a4188b2bc18d1a7ec849126d3e8f46fb2cf4cefa2960ed38ff09a0cad7233bfe5711bba5efaeed7cd5da6207c +DIST py3status-3.57.tar.gz 450564 BLAKE2B 136e8737ebf2fb0bfba91e767ba557656a0a09b57ae62da9a3196eb511016dae9967bdddfdbb24d1b6e17e6601fa091e7f5c7e8d73a091a9d6e05fea702479c3 SHA512 e91f78c3b081f4e98a91bc82d81088dfef0da7fe00ca3b1c90c5054aeda9f64e79c8c09e886e13ad514297cb0fc5cdf327e1b11f99f59f33a8a44ffb7ff469e0 diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml index d823cd0df908..deb1ffbd6ce4 100644 --- a/x11-misc/py3status/metadata.xml +++ b/x11-misc/py3status/metadata.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>ultrabug@gentoo.org</email> <name>Alexys Jacob</name> </maintainer> - <longdescription lang="en"> - py3status is an extensible i3status wrapper written in python. - </longdescription> <upstream> <remote-id type="pypi">py3status</remote-id> <remote-id type="github">ultrabug/py3status</remote-id> </upstream> <use> - <flag name="gevent">Install extra requirement <pkg>dev-python/gevent</pkg> to enable green threads.</flag> + <flag name="minimal">Don't depend on <pkg>x11-misc/i3status</pkg> if you don't plan to use any of its built-in modules.</flag> <flag name="udev">Install extra requirement <pkg>dev-python/pyudev</pkg> to enable udev events monitoring on modules.</flag> </use> </pkgmetadata> diff --git a/x11-misc/py3status/py3status-3.28.ebuild b/x11-misc/py3status/py3status-3.57.ebuild index f08967d407b9..306470adcb04 100644 --- a/x11-misc/py3status/py3status-3.28.ebuild +++ b/x11-misc/py3status/py3status-3.57.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +EAPI=7 +PYTHON_COMPAT=( python{3_9,3_10,3_11} ) +DISTUTILS_USE_PEP517=hatchling SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -17,14 +18,16 @@ HOMEPAGE="https://github.com/ultrabug/py3status" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gevent +udev" +IUSE="minimal +dbus +udev" +# It feels useless to run tests on this simple package +# since upstream (I) runs tox on CI +RESTRICT="test" RDEPEND=" - x11-misc/i3status - gevent? ( >=dev-python/gevent-1.2.0[${PYTHON_USEDEP}] ) + !minimal? ( x11-misc/i3status ) + dbus? ( >=dev-python/dbus-python-1.3.2[${PYTHON_USEDEP}] >=dev-python/pygobject-3.46.0[${PYTHON_USEDEP}] ) udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] ) " -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} diff --git a/x11-misc/pypanel/Manifest b/x11-misc/pypanel/Manifest deleted file mode 100644 index 656ffb559656..000000000000 --- a/x11-misc/pypanel/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST PyPanel-2.4.tar.gz 29857 BLAKE2B 55a47dd186aaaa79fd77068b2a7715ac5a5172517a38a49fc5df0d0065e91ef3dec36deefb7bda6c8b1668032d041acb7ce2602ec568ffb7832abe01f48f58c0 SHA512 acda16cbf4f725ee3f0e97e11f04177fc819f6c09d0bcc864c9de1fc0c1bc0bfe2593233e5b8b85399ad41bc07763ad87d7045bac4dece9dc15d6eaf3136895e diff --git a/x11-misc/pypanel/metadata.xml b/x11-misc/pypanel/metadata.xml deleted file mode 100644 index b6a5bfce49f3..000000000000 --- a/x11-misc/pypanel/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <longdescription> -PyPanel is a lightweight panel/taskbar for X11 window managers that can -be easily customized to match any desktop theme or taste. - -Some of the customizable features include transparency w/ shading, panel -dimensions and location, font type and colors, button events/actions, -clock and workspace name display. - -PyPanel should work with any WM that supports the EWMH specification. -The following have been tested: Kahakai, Openbox3, PekWM, WindowMaker. -</longdescription> - <upstream> - <remote-id type="sourceforge">pypanel</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/pypanel/pypanel-2.4-r2.ebuild b/x11-misc/pypanel/pypanel-2.4-r2.ebuild deleted file mode 100644 index c1c3381177d7..000000000000 --- a/x11-misc/pypanel/pypanel-2.4-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN=${PN/pyp/PyP} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="A lightweight panel/taskbar for X11 window managers" -HOMEPAGE="http://pypanel.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" -IUSE="" - -RDEPEND="x11-libs/libXft - dev-python/python-xlib[${PYTHON_USEDEP}] - media-libs/imlib2[X]" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} diff --git a/x11-misc/qarma/metadata.xml b/x11-misc/qarma/metadata.xml index 9e57ad8ce5f5..608d87a9ff27 100644 --- a/x11-misc/qarma/metadata.xml +++ b/x11-misc/qarma/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zx2c4@gentoo.org</email> diff --git a/x11-misc/qcomicbook/metadata.xml b/x11-misc/qcomicbook/metadata.xml index eccf315497a7..c1ed3aa190fc 100644 --- a/x11-misc/qcomicbook/metadata.xml +++ b/x11-misc/qcomicbook/metadata.xml @@ -1,14 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">stolowski/QComicBook</remote-id> </upstream> diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild index aaa44f685145..ea3d5ea091c0 100644 --- a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild +++ b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 MY_PN="QComicBook" CMAKE_IN_SOURCE_BUILD=1 PLOCALES="cs_CZ de_DE es_ES fi_FI fr_CA fr_FR it_IT ko_KR nl_NL pl_PL pt_BR ru_RU uk_UA zh_CN" -inherit cmake-utils flag-o-matic l10n +inherit cmake flag-o-matic plocale xdg -DESCRIPTION="A viewer for comic book archives containing jpeg/png images" +DESCRIPTION="Viewer for comic book archives containing jpeg/png images" HOMEPAGE="https://github.com/stolowski/QComicBook" SRC_URI="https://github.com/stolowski/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" @@ -17,15 +17,15 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="debug" -RDEPEND="app-text/poppler[qt5] +RDEPEND=" + app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) @@ -33,28 +33,28 @@ S="${WORKDIR}/${MY_PN}-${PV}" src_prepare() { rm_loc() { - rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed" + rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed" } rm "i18n/${PN}_en_EN.ts" || die 'removing redundant english locale failed' - l10n_find_plocales_changes "i18n" "${PN}_" ".ts" - l10n_for_each_disabled_locale_do rm_loc + plocale_find_changes "i18n" "${PN}_" ".ts" + plocale_for_each_disabled_locale rm_loc # fix desktop file - sed -i \ - -e '/^Encoding/d' \ + sed -e '/^Encoding/d' \ -e '/^Icon/s/.png//' \ -e '/^Categories/s/Application;//' \ - "data/${PN}.desktop" || die 'sed on desktop file failed' + -i data/${PN}.desktop || die 'sed on desktop file failed' - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { + xdg_pkg_postinst elog "For using QComicBook with compressed archives you may want to install:" elog " app-arch/p7zip" elog " app-arch/unace" diff --git a/x11-misc/qlipper/Manifest b/x11-misc/qlipper/Manifest index b79245def69e..1b92b1d7fd0b 100644 --- a/x11-misc/qlipper/Manifest +++ b/x11-misc/qlipper/Manifest @@ -1,2 +1 @@ -DIST qlipper-5.0.0.tar.gz 94281 BLAKE2B 04834165a70d71fad2ee945c0b8389ffefef110554d234e0b1f25f02f7b33a0c8cf809cafd7f7a74a2845f949d35a6ad8045d23981efdd9e6c091c5e61ac9367 SHA512 d2bd834f33531a175201244bdd6e9436da16c6f77e1fdc79616c8c3faef531ae50d4cc3b072074fd5efa494cc7be30ffe617912cf54494a66a72420095b0c642 DIST qlipper-5.1.2.tar.gz 104652 BLAKE2B 841b984d4720dfe7d69424a79beee8d84f5d66109ac1afb75c39cf16ff27da309d929f91eab2222e43a547d4d010809f31d59adb321c9f9f0ae19fb580cff0a2 SHA512 1ad49424855abf5f446026856178291b6ed8c1152338013f2228bbe5a923bc2e989754fe41e8b03f069f815c3850073eb1063842b5f40462005693a9029b187b diff --git a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch b/x11-misc/qlipper/files/qlipper-5.0.0-build.patch deleted file mode 100644 index 20f6b35c56a1..000000000000 --- a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b3cb6a08c82deacb905459b66f16eda35f0c3779 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Wed, 9 Nov 2016 21:42:08 +1100 -Subject: [PATCH] Fix build with ENABLE_NETWORK_CLIPBOARD_SHARING enabled. - -qlippernetwork.cpp expects network-related variables to be available if -ENABLE_NETWORK_CLIPBOARD_SHARING is defined, but qlippernetwork.h defined those -variables if ENABLE_NETWORK_CLIPBOARD_SHARING was *un*defined. - -This also adds a missing include that is no longer available transitively via -QtNetwork/QUdpSocket. ---- - src/qlippernetwork.h | 4 ++-- - src/qlippertypes.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/qlippernetwork.h b/src/qlippernetwork.h -index 9163cf8..ce1ac9a 100644 ---- a/src/qlippernetwork.h -+++ b/src/qlippernetwork.h -@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., - #define QLIPPERNETWORK_H - - #include <QtCore/QObject> --#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING -+#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING - #include <QtNetwork/QUdpSocket> - #endif - #include "qlippertypes.h" -@@ -38,7 +38,7 @@ public slots: - void sendData(const ClipboardContent &value); - - private: --#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING -+#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING - QUdpSocket *m_socket; - QString m_id; - #endif -diff --git a/src/qlippertypes.h b/src/qlippertypes.h -index b55f0e1..c97c311 100644 ---- a/src/qlippertypes.h -+++ b/src/qlippertypes.h -@@ -2,7 +2,7 @@ - #define QLIPPERTYPES_H - - #include <QMetaType> -- -+#include <QHashIterator> - - typedef QHash<QString,QByteArray> ClipboardContent; - typedef QHashIterator<QString,QByteArray> ClipboardContentIterator; --- -2.7.3 - diff --git a/x11-misc/qlipper/metadata.xml b/x11-misc/qlipper/metadata.xml index bfc5032dd997..75548511812c 100644 --- a/x11-misc/qlipper/metadata.xml +++ b/x11-misc/qlipper/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">pvanek/qlipper</remote-id> </upstream> diff --git a/x11-misc/qlipper/qlipper-5.0.0.ebuild b/x11-misc/qlipper/qlipper-5.0.0.ebuild deleted file mode 100644 index ac11c2bd92c9..000000000000 --- a/x11-misc/qlipper/qlipper-5.0.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils - -DESCRIPTION="Lightweight and cross-platform clipboard history applet" -HOMEPAGE="https://github.com/pvanek/qlipper" -SRC_URI="https://github.com/pvanek/qlipper/archive/5.0.0.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -# bundles x11-libs/libqxt but no qt5 system version is available yet -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - x11-libs/libX11 -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -PATCHES=( "${FILESDIR}/${P}-build.patch" ) - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/qlipper/qlipper-5.1.2.ebuild b/x11-misc/qlipper/qlipper-5.1.2.ebuild index 746b675f1bdd..c8baf97ee0dc 100644 --- a/x11-misc/qlipper/qlipper-5.1.2.ebuild +++ b/x11-misc/qlipper/qlipper-5.1.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils @@ -14,16 +14,15 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -# bundles x11-libs/libqxt but no qt5 system version is available yet +# TODO: still accurate? bundles x11-libs/libqxt but no qt5 system version is available yet RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libX11 " -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" pkg_postinst() { xdg_icon_cache_update diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest index 65d271774b62..f4580a2b3282 100644 --- a/x11-misc/qps/Manifest +++ b/x11-misc/qps/Manifest @@ -1,3 +1,2 @@ -DIST qps-1.10.20.tar.xz 209588 BLAKE2B abf50904a97e9d2f5755bfc25509266de9c4b5a941a1010f93f475f02e8801b970ba112b01727e076c7b232cf23f50f6b8f7d2fe7acf2d8b273686f6a92404f3 SHA512 407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef -DIST qps-2.0.0.tar.xz 211452 BLAKE2B 9b8501f3e57939b33ea54daf58d84cf37b6b66a0c4a32d546691898a82f19b747eba4eef77db6f07ca917da83fabfbee0f7ad9cd146b92e160c886d5f1905a02 SHA512 b5c3d194e97ac61ede43e29f4f12e3775ee8afabb1c1c344d068ea0af85fc8a574667cb6c4b801af620e81da1648b0618e31df7c0d5701cf47625482e8528019 -DIST qps-2.1.0.tar.xz 197352 BLAKE2B c607fde920973c21e85b74e9408f7827ad4354d95b5b16cc95c22bc4143579f1dcddf68bcf9904f4df12236d49f786f457bdf3ce809f37549211f297bab18205 SHA512 e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2 +DIST qps-2.7.0.tar.xz 269192 BLAKE2B 90cb86f854d7c7df92ad206558741284a758b569ad117e9c4c0fcf063ec86539e9dc45e25e02449c63063b335056d01b5926ec760fde505b014ba3eb76c4ca2f SHA512 76285f37869f057fccd895eccf965547c11e49dd8315ef8ac4ea199734aae449be8e7782d41fb8582b0fa60715952857595d4bef7a3afcb47e83f31a168fd3c7 +DIST qps-2.8.0.tar.xz 450280 BLAKE2B 2cb5197ed9564f1b2c48cca734bfca70df9513c1e44fd46ffada374823275370afdaa43ca4a2c8572781ba255efd5b95a67ca0aad038eea2cea9acefd8fdd449 SHA512 1dc4e0018eec82a70f33604d3f5b58a20892f1d97bb0334596d9ca47bc9d4e51c5acbdc8f72289612ab12a9a180c04b87de5f91a2fc0872791f68d0e6a1a2129 diff --git a/x11-misc/qps/metadata.xml b/x11-misc/qps/metadata.xml index 32ee43deea92..63e1638bd7fc 100644 --- a/x11-misc/qps/metadata.xml +++ b/x11-misc/qps/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> </maintainer> <upstream> <remote-id type="github">lxqt/qps</remote-id> diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild deleted file mode 100644 index 35616a6fed6b..000000000000 --- a/x11-misc/qps/qps-1.10.20.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Visual process manager - Qt version of ps/top" -HOMEPAGE="https://lxqt.github.io/" -SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="debug" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.6.0 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 -" -RDEPEND="${DEPEND}" - -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/qps/qps-2.0.0.ebuild b/x11-misc/qps/qps-2.0.0.ebuild deleted file mode 100644 index 2fd670cd0aaa..000000000000 --- a/x11-misc/qps/qps-2.0.0.ebuild +++ /dev/null @@ -1,38 +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="Visual process manager - Qt version of ps/top" -HOMEPAGE="https://lxqt.github.io/" -SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="debug" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.6.0 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 -" -RDEPEND="${DEPEND}" - -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/qps/qps-2.1.0-r1.ebuild b/x11-misc/qps/qps-2.7.0.ebuild index 0a414be68936..1c66548a5258 100644 --- a/x11-misc/qps/qps-2.1.0-r1.ebuild +++ b/x11-misc/qps/qps-2.7.0.ebuild @@ -1,29 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils DESCRIPTION="Qt GUI Process Manager" -HOMEPAGE="https://lxqt.github.io/" +HOMEPAGE="https://lxqt-project.org/" 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 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.7.0 + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.13.0 " DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - >=lxqt-base/liblxqt-0.15.0 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=lxqt-base/liblxqt-1.3:= " RDEPEND="${DEPEND}" diff --git a/x11-misc/qps/qps-2.8.0.ebuild b/x11-misc/qps/qps-2.8.0.ebuild new file mode 100644 index 000000000000..67bba6929681 --- /dev/null +++ b/x11-misc/qps/qps-2.8.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI Process Manager" +HOMEPAGE="https://lxqt-project.org/" +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 ~loong ~riscv x86" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=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.4:= +" +RDEPEND="${DEPEND}" + +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/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index 3b14ed92043e..16af51180b67 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1,2 +1 @@ -DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2 SHA512 a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009 -DIST qt5ct-1.0.tar.bz2 73360 BLAKE2B a2a37534434102f08d0f225017c5b835bc22ac2d86592505d4dcc8823a8ed34fd54085a581e86e83ecaec04141e90f4c6e87b9aaed027b68e29ed9a773108263 SHA512 f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2 +DIST qt5ct-1.8.tar.bz2 85945 BLAKE2B 0a882a076eb1013c4196e9067f7ed135b0f86c2850071de4945bb17053618a605ca412fbc1c7a87a6e00ee051f4fb5f0d31754490aa51abe472c72a6918088c9 SHA512 5417850fb2bad4faaed59c8af61bec04c1ee7fefe8495286571e257b2f68cd417d36439c66fcfac28bb735c753a4ca4cec327b74e97e5ce8c2d4e36b3e4fba28 diff --git a/x11-misc/qt5ct/metadata.xml b/x11-misc/qt5ct/metadata.xml index 431c089faf5d..6b15ce319d3f 100644 --- a/x11-misc/qt5ct/metadata.xml +++ b/x11-misc/qt5ct/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mgorny@gentoo.org</email> @@ -9,9 +9,6 @@ This program allows users to configure Qt5 settings (theme, font, icons, etc.) under DE/WM without Qt5 integration. </longdescription> - <use> - <flag name="dbus">Enable system tray and global menu support</flag> - </use> <upstream> <remote-id type="sourceforge">qt5ct</remote-id> </upstream> diff --git a/x11-misc/qt5ct/qt5ct-0.41.ebuild b/x11-misc/qt5ct/qt5ct-0.41.ebuild deleted file mode 100644 index 575ed6982d0c..000000000000 --- a/x11-misc/qt5ct/qt5ct-0.41.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" -HOMEPAGE="https://sourceforge.net/projects/qt5ct/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+dbus" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - dbus? ( - dev-qt/qtdbus:5 - dev-qt/qtgui:5[dbus] - ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -src_configure() { - eqmake5 DISABLE_DBUS=$(usex dbus 0 1) -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs - - newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct' -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - ewarn "qt5ct configuration won't be applied to the currently running sessions." - ewarn "Please relogin." - fi - if ! has_version 'dev-qt/qtsvg:5'; then - elog - elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." - elog - fi -} diff --git a/x11-misc/qt5ct/qt5ct-1.0.ebuild b/x11-misc/qt5ct/qt5ct-1.8.ebuild index 9f615edb3db0..8be1a39d4b3c 100644 --- a/x11-misc/qt5ct/qt5ct-1.0.ebuild +++ b/x11-misc/qt5ct/qt5ct-1.8.ebuild @@ -1,9 +1,9 @@ -# 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 qmake-utils +inherit cmake DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" HOMEPAGE="https://sourceforge.net/projects/qt5ct/" @@ -11,30 +11,23 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+dbus" +KEYWORDS="amd64 ~arm ~ppc64 x86" RDEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtgui:5= + dev-qt/qtdbus:5 + dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5 - dbus? ( - dev-qt/qtdbus:5 - dev-qt/qtgui:5[dbus] - ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-qt/linguist-tools:5 + dev-qt/qtpaths:5 " -src_configure() { - eqmake5 DISABLE_DBUS=$(usex dbus 0 1) -} - src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs + cmake_src_install newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct' } diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest index acd52ff6e70d..030eacc9a25e 100644 --- a/x11-misc/qterm/Manifest +++ b/x11-misc/qterm/Manifest @@ -1,2 +1 @@ -DIST qterm-0.7.1.tar.gz 901169 BLAKE2B ab5337680f49e5f5f0d173585a9b9bc9a8606f086faf03405e2eb7efbf73cc3d9808fa6868deae3fe82e00d0ed2c0ec2d461d3085303b51ee1026bda672d8ddc SHA512 94f4c3f7974572c29eabf98c45e962b9232a4b0fbd6710c7725e0d23e6ecc91456f52a8c112779cd3b4732cb2e4302629419f7365b2d359ccbf39578e6e67cdd DIST qterm-0.7.3.tar.gz 901423 BLAKE2B e3f799946bfff4531e77d04fe535d53ef92093d1435aca32b06fa43c444c55798ab1c8408847dde81d1d24b5fda0c4a4f58fb563369f2c4669ba43929695cbd8 SHA512 93fdd24d79a81853654a4702ff55b2fad80c1cc734ec3230a297b3a2613cf24d41f4c645eadc5f34b6025f548e7c8cd5d291d4c29fc919f8966eeb8b44f5c046 diff --git a/x11-misc/qterm/files/qterm-0.7.1-headers.patch b/x11-misc/qterm/files/qterm-0.7.1-headers.patch deleted file mode 100644 index c442c0ac8b30..000000000000 --- a/x11-misc/qterm/files/qterm-0.7.1-headers.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/keydialog.h -+++ b/src/keydialog.h -@@ -10,6 +10,7 @@ - #ifndef KEYDIALOG_H - #define KEYDIALOG_H - -+#include <QButtonGroup> - #include "ui_keydialog.h" - namespace QTerm - { ---- a/src/soundconf.h -+++ b/src/soundconf.h -@@ -1,6 +1,7 @@ - #ifndef SOUNDCONF_H - #define SOUNDCONF_H - -+#include <QButtonGroup> - #include "ui_soundconf.h" - namespace QTerm - { ---- a/src/shortcutsdialog.cpp -+++ b/src/shortcutsdialog.cpp -@@ -3,6 +3,7 @@ - #include <QKeyEvent> - #include <QMessageBox> - #include <QShortcut> -+#include <QAction> - - namespace QTerm { - ---- a/src/shortcutsdialog.h -+++ b/src/shortcutsdialog.h -@@ -3,6 +3,7 @@ - - #include "ui_shortcutsdialog.h" - class QShortcut; -+class QAction; - - namespace QTerm{ - diff --git a/x11-misc/qterm/files/qterm-libressl.patch b/x11-misc/qterm/files/qterm-libressl.patch deleted file mode 100644 index d0e0ae1f9cb5..000000000000 --- a/x11-misc/qterm/files/qterm-libressl.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/src/ssh/libcrypto-compat.c -+++ b/src/ssh/libcrypto-compat.c -@@ -8,7 +8,7 @@ - */ - - #include "libcrypto-compat.h" --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #include <string.h> - #include <openssl/engine.h> - ---- a/src/ssh/libcrypto-compat.h -+++ b/src/ssh/libcrypto-compat.h -@@ -9,7 +9,7 @@ - #include <openssl/evp.h> - #include <openssl/hmac.h> - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); - int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q); ---- a/src/ssh/socket.cpp -+++ b/src/ssh/socket.cpp -@@ -36,7 +36,7 @@ - SSH2SocketPriv::SSH2SocketPriv(SocketPrivate * plainSocket, QByteArray & banner, QObject * parent) - : SSHSocketPriv(parent), m_banner(banner), m_status(Init), m_sessionID(), m_channelList() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - OpenSSL_add_all_ciphers(); - #endif - m_sessionID = NULL; -@@ -56,7 +56,7 @@ - - SSH2SocketPriv::~SSH2SocketPriv() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_cleanup(); - #endif - } -@@ -133,7 +133,7 @@ - #ifdef SSH_DEBUG - qDebug() << "init ssh1 session"; - #endif --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - OpenSSL_add_all_ciphers(); - #endif - m_inPacket = new SSH1InBuffer(plainSocket, this); -@@ -148,7 +148,7 @@ - - SSH1SocketPriv::~SSH1SocketPriv() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_cleanup(); - #endif - } diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml index 59fe2d65e616..d010a3ee5307 100644 --- a/x11-misc/qterm/metadata.xml +++ b/x11-misc/qterm/metadata.xml @@ -1,10 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">qterm/qterm</remote-id> <remote-id type="sourceforge">qterm</remote-id> diff --git a/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild deleted file mode 100644 index d1116333ae8f..000000000000 --- a/x11-misc/qterm/qterm-0.7.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils gnome2-utils xdg-utils - -DESCRIPTION="A BBS client based on Qt" -HOMEPAGE="https://github.com/qterm/qterm" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="libressl" - -RDEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5[scripttools] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - x11-libs/libX11 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= )" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qthelp:5 - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${PN}-libressl.patch - "${FILESDIR}"/${P}-headers.patch -) -DOCS=( README.rst RELEASE_NOTES TODO ) - -src_prepare() { - # file collision with sys-cluster/torque, bug #176533 - sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt - sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop - - cmake-utils_src_prepare - xdg_environment_reset -} - -src_configure() { - local mycmakeargs=( - -DQT5=ON - ) - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3-r1.ebuild index 8297a404681e..3100adfc8386 100644 --- a/x11-misc/qterm/qterm-0.7.3.ebuild +++ b/x11-misc/qterm/qterm-0.7.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -inherit cmake-utils gnome2-utils xdg-utils +inherit cmake xdg DESCRIPTION="A BBS client based on Qt" HOMEPAGE="https://github.com/qterm/qterm" @@ -11,8 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl" +KEYWORDS="amd64 x86" RDEPEND="dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -23,36 +22,27 @@ RDEPEND="dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/libX11 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= )" + dev-libs/openssl:=" DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 + x11-base/xorg-proto" +BDEPEND="dev-qt/linguist-tools:5 dev-qt/qthelp:5 x11-base/xorg-proto" -PATCHES=( "${FILESDIR}"/${PN}-libressl.patch ) DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt ) src_prepare() { # file collision with sys-cluster/torque, bug #176533 - sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt - sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop + sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt || die + sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop || die - cmake-utils_src_prepare - xdg_environment_reset + cmake_src_prepare } src_configure() { local mycmakeargs=( -DQT5=ON ) - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update -} -pkg_postrm() { - gnome2_icon_cache_update + cmake_src_configure } diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest index a09fd0905559..bc1f91b23848 100644 --- a/x11-misc/qtfm/Manifest +++ b/x11-misc/qtfm/Manifest @@ -1 +1 @@ -DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d +DIST qtfm-6.2.1.tar.gz 410958 BLAKE2B fe542b935dfa0d16198f9a0dc3fb5e0b43718056ebc0987ef73ff8c56258e8ba660ef7f294cc424aab397cd26a2aba37048806d9175fe86004298129443c707b SHA512 911c90a6f9bcfe539aaacf3476d660116f2dc18821b23cc420615be649bbffd530abf640ebf77d80ee85b61779e4844e0bc10f8fd3f3b0686366e6b5372f9f2c diff --git a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch deleted file mode 100644 index 783d33d42328..000000000000 --- a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c80a7f7e89f5810fab889dc2660d078438727c05 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 14 Jun 2020 20:25:46 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - libfm/iconlist.cpp | 2 ++ - libfm/iconview.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/libfm/iconlist.cpp b/libfm/iconlist.cpp -index ca72f2e..9b25dd2 100644 ---- a/libfm/iconlist.cpp -+++ b/libfm/iconlist.cpp -@@ -1,5 +1,7 @@ - #include "iconlist.h" - -+#include <QPainterPath> -+ - QSize IconListDelegate::sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const - { -diff --git a/libfm/iconview.cpp b/libfm/iconview.cpp -index 7b72bfb..f1abbd2 100644 ---- a/libfm/iconview.cpp -+++ b/libfm/iconview.cpp -@@ -1,5 +1,7 @@ - #include "iconview.h" - -+#include <QPainterPath> -+ - bool IconViewDelegate::eventFilter(QObject *object, - QEvent *event) - { --- -2.27.0 - diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch deleted file mode 100644 index 815453760fe2..000000000000 --- a/x11-misc/qtfm/files/qtfm-99999-cmake.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -121,7 +121,6 @@ set_target_properties( - ${PROJECT_VERSION_MAJOR} - ) - if(ENABLE_MAGICK) -- target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER}) - target_link_libraries(QtFM ${MAGICK_LIBRARIES}) - if(ENABLE_FFMPEG) - target_include_directories(QtFM diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml index 004b55d08e68..54f5015d9b37 100644 --- a/x11-misc/qtfm/metadata.xml +++ b/x11-misc/qtfm/metadata.xml @@ -1,16 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> -</maintainer> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -<use> -<flag name='dbus'>Install the qtfm-tray removable device manager</flag> -<flag name='shared'>Install the libQtFM shared library and headers</flag> -</use> + <!-- maintainer-needed --> + <use> + <flag name="dbus">Install the qtfm-tray removable device manager</flag> + <flag name="shared">Install the libQtFM shared library and headers</flag> + </use> </pkgmetadata> diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.1.ebuild index 2701a220c7e8..9e46320ebd05 100644 --- a/x11-misc/qtfm/qtfm-6.2.0.ebuild +++ b/x11-misc/qtfm/qtfm-6.2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit qmake-utils xdg-utils +inherit qmake-utils xdg DESCRIPTION="Small, lightweight file manager based on pure Qt" HOMEPAGE="https://qtfm.eu/" @@ -14,10 +14,6 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="+dbus shared" -BDEPEND=" - app-arch/unzip - dev-qt/linguist-tools:5 -" RDEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -28,8 +24,10 @@ RDEPEND=" dbus? ( dev-qt/qtdbus:5 ) " DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch ) +BDEPEND=" + app-arch/unzip + dev-qt/linguist-tools:5 +" src_configure() { eqmake5 \ @@ -45,13 +43,3 @@ src_install() { emake INSTALL_ROOT="${D}" install einstalldocs } - -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/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild index d61d41015c7a..7f4ff083dd93 100644 --- a/x11-misc/qtfm/qtfm-99999.ebuild +++ b/x11-misc/qtfm/qtfm-99999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake git-r3 xdg-utils +inherit cmake git-r3 xdg DESCRIPTION="Small, lightweight file manager based on pure Qt" HOMEPAGE="https://qtfm.eu/" @@ -14,10 +14,6 @@ SLOT="0" KEYWORDS="" IUSE="+dbus ffmpeg imagemagick" -BDEPEND=" - app-arch/unzip - dev-qt/linguist-tools:5 -" RDEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -30,8 +26,10 @@ RDEPEND=" imagemagick? ( >=media-gfx/imagemagick-7:= ) " DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-99999-cmake.patch ) +BDEPEND=" + app-arch/unzip + dev-qt/linguist-tools:5 +" src_configure() { local mycmakeargs=( @@ -41,13 +39,3 @@ src_configure() { ) 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/quitcount/Manifest b/x11-misc/quitcount/Manifest index df66285e5072..b61fb9ec946a 100644 --- a/x11-misc/quitcount/Manifest +++ b/x11-misc/quitcount/Manifest @@ -1 +1 @@ -DIST quitcount-3.1.3.tar.gz 403607 BLAKE2B 90f02961afa25f3df6ee81174828ed7a0e61403d91c048cf9d092f0a7c68f6530acd38ff1410d24a93046618773444adb4e3a903f1ac6400956973191ead6d2b SHA512 92e088b8272657f14e60d91589963cfcefe84ead9f4d90aa3a77ac9612fe216f558e0378788edde7680a3dba131021bf72129fbc1291eca83cd232490f486f9f +DIST quitcount-3.1.4.tar.gz 438256 BLAKE2B 65ba36ace7dfa4f9e494c4d0ffd0bc9cba0ed22a22d82767913aafdf6d4724ee7fca7e8dd0f6a94b45082fb3f15bd81d5dafb35021c1283c69e1555efe1d9ac6 SHA512 c4b0d3d35141f63b3c60ddc49b9c717f79dbbfb63690ae2ae4f7a014b24182df04006b7dd0cce5918006dc53c8fbe1dde4005ad49f4f8974f1c262e8f02e7ec3 diff --git a/x11-misc/quitcount/metadata.xml b/x11-misc/quitcount/metadata.xml index f555183b2831..b7b806a1c5da 100644 --- a/x11-misc/quitcount/metadata.xml +++ b/x11-misc/quitcount/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>laurent@lamzi.com</email> <name>Laurent Vivier</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/quitcount/quitcount-3.1.3.ebuild b/x11-misc/quitcount/quitcount-3.1.3.ebuild deleted file mode 100644 index 1fa341a50b67..000000000000 --- a/x11-misc/quitcount/quitcount-3.1.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit gnome2-utils - -# The string in SRC_URI doesn't follow standard naming convention -MV="3.1" -DESCRIPTION="A simple applet that shows what you saved since you quit smoking." -HOMEPAGE="http://quitcount.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -DEPEND="x11-libs/gtk+:3 - >=dev-libs/glib-2.6:2" - -RDEPEND="${DEPEND}" - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/quitcount/quitcount-3.1.4.ebuild b/x11-misc/quitcount/quitcount-3.1.4.ebuild new file mode 100644 index 000000000000..4a07a6a96d8d --- /dev/null +++ b/x11-misc/quitcount/quitcount-3.1.4.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +DESCRIPTION="A simple applet that shows what you saved since you quit smoking" +HOMEPAGE="http://quitcount.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/$(ver_cut 1-2)/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + x11-libs/gtk+:3 + >=dev-libs/glib-2.6:2 + x11-libs/gdk-pixbuf:2 +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + sed -i '/appdata$/s/appdata$/metainfo/' Makefile.in || die +} diff --git a/x11-misc/qxkb/metadata.xml b/x11-misc/qxkb/metadata.xml index 2a4969aacf84..2a8d8132cc9c 100644 --- a/x11-misc/qxkb/metadata.xml +++ b/x11-misc/qxkb/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">disels/qxkb</remote-id> </upstream> diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest index 484287bc4256..e77014bb262d 100644 --- a/x11-misc/read-edid/Manifest +++ b/x11-misc/read-edid/Manifest @@ -1,2 +1 @@ -DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac diff --git a/x11-misc/read-edid/metadata.xml b/x11-misc/read-edid/metadata.xml index bc1b97e1eb76..ae008b93a553 100644 --- a/x11-misc/read-edid/metadata.xml +++ b/x11-misc/read-edid/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <use> + <flag name="vbe-mode">Build get-edid with support for legacy, VBE-based interface. + Requires <pkg>dev-libs/libx86</pkg>.</flag> + </use> </pkgmetadata> diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild deleted file mode 100644 index e21cc086c588..000000000000 --- a/x11-misc/read-edid/read-edid-1.4.2.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Get EDID information from a PnP monitor" -HOMEPAGE="http://www.polypux.org/projects/read-edid/" -SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ~sparc x86" - -src_configure() { - econf --mandir=/usr/share/man -} 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 new file mode 100644 index 000000000000..75e2178a1c6a --- /dev/null +++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic linux-info + +DESCRIPTION="Program that can get information from a PnP monitor" +HOMEPAGE="http://www.polypux.org/projects/read-edid/" +SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="amd64 ~loong ppc ~riscv ~sparc x86" +IUSE="vbe-mode" + +DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )" +RDEPEND="${DEPEND}" + +pkg_setup() { + CONFIG_CHECK="~I2C_CHARDEV" + ERROR_I2C_CHARDEV="I2C_CHARDEV support not enabled in the kernel. get-edid will " + if use vbe-mode; then + ERROR_I2C_CHARDEV+="fall back to the legacy, VBE-based interface." + else + ERROR_I2C_CHARDEV+="not work." + fi + linux-info_pkg_setup +} + +src_prepare() { + sed -i -e 's|COPYING||g;s|share/doc/read-edid|share/doc/'"${PF}"'|g' \ + CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + append-cflags -fcommon + local mycmakeargs=( + -DCLASSICBUILD=$(usex vbe-mode) + ) + cmake_src_configure +} diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild deleted file mode 100644 index cef6d33015a8..000000000000 --- a/x11-misc/read-edid/read-edid-3.0.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils flag-o-matic - -DESCRIPTION="Program that can get information from a PnP monitor" -HOMEPAGE="http://www.polypux.org/projects/read-edid/" -SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="-* amd64 x86" - -DEPEND=">=dev-libs/libx86-1.1" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i -e 's|COPYING||g;s|share/doc/read-edid|&-'"${PV}"'|g' \ - CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - append-cflags -fcommon - cmake-utils_src_configure -} diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest index e4397643934b..18f1b94c1740 100644 --- a/x11-misc/redshift/Manifest +++ b/x11-misc/redshift/Manifest @@ -1 +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/files/redshift-1.12-apparmor.patch b/x11-misc/redshift/files/redshift-1.12-apparmor.patch new file mode 100644 index 000000000000..cb939994bf52 --- /dev/null +++ b/x11-misc/redshift/files/redshift-1.12-apparmor.patch @@ -0,0 +1,35 @@ +From c740a3a733a59782c26f2f90a073befec2e2324d Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Tue, 27 Dec 2022 01:27:35 +0100 +Subject: [PATCH] Fix AppArmor profile + +Inspired by: +- https://github.com/jonls/redshift/pull/864 +- https://gitlab.com/chinstrap/gammastep/-/blob/9db19f5ccfad20ab7b501daedcfd5ef137860dd2/data/apparmor/usr.bin.redshift.in +--- + data/apparmor/usr.bin.redshift.in | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/data/apparmor/usr.bin.redshift.in b/data/apparmor/usr.bin.redshift.in +index d6696db..9b71f0d 100644 +--- a/data/apparmor/usr.bin.redshift.in ++++ b/data/apparmor/usr.bin.redshift.in +@@ -35,8 +35,13 @@ + # Allow but log any other dbus activity + audit dbus bus=system, + +- owner @{HOME}/.config/redshift.conf r, ++ owner @{HOME}/.config/{,redshift/}redshift.conf r, ++ owner @{HOME}/.config/redshift/hooks/ r, ++ owner @{HOME}/.config/redshift/hooks/* Ux, ++ ++ # Required by getpwuid() call in config-ini.c. ++ /etc/passwd* r, + + # Site-specific additions and overrides. See local/README for details. +- #include <local/usr.bin.redshift> ++ #include if exists <local/usr.bin.redshift> + } +-- +2.39.0 + diff --git a/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch b/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch new file mode 100644 index 000000000000..e2ff7a7c100d --- /dev/null +++ b/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch @@ -0,0 +1,33 @@ +From f2df94b6ad23eceea8c163f9c910e1f6ea122428 Mon Sep 17 00:00:00 2001 +From: Kentaro Hayashi <kenhys@gmail.com> +Date: Mon, 27 Apr 2020 11:56:02 +0900 +Subject: [PATCH] redshift-gtk: use Ayatana AppIndicator3 instead of App + Indicator3 + +libappindicator was deprecated and it will be removed in the +future Debian release. + + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895037 + +There is a successor API compatible library - Ayatana Indicator. + + https://ayatanaindicators.github.io/code/ +--- + src/redshift-gtk/statusicon.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py +index b4adfb00..68752ed6 100644 +--- a/src/redshift-gtk/statusicon.py ++++ b/src/redshift-gtk/statusicon.py +@@ -33,8 +33,8 @@ + from gi.repository import Gtk, GLib + + try: +- gi.require_version('AppIndicator3', '0.1') +- from gi.repository import AppIndicator3 as appindicator ++ gi.require_version('AyatanaAppIndicator3', '0.1') ++ from gi.repository import AyatanaAppIndicator3 as appindicator + except (ImportError, ValueError): + appindicator = None + diff --git a/x11-misc/redshift/metadata.xml b/x11-misc/redshift/metadata.xml index fbfb697dea56..d0fbd4448cd5 100644 --- a/x11-misc/redshift/metadata.xml +++ b/x11-misc/redshift/metadata.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> </maintainer> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> <use> <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag> </use> diff --git a/x11-misc/redshift/redshift-1.12-r3.ebuild b/x11-misc/redshift/redshift-1.12-r10.ebuild index 2666e1fd1976..c0fecea4ac9d 100644 --- a/x11-misc/redshift/redshift-1.12-r3.ebuild +++ b/x11-misc/redshift/redshift-1.12-r10.ebuild @@ -1,25 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) +EAPI=8 -inherit systemd autotools eutils gnome2-utils python-r1 +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/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 arm64 x86" +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] ) + appindicator? ( dev-libs/libayatana-appindicator ) geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 ) gtk? ( ${PYTHON_DEPS} )" RDEPEND="${COMMON_DEPEND} @@ -32,14 +33,17 @@ DEPEND="${COMMON_DEPEND} " REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )" -src_prepare() { - default - eautoreconf -} +PATCHES=( + "${FILESDIR}"/${P}-apparmor.patch + "${FILESDIR}"/${P}-libayatana-appindicator.patch +) src_configure() { use gtk && python_setup + # Fix compile for Clang (bug #732438) + append-cflags -fPIE + econf \ $(use_enable nls) \ --enable-drm \ @@ -58,8 +62,10 @@ src_configure() { } _impl_specific_src_install() { - emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \ - -C src/redshift-gtk install + emake DESTDIR="${D}" \ + PYTHON="${PYTHON}" \ + pythondir="$(python_get_sitedir)" \ + -C src/redshift-gtk install } src_install() { @@ -71,17 +77,16 @@ src_install() { dosym redshift-gtk /usr/bin/gtk-redshift python_foreach_impl python_optimize - fi -} -pkg_preinst() { - use gtk && gnome2_icon_savelist + # https://bugs.gentoo.org/784281 + mv "${D}"/usr/share/{appdata,metainfo}/ || die + fi } pkg_postinst() { - use gtk && gnome2_icon_cache_update + use gtk && xdg_icon_cache_update } pkg_postrm() { - use gtk && gnome2_icon_cache_update + use gtk && xdg_icon_cache_update } diff --git a/x11-misc/redshift/redshift-1.12-r11.ebuild b/x11-misc/redshift/redshift-1.12-r11.ebuild new file mode 100644 index 000000000000..b2b5c880cfe7 --- /dev/null +++ b/x11-misc/redshift/redshift-1.12-r11.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit autotools 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/libayatana-appindicator ) + 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 + "${FILESDIR}"/${P}-libayatana-appindicator.patch +) + +src_prepare() { + # we need to re-generate file py-compile with a version + # that supports Python >=3.12 to not fail with error: + # ModuleNotFoundError: No module named 'imp' + rm py-compile || die + eautoreconf + + eapply_user +} + +src_configure() { + use gtk && python_setup + + # Fix compile for Clang (bug #732438) + append-cflags -fPIE + + econf \ + $(use_enable nls) \ + --enable-drm \ + --enable-randr \ + --enable-vidmode \ + --disable-wingdi \ + \ + --disable-corelocation \ + $(use_enable geoclue geoclue2) \ + \ + $(use_enable gtk gui) \ + --with-systemduserunitdir="$(systemd_get_userunitdir)" \ + --enable-apparmor \ + --disable-quartz \ + --disable-ubuntu +} + +_impl_specific_src_install() { + emake DESTDIR="${D}" \ + PYTHON="${PYTHON}" \ + pythondir="$(python_get_sitedir)" \ + -C src/redshift-gtk install +} + +src_install() { + emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install + + if use gtk; then + python_foreach_impl _impl_specific_src_install + python_replicate_script "${D}"/usr/bin/redshift-gtk + dosym redshift-gtk /usr/bin/gtk-redshift + + python_foreach_impl python_optimize + + # https://bugs.gentoo.org/784281 + mv "${D}"/usr/share/{appdata,metainfo}/ || die + fi +} + +pkg_postinst() { + use gtk && xdg_icon_cache_update +} + +pkg_postrm() { + use gtk && xdg_icon_cache_update +} diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest index af896a75ee4b..a6a9bf90f24b 100644 --- a/x11-misc/rendercheck/Manifest +++ b/x11-misc/rendercheck/Manifest @@ -1 +1 @@ -DIST rendercheck-1.5.tar.bz2 143656 BLAKE2B 50de34193aeb4751f967fbc04b54e75909672dc7bbac29a1fbf6ac0e648ac032c877bc215586feb44c89cb7625fc2ac2317d03ff30dcab83625290d85aad6cda SHA512 ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616 +DIST rendercheck-1.6.tar.xz 23996 BLAKE2B 981095f88d70320ba22b15ceeb33182c88fb5c4ca1df323e016a6750812dc7b0154e95c76619926bfe945a80243de5ea0921e04d94b70992b8be512d70a437d3 SHA512 0cc5372a318d4a28d63d82a2efc42f15b810186ce91b226bc5b962520637b628b1ae991a9e7745f8239c4fd100bf8f8eab79bc3803a01cad6827022af49be1a3 diff --git a/x11-misc/rendercheck/metadata.xml b/x11-misc/rendercheck/metadata.xml index e943b72b8a48..60df35fd321e 100644 --- a/x11-misc/rendercheck/metadata.xml +++ b/x11-misc/rendercheck/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/test/rendercheck</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild b/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild deleted file mode 100644 index 2b27b2a2f34d..000000000000 --- a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Tests for compliance with X RENDER extension" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/test/rendercheck" -SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86" -IUSE="" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - x11-libs/libXrender - x11-libs/libX11 -" -DEPEND="${RDEPEND}" - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} diff --git a/x11-misc/rendercheck/rendercheck-1.6.ebuild b/x11-misc/rendercheck/rendercheck-1.6.ebuild new file mode 100644 index 000000000000..15635c0581c1 --- /dev/null +++ b/x11-misc/rendercheck/rendercheck-1.6.ebuild @@ -0,0 +1,32 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MODULE=test/ +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 meson + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +fi + +DESCRIPTION="Tests for compliance with X RENDER extension" +HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/test/rendercheck" +LICENSE="MIT GPL-2+" + +RDEPEND=" + x11-libs/libXrender + x11-libs/libXext + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +# Override xorg-3's src_prepare +src_prepare() { + default +} diff --git a/x11-misc/rendercheck/rendercheck-9999.ebuild b/x11-misc/rendercheck/rendercheck-9999.ebuild new file mode 100644 index 000000000000..89bb8e72ef8d --- /dev/null +++ b/x11-misc/rendercheck/rendercheck-9999.ebuild @@ -0,0 +1,32 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MODULE=test/ +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 meson + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Tests for compliance with X RENDER extension" +HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/test/rendercheck" +LICENSE="MIT GPL-2+" + +RDEPEND=" + x11-libs/libXrender + x11-libs/libXext + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +# Override xorg-3's src_prepare +src_prepare() { + default +} diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest new file mode 100644 index 000000000000..26dedb4a157d --- /dev/null +++ b/x11-misc/revelation/Manifest @@ -0,0 +1 @@ +DIST revelation-0.5.5.tar.xz 282252 BLAKE2B 7c4c430d24d79b820139dd2b4989dc2d78c967b16c864149d2aafa9e91ddc26a3351f42b5782812202f77a36529c46d9515cc1aea73346c7e8e017079b810a7d SHA512 17bfeda87e27c00f12bc068446d053cee394282e5eabea6d075ac262b5f400f31520d2f9b29f99097d1d6ad72bbcf5d2d9d4da2a0eba2806ff0adbf1bb47bb0f diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml new file mode 100644 index 000000000000..f2900a6d8676 --- /dev/null +++ b/x11-misc/revelation/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>misanthropos@gmx.net</email> + <name>Richard Fröhning</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <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.5.ebuild b/x11-misc/revelation/revelation-0.5.5.ebuild new file mode 100644 index 000000000000..f31aeae6bc97 --- /dev/null +++ b/x11-misc/revelation/revelation-0.5.5.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +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/defusedxml[${PYTHON_USEDEP}] + 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}" + +src_prepare() { + find -name '*.py' -exec \ + sed -i -e 's:Cryptodome:Crypto:' meson.build {} + || die + default +} + +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/rodent/Manifest b/x11-misc/rodent/Manifest deleted file mode 100644 index d3ae1e0e2d18..000000000000 --- a/x11-misc/rodent/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rodent-5.3.16.3.tar.bz2 10873231 BLAKE2B 5eca3c69d5a0427997bfcb7af8cd187fcb9f49e98988ed16a2cb292e59686d82ca93f60f8c827669df3b168d53c1da5b956d267dc94c1b67793113ae42b98954 SHA512 83c85501d3fe49e84abe9bb61a23ca4ec86fb22abb2e9a01228b3180d114380ff085ee58f51b9ac47173214ab8323e0bde7cfca6fb9b7907d4b1551ad48326f5 diff --git a/x11-misc/rodent/metadata.xml b/x11-misc/rodent/metadata.xml deleted file mode 100644 index 26d67cb425c3..000000000000 --- a/x11-misc/rodent/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>xfce@gentoo.org</email> - <name>XFCE Team</name> - </maintainer> - <longdescription lang="en">Rodent is fast, small and powerful file manager for the GNU operating system (but it also works in BSD). Rodent is *not* a filemanager for dummies. Emphasis is on ease of use for the advanced user, not the computer illiterate.</longdescription> - <upstream> - <remote-id type="sourceforge">xffm</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild b/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild deleted file mode 100644 index bb5422a7ceda..000000000000 --- a/x11-misc/rodent/rodent-5.3.16.3-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2-utils xdg-utils - -DESCRIPTION="A fast, small and powerful file manager and graphical shell" -HOMEPAGE="http://xffm.org/" -SRC_URI="mirror://sourceforge/xffm/${PV}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=x11-libs/librfm-5.3.16.3" -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog TODO ) - -src_prepare() { - pushd apps/rodent-pkg >/dev/null || die - sed -i -e "/^install-data-hook/d" \ - -e "/rm -f/d" Build/Makefile.am || die - eautoreconf - popd >/dev/null || die - default -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest index 095c85464e97..36ea19b3fde4 100644 --- a/x11-misc/rofi-calc/Manifest +++ b/x11-misc/rofi-calc/Manifest @@ -1,2 +1,2 @@ -DIST rofi-calc-1.5.tar.gz 1693385 BLAKE2B 7ff21873ee298c4295f2766917318796d6327959e63d99adc86857d2e05534e77062c9546ba8c6cf645a12ae46147e4583a61fc95dbc6953ee642449ff108d40 SHA512 04213b6489cd9e3c5085a88cee07ee9413819c19d4ee08f6e2eef3ad418d21b5acaf1d4ef21f1495d81694e5706f93598c91ada65f1bcc83ce94a6cf5d50ea0c -DIST rofi-calc-1.6.tar.gz 1694150 BLAKE2B bc1f3a2589c0e704793693e0f007503d1b0eaa363f416f0d111709541f2960f0f5ab31d0eb129000e7f82af3d46ce0a52918cfbfc00d14292a839a40a0986bb0 SHA512 a87523d3d64fbd53e431dba7da674a213fcfbdcaac25906a19bc83aa3feb14da479b702b39fd58ffeb04198ea0a5d52808f7c9c36495defc99c9c83df963e0b6 +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/metadata.xml b/x11-misc/rofi-calc/metadata.xml index 300495cc81c1..ec1ad57a47be 100644 --- a/x11-misc/rofi-calc/metadata.xml +++ b/x11-misc/rofi-calc/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>robin@hallabro-kokko.se</email> - <name>Robin Hallabro-Kokko</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">svenstaro/rofi-calc</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/rofi-calc/rofi-calc-1.5.ebuild b/x11-misc/rofi-calc/rofi-calc-2.0.0.ebuild index a267871cd50b..ce53ee1c9e75 100644 --- a/x11-misc/rofi-calc/rofi-calc-1.5.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-1.6.ebuild b/x11-misc/rofi-calc/rofi-calc-2.2.0.ebuild index a267871cd50b..5264d2023257 100644 --- a/x11-misc/rofi-calc/rofi-calc-1.6.ebuild +++ b/x11-misc/rofi-calc/rofi-calc-2.2.0.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 autotools @@ -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-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-file-browser-extended/Manifest b/x11-misc/rofi-file-browser-extended/Manifest new file mode 100644 index 000000000000..2dafe33fb12b --- /dev/null +++ b/x11-misc/rofi-file-browser-extended/Manifest @@ -0,0 +1 @@ +DIST rofi-file-browser-extended-1.3.1.tar.gz 27169 BLAKE2B ced5ae91a865b136bcb2182a17c7a49cbdfcc861f8d1063415691afb13f5bdf3f1c2c0fc56a21a0dec31ee656c2379e55a4f60899c59ca7e056438142675aeb2 SHA512 269e33d62e5fdf7f6c48763ae4309fac53873d53af4ebf78f731b709ac6ff41d8f8cf21de917866fe5a80f4949d70d3be6e516c3825a8768106c706438a5b3d1 diff --git a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch new file mode 100644 index 000000000000..0cfff4286608 --- /dev/null +++ b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch @@ -0,0 +1,23 @@ +From 6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Fri, 11 Nov 2022 15:03:32 +0100 +Subject: [PATCH] Fix function pointer initialization + +Fix + +src/filebrowser.c:380:27: warning: incompatible function pointer types initializing '_mode_get_icon' (aka 'struct _cairo_surface *(*)(const struct rofi_mode *, unsigned int, unsigned int)') with an expression of type 'cairo_surface_t *(const Mode *, unsigned int, int)' (aka 'struct _cairo_surface *(const struct rofi_mode *, unsigned int, int)') [-Wincompatible-function-pointer-types] + ._get_icon = file_browser_get_icon, + ^~~~~~~~~~~~~~~~~~~~~ + +See also https://bugs.gentoo.org/880985 +--- a/src/filebrowser.c ++++ b/src/filebrowser.c +@@ -263,7 +263,7 @@ static char *file_browser_get_display_value ( const Mode *sw, unsigned int selec + } + } + +-static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, int height ) ++static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, unsigned int height ) + { + FileBrowserModePrivateData *pd = ( FileBrowserModePrivateData * ) mode_get_private_data ( sw ); + FileBrowserFileData *fd = &pd->file_data; diff --git a/x11-misc/rofi-file-browser-extended/metadata.xml b/x11-misc/rofi-file-browser-extended/metadata.xml new file mode 100644 index 000000000000..75209e7cb520 --- /dev/null +++ b/x11-misc/rofi-file-browser-extended/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type='person'> + <email>flow@gentoo.org</email> + <name>Florian Schmaus</name> + </maintainer> +</pkgmetadata> diff --git a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild new file mode 100644 index 000000000000..a3fe3b3b176b --- /dev/null +++ b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A file browser for rofi" +HOMEPAGE="https://github.com/marvinkreis/rofi-file-browser-extended" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/marvinkreis/${PN}.git" +else + SRC_URI="https://github.com/marvinkreis/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +BDEPEND="virtual/pkgconfig" +COMMON_DEPEND=" + dev-libs/glib:2 + x11-misc/rofi +" +DEPEND=" + ${COMMON_DEPEND} + x11-libs/cairo +" +RDEPEND="${COMMON_DEPEND}" + +PATCHES=( + # https://bugs.gentoo.org/880985 https://github.com/marvinkreis/rofi-file-browser-extended/pull/49 + "${FILESDIR}/${PN}-1.3.1-fix-function-pointer-initialization.patch" +) + +src_prepare() { + # Delete the lines in CMakeLists.txt that install the man page. + sed -i "45,56d" CMakeLists.txt || die + cmake_src_prepare +} + +src_install() { + cmake_src_install + doman "doc/${PN}.1" +} diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest index d793eeb10deb..75d274fd3f64 100644 --- a/x11-misc/rofi/Manifest +++ b/x11-misc/rofi/Manifest @@ -1 +1 @@ -DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394 +DIST rofi-1.7.5.tar.xz 772952 BLAKE2B 54511f4f793f3ba0b58294daa1d2974228904a637d13d729b0b7d974c0ebf8d0d98514705212bd42500fe90b0685a3515dc67793baa95baefe6dfc0ecdee83c7 SHA512 84cbb8ccef14fdb5d68062b17245fbcb0e9bab46534eb6c7ce532750b86fb33ce6e43ed24cf3c65e553d15b23a201c9168d97d257da4dddeddb0a7c44dd59cc0 diff --git a/x11-misc/rofi/files/rofi-0.15.12-Werror.patch b/x11-misc/rofi/files/rofi-0.15.12-Werror.patch deleted file mode 100644 index 89755ee4d0c5..000000000000 --- a/x11-misc/rofi/files/rofi-0.15.12-Werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -7,7 +7,7 @@ - dnl Setup automake to be silent and in foreign mode. - dnl We want xz distribution - dnl --------------------------------------------------------------------- --AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects dist-xz]) -+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-xz]) - AM_SILENT_RULES([yes]) - - dnl --------------------------------------------------------------------- diff --git a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch b/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch deleted file mode 100644 index 82aa264ac29e..000000000000 --- a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/subprojects/libnkutils/libnkutils-common.mk -+++ b/subprojects/libnkutils/libnkutils-common.mk -@@ -130,8 +130,8 @@ - %D%/src/gtk-settings.c \ - %D%/src/nkutils-gtk-settings.h - --_libnkutils_tests += \ -- %D%/tests/gtk-settings.test -+#_libnkutils_tests += \ -+# %D%/tests/gtk-settings.test - endif - - if NK_ENABLE_XDG_DE diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml index d9dc616fbbc3..61c7bf918fc9 100644 --- a/x11-misc/rofi/metadata.xml +++ b/x11-misc/rofi/metadata.xml @@ -1,17 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>jer@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -<use> - <flag name="windowmode">Enable normal window mode</flag> -</use> -<upstream> - <remote-id type="github">DaveDavenport/rofi</remote-id> -</upstream> + <maintainer type="person" proxied="yes"> + <email>petrus.zy.07@gmail.com</email> + <name>Petrus Zhao</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person"> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> + </maintainer> + <use> + <flag name="drun">Enable desktop file run dialog</flag> + <flag name="windowmode">Enable normal window mode</flag> + </use> + <upstream> + <remote-id type="github">davatorium/rofi</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/rofi/rofi-1.5.4-r1.ebuild b/x11-misc/rofi/rofi-1.5.4-r1.ebuild deleted file mode 100644 index 6d0d5474b2bf..000000000000 --- a/x11-misc/rofi/rofi-1.5.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="test windowmode" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib:2 - gnome-base/librsvg:2 - media-libs/freetype - x11-libs/cairo[X,xcb(+)] - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libxcb - x11-libs/libxkbcommon[X] - x11-libs/pango[X] - x11-libs/startup-notification - x11-libs/xcb-util - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - test? ( >=dev-libs/check-0.11 ) -" -PATCHES=( - "${FILESDIR}"/${PN}-0.15.12-Werror.patch - "${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export CC - - econf \ - $(use_enable test check) \ - $(use_enable windowmode) -} diff --git a/x11-misc/rofi/rofi-1.7.5.ebuild b/x11-misc/rofi/rofi-1.7.5.ebuild new file mode 100644 index 000000000000..69974bf5e0e4 --- /dev/null +++ b/x11-misc/rofi/rofi-1.7.5.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs xdg-utils + +DESCRIPTION="A window switcher, run dialog and dmenu replacement" +HOMEPAGE="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" +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() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/881281 + # fixed upstream in git next, remove on next version bump + filter-lto + + # Doesn't work with reflex, bug #887049 + export LEX=flex + + # Requires bison, see https://bugs.gentoo.org/894634. + unset YACC + + tc-export CC + + local myeconfargs=( + $(use_enable drun) + $(use_enable test check) + $(use_enable windowmode) + ) + econf "${myeconfargs[@]}" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/rofi/rofi-9999.ebuild b/x11-misc/rofi/rofi-9999.ebuild new file mode 100644 index 000000000000..aa90b0c02f84 --- /dev/null +++ b/x11-misc/rofi/rofi-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs xdg-utils + +DESCRIPTION="A window switcher, run dialog and dmenu replacement" +HOMEPAGE="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" +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 + + # Requires bison, see https://bugs.gentoo.org/894634. + unset YACC + + tc-export CC + + local myeconfargs=( + $(use_enable drun) + $(use_enable test check) + $(use_enable windowmode) + ) + econf "${myeconfargs[@]}" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild deleted file mode 100644 index 81f8f9cf847d..000000000000 --- a/x11-misc/rofi/rofi-99999.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 toolchain-funcs - -DESCRIPTION="A window switcher, run dialog and dmenu replacement" -HOMEPAGE="https://github.com/davatorium/rofi" -EGIT_REPO_URI="https://github.com/davatorium/rofi" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="test windowmode" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib:2 - gnome-base/librsvg:2 - media-libs/freetype - x11-libs/cairo[X,xcb(+)] - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libxcb - x11-libs/libxkbcommon[X] - x11-libs/pango[X] - x11-libs/startup-notification - x11-libs/xcb-util - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - test? ( >=dev-libs/check-0.11 ) -" -PATCHES=( - "${FILESDIR}"/${PN}-0.15.12-Werror.patch - "${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export CC - - econf \ - $(use_enable test check) \ - $(use_enable windowmode) -} diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch new file mode 100644 index 000000000000..4527f8710f83 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch @@ -0,0 +1,11 @@ +--- a/configure.in ++++ b/configure.in +@@ -52,7 +52,7 @@ + AC_HEADER_STDC + AC_PATH_XTRA + +-if test "x${ac_cv_have_x:0:10}" != "xhave_x=yes"; then ++if test "x$have_x" != "xyes"; then + AC_MSG_ERROR([X11 is missing but required.]) + fi + diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch new file mode 100644 index 000000000000..c92f1162dd37 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-c++11-narrowing.patch @@ -0,0 +1,22 @@ +--- rss-glx_0.9.1/src/hyperspace.cpp 2009-05-16 23:41:52.000000000 +0100 ++++ rss-glx_0.9.1/src/hyperspace.cpp 2021-01-22 22:54:20.297572792 +0000 +@@ -376,7 +376,7 @@ + double flarepos[3] = {0.0f, 2.0f, 0.0f}; + glBindTexture(GL_TEXTURE_2D, flaretex[0]); + sunStar->draw(camPos); +- float diff[3] = {flarepos[0] - camPos[0], flarepos[1] - camPos[1], flarepos[2] - camPos[2]}; ++ float diff[3] = {(float)flarepos[0] - camPos[0], (float)flarepos[1] - camPos[1], (float)flarepos[2] - camPos[2]}; + float alpha = 0.5f - 0.005f * sqrtf(diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2]); + if(alpha > 0.0f) + flare(flarepos, 1.0f, 1.0f, 1.0f, alpha); +--- rss-glx_0.9.1/src/flare.cpp 2009-04-21 17:54:42.000000000 +0100 ++++ rss-glx_0.9.1/src/flare.cpp 2021-01-22 22:54:57.808305771 +0000 +@@ -193,7 +193,7 @@ + &winx, &winy, &winz); + x = (float(winx) / float(xsize)) * aspectRatio; + y = float(winy) / float(ysize); +- float diff[3] = {pos[0] - camPos[0], pos[1] - camPos[1], pos[2] - camPos[2]}; ++ float diff[3] = {(float)pos[0] - camPos[0], (float)pos[1] - camPos[1], (float)pos[2] - camPos[2]}; + if(diff[0] * billboardMat[8] + diff[1] * billboardMat[9] + diff[2] * billboardMat[10] > 0.0f) + return; + diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-hang.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-hang.patch new file mode 100644 index 000000000000..60f2b326ec43 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-hang.patch @@ -0,0 +1,14 @@ +Ensure a signalled process exits even if the GL driver hangs. + +https://bugs.gentoo.org/478074 + +--- a/src/driver.c ++++ b/src/driver.c +@@ -397,6 +397,7 @@ + void signalHandler (int sig) + { + signalled = 1; ++ alarm(3); /* Self-destruct if something goes wrong */ + } + + int main (int argc, char *argv[]) diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-macro-if-scope.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-macro-if-scope.patch new file mode 100644 index 000000000000..5044aae31918 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-macro-if-scope.patch @@ -0,0 +1,29 @@ +Fix multistatement macro partially guarded by if + +The code still works correctly by chance, but it performs redundant +calls to BZ2_bzBuffToBuffDecompress() and it's a horrible mess. + +--- a/src/matrixview.c ++++ b/src/matrixview.c +@@ -248,8 +248,9 @@ void loadNextImage () + GetExceptionInfo (&exception); + #endif + +- if (!pics) ++ if (!pics) { + LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size) ++ } + + if ((text_x != 90) || (text_y != 70)) { + if (!pic) +@@ -279,8 +280,9 @@ void loadNextImage () + DestroyImage (image); + DestroyImage (scaled_image); + } else { +- if (!pics) ++ if (!pics) { + LOAD_TEXTURE (pics, cpics, cpics_compressedsize, cpics_size) ++ } + + pic = (unsigned char *)(pics + ((random () & 15) * (text_x * text_y))); + } diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch new file mode 100644 index 000000000000..cb9f5e9a500c --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch @@ -0,0 +1,27 @@ +--- a/src/matrixview.c ++++ b/src/matrixview.c +@@ -537,7 +537,12 @@ void load_texture () + { + long a; + ++#ifdef HAVE_LIBBZ2 + LOAD_TEXTURE (font, cfont, cfont_compressedsize, cfont_size) ++#else ++ font = (unsigned char*) malloc (cfont_size); ++ memcpy (font, cfont, cfont_size); ++#endif + + for (a = 0; a < 131072; a++) { + if ((a >> 9) & 2) +@@ -579,7 +584,11 @@ void ourBuildTextures () + exit (-1); + } + ++#ifdef HAVE_LIBBZ2 + FREE_TEXTURE (font) ++#else ++ free (font); ++#endif + + glBindTexture (GL_TEXTURE_2D, 3); + diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch new file mode 100644 index 000000000000..6a6e286f873c --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch @@ -0,0 +1,10 @@ +--- a/src/Implicit/impSurface.h ++++ b/src/Implicit/impSurface.h +@@ -25,6 +25,7 @@ + #ifdef WIN32 + #include <windows.h> + #endif ++#include <cstddef> + #include <vector> + #include <GL/gl.h> + diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-param-bound-mismatch.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-param-bound-mismatch.patch new file mode 100644 index 000000000000..883dede1c8d4 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-param-bound-mismatch.patch @@ -0,0 +1,14 @@ +Fix mismatched array bounds for the parameters of function +rsVec_cross()'s declaration and definition. + +--- a/src/rsMath.c ++++ b/src/rsMath.c +@@ -43,7 +43,7 @@ float rsVec_normalize (float *v) + return length; + } + +-void rsVec_cross (float *v, float vec1[4], float vec2[4]) ++void rsVec_cross (float *v, float vec1[3], float vec2[3]) + { + v[0] = vec1[1] * vec2[2] - vec2[1] * vec1[2]; + v[1] = vec1[2] * vec2[0] - vec2[2] * vec1[0]; diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-strict-aliasing.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-strict-aliasing.patch new file mode 100644 index 000000000000..e95b1f6a1a7d --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-strict-aliasing.patch @@ -0,0 +1,36 @@ +Fix strict aliasing violation in FMotion.cpp + +Bug: https://bugs.gentoo.org/928251 + +--- a/src/FMotion.cpp ++++ b/src/FMotion.cpp +@@ -22,6 +22,7 @@ + */ + + #include <stdio.h> ++#include <string.h> + #include <cmath> + + // In case cmath doesn't pull in all the usual suspects from math.h +@@ -54,15 +55,19 @@ + #define FLOATTOINTCONST2 (((65536.0*16))) + inline int f2int2 (float f) + { ++ int i; + f += FLOATTOINTCONST2; +- return ((*((int *)(void *)&f)) & 0x007fffff) - 0x00400000; ++ memcpy(&i, &f, sizeof(i)); ++ return (i & 0x007fffff) - 0x00400000; + } + + #define FLOATTOINTCONST (((1.5*65536*256))) + inline int f2int (float f) + { ++ int i; + f += FLOATTOINTCONST; +- return ((*((int *)(void *)&f)) & 0x007fffff) - 0x00400000; ++ memcpy(&i, &f, sizeof(i)); ++ return (i & 0x007fffff) - 0x00400000; + } + + #define Float2Int(f) (f2int(f)) diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-variable-mismatch.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-variable-mismatch.patch new file mode 100644 index 000000000000..19da515feff9 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-variable-mismatch.patch @@ -0,0 +1,192 @@ +Subject: [PATCH] Fix variable type mismatch in hyperspace +From: Alexander Miller <alex.miller@gmx.de> +Date: Sun, 31 Mar 2024 2024-03-31 03:08:04 +0200 + +Some source files of hyperspace (flare.cpp, goo.cpp, starBurst.cpp) +were referring to a variable "extern float frameTime" which doesn't +exist in hyperspace (it's only a parameter of hack_draw() nowadays). + +It got mixed up with the driver.c variable "int frameTime". + +Remove the mismatched declaration from the 3 files and pass the value +from hack_draw() to the functions using it by adding a new parameter. +Also make frameTime (and most other variables) in driver.c static. + +Bug: https://bugs.gentoo.org/928251 +Signed-off-by: Alexander Miller <alex.miller@gmx.de> +--- a/src/driver.c ++++ b/src/driver.c +@@ -49,24 +49,24 @@ + + #include "vroot.h" + +-xstuff_t *XStuff; ++static xstuff_t *XStuff; + + extern const char *hack_name; + + /* + * display parameters + */ +-int rootWindow = False; ++static int rootWindow = False; + int glewInitialized = False; + #ifdef HAVE_GLEW +-int frameTime = 10000; +-int vsync = 1; ++static int frameTime = 10000; ++static int vsync = 1; + #else +-int frameTime = 33333; +-int vsync = 0; ++static int frameTime = 33333; ++static int vsync = 0; + #endif +-int idleOnDPMS = 1; +-int signalled = 0; ++static int idleOnDPMS = 1; ++static volatile int signalled = 0; + + void createWindow (int argc, char **argv) + { +--- a/src/flare.cpp ++++ b/src/flare.cpp +@@ -45,7 +45,6 @@ extern double modelMat[16]; + extern double projMat[16]; + extern int viewport[4]; + // Calculated in main draw routine each frame +-extern float frameTime; + extern float camPos[3]; + + +@@ -182,7 +181,7 @@ void initFlares(){ + // Draw a flare at a specified (x,y) location on the screen + // Screen corners are at (0,0) and (1,1) + // alpha = 0.0 for lowest intensity; alpha = 1.0 for highest intensity +-void flare(double *pos, float red, float green, float blue, float alpha){ ++void flare(double *pos, float red, float green, float blue, float alpha, float frameTime){ + double winx, winy, winz; // in screen coordinates + float x, y, dx, dy; + float fadewidth, temp; +--- a/src/flare.h ++++ b/src/flare.h +@@ -36,7 +36,7 @@ void initFlares(); + // Draw a flare at a specified (x,y) location on the screen + // Screen corners are at (0,0) and (1,1) + // alpha = 0.0 for lowest intensity; alpha = 1.0 for highest intensity +-void flare(double *pos, float red, float green, float blue, float alpha); ++void flare(double *pos, float red, float green, float blue, float alpha, float frameTime); + + + #endif // FLARE_H +--- a/src/goo.cpp ++++ b/src/goo.cpp +@@ -25,9 +25,7 @@ + #include "goo.h" + + +-extern float frameTime, simulationTime; + extern float shiftx, shiftz; +-extern float dFov; + + + goo::goo(int res, float rad, float (*func)(float* position)){ +--- a/src/hyperspace.cpp ++++ b/src/hyperspace.cpp +@@ -340,10 +340,10 @@ void hack_draw (xstuff_t * XStuff, doubl + } + #ifdef HAVE_GLEW + if (dShaders) +- theStarBurst->draw(lerp); ++ theStarBurst->draw(frameTime, lerp); + else + #endif +- theStarBurst->draw(); ++ theStarBurst->draw(frameTime); + + // draw tunnel + theTunnel->make(frameTime); +@@ -379,7 +379,7 @@ void hack_draw (xstuff_t * XStuff, doubl + float diff[3] = {(float)flarepos[0] - camPos[0], (float)flarepos[1] - camPos[1], (float)flarepos[2] - camPos[2]}; + float alpha = 0.5f - 0.005f * sqrtf(diff[0] * diff[0] + diff[1] * diff[1] + diff[2] * diff[2]); + if(alpha > 0.0f) +- flare(flarepos, 1.0f, 1.0f, 1.0f, alpha); ++ flare(flarepos, 1.0f, 1.0f, 1.0f, alpha, frameTime); + glEnable(GL_FOG); + } + +--- a/src/starBurst.cpp ++++ b/src/starBurst.cpp +@@ -38,7 +38,6 @@ + + extern int xsize, ysize; + extern float aspectRatio; +-extern float frameTime; + extern float camPos[3]; + extern int numAnimTexFrames; + extern wavyNormalCubeMaps* theWNCM; +@@ -136,7 +135,7 @@ void starBurst::restart(float* position) + } + + +-void starBurst::drawStars(){ ++void starBurst::drawStars(float frameTime){ + int i; + float distance; + +@@ -158,8 +157,8 @@ void starBurst::drawStars(){ + } + + +-void starBurst::draw(){ +- drawStars(); ++void starBurst::draw(float frameTime){ ++ drawStars(frameTime); + + size += frameTime * 0.5f; + if(size >= 3.0f) +@@ -172,7 +171,7 @@ void starBurst::draw(float frameTime){ + p[0] = pos[0]; + p[1] = pos[1]; + p[2] = pos[2]; +- flare(p, 1.0f, 1.0f, 1.0f, brightness); ++ flare(p, 1.0f, 1.0f, 1.0f, brightness, frameTime); + } + + glMatrixMode(GL_MODELVIEW); +@@ -201,8 +200,8 @@ void starBurst::draw(){ + + + #ifdef HAVE_GLEW +-void starBurst::draw(float lerp){ +- drawStars(); ++void starBurst::draw(float frameTime, float lerp){ ++ drawStars(frameTime); + + size += frameTime * 0.5f; + if(size >= 3.0f) +@@ -215,7 +214,7 @@ void starBurst::draw(float frameTime, fl + p[0] = pos[0]; + p[1] = pos[1]; + p[2] = pos[2]; +- flare(p, 1.0f, 1.0f, 1.0f, brightness); ++ flare(p, 1.0f, 1.0f, 1.0f, brightness, frameTime); + } + + glMatrixMode(GL_MODELVIEW); +--- a/src/starBurst.h ++++ b/src/starBurst.h +@@ -43,10 +43,10 @@ public: + starBurst(); + ~starBurst(); + void restart(float* position); +- void drawStars(); +- void draw(); // draw regular ++ void drawStars(float frameTime); ++ void draw(float frameTime); // draw regular + #ifdef HAVE_GLEW +- void draw(float lerp); // draw with shaders ++ void draw(float frameTime, float lerp); // draw with shaders + #endif + }; + diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml index bb438a9d8a3c..d6efc7f90d1d 100644 --- a/x11-misc/rss-glx/metadata.xml +++ b/x11-misc/rss-glx/metadata.xml @@ -1,9 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person" proxied="yes"> + <email>alex.miller@gmx.de</email> + <name>Alexander Miller</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="quesoglc">Enable support for OpenGL Character Renderer</flag> diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild index 2faf1cb8c311..951fc14b7ddb 100644 --- a/x11-misc/rss-glx/rss-glx-0.9.1-r1.ebuild +++ b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils multilib +EAPI=7 + +inherit autotools MY_P=${PN}_${PV} DESCRIPTION="Really Slick OpenGL Screensavers for XScreenSaver" HOMEPAGE="http://rss-glx.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -24,21 +25,25 @@ RDEPEND=" >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 ) - quesoglc? ( media-libs/quesoglc ) -" + quesoglc? ( media-libs/quesoglc )" DEPEND=" ${RDEPEND} - x11-base/xorg-proto + x11-base/xorg-proto" +BDEPEND=" virtual/pkgconfig - sys-apps/sed -" + bzip2? ( app-arch/bzip2 )" + +S="${WORKDIR}/${MY_P}" -DOCS="ChangeLog README*" -S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}"/${P}-quesoglc.patch "${FILESDIR}"/${P}-asneeded.patch "${FILESDIR}"/${P}-imagemagick-7.patch + "${FILESDIR}"/${P}-c++11-narrowing.patch + "${FILESDIR}"/${P}-hang.patch + "${FILESDIR}"/${P}-matrixview-copy-font.patch + "${FILESDIR}"/${P}-missing-include.patch + "${FILESDIR}"/${P}-bashism.patch ) src_prepare() { @@ -49,24 +54,31 @@ src_prepare() { -e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \ -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ configure.in || die + mv configure.{in,ac} || die eautoreconf } src_configure() { econf \ + --disable-static \ + --enable-shared \ $(use_enable bzip2) \ $(use_enable openal sound) \ $(use_with quesoglc) \ - --bindir=/usr/$(get_libdir)/misc/xscreensaver \ - --enable-shared \ - --with-configdir=/usr/share/xscreensaver/config + --bindir="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver \ + --with-configdir="${EPREFIX}"/usr/share/xscreensaver/config +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { - local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver" + local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver - if [ -f ${xssconf} ]; then + if [[ -f ${xssconf} ]]; then sed -e '/*programs:/a\ GL: \"Cyclone\" cyclone --root \\n\\\ GL: \"Euphoria\" euphoria --root \\n\\\ @@ -81,8 +93,8 @@ pkg_postinst() { GL: \"Skyrocket\" skyrocket --root \\n\\\ GL: \"Solarwinds\" solarwinds --root \\n\\\ GL: \"Colorfire\" colorfire --root \\n\\\ - GL: \"Hufos Smoke\" hufo_smoke --root \\n\\\ - GL: \"Hufos Tunnel\" hufo_tunnel --root \\n\\\ + GL: \"Hufo\x27s Smoke\" hufo_smoke --root \\n\\\ + GL: \"Hufo\x27s Tunnel\" hufo_tunnel --root \\n\\\ GL: \"Sundancer2\" sundancer2 --root \\n\\\ GL: \"BioF\" biof --root \\n\\\ GL: \"BusySpheres\" busyspheres --root \\n\\\ @@ -91,14 +103,14 @@ pkg_postinst() { GL: \"Lorenz\" lorenz --root \\n\\\ GL: \"Drempels\" drempels --root \\n\\\ GL: \"Feedback\" feedback --root \\n\\' \ - -i ${xssconf} || die + -i "${xssconf}" || die fi } pkg_postrm() { - local xssconf="${ROOT}usr/share/X11/app-defaults/XScreenSaver" + local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver - if [ -f ${xssconf} ]; then + if [[ -f ${xssconf} ]]; then sed \ -e '/\"Cyclone\" cyclone/d' \ -e '/\"Euphoria\" euphoria/d' \ @@ -113,8 +125,8 @@ pkg_postrm() { -e '/\"Skyrocket\" skyrocket/d' \ -e '/\"Solarwinds\" solarwinds/d' \ -e '/\"Colorfire\" colorfire/d' \ - -e '/\"Hufos Smoke\" hufo_smoke/d' \ - -e '/\"Hufos Tunnel\" hufo_tunnel/d' \ + -e '/\"Hufo.*Smoke\" hufo_smoke/d' \ + -e '/\"Hufo.*Tunnel\" hufo_tunnel/d' \ -e '/\"Sundancer2\" sundancer2/d' \ -e '/\"BioF\" biof/d' \ -e '/\"BusySpheres\" busyspheres/d' \ @@ -123,6 +135,6 @@ pkg_postrm() { -e '/\"Lorenz\" lorenz/d' \ -e '/\"Drempels\" drempels/d' \ -e '/\"Feedback\" feedback/d' \ - -i ${xssconf} || die + -i "${xssconf}" || die fi } diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r4.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r4.ebuild new file mode 100644 index 000000000000..86edaf46c925 --- /dev/null +++ b/x11-misc/rss-glx/rss-glx-0.9.1-r4.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P=${PN}_${PV} + +DESCRIPTION="Really Slick OpenGL Screensavers for XScreenSaver" +HOMEPAGE="https://rss-glx.sourceforge.net" +SRC_URI="https://sourceforge.net/projects/rss-glx/files/rss-glx/${PV}/${PN}_${PV}.tar.bz2/download -> ${PN}_${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+bzip2 openal quesoglc" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + >=media-libs/glew-1.5.1:= + media-libs/mesa[X(+)] + >=media-gfx/imagemagick-6.4:= + >=x11-misc/xscreensaver-5.08-r2 + bzip2? ( app-arch/bzip2 ) + openal? ( >=media-libs/freealut-1.1.0-r1 ) + quesoglc? ( media-libs/quesoglc ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig + bzip2? ( app-arch/bzip2 ) +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${P}-quesoglc.patch + "${FILESDIR}"/${P}-asneeded.patch + "${FILESDIR}"/${P}-imagemagick-7.patch + "${FILESDIR}"/${P}-c++11-narrowing.patch + "${FILESDIR}"/${P}-hang.patch + "${FILESDIR}"/${P}-matrixview-copy-font.patch + "${FILESDIR}"/${P}-missing-include.patch + "${FILESDIR}"/${P}-bashism.patch + "${FILESDIR}"/${P}-strict-aliasing.patch + "${FILESDIR}"/${P}-variable-mismatch.patch + "${FILESDIR}"/${P}-macro-if-scope.patch + "${FILESDIR}"/${P}-param-bound-mismatch.patch +) + +src_prepare() { + default + + sed -i \ + -e '/CFLAGS=/s:-O2:${CFLAGS}:' \ + -e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ + configure.in || die + mv configure.{in,ac} || die + + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + --enable-shared \ + $(use_enable bzip2) \ + $(use_enable openal sound) \ + $(use_with quesoglc) \ + --bindir="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver \ + --with-configdir="${EPREFIX}"/usr/share/xscreensaver/config +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver + + if [[ -f ${xssconf} ]]; then + sed -e '/*programs:/a\ + GL: \"Cyclone\" cyclone --root \\n\\\ + GL: \"Euphoria\" euphoria --root \\n\\\ + GL: \"Fieldlines\" fieldlines --root \\n\\\ + GL: \"Flocks\" flocks --root \\n\\\ + GL: \"Flux\" flux --root \\n\\\ + GL: \"Helios\" helios --root \\n\\\ + GL: \"Hyperspace\" hyperspace --root \\n\\\ + GL: \"Lattice\" lattice --root \\n\\\ + GL: \"Plasma\" plasma --root \\n\\\ + GL: \"Pixelcity\" pixelcity --root \\n\\\ + GL: \"Skyrocket\" skyrocket --root \\n\\\ + GL: \"Solarwinds\" solarwinds --root \\n\\\ + GL: \"Colorfire\" colorfire --root \\n\\\ + GL: \"Hufo\x27s Smoke\" hufo_smoke --root \\n\\\ + GL: \"Hufo\x27s Tunnel\" hufo_tunnel --root \\n\\\ + GL: \"Sundancer2\" sundancer2 --root \\n\\\ + GL: \"BioF\" biof --root \\n\\\ + GL: \"BusySpheres\" busyspheres --root \\n\\\ + GL: \"SpirographX\" spirographx --root \\n\\\ + GL: \"MatrixView\" matrixview --root \\n\\\ + GL: \"Lorenz\" lorenz --root \\n\\\ + GL: \"Drempels\" drempels --root \\n\\\ + GL: \"Feedback\" feedback --root \\n\\' \ + -i "${xssconf}" || die + fi +} + +pkg_postrm() { + local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver + + if [[ -f ${xssconf} ]]; then + sed \ + -e '/\"Cyclone\" cyclone/d' \ + -e '/\"Euphoria\" euphoria/d' \ + -e '/\"Fieldlines\" fieldlines/d' \ + -e '/\"Flocks\" flocks/d' \ + -e '/\"Flux\" flux/d' \ + -e '/\"Helios\" helios/d' \ + -e '/\"Hyperspace\" hyperspace/d' \ + -e '/\"Lattice\" lattice/d' \ + -e '/\"Plasma\" plasma/d' \ + -e '/\"Pixelcity\" pixelcity/d' \ + -e '/\"Skyrocket\" skyrocket/d' \ + -e '/\"Solarwinds\" solarwinds/d' \ + -e '/\"Colorfire\" colorfire/d' \ + -e '/\"Hufo.*Smoke\" hufo_smoke/d' \ + -e '/\"Hufo.*Tunnel\" hufo_tunnel/d' \ + -e '/\"Sundancer2\" sundancer2/d' \ + -e '/\"BioF\" biof/d' \ + -e '/\"BusySpheres\" busyspheres/d' \ + -e '/\"SpirographX\" spirographx/d' \ + -e '/\"MatrixView\" matrixview/d' \ + -e '/\"Lorenz\" lorenz/d' \ + -e '/\"Drempels\" drempels/d' \ + -e '/\"Feedback\" feedback/d' \ + -i "${xssconf}" || die + fi +} diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest index 9aa91080cf18..4fcd5e9d7940 100644 --- a/x11-misc/safeeyes/Manifest +++ b/x11-misc/safeeyes/Manifest @@ -1,3 +1 @@ -DIST safeeyes-2.0.8.1.tar.gz 314379 BLAKE2B 9a54dfcda3027ecb12261b5e90f5526c4011ddc07bcaa8f80357b60738a5a03673136c5597e0f1414894b548d10a52da13f7cac4bd418c0534c341bcf3b5397a SHA512 06b53d6baad479e4143ae65cc37d01367ff73875083817511903692f493f01f5704a1f37ac95c4ec4aaa66040ec0aa1424e6a76fbea0676584fd531c1547b0a7 -DIST safeeyes-2.0.8.tar.gz 304438 BLAKE2B 5f6b36ae0d214e33035d1a3f7856c2eacd8407b2586365f7c914d69a5744a4d1488f5bcbc1d1c7112b9f237ccdbfa7839c426048e88d2e19e56cf550da33ecfa SHA512 6e7669d9ee6b2167c23307108544b3a3b4a4161fe819569fc7920a7e24af94701b053a2e147f83ce0300a0112e2a66d500055fc722eba89208b6c0cd86b49f38 -DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2 +DIST safeeyes-2.1.6.tar.gz 286359 BLAKE2B a5e4b4d680d455f2ae9494705f1e4508341802f4826b2d11f5407eed4074f0eab45066a3741745dd164b47e26a2dbf2a393945bffef0f747cbebd5f87b3b1961 SHA512 6476284ed1d8cdde77f10b3fe962a5d9d5ead944b0418f797e375cc67affa6807d858279cf4a1189585b7688dbe983fc6b90c917e0e55a2a11ebfdc56b44ca93 diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch b/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch new file mode 100644 index 000000000000..93430da89b88 --- /dev/null +++ b/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch @@ -0,0 +1,34 @@ +From 043d9c5018431b3b41cc2bcfacdaaa7f0db1563c Mon Sep 17 00:00:00 2001 +From: Alyssa Rosenzweig <alyssa@rosenzweig.io> +Date: Thu, 9 Nov 2023 12:14:13 -0400 +Subject: [PATCH] Fix with python3.12 + +imp is deprecated in 3.4 and removed in 3.12. this caused safe eyes to +break on upgrading to fedora 39 + +Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> +--- + safeeyes/utility.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/safeeyes/utility.py b/safeeyes/utility.py +index e145d4d..3976140 100644 +--- a/safeeyes/utility.py ++++ b/safeeyes/utility.py +@@ -21,7 +21,6 @@ + """ + + import errno +-import imp + import inspect + import importlib + import json +@@ -355,7 +354,7 @@ def module_exist(module): + Check wther the given Python module exists or not. + """ + try: +- imp.find_module(module) ++ importlib.util.find_spec(module) + return True + except ImportError: + return False diff --git a/x11-misc/safeeyes/metadata.xml b/x11-misc/safeeyes/metadata.xml index 8ff45602e151..928829cc8987 100644 --- a/x11-misc/safeeyes/metadata.xml +++ b/x11-misc/safeeyes/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild index 583b24353a25..c6d102ef6476 100644 --- a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.1.6-r1.ebuild @@ -1,50 +1,42 @@ -# 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 -PYTHON_COMPAT=( python3_{6,7} ) -inherit gnome2-utils xdg distutils-r1 +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py +DISTUTILS_USE_PEP517=setuptools + +inherit xdg distutils-r1 pypi DESCRIPTION="Linux alternative to EyeLeo" HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~riscv ~x86" -CDEPEND="${PYTHON_DEPS}" -DEPEND="${CDEPEND} - >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}] - " -RDEPEND="${CDEPEND} - dev-libs/libappindicator:3 +RDEPEND=" + dev-libs/libayatana-appindicator 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_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild index 583b24353a25..307103b60daf 100644 --- a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.1.6-r2.ebuild @@ -1,50 +1,46 @@ -# 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 -PYTHON_COMPAT=( python3_{6,7} ) -inherit gnome2-utils xdg distutils-r1 +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py +DISTUTILS_USE_PEP517=setuptools + +inherit xdg distutils-r1 pypi DESCRIPTION="Linux alternative to EyeLeo" HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~riscv ~x86" -CDEPEND="${PYTHON_DEPS}" -DEPEND="${CDEPEND} - >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}] - " -RDEPEND="${CDEPEND} - dev-libs/libappindicator:3 +PATCHES=( + "${FILESDIR}"/${P}-py312.patch +) + +RDEPEND=" + dev-libs/libayatana-appindicator 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_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/x11-misc/safeeyes/safeeyes-2.1.6-r3.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r3.ebuild new file mode 100644 index 000000000000..7f1927eab085 --- /dev/null +++ b/x11-misc/safeeyes/safeeyes-2.1.6-r3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py +DISTUTILS_USE_PEP517=setuptools + +inherit xdg distutils-r1 pypi + +DESCRIPTION="Linux alternative to EyeLeo" +HOMEPAGE="https://github.com/slgobinath/SafeEyes" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-py312.patch +) + +RDEPEND=" + dev-libs/libayatana-appindicator + 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 + " + +python_install() { + distutils-r1_python_install + + # Workaround for https://bugs.gentoo.org/926816 + # Files were misplaced and also duplicate across Python slots. + local misplaced_usr="${D}/usr/lib/${EPYTHON}/site-packages/usr" + local i + for i in applications icons ; do + local source="${misplaced_usr}/share/${i}" + local target="${D}/usr/share/${i}" + if [[ ! -d "${target}" ]]; then + dodir /usr/share/ + mv "${source}" "${target}" || die + fi + done + rm -R "${misplaced_usr}" || die +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6.ebuild index 583b24353a25..5aca9341d36c 100644 --- a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.1.6.ebuild @@ -1,50 +1,43 @@ -# 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 -PYTHON_COMPAT=( python3_{6,7} ) -inherit gnome2-utils xdg distutils-r1 +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py +DISTUTILS_USE_PEP517=setuptools + +inherit xdg distutils-r1 pypi DESCRIPTION="Linux alternative to EyeLeo" HOMEPAGE="https://github.com/slgobinath/SafeEyes" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="" -CDEPEND="${PYTHON_DEPS}" -DEPEND="${CDEPEND} - >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}] - " -RDEPEND="${CDEPEND} - dev-libs/libappindicator:3 +RDEPEND=" + dev-libs/libayatana-appindicator 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_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/x11-misc/screen-message/Manifest b/x11-misc/screen-message/Manifest index 64f754605dd3..0cf545daa71c 100644 --- a/x11-misc/screen-message/Manifest +++ b/x11-misc/screen-message/Manifest @@ -1,2 +1,2 @@ -DIST screen-message_0.24.orig.tar.gz 348147 BLAKE2B f8973c1af5165fa21061c8202788061a78100c94325f9e3dcc9628ef0e02cef43017a58439cf1ebb49378b84182ca5a3b6650306e38f691c87e0ced3992f1173 SHA512 0553c43fc4357c756d2a6ce6dab7e8d3fa880faf90a4bee68b706a0cd8b2a0b92a2e77bd3930e473deaeca75afadcadd946cd3d5c9d116786a4bd0f5cee80506 -DIST screen-message_0.25.orig.tar.gz 348684 BLAKE2B 04d067b71b5d23862a8750a3f403938e2ec243bd25c79f601770b89f86ddcf066e05a3550c26be8479707d5571e67f187d5d556af6662682099f35e45704f1ba SHA512 30fb47fa0d0707c7219517df5384f559c4a56b5b259d2d1940b50e05834052142d97c8c776d9b22d52f2fe502b7bfe15ee5667f7d2aaa8dc3a29f5677560be41 +DIST screen-message-0.28.gh.tar.gz 264372 BLAKE2B 6df2e894fd3c4fde99d80844b3ee2e2dc51202f891f69fa5fc7c51770949fab68bac935da1e5661105952f1941ed65fc991f9ab27c0177ed56c6da25b934bb9f SHA512 6c993b0f77e4ed0a6c13b8afc4e194e0fbdaea5af0cd423b26343b10e1daf471926e007faad5b48b8af649f984abc0ccb2d1f6ead45d0f11be67b58e5bc7019c +DIST screen-message_0.26.orig.tar.gz 347704 BLAKE2B 5ba40db417fbb391aa3e3be44dc5cf78cdff4117df4d22f5d790906a90f7a5a338ae7c20fb31bd60fdffd4ee6d332a5fb87643a4906a2b59ebadc3f4237e41b3 SHA512 3364c4b2cedbadc40c0f885b2810dfbb3b57a067288b8c5bacc62f76c68a5293a4d5215fc31717310526e0ae3fb8b791ceeacf958587dbeef14debfe9bd346eb diff --git a/x11-misc/screen-message/metadata.xml b/x11-misc/screen-message/metadata.xml index 6d2298876faa..6eb25c3bed2d 100644 --- a/x11-misc/screen-message/metadata.xml +++ b/x11-misc/screen-message/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> <name>Sebastian Pipping</name> </maintainer> + <upstream> + <remote-id type="github">nomeata/screen-message</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/screen-message/screen-message-0.25.ebuild b/x11-misc/screen-message/screen-message-0.25.ebuild deleted file mode 100644 index 2c0b46504706..000000000000 --- a/x11-misc/screen-message/screen-message-0.25.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Display a multi-line message large, fullscreen, black on white" -HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message" -SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="x11-libs/gtk+:3 - x11-libs/cairo - >=x11-libs/pango-1.16" -RDEPEND="${DEPEND}" - -src_install() { - default - - dodir /usr/bin - mv "${D}"/usr/{games,bin}/sm || die - sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die -} diff --git a/x11-misc/screen-message/screen-message-0.24.ebuild b/x11-misc/screen-message/screen-message-0.26.ebuild index 9ddb6ea960fd..a68ba782d880 100644 --- a/x11-misc/screen-message/screen-message-0.24.ebuild +++ b/x11-misc/screen-message/screen-message-0.26.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="7" + +inherit xdg DESCRIPTION="Display a multi-line message large, fullscreen, black on white" HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message" @@ -20,7 +22,10 @@ RDEPEND="${DEPEND}" src_install() { default + # It's not a game so let's make it *not* end up /usr/games dodir /usr/bin mv "${D}"/usr/{games,bin}/sm || die - sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die + rmdir "${D}"/usr/games || die + sed 's|^Exec=/usr/games/sm|Exec=/usr/bin/sm|' \ + -i "${D}"/usr/share/applications/sm.desktop || die } diff --git a/x11-misc/screen-message/screen-message-0.28.ebuild b/x11-misc/screen-message/screen-message-0.28.ebuild new file mode 100644 index 000000000000..ba37f9dd98a9 --- /dev/null +++ b/x11-misc/screen-message/screen-message-0.28.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools xdg + +DESCRIPTION="Display a multi-line message large, fullscreen, black on white" +HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message + https://github.com/nomeata/screen-message" +SRC_URI="https://github.com/nomeata/screen-message/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="x11-libs/gtk+:3 + x11-libs/cairo + >=x11-libs/pango-1.16" +RDEPEND="${DEPEND}" + +src_prepare() { + eapply_user + eautoreconf +} + +src_install() { + default + + # It's not a game so let's make it *not* end up in /usr/games + dodir /usr/bin + mv "${D}"/usr/{games,bin}/sm || die + rmdir "${D}"/usr/games || die + sed 's|^Exec=/usr/games/sm|Exec=/usr/bin/sm|' \ + -i "${D}"/usr/share/applications/sm.desktop || die +} diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest index 839bfe936bce..ed031be0fb24 100644 --- a/x11-misc/screengrab/Manifest +++ b/x11-misc/screengrab/Manifest @@ -1,3 +1,2 @@ -DIST screengrab-1.101.tar.xz 130248 BLAKE2B 0a81b80249322a8c6b4767b9bae70d43eaa41619927fdd799179d6dc9e15fe0cfb8ef50794890d9f9c84787bb88b447f84452b64f88e114aa3393466b1cf443c SHA512 f253c4015f9c9ae6b53bb4919c0301cc843b0d6f6ab0b8ad88befbd397004aa4838d5900d1af86ed348cbba45fa352ded5192d494bd738c2f2b314e9ad73fb13 -DIST screengrab-2.0.0.tar.xz 119296 BLAKE2B 0f3c55a78fb80569b4f42e63b9443018b7296c1b48ad4aa0af4270df19f939c44dbfc932731d6b16b0e15b6a735db333387e110ca221f88aab033ecb7b56cc96 SHA512 f08cd37489062d4b9c66278203b2fdd0298d1222e42e9240c5812779216289728f84a6567d7570ad3bf209834df4549acd9d31550c328f7785da6176b237d7e7 -DIST screengrab-2.0.1.tar.xz 123628 BLAKE2B 62cad8ccbf89c4cb3728311b6dd4883676a0be514f84c6f54633e7001a39470b7209b7416e42a19603cd1ad74661eea87d015cb0c70ed8ff3e181ecc25dbeb71 SHA512 f65d1aa4a36bf7e11e29bd1d1ad009f979e3c66a27204cd74c7ef7a54bde4027efdf030933cb81d2f9cb8b67715e868e1454a1faf7bbbb63cf162214bad8dc02 +DIST screengrab-2.6.0.tar.xz 337392 BLAKE2B 086490ef883ce1a317da00d7580f1b5162d6273f2a7caa286ccfb00ba3017631d2c58a127d8ca735d4d9f5947b46a8a5b0f6b315dba857153789a0f353846f6a SHA512 622bd9fa4548dbbd2b965f2a38446d6b6002786ff2154f9efe86a4970ac464174d1d7e34b8fdc61761f935c97bf4ac8bb2e8ffd166b859cddd3183bd76380b88 +DIST screengrab-2.7.0.tar.xz 341696 BLAKE2B ad45155caa4964577626d54a067d20935c7419e4a54b725077fb5d0db21b8a7b55c6caebedf6522c74cf8026487d203f8570f57f9f9f71ad11609175b901124c SHA512 0becd8972408a788b56affc9091cdc9ce1fe79160bba27ae29c5f1bf48ed0b73bafdabf3aeaac1eafe646aeaa4e162c0302b7ba1ee4f07785010e50a7d8131a1 diff --git a/x11-misc/screengrab/metadata.xml b/x11-misc/screengrab/metadata.xml index cd05383b1896..bedf06d3eb67 100644 --- a/x11-misc/screengrab/metadata.xml +++ b/x11-misc/screengrab/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> </maintainer> <upstream> <maintainer status="active"> diff --git a/x11-misc/screengrab/screengrab-1.101.ebuild b/x11-misc/screengrab/screengrab-1.101.ebuild deleted file mode 100644 index 6070e93aa8ec..000000000000 --- a/x11-misc/screengrab/screengrab-1.101.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Qt application for getting screenshots" -HOMEPAGE="https://lxqt.github.io/" -SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="" - -BDEPEND="dev-qt/linguist-tools:5" -DEPEND=" - >=dev-libs/libqtxdg-3.3.1 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtnetwork:5 - kde-frameworks/kwindowsystem:5[X] - x11-libs/libxcb - x11-libs/libX11 -" -RDEPEND="${DEPEND}" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-misc/screengrab/screengrab-2.0.0.ebuild b/x11-misc/screengrab/screengrab-2.0.0.ebuild deleted file mode 100644 index b58f948c724b..000000000000 --- a/x11-misc/screengrab/screengrab-2.0.0.ebuild +++ /dev/null @@ -1,41 +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="Qt application for getting screenshots" -HOMEPAGE="https://lxqt.github.io/" -SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="" - -BDEPEND="dev-qt/linguist-tools:5" -DEPEND=" - >=dev-libs/libqtxdg-3.3.1 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtnetwork:5 - kde-frameworks/kwindowsystem:5[X] - x11-libs/libxcb - x11-libs/libX11 - x11-libs/libXfixes -" -RDEPEND="${DEPEND}" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-misc/screengrab/screengrab-2.0.1.ebuild b/x11-misc/screengrab/screengrab-2.6.0.ebuild index 37ef4c7ac246..480ce47768d4 100644 --- a/x11-misc/screengrab/screengrab-2.0.1.ebuild +++ b/x11-misc/screengrab/screengrab-2.6.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils @@ -11,22 +11,21 @@ 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 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" IUSE="" BDEPEND="dev-qt/linguist-tools:5" DEPEND=" - >=dev-libs/libqtxdg-3.5.0 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtnetwork:5 + >=dev-libs/libqtxdg-3.11.0 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtnetwork-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 kde-frameworks/kwindowsystem:5[X] - x11-libs/libxcb x11-libs/libX11 - x11-libs/libXfixes + x11-libs/libxcb:= " RDEPEND="${DEPEND}" diff --git a/x11-misc/screengrab/screengrab-2.7.0.ebuild b/x11-misc/screengrab/screengrab-2.7.0.ebuild new file mode 100644 index 000000000000..4603a5d4cf46 --- /dev/null +++ b/x11-misc/screengrab/screengrab-2.7.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI Screenshot Utility" +HOMEPAGE="https://lxqt.github.io/" +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 ~loong ~riscv x86" +IUSE="" + +BDEPEND="dev-qt/linguist-tools:5" +DEPEND=" + >=dev-libs/libqtxdg-3.12.0 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtnetwork-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + kde-frameworks/kwindowsystem:5[X] + x11-libs/libX11 + x11-libs/libxcb:= +" +RDEPEND="${DEPEND}" + +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/screenkey/Manifest b/x11-misc/screenkey/Manifest new file mode 100644 index 000000000000..98a2838dc2a5 --- /dev/null +++ b/x11-misc/screenkey/Manifest @@ -0,0 +1 @@ +DIST screenkey-1.5_p20230109.tar.bz2 77229 BLAKE2B 8b6d089bdecbbd0d9057ccad12d72321de5b9c6df60785398e15e9196b21fec2b88e27b2e068c53caf5c699ed7b7dcd3bacfbdf86d14b3c4c4a3b2125dfa66c7 SHA512 b6b5121c2b4f68cd8df409176e32019b0747da637c6baa7f45d6268c1605144d32cb099aa16a91748ae672d6386be2579af1bef167488bcdc5e1b452d39d2eee diff --git a/x11-misc/screenkey/metadata.xml b/x11-misc/screenkey/metadata.xml new file mode 100644 index 000000000000..3926bbb56384 --- /dev/null +++ b/x11-misc/screenkey/metadata.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <longdescription> + A screencast tool to display your keys, inspired by Screenflick. + Featuring: + several keyboard translation methods, + key composition/input method support, + configurable font/size/position, + highlighting of recent keystrokes, + improved backspace processing, + normal/Emacs/Mac caps modes, + multi-monitor support, + dynamic recording control, + switch for visible shift and modifier sequences only, + repeats compression, + countless bug fixes, + mouse buttons support. + </longdescription> + <upstream> + <bugs-to>https://gitlab.com/screenkey/screenkey/-/issues</bugs-to> + <remote-id type="gitlab">screenkey/screenkey</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/screenkey/screenkey-1.5_p20230109-r1.ebuild b/x11-misc/screenkey/screenkey-1.5_p20230109-r1.ebuild new file mode 100644 index 000000000000..379af07f4cf6 --- /dev/null +++ b/x11-misc/screenkey/screenkey-1.5_p20230109-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 xdg + +DESCRIPTION="A screencast tool to display your keys inspired by Screenflick" +HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/" + +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git" +else + if [[ "${PV}" == *_p20230109 ]] ; then + COMMIT=7bdba66574244061c6e1934c4f204d02d570f182 + SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2 + -> ${P}.tar.bz2" + S="${WORKDIR}/${PN}-${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" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="appindicator" +RESTRICT="test" + +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/libayatana-appindicator ) +" +BDEPEND=" + dev-python/Babel[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] +" + +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-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild new file mode 100644 index 000000000000..bbfbe5b4cae5 --- /dev/null +++ b/x11-misc/screenkey/screenkey-9999.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 xdg + +DESCRIPTION="A screencast tool to display your keys inspired by Screenflick" +HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/" + +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git" +else + SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 + -> ${P}.tar.bz2" + S="${WORKDIR}/${PN}-v${PV}" + + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="appindicator" +RESTRICT="test" + +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/libayatana-appindicator ) +" +BDEPEND=" + dev-python/Babel[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] +" + +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/sct/Manifest b/x11-misc/sct/Manifest index 774379125789..20601b429e43 100644 --- a/x11-misc/sct/Manifest +++ b/x11-misc/sct/Manifest @@ -1,2 +1 @@ -DIST sct-0.4.tar.gz 4560 BLAKE2B a7434499d43180a20e4345ad207cd7644dd7271f9d1a3929e797263f5580e9f7517a3cb86a65892b68a1619a29cc5bb846fa40e3e8c14f4f5a5a7ab65dfa5ca1 SHA512 7a556c2d26cb2389a3e38e74de992d3fac96b29c637e20d1307e0ea0985c1119a3d05f2108d338612b407f5b5f5362bd3e5582722878d7ae62c568bdc9f46e65 DIST sct-0.5.tar.gz 4802 BLAKE2B 2a7d522031f159b2a8d8d8b63603ff4094d6726d92ad7ac1675c8fbc4c716a8c8b1ae6fbc12d3fe5238552621ebbbc4416658ac89610d40010bf1560446fc55d SHA512 15f2013e3c6c56ff50078f1aa070b3388e07a780d14e5664542ea47e51e8eb84e937927467bf9ed74127a7382dea16c5ca94d255c8aeaaa696c9a81ca658f4a2 diff --git a/x11-misc/sct/metadata.xml b/x11-misc/sct/metadata.xml index 58c1077b82e4..115e9d64a669 100644 --- a/x11-misc/sct/metadata.xml +++ b/x11-misc/sct/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/sct/sct-0.4.ebuild b/x11-misc/sct/sct-0.4.ebuild deleted file mode 100644 index 757fc9bf534b..000000000000 --- a/x11-misc/sct/sct-0.4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Set color temperature of the screen" -HOMEPAGE="https://www.umaxx.net/" -SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" - -DEPEND=" - x11-libs/libXrandr" - -RDEPEND=" - ${DEPEND}" - -src_prepare() { - default - sed \ - -e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \ - -i Makefile || die -} - -src_install() { - dobin "${PN}" - doman "${PN}.1" - einstalldocs -} diff --git a/x11-misc/sct/sct-0.5.ebuild b/x11-misc/sct/sct-0.5-r1.ebuild index 615b8b643af7..34262ce5fd71 100644 --- a/x11-misc/sct/sct-0.5.ebuild +++ b/x11-misc/sct/sct-0.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Set color temperature of the screen" HOMEPAGE="https://www.umaxx.net/" @@ -9,7 +9,7 @@ SRC_URI="https://www.umaxx.net/dl/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" DEPEND=" x11-libs/libXrender diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 09a0d01520a9..8d6ee0946cd6 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1,2 +1,4 @@ -DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 +DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1 SHA512 30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 +DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144 SHA512 6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2 +DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0 SHA512 2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370caaaa70f458 diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch b/x11-misc/sddm/files/pam-1.4-substack.patch deleted file mode 100644 index b0467b268228..000000000000 --- a/x11-misc/sddm/files/pam-1.4-substack.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- sddm-0.18.1/services/sddm-autologin.pam.bak 2020-06-19 22:27:57.305580696 +0200 -+++ sddm-0.18.1/services/sddm-autologin.pam 2020-06-19 22:30:50.513583973 +0200 -@@ -1,6 +1,5 @@ - #%PAM-1.0 - auth required pam_env.so --auth required pam_tally.so file=/var/log/faillog onerr=succeed - auth required pam_shells.so - auth required pam_nologin.so - auth required pam_permit.so ---- sddm-0.18.1/services/sddm.pam.bak 2020-06-19 22:27:26.721580117 +0200 -+++ sddm-0.18.1/services/sddm.pam 2020-06-19 22:27:48.729580533 +0200 -@@ -1,15 +1,15 @@ - #%PAM-1.0 - --auth include system-login -+auth substack system-login - -auth optional pam_gnome_keyring.so - -auth optional pam_kwallet5.so - --account include system-login -+account substack system-login - --password include system-login -+password substack system-login - -password optional pam_gnome_keyring.so use_authtok - - session optional pam_keyinit.so force revoke --session include system-login -+session substack system-login - -session optional pam_gnome_keyring.so auto_start - -session optional pam_kwallet5.so auto_start
\ No newline at end of file diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch deleted file mode 100644 index fc450169792d..000000000000 --- a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -u CMakeLists.txt CMakeLists.txt ---- a/CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 -+++ b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 -@@ -35,22 +35,6 @@ - # Definitions - add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) - --# Default build type --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE Release) --endif() -- --# Handle build type --if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug) -- message(STATUS "Debug build") -- add_definitions(-DDEBUG) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") --else() -- message(STATUS "Release build") -- add_definitions(-DNDEBUG) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") --endif() -- - # Default absolute paths - if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR) - set(CMAKE_INSTALL_SYSCONFDIR "/etc") diff --git a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch deleted file mode 100644 index 64ea0648286a..000000000000 --- a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 -+++ b/data/scripts/Xsession 2016-08-28 14:53:07.157184480 +0200 -@@ -91,5 +91,5 @@ - if [ -z "$@" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - else -- exec $@ -+ exec ck-launch-session $@ - fi diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch deleted file mode 100644 index bbe2a272840c..000000000000 --- a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch +++ /dev/null @@ -1,20 +0,0 @@ -SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2 -has the same interface names as logind. - -This patch forces sddm to use legacy behaviour when consolekit2 is detected. - -Bug: https://bugs.gentoo.org/633920 -Bug: https://github.com/sddm/sddm/issues/903 -Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99 - ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -60,7 +60,7 @@ - - if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { - qDebug() << "Console kit interface found"; -- available = true; -+ available = false; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); - managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch deleted file mode 100644 index 41c813a06645..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 -+++ b/data/scripts/Xsession 2017-10-21 15:25:47.668886596 +0200 -@@ -50,6 +50,10 @@ - ;; - esac - -+# Make D-Bus and ConsoleKit start properly, see: -+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit} -+command="$@" -+ - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f $HOME/.xprofile ] && . $HOME/.xprofile - -@@ -94,8 +98,8 @@ - . "$USERXSESSION" - fi - --if [ -z "$*" ]; then -+if [ -z "$command" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - else -- exec $@ -+ exec $command - fi diff --git a/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch b/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch deleted file mode 100644 index 9d8f2b545a1e..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 300078995ae82495cf09a0646a07e0214f0ae030 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sat, 21 Jul 2018 22:41:29 +0200 -Subject: [PATCH] Change location of sddm.conf.d to DATAROOTDIR - -/usr/lib is not a location that should be hardcoded - depending on -distribution and architecture this can be different. So far, SDDM -does not use this path unless the above conditions happen to make -it coincide with the install location of its Qml modules. - -DATAROOTDIR is defined as: Read-only architecture-independent data. -This seems to be a better fit for a system SDDM default config dir. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8500c65..5150b7d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -184,7 +184,7 @@ set(WAYLAND_SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/wayland-session" - - set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") - set(CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d" CACHE PATH "Path of the sddm config directory") --set(SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory") -+set(SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory") - set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file") - set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file") - set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory") --- -2.18.0 - diff --git a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch deleted file mode 100644 index f4ce7ae7ad73..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001 -From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de> -Date: Thu, 9 May 2019 03:06:48 +0200 -Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159) - -This moves the supplemental group initialization step from -UserSession.cpp to the Backend system, so that the Pam Backend can -inject additional supplemental groups via modules like pam_group.so. - -pam_setcred(3) assumes that it operates on an already initialized -supplemental group list. However, PamBackend calls -pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start -PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call -must be issued to repeat the injection of PAM's supplemental groups. ---- - src/helper/Backend.cpp | 5 +++++ - src/helper/Backend.h | 3 +++ - src/helper/HelperApp.cpp | 4 ++++ - src/helper/HelperApp.h | 1 + - src/helper/UserSession.cpp | 13 ++++++++----- - src/helper/backend/PamBackend.cpp | 18 ++++++++++++++++++ - src/helper/backend/PamBackend.h | 2 ++ - 7 files changed, 41 insertions(+), 5 deletions(-) - -diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp -index d6bb4d0a..35ae2bdf 100644 ---- a/src/helper/Backend.cpp -+++ b/src/helper/Backend.cpp -@@ -29,6 +29,7 @@ - #include <QtCore/QProcessEnvironment> - - #include <pwd.h> -+#include <grp.h> - - namespace SDDM { - Backend::Backend(HelperApp* parent) -@@ -79,4 +80,8 @@ namespace SDDM { - bool Backend::closeSession() { - return true; - } -+ -+ bool Backend::setupSupplementalGroups(struct passwd *pw) { -+ return !initgroups(pw->pw_name, pw->pw_gid); -+ } - } -diff --git a/src/helper/Backend.h b/src/helper/Backend.h -index b790e001..3caf1592 100644 ---- a/src/helper/Backend.h -+++ b/src/helper/Backend.h -@@ -22,6 +22,7 @@ - #define BACKEND_H - - #include <QtCore/QObject> -+#include <pwd.h> - - namespace SDDM { - class HelperApp; -@@ -38,6 +39,8 @@ namespace SDDM { - void setAutologin(bool on = true); - void setGreeter(bool on = true); - -+ virtual bool setupSupplementalGroups(struct passwd *pw); -+ - public slots: - virtual bool start(const QString &user = QString()) = 0; - virtual bool authenticate() = 0; -diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp -index cad93bd8..d0891d75 100644 ---- a/src/helper/HelperApp.cpp -+++ b/src/helper/HelperApp.cpp -@@ -253,6 +253,10 @@ namespace SDDM { - return m_session; - } - -+ Backend *HelperApp::backend() { -+ return m_backend; -+ } -+ - const QString& HelperApp::user() const { - return m_user; - } -diff --git a/src/helper/HelperApp.h b/src/helper/HelperApp.h -index 3742df12..cb5959a7 100644 ---- a/src/helper/HelperApp.h -+++ b/src/helper/HelperApp.h -@@ -39,6 +39,7 @@ namespace SDDM { - virtual ~HelperApp(); - - UserSession *session(); -+ Backend *backend(); - const QString &user() const; - const QString &cookie() const; - -diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp -index f71fd358..62fd4d70 100644 ---- a/src/helper/UserSession.cpp -+++ b/src/helper/UserSession.cpp -@@ -19,6 +19,7 @@ - * - */ - -+#include "Backend.h" - #include "Configuration.h" - #include "UserSession.h" - #include "HelperApp.h" -@@ -129,7 +130,8 @@ namespace SDDM { - #endif - - // switch user -- const QByteArray username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit(); -+ HelperApp* app = qobject_cast<HelperApp*>(parent()); -+ const QByteArray username = app->user().toLocal8Bit(); - struct passwd pw; - struct passwd *rpw; - long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX); -@@ -146,12 +148,13 @@ namespace SDDM { - qCritical() << "getpwnam_r(" << username << ") failed with error: " << strerror(err); - exit(Auth::HELPER_OTHER_ERROR); - } -- if (setgid(pw.pw_gid) != 0) { -- qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username; -+ -+ if (!app->backend()->setupSupplementalGroups(&pw)) { -+ qCritical() << "failed to set up supplemental groups for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); - } -- if (initgroups(pw.pw_name, pw.pw_gid) != 0) { -- qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username; -+ if (setgid(pw.pw_gid) != 0) { -+ qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); - } - if (setuid(pw.pw_uid) != 0) { -diff --git a/src/helper/backend/PamBackend.cpp b/src/helper/backend/PamBackend.cpp -index f86d77d6..cccfa258 100644 ---- a/src/helper/backend/PamBackend.cpp -+++ b/src/helper/backend/PamBackend.cpp -@@ -289,6 +289,24 @@ namespace SDDM { - return QString::fromLocal8Bit((const char*) m_pam->getItem(PAM_USER)); - } - -+ bool PamBackend::setupSupplementalGroups(struct passwd *pw) { -+ if (!Backend::setupSupplementalGroups(pw)) -+ return false; -+ -+ // pam_setcred(3) may inject additional groups into the user's -+ // list of supplemental groups, and assumes that the user's -+ // supplemental groups have already been initialized before -+ // its invocation. Since pam_setcred was already called at the -+ // start of openSession, we need to repeat this step here as -+ // the user's groups have only just now been initialized. -+ -+ if (!m_pam->setCred(PAM_REINITIALIZE_CRED)) { -+ m_app->error(m_pam->errorString(), Auth::ERROR_AUTHENTICATION); -+ return false; -+ } -+ return true; -+ } -+ - int PamBackend::converse(int n, const struct pam_message **msg, struct pam_response **resp) { - qDebug() << "[PAM] Conversation with" << n << "messages"; - -diff --git a/src/helper/backend/PamBackend.h b/src/helper/backend/PamBackend.h -index 4c8b4b35..5b079099 100644 ---- a/src/helper/backend/PamBackend.h -+++ b/src/helper/backend/PamBackend.h -@@ -28,6 +28,7 @@ - #include <QtCore/QObject> - - #include <security/pam_appl.h> -+#include <pwd.h> - - namespace SDDM { - class PamHandle; -@@ -61,6 +62,7 @@ namespace SDDM { - explicit PamBackend(HelperApp *parent); - virtual ~PamBackend(); - int converse(int n, const struct pam_message **msg, struct pam_response **resp); -+ virtual bool setupSupplementalGroups(struct passwd *pw); - - public slots: - virtual bool start(const QString &user = QString()); diff --git a/x11-misc/sddm/files/sddm-0.18.1-only-reuse-online-sessions.patch b/x11-misc/sddm/files/sddm-0.18.1-only-reuse-online-sessions.patch deleted file mode 100644 index b3ea90ff768c..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-only-reuse-online-sessions.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f131270ff3ae6e6b4e2dc965cd05b46e194b48c1 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Tue, 31 Jul 2018 16:51:13 +0200 -Subject: [PATCH] Session reuse: Only consider "online" sessions - -Otherwise it might switch to already dead sessions ("closing" or "lingering"). ---- - src/daemon/Display.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/daemon/Display.cpp b/src/daemon/Display.cpp -index 86e597e..ec442b0 100644 ---- a/src/daemon/Display.cpp -+++ b/src/daemon/Display.cpp -@@ -290,8 +290,8 @@ namespace SDDM { - foreach(const SessionInfo &s, reply.value()) { - if (s.userName == user) { - OrgFreedesktopLogin1SessionInterface session(Logind::serviceName(), s.sessionPath.path(), QDBusConnection::systemBus()); -- if (session.service() == QLatin1String("sddm")) { -- m_reuseSessionId = s.sessionId; -+ if (session.service() == QLatin1String("sddm") && session.state() == QLatin1String("online")) { -+ m_reuseSessionId = s.sessionId; - break; - } - } --- -2.18.0 diff --git a/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch b/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch deleted file mode 100644 index f14ff7670c88..000000000000 --- a/x11-misc/sddm/files/sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch +++ /dev/null @@ -1,87 +0,0 @@ -From d3953e88a94ec25a87d3c5136517b3d1009cb1fd Mon Sep 17 00:00:00 2001 -From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de> -Date: Wed, 8 May 2019 18:58:53 +0200 -Subject: [PATCH] Revert "Honor PAM's ambient supplemental groups. (#834)" - -This reverts commit 1bc813d08b8130e458a6550ec47fb2bfbe6de080, which -misuses PAM and leads to pulling in all of root's supplemental groups -during session initialization instead of only adding PAM's extra -groups. The problem was masked due to the root user not having any -supplemental groups in some common contexts, like running sddm from a -systemd unit. ---- - src/helper/UserSession.cpp | 57 -------------------------------------- - 1 file changed, 57 deletions(-) - -diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp -index b3aec356..f71fd358 100644 ---- a/src/helper/UserSession.cpp -+++ b/src/helper/UserSession.cpp -@@ -150,67 +150,10 @@ namespace SDDM { - qCritical() << "setgid(" << pw.pw_gid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); - } -- --#ifdef USE_PAM -- -- // fetch ambient groups from PAM's environment; -- // these are set by modules such as pam_groups.so -- int n_pam_groups = getgroups(0, NULL); -- gid_t *pam_groups = NULL; -- if (n_pam_groups > 0) { -- pam_groups = new gid_t[n_pam_groups]; -- if ((n_pam_groups = getgroups(n_pam_groups, pam_groups)) == -1) { -- qCritical() << "getgroups() failed to fetch supplemental" -- << "PAM groups for user:" << username; -- exit(Auth::HELPER_OTHER_ERROR); -- } -- } else { -- n_pam_groups = 0; -- } -- -- // fetch session's user's groups -- int n_user_groups = 0; -- gid_t *user_groups = NULL; -- if (-1 == getgrouplist(username.constData(), pw.pw_gid, -- NULL, &n_user_groups)) { -- user_groups = new gid_t[n_user_groups]; -- if ((n_user_groups = getgrouplist(username.constData(), -- pw.pw_gid, user_groups, -- &n_user_groups)) == -1 ) { -- qCritical() << "getgrouplist(" << username << ", " << pw.pw_gid -- << ") failed"; -- exit(Auth::HELPER_OTHER_ERROR); -- } -- } -- -- // set groups to concatenation of PAM's ambient -- // groups and the session's user's groups -- int n_groups = n_pam_groups + n_user_groups; -- if (n_groups > 0) { -- gid_t *groups = new gid_t[n_groups]; -- memcpy(groups, pam_groups, (n_pam_groups * sizeof(gid_t))); -- memcpy((groups + n_pam_groups), user_groups, -- (n_user_groups * sizeof(gid_t))); -- -- // setgroups(2) handles duplicate groups -- if (setgroups(n_groups, groups) != 0) { -- qCritical() << "setgroups() failed for user: " << username; -- exit (Auth::HELPER_OTHER_ERROR); -- } -- delete[] groups; -- } -- delete[] pam_groups; -- delete[] user_groups; -- --#else -- - if (initgroups(pw.pw_name, pw.pw_gid) != 0) { - qCritical() << "initgroups(" << pw.pw_name << ", " << pw.pw_gid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); - } -- --#endif /* USE_PAM */ -- - if (setuid(pw.pw_uid) != 0) { - qCritical() << "setuid(" << pw.pw_uid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); diff --git a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch new file mode 100644 index 000000000000..daaf9f52dbcf --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ + message(STATUS "Debug build") + add_definitions(-DDEBUG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") +-else() ++elseif(CMAKE_BUILD_TYPE MATCHES Release) + message(STATUS "Release build") + add_definitions(-DNDEBUG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") diff --git a/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch new file mode 100644 index 000000000000..0388ee894231 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch @@ -0,0 +1,41 @@ +From dac9752495d1467d11e30450989194177677f30a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 21 Oct 2017 14:44:59 2017 +0200 +Subject: [PATCH 2/5] Xsession + +Thanks-to: Joakim Tjernlund <joakim.tjernlund@infinera.com> +Bug: https://bugs.gentoo.org/611210 + +--- + data/scripts/Xsession | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/data/scripts/Xsession b/data/scripts/Xsession +index a971d40..2d84a5a 100755 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession +@@ -39,6 +39,10 @@ case $SHELL in + ;; + esac + ++# Make D-Bus start properly, see: ++# /etc/X11/xinit/xinitrc.d/80-dbus ++command="$@" ++ + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f /usr/local/etc/xprofile ] && . /usr/local/etc/xprofile + [ -f $HOME/.xprofile ] && . $HOME/.xprofile +@@ -87,8 +91,8 @@ if [ -f "$USERXSESSION" ]; then + . "$USERXSESSION" + fi + +-if [ -z "$*" ]; then ++if [ -z "$command" ]; then + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + else +- exec $@ ++ exec $command + fi +-- +2.43.0 + diff --git a/x11-misc/sddm/files/sddm.logrotate b/x11-misc/sddm/files/sddm.logrotate new file mode 100644 index 000000000000..ba6199c416dc --- /dev/null +++ b/x11-misc/sddm/files/sddm.logrotate @@ -0,0 +1,5 @@ +/var/log/sddm.log { + missingok + notifempty + copytruncate +} diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml index c5bfbd1e394a..86353a72d168 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -1,25 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag> - <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag> - </use> - <longdescription lang="en"> - SDDM is a modern display manager for X11 aiming to be fast, simple - and beatiful. It uses modern technologies like QtQuick, which in - turn gives the designer the ability to create smooth, animated - user interfaces. - </longdescription> - <upstream> - <remote-id type="github">sddm/sddm</remote-id> - </upstream> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <longdescription lang="en"> + SDDM is a modern display manager aiming to be fast, simple + and beautiful. It uses modern technologies like QtQuick, which + gives the designer the ability to create smooth, animated UIs. + </longdescription> + <upstream> + <remote-id type="github">sddm/sddm</remote-id> + <remote-id type="cpe">cpe:/a:sddm_project:sddm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild deleted file mode 100644 index 9dde4b79612d..000000000000 --- a/x11-misc/sddm/sddm-0.15.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils systemd user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 x86" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -IUSE="consolekit elogind +pam systemd" - -REQUIRED_USE="?? ( elogind systemd )" - -RDEPEND=" - >=dev-qt/qtcore-5.6:5 - >=dev-qt/qtdbus-5.6:5 - >=dev-qt/qtgui-5.6:5 - >=dev-qt/qtdeclarative-5.6:5 - >=dev-qt/qtnetwork-5.6:5 - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb] - consolekit? ( >=sys-auth/consolekit-0.9.4 ) - elogind? ( sys-auth/elogind ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd:= ) - !systemd? ( sys-power/upower )" - -DEPEND="${RDEPEND} - dev-python/docutils - >=dev-qt/linguist-tools-5.6:5 - >=dev-qt/qttest-5.6:5 - kde-frameworks/extra-cmake-modules - virtual/pkgconfig" - -# fix for flags handling and bug 563108 -PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" ) - -src_prepare() { - use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch" - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_PAM=$(usex pam) - -DNO_SYSTEMD=$(usex '!systemd') - -DUSE_ELOGIND=$(usex 'elogind') - -DBUILD_MAN_PAGES=ON - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - ) - cmake-utils_src_configure -} - -pkg_postinst() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video - - systemd_reenable sddm.service -} diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild deleted file mode 100644 index bb3da55d933b..000000000000 --- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW" -inherit cmake l10n systemd user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="consolekit elogind +pam systemd test" -RESTRICT="!test? ( test )" - -REQUIRED_USE="?? ( elogind systemd )" - -BDEPEND=" - dev-python/docutils - >=dev-qt/linguist-tools-5.9.4:5 - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig -" -RDEPEND=" - >=dev-qt/qtcore-5.9.4:5 - >=dev-qt/qtdbus-5.9.4:5 - >=dev-qt/qtdeclarative-5.9.4:5 - >=dev-qt/qtgui-5.9.4:5 - >=dev-qt/qtnetwork-5.9.4:5 - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb] - consolekit? ( >=sys-auth/consolekit-0.9.4 ) - elogind? ( sys-auth/elogind ) - pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 ) - systemd? ( sys-apps/systemd:= ) - !systemd? ( sys-power/upower ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qttest-5.9.4:5 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" - "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 - "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" - # fix for groups: https://github.com/sddm/sddm/issues/1159 - "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" - "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch" - # fix for ReuseSession=true - "${FILESDIR}/${P}-only-reuse-online-sessions.patch" - # TODO: fix properly - "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 -) - -src_prepare() { - cmake_src_prepare - - disable_locale() { - sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die - } - l10n_find_plocales_changes "data/translations" "" ".ts" - l10n_for_each_disabled_locale_do disable_locale - - if ! use test; then - sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die - cmake_comment_add_subdirectory test - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_PAM=$(usex pam) - -DNO_SYSTEMD=$(usex '!systemd') - -DUSE_ELOGIND=$(usex 'elogind') - -DBUILD_MAN_PAGES=ON - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement - local confd="/usr/share/sddm/sddm.conf.d" - dodir ${confd} - "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \ - || die "Failed to create 00default.conf" - - sed -e "/^InputMethod/s/qtvirtualkeyboard//" \ - -e "/^ReuseSession/s/false/true/" \ - -e "/^EnableHiDPI/s/false/true/" \ - -i "${D}/${confd}"/00default.conf || die -} - -pkg_postinst() { - elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf" - elog "Use it to override specific options. SDDM defaults are now" - elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf" - - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video - - systemd_reenable sddm.service -} diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild b/x11-misc/sddm/sddm-0.18.1-r3.ebuild deleted file mode 100644 index ddadebe514b0..000000000000 --- a/x11-misc/sddm/sddm-0.18.1-r3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW" -inherit cmake l10n systemd user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="consolekit elogind +pam systemd test" -RESTRICT="!test? ( test )" - -REQUIRED_USE="?? ( elogind systemd )" - -BDEPEND=" - dev-python/docutils - >=dev-qt/linguist-tools-5.9.4:5 - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig -" -RDEPEND=" - >=dev-qt/qtcore-5.9.4:5 - >=dev-qt/qtdbus-5.9.4:5 - >=dev-qt/qtdeclarative-5.9.4:5 - >=dev-qt/qtgui-5.9.4:5 - >=dev-qt/qtnetwork-5.9.4:5 - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb] - consolekit? ( >=sys-auth/consolekit-0.9.4 ) - elogind? ( sys-auth/elogind ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd:= ) - !systemd? ( sys-power/upower ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qttest-5.9.4:5 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" - "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 - "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" - # fix for groups: https://github.com/sddm/sddm/issues/1159 - "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" - "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch" - # fix for ReuseSession=true - "${FILESDIR}/${P}-only-reuse-online-sessions.patch" - # TODO: fix properly - "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 - "${FILESDIR}/pam-1.4-substack.patch" -) - -src_prepare() { - cmake_src_prepare - - disable_locale() { - sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die - } - l10n_find_plocales_changes "data/translations" "" ".ts" - l10n_for_each_disabled_locale_do disable_locale - - if ! use test; then - sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die - cmake_comment_add_subdirectory test - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_PAM=$(usex pam) - -DNO_SYSTEMD=$(usex '!systemd') - -DUSE_ELOGIND=$(usex 'elogind') - -DBUILD_MAN_PAGES=ON - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement - local confd="/usr/share/sddm/sddm.conf.d" - dodir ${confd} - "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \ - || die "Failed to create 00default.conf" - - sed -e "/^InputMethod/s/qtvirtualkeyboard//" \ - -e "/^ReuseSession/s/false/true/" \ - -e "/^EnableHiDPI/s/false/true/" \ - -i "${D}/${confd}"/00default.conf || die -} - -pkg_postinst() { - elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf" - elog "Use it to override specific options. SDDM defaults are now" - elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf" - - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video - - systemd_reenable sddm.service -} diff --git a/x11-misc/sddm/sddm-0.18.1-r8.ebuild b/x11-misc/sddm/sddm-0.18.1-r8.ebuild new file mode 100644 index 000000000000..0f35ab30d4eb --- /dev/null +++ b/x11-misc/sddm/sddm-0.18.1-r8.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PATCHSET="${P}-patchset" +inherit cmake linux-info systemd tmpfiles + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="+elogind +pam systemd test" + +REQUIRED_USE="?? ( elogind systemd )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + acct-group/sddm + acct-user/sddm + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + x11-base/xorg-server + x11-libs/libxcb:= + elogind? ( sys-auth/elogind ) + pam? ( sys-libs/pam ) + !pam? ( virtual/libcrypt:= ) + systemd? ( sys-apps/systemd:= ) + !systemd? ( sys-power/upower ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-qt/qttest:5 ) +" +RDEPEND="${COMMON_DEPEND} + !systemd? ( gui-libs/display-manager-init ) +" +BDEPEND=" + dev-python/docutils + dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +PATCHES=( + "${WORKDIR}/${PATCHSET}/${P}-respect-user-flags.patch" + "${WORKDIR}/${PATCHSET}/${P}-Xsession.patch" # bug 611210 + "${WORKDIR}/${PATCHSET}/${PN}-0.18.0-sddmconfdir.patch" + # fix for groups: https://github.com/sddm/sddm/issues/1159 + "${WORKDIR}/${PATCHSET}/${P}-revert-honor-PAM-supplemental-groups.patch" + "${WORKDIR}/${PATCHSET}/${P}-honor-PAM-supplemental-groups-v2.patch" + # fix for ReuseSession=true + "${WORKDIR}/${PATCHSET}/${P}-only-reuse-online-sessions.patch" + # TODO: fix properly + "${WORKDIR}/${PATCHSET}/pam-1.4-substack.patch" + # upstream git develop branch: + "${WORKDIR}/${PATCHSET}/${P}-qt-5.15.2.patch" + "${WORKDIR}/${PATCHSET}/${P}-cve-2020-28049.patch" # bug 753104 + "${WORKDIR}/${PATCHSET}/${P}-nvidia-glitches-vt-switch.patch" + "${WORKDIR}/${PATCHSET}/${P}-drop-wayland-suffix.patch" + "${WORKDIR}/${PATCHSET}/${P}-fix-qt-5.15.7.patch" # KDE-bug 458865 +) + +pkg_setup() { + local CONFIG_CHECK="~DRM" + use kernel_linux && linux-info_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + if ! use test; then + sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die + cmake_comment_add_subdirectory test + fi +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PAM=$(usex pam) + -DNO_SYSTEMD=$(usex '!systemd') + -DUSE_ELOGIND=$(usex 'elogind') + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + newtmpfiles "${WORKDIR}/${PATCHSET}/${PN}.tmpfiles" "${PN}.conf" + + # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement + local confd="/usr/share/sddm/sddm.conf.d" + dodir ${confd} + "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \ + || die "Failed to create 00default.conf" + + sed -e "/^InputMethod/s/qtvirtualkeyboard//" \ + -e "/^ReuseSession/s/false/true/" \ + -e "/^EnableHiDPI/s/false/true/" \ + -i "${D}/${confd}"/00default.conf || die +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" + + elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf" + elog "Use it to override specific options. SDDM defaults are now" + elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf" + elog + elog "NOTE: If SDDM startup appears to hang then entropy pool is too low." + elog "This can be fixed by configuring one of the following:" + elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel" + elog " - # emerge sys-apps/haveged && rc-update add haveged boot" + elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot" + elog + elog "For more information on how to configure SDDM, please visit the wiki:" + elog " https://wiki.gentoo.org/wiki/SDDM" + if has_version x11-drivers/nvidia-drivers; then + elog + elog " Nvidia GPU owners in particular should pay attention" + elog " to the troubleshooting section." + fi + + systemd_reenable sddm.service +} diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0.ebuild new file mode 100644 index 000000000000..6aa0a5118fe9 --- /dev/null +++ b/x11-misc/sddm/sddm-0.21.0.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PAM_TAR="${PN}-0.21.0-pam" +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +fi + +QTMIN=5.15.12 +inherit cmake linux-info optfeature pam systemd tmpfiles + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="+elogind systemd test" + +REQUIRED_USE="^^ ( elogind systemd )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + acct-group/sddm + acct-user/sddm + >=dev-qt/qtcore-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + sys-libs/pam + x11-libs/libXau + x11-libs/libxcb:= + elogind? ( sys-auth/elogind[pam] ) + systemd? ( sys-apps/systemd:=[pam] ) + !systemd? ( sys-power/upower ) +" +DEPEND="${COMMON_DEPEND} + test? ( >=dev-qt/qttest-${QTMIN}:5 ) +" +RDEPEND="${COMMON_DEPEND} + x11-base/xorg-server + !systemd? ( gui-libs/display-manager-init ) +" +BDEPEND=" + dev-python/docutils + >=dev-qt/linguist-tools-${QTMIN}:5 + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +PATCHES=( + # Downstream patches + "${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch" + "${FILESDIR}/${P}-Xsession.patch" # bug 611210 +) + +pkg_setup() { + local CONFIG_CHECK="~DRM" + use kernel_linux && linux-info_pkg_setup +} + +src_unpack() { + [[ ${PV} == *9999* ]] && git-r3_src_unpack + default +} + +src_prepare() { + touch 01gentoo.conf || die + +cat <<-EOF >> 01gentoo.conf +[General] +# Remove qtvirtualkeyboard as InputMethod default +InputMethod= +EOF + + cmake_src_prepare + + if ! use test; then + sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die + cmake_comment_add_subdirectory test + fi + + if use systemd; then + sed -e "/pam_elogind.so/s/elogind/systemd/" \ + -i "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam || die + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_MAN_PAGES=ON + -DBUILD_WITH_QT6=OFF # default theme (and others) not yet compatible + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + -DINSTALL_PAM_CONFIGURATION=OFF + -DRUNTIME_DIR=/run/sddm + -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d" + -DNO_SYSTEMD=$(usex !systemd) + -DUSE_ELOGIND=$(usex elogind) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /etc/sddm.conf.d/ + doins "${S}"/01gentoo.conf + + # with systemd logs are sent to journald, so no point to bother in that case + if ! use systemd; then + insinto /etc/logrotate.d + newins "${FILESDIR}/sddm.logrotate" sddm + fi + + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}.pam ${PN} + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-autologin.pam ${PN}-autologin + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam ${PN}-greeter +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" + + elog "NOTE: If SDDM startup appears to hang then entropy pool is too low." + elog "This can be fixed by configuring one of the following:" + elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel" + elog " - # emerge sys-apps/haveged && rc-update add haveged boot" + elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot" + elog + elog "SDDM example config can be shown with:" + elog " ${EROOT}/usr/bin/sddm --example-config" + elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific options." + elog + elog "For more information on how to configure SDDM, please visit the wiki:" + elog " https://wiki.gentoo.org/wiki/SDDM" + if has_version x11-drivers/nvidia-drivers; then + elog + elog " Nvidia GPU owners in particular should pay attention" + elog " to the troubleshooting section." + fi + + optfeature "Weston DisplayServer support (EXPERIMENTAL)" dev-libs/weston + optfeature "KWin DisplayServer support (EXPERIMENTAL)" kde-plasma/kwin + + systemd_reenable sddm.service +} diff --git a/x11-misc/seetxt/files/0.72-0001-fix-linking.patch b/x11-misc/seetxt/files/0.72-0001-fix-linking.patch index b21e05592933..2a3d20d41942 100644 --- a/x11-misc/seetxt/files/0.72-0001-fix-linking.patch +++ b/x11-misc/seetxt/files/0.72-0001-fix-linking.patch @@ -2,14 +2,6 @@ From 0eb39c4c08e7e3787d411a36e4997ae144e2bed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch> Date: Tue, 9 Apr 2013 07:23:19 +0200 Subject: [PATCH 1/2] Fix linking. - ---- - configure.ac | 2 +- - src/Makefile.am | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3a1aa30..f1d3f30 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AM_PROG_CC_C_O diff --git a/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch b/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch new file mode 100644 index 000000000000..f1d69b20d42c --- /dev/null +++ b/x11-misc/seetxt/files/seetxt-0.72-fno-common.patch @@ -0,0 +1,24 @@ +https://sources.debian.org/patches/see/0.72-7/40-fix_ftbfs.patch/ +https://bugs.gentoo.org/707402 +--- a/src/main.h ++++ b/src/main.h +@@ -92,7 +92,8 @@ typedef struct { + struct matchspec { + int bgn; + int end; +-} rgxp; ++}; ++extern struct matchspec rgxp; + + /* see.c */ + void addtohistory (char *line); +--- a/src/util.c ++++ b/src/util.c +@@ -11,6 +11,7 @@ Public License along with this program. + #include "main.h" + + char *EXDline, Me[64]; ++struct matchspec rgxp; + + int buflen (char *buffer) { + int blen = strlen(buffer), NofL=0, i; diff --git a/x11-misc/seetxt/metadata.xml b/x11-misc/seetxt/metadata.xml index 89bdea614842..bfb30af4eaac 100644 --- a/x11-misc/seetxt/metadata.xml +++ b/x11-misc/seetxt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/seetxt/seetxt-0.72-r1.ebuild b/x11-misc/seetxt/seetxt-0.72-r1.ebuild index a61c7e234474..db7394530239 100644 --- a/x11-misc/seetxt/seetxt-0.72-r1.ebuild +++ b/x11-misc/seetxt/seetxt-0.72-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools eutils +inherit autotools DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows" HOMEPAGE="https://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/" @@ -12,16 +12,19 @@ SRC_URI="https://seetxt.googlecode.com/files/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" +BDEPEND="virtual/pkgconfig" RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PV}-0001-fix-linking.patch" + "${FILESDIR}/${PV}-0002-fix-shared-files-install.patch" + "${FILESDIR}/${PN}-0.72-fno-common.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/${PV}-0001-fix-linking.patch" \ - "${FILESDIR}/${PV}-0002-fix-shared-files-install.patch" + default eautoreconf } diff --git a/x11-misc/sent/Manifest b/x11-misc/sent/Manifest index 2015fe319b9f..b1423589e171 100644 --- a/x11-misc/sent/Manifest +++ b/x11-misc/sent/Manifest @@ -1,2 +1 @@ -DIST sent-0.2.tar.gz 13479 BLAKE2B 0641cf856450af5a451b5b122feaddc884512ad5e068f04121a740be057c2ebc215651d971a9f01f3387327074e300417c4a3c00756c093290a4be54ccb29365 SHA512 22c1e1e1bb7dbdaacb75a71a34ab533ca17b632e505ff96a351a907b861009b748502f7ad2934397f40842bef11e3072e814952a6abb141d470d0bb2e34a1540 DIST sent-1.tar.gz 15285 BLAKE2B 97bd71ff355b51a809e62a0a0a6c602550adce2331d53d8e2eef86fabfbd6c3122f93d431a670479fd22ec2a7c37880f2b464e453780ce1a965143ef83c47f07 SHA512 4797468bf949de507662253eac1ec80f566553051f407a55a88ccdd6544532c0d8d0f51bb11b88bdff78e6630519558049569ac0c9d3d8279f243882653ef1c0 diff --git a/x11-misc/sent/metadata.xml b/x11-misc/sent/metadata.xml index 87b4ee7d7109..be2ad39da9bb 100644 --- a/x11-misc/sent/metadata.xml +++ b/x11-misc/sent/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>jer@gentoo.org</email> -<name>Jeroen Roovers</name> -</maintainer> -<use> -<flag name="savedconfig">Without a saved config.h, this package depends on <pkg>media-gfx/farbfeld</pkg> for image conversions</flag> -</use> + <!-- maintainer-needed --> + <use> + <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>media-gfx/farbfeld</pkg> for image conversions</flag> + </use> </pkgmetadata> diff --git a/x11-misc/sent/sent-0.2.ebuild b/x11-misc/sent/sent-0.2.ebuild deleted file mode 100644 index 156215e99e2f..000000000000 --- a/x11-misc/sent/sent-0.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit savedconfig toolchain-funcs - -DESCRIPTION="Simple plaintext presentation tool" -HOMEPAGE="https://tools.suckless.org/sent/" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - media-libs/fontconfig - media-libs/libpng:* - x11-libs/libX11 - x11-libs/libXft -" - -DEPEND=" - ${RDEPEND} - -" - -src_prepare() { - sed -i \ - -e 's|^ @| |g' \ - -e 's|@${CC}|$(CC)|g' \ - -e '/^ echo/d' \ - Makefile || die - - restore_config config.def.h -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install -} diff --git a/x11-misc/sent/sent-1-r1.ebuild b/x11-misc/sent/sent-1-r1.ebuild index 8324b45871a4..87fe2dfa950e 100644 --- a/x11-misc/sent/sent-1-r1.ebuild +++ b/x11-misc/sent/sent-1-r1.ebuild @@ -1,16 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit savedconfig toolchain-funcs DESCRIPTION="Simple plaintext presentation tool" HOMEPAGE="https://tools.suckless.org/sent/" SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" +S="${WORKDIR}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~riscv" DEPEND=" media-libs/fontconfig @@ -21,7 +23,6 @@ RDEPEND=" ${DEPEND} !savedconfig? ( media-gfx/farbfeld ) " -S=${WORKDIR} src_prepare() { default @@ -36,7 +37,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/sent/sent-9999.ebuild b/x11-misc/sent/sent-9999.ebuild deleted file mode 100644 index 95b2d9227ca5..000000000000 --- a/x11-misc/sent/sent-9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit git-r3 savedconfig toolchain-funcs - -DESCRIPTION="Simple plaintext presentation tool" -HOMEPAGE="https://tools.suckless.org/sent/" -EGIT_REPO_URI="https://git.suckless.org/sent/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" - -DEPEND=" - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXft -" -RDEPEND=" - ${DEPEND} - !savedconfig? ( media-gfx/farbfeld ) -" - -src_prepare() { - default - - sed -i \ - -e 's|^ @| |g' \ - -e 's|@${CC}|$(CC)|g' \ - -e '/^ echo/d' \ - Makefile || die - - restore_config config.h -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install - save_config config.h -} diff --git a/x11-misc/set_opacity/metadata.xml b/x11-misc/set_opacity/metadata.xml index a3e23a3c6ecb..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 "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <maintainer> <email>anton.kochkov@gmail.com</email> diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest index 1592c6657851..58da0a861bb0 100644 --- a/x11-misc/shared-mime-info/Manifest +++ b/x11-misc/shared-mime-info/Manifest @@ -1,3 +1,5 @@ -DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda -DIST shared-mime-info-1.15.tar.xz 772708 BLAKE2B 763c7b5f1128882cb8a027ee7fb35daa5d141ccab07ba7aeae5139b94c1ed1c5702741b30c8803b7796bb6eb66fa02fde41d14e078b1960003bd3ba5e0de4e1a SHA512 3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2 -DIST shared-mime-info-2.0.tar.xz 5015272 BLAKE2B 8bac4790177f8b72a8c74799d7abca360ad11a922635aa1207eead78674192b300cf0096f5943a65aa3991c8403b145adb24f5e7746db7ea6ceeab64978608c3 SHA512 f4a1ea9a408ffcff325e57585dec5862405e9fd6c79e444048039f3061676501c40168cecf8935d002644a702a21f08f0f7c680ef6a65fdf188e0d892f3cc085 +DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e +DIST shared-mime-info-2.3.tar.bz2 6643480 BLAKE2B 2a3adc0568d1be5a17e5a1533f3c4620c6f9d97069ad9e0a0b26ac241c7b14f7d3b9200534df7e1c2295a561d5e049ce8edf8a1e96d2f4e2040508545172a351 SHA512 f1959933e93373ee6939b289d0c3c35d527ce6803865558e4a8bcb5a0183df2fc1148bbf58bfe9a97342e7125f2e0e39ac5dd3bae998510396d9b6c96a330762 +DIST shared-mime-info-2.4.tar.bz2 7096347 BLAKE2B 25ff086e4962f5ab0cb2b7155df02be4af7af63dd0267500b2b12b802680bbae04b9ed252ef5a004d0175f6b48956c5e4b9738af9ab5d2fa76a7a0b6eac067ad SHA512 712f414e80919bf2a0f5083ced44c54a350948a526850466a6e9f35365dcfd97fad8bcdbb29945de2715a8f9b70a108e931c8500209a4d6e3dddf97af02771cb +DIST xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2 28123 BLAKE2B ea107dba0819027e4a0a486db00e76f50a4e32e8e84f366b81490e213456e2c7e1c4a92cc4f92173dd6f94f257455bdcb77e3eb7d0ce8fb699c948d2d5b01f0d SHA512 efccff2672efb3ff0e44e83cfbaf6e2b926146e4a9d6132b14e2d7a88d602af340b3948793306ce5f720ac8b09e5d37d3b356a0cc269e8240b382558c9a3cf10 +DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8 diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch deleted file mode 100644 index e694928728f4..000000000000 --- a/x11-misc/shared-mime-info/files/shared-mime-info-2.0-pkgconfig_install_path.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6bf9e4ff0fb7eff11a02bd937045bf5dc291841a Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 6 May 2020 16:48:47 +0200 -Subject: [PATCH] data: Fix pkg-config installation path - ---- - data/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/meson.build b/data/meson.build -index 25ce031..e22b544 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -38,4 +38,5 @@ pkgconfig.generate( - name: 'shared-mime-info', - description: 'Freedesktop common MIME database', - version: meson.project_version(), -+ install_dir: get_option('datadir') / 'pkgconfig' - ) --- -2.26.2 - diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch new file mode 100644 index 000000000000..fe868ad709f6 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/915859 +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/12a3a6b1141c704fc594379af1808bb9008d588c + +From 12a3a6b1141c704fc594379af1808bb9008d588c Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Sun, 8 Oct 2023 00:11:49 +0200 +Subject: [PATCH] Fix string literal concatenation + +Clang is not able to disambiguate between multiple string literatals +and C++11 user defined literals. Spaces help. +--- + src/update-mime-database.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 733ba063..29d82a9d 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; + dirs = g_strsplit(env, PATH_SEPARATOR, 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) +@@ -2170,7 +2170,7 @@ static void check_in_path_xdg_data(const char *mime_path) + dirs[n] = g_build_filename(g_get_home_dir(), ".local", + "share", NULL); + n++; +- ++ + for (i = 0; i < n; i++) + { + if (stat(dirs[i], &dir_info) == 0 && +-- +GitLab diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch new file mode 100644 index 000000000000..abf766c07f84 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch @@ -0,0 +1,55 @@ +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/7499ac1a85b2487b94e315e6b55c34bcf220295f + +From 7499ac1a85b2487b94e315e6b55c34bcf220295f Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Sat, 7 Oct 2023 23:45:47 +0200 +Subject: [PATCH] Fix false positive fdatasync detection on darwin + +The `has_function` feature in meson uses different detection methods +depending on the contents of the `prefix` kwarg [1]: + + * if it contains `#include` directives it will copy the prefix into + the test code and check if it compiles + * if it doesn't contain an include or isn't specified, `has_function` + will forward declare the function and test for it's existence by + trying to link it to the default libraries + +The latter approach wrongly succeeds for `fdatasync` on darwin because +the linker binds the function to a system call of the same name. Note +that this result really is wrong because that system call has not +the expected semantics of `fdatasync`. + +By adding an include for `unistd.h` we can get meson to use the +first approach and the detection fails. + +Note that this has gone unnoticed so far because only recent versions +of clang (the default compiler on darwin) started to treat implicit +function declarations as an error. + +[1] https://github.com/mesonbuild/meson/blob/583d2815d1a130227f0f4db47e4ab2e80ebb6a61/mesonbuild/compilers/mixins/clike.py#L839-L846 + +Fixes #211 +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 1780c443..7998a51b 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,12 +49,7 @@ endif + ############################################################################### + # Dependencies + +-check_functions = [ +- 'fdatasync', +-] +-foreach function : check_functions +- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) +-endforeach ++config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>')) + + + if get_option('build-translations') +-- +GitLab diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch new file mode 100644 index 000000000000..18470b3ced24 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch @@ -0,0 +1,282 @@ +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/157c16b09f54741aefbc4be6a3507455f0378389 + +From 157c16b09f54741aefbc4be6a3507455f0378389 Mon Sep 17 00:00:00 2001 +From: Biswapriyo Nath <nathbappai@gmail.com> +Date: Sun, 8 Oct 2023 13:26:43 +0000 +Subject: [PATCH] Fix missing sentinel warning with clang + +This fixes the compiler warnings similar as following. + +../src/update-mime-database.cpp:393:50: warning: missing sentinel in function call [-Wsentinel] + 393 | g_strconcat(namespaceURI, " ", localName, NULL), + | ^ + | , nullptr +--- + src/update-mime-database.cpp | 58 ++++++++++++++++++------------------ + 1 file changed, 29 insertions(+), 29 deletions(-) + +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 29d82a9d..7838a0eb 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -390,7 +390,7 @@ static void add_namespace(Type *type, const char *namespaceURI, + } + + g_hash_table_insert(namespace_hash, +- g_strconcat(namespaceURI, " ", localName, NULL), ++ g_strconcat(namespaceURI, " ", localName, nullptr), + type); + } + +@@ -1023,7 +1023,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data) + char *lower; + + lower = g_ascii_strdown(type->media, -1); +- media = g_strconcat(mime_dir, "/", lower, NULL); ++ media = g_strconcat(mime_dir, "/", lower, nullptr); + g_free(lower); + #ifdef _WIN32 + fs::create_directory(media); +@@ -1032,7 +1032,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data) + #endif + + lower = g_ascii_strdown(type->subtype, -1); +- filename = g_strconcat(media, "/", lower, ".xml.new", NULL); ++ filename = g_strconcat(media, "/", lower, ".xml.new", nullptr); + g_free(lower); + g_free(media); + media = NULL; +@@ -1622,7 +1622,7 @@ static Magic *magic_new(xmlNode *node, Type *type, GError **error) + magic_free(magic); + magic = NULL; + (*error)->message = g_strconcat( +- _("Error in <match> element: "), old, NULL); ++ _("Error in <match> element: "), old, nullptr); + g_free(old); + } else if (magic->matches == NULL) { + magic_free(magic); +@@ -1843,7 +1843,7 @@ static TreeMagic *tree_magic_new(xmlNode *node, Type *type, GError **error) + tree_magic_free(magic); + magic = NULL; + (*error)->message = g_strconcat( +- _("Error in <treematch> element: "), old, NULL); ++ _("Error in <treematch> element: "), old, nullptr); + g_free(old); + } + } +@@ -1960,7 +1960,7 @@ static void delete_old_types(const gchar *mime_dir) + + for (i = 0; i < G_N_ELEMENTS(media_types); i++) + { +- const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], NULL); ++ const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], nullptr); + + if (!fs::is_directory(fs::status(media_dir))) + continue; +@@ -1973,13 +1973,13 @@ static void delete_old_types(const gchar *mime_dir) + continue; + + char *type_name = g_strconcat(media_types[i], "/", +- dir_entry.path().filename().string().c_str(), NULL); ++ dir_entry.path().filename().string().c_str(), nullptr); + type_name[strlen(type_name) - 4] = '\0'; + if (!g_hash_table_lookup(types, type_name)) + { + char *path; + path = g_strconcat(mime_dir, "/", +- type_name, ".xml", NULL); ++ type_name, ".xml", nullptr); + #if 0 + g_warning("Removing old info for type %s", + path); +@@ -2002,7 +2002,7 @@ static void add_ns(gpointer key, gpointer value, gpointer data) + Type *type = (Type *) value; + + g_ptr_array_add(lines, g_strconcat(ns, " ", type->media, +- "/", type->subtype, "\n", NULL)); ++ "/", type->subtype, "\n", nullptr)); + } + + /* Write all the collected namespace rules to 'XMLnamespaces' */ +@@ -2038,7 +2038,7 @@ static void write_subclass(gpointer key, gpointer value, gpointer data) + + for (l = list; l; l = l->next) + { +- line = g_strconcat (static_cast<const gchar *>(key), " ", l->data, "\n", NULL); ++ line = g_strconcat (static_cast<const gchar *>(key), " ", l->data, "\n", nullptr); + fwrite(line, 1, strlen(line), stream); + g_free (line); + } +@@ -2061,7 +2061,7 @@ static void add_alias(gpointer key, gpointer value, gpointer data) + + g_ptr_array_add(lines, g_strconcat(alias, " ", type->media, + "/", type->subtype, "\n", +- NULL)); ++ nullptr)); + } + + /* Write all the collected aliases */ +@@ -2092,7 +2092,7 @@ static void add_type(gpointer key, gpointer value, gpointer data) + { + GPtrArray *lines = (GPtrArray *) data; + +- g_ptr_array_add(lines, g_strconcat((char *)key, "\n", NULL)); ++ g_ptr_array_add(lines, g_strconcat((char *)key, "\n", nullptr)); + } + + /* Write all the collected types */ +@@ -2127,7 +2127,7 @@ static void write_one_icon(gpointer key, gpointer value, gpointer data) + FILE *stream = (FILE *)data; + char *line; + +- line = g_strconcat (mimetype, ":", iconname, "\n", NULL); ++ line = g_strconcat (mimetype, ":", iconname, "\n", nullptr); + fwrite(line, 1, strlen(line), stream); + g_free (line); + } +@@ -2168,7 +2168,7 @@ static void check_in_path_xdg_data(const char *mime_path) + dirs[n] = g_strdup(env); + else + dirs[n] = g_build_filename(g_get_home_dir(), ".local", +- "share", NULL); ++ "share", nullptr); + n++; + + for (i = 0; i < n; i++) +@@ -3588,7 +3588,7 @@ newest_mtime(const char *packagedir) + while ((name = g_dir_read_name(dir))) { + char *path; + +- path = g_build_filename(packagedir, name, NULL); ++ path = g_build_filename(packagedir, name, nullptr); + retval = g_stat(path, &statbuf); + g_free(path); + if (retval < 0) +@@ -3609,7 +3609,7 @@ is_cache_up_to_date (const char *mimedir, const char *packagedir) + char *mimeversion; + int retval; + +- mimeversion = g_build_filename(mimedir, "/version", NULL); ++ mimeversion = g_build_filename(mimedir, "/version", nullptr); + retval = g_stat(mimeversion, &version_stat); + g_free(mimeversion); + if (retval < 0) +@@ -3694,7 +3694,7 @@ int main(int argc, char **argv) + } + } + +- package_dir = g_strconcat(mime_dir, "/packages", NULL); ++ package_dir = g_strconcat(mime_dir, "/packages", nullptr); + + if (!fs::exists(mime_dir) && !fs::is_directory(fs::status(mime_dir))) + { +@@ -3747,7 +3747,7 @@ int main(int argc, char **argv) + + g_hash_table_foreach(globs_hash, collect_glob2, &glob_list); + glob_list = g_list_sort(glob_list, (GCompareFunc)compare_glob_by_weight); +- globs_path = g_strconcat(mime_dir, "/globs.new", NULL); ++ globs_path = g_strconcat(mime_dir, "/globs.new", nullptr); + globs = fopen_gerror(globs_path, error); + if (!globs) + goto out; +@@ -3761,7 +3761,7 @@ int main(int argc, char **argv) + goto out; + g_free(globs_path); + +- globs_path = g_strconcat(mime_dir, "/globs2.new", NULL); ++ globs_path = g_strconcat(mime_dir, "/globs2.new", nullptr); + globs = fopen_gerror(globs_path, error); + if (!globs) + goto out; +@@ -3782,7 +3782,7 @@ int main(int argc, char **argv) + FILE *stream; + char *magic_path; + int i; +- magic_path = g_strconcat(mime_dir, "/magic.new", NULL); ++ magic_path = g_strconcat(mime_dir, "/magic.new", nullptr); + stream = fopen_gerror(magic_path, error); + if (!stream) + goto out; +@@ -3807,7 +3807,7 @@ int main(int argc, char **argv) + FILE *stream; + char *ns_path; + +- ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", NULL); ++ ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", nullptr); + stream = fopen_gerror(ns_path, error); + if (!stream) + goto out; +@@ -3823,7 +3823,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/subclasses.new", NULL); ++ path = g_strconcat(mime_dir, "/subclasses.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3839,7 +3839,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/aliases.new", NULL); ++ path = g_strconcat(mime_dir, "/aliases.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3855,7 +3855,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/types.new", NULL); ++ path = g_strconcat(mime_dir, "/types.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3871,7 +3871,7 @@ int main(int argc, char **argv) + FILE *stream; + char *icon_path; + +- icon_path = g_strconcat(mime_dir, "/generic-icons.new", NULL); ++ icon_path = g_strconcat(mime_dir, "/generic-icons.new", nullptr); + stream = fopen_gerror(icon_path, error); + if (!stream) + goto out; +@@ -3887,7 +3887,7 @@ int main(int argc, char **argv) + FILE *stream; + char *icon_path; + +- icon_path = g_strconcat(mime_dir, "/icons.new", NULL); ++ icon_path = g_strconcat(mime_dir, "/icons.new", nullptr); + stream = fopen_gerror(icon_path, error); + if (!stream) + goto out; +@@ -3903,7 +3903,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + int i; +- path = g_strconcat(mime_dir, "/treemagic.new", NULL); ++ path = g_strconcat(mime_dir, "/treemagic.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3928,7 +3928,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/mime.cache.new", NULL); ++ path = g_strconcat(mime_dir, "/mime.cache.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +@@ -3944,7 +3944,7 @@ int main(int argc, char **argv) + FILE *stream; + char *path; + +- path = g_strconcat(mime_dir, "/version.new", NULL); ++ path = g_strconcat(mime_dir, "/version.new", nullptr); + stream = fopen_gerror(path, error); + if (!stream) + goto out; +-- +GitLab diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch b/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch new file mode 100644 index 000000000000..22d2349053f5 --- /dev/null +++ b/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/917561 +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/219 +https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573 + +From c918fe77e255150938e83a6aec259f153d303573 Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sun, 19 Nov 2023 11:18:11 +0100 +Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 + +Fixes #219 +--- a/src/test-subclassing.c ++++ b/src/test-subclassing.c +@@ -1,4 +1,5 @@ + #include <libxml/tree.h> ++#include <libxml/parser.h> + #include <stdio.h> + #include <string.h> + +-- +GitLab diff --git a/x11-misc/shared-mime-info/metadata.xml b/x11-misc/shared-mime-info/metadata.xml index 95e86c12108a..b133711a480e 100644 --- a/x11-misc/shared-mime-info/metadata.xml +++ b/x11-misc/shared-mime-info/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xdg/shared-mime-info</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild deleted file mode 100644 index d88ef77286f0..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic xdg-utils - -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="https://freedesktop.org/wiki/Software/shared-mime-info" -SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-libs/glib-2 - dev-libs/libxml2" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -DOCS=( ChangeLog HACKING NEWS README ) - -src_configure() { - export ac_cv_func_fdatasync=no #487504 - - if [[ ${PV} == 1.10 ]]; then - # https://bugs.gentoo.org/684884 - append-lfs-flags - else - eerror "LFS support merged upstream." - eerror "https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/20" - die "Please remove LFS workaround." - fi - - local myeconfargs=( - $(use_enable test default-make-check) - --disable-update-mimedb - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # FIXME: 0.91 fails with -j9 every second time like: - # update_mime_database-update-mime-database.o: file not recognized: File truncated - # collect2: ld returned 1 exit status - emake -j1 -} - -src_install() { - default - - # in prefix, install an env.d entry such that prefix patch is used/added - if use prefix; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die - doenvd "${T}"/50mimeinfo - fi -} - -pkg_postinst() { - use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share - xdg_mimeinfo_database_update -} diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild deleted file mode 100644 index 35038d58bea6..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -HASH=b27eb88e4155d8fccb8bb3cd12025d5b # don't forget to update on version bumps -inherit xdg-utils - -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" -SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -BDEPEND=" - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 -" -DEPEND="${RDEPEND}" - -DOCS=( ChangeLog HACKING NEWS README ) - -src_configure() { - export ac_cv_func_fdatasync=no #487504 - econf --disable-update-mimedb -} - -src_install() { - default - - # in prefix, install an env.d entry such that prefix patch is used/added - if use prefix; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die - doenvd "${T}"/50mimeinfo - fi -} - -pkg_postinst() { - use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share - xdg_mimeinfo_database_update -} diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild deleted file mode 100644 index 714f445d6525..000000000000 --- a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -HASH=0440063a2e6823a4b1a6fb2f2af8350f # don't forget to update on version bumps -inherit meson xdg-utils - -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" -SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# requires installed xdgmime binary -RESTRICT="test" - -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 -" -DEPEND="${RDEPEND}" - -DOCS=( HACKING.md NEWS README.md ) - -PATCHES=( - "${FILESDIR}/${P}-pkgconfig_install_path.patch" #728404 -) - -src_install() { - meson_src_install - - # in prefix, install an env.d entry such that prefix patch is used/added - if use prefix; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die - doenvd "${T}"/50mimeinfo - fi -} - -pkg_postinst() { - use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share - xdg_mimeinfo_database_update -} diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild new file mode 100644 index 000000000000..37199f3b2e5e --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson toolchain-funcs xdg-utils + +# Keep an eye on https://gitlab.freedesktop.org/xdg/xdgmime/-/merge_requests/25! +# xdgmime is used for tests but doesn't make releases nowadays; do what +# Fedora does and use a snapshot so we can run the test suite. +MY_XDGMIME_COMMIT="92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7" +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" +SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.gz" +SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 +" +DEPEND="${RDEPEND}" + +DOCS=( HACKING.md NEWS README.md ) + +src_prepare() { + default + + if use test ; then + # Drop empty dir (it's a submodule in upstream git repo) + rm -r "${S}"/xdgmime || die + # Lead Meson to our snapshot + ln -s "${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} xdgmime || die + # Don't break parallel make + sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die + fi +} + +src_configure() { + # We have to trick Meson into thinking it's there now so that + # we can run meson then emake to build xdgmime later, rather than + # building before running meson which would mean doing something + # unexpected in src_configure. + if use test ; then + # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 + touch xdgmime/src/{print,test}-mime{,-data} || die + chmod +x xdgmime/src/{print,test}-mime{,-data} || die + fi + + local emesonargs=( + -Dbuild-tools=true + -Dupdate-mimedb=false + ) + + meson_src_configure +} + +src_compile() { + if use test ; then + tc-export CC + + # xdgmime only has a homebrew Makefile + emake -C xdgmime + fi + + meson_src_compile +} + +src_install() { + meson_src_install + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + xdg_mimeinfo_database_update +} diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild new file mode 100644 index 000000000000..e63535b1ac2d --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg-utils + +# xdgmime is used for tests but doesn't make releases nowadays; do what +# Fedora does and use a snapshot so we can run the test suite. +MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7" +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" +SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2" +SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 +" +DEPEND="${RDEPEND}" + +DOCS=( HACKING.md NEWS README.md ) + +PATCHES=( + "${FILESDIR}"/${P}-clang-string-literal.patch + "${FILESDIR}"/${P}-fsync-detection.patch + "${FILESDIR}"/${P}-wformat.patch +) + +src_prepare() { + default + + if use test ; then + # Drop empty dir (it's a submodule in upstream git repo) + rm -r "${S}"/xdgmime || die + # Lead Meson to our snapshot + mkdir "${WORKDIR}"/xdgmime_build || die + ln -s "${WORKDIR}"/xdgmime_build xdgmime || die + # Don't break parallel make + #sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die + fi +} + +src_configure() { + # We have to trick Meson into thinking it's there now so that + # we can run meson then emake to build xdgmime later, rather than + # building before running meson which would mean doing something + # unexpected in src_configure. + if use test ; then + # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 + mkdir xdgmime/src || die + touch xdgmime/src/{print,test}-mime{,-data} || die + chmod +x xdgmime/src/{print,test}-mime{,-data} || die + + BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure + fi + + local emesonargs=( + -Dbuild-tools=true + -Dupdate-mimedb=false + $(meson_use test build-tests) + ) + + meson_src_configure +} + +src_compile() { + if use test ; then + meson_src_compile -C "${WORKDIR}"/xdgmime_build + fi + + meson_src_compile +} + +src_install() { + meson_src_install + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + xdg_mimeinfo_database_update +} diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild new file mode 100644 index 000000000000..4416469b12f3 --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg-utils + +# xdgmime is used for tests but doesn't make releases nowadays; do what +# Fedora does and use a snapshot so we can run the test suite. +MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7" +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" +SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2" +SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 +" +DEPEND="${RDEPEND}" + +DOCS=( HACKING.md NEWS README.md ) + +PATCHES=( + "${FILESDIR}"/${P}-libxml2.12.patch +) + +src_prepare() { + default + + if use test ; then + # Drop empty dir (it's a submodule in upstream git repo) + rm -r "${S}"/xdgmime || die + # Lead Meson to our snapshot + mkdir "${WORKDIR}"/xdgmime_build || die + ln -s "${WORKDIR}"/xdgmime_build xdgmime || die + # Don't break parallel make + #sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die + fi +} + +src_configure() { + # We have to trick Meson into thinking it's there now so that + # we can run meson then emake to build xdgmime later, rather than + # building before running meson which would mean doing something + # unexpected in src_configure. + if use test ; then + # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 + mkdir xdgmime/src || die + touch xdgmime/src/{print,test}-mime{,-data} || die + chmod +x xdgmime/src/{print,test}-mime{,-data} || die + + BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure + fi + + local emesonargs=( + -Dbuild-tools=true + -Dupdate-mimedb=false + $(meson_use test build-tests) + ) + + meson_src_configure +} + +src_compile() { + if use test ; then + meson_src_compile -C "${WORKDIR}"/xdgmime_build + fi + + meson_src_compile +} + +src_install() { + meson_src_install + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + xdg_mimeinfo_database_update +} diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest index 3f3665f066d3..99285f181a91 100644 --- a/x11-misc/shutter/Manifest +++ b/x11-misc/shutter/Manifest @@ -1 +1,2 @@ -DIST shutter-0.94.3.tar.gz 3375447 BLAKE2B e996966722999ee11ed3c185fd17a77e8982688ec17253f3558f89ccfd2e3afefec34d9214acffb10009fc1a28f587a5b994e32d7bb3538cde5e4f398b8e7b95 SHA512 7f67ed6fbc94aee4b6caa73662ab20684e2d8bdfd7208dcd407bdce4e1b93f2aa1fa256ad6bce66b92c741500726b90e5701e7f31bc831709568e5c4c27bff3b +DIST shutter-0.99.4.tar.gz 1734992 BLAKE2B 410e73f784f0d83638867132669a00fe89c06af622f3024e52b5b5700c1a431b4ad50f9066c267cd76f9be48ce6ff88eab4348d2d4dff28b4ae7e0267eb7bc41 SHA512 57f7fdc1066375942bd1a9db381a8ba6f24fafbd5e0853a4dd19016438ec2f3cb039ebe90038d282bc07f6e45af9cdbb6f180f55e43357231b41818b8555347b +DIST shutter-0.99.5.tar.gz 1736757 BLAKE2B b861d4c71295ceb1e8a2d268e57babccb8a832245ffb18410c19b20bb5aca56358e00cb4e578f3b8dfcd15e4c318beb7ed873a86094de522deed7f4b2e33b58c SHA512 524e135191a324f7da890922c98646c7cd83a714a3b1dc14f2ba9910f8a90f5c6c527a5c857888c2be93120a7b242e435664c8af45792d36b66d7642fda50371 diff --git a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch b/x11-misc/shutter/files/shutter-0.90-goocanvas.patch deleted file mode 100644 index 3a811635a988..000000000000 --- a/x11-misc/shutter/files/shutter-0.90-goocanvas.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: shutter-0.90/bin/shutter -=================================================================== ---- shutter-0.90.orig/bin/shutter -+++ shutter-0.90/bin/shutter -@@ -9407,12 +9407,7 @@ else { - $nautilus_sendto = FALSE; - } - -- #goocanvas -- eval { require Goo::Canvas }; -- if ($@) { -- warn "WARNING: Goo::Canvas/libgoo-canvas-perl is missing --> drawing tool will be disabled!\n\n"; -- $goocanvas = FALSE; -- } -+ $goocanvas = FALSE; - - #net-dbus-glib-perl - eval { require Net::DBus::GLib }; diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml index f341b92a1e2e..1c759a0a2823 100644 --- a/x11-misc/shutter/metadata.xml +++ b/x11-misc/shutter/metadata.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>alexey+gentoo@asokolov.org</email> <name>Alexey Sokolov</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="drawing">Enables drawing tool</flag> - </use> + <upstream> + <remote-id type="github">shutter-project/shutter</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/shutter/shutter-0.94.3.ebuild b/x11-misc/shutter/shutter-0.94.3.ebuild deleted file mode 100644 index 4a8e44ee526f..000000000000 --- a/x11-misc/shutter/shutter-0.94.3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg-utils desktop - -DESCRIPTION="Feature-rich screenshot program" -HOMEPAGE="https://shutter-project.org/" -#SRC_URI="https://shutter-project.org/wp-content/uploads/releases/tars/${P}.tar.gz" -SRC_URI="https://launchpad.net/shutter/0.9x/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="drawing" - -RDEPEND="dev-lang/perl - drawing? ( dev-perl/Goo-Canvas ) - dev-perl/libxml-perl - dev-perl/gnome2-canvas - dev-perl/gnome2-perl - dev-perl/gnome2-wnck - dev-perl/Gtk2-Unique - dev-perl/Gtk2-ImageView - dev-perl/File-DesktopEntry - dev-perl/File-HomeDir - dev-perl/File-Which - dev-perl/JSON - dev-perl/File-Copy-Recursive - dev-perl/File-MimeInfo - dev-perl/Locale-gettext - dev-perl/Net-DBus - dev-perl/Proc-Simple - dev-perl/Proc-ProcessTable - dev-perl/Sort-Naturally - dev-perl/WWW-Mechanize - dev-perl/X11-Protocol - dev-perl/XML-Simple - dev-perl/libwww-perl - virtual/imagemagick-tools[perl]" - -src_prepare() { - default - - use drawing || eapply "${FILESDIR}"/${PN}-0.90-goocanvas.patch - - #Fix tray icon because it doesn't pick the right icon using various themes - sed -i -e "/\$tray->set_from_icon_name/s:set_from_icon_name:set_from_file:" \ - -e "s:shutter-panel:/usr/share/icons/hicolor/scalable/apps/&.svg:" \ - bin/shutter || die "failed to fix trayicon" -} - -src_install() { - dobin bin/${PN} - insinto /usr/share/${PN} - doins -r share/${PN}/* - dodoc README - domenu share/applications/${PN}.desktop - # Man page is broken. Reconstruct it. - gunzip share/man/man1/${PN}.1.gz || die "gunzip failed" - doman share/man/man1/${PN}.1 - doicon share/pixmaps/${PN}.png - doins -r share/locale - insinto /usr/share/icons/hicolor - doins -r share/icons/hicolor/* - find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \ - || die "failed to make plugins executables" - find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ - -name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables" -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - - elog "" - elog "These optional dependencies provide additional functions:" - elog "" - elog "- media-libs/exiftool : Writing Exif information" - elog "- dev-libs/libappindicator : Status icon support for Unity" - elog "- dev-perl/{Net-OAuth,Path-Class}: Dropbox support" - elog "- dev-perl/JSON-XS : vgy.me image hosting support" - elog"" -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/x11-misc/shutter/shutter-0.94.3-r1.ebuild b/x11-misc/shutter/shutter-0.99.4-r1.ebuild index d2df1d6487bc..c2b4f443b835 100644 --- a/x11-misc/shutter/shutter-0.94.3-r1.ebuild +++ b/x11-misc/shutter/shutter-0.99.4-r1.ebuild @@ -1,26 +1,30 @@ -# 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 desktop eutils xdg-utils +inherit desktop optfeature prefix xdg DESCRIPTION="Feature-rich screenshot program" HOMEPAGE="https://shutter-project.org/" -SRC_URI="https://launchpad.net/shutter/0.9x/${PV}/+download/${P}.tar.gz" +SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" +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/gnome2-canvas - dev-perl/gnome2-perl - dev-perl/gnome2-wnck - dev-perl/Gtk2-Unique - dev-perl/Gtk2-ImageView + dev-perl/Glib-Object-Introspection + dev-perl/GooCanvas2 + dev-perl/GooCanvas2-CairoTypes + dev-perl/Gtk3 + dev-perl/Gtk3-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which @@ -28,25 +32,37 @@ 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 - dev-perl/libwww-perl virtual/imagemagick-tools[perl] + x11-libs/libwnck:3[introspection] " +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 domenu share/applications/shutter.desktop doicon share/pixmaps/shutter.png - - # Man page is broken. Reconstruct it. - gunzip share/man/man1/shutter.1.gz || die "gunzip failed" doman share/man/man1/shutter.1 insinto /usr/share @@ -55,25 +71,21 @@ 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 - find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \ - || die "failed to make plugins executables" # shutter executes perl scripts as standalone scripts, and after that "require"s them. + find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod +x {} + \ + || die "failed to make plugins executables" find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ - -name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables" + -name "*.pm" -exec chmod +x {} + || die "failed to make upload plugins executables" } pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst optfeature "writing Exif information" media-libs/exiftool - optfeature "drawing tool" dev-perl/Goo-Canvas - optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class" -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update + optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Path-Class" } diff --git a/x11-misc/shutter/shutter-0.99.5.ebuild b/x11-misc/shutter/shutter-0.99.5.ebuild new file mode 100644 index 000000000000..1bc51eaa128f --- /dev/null +++ b/x11-misc/shutter/shutter-0.99.5.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop optfeature prefix xdg + +DESCRIPTION="Feature-rich screenshot program" +HOMEPAGE="https://shutter-project.org/" +SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +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/Glib-Object-Introspection + dev-perl/GooCanvas2 + dev-perl/GooCanvas2-CairoTypes + dev-perl/Gtk3 + dev-perl/Gtk3-ImageView + dev-perl/File-DesktopEntry + dev-perl/File-HomeDir + dev-perl/File-Which + dev-perl/JSON + 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/X11-Protocol + dev-perl/XML-Simple + virtual/imagemagick-tools[perl] + x11-libs/libwnck:3[introspection] +" +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 + domenu share/applications/shutter.desktop + doicon share/pixmaps/shutter.png + doman share/man/man1/shutter.1 + + insinto /usr/share + doins -r share/shutter + doins -r share/locale + doins -r share/icons + + insinto /usr/share/metainfo + doins share/metainfo/shutter.metainfo.xml + + # .po doesn't belong to installed system, only .mo + rm -r "${ED}"/usr/share/shutter/resources/po || die + + # shutter executes perl scripts as standalone scripts, and after that "require"s them. + find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod +x {} + \ + || die "failed to make plugins executables" + find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ + -name "*.pm" -exec chmod +x {} + || die "failed to make upload plugins executables" +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "writing Exif information" media-libs/exiftool + optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Path-Class" + optfeature "WebP support" gui-libs/gdk-pixbuf-loader-webp +} diff --git a/x11-misc/simpleswitcher/Manifest b/x11-misc/simpleswitcher/Manifest index a1629923c59d..79e0e28662e4 100644 --- a/x11-misc/simpleswitcher/Manifest +++ b/x11-misc/simpleswitcher/Manifest @@ -1 +1 @@ -DIST simpleswitcher-20140219-cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a.tar.gz 16370 BLAKE2B 5bc23dcb26a99857c943b52b857f227043f3062337815f9d9f7feef05120abcdec31c3d756433e763b984cc8df506c9667954de200f19edff72a7a9efab9dbde SHA512 1c17e1858855d587a85a2ba2c0000ddc3e6da0e8bfdb6703de04a7bceaa575d2db0b8a032f3833c1f08c0ce413eaa1908fa62c6b6c98dba367668a7bceec467c +DIST simpleswitcher-20191008-7230421aa2e3364e3b4620f1ea3760f8f810b1a5.tar.gz 16400 BLAKE2B 5bf6efa685c6114cb8ad5ea491f683f25aa7c2ed84d5f3014de9c3eb4ef1934be232082190c3c7444acfebf902ba7e0aabf29604cd7abb9fa33c6fd024ef2b90 SHA512 b86eee41de3c0b92fe68f13b8691fd0a60a6ffbb73bfcf411c2898b3bb5b159bc4d36a09b651cba27d375ae2db99ce2e046b1dde8e9d93d8d5444b3b338c484c diff --git a/x11-misc/simpleswitcher/metadata.xml b/x11-misc/simpleswitcher/metadata.xml index ce653eb7e972..38ebeb6e4b57 100644 --- a/x11-misc/simpleswitcher/metadata.xml +++ b/x11-misc/simpleswitcher/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> +<maintainer type="project"> <email>desktop-misc@gentoo.org</email> </maintainer> <upstream> diff --git a/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild b/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild index 796d5806dbf1..830edeee59d4 100644 --- a/x11-misc/simpleswitcher/simpleswitcher-20140219.ebuild +++ b/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild @@ -1,36 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs -SSHASH="cbc89a71a61fd2d164c3fdc3ef4d3fa809c1741a" +SSHASH="7230421aa2e3364e3b4620f1ea3760f8f810b1a5" DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu" HOMEPAGE="https://github.com/seanpringle/simpleswitcher" SRC_URI="https://github.com/seanpringle/simpleswitcher/archive/${SSHASH}.tar.gz -> ${P}-${SSHASH}.tar.gz" +S="${WORKDIR}/${PN}-${SSHASH}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" +BDEPEND="virtual/pkgconfig" RDEPEND=" x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -S=${WORKDIR}/${PN}-${SSHASH} +DEPEND="${RDEPEND}" src_compile() { tc-export CC default } - -src_install() { - default - doman ${PN}.1 -} diff --git a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild index 093564097040..c4313820fcfd 100644 --- a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild +++ b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit git-r3 toolchain-funcs DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu" @@ -10,25 +11,17 @@ EGIT_REPO_URI="https://github.com/seanpringle/simpleswitcher" LICENSE="MIT" SLOT="0" -KEYWORDS="" +BDEPEND="virtual/pkgconfig" RDEPEND=" x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXres " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" src_compile() { tc-export CC default } - -src_install() { - default - doman ${PN}.1 -} diff --git a/x11-misc/sisctrl/Manifest b/x11-misc/sisctrl/Manifest deleted file mode 100644 index cb8311abbbac..000000000000 --- a/x11-misc/sisctrl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sisctrl-0.0.20051202.tar.gz 666749 BLAKE2B 8e99581cd9708a17ed3d01934c3a70e660213df91cbbac71816eb16dd5c41da725d92fc66d336fdc88b61704d9e7259f77b3da2becf2d2ab901d72e71f1e8c9c SHA512 26fe6561c2c14ff6cf952b89b8089b4fbdbc0c142bbcbf1358afe610b219a05dcf4d0bc835365cd0cf13558fed142b8aa2a0aa91c4fec8f40f0fc82590feabd1 diff --git a/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch b/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch deleted file mode 100644 index 6c61b8485bc2..000000000000 --- a/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/sisctrl.c -+++ b/src/sisctrl.c -@@ -4067,7 +4067,9 @@ - ( (!(sc.sdflags & SiS_SD_SUPPORT2OVL)) || (sc.sd2flags & SiS_SD2_SUPPORT760OO) ) ) ? - 1 : 0; - -+#ifdef USEXV - gl.noxvdemo = (sc.noxvdemo) ? 1 : 0; -+#endif - - #ifdef USE_STRAY - gl.dontusesystemtray = sc.dontusesystemtray; diff --git a/x11-misc/sisctrl/metadata.xml b/x11-misc/sisctrl/metadata.xml deleted file mode 100644 index 66187a0f4213..000000000000 --- a/x11-misc/sisctrl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> -</pkgmetadata> diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild deleted file mode 100644 index 53c9511c8cc6..000000000000 --- a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic - -DESCRIPTION="tool that allows you to tune SiS drivers from X" -HOMEPAGE="http://www.winischhofer.net/linuxsispart1.shtml#sisctrl" -SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:2 - x11-libs/libXrender - x11-libs/libXv - x11-libs/libXxf86vm -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -DOCS="AUTHORS ChangeLog NEWS README" -PATCHES=( - "${FILESDIR}"/${P}-no-xv.patch -) - -src_configure() { - append-libs -lm - econf \ - --with-xv-path="${EROOT}/usr/$(get_libdir)" -} diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild deleted file mode 100644 index c6a8cc504965..000000000000 --- a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic - -DESCRIPTION="tool that allows you to tune SiS drivers from X" -HOMEPAGE="http://www.winischhofer.net/linuxsispart1.shtml#sisctrl" -SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -RDEPEND="dev-libs/glib:2 - x11-libs/gtk+:2 - x11-libs/libXrender - x11-libs/libXv - x11-libs/libXxf86vm" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto" - -DOCS="AUTHORS ChangeLog NEWS README" - -src_prepare() { - epatch "${FILESDIR}"/${P}-no-xv.patch - sed -i -e 's,/X11R6,,g' configure || die - append-flags -lm -} diff --git a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch index 5c8c64b632f9..2792029a0f5f 100644 --- a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch +++ b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch @@ -11,8 +11,8 @@ Don't use LDFLAGS to pass libraries. - -CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft --cflags` -g -pedantic -Wall -LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs` -+CFLAGS += `imlib2-config --cflags` `pkg-config xft --cflags` -pedantic -Wall -+LDLIBS = -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs` ++CFLAGS += `imlib2-config --cflags` `${PKG_CONFIG} xft --cflags` -pedantic -Wall ++LDLIBS = -lX11 -lm `imlib2-config --libs` `${PKG_CONFIG} xft --libs` # Comment these out to disable Xinerama support CFLAGS += -DXINERAMA diff --git a/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch b/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch new file mode 100644 index 000000000000..c109b4e31860 --- /dev/null +++ b/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/828943 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,8 @@ + PREFIX = /usr + BINDIR = ${PREFIX}/bin + +-CFLAGS += `imlib2-config --cflags` `${PKG_CONFIG} xft --cflags` -pedantic -Wall +-LDLIBS = -lX11 -lm `imlib2-config --libs` `${PKG_CONFIG} xft --libs` ++CFLAGS += `${PKG_CONFIG} --cflags imlib2` `${PKG_CONFIG} xft --cflags` -pedantic -Wall ++LDLIBS = -lX11 -lm `${PKG_CONFIG} --libs imlib2` `${PKG_CONFIG} xft --libs` + + # Comment these out to disable Xinerama support + CFLAGS += -DXINERAMA diff --git a/x11-misc/skippy/metadata.xml b/x11-misc/skippy/metadata.xml index 2ba8e9e851e4..85e4ed814fa2 100644 --- a/x11-misc/skippy/metadata.xml +++ b/x11-misc/skippy/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r2.ebuild index d8db07312cfc..519bef1bd83f 100644 --- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild +++ b/x11-misc/skippy/skippy-0.5.0-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality" @@ -11,7 +12,6 @@ SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" RDEPEND="media-libs/imlib2[X] x11-libs/libXext @@ -20,19 +20,21 @@ RDEPEND="media-libs/imlib2[X] x11-libs/libXmu x11-libs/libXft" DEPEND="${RDEPEND} - x11-base/xorg-proto - virtual/pkgconfig" + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch "${FILESDIR}"/${P}-Makefile.patch "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-imlib2-pkg-config.patch ) DOCS=( CHANGELOG skippyrc-default ) src_compile() { - tc-export CC + tc-export CC PKG_CONFIG + default } 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-config.diff b/x11-misc/slim/files/slim-1.3.6-config.diff deleted file mode 100644 index 9da6795cccfa..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-config.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- slim.conf.orig 2010-08-25 11:52:23.000000000 -0400 -+++ 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 8cefc0bf0998..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 ---- ./CMakeLists.txt.orig 2014-11-11 20:38:40.706121207 +0100 -+++ ./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-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch deleted file mode 100644 index 8335e0fe9e75..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- CMakeLists.txt 2013-10-01 18:38:05.000000000 -0400 -+++ 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 f116c5ebc976..000000000000 --- a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- CMakeLists.txt 2013-10-15 12:02:13.463722050 -0400 -+++ CMakeLists.txt.new 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/files/slim-9999-config.diff b/x11-misc/slim/files/slim-9999-config.diff deleted file mode 100644 index 81f0feea43f1..000000000000 --- a/x11-misc/slim/files/slim-9999-config.diff +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/slim.conf b/slim.conf -index 2c72255..7af4adb 100644 ---- a/slim.conf -+++ b/slim.conf -@@ -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 @@ authfile /var/run/slim.auth - - - # 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,19 +33,20 @@ authfile /var/run/slim.auth - # 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 - # sessreg. You can use the %user variable - # --# 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: - # The current chosen session name replaces %session in the login_cmd -@@ -63,7 +64,10 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session - sessiondir /usr/share/xsessions - - # Executed when pressing F11 (requires imagemagick for 'import') --screenshot_cmd import -window root /slim.png -+# Alternative: media-gfx/scrot. See Gentoo bug 252241 for more info. -+screenshot_cmd import -window root /tmp/slim.png -+#screenshot_cmd scrot /tmp/slim.png -+ - - # welcome message. Available variables: %host, %domain - welcome_msg Welcome to %host -@@ -92,8 +96,8 @@ reboot_msg The system is rebooting... - # 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/metadata.xml b/x11-misc/slim/metadata.xml index 8f38f154c1b0..1505068a165e 100644 --- a/x11-misc/slim/metadata.xml +++ b/x11-misc/slim/metadata.xml @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>axs@gentoo.org</email> + <maintainer type="person" proxied="yes"> + <email>bugs.gentoo@flitspace.org.uk</email> + <name>Robert Pearce</name> </maintainer> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="consolekit">Enable native consolekit support</flag> - </use> <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 9b1efda4c881..000000000000 --- a/x11-misc/slim/slim-1.3.6-r5.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils pam eutils systemd versionator - -DESCRIPTION="Simple Login Manager" -HOMEPAGE="https://sourceforge.net/projects/slim.berlios/" -SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86" -IUSE="branding pam consolekit" -REQUIRED_USE="consolekit? ( 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 - consolekit? ( sys-auth/consolekit - sys-apps/dbus ) - pam? ( sys-libs/pam - !x11-misc/slimlock )" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto" -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 -) - -src_prepare() { - cmake-utils_src_prepare - - if use elibc_FreeBSD; then - sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ - || die - fi - - if use branding; then - sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use pam USE_PAM) - $(cmake-utils_use consolekit USE_CONSOLEKIT) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_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 version_is_at_least "1.3.2-r7" "${rv}" ; then - rv=newer - break; - fi - if version_is_at_least "1.0" "${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 - ewarn "Please note that slim supports consolekit directly. Please do not use any " - ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)" - ewarn "and enable USE=\"consolekit\" instead." - ewarn - 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..cd277b37a06b --- /dev/null +++ b/x11-misc/slim/slim-1.4.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake pam readme.gentoo-r1 systemd + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="https://svn.code.sf.net/p/slim-fork/code/trunk" + inherit subversion +else + SRC_URI="https://downloads.sourceforge.net/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 index 90753c4f0d6f..db4cad03ff7a 100644 --- a/x11-misc/slim/slim-9999.ebuild +++ b/x11-misc/slim/slim-9999.ebuild @@ -1,79 +1,87 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils pam systemd versionator +inherit cmake pam readme.gentoo-r1 systemd -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/axs-gentoo/slim-git.git" - inherit git-r3 +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}.berlios/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://downloads.sourceforge.net/project/${PN}-fork/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -DESCRIPTION="Simple Login Manager" -HOMEPAGE="https://sourceforge.net/projects/slim.berlios/" +DESCRIPTION="Simple Login Manager resurrected" +HOMEPAGE="https://slim-fork.sourceforge.io/" + LICENSE="GPL-2" SLOT="0" -IUSE="branding pam consolekit" -REQUIRED_USE="consolekit? ( pam )" +IUSE="branding pam" -RDEPEND="x11-libs/libXmu +RDEPEND="media-libs/libjpeg-turbo:= + media-libs/libpng:0= + virtual/libcrypt:= + x11-apps/sessreg x11-libs/libX11 - x11-libs/libXpm x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm x11-libs/libXrandr - media-libs/libpng:0= - virtual/jpeg:= - x11-apps/sessreg - consolekit? ( sys-auth/consolekit - sys-apps/dbus ) - pam? ( sys-libs/pam - !x11-misc/slimlock )" + pam? ( + sys-libs/pam + x11-libs/libXext + )" DEPEND="${RDEPEND} - virtual/pkgconfig 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.4.0-config.diff ) -src_prepare() { - cmake-utils_src_prepare +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=" +The configuration file is located at /etc/slim.conf. - if use elibc_FreeBSD; then - sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ - || die - fi +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 + sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf || die fi } src_configure() { local mycmakeargs=( -DUSE_PAM=$(usex pam) - -DUSE_CONSOLEKIT=$(usex consolekit) + -DUSE_CONSOLEKIT=OFF + -DBUILD_SLIMLOCK=$(usex pam) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_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 build_files/slim.service + systemd_dounit slim.service insinto /usr/share/slim newins "${FILESDIR}/Xsession-r3" Xsession @@ -81,56 +89,13 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}/slim.logrotate" slim - dodoc xinitrc.sample README THEMES + dodoc xinitrc.sample ChangeLog README TODO THEMES + readme.gentoo_create_doc } 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 version_is_at_least "1.3.2-r7" "${rv}" ; then - rv=newer - break; - fi - if version_is_at_least "1.0" "${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 provide X session selection based on the" - elog ".desktop entries in /usr/share/xsessions/ that are installed by each" - elog "DE, including ~/.xsession support via the 'Xsession' session. Sessions" - elog "are selected at login by pressing [F1]. As per the Xorg guide, each" - elog "user's default session can be specified by adding the name from" - elog "/etc/X11/Sessions to ~/.xsession." - 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 - ewarn "Please note that slim supports consolekit directly. Please do not use any " - ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)" - ewarn "and enable USE=\"consolekit\" instead." - ewarn - fi + 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" diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest index 9f3c59274d64..4de919f78f4b 100644 --- a/x11-misc/slock/Manifest +++ b/x11-misc/slock/Manifest @@ -1 +1,2 @@ DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f +DIST slock-1.5.tar.gz 6898 BLAKE2B f3435311b24c20fef656589f468b4cd6bbed30568459cb1d525b7dd5b57e5759ee287787d7506ad6cb922fd092bad504f38ab8c57b41deebec4f6aa554269a41 SHA512 2402b1e49f5dbe06cca2f3a31efedce6359413b240f2b98c57147483591a873c3c5457dbf6707485167002ff6d7ee0e9005d9fa506a51bf71337624e8728bb43 diff --git a/x11-misc/slock/files/slock-1.4-fix-link-paths.patch b/x11-misc/slock/files/slock-1.4-fix-link-paths.patch new file mode 100644 index 000000000000..503c2e52f7a9 --- /dev/null +++ b/x11-misc/slock/files/slock-1.4-fix-link-paths.patch @@ -0,0 +1,18 @@ +From: Sam James <sam@gentoo.org> +Date: Wed, 30 Jun 2021 06:54:36 +0100 +Subject: [PATCH] Drop unnecessary include, library paths + +Closes: https://bugs.gentoo.org/732410 +--- a/config.mk ++++ b/config.mk +@@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include + X11LIB = /usr/X11R6/lib + + # includes and libs +-INCS = -I. -I/usr/include -I${X11INC} +-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr ++INCS = -I. -I${X11INC} ++LIBS = -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr + + # flags + CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml index 807835d750ec..115e9d64a669 100644 --- a/x11-misc/slock/metadata.xml +++ b/x11-misc/slock/metadata.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>jer@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4-r1.ebuild index a8d677de1b6d..0f6f4a035658 100644 --- a/x11-misc/slock/slock-1.4.ebuild +++ b/x11-misc/slock/slock-1.4-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit fcaps savedconfig toolchain-funcs DESCRIPTION="simple X display locker" @@ -10,9 +11,10 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 hppa x86" +KEYWORDS="amd64 arm64 ~hppa ppc64 x86" RDEPEND=" + virtual/libcrypt:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr @@ -22,6 +24,10 @@ DEPEND=" x11-base/xorg-proto " +PATCHES=( + "${FILESDIR}"/slock-1.4-fix-link-paths.patch +) + src_prepare() { default @@ -34,16 +40,14 @@ src_prepare() { -e 's|@${CC}|$(CC)|g' \ Makefile || die - if use elibc_FreeBSD; then - sed -i -e 's/-DHAVE_SHADOW_H//' config.mk || die - fi - restore_config config.h tc-export CC } -src_compile() { emake slock; } +src_compile() { + emake slock +} src_install() { dobin slock diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild new file mode 100644 index 000000000000..4893525a9c52 --- /dev/null +++ b/x11-misc/slock/slock-1.5.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps savedconfig toolchain-funcs + +DESCRIPTION="simple X display locker" +HOMEPAGE="https://tools.suckless.org/slock" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm64 ~hppa ppc64 x86" + +RDEPEND=" + virtual/libcrypt:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}"/slock-1.4-fix-link-paths.patch +) + +src_prepare() { + default + + sed -i \ + -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \ + -e '/^CC/d' \ + -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \ + config.mk || die + sed -i \ + -e 's|@${CC}|$(CC)|g' \ + Makefile || die + + restore_config config.h + + tc-export CC +} + +src_compile() { + emake slock +} + +src_install() { + dobin slock + save_config config.h +} + +pkg_postinst() { + # cap_dac_read_search used to be enough for shadow access + # but now slock wants to write to /proc/self/oom_score_adj + # and for that it needs: + fcaps \ + cap_dac_override,cap_setgid,cap_setuid,cap_sys_resource \ + /usr/bin/slock + + savedconfig_pkg_postinst +} diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest index 6ea0008d7887..1760412cfce0 100644 --- a/x11-misc/slop/Manifest +++ b/x11-misc/slop/Manifest @@ -1,2 +1 @@ -DIST slop-7.4.tar.gz 50079 BLAKE2B 20815270bf1bffe0ef26630fd31d0d4cc7261633cef389e64c232a89033b6e8b5e1651fb5c882e2870808107734c4c088123b85675fa2aae932570d770344dc8 SHA512 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58 -DIST slop-7.5.tar.gz 51060 BLAKE2B 8d0fcf932181dfc482be7c54cf5a08605a32c85bcd8b27223a4cd8a08323382e802a7f20faa6c51fe67583b1d320cf783c7b5cc8b871e534ea11a32b827e1f45 SHA512 c02e40c5b924841996617fcc9629a6a739a04b6128c18e1eb06dc285d2f8026d847e67077fb59a111fc45c112f871a6e5faef20108c3d777271e1d4aca7f4737 +DIST slop-7.6.tar.gz 198605 BLAKE2B fcf8b0e1212f50044aa3e3a15d208ee3fda9e1883b9601beba6b29ad574555db83f382547bbe064570765e1ed1e7c0c92bf891edadf89f006bfdf10a5b469c66 SHA512 d1abc50cad124cfb11e9b57c38c824efb2ece3dffce8e54e451ce4adc4a7ad441c6171b7df5d1c8dfa66c875a12cf07b206ba3b87229c0e5f2ddf744d7922fc3 diff --git a/x11-misc/slop/files/slop-7.5-missing-header.patch b/x11-misc/slop/files/slop-7.5-missing-header.patch new file mode 100644 index 000000000000..f77fe8f9cf88 --- /dev/null +++ b/x11-misc/slop/files/slop-7.5-missing-header.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/810349 + +https://github.com/naelstrof/slop/commit/5cbcb9e +From: Drunkard Zhang <gongfan193@gmail.com> +Date: Tue, 28 Sep 2021 12:20:25 +0800 +Subject: [PATCH] bugfix: add missed header + +XDestroyImage is included in <X11/Xutil.h> which belongs to libX11. +Build fails without include this header on Gentoo. +--- a/src/framebuffer.cpp ++++ b/src/framebuffer.cpp +@@ -1,3 +1,4 @@ ++#include <X11/Xutil.h> + #include "framebuffer.hpp" + + slop::Framebuffer::Framebuffer( int w, int h ) { diff --git a/x11-misc/slop/metadata.xml b/x11-misc/slop/metadata.xml index 34017c588f44..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 "http://www.gentoo.org/dtd/metadata.dtd"> +<!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.4.ebuild b/x11-misc/slop/slop-7.4.ebuild deleted file mode 100644 index a61629c541d3..000000000000 --- a/x11-misc/slop/slop-7.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -inherit cmake-utils - -DESCRIPTION="An application that queries the user for a selection for printing" -HOMEPAGE="https://github.com/naelstrof/slop" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/naelstrof/slop.git" -else - SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${PV}" -IUSE="opengl" - -RDEPEND=" - dev-libs/icu:= - x11-libs/libX11 - x11-libs/libXext - opengl? ( - media-libs/glew:0= - virtual/opengl - x11-libs/libXrender:= - )" -DEPEND=" - ${RDEPEND} - media-libs/glm" - -src_configure() { - local mycmakeargs=( - -DSLOP_OPENGL=$(usex opengl) - ) - cmake-utils_src_configure -} diff --git a/x11-misc/slop/slop-7.5.ebuild b/x11-misc/slop/slop-7.6-r1.ebuild index a9c376b256ec..c54f3ecfd4d0 100644 --- a/x11-misc/slop/slop-7.5.ebuild +++ b/x11-misc/slop/slop-7.6-r1.ebuild @@ -1,27 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="Application that queries the user for a selection for printing" HOMEPAGE="https://github.com/naelstrof/slop" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/naelstrof/slop.git" -else - SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz" +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? ( @@ -31,13 +25,21 @@ RDEPEND=" x11-libs/libXrender:= ) " -DEPEND="${RDEPEND} +BDEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +DEPEND=" + ${RDEPEND} media-libs/glm " +PATCHES=( "${FILESDIR}/${PN}"-7.5-missing-header.patch ) + src_configure() { local mycmakeargs=( -DSLOP_OPENGL=$(usex opengl) + -DSLOP_UNICODE=$(usex icu) ) cmake_src_configure } diff --git a/x11-misc/slop/slop-9999.ebuild b/x11-misc/slop/slop-9999.ebuild deleted file mode 100644 index a9c376b256ec..000000000000 --- a/x11-misc/slop/slop-9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Application that queries the user for a selection for printing" -HOMEPAGE="https://github.com/naelstrof/slop" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/naelstrof/slop.git" -else - SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${PV}" -IUSE="opengl" - -RDEPEND=" - dev-libs/icu:= - x11-libs/libX11 - x11-libs/libXext - opengl? ( - media-libs/glew:0= - media-libs/libglvnd - virtual/opengl - x11-libs/libXrender:= - ) -" -DEPEND="${RDEPEND} - media-libs/glm -" - -src_configure() { - local mycmakeargs=( - -DSLOP_OPENGL=$(usex opengl) - ) - cmake_src_configure -} diff --git a/x11-misc/snixembed/metadata.xml b/x11-misc/snixembed/metadata.xml index 90af0369c665..07d2ac5f6762 100644 --- a/x11-misc/snixembed/metadata.xml +++ b/x11-misc/snixembed/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>steils@gentoo.org</email> <name>Stefan Strogin</name> </maintainer> + <upstream> + <remote-id type="sourcehut">~steef/snixembed</remote-id> + </upstream> </pkgmetadata> 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/files/spacefm-fno-common.patch b/x11-misc/spacefm/files/spacefm-fno-common.patch new file mode 100644 index 000000000000..4cdc834a8277 --- /dev/null +++ b/x11-misc/spacefm/files/spacefm-fno-common.patch @@ -0,0 +1,86 @@ +--- a/src/settings.c ++++ b/src/settings.c +@@ -52,6 +52,24 @@ + /* Dirty hack: check whether we are under LXDE or not */ + #define is_under_LXDE() (g_getenv( "_LXSESSION_PID" ) != NULL) + ++char* settings_terminal_su = NULL; ++char* settings_graphical_su = NULL; ++GList* xset_cmd_history = NULL; ++XSet* evt_win_focus = NULL; ++XSet* evt_win_move = NULL; ++XSet* evt_win_click = NULL; ++XSet* evt_win_key = NULL; ++XSet* evt_win_close = NULL; ++XSet* evt_pnl_show = NULL; ++XSet* evt_pnl_focus = NULL; ++XSet* evt_pnl_sel = NULL; ++XSet* evt_tab_new = NULL; ++XSet* evt_tab_chdir = NULL; ++XSet* evt_tab_focus = NULL; ++XSet* evt_tab_close = NULL; ++XSet* evt_device = NULL; ++ ++ + AppSettings app_settings = {0}; + /* const gboolean singleInstance_default = TRUE; */ + const gboolean show_hidden_files_default = FALSE; +--- a/src/settings.h ++++ b/src/settings.h +@@ -120,7 +120,7 @@ const char* xset_get_user_tmp_dir(); + /////////////////////////////////////////////////////////////////////////////// + //MOD extra settings below + +-GList* xsets; ++extern GList* xsets; + + enum { + XSET_B_UNSET, +@@ -311,22 +311,22 @@ typedef struct + } XMenuItem; + + // cache these for speed in event handlers +-XSet* evt_win_focus; +-XSet* evt_win_move; +-XSet* evt_win_click; +-XSet* evt_win_key; +-XSet* evt_win_close; +-XSet* evt_pnl_show; +-XSet* evt_pnl_focus; +-XSet* evt_pnl_sel; +-XSet* evt_tab_new; +-XSet* evt_tab_chdir; +-XSet* evt_tab_focus; +-XSet* evt_tab_close; +-XSet* evt_device; ++extern XSet* evt_win_focus; ++extern XSet* evt_win_move; ++extern XSet* evt_win_click; ++extern XSet* evt_win_key; ++extern XSet* evt_win_close; ++extern XSet* evt_pnl_show; ++extern XSet* evt_pnl_focus; ++extern XSet* evt_pnl_sel; ++extern XSet* evt_tab_new; ++extern XSet* evt_tab_chdir; ++extern XSet* evt_tab_focus; ++extern XSet* evt_tab_close; ++extern XSet* evt_device; + + // instance-wide command history +-GList* xset_cmd_history; ++extern GList* xset_cmd_history; + + static const char* terminal_programs[] = //for pref-dialog.c + { +@@ -374,8 +374,8 @@ static const char* gsu_commands[] = // order and contents must match prefdlg.ui + }; + + // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf +-char* settings_terminal_su; +-char* settings_graphical_su; ++extern char* settings_terminal_su; ++extern char* settings_graphical_su; + + typedef struct + { diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml index 35fc0bff16f7..a279d4604523 100644 --- a/x11-misc/spacefm/metadata.xml +++ b/x11-misc/spacefm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> @@ -14,8 +14,6 @@ <remote-id type="github">ignorantguru/spacefm</remote-id> </upstream> <use> - <flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag> - <flag name="gtk3">Support GTK+ 3.x instead of GTK+ 2.x</flag> <flag name="video-thumbnails">Support video thumbnails with <pkg>media-video/ffmpegthumbnailer</pkg></flag> </use> <longdescription lang="en"> diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild new file mode 100644 index 000000000000..0e63a546df0d --- /dev/null +++ b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info optfeature xdg + +DESCRIPTION="A multi-panel tabbed file manager" +HOMEPAGE="https://ignorantguru.github.io/spacefm/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git" + EGIT_BRANCH="next" + inherit git-r3 +else + KEYWORDS="amd64 x86" + SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="+startup-notification +video-thumbnails" + +RDEPEND="dev-libs/glib:2 + dev-util/desktop-file-utils + virtual/udev + virtual/freedesktop-icon-theme + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/pango + x11-libs/libX11 + x11-misc/shared-mime-info + startup-notification? ( x11-libs/startup-notification ) + video-thumbnails? ( media-video/ffmpegthumbnailer )" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-9999-include-sysmacros.patch + "${FILESDIR}"/${PN}-fno-common.patch +) + +src_configure() { + econf \ + $(use_enable startup-notification) \ + $(use_enable video-thumbnails) \ + --disable-hal \ + --enable-inotify \ + --disable-pixmaps \ + --with-gtk3 +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks + optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil + optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu] + # sys-apps/util-linux is required for eject + optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux + + if ! has_version 'sys-fs/udisks' ; then + elog "When using SpaceFM without udisks, and without the udisks-daemon running," + elog "you may need to enable kernel polling for device media changes to be detected." + elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll" + fi +} diff --git a/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild new file mode 100644 index 000000000000..c250bfeca80f --- /dev/null +++ b/x11-misc/spacefm/spacefm-1.0.6-r2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info optfeature xdg + +DESCRIPTION="A multi-panel tabbed file manager" +HOMEPAGE="https://ignorantguru.github.io/spacefm/" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git" + EGIT_BRANCH="next" + inherit git-r3 +else + KEYWORDS="amd64 x86" + SRC_URI="https://github.com/IgnorantGuru/spacefm/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="+startup-notification +video-thumbnails" + +RDEPEND="dev-libs/glib:2 + dev-util/desktop-file-utils + virtual/udev + virtual/freedesktop-icon-theme + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/pango + x11-libs/libX11 + x11-misc/shared-mime-info + startup-notification? ( x11-libs/startup-notification ) + video-thumbnails? ( media-video/ffmpegthumbnailer )" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-9999-include-sysmacros.patch + "${FILESDIR}"/${PN}-fno-common.patch + "${FILESDIR}"/${PN}-dash.patch #891181 +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable startup-notification) \ + $(use_enable video-thumbnails) \ + --disable-hal \ + --enable-inotify \ + --disable-pixmaps \ + --with-gtk3 +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks + optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil + optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu] + # sys-apps/util-linux is required for eject + optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux + + if ! has_version 'sys-fs/udisks' ; then + elog "When using SpaceFM without udisks, and without the udisks-daemon running," + elog "you may need to enable kernel polling for device media changes to be detected." + elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll" + fi +} diff --git a/x11-misc/spacefm/spacefm-1.0.6.ebuild b/x11-misc/spacefm/spacefm-1.0.6.ebuild deleted file mode 100644 index f1c2cea9d53c..000000000000 --- a/x11-misc/spacefm/spacefm-1.0.6.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2-utils linux-info xdg-utils - -DESCRIPTION="A multi-panel tabbed file manager" -HOMEPAGE="https://ignorantguru.github.com/spacefm/" -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git" - EGIT_BRANCH="next" - inherit git-r3 -else - KEYWORDS="amd64 x86" - SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails" - -RDEPEND="dev-libs/glib:2 - dev-util/desktop-file-utils - >=virtual/udev-143 - virtual/freedesktop-icon-theme - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/pango - x11-libs/libX11 - x11-misc/shared-mime-info - gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) - !gtk2? ( x11-libs/gtk+:3 ) - startup-notification? ( x11-libs/startup-notification ) - video-thumbnails? ( media-video/ffmpegthumbnailer )" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch ) - -src_configure() { - econf \ - $(use_enable startup-notification) \ - $(use_enable video-thumbnails) \ - --disable-hal \ - --enable-inotify \ - --disable-pixmaps \ - $(use_with gtk3 gtk3 "yes") -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update - - einfo - elog "To mount as non-root user you need one of the following:" - elog " sys-apps/udevil (recommended, see below)" - elog " sys-apps/pmount" - elog " sys-fs/udisks:0" - elog " sys-fs/udisks:2" - elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:" - elog " sys-apps/udevil" - elog "To perform as root functionality you need one of the following:" - elog " x11-misc/ktsuss" - elog " kde-plasma/kde-cli-tools[kdesu]" - elog "Other optional dependencies:" - elog " sys-apps/dbus" - elog " sys-process/lsof (device processes)" - elog " virtual/eject (eject media)" - einfo - if ! has_version 'sys-fs/udisks' ; then - elog "When using SpaceFM without udisks, and without the udisks-daemon running," - elog "you may need to enable kernel polling for device media changes to be detected." - elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll" - has_version '<virtual/udev-173' && ewarn "You need at least udev-173" - kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38" - einfo - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild deleted file mode 100644 index 31647a6d0f80..000000000000 --- a/x11-misc/spacefm/spacefm-9999.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2-utils linux-info xdg-utils - -DESCRIPTION="A multi-panel tabbed file manager" -HOMEPAGE="https://ignorantguru.github.com/spacefm/" -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git" - EGIT_BRANCH="next" - inherit git-r3 -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails" - -RDEPEND="dev-libs/glib:2 - dev-util/desktop-file-utils - >=virtual/udev-143 - virtual/freedesktop-icon-theme - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/pango - x11-libs/libX11 - x11-misc/shared-mime-info - gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) - !gtk2? ( x11-libs/gtk+:3 ) - startup-notification? ( x11-libs/startup-notification ) - video-thumbnails? ( media-video/ffmpegthumbnailer )" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch ) - -src_configure() { - econf \ - $(use_enable startup-notification) \ - $(use_enable video-thumbnails) \ - --disable-hal \ - --enable-inotify \ - --disable-pixmaps \ - $(use_with gtk3 gtk3 "yes") -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update - - einfo - elog "To mount as non-root user you need one of the following:" - elog " sys-apps/udevil (recommended, see below)" - elog " sys-apps/pmount" - elog " sys-fs/udisks:0" - elog " sys-fs/udisks:2" - elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:" - elog " sys-apps/udevil" - elog "To perform as root functionality you need one of the following:" - elog " x11-misc/ktsuss" - elog " kde-plasma/kde-cli-tools[kdesu]" - elog "Other optional dependencies:" - elog " sys-apps/dbus" - elog " sys-process/lsof (device processes)" - elog " virtual/eject (eject media)" - einfo - if ! has_version 'sys-fs/udisks' ; then - elog "When using SpaceFM without udisks, and without the udisks-daemon running," - elog "you may need to enable kernel polling for device media changes to be detected." - elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll" - has_version '<virtual/udev-173' && ewarn "You need at least udev-173" - kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38" - einfo - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/x11-misc/splatmoji/Manifest b/x11-misc/splatmoji/Manifest index 8e0de9eaf6e6..c5a9dad4a930 100644 --- a/x11-misc/splatmoji/Manifest +++ b/x11-misc/splatmoji/Manifest @@ -1 +1,2 @@ -DIST splatmoji-1.0.tar.gz 407506 BLAKE2B 5e2ac158501c29b013249eb9e4e509afd5b2418ce3975bc1f4e1739ac92227ca135ade6e4bd328400d337414befc7e413f76ce5a87a9cedcfcaec293e2439d1d SHA512 71d7d1895570cd85c5cc7896d165b8aa7444a89eb8d99c2e10a977bec38853e03ba707231551bc763add260d3c3bc8e0553b561204cb8f88d384870b7dba7fa0 +DIST splatmoji-1.1.1.tar.gz 4329965 BLAKE2B 6c9958bc8448d4e1c84358a7631d9b69c6d38cfedf42c86b5b220e0c380c5080de6653698ede6564817fcfd3d9e68603bd472ad43473c528580176baf7735d81 SHA512 d283d633ec9ff6a3345918518aabe72af56ab5bc71991e7324f85d5eae4ec078ca6a5f6aafbd8b8ebad0cb9fb18f15d68eca5662a4c895aa615d851d9c7ed845 +DIST splatmoji-1.2.0.tar.gz 4331395 BLAKE2B 2a786aba2ffc652c16fa479c0c2f2cba9b54508b2567f9d0d4269b81f100a8d1abe81926e9eaa9fbd3eb84617806755c21abdfd56fcdb0e58efcacc7dc2f3260 SHA512 d4f906bd6aac862cf696d159dca0a0a3317912d16a79ed036b313817bfee03b89900975b6d2cd3e24ea907d3e9fe8ffa501164dc9fead1017d91bc4c545e96c9 diff --git a/x11-misc/splatmoji/metadata.xml b/x11-misc/splatmoji/metadata.xml index 8098c7e79c6b..80592a62ef4c 100644 --- a/x11-misc/splatmoji/metadata.xml +++ b/x11-misc/splatmoji/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>william@ewpettersson.se</email> <name>William Pettersson</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy maintainers</name> </maintainer> diff --git a/x11-misc/splatmoji/splatmoji-1.0.ebuild b/x11-misc/splatmoji/splatmoji-1.1.1.ebuild index fe3507b04dc6..a8bdeaded1fb 100644 --- a/x11-misc/splatmoji/splatmoji-1.0.ebuild +++ b/x11-misc/splatmoji/splatmoji-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,4 +23,6 @@ src_install() { doins splatmoji.config insinto /usr/share/splatmoji doins -r data + insinto /usr/lib/splatmoji + doins lib/functions } diff --git a/x11-misc/splatmoji/splatmoji-1.2.0.ebuild b/x11-misc/splatmoji/splatmoji-1.2.0.ebuild new file mode 100644 index 000000000000..74bcd923cb57 --- /dev/null +++ b/x11-misc/splatmoji/splatmoji-1.2.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit optfeature + +DESCRIPTION="Quickly look up and input emoji and/or emoticons" +HOMEPAGE="https://github.com/cspeterson/splatmoji/" +SRC_URI="https://github.com/cspeterson/splatmoji/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0" +IUSE="test" + +RESTRICT="!test? ( test )" + +DEPEND="test? ( + app-misc/jq + dev-util/shunit2 + )" +RDEPEND=" + app-shells/bash + x11-misc/rofi + x11-misc/xdotool + x11-misc/xsel" + +src_test() { + ./test/unit_tests || die +} + +src_install() { + dobin splatmoji + + insinto /etc/xdg/splatmoji + doins splatmoji.config + + insinto /usr/share/splatmoji + doins -r data + + insinto /usr/lib/splatmoji + doins lib/functions +} + +pkg_postinst() { + optfeature "JSON-style output" app-misc/jq +} diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest index 4b3f7fb47ab8..77bc7b18b217 100644 --- a/x11-misc/spnavcfg/Manifest +++ b/x11-misc/spnavcfg/Manifest @@ -1 +1,3 @@ -DIST spnavcfg-0.3.tar.gz 214774 BLAKE2B aee45a796bd95761e4a7fe922cc5b65185c894e2fa366dea6d7677fc5ac3b7e0345b89eedef7bf8e446c598d66f161bb66fa695c07b433f5a6b7dce5055b6256 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80 +DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408 +DIST spnavcfg-1.0.tar.gz 496695 BLAKE2B 59d79cc1707881ba50e809c73a41cb94dbfd15e5e184114190efa2394fe4b53f25960a828611007a200687a3e9827bc4df30d3d06ca3764b23573a1f51fb2974 SHA512 271d1d66fdfb4aff9faa521c51c776dbccf77320b0783a5dbdcc4a28d4190ef3ba6c3d277d706dafc35e2e6ceed1d244d346d4a91cf8e1f5ba3141c24d065ea8 +DIST spnavcfg-1.1.tar.gz 497896 BLAKE2B 874489904970182f6f56d0a7bd63cc3847f101729b2c6866677fc0c17fab4bad42132ac0f93a39ef9a35654acde8ef6cd42a462756dd7f0c3914424a5fc54dd2 SHA512 4d5c9dc37d1906dbc99535a758554d9419e20ad773adcf2d2062795a8e194a88b68c360341a08e3ac236df08a2e389c4475f341b5bac662a4526dada0bb891a6 diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch b/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch deleted file mode 100644 index d0ef0db6e711..000000000000 --- a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e994e67a6a5c4722bdc8140528a4dd258c785402 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 18 Jan 2017 18:45:11 +0100 -Subject: [PATCH] Respect custom CFLAGS/LDFLAGS - -Based on spnavcfg-0.2.1-custom-flags.patch ---- - Makefile.in | 4 ++-- - configure | 13 +++++++++++++ - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 06f23a6..296dd5d 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -7,8 +7,8 @@ warn = -Wall - CC = gcc - SED = sed - INSTALL = install --CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0` --LDFLAGS = `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11 -+CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0` -+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11 - - $(bin): $(obj) - $(CC) -o $@ $(obj) $(LDFLAGS) -diff --git a/configure b/configure -index e211d92..0fed776 100755 ---- a/configure -+++ b/configure -@@ -43,6 +43,12 @@ done - echo " prefix: $PREFIX" - echo " optimize for speed: $OPT" - echo " include debugging symbols: $DBG" -+if [ -n "$CFLAGS" ]; then -+ echo " cflags: $CFLAGS" -+fi -+if [ -n "$LDFLAGS" ]; then -+ echo " ldflags: $LDFLAGS" -+fi - echo - - # create Makefile -@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then - echo 'opt = -O3' >>Makefile - fi - -+if [ -n "$CFLAGS" ]; then -+ echo "user_cflags = $CFLAGS" >>Makefile -+fi -+if [ -n "$LDFLAGS" ]; then -+ echo "user_ldflags = $LDFLAGS" >>Makefile -+fi -+ - cat "$srcdir/Makefile.in" >>Makefile - - echo '' --- -2.11.0 - diff --git a/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch b/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch new file mode 100644 index 000000000000..0476d7a10152 --- /dev/null +++ b/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch @@ -0,0 +1,23 @@ +From fd9aa10fb8e19a257398757943b3d8e79906e583 Mon Sep 17 00:00:00 2001 +From: John Tsiombikas <nuclear@member.fsf.org> +Date: Sun, 8 Jan 2023 21:49:12 +0200 +Subject: [PATCH] Make sure there are no duplicate object files. Closes issue + #29 + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index b760f4d..f66ba22 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -2,7 +2,7 @@ csrc = $(wildcard src/*.c) + ccsrc = $(wildcard src/*.cc) + mochdr = src/ui.h + mocsrc = $(mochdr:.h=.moc.cc) +-obj = $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o) res.cc ++obj = $(sort $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o)) res.cc + dep = $(csrc:.c=.d) $(ccsrc:.cc=.d) + bin = spnavcfg + diff --git a/x11-misc/spnavcfg/metadata.xml b/x11-misc/spnavcfg/metadata.xml index 6dca9970b454..51cdf03f1be0 100644 --- a/x11-misc/spnavcfg/metadata.xml +++ b/x11-misc/spnavcfg/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild index 20345a3947af..d4804079dfe0 100644 --- a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild +++ b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs DESCRIPTION="GTK-based GUI to configure a space navigator device" HOMEPAGE="http://spacenav.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -20,8 +20,10 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} app-misc/spacenavd[X]" -PATCHES=( "${FILESDIR}"/${P}-custom-flags.patch ) +src_configure() { + econf --disable-debug --disable-opt +} src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } diff --git a/x11-misc/spnavcfg/spnavcfg-1.0.ebuild b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild new file mode 100644 index 000000000000..9d9d3706b87d --- /dev/null +++ b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs qmake-utils + +DESCRIPTION="GTK-based GUI to configure a space navigator device" +HOMEPAGE="http://spacenav.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +COMMON_DEPEND=">=dev-libs/libspnav-1[X] + dev-qt/qtcore + dev-qt/qtgui + dev-qt/qtwidgets + x11-libs/libX11" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + >=app-misc/spacenavd-1[X]" + +src_configure() { + econf --disable-debug --disable-opt +} + +src_compile() { + local args=( + CC="$(tc-getCC)" + MOC="$(qt5_get_bindir)/moc" + RCC="$(qt5_get_bindir)/rcc" + UIC="$(qt5_get_bindir)/uic" + ) + emake "${args[@]}" +} diff --git a/x11-misc/spnavcfg/spnavcfg-1.1.ebuild b/x11-misc/spnavcfg/spnavcfg-1.1.ebuild new file mode 100644 index 000000000000..0cfb5b301c56 --- /dev/null +++ b/x11-misc/spnavcfg/spnavcfg-1.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs qmake-utils + +DESCRIPTION="Qt-based GUI to configure a space navigator device" +HOMEPAGE="http://spacenav.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +COMMON_DEPEND=">=dev-libs/libspnav-1[X] + dev-qt/qtcore + dev-qt/qtgui + dev-qt/qtwidgets + x11-libs/libX11" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + >=app-misc/spacenavd-1[X]" + +src_configure() { + # Note: Makefile uses $(add_cflags) inside $(CXXFLAGS) + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + econf --disable-debug --disable-opt +} + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch +) + +src_compile() { + local args=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + MOC="$(qt5_get_bindir)/moc" + RCC="$(qt5_get_bindir)/rcc" + UIC="$(qt5_get_bindir)/uic" + libpath="-L/usr/$(get_libdir)" + ) + emake "${args[@]}" +} 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 a8fb43312942..000000000000 --- a/x11-misc/sprop/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> -<email>jer@gentoo.org</email> -<name>Jeroen Roovers</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 c0cee8850f7d..000000000000 --- a/x11-misc/sprop/sprop-0.1-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 ~x86" - -RDEPEND=" - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -src_prepare() { - sed -i \ - -e '/^CC/d' \ - -e '/^CFLAGS/s| =| +=|;s| -Os||g' \ - -e '/^LDFLAGS/s|= -s|+=|g' \ - config.mk || die - - sed -i \ - -e 's|@${CC}|$(CC)|g' \ - Makefile || die - - sed -i \ - -e "s|VERSION|${PV}|g" \ - ${PN}.1 || die - - default - - tc-export CC -} - -src_compile() { emake sprop; } - -src_install() { - dobin ${PN} - doman ${PN}.1 -} diff --git a/x11-misc/sselp/Manifest b/x11-misc/sselp/Manifest deleted file mode 100644 index e118b8328f69..000000000000 --- a/x11-misc/sselp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sselp-0.2.tar.gz 2562 BLAKE2B e41b68931f7f386a57b13f08c4617fa84621bbd9ea7d8837adda3899ae06077e605382b1f58132afcb4ff24d9d55842c5012bf44970410db06ae0098c00a1e5a SHA512 f53163bd6bf257ef912d23dd813690a6a8700344bcc3caad73556917f12e76364b6ebc9bd11224fe8f4013d83518459440f113a313fc9721de2a124277270044 diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml deleted file mode 100644 index 229dd61feac9..000000000000 --- a/x11-misc/sselp/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> -<email>jer@gentoo.org</email> -<name>Jeroen Roovers</name> -</maintainer> -<maintainer type="project"> -<email>desktop-misc@gentoo.org</email> -<name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -</pkgmetadata> diff --git a/x11-misc/sselp/sselp-0.2-r1.ebuild b/x11-misc/sselp/sselp-0.2-r1.ebuild deleted file mode 100644 index 454a438e9bd2..000000000000 --- a/x11-misc/sselp/sselp-0.2-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Simple X selection printer" -HOMEPAGE="https://tools.suckless.org/x/sselp" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 hppa ~ppc ~ppc64 x86" - -DEPEND="x11-libs/libX11" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i \ - -e "s|^CFLAGS = -std=c99 -pedantic -Wall -Os|CFLAGS += -std=c99 -pedantic -Wall|" \ - -e "s|^LDFLAGS = -s|LDFLAGS +=|" \ - -e "s|^CC = cc|CC = $(tc-getCC)|" \ - config.mk || die "sed failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - einstalldocs -} diff --git a/x11-misc/sselp/sselp-9999.ebuild b/x11-misc/sselp/sselp-9999.ebuild deleted file mode 100644 index d44b336a1777..000000000000 --- a/x11-misc/sselp/sselp-9999.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit git-r3 toolchain-funcs - -DESCRIPTION="Simple X selection printer" -HOMEPAGE="https://tools.suckless.org/x/sselp" -EGIT_REPO_URI="https://git.suckless.org/sselp" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" - -DEPEND="x11-libs/libX11" -RDEPEND="${DEPEND}" - -src_prepare() { - default - sed -i \ - -e "s|^CFLAGS = -std=c99 -pedantic -Wall -Os|CFLAGS += -std=c99 -pedantic -Wall|" \ - -e "s|^LDFLAGS = -s|LDFLAGS +=|" \ - -e "s|^CC = cc|CC = $(tc-getCC)|" \ - config.mk || die "sed failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - einstalldocs -} diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest index 98ae718aa32d..eac5b685ec28 100644 --- a/x11-misc/stalonetray/Manifest +++ b/x11-misc/stalonetray/Manifest @@ -1 +1,2 @@ -DIST stalonetray-0.8.3.tar.bz2 155276 BLAKE2B 68041239df7d3441f9abd279cec55ff11deb0ef73eb984be8ad2f0348285164c112918c9e850e5fd2a994144a0c84429164e9f46a0baf81a29ed763b750ffce7 SHA512 b1c50d844b6497b586c1ad56b721675690ea305a4e3a2601ab5305af0e208c215825eefa8fa374ae0c392252156a8dffd5882992c943344f5b6a674fe6553942 +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 5f630340ef1f..ac413e887dc0 100644 --- a/x11-misc/stalonetray/metadata.xml +++ b/x11-misc/stalonetray/metadata.xml @@ -1,11 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>jaco@uls.co.za</email> + <name>Jaco Kroon</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> - <flag name="graceful-exit">use non-portable hack to exit gracefuly on signal</flag> + <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.3.ebuild b/x11-misc/stalonetray/stalonetray-0.8.3.ebuild deleted file mode 100644 index 2cff1037b9f0..000000000000 --- a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="System tray utility including support for KDE system tray icons" -HOMEPAGE="http://stalonetray.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug +graceful-exit kde" - -RDEPEND="x11-libs/libX11 - x11-libs/libICE - x11-libs/libSM - x11-libs/libXpm" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -src_configure() { - econf $(use_enable debug) \ - $(use_enable graceful-exit) \ - $(use_enable kde native-kde) -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS ChangeLog NEWS README stalonetrayrc.sample TODO - dohtml stalonetray.html -} diff --git a/x11-misc/stalonetray/stalonetray-0.8.4.ebuild b/x11-misc/stalonetray/stalonetray-0.8.4.ebuild new file mode 100644 index 000000000000..f63dff437496 --- /dev/null +++ b/x11-misc/stalonetray/stalonetray-0.8.4.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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/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/Manifest b/x11-misc/sunflower/Manifest index 5c5c22b73aca..515eda905f39 100644 --- a/x11-misc/sunflower/Manifest +++ b/x11-misc/sunflower/Manifest @@ -1,2 +1 @@ -DIST sunflower-0.2-59.tgz 790126 BLAKE2B 32df1ced73ba0bf5e814e52010eefbbd10657bdbb602dd3a48dc08b865195c3d1efa631bfe2d421f0a12a2f01521a2c6248fe5b9ca8fcc268423f0c9aa3d252d SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9 -DIST sunflower-0.3.61.tar.gz 975053 BLAKE2B 5845ce0e81cf98b7488c9c34b8a3b6702e01abe9976bd4186691ce3804164d707d3ca999896e3f8d60e5253891d94f39e2fabdb50170afa8ec0f937df141db89 SHA512 f55c2fb15889f903375776f989498827dcab287e87d4015c50f12780dd2f0271e1e127533a10ca94f44ebd44727018917cf92e828bbe82b7653d8ed559ee1cc3 +DIST 0.5-63.tar.gz 784093 BLAKE2B eef6fe3749137ac44cddb730549ca4eeed240d17bd7c4d0ac5b70f95e16f5eb57590a22a87150fabac31051219837aeeef32869f07d5def37784526181a3dd32 SHA512 ddf303dc873d38c4e5f8b2026f70088d40cb82ea2a10c91bd9c21938467fb797dd6bae3211b82cb2328fa212f880d878f2a799c2688da725ac5a448a11c3244d diff --git a/x11-misc/sunflower/files/sunflower b/x11-misc/sunflower/files/sunflower deleted file mode 100644 index 192d4b99e1ae..000000000000 --- a/x11-misc/sunflower/files/sunflower +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python - -import os -os.chdir("@SITEDIR@") -import sunflower.Sunflower diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml index a92806229f30..93f00ab80dae 100644 --- a/x11-misc/sunflower/metadata.xml +++ b/x11-misc/sunflower/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> -<upstream> - <remote-id type="github">MeanEYE/Sunflower</remote-id> -</upstream> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">MeanEYE/Sunflower</remote-id> + <remote-id type="gitlab">MeanEYE/Sunflower</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild deleted file mode 100644 index d1fea9c5a0c7..000000000000 --- a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit gnome2-utils python-r1 xdg-utils - -MY_PN="Sunflower" -DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support" -HOMEPAGE="https://github.com/MeanEYE/Sunflower - https://sunflower-fm.org/" -SRC_URI="http://sunflower-fm.org/pub/sunflower-${PV/_alpha/-}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - >=dev-python/pygtk-2.15.0[${PYTHON_USEDEP}] - >=dev-python/notify-python-0.1[${PYTHON_USEDEP}] - gnome-base/librsvg:2" - -S=${WORKDIR}/${MY_PN} - -src_prepare() { - default - find "${S}" -name "*.py[co]" -delete || die - find "${S}"/translations -name "*.po" -delete || die - rm "${S}"/translations/${PN}.pot || die - - sed -i \ - -e '/^application_file/s/os.path.dirname(sys.argv\[0\])/os.getcwd()/' \ - ${MY_PN}.py || die -} - -src_install() { - touch __init__.py || die - installme() { - # install modules - python_moduleinto ${PN} - python_domodule images application ${MY_PN}.py \ - AUTHORS CHANGES COPYING DEPENDS TODO __init__.py - - # generate and install startup scripts - sed \ - -e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \ - "${FILESDIR}"/${PN} > "${WORKDIR}"/${PN} || die - python_doscript "${WORKDIR}"/${PN} - } - - # install for all enabled implementations - python_foreach_impl installme - - insinto /usr/share/locale - # correct gettext behavior - if [[ -n "${LINGUAS+x}" ]] ; then - for i in $(cd "${S}"/translations ; echo *) ; do - if has ${i} ${LINGUAS} ; then - doins -r "${S}"/translations/${i} - fi - done - else - doins -r "${S}"/translations/* - fi - - newicon -s 64 images/${PN}_64.png ${PN}.png - doicon -s scalable images/${PN}.svg - newmenu ${MY_PN}.desktop ${PN}.desktop -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update - - # TODO: better description - elog "optional dependencies:" - elog " dev-python/libgnome-python" - elog " media-libs/mutagen" - elog " x11-libs/vte:0[python] (terminal support)" -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/x11-misc/sunflower/sunflower-0.3.61.ebuild b/x11-misc/sunflower/sunflower-0.3.61.ebuild deleted file mode 100644 index e632d371fb25..000000000000 --- a/x11-misc/sunflower/sunflower-0.3.61.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit python-r1 xdg-utils desktop - -MY_PN="${PN^}" -MY_PV=$(ver_rs 2 '-') - -DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support" -HOMEPAGE="https://github.com/MeanEYE/Sunflower - https://sunflower-fm.org/" -SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - >=dev-python/pygtk-2.15.0:2[${PYTHON_USEDEP}] - >=dev-python/notify-python-0.1[${PYTHON_USEDEP}] - gnome-base/librsvg:2 - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] -" - -S=${WORKDIR}/${MY_PN}-$MY_PV - -src_prepare() { - default - find "${S}"/translations -name "*.po" -delete || die - rm "${S}"/translations/${PN}.pot || die - - sed -i \ - -e '/^application_file/s/os.path.dirname(sys.argv\[0\])/os.getcwd()/' \ - ${MY_PN}.py || die -} - -src_install() { - touch __init__.py || die - installme() { - # install modules - python_moduleinto ${PN} - python_domodule images application ${MY_PN}.py \ - AUTHORS CHANGES COPYING DEPENDS TODO __init__.py - - # generate and install startup scripts - sed \ - -e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \ - "${FILESDIR}"/${PN} > "${WORKDIR}"/${PN} || die - python_doscript "${WORKDIR}"/${PN} - } - - # install for all enabled implementations - python_foreach_impl installme - - insinto /usr/share/locale - # correct gettext behavior - if [[ -n "${LINGUAS+x}" ]] ; then - for i in $(cd "${S}"/translations ; echo *) ; do - if has ${i} ${LINGUAS} ; then - doins -r "${S}"/translations/${i} - fi - done - else - doins -r "${S}"/translations/* - fi - - newicon -s 64 images/${PN}_64.png ${PN}.png - doicon -s scalable images/${PN}.svg - newmenu ${MY_PN}.desktop ${PN}.desktop -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - # TODO: better description - elog "optional dependencies:" - elog " dev-python/libgnome-python" - elog " media-libs/mutagen" - elog " x11-libs/vte:0[python] (terminal support)" -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-misc/sunflower/sunflower-0.5-r2.ebuild b/x11-misc/sunflower/sunflower-0.5-r2.ebuild new file mode 100644 index 000000000000..927a7198f232 --- /dev/null +++ b/x11-misc/sunflower/sunflower-0.5-r2.ebuild @@ -0,0 +1,41 @@ +# 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="sqlite" +DISTUTILS_USE_PEP517="setuptools" +inherit distutils-r1 xdg + +MY_PN="Sunflower" +MY_PV="${PV}-63" + +DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support" +HOMEPAGE="https://github.com/MeanEYE/Sunflower + https://sunflower-fm.org/" +SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND=" + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/chardet[${PYTHON_USEDEP}] +" + +RDEPEND="${DEPEND} + dev-python/pycairo[${PYTHON_USEDEP}] + x11-libs/vte +" + +S="${WORKDIR}/${MY_PN}-${MY_PV}" + +src_prepare() { + default + + # Upstream's get_version requires a lot of BDEPENDS we do not want. + sed 's%version=get_version()%version="0.5"%g' -i setup.py +} diff --git a/x11-misc/superswitcher/Manifest b/x11-misc/superswitcher/Manifest deleted file mode 100644 index ffe912262407..000000000000 --- a/x11-misc/superswitcher/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST superswitcher-0.6.tar.gz 183184 BLAKE2B c1f6abb573f34b6c2f823d66e2a7ebe0575b690823246705a7c37aa342e3776f1e2240791192af5b9544efb702925b81ec2c9f5a4ecbe868d11135224ba1d2de SHA512 7385c14537a81f3e78509ff7399e1caf84f46fae22ce844f70f7cd72c8865d3808af77229744443178da691dfbcf61cae908c2eb54ef1564c83473ed9ff6ae0b diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch b/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch deleted file mode 100644 index fe3249982870..000000000000 --- a/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: superswitcher-0.6/src/dbus-object.h -=================================================================== ---- superswitcher-0.6.orig/src/dbus-object.h -+++ superswitcher-0.6/src/dbus-object.h -@@ -4,7 +4,7 @@ - #ifndef SUPERSWITCHER_DBUS_OBJECT_H - #define SUPERSWITCHER_DBUS_OBJECT_H - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "forward_declarations.h" - -Index: superswitcher-0.6/src/forward_declarations.h -=================================================================== ---- superswitcher-0.6.orig/src/forward_declarations.h -+++ superswitcher-0.6/src/forward_declarations.h -@@ -18,8 +18,7 @@ typedef struct _SSXineramaScreen SSXiner - #define ABNORMAL_EXIT_CODE_ANOTHER_INSTANCE_IS_RUNNING 1 - #define ABNORMAL_EXIT_CODE_UNKNOWN_COMMAND_LINE_OPTION 2 - --#include <glib/gerror.h> --#include <glib/gtypes.h> -+#include <glib.h> - gboolean superswitcher_hide_popup (void *, GError **); - gboolean superswitcher_show_popup (void *, GError **); - gboolean superswitcher_toggle_popup (void *, GError **); diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch deleted file mode 100644 index 90919a57485b..000000000000 --- a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch +++ /dev/null @@ -1,62 +0,0 @@ -It seems like wnck_window_is_skip_pager isn't all we need to check. - ---- superswitcher/src/screen.c -+++ superswitcher/src/screen.c -@@ -505,6 +505,7 @@ - static SSWindow * - add_window_to_screen (SSScreen *screen, WnckWindow *wnck_window) - { -+ WnckWorkspace *wnck_workspace; - SSWindow *window; - SSWorkspace *workspace; - int n; -@@ -513,7 +514,13 @@ - return NULL; - } - -- n = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window)); -+ wnck_workspace = wnck_window_get_workspace (wnck_window); -+ -+ if (wnck_workspace == NULL) { -+ return NULL; -+ } -+ -+ n = wnck_workspace_get_number (wnck_workspace); - workspace = ss_screen_get_nth_workspace (screen, n); - - window = ss_window_new (workspace, wnck_window); ---- superswitcher/src/window.c -+++ superswitcher/src/window.c -@@ -254,6 +254,7 @@ - static void - on_workspace_changed (WnckWindow *wnck_window, gpointer data) - { -+ WnckWorkspace *wnck_workspace; - SSWindow *window; - SSWorkspace *old_workspace; - SSWorkspace *new_workspace; -@@ -261,12 +262,19 @@ - - window = (SSWindow *) data; - old_workspace = window->workspace; -- new_workspace_id = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window)); -- new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id); -- - ss_workspace_remove_window (old_workspace, window); -+ -+ wnck_workspace = wnck_window_get_workspace (wnck_window); -+ if (wnck_workspace) { -+ new_workspace_id = wnck_workspace_get_number (wnck_workspace); -+ new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id); -+ -+ ss_workspace_add_window (new_workspace, window); -+ window->workspace = new_workspace; -+ } else { -+ window->workspace = NULL; -+ } -+ -- window->workspace = new_workspace; -- ss_workspace_add_window (new_workspace, window); - window->new_window_index = -1; - gtk_widget_queue_draw (gtk_widget_get_toplevel (window->widget)); - } diff --git a/x11-misc/superswitcher/metadata.xml b/x11-misc/superswitcher/metadata.xml deleted file mode 100644 index 83036dcc7b43..000000000000 --- a/x11-misc/superswitcher/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type='project'> -<email>desktop-misc@gentoo.org</email> -</maintainer> -<longdescription lang="en"> -SuperSwitcher is a (more feature-ful) replacement for the Alt-Tab window -switching behavior and Ctrl-Alt-Left/Right/Up/Down workspace switching behavior -that is currently provided by Metacity. -</longdescription> -<upstream> -<remote-id type="google-code">superswitcher</remote-id> -</upstream> -</pkgmetadata> diff --git a/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild b/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild deleted file mode 100644 index 63e4756b5b18..000000000000 --- a/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A more feature-full replacement of the Alt-Tab window switching behavior" -HOMEPAGE="https://code.google.com/p/superswitcher/" -SRC_URI="https://superswitcher.googlecode.com/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/dbus-glib - dev-libs/glib:2 - >=gnome-base/gconf-2:2 - x11-libs/gtk+:2 - >=x11-libs/libwnck-2.10:1 - x11-libs/libXcomposite - x11-libs/libXinerama - x11-libs/libXrender" -DEPEND="${RDEPEND} - gnome-base/gnome-common - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-wnck-workspace.patch - "${FILESDIR}"/${PN}-0.6-glib-single-include.patch -) - -src_prepare() { - default - sed -i \ - -e '/-DG.*_DISABLE_DEPRECATED/d' \ - src/Makefile.am || die #338906 - - mv configure.{in,ac} || die #426262 - - eautoreconf -} diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest index e2de646105bf..73168640bbbd 100644 --- a/x11-misc/sux/Manifest +++ b/x11-misc/sux/Manifest @@ -1 +1 @@ -DIST sux 9403 BLAKE2B 26df0f3759b4f4f70479d1532459e3e04da05098045bed7b1066a89f6c636a1200f28866c7ba251d54c24d621b658686889f2306ed797719dfb95a55fb7b3430 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598 +DIST sux-1.0.1.tar.gz 10614 BLAKE2B f22005a76194ff483ec24ad6ca1d92190fa9f2dbeabb96ad0343b06658b2bc2498e502e167e67df9ed335c74120b443e3daa31530aa18c615416d8464d758a5c SHA512 f121f70daa9e341ae636361675b1c73e3bb5c3f2301b93b32155c79175b3639d307b8fb0b63fbd51d98b6f3ae6c4530c0991343e86f95192a523a9a08a6048f3 diff --git a/x11-misc/sux/files/sux-1.0-dash.patch b/x11-misc/sux/files/sux-1.0-dash.patch deleted file mode 100644 index a2ba00e0be05..000000000000 --- a/x11-misc/sux/files/sux-1.0-dash.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/sux -+++ b/sux -@@ -302,7 +302,8 @@ - then - if [ "$sux_got_minus" = "1" ] - then -- sux_cmd="sh -c \"exec -l \$SHELL\"" -+ # exec -l does not work in dash (Gentoo bug #473200) -+ sux_cmd="sh -c \"exec \$SHELL\"" - else - sux_cmd="\$SHELL" - fi diff --git a/x11-misc/sux/files/sux-1.0-r1.patch b/x11-misc/sux/files/sux-1.0-xauth-and-home.patch index 5be78fd7b7d2..09bcf3826af3 100644 --- a/x11-misc/sux/files/sux-1.0-r1.patch +++ b/x11-misc/sux/files/sux-1.0-xauth-and-home.patch @@ -13,11 +13,11 @@ # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging # around. - export TERM="xauth -q remove $DISPLAY 2>/dev/null;" -+ export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;" ++ export TERM="/usr/bin/xauth -q remove $DISPLAY 2>/dev/null;" if [ -n "$sux_unix_display" ] then - TERM="$TERM xauth -q remove $sux_unix_display;" -+ TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;" ++ TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;" fi # Note that there may be more than one cookie to transfer, hence @@ -26,11 +26,11 @@ if [ $sux_i -eq 9 ] then - TERM="$TERM | xauth nmerge - ;" -+ TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;" ++ TERM="$TERM | /usr/bin/xauth nmerge - ;" sux_i=0 fi done -@@ -316,12 +316,12 @@ +@@ -316,12 +315,12 @@ # wouldn't have the proper access rights anyway... unset XAUTHORITY @@ -44,7 +44,7 @@ if [ -z "$sux_home" ] then echo "WARNING: --preserve-environment has been set, but no good value was found for XAUTHORITY, expect trouble" >&2 -@@ -334,4 +334,4 @@ +@@ -334,4 +333,4 @@ ## # Execute su exec su $sux_su_opts -c "$sux_xauth_cmd \ diff --git a/x11-misc/sux/files/sux-X11R6.patch b/x11-misc/sux/files/sux-X11R6.patch deleted file mode 100644 index 6b345a646965..000000000000 --- a/x11-misc/sux/files/sux-X11R6.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/sux -+++ b/sux -@@ -229,10 +229,10 @@ - # Remove the old cookies. They may cause trouble if we transfer only one - # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging - # around. -- export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;" -+ export TERM="/usr/bin/xauth -q remove $DISPLAY 2>/dev/null;" - if [ -n "$sux_unix_display" ] - then -- TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;" -+ TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;" - fi - - # Note that there may be more than one cookie to transfer, hence -@@ -249,7 +249,7 @@ - sux_i=`expr $sux_i + 1` - if [ $sux_i -eq 9 ] - then -- TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;" -+ TERM="$TERM | /usr/bin/xauth nmerge - ;" - sux_i=0 - fi - done diff --git a/x11-misc/sux/metadata.xml b/x11-misc/sux/metadata.xml index bc1b97e1eb76..02ab588d0b09 100644 --- a/x11-misc/sux/metadata.xml +++ b/x11-misc/sux/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild deleted file mode 100644 index a9b3f0087aa0..000000000000 --- a/x11-misc/sux/sux-1.0-r4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="\"su\" wrapper which transfers X credentials" -HOMEPAGE="http://fgouget.free.fr/sux/sux-readme.shtml" -SRC_URI="http://fgouget.free.fr/sux/sux" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ppc sparc x86" -IUSE="" - -S="${WORKDIR}" - -RDEPEND="x11-apps/xauth" - -src_unpack() { - cp "${DISTDIR}"/${A} . -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-r1.patch \ - "${FILESDIR}"/${PN}-X11R6.patch \ - "${FILESDIR}"/${P}-dash.patch -} - -src_install() { - dobin sux -} diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild new file mode 100644 index 000000000000..257dc59f7c9e --- /dev/null +++ b/x11-misc/sux/sux-1.0.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="\"su\" wrapper which transfers X credentials" +HOMEPAGE="http://fgouget.free.fr/sux/sux-readme.shtml" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ppc sparc x86" + +RDEPEND="x11-apps/xauth" +DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.0-xauth-and-home.patch +) + +src_install() { + dobin ${PN}{,term} + dodoc TODO + newdoc debian/changelog Debian.changelog + doman debian/${PN}{,term}.1 +} diff --git a/x11-misc/svkbd/Manifest b/x11-misc/svkbd/Manifest new file mode 100644 index 000000000000..2f3f6f1fc0bd --- /dev/null +++ b/x11-misc/svkbd/Manifest @@ -0,0 +1 @@ +DIST svkbd-0.2.1.tar.gz 19476 BLAKE2B 8bb33195f82e0ce6c348d0526d8c07d75bbb44f96c133b44020037e312b04197b449cb2dbe586d0e7cd0dca022da1847cc472122a16b764787b46f4d14419b0d SHA512 c6b6f8e4cff4c8aa4ab5cc9369bacbfa226bee3cf7008351d9873a33a59751106b8cd21242c9d13ce463e68968a920459162bbd73173928acf68c067ac81e736 diff --git a/x11-misc/svkbd/metadata.xml b/x11-misc/svkbd/metadata.xml new file mode 100644 index 000000000000..cc99cabe2b10 --- /dev/null +++ b/x11-misc/svkbd/metadata.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> +<email>desktop-misc@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild b/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild new file mode 100644 index 000000000000..0633cbd0bcf8 --- /dev/null +++ b/x11-misc/svkbd/svkbd-0.2.1-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit savedconfig toolchain-funcs + +DESCRIPTION="Simple Virtual Keyboard" +HOMEPAGE="https://tools.suckless.org/x/svkbd/" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXtst +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + restore_config config.def.h + + sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile config.mk || die +} + +src_compile() { + for i in layout*.h; do + i=${i/layout.}; i=${i/.h} + emake \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + LAYOUT=${i} + done +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + + dobin ${PN}-* + + doman ${PN}.1 + + save_config config.def.h +} diff --git a/x11-misc/sw-notify-send/Manifest b/x11-misc/sw-notify-send/Manifest deleted file mode 100644 index 0bb40474c188..000000000000 --- a/x11-misc/sw-notify-send/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tinynotify-send-1.2.1.tar.bz2 266078 BLAKE2B ac3c9510d89fdfd50f70fbfad14476e95e14616cfff9d29c9976af5459e2c73a8ddcf5cb578284b177e78743c46594126343933ae87f78a380bca3ce2350aaa9 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d diff --git a/x11-misc/sw-notify-send/metadata.xml b/x11-misc/sw-notify-send/metadata.xml deleted file mode 100644 index 59cabc032eb7..000000000000 --- a/x11-misc/sw-notify-send/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to> - <remote-id type="github">mgorny/tinynotify-send</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild deleted file mode 100644 index 89f5d2ea4b6e..000000000000 --- a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P=tinynotify-send-${PV} -DESCRIPTION="A system-wide variant of tinynotify-send" -HOMEPAGE="https://github.com/mgorny/tinynotify-send/" -SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libtinynotify:0= - ~x11-libs/libtinynotify-cli-${PV} - x11-libs/libtinynotify-systemwide:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( README ) -S=${WORKDIR}/${MY_P} - -src_configure() { - local myconf=( - --disable-library - --disable-regular - --enable-system-wide - ) - - econf "${myconf[@]}" -} diff --git a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild deleted file mode 100644 index a7650200395f..000000000000 --- a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git" -inherit autotools git-r3 - -MY_P=tinynotify-send-${PV} -DESCRIPTION="A system-wide variant of tinynotify-send" -HOMEPAGE="https://github.com/mgorny/tinynotify-send/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND="x11-libs/libtinynotify:0= - ~x11-libs/libtinynotify-cli-${PV} - x11-libs/libtinynotify-systemwide:0=" -DEPEND="${RDEPEND} - dev-util/gtk-doc - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-library - --disable-regular - --enable-system-wide - ) - - econf "${myconf[@]}" -} diff --git a/x11-misc/sxcs/Manifest b/x11-misc/sxcs/Manifest new file mode 100644 index 000000000000..3fd636a3a269 --- /dev/null +++ b/x11-misc/sxcs/Manifest @@ -0,0 +1,2 @@ +DIST sxcs-0.7.3.tar.gz 22204 BLAKE2B 04bb29188c89622dd2bc348dbc334963a807691ce6fda2f6a6eafedc860be5855d614aeab801dd6cba916dae67a5af92d37317420a04345f1aa8d9203cc44510 SHA512 dbd11ecae74e7a50a346efd0d919952cdd138ebcf75a369888c9f889fcc2752923152b07bcec5f7d4f259672e3af11762d88d9a0b7fe37342f9f5880ecd724ec +DIST sxcs-1.0.0.tar.gz 22787 BLAKE2B 3b36d13ed631c6b7686314f3be7ca4621c88fdf867b0dad02beff815d008fe23e75771f4bdb92a806a93e000d037cae8c12a2315cba74c154e6b94524b3038ae SHA512 dbcd20d894ac2d63f3c93dcee9881a068d40f33cbce5527de746dca2dc34fe264eb91d0849cff81a2730b78645ed421ccf763b544922fbd626361b8056f24d3a diff --git a/x11-misc/sxcs/metadata.xml b/x11-misc/sxcs/metadata.xml new file mode 100644 index 000000000000..5ed3aa71f526 --- /dev/null +++ b/x11-misc/sxcs/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>nrk@disroot.org</email> + <name>NRK</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="codeberg">NRK/sxcs</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/sxcs/sxcs-0.7.3.ebuild b/x11-misc/sxcs/sxcs-0.7.3.ebuild new file mode 100644 index 000000000000..f1fd68f0a646 --- /dev/null +++ b/x11-misc/sxcs/sxcs-0.7.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Color picker and magnifier for X11" +HOMEPAGE="https://codeberg.org/NRK/sxcs" + +SRC_URI="https://codeberg.org/NRK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + +KEYWORDS="amd64" +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXcursor +" +DEPEND="${RDEPEND}" + +src_compile() { + $(tc-getCC) -o sxcs sxcs.c ${CFLAGS} ${LDFLAGS} -l X11 -l Xcursor || die "Compilation failed" +} + +src_install() { + dobin sxcs + doman sxcs.1 + dodoc README.md +} diff --git a/x11-misc/sxcs/sxcs-1.0.0.ebuild b/x11-misc/sxcs/sxcs-1.0.0.ebuild new file mode 100644 index 000000000000..0ffac067fd37 --- /dev/null +++ b/x11-misc/sxcs/sxcs-1.0.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Color picker and magnifier for X11" +HOMEPAGE="https://codeberg.org/NRK/sxcs" + +SRC_URI="https://codeberg.org/NRK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + +KEYWORDS="~amd64" +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXcursor +" +DEPEND="${RDEPEND}" + +src_compile() { + $(tc-getCC) -o sxcs sxcs.c ${CFLAGS} ${LDFLAGS} -l X11 -l Xcursor || die "Compilation failed" +} + +src_install() { + dobin sxcs + doman sxcs.1 + dodoc README.md +} diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest index 6f810d8c8de6..e359766ebeca 100644 --- a/x11-misc/sxhkd/Manifest +++ b/x11-misc/sxhkd/Manifest @@ -1 +1 @@ -DIST sxhkd-0.6.1.tar.gz 34808 BLAKE2B b25ff934d0a7f28b3950152ef800da90c5f990f2efd92e9178fef8a77939dc1ed1bbde55bb5a990c33fd3d0be7490dfb2e799ca56abf3c3c6f20c258169eb100 SHA512 d8cd6166ff7e7bc800ed79c5d63cbdfad4f9824c5a5e19b6a315b2ec570295150600651376265932f5fde8b6127f629a553337c6454a1c78c62b3395aaeb55a2 +DIST sxhkd-0.6.2.tar.gz 35711 BLAKE2B a1dc409314dda68aa3df99bf584d20e492c7220dceb188b844a6bd9374a4c52b7e1a406b96fc77276498db86dd5e5114a50357ddee660f5f08d6fe974de8f990 SHA512 3f758aec3de76c6336a9008e997317ed7a05db0fcd81025d8f856694c2b8162022e25d9a48876de99056748a2dbe6a561a0e1594973c854ac2c98d44af6b03aa diff --git a/x11-misc/sxhkd/metadata.xml b/x11-misc/sxhkd/metadata.xml index 0b9bd4061f6d..1f1b477b4371 100644 --- a/x11-misc/sxhkd/metadata.xml +++ b/x11-misc/sxhkd/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>johu@gentoo.org</email> - <name>Johannes Huber</name> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> <upstream> <remote-id type="github">baskerville/sxhkd</remote-id> diff --git a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild b/x11-misc/sxhkd/sxhkd-0.6.2-r1.ebuild index fcdc146ee0ca..83ed6a4db2ef 100644 --- a/x11-misc/sxhkd/sxhkd-0.6.1.ebuild +++ b/x11-misc/sxhkd/sxhkd-0.6.2-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs systemd DESCRIPTION="Simple X hotkey daemon" @@ -10,18 +11,26 @@ SRC_URI="https://github.com/baskerville/sxhkd/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~riscv x86" -RDEPEND="x11-libs/libxcb +RDEPEND=" + x11-libs/libxcb:= x11-libs/xcb-util-keysyms" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} x11-libs/xcb-util" src_compile() { - emake CC="$(tc-getCC)" PREFIX=/usr + emake CC="$(tc-getCC)" } src_install() { - emake PREFIX=/usr DESTDIR="${D}" install + local emakeargs=( + DESTDIR="${D}" + PREFIX="${EPREFIX}"/usr + DOCPREFIX="${EPREFIX}"/usr/share/doc/${PF} + ) + emake "${emakeargs[@]}" install + systemd_dounit contrib/systemd/${PN}.service } diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index 0cbd3276f02f..b817cd6697e4 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -1,3 +1,3 @@ -DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe -DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13 -DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d +DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880 +DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab +DIST synergy-core-1.14.1.32-stable.tar.gz 4617994 BLAKE2B c015ddff44175ea6b0436ab0d7eccfc4e693d7697a67a1b256d310784d794589b1f1815c95fc5948b9987b2c8d11b6bd0685efe08fc87291835fb03b7dcce970 SHA512 c0835d9f1b3f05a994d8340c7abdeb4ed7ab68739d3c0f05e61f639924978d2de1ed1ded58b398287aa29d013a73114b71a578572d2ad6f96e3fce3e0e1a8bc6 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/files/synergy-1.9.1-cmake-version.patch b/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch deleted file mode 100644 index da7a603119d3..000000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/cmake/Version.cmake 2018-04-10 12:18:42.000000000 +0200 -+++ b/cmake/Version.cmake 2018-05-11 23:29:24.499906356 +0200 -@@ -23,7 +23,7 @@ - if (DEFINED ENV{SYNERGY_VERSION_PATCH}) - set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH}) - else() -- set (SYNERGY_VERSION_PATCH 0) -+ set (SYNERGY_VERSION_PATCH 1) - message (WARNING "Synergy version wasn't set. Set to ${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") - endif() - endif() -@@ -36,29 +36,6 @@ - endif() - endif() - --if (NOT DEFINED SYNERGY_REVISION) -- if (DEFINED ENV{GIT_COMMIT}) -- string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION) -- elseif (SYNERGY_VERSION_STAGE STREQUAL "snapshot") -- execute_process ( -- COMMAND git rev-parse --short=8 HEAD -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- OUTPUT_VARIABLE SYNERGY_REVISION -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ) -- endif() --endif() -- --if (DEFINED SYNERGY_REVISION) -- string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH) -- if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8"))) -- message (FATAL_ERROR "SYNERGY_REVISION ('${SYNERGY_REVISION}') should be a short commit hash") -- endif() -- unset (SYNERGY_REVISION_LENGTH) --else() -- set (SYNERGY_REVISION "0badc0de") --endif() -- - if (DEFINED ENV{BUILD_NUMBER}) - set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER}) - else() -@@ -66,7 +43,6 @@ - endif() - - string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) --set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}") - - if (SYNERGY_VERSION_STAGE STREQUAL "snapshot") - set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}") -@@ -80,7 +56,6 @@ - - add_definitions (-DSYNERGY_VERSION="${SYNERGY_VERSION}") - add_definitions (-DSYNERGY_VERSION_STRING="${SYNERGY_VERSION_STRING}") --add_definitions (-DSYNERGY_REVISION="${SYNERGY_REVISION}") - add_definitions (-DSYNERGY_BUILD_DATE="${SYNERGY_BUILD_DATE}") - add_definitions (-DSYNERGY_BUILD_NUMBER=${SYNERGY_BUILD_NUMBER}) - diff --git a/x11-misc/synergy/files/synergy-1.9.1-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-gtest.patch deleted file mode 100644 index f7a5e614e810..000000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-gtest.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/lib/synergy/KeyMap.h -+++ b/src/lib/synergy/KeyMap.h -@@ -24,7 +24,9 @@ - #include "common/stdset.h" - #include "common/stdvector.h" - -+#if WITH_GENTOO_TEST - #include <gtest/gtest_prod.h> -+#endif - - namespace synergy { - -@@ -327,6 +329,7 @@ - //@} - - -+#if WITH_GENTOO_TEST - private: - FRIEND_TEST(KeyMapTests, - findBestKey_requiredDown_matchExactFirstItem); -@@ -341,6 +344,7 @@ - FRIEND_TEST(KeyMapTests, - findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem); - FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch); -+#endif - - private: - //! Ways to synthesize a key diff --git a/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch deleted file mode 100644 index bc8a96130575..000000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -14,20 +14,5 @@ - # You should have received a copy of the GNU General Public License - # along with this program. If not, see <http://www.gnu.org/licenses/>. - --include_directories( -- ../../ext/gtest -- ../../ext/gtest/include -- ../../ext/gmock -- ../../ext/gmock/include) -- --add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc) --add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc) -- --if (UNIX) -- # ignore warnings in gtest and gmock -- set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w") -- set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w") --endif() -- - add_subdirectory(integtests) - add_subdirectory(unittests) diff --git a/x11-misc/synergy/files/synergy-1.9.1-pthread.patch b/x11-misc/synergy/files/synergy-1.9.1-pthread.patch deleted file mode 100644 index 46ae6e1588b8..000000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-pthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,6 +141,8 @@ - check_library_exists ("pthread" pthread_create "" HAVE_PTHREAD) - if (HAVE_PTHREAD) - list (APPEND libs pthread) -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") - else() - message (FATAL_ERROR "Missing library: pthread") - endif() diff --git a/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch b/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch deleted file mode 100644 index 7a706a084d0b..000000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/gui/CMakeLists.txt 2018-05-11 23:30:26.425509147 +0200 -+++ b/src/gui/CMakeLists.txt 2018-05-11 23:31:53.237354182 +0200 -@@ -39,7 +39,7 @@ - target_link_libraries (synergy dns_sd) - endif() - --qt5_use_modules (synergy Core Widgets Network) -+target_link_libraries (synergy Qt5::Core Qt5::Widgets Qt5::Network) - target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}") - target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}") - ---- a/src/gui/src/ActionDialog.cpp 2018-04-10 12:18:42.000000000 +0200 -+++ b/src/gui/src/ActionDialog.cpp 2018-05-11 23:33:50.814498692 +0200 -@@ -25,6 +25,7 @@ - - #include <QtCore> - #include <QtGui> -+#include <QButtonGroup> - - ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) : - QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), ---- a/src/gui/src/ScreenSetupView.cpp 2018-04-10 12:18:42.000000000 +0200 -+++ b/src/gui/src/ScreenSetupView.cpp 2018-05-11 23:35:33.304496343 +0200 -@@ -22,6 +22,7 @@ - - #include <QtCore> - #include <QtGui> -+#include <QHeaderView> - - ScreenSetupView::ScreenSetupView(QWidget* parent) : - QTableView(parent) diff --git a/x11-misc/synergy/metadata.xml b/x11-misc/synergy/metadata.xml index 11c61fc68912..429e10cbb5c7 100644 --- a/x11-misc/synergy/metadata.xml +++ b/x11-misc/synergy/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> - <remote-id type="google-code">synergy</remote-id> - <remote-id type="github">synergy/synergy</remote-id> + <remote-id type="github">symless/synergy-core</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/synergy/synergy-1.14.1.32.ebuild b/x11-misc/synergy/synergy-1.14.1.32.ebuild new file mode 100644 index 000000000000..f12853d6d34b --- /dev/null +++ b/x11-misc/synergy/synergy-1.14.1.32.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg-utils virtualx + +[[ ${PV} == *_* ]] && MY_PV=${PV/_/-} || MY_PV=${PV}-stable +MY_P=synergy-core-${MY_PV} +GTEST_COMMIT=18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6 + +DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" +HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core/" +SRC_URI=" + https://github.com/symless/synergy-core/archive/${MY_PV}.tar.gz + -> ${MY_P}.tar.gz + https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png + test? ( + https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz + -> googletest-${GTEST_COMMIT}.tar.gz + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gui test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/glib + dev-libs/openssl:= + dev-qt/qtdbus:5 + x11-libs/gdk-pixbuf + x11-libs/libICE:= + x11-libs/libSM:= + x11-libs/libX11:= + x11-libs/libXext:= + x11-libs/libXi:= + x11-libs/libXinerama:= + x11-libs/libXrandr:= + x11-libs/libXtst:= + x11-libs/libnotify + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + gui? ( + dev-qt/linguist-tools:5 + )" + +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 + + if use test; then + rmdir ext/googletest || die + mv "${WORKDIR}/googletest-${GTEST_COMMIT}" ext/googletest || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSYNERGY_BUILD_LEGACY_GUI=$(usex gui) + -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF + -DBUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} + +my_test() { + "${BUILD_DIR}"/bin/unittests && + "${BUILD_DIR}"/bin/integtests +} + +src_test() { + virtx my_test +} + +src_install() { + dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool} + + if use gui; then + newbin "${BUILD_DIR}"/bin/synergy qsynergy + newicon -s 256 "${DISTDIR}"/synergy-1.12.0.png qsynergy.png + make_desktop_entry qsynergy Synergy qsynergy 'Utility;' + fi + + insinto /etc + newins doc/synergy.conf.example synergy.conf + + newman doc/synergyc.man synergyc.1 + newman doc/synergys.man synergys.1 + + einstalldocs +} + +pkg_postinst() { + use gui && xdg_icon_cache_update +} + +pkg_postrm() { + use gui && xdg_icon_cache_update +} diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild deleted file mode 100644 index 0c5c3b75592b..000000000000 --- a/x11-misc/synergy/synergy-1.9.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop gnome2-utils - -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" -HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core" -SRC_URI=" - https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~jer/${PN}.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="libressl qt5" -RESTRICT="test" - -S=${WORKDIR}/${PN}-core-${PV}-stable - -COMMON_DEPEND=" - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - net-misc/curl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXtst - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - net-dns/avahi[mdnsresponder-compat] - ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto -" -RDEPEND=" - ${COMMON_DEPEND} - qt5? ( !x11-misc/qsynergy ) -" - -DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} ) - -PATCHES=( - "${FILESDIR}"/${P}-pthread.patch - "${FILESDIR}"/${P}-internal-gmock-gtest.patch - "${FILESDIR}"/${P}-gtest.patch - "${FILESDIR}"/${P}-cmake-version.patch - "${FILESDIR}"/${P}-qt-5.11.patch -) - -src_configure() { - local mycmakeargs=( - -DSYNERGY_BUILD_LEGACY_GUI=$(usex qt5) - -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF - ) - - cmake-utils_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool} - - if use qt5 ; then - newbin "${BUILD_DIR}"/bin/${PN} qsynergy - newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png - make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility; - fi - - insinto /etc - newins doc/synergy.conf.example synergy.conf - - newman doc/${PN}c.man ${PN}c.1 - newman doc/${PN}s.man ${PN}s.1 - - einstalldocs -} - -pkg_preinst() { - use qt5 && gnome2_icon_savelist -} - -pkg_postinst() { - use qt5 && gnome2_icon_cache_update -} - -pkg_postrm() { - use qt5 && gnome2_icon_cache_update -} diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild deleted file mode 100644 index 3a3b2d0bfac9..000000000000 --- a/x11-misc/synergy/synergy-2.0.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic gnome2-utils cmake-utils - -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" -HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core" -SRC_URI=" - https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="libressl" - -S=${WORKDIR}/${PN}-core-${PV}-stable - -COMMON_DEPEND=" - net-misc/curl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXtst - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto -" -RDEPEND=" - ${COMMON_DEPEND} -" - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - append-cxxflags ${mycmakeargs} - local mycmakeargs=( -DSYNERGY_REVISION=0bd448d5 ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - dobin ../${P}_build/bin/${PN}{c,s} ../${P}_build/bin/synergy-core - - insinto /etc - newins doc/synergy.conf.example synergy.conf - - newman doc/${PN}c.man ${PN}c.1 - newman doc/${PN}s.man ${PN}s.1 - - dodoc doc/synergy.conf.example* ChangeLog -} diff --git a/x11-misc/tabbed/Manifest b/x11-misc/tabbed/Manifest index 83972a7921ec..49f40ffafbf0 100644 --- a/x11-misc/tabbed/Manifest +++ b/x11-misc/tabbed/Manifest @@ -1 +1 @@ -DIST tabbed-0.6.tar.gz 12926 BLAKE2B e92e2c7132f7a760286c61c99faa0b26e411326e172c231f3354e61f8151f561babd4a35998bc06cb7fd87dc962334ef0ddac78ba284cd3090bb1c2dcfa159be SHA512 bcad873251be6b5de21311531e8d24330003b42790cb94d559a0d1be45408b3e0722c14e7c7f2cefd0717fd2a2d7a100fa08fc4e10e7bb669935909602286553 +DIST tabbed-0.8.tar.gz 13970 BLAKE2B 289d3a94224d9c717a3a66a6ea10e34f744b49bf010e7bea6ddb4f8db92a89f8e2ca1d3bbc5c6ffa3402f85117b3bbb0a54140d1e70d6e1f0200c883f46fbe8f SHA512 aa81ee2a293110cdd7660c4643a21bb44573516ddd03657ab4cfd2be2f52f7dd5a4fcfce60fd2b4dac591d13e40f952985780cd8923394fc64e814152729a754 diff --git a/x11-misc/tabbed/metadata.xml b/x11-misc/tabbed/metadata.xml index 229dd61feac9..15cf2ff7a521 100644 --- a/x11-misc/tabbed/metadata.xml +++ b/x11-misc/tabbed/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>jer@gentoo.org</email> -<name>Jeroen Roovers</name> -</maintainer> -<maintainer type="project"> -<email>desktop-misc@gentoo.org</email> -<name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> + <name>Petr Vaněk</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/tabbed/tabbed-0.6.ebuild b/x11-misc/tabbed/tabbed-0.6.ebuild deleted file mode 100644 index 2848e538dacb..000000000000 --- a/x11-misc/tabbed/tabbed-0.6.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit savedconfig toolchain-funcs - -DESCRIPTION="Simple generic tabbed fronted to xembed aware applications" -HOMEPAGE="https://tools.suckless.org/tabbed" -SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND=" - x11-base/xorg-proto - ${RDEPEND} -" - -src_prepare() { - sed config.mk \ - -e '/^CC/d' \ - -e 's|/usr/local|/usr|g' \ - -e 's|^CFLAGS.*|CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)|g' \ - -e 's|^LDFLAGS.*|LDFLAGS += $(CFLAGS) $(LIBS)|g' \ - -e 's|^LIBS.*|LIBS = -lX11|g' \ - -e 's|{|(|g;s|}|)|g' \ - -i || die - - sed Makefile \ - -e 's|{|(|g;s|}|)|g' \ - -e '/^[[:space:]]*@echo/d' \ - -e 's|^ @| |g' \ - -i || die - - restore_config config.h -} - -src_compile() { - emake CC=$(tc-getCC) -} -src_install() { - default - save_config config.h -} diff --git a/x11-misc/tabbed/tabbed-0.8-r1.ebuild b/x11-misc/tabbed/tabbed-0.8-r1.ebuild new file mode 100644 index 000000000000..d86dcca418d1 --- /dev/null +++ b/x11-misc/tabbed/tabbed-0.8-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit savedconfig toolchain-funcs + +DESCRIPTION="Simple generic tabbed fronted to xembed aware applications" +HOMEPAGE="https://tools.suckless.org/tabbed/" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm64 ppc64 ~riscv x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXft +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig +" + +src_prepare() { + default + restore_config config.h +} + +src_compile() { + tc-export CC PKG_CONFIG + + local emakeargs=( + TABBED_CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags x11 xft)" + TABBED_LDFLAGS="${LDFLAGS} $("${PKG_CONFIG}" --libs x11 xft)" + ) + + emake "${emakeargs[@]}" +} + +src_install() { + local emakeargs=( + DESTDIR="${D}" + PREFIX="${EPREFIX}/usr" + DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" + ) + emake "${emakeargs[@]}" install + + save_config config.h +} diff --git a/x11-misc/tdrop/Manifest b/x11-misc/tdrop/Manifest index cdd596c316d8..62e11fadfb1b 100644 --- a/x11-misc/tdrop/Manifest +++ b/x11-misc/tdrop/Manifest @@ -1 +1,2 @@ -DIST tdrop-0.3.0.tar.gz 19495 BLAKE2B 5f72090e6ccacaa4f708715cb1a2eb43bb8acec79f43301da67dbe0a8d81637806603d06b9ad0b2815e8aea1f481271f5b8f8adddba60079ad48ec621f8e8e8f SHA512 3e1c30e42ce96570fabd43b89fd9f17a23d74c4943ef9ab5d1edb4967ffa6c4c0259df4449ef2a18b396d1057f4a19a413fec817ff708d3e41906695cebb67ca +DIST tdrop-0.4.0.tar.gz 21550 BLAKE2B 673ad98aa294410b4547fce842d191fd3c5512cca79361cae35fcb646afd328615daab1fa112bcba9e28cdea6bbeb2ca696bcc78d54c0302d32a91324a8a16d9 SHA512 679fed509e29752ebe3df378e68d9701c9edb53c9162854a8cb623f2da53499b933dad59fa6fc865ac44c67544cd6bcb779316ee4312e87c39559ade1ab313d8 +DIST tdrop-0.5.0.tar.gz 24726 BLAKE2B d0043bcc28115999b89fe6d89790ea4d1d6da71dec7034a283c4f3b5b2b8f065482f8727d6e0d900f5ae00c3ea3d7a06ce03a82902286d509a8b04dd5b46025d SHA512 cfccbdb73b00ea8c1376f34debe2b7f550343100fd47e7f45a859ad692f42abbf58e26316a95813691f4bda05cce657490bfcc7b3765585d9afb396580aefce5 diff --git a/x11-misc/tdrop/metadata.xml b/x11-misc/tdrop/metadata.xml index e22c540bc283..6489284c5d4a 100644 --- a/x11-misc/tdrop/metadata.xml +++ b/x11-misc/tdrop/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> <upstream> - <remote-id type="github">octuid/tdrop</remote-id> + <remote-id type="github">noctuid/tdrop</remote-id> + <changelog>https://github.com/noctuid/tdrop/blob/master/Changelog.org</changelog> </upstream> </pkgmetadata> diff --git a/x11-misc/tdrop/tdrop-0.3.0.ebuild b/x11-misc/tdrop/tdrop-0.4.0.ebuild index 1031384a291e..695b437b87d3 100644 --- a/x11-misc/tdrop/tdrop-0.3.0.ebuild +++ b/x11-misc/tdrop/tdrop-0.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/x11-misc/tdrop/tdrop-0.5.0.ebuild b/x11-misc/tdrop/tdrop-0.5.0.ebuild new file mode 100644 index 000000000000..252c3456998e --- /dev/null +++ b/x11-misc/tdrop/tdrop-0.5.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +DESCRIPTION="WM-Independent Dropdown Creator" +HOMEPAGE="https://github.com/noctuid/tdrop" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/noctuid/tdrop" +else + SRC_URI="https://github.com/noctuid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc64" +fi + +LICENSE="BSD-2" +SLOT="0" +IUSE="" + +RDEPEND=" + app-shells/bash + sys-apps/gawk + sys-process/procps + x11-apps/xprop + x11-apps/xrandr + x11-apps/xwininfo + x11-misc/xdotool +" + +src_compile() { + : +} + +src_install() { + dobin tdrop + doman tdrop.1 + dodoc README.org +} + +pkg_postinst() { + optfeature "tmux session support" app-misc/tmux +} diff --git a/x11-misc/tdrop/tdrop-9999.ebuild b/x11-misc/tdrop/tdrop-9999.ebuild index 1031384a291e..252c3456998e 100644 --- a/x11-misc/tdrop/tdrop-9999.ebuild +++ b/x11-misc/tdrop/tdrop-9999.ebuild @@ -1,7 +1,9 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit optfeature DESCRIPTION="WM-Independent Dropdown Creator" HOMEPAGE="https://github.com/noctuid/tdrop" @@ -20,6 +22,7 @@ IUSE="" RDEPEND=" app-shells/bash + sys-apps/gawk sys-process/procps x11-apps/xprop x11-apps/xrandr @@ -36,3 +39,7 @@ src_install() { doman tdrop.1 dodoc README.org } + +pkg_postinst() { + optfeature "tmux session support" app-misc/tmux +} diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest index 32848c306bc5..4095172010b2 100644 --- a/x11-misc/tint2/Manifest +++ b/x11-misc/tint2/Manifest @@ -1,4 +1,2 @@ -DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe -DIST tint2-16.6.1.tar.gz 546590 BLAKE2B 0e970293b09ba766d795b7bc454f06c7a9e95a7c3534144583f5739fd275d3fee2568677f24b5d9b0809ebbc466351cfa17f91dbb726f5cdae3a0bdc9b9df16f SHA512 ae3b8c7b1573f7bb993a587a125341e4018ace605b4b357a7d633beb02e7622443b92cd11b95028d4704e94211ae9f2e13e89cd3bca91474e7daba2fb9fc2b46 -DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1 -DIST tint2-v16.7.tar.gz 551197 BLAKE2B ef1c5b3dea255e12f6dcea80a29f016e32e48f729f4be3e1fd7421c6fbdbbacde70f42f3052547dca8421b8343d4b41fbf2ea52b07aa4471974f9f0cc6eea7a7 SHA512 a9bb0b55536e09f70b1d14a5748635f5c5ec1b7b22517453a963b240ab593aae43c56e5cbc7b79d5f19103f0e13200faceb2d25afd66c3d941580424ae6d9d31 +DIST tint2-v17.0.2.tar.gz 553734 BLAKE2B 73cd89757963f1a3c3460a2e8e61891e77eb12b9809590dbbbc00df00d03e82d33d6175c7e3ff4623a3390e35fe1530263915b4574dedfd46d9401fbc90d769f SHA512 9bfdf9ba33183ed60b95f73e58d9c1c22af83e9973a0e07ff2825d66d19c7103364426753a07eaecd4dbca278dfc6e22737bc6ce38d9b577b65f672f146e7aa2 +DIST tint2-v17.1.3.tar.gz 573472 BLAKE2B 459833b0bde126bd99f7aa016df81ca81866d641ff8b55c54d397c7eef7f80b2bcb219d56dfdb42e10d21f09856d2d97fafe712c1b9f6002f6f0350c4dbc3685 SHA512 dfdfd011d35130955f243bf390f014fcc691448f284d635a9238616595155a3cd815aa229fd570ae58e94c58b439ae1545f7e13090e174117c50ca48679d0135 diff --git a/x11-misc/tint2/metadata.xml b/x11-misc/tint2/metadata.xml index 3187164d5a91..ede6d14f0e56 100644 --- a/x11-misc/tint2/metadata.xml +++ b/x11-misc/tint2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>amynka@gentoo.org</email> @@ -7,6 +7,7 @@ <use> <flag name="battery">Enable battery status plugin</flag> <flag name="tint2conf">Build/Install tint2conf as well</flag> + <flag name="sanitize">Enable ASAN</flag> </use> <longdescription lang="en">tint2 is a simple panel/taskbar intentionally made for <pkg>x11-wm/openbox</pkg>3, but should also work with other window managers. diff --git a/x11-misc/tint2/tint2-16.2.ebuild b/x11-misc/tint2/tint2-16.2.ebuild deleted file mode 100644 index 97820dabd24e..000000000000 --- a/x11-misc/tint2/tint2-16.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils vcs-snapshot - -DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux." -HOMEPAGE="https://gitlab.com/o9000/tint2" -SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="battery svg startup-notification tint2conf" - -DEPEND=" - dev-libs/glib:2 - svg? ( gnome-base/librsvg:2 ) - >=media-libs/imlib2-1.4.2[X,png] - x11-libs/cairo[X] - x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - >=x11-libs/libXrandr-1.3 - x11-libs/libXrender - startup-notification? ( x11-libs/startup-notification ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_BATTERY="$(usex battery)" - -DENABLE_TINT2CONF="$(usex tint2conf)" - -DENABLE_SN="$(usex startup-notification)" - -DENABLE_RSVG="$(usex svg)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/tint2/tint2-16.6.1.ebuild b/x11-misc/tint2/tint2-16.6.1.ebuild deleted file mode 100644 index 5a5f9d056fd8..000000000000 --- a/x11-misc/tint2/tint2-16.6.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils vcs-snapshot - -DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux." -HOMEPAGE="https://gitlab.com/o9000/tint2" -SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="battery svg startup-notification tint2conf" - -DEPEND=" - dev-libs/glib:2 - svg? ( gnome-base/librsvg:2 ) - >=media-libs/imlib2-1.4.2[X,png] - x11-libs/cairo[X] - x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - >=x11-libs/libXrandr-1.3 - x11-libs/libXrender - startup-notification? ( x11-libs/startup-notification ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_BATTERY="$(usex battery)" - -DENABLE_TINT2CONF="$(usex tint2conf)" - -DENABLE_SN="$(usex startup-notification)" - -DENABLE_RSVG="$(usex svg)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/tint2/tint2-16.6.ebuild b/x11-misc/tint2/tint2-16.6.ebuild deleted file mode 100644 index e901507e5acb..000000000000 --- a/x11-misc/tint2/tint2-16.6.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils vcs-snapshot - -DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux." -HOMEPAGE="https://gitlab.com/o9000/tint2" -SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="battery svg startup-notification tint2conf" - -DEPEND=" - dev-libs/glib:2 - svg? ( gnome-base/librsvg:2 ) - >=media-libs/imlib2-1.4.2[X,png] - x11-libs/cairo[X] - x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - >=x11-libs/libXrandr-1.3 - x11-libs/libXrender - startup-notification? ( x11-libs/startup-notification ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_BATTERY="$(usex battery)" - -DENABLE_TINT2CONF="$(usex tint2conf)" - -DENABLE_SN="$(usex startup-notification)" - -DENABLE_RSVG="$(usex svg)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/tint2/tint2-16.7.ebuild b/x11-misc/tint2/tint2-17.0.2.ebuild index 1a088f5d1abb..bf1274bc041a 100644 --- a/x11-misc/tint2/tint2-16.7.ebuild +++ b/x11-misc/tint2/tint2-17.0.2.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake-utils xdg +inherit cmake xdg -DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux." +DESCRIPTION="Lightweight panel/taskbar for Linux" HOMEPAGE="https://gitlab.com/o9000/tint2" SRC_URI="https://gitlab.com/o9000/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" S=${WORKDIR}/${PN}-v${PV} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="battery svg startup-notification tint2conf" +KEYWORDS="amd64 ~arm64 ~ppc x86" +IUSE="battery startup-notification svg tint2conf" DEPEND=" dev-libs/glib:2 @@ -21,7 +21,7 @@ DEPEND=" >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) + tint2conf? ( x11-libs/gtk+:3 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage @@ -33,8 +33,7 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { - xdg_src_prepare - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -45,22 +44,5 @@ src_configure() { -DENABLE_SN="$(usex startup-notification)" -DENABLE_RSVG="$(usex svg)" ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm + cmake_src_configure } diff --git a/x11-misc/tint2/tint2-17.1.3.ebuild b/x11-misc/tint2/tint2-17.1.3.ebuild new file mode 100644 index 000000000000..0c3ec79c99a1 --- /dev/null +++ b/x11-misc/tint2/tint2-17.1.3.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Lightweight panel/taskbar for Linux" +HOMEPAGE="https://gitlab.com/nick87720z/tint2" +SRC_URI="https://gitlab.com/nick87720z/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" +S=${WORKDIR}/${PN}-v${PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="battery debug startup-notification sanitize svg tint2conf" + +DEPEND=" + dev-libs/glib:2 + svg? ( gnome-base/librsvg:2 ) + >=media-libs/imlib2-1.4.2[X,png] + x11-libs/cairo[X] + x11-libs/pango + tint2conf? ( x11-libs/gtk+:3 ) + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXinerama + >=x11-libs/libXrandr-1.3 + x11-libs/libXrender + startup-notification? ( x11-libs/startup-notification ) + debug? ( + sys-libs/libunwind + ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + cmake_src_prepare + xdg_environment_reset +} + +src_configure() { + local mycmakeargs=( + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -DENABLE_ASAN=$(usex sanitize) + -DENABLE_BATTERY=$(usex battery) + -DENABLE_TINT2CONF=$(usex tint2conf) + -DENABLE_SN=$(usex startup-notification) + -DENABLE_RSVG=$(usex svg) + -DENABLE_BACKTRACE=$(usex debug) + -DENABLE_BACKTRACE_ON_SIGNAL=$(usex debug) + -DENABLE_TRACING=$(usex debug) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/tinynotify-send/metadata.xml b/x11-misc/tinynotify-send/metadata.xml index 59cabc032eb7..66d473d268b3 100644 --- a/x11-misc/tinynotify-send/metadata.xml +++ b/x11-misc/tinynotify-send/metadata.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> <upstream> - <maintainer status="active"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <bugs-to>https://github.com/mgorny/tinynotify-send/issues/</bugs-to> - <remote-id type="github">mgorny/tinynotify-send</remote-id> + <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/touchcal/metadata.xml b/x11-misc/touchcal/metadata.xml index d521ae73b455..b60c79b6d20c 100644 --- a/x11-misc/touchcal/metadata.xml +++ b/x11-misc/touchcal/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/touchcal/touchcal-0.80.ebuild b/x11-misc/touchcal/touchcal-0.80.ebuild index eed48ddb112c..137c42ef4890 100644 --- a/x11-misc/touchcal/touchcal-0.80.ebuild +++ b/x11-misc/touchcal/touchcal-0.80.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Touchscreen calibration utility" HOMEPAGE="http://touchcal.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}_${PV}.orig.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest index 6ca5f2c51065..7f8792aa53f8 100644 --- a/x11-misc/trayer-srg/Manifest +++ b/x11-misc/trayer-srg/Manifest @@ -1,2 +1 @@ -DIST trayer-srg-1.1.7.tar.gz 27987 BLAKE2B aaaa1609bebe91c7b2d3934d68075fa16f393896b7f9300dd6aecd7aa8666a7f3474711fbbc9dae5f72ed5ba8b63d0275f590a5a82ea4547b640a75a81012fc5 SHA512 5bb049af01c3f3f62dc8a5c1932985b92c98e4e2083aebd1dc09256746e097239be54ebc739801773878882a5c8f168a4a13bdac292388f79079ad52c41b2cad DIST trayer-srg-1.1.8.tar.gz 28025 BLAKE2B 3eca8faf7237e1941a611a85a4460310dda1a8d89cb96ae2ac7d77c47a7f8b4fa4bb1a2bcc549fef285ca14a74dce23d9af1b349bb5b0ff9d3bf4abe1ed06351 SHA512 5ae92fdcee64ad1ca59846874dcd4bd4859adeeb80a86f1ed97d62e6306f8ec62d1ee26dba251257242dc25d158a6a550e69f2fcc8739242a2311e37fe1ce310 diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch new file mode 100644 index 000000000000..c0cc5a562da8 --- /dev/null +++ b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch @@ -0,0 +1,24 @@ +Date: Sat, 3 Dec 2022 17:24:58 +0100 +Subject: [PATCH] avoid prestripping of files + +Bug: https://bugs.gentoo.org/837260 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> +--- a/Makefile ++++ b/Makefile +@@ -20,9 +20,9 @@ endif + TARGET = trayer + $(TARGET): $(OBJ) + $(CC) $(LDFLAGS) $(OBJ) -o $@ $(LIBS) +-ifeq (,$(DEVEL)) +- strip $@ +-endif ++# ifeq (,$(DEVEL)) ++# strip $@ ++# endif + + all: $(TARGET) + +-- +2.38.1 + diff --git a/x11-misc/trayer-srg/metadata.xml b/x11-misc/trayer-srg/metadata.xml index cc2811834104..a1757eadc52d 100644 --- a/x11-misc/trayer-srg/metadata.xml +++ b/x11-misc/trayer-srg/metadata.xml @@ -1,8 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">sargon/trayer-srg</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>pascal.jaeger@leimstift.de</email> + <name>Pascal Jäger</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">sargon/trayer-srg</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild index 45e6091acf64..857f7def615b 100644 --- a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild +++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,26 +12,24 @@ SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.g LICENSE="MIT GPL-2+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND=" x11-libs/gdk-pixbuf:2 + dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}"/${PN}-trayer-${PV} src_configure() { - # Custom configure script ./configure --prefix="${EPREFIX}" || die } src_compile() { - emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)" + emake TARGET=${PN} CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild index 8a9b9e21d068..2676ed677f88 100644 --- a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild +++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild @@ -1,37 +1,36 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase" HOMEPAGE="https://github.com/sargon/trayer-srg" SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-trayer-${PV} LICENSE="MIT GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="amd64 x86" RDEPEND=" x11-libs/gdk-pixbuf:2 + dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 " -DEPEND="${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}"/${PN}-trayer-${PV} +PATCHES=( "${FILESDIR}/${P}-avoid-prestripping-of-files.patch" ) src_configure() { - # Custom configure script ./configure --prefix="${EPREFIX}" || die } src_compile() { - emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)" + emake TARGET=${PN} CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest index a2fa373bc415..ee5cb7c5e9a2 100644 --- a/x11-misc/trayer/Manifest +++ b/x11-misc/trayer/Manifest @@ -1,2 +1 @@ DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049 -DIST trayer-1.0.tar.gz 30445 BLAKE2B f95df1496392064b803e712e57a4ec76ed6e9a62dadb254eb044954e38620590cd486dc37d46d56598a7f2db5f27051db47e78df2d788092ccf3cdb7707978e0 SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7 diff --git a/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch new file mode 100644 index 000000000000..e2d750641214 --- /dev/null +++ b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch @@ -0,0 +1,19 @@ +Clang16 will not allow incompatible pointer types by default. + +Bug: https://bugs.gentoo.org/881081 + +Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de> +--- a/plugin.h ++++ b/plugin.h +@@ -9,6 +9,8 @@ + #include <stdio.h> + #include "panel.h" + ++struct _plugin; ++ + typedef struct { + /* common */ + char *fname; +-- +2.38.1 + diff --git a/x11-misc/trayer/metadata.xml b/x11-misc/trayer/metadata.xml index cfab5bb7c8da..cc99cabe2b10 100644 --- a/x11-misc/trayer/metadata.xml +++ b/x11-misc/trayer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild deleted file mode 100644 index f130f5ec280a..000000000000 --- a/x11-misc/trayer/trayer-1.0-r3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop" -HOMEPAGE="http://home.gna.org/fvwm-crystal/" -SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch - "${FILESDIR}"/${P}-dont-include-libXmu.patch - "${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch -) - -src_compile() { - tc-export PKG_CONFIG - - emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -} - -src_install() { - dobin trayer - doman trayer.1 - einstalldocs -} diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild index db168a56b03e..5afa3ceb9eee 100644 --- a/x11-misc/trayer/trayer-1.0-r4.ebuild +++ b/x11-misc/trayer/trayer-1.0-r4.ebuild @@ -1,27 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop" HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/" SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" -RDEPEND=" - dev-libs/glib:2 +RDEPEND="dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" + x11-libs/libX11" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch diff --git a/x11-misc/trayer/trayer-1.0-r5.ebuild b/x11-misc/trayer/trayer-1.0-r5.ebuild new file mode 100644 index 000000000000..0eb7ae28ba83 --- /dev/null +++ b/x11-misc/trayer/trayer-1.0-r5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop" +HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/" +SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" + +RDEPEND="dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libX11" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch + "${FILESDIR}"/${P}-dont-include-libXmu.patch + "${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-fix-incompatible-pointer-types.patch +) + +src_compile() { + tc-export PKG_CONFIG + + emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -C systray + emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" +} + +src_install() { + dobin trayer + doman "${FILESDIR}"/trayer.1 + einstalldocs +} diff --git a/x11-misc/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest index 6da6c4a74414..4c3c38b56b17 100644 --- a/x11-misc/unclutter-xfixes/Manifest +++ b/x11-misc/unclutter-xfixes/Manifest @@ -1 +1 @@ -DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095 +DIST unclutter-xfixes-1.6.tar.gz 8965 BLAKE2B f0975c2fdf1409acf85cb44faf5d0e34a23bb934f8715fb19c9c67a2218f0f1ca85fd83b1a180be2d2362c2547ec040c4494247c63f5bb0bf74da9e779206aaf SHA512 aebcd85d0474471a3cd4a4e190692cf2fe91e47da1057b46e33ee79e5c47e3a488f4ac264530df71a0fbebeb679e0da33bafa19a29c73acd0ae62d0edf8acead diff --git a/x11-misc/unclutter-xfixes/metadata.xml b/x11-misc/unclutter-xfixes/metadata.xml index 3b4eb9e4c1b1..ea9c6471b2e9 100644 --- a/x11-misc/unclutter-xfixes/metadata.xml +++ b/x11-misc/unclutter-xfixes/metadata.xml @@ -1,7 +1,10 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> <upstream> <remote-id type="github">Airblader/unclutter-xfixes</remote-id> </upstream> diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild deleted file mode 100644 index 3e79355700b4..000000000000 --- a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A rewrite of unclutter using the x11-xfixes extension" -HOMEPAGE="https://github.com/Airblader/unclutter-xfixes" -SRC_URI="https://github.com/Airblader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-libs/libev - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXi - !x11-misc/unclutter -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/asciidoc - virtual/pkgconfig -" - -src_compile() { - emake CC="$(tc-getCC)" -} diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild deleted file mode 100644 index 87d0a9f6f807..000000000000 --- a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A rewrite of unclutter using the x11-xfixes extension" -HOMEPAGE="https://github.com/Airblader/unclutter-xfixes" -SRC_URI="https://github.com/Airblader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND=" - dev-libs/libev - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXi - !x11-misc/unclutter -" -DEPEND="${RDEPEND} - app-text/asciidoc - virtual/pkgconfig -" - -src_compile() { - emake CC="$(tc-getCC)" -} diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.6.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.6.ebuild new file mode 100644 index 000000000000..22a16e65df2e --- /dev/null +++ b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.6.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Hides mouse pointer while not in use (rewrite of unclutter)" +HOMEPAGE="https://github.com/Airblader/unclutter-xfixes" +SRC_URI="https://github.com/Airblader/unclutter-xfixes/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + dev-libs/libev + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXi + !x11-misc/unclutter" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-text/asciidoc + virtual/pkgconfig" + +src_compile() { + emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" +} + +src_install() { + dobin unclutter + newman man/${PN}.1 unclutter.1 + einstalldocs +} diff --git a/x11-misc/unclutter/Manifest b/x11-misc/unclutter/Manifest deleted file mode 100644 index 197c6f0ac6cd..000000000000 --- a/x11-misc/unclutter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST unclutter-8.tar.Z 12344 BLAKE2B 10090ec2f3772c17d00cbcb27f416fb528b75641b7d57eeb36ab7e19af2510ebc5901a0394c0ee590a38afb8bf64d4b2b2ed069b0b1a44edcb9b37701f89c9b5 SHA512 9a64e6eceae685cf34b1ea85818735f8f85514ba1eea262476653886d74e469cfd6b9a39edbd098b138a5c89e6b97b42cf251bee59272c76cbeba190979744b4 diff --git a/x11-misc/unclutter/files/unclutter-8-FocusOut.patch b/x11-misc/unclutter/files/unclutter-8-FocusOut.patch deleted file mode 100644 index d26ef8e6a652..000000000000 --- a/x11-misc/unclutter/files/unclutter-8-FocusOut.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fixes blinking pointer and 100% CPU usage with GTK applications -Author: Tao Nelson <taobert@gmail.com> -Debian-Bug: 266118 - ---- a/unclutter.c -+++ b/unclutter.c -@@ -399,7 +399,9 @@ - do{ - XNextEvent(display,&event); - }while(event.type!=LeaveNotify && -- event.type!=FocusOut && -+ /* Some gtk applications seem not to like this: -+ * event.type!=FocusOut && -+ */ - event.type!=UnmapNotify && - event.type!=ConfigureNotify && - event.type!=CirculateNotify && diff --git a/x11-misc/unclutter/files/unclutter-8-include.patch b/x11-misc/unclutter/files/unclutter-8-include.patch deleted file mode 100644 index 688fa129c561..000000000000 --- a/x11-misc/unclutter/files/unclutter-8-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/unclutter.c -+++ b/unclutter.c -@@ -24,6 +24,7 @@ - #include <X11/Xutil.h> - #include <X11/Xproto.h> - #include <stdio.h> -+#include <stdlib.h> - #include "vroot.h" - - char *progname; diff --git a/x11-misc/unclutter/metadata.xml b/x11-misc/unclutter/metadata.xml deleted file mode 100644 index 49c86a887b6a..000000000000 --- a/x11-misc/unclutter/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -</pkgmetadata> diff --git a/x11-misc/unclutter/unclutter-8-r4.ebuild b/x11-misc/unclutter/unclutter-8-r4.ebuild deleted file mode 100644 index e89045f242f1..000000000000 --- a/x11-misc/unclutter/unclutter-8-r4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Hides mouse pointer while not in use" -HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README" -SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z" - -SLOT="0" -LICENSE="public-domain" -KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 ~sparc x86" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/${PN} - -PATCHES=( - "${FILESDIR}"/${P}-include.patch - "${FILESDIR}"/${P}-FocusOut.patch -) - -src_compile() { - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDOPTIONS="${LDFLAGS}" -} - -src_install() { - dobin unclutter - newman unclutter.man unclutter.1x - einstalldocs -} diff --git a/x11-misc/urxvt-font-size/metadata.xml b/x11-misc/urxvt-font-size/metadata.xml index b987c98512a3..eed014cb38ca 100644 --- a/x11-misc/urxvt-font-size/metadata.xml +++ b/x11-misc/urxvt-font-size/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/urxvt-perls/metadata.xml b/x11-misc/urxvt-perls/metadata.xml index d787dd460150..62384141e82d 100644 --- a/x11-misc/urxvt-perls/metadata.xml +++ b/x11-misc/urxvt-perls/metadata.xml @@ -1,14 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>juippis@gentoo.org</email> - <name>Joonas Niilola</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="deprecated">Install scripts which have been marked as deprecated by upstream</flag> </use> <upstream> - <remote-id type="github">muennich/urxvt-perls</remote-id> + <remote-id type="github">xyb3rt/urxvt-perls</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild index e91ce98faa0c..8c551d4c2ada 100644 --- a/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild +++ b/x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Perl extensions for rxvt-unicode" -HOMEPAGE="https://github.com/muennich/urxvt-perls" -SRC_URI="https://github.com/muennich/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/xyb3rt/urxvt-perls" +SRC_URI="https://github.com/xyb3rt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/x11-misc/urxvt-tabbedex/Manifest b/x11-misc/urxvt-tabbedex/Manifest index 30c792166d9f..464ddb741014 100644 --- a/x11-misc/urxvt-tabbedex/Manifest +++ b/x11-misc/urxvt-tabbedex/Manifest @@ -1 +1 @@ -DIST urxvt-tabbedex-20.09.tar.gz 32254 BLAKE2B 7c2bc4d17ad91415210c039adcb01edbafe539e24d82000314124c518d76af97487c1929c168dbce40b4931822aed6224e309e82a855fbc07adf44a0639b538a SHA512 166fa965236d3f60d17d1ad914b3648895237003704219294b0ce72631e6e0431c61a3c320823f227ee58a07f968a1b7d9c479bc58c6246df2f7059e1f04613f +DIST urxvt-tabbedex-22.32.tar.gz 34582 BLAKE2B 58b133f8bc950caacd47a7ec2286a8e2f1b1086d074c21be8204a137d618454c4821da054df0bddfae82128464f5c32a6ffb417f24a91879a1aa2645e1e54034 SHA512 5322c05c5d1fc37d213eac8673d8af5b2f3c6bd378d91097fcd2099e59bf61b2a78697fdee8e394bc3943c7c0d5c6fafbe5efd240da8ef1507681031293711d2 diff --git a/x11-misc/urxvt-tabbedex/metadata.xml b/x11-misc/urxvt-tabbedex/metadata.xml index 0bd14750c669..bfb18a0dbbf7 100644 --- a/x11-misc/urxvt-tabbedex/metadata.xml +++ b/x11-misc/urxvt-tabbedex/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>juippis@gentoo.org</email> - <name>Joonas Niilola</name> - </maintainer> - <stabilize-allarches/> + <!-- maintainer-needed --> + <stabilize-allarches/> + <upstream> + <remote-id type="github">mina86/urxvt-tabbedex</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild index 28cd53709f7b..810342261dfe 100644 --- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.09.ebuild +++ b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="An extended version of rxvt-unicode's tabbed perl extension" HOMEPAGE="https://github.com/mina86/urxvt-tabbedex" @@ -13,7 +13,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -RDEPEND=">=x11-terms/rxvt-unicode-9.21[perl]" +RDEPEND="x11-terms/rxvt-unicode[perl]" DOCS=( AUTHORS README.md command-runner.sample ) diff --git a/x11-misc/urxvtconfig/metadata.xml b/x11-misc/urxvtconfig/metadata.xml index 3ff8b3dc6ff2..742c048a416e 100644 --- a/x11-misc/urxvtconfig/metadata.xml +++ b/x11-misc/urxvtconfig/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>eckertdawid@gmail.com</email> - <name>Dawid Eckert</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">daedreth/urxvtconfig</remote-id> </upstream> diff --git a/x11-misc/urxvtconfig/urxvtconfig-1.0-r1.ebuild b/x11-misc/urxvtconfig/urxvtconfig-1.0-r1.ebuild index 52577904a6b7..a913d75590fd 100644 --- a/x11-misc/urxvtconfig/urxvtconfig-1.0-r1.ebuild +++ b/x11-misc/urxvtconfig/urxvtconfig-1.0-r1.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit qmake-utils +EAPI=7 MY_PN=URXVTConfig +inherit qmake-utils DESCRIPTION="GUI configuration tool for the rxvt-unicode terminal emulator" HOMEPAGE="https://github.com/daedreth/URXVTConfig" SRC_URI="https://github.com/daedreth/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" -SLOT="0" LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" @@ -24,11 +23,13 @@ RDEPEND=" dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 - x11-terms/rxvt-unicode[xft]" + x11-terms/rxvt-unicode[xft] +" DEPEND="${RDEPEND} media-gfx/imagemagick + media-libs/fontconfig x11-libs/libXft - media-libs/fontconfig" +" src_configure() { eqmake5 source/URXVTConfig.pro diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest index 106e76be00d3..0630781c782e 100644 --- a/x11-misc/util-macros/Manifest +++ b/x11-misc/util-macros/Manifest @@ -1 +1 @@ -DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619 +DIST util-macros-1.20.1.tar.xz 83124 BLAKE2B f80f6dd5823bd4264b4a6d50cb01cb0fca739a4d9c164d45fa5f9367f9ab7f6181c654859a3dcbea1e666ce12a1402b984eb028b47d71ce6c7b9bc95ce61474e SHA512 5f44d73c18ff87459cd94a68a961465b3970a36f0b55be65c0ec228320a675561eb24a1b1359745124302446a1a3fadc2f50d3378f439df5bd3e866cb8015286 diff --git a/x11-misc/util-macros/metadata.xml b/x11-misc/util-macros/metadata.xml index e943b72b8a48..926332c2bb66 100644 --- a/x11-misc/util-macros/metadata.xml +++ b/x11-misc/util-macros/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/util/macros</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.20.1.ebuild index 26b75243fcd4..a8bf00a634cf 100644 --- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild +++ b/x11-misc/util-macros/util-macros-1.20.1.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" +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/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest index 49412210ea63..6ecc4d6e9f3d 100644 --- a/x11-misc/vdpauinfo/Manifest +++ b/x11-misc/vdpauinfo/Manifest @@ -1,2 +1 @@ -DIST vdpauinfo-1.3.tar.gz 12159 BLAKE2B 41dc31ef2f45272221e2eea969d7801cc9c8bfd693e64f7d157b17645da654b7f50d780df698736b3e2ea9c55c7d3b6e7ce75f96aacd50bbaa4032dfc753a43f SHA512 2271053c17d389ea600742ffe14e863921f18e504e07cb5db33c98745d2f71aece908408bca0161b3c2fa9cd67de8c741c132a774a4fd9443c7124168a4da79f -DIST vdpauinfo-1.4.tar.bz2 11811 BLAKE2B bf0c268505b8eafb9da7c799518296498f2c04bde33443101625c4a80cfde6418428d3969e9ac0f4222a6985b53f3bd4dff688fc03af29de7576f3af3605e07c SHA512 7227205f35d5ad9bc64537d4e47e1924e7efbcd1185420f5f575eadff23f2932484db9c39c377282ed88fa7fd43d436064b10961082ccbf66c49dac72b4129a3 +DIST vdpauinfo-1.5.tar.bz2 11851 BLAKE2B bb4ee88083fbdf718e3c0e427e6a9c0d5b56148feaf6fa9c7dbb07823f19df44eb7bd08c031d3a40e7929e6fd8fa5c1665dece41758c806cb7ab7c853b7fb3d2 SHA512 a41fd78983dbe5833142535a0860641523ca06e12f5fdf0ed25b6e5b3de82760a8fd8f72a489a596e4453905f614a62992c484d5b53220613827455cd78cfb31 diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml index fed47a353275..d9f02a548258 100644 --- a/x11-misc/vdpauinfo/metadata.xml +++ b/x11-misc/vdpauinfo/metadata.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='person'> -<email>jer@gentoo.org</email> -</maintainer> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">vdpau/vdpauinfo</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild deleted file mode 100644 index 6c12128cc543..000000000000 --- a/x11-misc/vdpauinfo/vdpauinfo-1.3.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 - -DESCRIPTION="Displays info about your card's VDPAU support" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - x11-libs/libX11 - >=x11-libs/libvdpau-1.3 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - default - eautoreconf -} diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild deleted file mode 100644 index 39610aa786da..000000000000 --- a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Displays info about your card's VDPAU support" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=x11-libs/libvdpau-1.4 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - default - eautoreconf -} diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild new file mode 100644 index 000000000000..0a5e0bfd4ccd --- /dev/null +++ b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Displays info about your card's VDPAU support" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/" +SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + >=x11-libs/libvdpau-1.5 + x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + eautoreconf + + append-flags -fno-strict-aliasing #864755 +} diff --git a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild b/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild deleted file mode 100644 index 1c399e6d2057..000000000000 --- a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="Displays info about your card's VDPAU support" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -EGIT_REPO_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - >=x11-libs/libvdpau-1.4 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - default - eautoreconf -} diff --git a/x11-misc/viewglob/metadata.xml b/x11-misc/viewglob/metadata.xml index d35fe20ba4c7..27ac640c0ecd 100644 --- a/x11-misc/viewglob/metadata.xml +++ b/x11-misc/viewglob/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>shell-tools@gentoo.org</email> diff --git a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild index 002f4494df2e..5e6a315f0954 100644 --- a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild +++ b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild @@ -1,34 +1,42 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils readme.gentoo +inherit autotools readme.gentoo-r1 DESCRIPTION="Graphical display of directories and globs referenced at the shell prompt" HOMEPAGE="http://viewglob.sourceforge.net/" -SRC_URI="mirror://sourceforge/viewglob/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/viewglob/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" -IUSE="" +BDEPEND="virtual/pkgconfig" RDEPEND=" dev-libs/glib:2 x11-libs/gtk+:2 || ( app-shells/bash:* app-shells/zsh )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-underlinking.patch "${FILESDIR}"/${P}-format-security.patch ) +src_prepare() { + default + + eautoreconf +} + src_install() { - autotools-utils_src_install - readme.gentoo_src_install + default + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog } diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest index 1fce81202c15..11e76ff3e965 100644 --- a/x11-misc/virtualgl/Manifest +++ b/x11-misc/virtualgl/Manifest @@ -1,3 +1,2 @@ -DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5 -DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e SHA512 c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea -DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280 +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/vgl.initd-r3 b/x11-misc/virtualgl/files/vgl.initd-r4 index 951d73287d23..d40686266e0c 100644 --- a/x11-misc/virtualgl/files/vgl.initd-r3 +++ b/x11-misc/virtualgl/files/vgl.initd-r4 @@ -1,11 +1,11 @@ #!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # TODO: description="*" and other OpenRC 0.9+ candies depend() { - need xdm + need display-manager after sshd } diff --git a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch b/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch deleted file mode 100644 index 6f45ba8a3ffa..000000000000 --- a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch +++ /dev/null @@ -1,105 +0,0 @@ -From faedcc1e36b4ed89a325e01822447900840a0b77 Mon Sep 17 00:00:00 2001 -From: DRC <information@virtualgl.org> -Date: Thu, 13 Feb 2020 19:11:46 -0600 -Subject: [PATCH] Faker: Fix build issue w/ Mesa 19.3.0+ headers - -Mesa changed the signatures for glXGetTransparentIndexSUN() and -glXQueryGLXPbufferSGIX() to match the official GLX extension specs: -https://www.khronos.org/registry/OpenGL/extensions/SUN/GLX_SUN_get_transparent_index.txt -https://www.khronos.org/registry/OpenGL/extensions/SGIX/GLX_SGIX_pbuffer.txt - -Reference: -https://gitlab.freedesktop.org/mesa/mesa/commit/3dd299c3d5b88114894ec30d1fac85fba688201f - -Fixes #109 ---- - ChangeLog.md | 2 ++ - server/faker-glx.cpp | 14 +++++++++++++- - server/faker-sym.h | 8 +++++++- - 3 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog.md b/ChangeLog.md -index 8d092bd7..78391d06 100644 ---- a/ChangeLog.md -+++ b/ChangeLog.md -@@ -6,6 +6,8 @@ - 1. VirtualGL now works properly with 3D applications that use the - `glDrawBuffers()` function and render to the front buffer. - -+2. VirtualGL can now be built using the GLX headers from Mesa 19.3.0 and later. -+ - - 2.6.3 - ===== -diff --git a/server/faker-glx.cpp b/server/faker-glx.cpp -index faea37b6..6e7beb63 100644 ---- a/server/faker-glx.cpp -+++ b/server/faker-glx.cpp -@@ -1,6 +1,6 @@ - // Copyright (C)2004 Landmark Graphics Corporation - // Copyright (C)2005, 2006 Sun Microsystems, Inc. --// Copyright (C)2009, 2011-2019 D. R. Commander -+// Copyright (C)2009, 2011-2020 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) -@@ -2192,11 +2192,18 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute, - CATCH(); - } - -+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 -+void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, -+ unsigned int *value) -+#else - int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, - unsigned int *value) -+#endif - { - glXQueryDrawable(dpy, pbuf, attribute, value); -+ #if !defined(GLX_GLXEXT_VERSION) || GLX_GLXEXT_VERSION < 20190000 - return 0; -+ #endif - } - - -@@ -2358,8 +2365,13 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable) - - // Returns the transparent index from the overlay visual on the 2D X server - -+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 -+int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, -+ unsigned long *transparentIndex) -+#else - int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, - long *transparentIndex) -+#endif - { - int retval = False; - XWindowAttributes xwa; -diff --git a/server/faker-sym.h b/server/faker-sym.h -index b9aa30d0..0168ac7b 100644 ---- a/server/faker-sym.h -+++ b/server/faker-sym.h -@@ -1,6 +1,6 @@ - // Copyright (C)2004 Landmark Graphics Corporation - // Copyright (C)2005, 2006 Sun Microsystems, Inc. --// Copyright (C)2009, 2011, 2013-2016, 2018-2019 D. R. Commander -+// Copyright (C)2009, 2011, 2013-2016, 2018-2020 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) -@@ -535,8 +535,14 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX, Display *, dpy, - - // GLX_SUN_get_transparent_index - -+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 -+FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay, -+ Window, underlay, unsigned long *, transparentIndex, -+ glXGetTransparentIndexSUN) -+#else - FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay, - Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN); -+#endif - - - // GL functions diff --git a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch new file mode 100644 index 000000000000..5e7153c3c383 --- /dev/null +++ b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch @@ -0,0 +1,53 @@ +https://github.com/VirtualGL/virtualgl/pull/233 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Thu, 1 Jun 2023 14:45:17 +0530 +Subject: [PATCH] Dropping use of register keyword + +The usage of register keyword was deprecated in c++14 and it's +completely removed in c++17. Found will building virtualgl on gentoo +with clang-16. + +Bug: https://bugs.gentoo.org/898876 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/server/fltk/src/Fl_Text_Buffer.cxx ++++ b/server/fltk/src/Fl_Text_Buffer.cxx +@@ -1286,7 +1286,7 @@ int Fl_Text_Buffer::substitute_null_characters( char *string, int len ) { + ** routine if no substitution has been done. + */ + void Fl_Text_Buffer::unsubstitute_null_characters( char *string ) { +- register char * c, subsChar = mNullSubsChar; ++ char * c, subsChar = mNullSubsChar; + + if ( subsChar == '\0' ) + return; +--- a/server/fltk/src/Fl_arg.cxx ++++ b/server/fltk/src/Fl_arg.cxx +@@ -314,7 +314,7 @@ without express or implied warranty. + + static int ReadInteger(char* string, char** NextString) + { +- register int Result = 0; ++ int Result = 0; + int Sign = 1; + + if (*string == '+') +@@ -337,7 +337,7 @@ int XParseGeometry(const char* string, int* x, int* y, + unsigned int* width, unsigned int* height) + { + int mask = NoValue; +- register char *strind; ++ char *strind; + unsigned int tempWidth = 0, tempHeight = 0; + int tempX = 0, tempY = 0; + char *nextCharacter; +--- a/util/md5.c ++++ b/util/md5.c +@@ -193,7 +193,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) + */ + void MD5Transform(uint32 buf[4], uint32 in[16]) + { +- register uint32 a, b, c, d; ++ uint32 a, b, c, d; + + a = buf[0]; + b = buf[1]; diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml index 9262412c8f84..1e624dab8a88 100644 --- a/x11-misc/virtualgl/metadata.xml +++ b/x11-misc/virtualgl/metadata.xml @@ -1,19 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>NP-Hardass@gentoo.org</email> - <name>NP-Hardass</name> - </maintainer> - <maintainer type="person"> <email>pacho@gentoo.org</email> <name>Pacho Ramos</name> </maintainer> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>rei4dan@gmail.com</email> <name>My Th</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> @@ -22,6 +18,7 @@ the ability to run OpenGL applications with full 3D hardware acceleration. </longdescription> <upstream> + <remote-id type="github">virtualgl/virtualgl</remote-id> <remote-id type="sourceforge">virtualgl</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild deleted file mode 100644 index 15a2ad641c5e..000000000000 --- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic systemd - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" - inherit git-r3 -else - MY_PN="VirtualGL" - MY_P="${MY_PN}-${PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" -HOMEPAGE="https://www.virtualgl.org/" - -SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE="libressl ssl" - -RDEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - ) - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libXv[${MULTILIB_USEDEP}] - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - amd64? ( abi_x86_32? ( - >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXtst-1.2.3[abi_x86_32] - >=x11-libs/libXv-1.0.10[abi_x86_32] - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] - ) ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - # Use /var/lib, bug #428122 - sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ - server/vglrun.in server/vglgenkey server/vglserver_config || die - - cmake_src_prepare -} - -src_configure() { - # Completely breaks steam/wine for discrete graphics otherwise - # see https://github.com/VirtualGL/virtualgl/issues/16 - append-ldflags "-Wl,--no-as-needed" - - abi_configure() { - local mycmakeargs=( - -DVGL_USESSL="$(usex ssl)" - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" - -DTJPEG_INCLUDE_DIR=/usr/include - -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL - -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so - -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) - ) - cmake_src_configure - } - multilib_parallel_foreach_abi abi_configure -} - -src_install() { - cmake-multilib_src_install - - # Make config dir - dodir /var/lib/VirtualGL - fowners root:video /var/lib/VirtualGL - fperms 0750 /var/lib/VirtualGL - newinitd "${FILESDIR}/vgl.initd-r3" vgl - newconfd "${FILESDIR}/vgl.confd-r2" vgl - - exeinto /usr/libexec - doexe "${FILESDIR}/vgl-helper.sh" - systemd_dounit "${FILESDIR}/vgl.service" - - # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs - mv "${D}"/usr/bin/{,v}glxinfo || die - - # Remove license files, bug 536284 - rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die -} diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild index b1f2ed56343a..27cb5efb4750 100644 --- a/x11-misc/virtualgl/virtualgl-9999.ebuild +++ b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib flag-o-matic systemd if [[ ${PV} == *9999 ]] ; then @@ -13,8 +12,8 @@ else MY_PN="VirtualGL" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" - SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.gz" + KEYWORDS="amd64 x86" fi DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" @@ -22,19 +21,20 @@ HOMEPAGE="https://www.virtualgl.org/" SLOT="0" LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE="libressl ssl" +IUSE="ssl" RDEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXtst[${MULTILIB_USEDEP}] x11-libs/libXv[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] virtual/glu[${MULTILIB_USEDEP}] + virtual/opencl[${MULTILIB_USEDEP}] virtual/opengl[${MULTILIB_USEDEP}] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] @@ -42,7 +42,9 @@ RDEPEND=" >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] + x11-libs/xcb-util-keysyms[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] + virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) ) " @@ -79,10 +81,10 @@ src_install() { cmake-multilib_src_install # Make config dir - dodir /var/lib/VirtualGL + keepdir /var/lib/VirtualGL fowners root:video /var/lib/VirtualGL fperms 0750 /var/lib/VirtualGL - newinitd "${FILESDIR}/vgl.initd-r3" vgl + newinitd "${FILESDIR}/vgl.initd-r4" vgl newconfd "${FILESDIR}/vgl.confd-r2" vgl exeinto /usr/libexec @@ -90,7 +92,9 @@ src_install() { systemd_dounit "${FILESDIR}/vgl.service" # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + # and eglinfo to veglinto because of conflict with mesa-progs[egl] mv "${D}"/usr/bin/{,v}glxinfo || die + mv "${D}"/usr/bin/{,v}eglinfo || die # Remove license files, bug 536284 rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die diff --git a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild index ed68cde9f2f2..74caab53733f 100644 --- a/x11-misc/virtualgl/virtualgl-2.6.3-r1.ebuild +++ b/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib flag-o-matic systemd if [[ ${PV} == *9999 ]] ; then @@ -13,7 +12,7 @@ else MY_PN="VirtualGL" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" - SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -22,18 +21,15 @@ HOMEPAGE="https://www.virtualgl.org/" SLOT="0" LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE="libressl ssl" +IUSE="" RDEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - ) media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXtst[${MULTILIB_USEDEP}] x11-libs/libXv[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] virtual/glu[${MULTILIB_USEDEP}] virtual/opencl[${MULTILIB_USEDEP}] virtual/opengl[${MULTILIB_USEDEP}] @@ -43,6 +39,7 @@ RDEPEND=" >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] + x11-libs/xcb-util-keysyms[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] @@ -51,8 +48,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - # Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version) - "${FILESDIR}/${P}-mesa-19.3.patch" + "${FILESDIR}"/${PN}-3.1-drop-register.patch ) src_prepare() { @@ -70,7 +66,6 @@ src_configure() { abi_configure() { local mycmakeargs=( - -DVGL_USESSL="$(usex ssl)" -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" -DTJPEG_INCLUDE_DIR=/usr/include -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL @@ -86,10 +81,10 @@ src_install() { cmake-multilib_src_install # Make config dir - dodir /var/lib/VirtualGL + keepdir /var/lib/VirtualGL fowners root:video /var/lib/VirtualGL fperms 0750 /var/lib/VirtualGL - newinitd "${FILESDIR}/vgl.initd-r3" vgl + newinitd "${FILESDIR}/vgl.initd-r4" vgl newconfd "${FILESDIR}/vgl.confd-r2" vgl exeinto /usr/libexec @@ -97,11 +92,10 @@ src_install() { systemd_dounit "${FILESDIR}/vgl.service" # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + # and eglinfo to veglinto because of conflict with mesa-progs[egl] mv "${D}"/usr/bin/{,v}glxinfo || die + mv "${D}"/usr/bin/{,v}eglinfo || die # Remove license files, bug 536284 rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die - - # Directory is created if needed at runtime - rm -r "${D}"/var/lib || die } diff --git a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild b/x11-misc/virtualgl/virtualgl-3.1.ebuild index ec1b128132e7..8f7cc8dd0a4d 100644 --- a/x11-misc/virtualgl/virtualgl-2.6.4.ebuild +++ b/x11-misc/virtualgl/virtualgl-3.1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib flag-o-matic systemd if [[ ${PV} == *9999 ]] ; then @@ -13,7 +12,7 @@ else MY_PN="VirtualGL" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" - SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -22,18 +21,15 @@ HOMEPAGE="https://www.virtualgl.org/" SLOT="0" LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE="libressl ssl" +IUSE="" RDEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - ) media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXtst[${MULTILIB_USEDEP}] x11-libs/libXv[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] virtual/glu[${MULTILIB_USEDEP}] virtual/opencl[${MULTILIB_USEDEP}] virtual/opengl[${MULTILIB_USEDEP}] @@ -43,6 +39,7 @@ RDEPEND=" >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] + x11-libs/xcb-util-keysyms[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] @@ -65,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 @@ -81,10 +77,10 @@ src_install() { cmake-multilib_src_install # Make config dir - dodir /var/lib/VirtualGL + keepdir /var/lib/VirtualGL fowners root:video /var/lib/VirtualGL fperms 0750 /var/lib/VirtualGL - newinitd "${FILESDIR}/vgl.initd-r3" vgl + newinitd "${FILESDIR}/vgl.initd-r4" vgl newconfd "${FILESDIR}/vgl.confd-r2" vgl exeinto /usr/libexec @@ -92,11 +88,10 @@ src_install() { systemd_dounit "${FILESDIR}/vgl.service" # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + # and eglinfo to veglinto because of conflict with mesa-progs[egl] mv "${D}"/usr/bin/{,v}glxinfo || die + mv "${D}"/usr/bin/{,v}eglinfo || die # Remove license files, bug 536284 rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die - - # Directory is created if needed at runtime - rm -r "${D}"/var/lib || die } diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest deleted file mode 100644 index 837abe1a6c24..000000000000 --- a/x11-misc/vnc2swf/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vnc2swf-0.5.0.tar.gz 438058 BLAKE2B bb0effab90934746451efbe23610b3534de31ca1f5f8331dfc1f907b9733f69e78d960bd8d27cc6d75cb0ef688045b019b9b984dcd0e6207819e0590b35fa183 SHA512 f1551015eaafb7810b5d6367b73605f97bc5c0d4d3449dfe1a98af90f743133c0534c8988ee72ce2fc8599926a5f3ed5a785bf18788522b4a7c3cb8bc0529913 diff --git a/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch b/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch deleted file mode 100644 index 4c03bb7e5c16..000000000000 --- a/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -12,6 +12,9 @@ - AC_PROG_MAKE_SET - AC_LANG_CPLUSPLUS - -+AC_ARG_VAR([AR], [the archiver to use]) -+AC_CHECK_TOOL([AR], [ar]) -+ - case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) - SOLARIS=yes ---- a/Makefile.in -+++ b/Makefile.in -@@ -95,7 +95,7 @@ - LIBS = @LIBS@ - LDFLAGS = @LDFLAGS@ - RANLIB = @RANLIB@ --AR = ar cq -+AR = @AR@ cq - - prefix = /usr/X11R6 - exec_prefix = $(prefix) ---- a/rdr/Makefile.in -+++ b/rdr/Makefile.in -@@ -37,7 +37,7 @@ - LIBS = @LIBS@ - LDFLAGS = @LDFLAGS@ - RANLIB = @RANLIB@ --AR = ar cq -+AR = @AR@ cq - - .SUFFIXES: - .SUFFIXES: .cxx .c .o ---- a/rfb/Makefile.in -+++ b/rfb/Makefile.in -@@ -36,7 +36,7 @@ - LIBS = @LIBS@ - LDFLAGS = @LDFLAGS@ - RANLIB = @RANLIB@ --AR = ar cq -+AR = @AR@ cq - - .SUFFIXES: - .SUFFIXES: .cxx .c .o diff --git a/x11-misc/vnc2swf/metadata.xml b/x11-misc/vnc2swf/metadata.xml deleted file mode 100644 index 6ecccf31f222..000000000000 --- a/x11-misc/vnc2swf/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <longdescription> - Vnc2swf is a cross-platform screen recording tool for ShockWave Flash (swf) - format. Vnc2swf comes with two different implementations, a Python one - (pyvnc2swf) and C one (vnc2swf). - </longdescription> - <use> - <flag name="x11vnc">Install script that depends on x11vnc</flag> - </use> -</pkgmetadata> diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild deleted file mode 100644 index a589a99435ca..000000000000 --- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions" -HOMEPAGE="https://www.unixuser.org/~euske/vnc2swf/" -SRC_URI="https://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="x11vnc" - -RDEPEND=" - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - x11vnc? ( x11-misc/x11vnc )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${P}-respect-AR.patch # bug 726264 -) - -src_prepare() { - default - sed -i -e "s:docs:html:" README || die - sed -i -e "s:-mouse ::" -e "s:./vnc2swf:vnc2swf:" recordwin.sh || die - - mv configure.{in,ac} || die - eautoconf -} - -src_install() { - dobin vnc2swf - if use x11vnc; then - # this USE flag is needed because recordwin - # only works on x11vnc - newbin recordwin.sh recordwin - fi - insinto /etc/X11/app-defaults - newins Vnc2Swf.ad Vnc2Swf - dodoc README* - - docinto html - dodoc docs/*.{html,swf} -} diff --git a/x11-misc/vym/metadata.xml b/x11-misc/vym/metadata.xml index 8487de8a64b4..a5dd1392ab72 100644 --- a/x11-misc/vym/metadata.xml +++ b/x11-misc/vym/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/vym/vym-2.7.1.ebuild b/x11-misc/vym/vym-2.7.1.ebuild index 7dec5336b1ef..30535620fac7 100644 --- a/x11-misc/vym/vym-2.7.1.ebuild +++ b/x11-misc/vym/vym-2.7.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PLOCALES="cs_CZ de_DE el es fr hr_HR ia it ja pt_BR ru sv zh_CN zh_TW" -inherit desktop l10n qmake-utils +inherit desktop plocale qmake-utils DESCRIPTION="View Your Mind, a mindmap tool" HOMEPAGE="https://www.insilmaril.de/vym/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="dbus" RDEPEND=" + dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 @@ -25,6 +26,9 @@ RDEPEND=" " DEPEND=" ${RDEPEND} +" +BDEPEND=" + dev-qt/qtcore:5 dev-qt/linguist-tools:5 " DOCS=( README.md doc/vym.pdf ) @@ -51,8 +55,8 @@ src_prepare() { rm lang/vym.en.ts || die remove_locale en - l10n_find_plocales_changes lang ${PN}. .ts - l10n_for_each_disabled_locale_do remove_locale + plocale_find_changes lang ${PN}. .ts + plocale_for_each_disabled_locale remove_locale "$(qt5_get_bindir)"/lrelease vym.pro || die } diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild index 539db055b531..d1943a94621b 100644 --- a/x11-misc/vym/vym-9999.ebuild +++ b/x11-misc/vym/vym-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW" -inherit desktop git-r3 l10n qmake-utils +PLOCALES="cs_CZ de_DE el es fr hr_HR ia it ja pt_BR ru sv zh_CN zh_TW" +inherit desktop git-r3 plocale qmake-utils DESCRIPTION="View Your Mind, a mindmap tool" -HOMEPAGE="http://www.insilmaril.de/vym/" +HOMEPAGE="https://www.insilmaril.de/vym/" EGIT_REPO_URI="https://git.code.sf.net/p/vym/code" LICENSE="GPL-2" @@ -15,6 +15,7 @@ KEYWORDS="" IUSE="dbus" RDEPEND=" + dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 @@ -24,6 +25,9 @@ RDEPEND=" " DEPEND=" ${RDEPEND} +" +BDEPEND=" + dev-qt/qtcore:5 dev-qt/linguist-tools:5 " DOCS=( README.md ) @@ -50,8 +54,8 @@ src_prepare() { rm lang/vym.en.ts || die remove_locale en - l10n_find_plocales_changes lang ${PN}. .ts - l10n_for_each_disabled_locale_do remove_locale + plocale_find_changes lang ${PN}. .ts + plocale_for_each_disabled_locale remove_locale "$(qt5_get_bindir)"/lrelease vym.pro || die } diff --git a/x11-misc/wayv/metadata.xml b/x11-misc/wayv/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/wayv/metadata.xml +++ b/x11-misc/wayv/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/wayv/wayv-0.3-r2.ebuild b/x11-misc/wayv/wayv-0.3-r2.ebuild deleted file mode 100644 index b7763a8fdc81..000000000000 --- a/x11-misc/wayv/wayv-0.3-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -DESCRIPTION="Wayv is hand-writing/gesturing recognition software for X" -HOMEPAGE="http://www.stressbunny.com/wayv" -SRC_URI="http://www.stressbunny.com/gimme/wayv/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXtst -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -src_prepare() { - sed -i -e 's| = -Wall -O2| += |g' src/Makefile* || die - tc-export CC -} - -src_install() { - default - - cd doc - default - dodoc HOWTO* -} diff --git a/x11-misc/wayv/wayv-0.3-r3.ebuild b/x11-misc/wayv/wayv-0.3-r3.ebuild index cfda0bef6e80..11ed5a71d171 100644 --- a/x11-misc/wayv/wayv-0.3-r3.ebuild +++ b/x11-misc/wayv/wayv-0.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.stressbunny.com/wayv" SRC_URI="http://www.stressbunny.com/gimme/wayv/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch deleted file mode 100644 index 5d64909d28b2..000000000000 --- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/etc/wbar.cfg.in -+++ b/etc/wbar.cfg.in -@@ -2,8 +2,3 @@ - c: @PACKAGE_NAME@ @DEFAULT_ARGV@ - t: none - --i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png --c: wbar-config --t: Config -- -- diff --git a/x11-misc/wbar/metadata.xml b/x11-misc/wbar/metadata.xml index e36cd4b8fcbb..0c4ad0766c11 100644 --- a/x11-misc/wbar/metadata.xml +++ b/x11-misc/wbar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild b/x11-misc/wbar/wbar-2.3.4-r2.ebuild deleted file mode 100644 index d5e6928b2a88..000000000000 --- a/x11-misc/wbar/wbar-2.3.4-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools bash-completion-r1 eutils - -DESCRIPTION="A fast, lightweight quick launch bar" -HOMEPAGE="https://github.com/rodolf0/wbar" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gtk" - -RDEPEND="media-libs/imlib2[X] - x11-libs/libX11 - gtk? ( gnome-base/libglade - media-libs/freetype:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch - - epatch \ - "${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \ - "${FILESDIR}"/${PN}-2.3.3-nowerror.patch \ - "${FILESDIR}"/${PN}-2.3.3-test.patch \ - "${FILESDIR}"/${P}-automake-1.13.patch \ - "${FILESDIR}"/${P}-completion.patch - - sed -i \ - -e "/^bashcompletiondir/s:=.*$:=$(get_bashcompdir):" \ - etc/Makefile.am || die #482358 - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable gtk wbar-config) -} - -pkg_postinst() { - einfo - elog "media-libs/imlib2 needs to be compiled with the appropriate useflags" - elog "depending on your choice of image files (such as png, jpeg...)" - einfo -} diff --git a/x11-misc/wbar/wbar-2.3.4-r3.ebuild b/x11-misc/wbar/wbar-2.3.4-r3.ebuild index f46e060720dc..a8f753750939 100644 --- a/x11-misc/wbar/wbar-2.3.4-r3.ebuild +++ b/x11-misc/wbar/wbar-2.3.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gtk" RDEPEND=" diff --git a/x11-misc/wdm/files/wdm-1.28-remove-sigsetmask.patch b/x11-misc/wdm/files/wdm-1.28-remove-sigsetmask.patch new file mode 100644 index 000000000000..f76db846e597 --- /dev/null +++ b/x11-misc/wdm/files/wdm-1.28-remove-sigsetmask.patch @@ -0,0 +1,15 @@ +Please reffer https://www.openembedded.org/pipermail/openembedded-core/2011-July/044923.html +--- a/src/wdm/util.c ++++ b/src/wdm/util.c +@@ -113,8 +113,10 @@ CleanUpChild (void) + #ifdef CSRG_BASED + setsid(); + #else ++ sigset_t sigmask; + setpgid (0, getpid ()); +- sigsetmask (0); ++ sigemptyset(&sigmask); ++ sigprocmask(SIG_SETMASK, &sigmask, NULL); + #endif + #ifdef SIGCHLD + (void) Signal (SIGCHLD, SIG_DFL); diff --git a/x11-misc/wdm/metadata.xml b/x11-misc/wdm/metadata.xml index e26a95188b76..02b4dca2051c 100644 --- a/x11-misc/wdm/metadata.xml +++ b/x11-misc/wdm/metadata.xml @@ -1,10 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">voins/wdm</remote-id> </upstream> diff --git a/x11-misc/wdm/wdm-1.28-r4.ebuild b/x11-misc/wdm/wdm-1.28-r4.ebuild deleted file mode 100644 index f6b3385ca80a..000000000000 --- a/x11-misc/wdm/wdm-1.28-r4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pam - -DESCRIPTION="WINGs Display Manager" -HOMEPAGE="https://github.com/voins/wdm" -SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" -IUSE="pam selinux truetype" - -COMMON_DEPEND=">=x11-wm/windowmaker-0.70.0 - truetype? ( x11-libs/libXft ) - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXpm - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext" -RDEPEND="${COMMON_DEPEND} - pam? ( >=sys-auth/pambase-20080219.1 )" - -PATCHES=( - "${FILESDIR}"/${P}-terminateServer.patch - "${FILESDIR}"/${P}-remove-fakehome.patch -) - -src_configure() { - econf \ - --with-wdmdir="${EPREFIX}"/etc/X11/wdm \ - $(use_enable pam) \ - $(use_enable selinux) -} - -src_install() { - default - - rm -f "${ED%/}"/etc/pam.d/wdm || die - pamd_mimic system-local-login wdm auth account password session -} diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r8.ebuild index 797dafa1bf98..1deebf96a564 100644 --- a/x11-misc/wdm/wdm-1.28-r5.ebuild +++ b/x11-misc/wdm/wdm-1.28-r8.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools pam toolchain-funcs DESCRIPTION="WINGs Display Manager" @@ -10,10 +11,11 @@ SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" IUSE="pam selinux truetype" -COMMON_DEPEND=" +DEPEND=" + virtual/libcrypt:= >=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm @@ -21,15 +23,14 @@ COMMON_DEPEND=" pam? ( sys-libs/pam ) truetype? ( x11-libs/libXft ) " -DEPEND=" - ${COMMON_DEPEND} +RDEPEND="${DEPEND} + pam? ( >=sys-auth/pambase-20080219.1 ) +" +BDEPEND=" sys-devel/gettext virtual/pkgconfig " -RDEPEND=" - ${COMMON_DEPEND} - pam? ( >=sys-auth/pambase-20080219.1 ) -" + PATCHES=( "${FILESDIR}"/${P}-terminateServer.patch "${FILESDIR}"/${P}-remove-fakehome.patch @@ -53,5 +54,8 @@ src_install() { default rm -f "${ED}"/etc/pam.d/wdm || die - pamd_mimic system-local-login wdm auth account password session + + if use pam; then + pamd_mimic system-local-login wdm auth account password session + fi } diff --git a/x11-misc/wdm/wdm-1.28-r9.ebuild b/x11-misc/wdm/wdm-1.28-r9.ebuild new file mode 100644 index 000000000000..4e96488782ae --- /dev/null +++ b/x11-misc/wdm/wdm-1.28-r9.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools pam toolchain-funcs + +DESCRIPTION="WINGs Display Manager" +HOMEPAGE="https://github.com/voins/wdm" +SRC_URI="http://voins.program.ru/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86" +IUSE="pam selinux truetype" + +DEPEND=" + virtual/libcrypt:= + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXmu + x11-wm/windowmaker + pam? ( sys-libs/pam ) + truetype? ( x11-libs/libXft ) +" +RDEPEND="${DEPEND} + pam? ( >=sys-auth/pambase-20080219.1 ) +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-terminateServer.patch + "${FILESDIR}"/${P}-remove-fakehome.patch + "${FILESDIR}"/${P}-remove-sigsetmask.patch + "${FILESDIR}"/${P}-pkg_config.patch + "${FILESDIR}"/${P}-ar.patch +) + +src_prepare() { + default + eautoreconf +} +src_configure() { + tc-export AR + econf \ + --with-wdmdir="${EPREFIX}"/etc/X11/wdm \ + $(use_enable pam) \ + $(use_enable selinux) +} + +src_install() { + default + + rm -f "${ED}"/etc/pam.d/wdm || die + + if use pam; then + pamd_mimic system-local-login wdm auth account password session + fi +} diff --git a/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch b/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch index 155233b4b183..6a7ec0084661 100644 --- a/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch +++ b/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch @@ -1,5 +1,5 @@ ---- whaw.c.orig 2014-05-15 12:11:22.404504530 +0400 -+++ whaw.c 2014-05-15 12:11:43.004506325 +0400 +--- a/whaw.c ++++ b/whaw.c @@ -5,6 +5,7 @@ #include <X11/cursorfont.h> #include <X11/extensions/Xinerama.h> diff --git a/x11-misc/whaw/metadata.xml b/x11-misc/whaw/metadata.xml index 39087954721b..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 "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/whaw/whaw-0.2.ebuild b/x11-misc/whaw/whaw-0.2.ebuild index ca7e6ab903de..6987e7948287 100644 --- a/x11-misc/whaw/whaw-0.2.ebuild +++ b/x11-misc/whaw/whaw-0.2.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" - -inherit eutils +EAPI=7 DESCRIPTION="Window manager independent Window Layout tool" HOMEPAGE="http://repetae.net/computer/whaw/" @@ -20,7 +18,6 @@ RDEPEND="dev-libs/popt " DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}/${P}-fix-implicit-declaration-warning.patch" - epatch_user -} +PATCHES=( + "${FILESDIR}/${P}-fix-implicit-declaration-warning.patch" +) 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/metadata.xml b/x11-misc/wininfo/metadata.xml index 66187a0f4213..d3e0f4631255 100644 --- a/x11-misc/wininfo/metadata.xml +++ b/x11-misc/wininfo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> 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/wmctrl/files/amd64-Xlib.patch b/x11-misc/wmctrl/files/amd64-Xlib.patch deleted file mode 100644 index a1039a825023..000000000000 --- a/x11-misc/wmctrl/files/amd64-Xlib.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- wmctrl-1.07.orig/main.c -+++ wmctrl-1.07/main.c -@@ -1425,6 +1425,16 @@ - * - * long_length = Specifies the length in 32-bit multiples of the - * data to be retrieved. -+ * -+ * NOTE: see -+ * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html -+ * In particular: -+ * -+ * When the X window system was ported to 64-bit architectures, a -+ * rather peculiar design decision was made. 32-bit quantities such -+ * as Window IDs, atoms, etc, were kept as longs in the client side -+ * APIs, even when long was changed to 64 bits. -+ * - */ - if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False, - xa_prop_type, &xa_ret_type, &ret_format, -@@ -1441,6 +1451,8 @@ - - /* null terminate the result to make string handling easier */ - tmp_size = (ret_format / 8) * ret_nitems; -+ /* Correct 64 Architecture implementation of 32 bit data */ -+ if(ret_format==32) tmp_size *= sizeof(long)/4; - ret = g_malloc(tmp_size + 1); - memcpy(ret, ret_prop, tmp_size); - ret[tmp_size] = '\0'; diff --git a/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch b/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch new file mode 100644 index 000000000000..8888a0320870 --- /dev/null +++ b/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch @@ -0,0 +1,12 @@ +http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html +--- a/main.c ++++ b/main.c +@@ -1441,6 +1451,8 @@ + + /* null terminate the result to make string handling easier */ + tmp_size = (ret_format / 8) * ret_nitems; ++ /* Correct 64 Architecture implementation of 32 bit data */ ++ if(ret_format==32) tmp_size *= sizeof(long)/4; + ret = g_malloc(tmp_size + 1); + memcpy(ret, ret_prop, tmp_size); + ret[tmp_size] = '\0'; diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml index d8d016215398..06d84e396dc3 100644 --- a/x11-misc/wmctrl/metadata.xml +++ b/x11-misc/wmctrl/metadata.xml @@ -1,15 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - The wmctrl program is a command line tool to interact with an - EWMH/NetWM compatible X Window Manager. It provides command line - access to almost all the features defined in the EWMH specification. - Using it, it's possible to, for example, obtain information about the - window manager, get a detailed list of desktops and managed windows, - switch and resize desktops, change number of desktops, make windows - full-screen, always-above or sticky, and activate, close, move, - resize, maximize and minimize them. - </longdescription> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild deleted file mode 100644 index 338af72ad91e..000000000000 --- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager" -HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl" -SRC_URI="http://sweb.cz/tripie/utils/${PN}/dist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64 ppc ~ppc64 ~sparc x86 ~x86-linux" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2:2 - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -PATCHES=( "${FILESDIR}/amd64-Xlib.patch" ) diff --git a/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild new file mode 100644 index 000000000000..a7bad8f520bc --- /dev/null +++ b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Command line tool to interact with an EWMH/NetWM compatible X Window Manager" +HOMEPAGE="http://tripie.sweb.cz/utils/wmctrl/" +SRC_URI="http://tripie.sweb.cz/utils/wmctrl/dist/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/libX11 + x11-libs/libXmu" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-64bit-xlib.patch +) diff --git a/x11-misc/wmname/metadata.xml b/x11-misc/wmname/metadata.xml index 6f49eba8f496..115e9d64a669 100644 --- a/x11-misc/wmname/metadata.xml +++ b/x11-misc/wmname/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/wmname/wmname-0.1-r1.ebuild b/x11-misc/wmname/wmname-0.1-r1.ebuild index eb9240796dc4..d7e6c152feab 100644 --- a/x11-misc/wmname/wmname-0.1-r1.ebuild +++ b/x11-misc/wmname/wmname-0.1-r1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -DESCRIPTION="utility to set the name of your window manager" +DESCRIPTION="Utility to set the name of your window manager" HOMEPAGE="https://tools.suckless.org/x/wmname" SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~sparc x86" -IUSE="" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND}" diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch new file mode 100644 index 000000000000..12f65b94fb62 --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch @@ -0,0 +1,25 @@ +From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= <guenal.davalan@uca.fr> +Date: Wed, 18 Nov 2020 08:40:45 +0100 +Subject: [PATCH] scan: limit access to shared memory segments to current user + +--- + src/scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scan.c b/src/scan.c +index 43e00d2..12994d5 100644 +--- a/src/scan.c ++++ b/src/scan.c +@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h, + + #if HAVE_XSHM + shm->shmid = shmget(IPC_PRIVATE, +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); + + if (shm->shmid == -1) { + rfbErr("shmget(%s) failed.\n", name); +-- +2.26.2 + 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 index 8e5d8a692175..3a21f30d7f14 100644 --- a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch @@ -1,93 +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..fb9daa6 100644 +index 04c2e27..ae82cd9 100644 --- a/src/sslhelper.c +++ b/src/sslhelper.c -@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag, - static int crl_callback(X509_STORE_CTX *callback_ctx) { - const ASN1_INTEGER *revoked_serial; - X509_STORE_CTX *store_ctx; --#if OPENSSL_VERSION_NUMBER > 0x10100000L -+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - X509_OBJECT *obj; - #else - X509_OBJECT obj; -@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { - * the current certificate in order to verify it's integrity. */ - store_ctx = X509_STORE_CTX_new(); - X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL); --#if OPENSSL_VERSION_NUMBER > 0x10100000L -+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - obj = X509_OBJECT_new(); - rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj); - crl = X509_OBJECT_get0_X509_CRL(obj); -@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { - rfbLog("Invalid signature on CRL\n"); - X509_STORE_CTX_set_error(callback_ctx, - X509_V_ERR_CRL_SIGNATURE_FAILURE); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - X509_OBJECT_free(obj); - #else - X509_OBJECT_free_contents(&obj); -@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { - rfbLog("Found CRL has invalid nextUpdate field\n"); - X509_STORE_CTX_set_error(callback_ctx, - X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - X509_OBJECT_free(obj); - #else - X509_OBJECT_free_contents(&obj); -@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { - rfbLog("Found CRL is expired - " - "revoking all certificates until you get updated CRL\n"); - X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - X509_OBJECT_free(obj); - #else - X509_OBJECT_free_contents(&obj); - #endif - return 0; /* Reject connection */ - } --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - X509_OBJECT_free(obj); - #else - X509_OBJECT_free_contents(&obj); -@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { - * the current certificate in order to check for revocation. */ - store_ctx = X509_STORE_CTX_new(); - X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL); --#if OPENSSL_VERSION_NUMBER > 0x10100000L -+#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - obj = X509_OBJECT_new(); - rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj); - crl = X509_OBJECT_get0_X509_CRL(obj); -@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { - "revoked per CRL from issuer %s\n", serial, serial, cp); - OPENSSL_free(cp); - X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - X509_OBJECT_free(obj); - #else - X509_OBJECT_free_contents(&obj); -@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) { - return 0; /* Reject connection */ - } - } --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - X509_OBJECT_free(obj); - #else - X509_OBJECT_free_contents(&obj); -@@ -1596,7 +1596,7 @@ static int switch_to_anon_dh(void) { +@@ -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) ++#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-r1 index b6b16dafb943..8907b3858a31 100644 --- a/x11-misc/x11vnc/files/x11vnc.init.d +++ b/x11-misc/x11vnc/files/x11vnc.init.d-r1 @@ -1,12 +1,12 @@ #!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description="The x11vnc daemon init script" depend() { need net - need xdm + need display-manager } checkconfig() { @@ -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/metadata.xml b/x11-misc/x11vnc/metadata.xml index 40fa3182ee05..432585e4ec19 100644 --- a/x11-misc/x11vnc/metadata.xml +++ b/x11-misc/x11vnc/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>alexander@tsoy.me</email> <name>Alexander Tsoy</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild deleted file mode 100644 index 0647c2bea807..000000000000 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 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" -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 libressl +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 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - 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 -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --without-v4l because of missing video4linux 2.x support wrt #389079 - # --with-crypto --with-ssl because USE=-ssl is broken (bug #686494) - econf \ - --with-crypto \ - --with-ssl \ - --without-v4l \ - --without-xkeyboard \ - --without-fbpm \ - --without-dpms \ - $(use_with crypt) \ - $(use_with fbcon fbdev) \ - $(use_with xcomposite) \ - $(use_with xdamage) \ - $(use_with xfixes) \ - $(use_with xinerama) \ - $(use_with xrandr) \ - $(use_with zeroconf avahi) -} - -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-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r8.ebuild index e25329e5f473..62b802f2bb43 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r8.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 autotools @@ -11,8 +11,8 @@ 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 libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" +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=" >=net-libs/libvncserver-0.9.8[ssl=] @@ -20,10 +20,8 @@ COMMON_DEPEND=" x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) + virtual/libcrypt:= + ssl? ( dev-libs/openssl:0= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) @@ -43,8 +41,10 @@ RDEPEND="${COMMON_DEPEND} 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}-libressl.patch "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-CVE-2020-29074.patch + "${FILESDIR}"/${P}-implicit-function-declaration.patch + "${FILESDIR}"/${P}-libressl.patch # 903001 ) src_prepare() { @@ -75,6 +75,6 @@ src_configure() { src_install() { default - newinitd "${FILESDIR}/x11vnc.init.d" x11vnc + newinitd "${FILESDIR}/x11vnc.init.d-r1" x11vnc newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc } diff --git a/x11-misc/x2vnc/files/x2vnc-1.7.2-clang16.patch b/x11-misc/x2vnc/files/x2vnc-1.7.2-clang16.patch new file mode 100644 index 000000000000..7b9cd1b50b69 --- /dev/null +++ b/x11-misc/x2vnc/files/x2vnc-1.7.2-clang16.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/870652 +--- a/rfbproto.c ++++ b/rfbproto.c +@@ -25,2 +25,4 @@ + ++#include <ctype.h> ++#include <time.h> + #include <unistd.h> +--- a/sockets.c ++++ b/sockets.c +@@ -33,2 +33,3 @@ + void PrintInHex(char *buf, int len); ++int tunnel(char *gatewayhost, char *remotehost, int remoteport); + +--- a/vncauth.c ++++ b/vncauth.c +@@ -28,2 +28,4 @@ + #include <sys/stat.h> ++#include <time.h> ++#include <unistd.h> + #include <vncauth.h> +--- a/x.c ++++ b/x.c +@@ -26,2 +26,3 @@ + #include <sys/types.h> ++#include <time.h> + #include <unistd.h> +--- a/x2vnc.c ++++ b/x2vnc.c +@@ -25,2 +25,3 @@ + ++#include <time.h> + #include <unistd.h> diff --git a/x11-misc/x2vnc/metadata.xml b/x11-misc/x2vnc/metadata.xml index 49c86a887b6a..3ab9b4a739d3 100644 --- a/x11-misc/x2vnc/metadata.xml +++ b/x11-misc/x2vnc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild deleted file mode 100644 index b9d93cf24e77..000000000000 --- a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Control a remote computer running VNC from X" -HOMEPAGE="http://fredrik.hubbe.net/x2vnc.html" -SRC_URI="http://fredrik.hubbe.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ppc sparc x86" -IUSE="tk" - -RDEPEND="x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libXinerama" -DEPEND="${RDEPEND} - x11-base/xorg-proto - tk? ( dev-tcltk/expect )" - -PATCHES=( - "${FILESDIR}/expectk.patch" -) - -src_install() { - dodir /usr/share /usr/bin - emake DESTDIR="${D}" install - use tk && dobin contrib/tkx2vnc - dodoc ChangeLog README -} diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild new file mode 100644 index 000000000000..610ab7161a8d --- /dev/null +++ b/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Control a remote computer running VNC from X" +HOMEPAGE="https://fredrik.hubbe.net/x2vnc.html" +SRC_URI="https://fredrik.hubbe.net/x2vnc/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ppc sparc x86" +IUSE="tk" + +COMMON_DEPEND=" + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXxf86dga" +RDEPEND=" + ${COMMON_DEPEND} + tk? ( dev-tcltk/expect )" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/expectk.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_configure() { + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + default +} + +src_install() { + dodir /usr/share /usr/bin + emake DESTDIR="${D}" install + use tk && dobin contrib/tkx2vnc + dodoc ChangeLog README +} diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest index b7569af88c55..1de96fbf7187 100644 --- a/x11-misc/x2x/Manifest +++ b/x11-misc/x2x/Manifest @@ -1,4 +1 @@ -DIST x2x-1.27-keymap.diff.gz 1145 BLAKE2B cca78c368a9f5a27c94121eec12ab800322d1b0549c1be940b22dd455cbd42761283d1646bba8e098b94364cd6023ef6e615df9f788cf68913af967077eb6de9 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f -DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131 -DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01 -DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71 +DIST x2x-1.30.tar.gz 52760 BLAKE2B fae2eeb9aa68241c3ba9e79021aa9313a5852048f23b6be8ad5de7dd090d2cd09c006f4c1b1403ccfa8057f314657c2248463a7c53187e41291742cfaa04139a SHA512 cb14b40e1511e3fe6c927443f5f411a827ebf6c313bfb46af0165eebdd534c8aa3abcc8064b89420b7f44c23c518ed4f02bab4c23bbcfaece8910a3f824c9c11 diff --git a/x11-misc/x2x/files/x2x_1.30-10-keymap.patch b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch new file mode 100644 index 000000000000..b9bb1f9b9623 --- /dev/null +++ b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch @@ -0,0 +1,115 @@ +--- a./x2x.c ++++ b./x2x.c +@@ -321,6 +321,12 @@ typedef struct _sticky { + KeySym keysym; + } STICKY, *PSTICKY; + ++typedef struct _keymap { ++ struct _keymap * pNext; ++ KeySym from; ++ KeySym to; ++} KEYMAP, *PKEYMAP; ++ + typedef int (*HANDLER)(); /* event handler function */ + + /* These prototypes need the typedefs */ +@@ -377,6 +383,7 @@ static Bool doDpmsMouse = False; + static int logicalOffset= 0; + static int nButtons = 0; + static KeySym buttonmap[N_BUTTONS + 1][MAX_BUTTONMAPEVENTS + 1]; ++static PKEYMAP keymaps = NULL; + static Bool noScale = False; + static int compRegLeft = 0; + static int compRegRight = 0; +@@ -571,7 +578,8 @@ char **argv; + PSHADOW pShadow; + extern char *lawyerese; + PSTICKY pNewSticky; +- KeySym keysym; ++ PKEYMAP pNewKeymap; ++ KeySym keysym,keysym2; + int button; + int eventno; + char *keyname, *argptr; +@@ -703,6 +711,22 @@ char **argv; + } else { + printf("x2x: warning: can't translate %s\n", argv[arg]); + } ++ } else if (!strcasecmp(argv[arg], "-keymap")) { ++ if ((++arg+1) >= argc) Usage(); ++ if (((keysym = XStringToKeysym(argv[arg])) != NoSymbol) && ++ ((keysym2 = XStringToKeysym(argv[arg+1])) != NoSymbol)) { ++ pNewKeymap = (PKEYMAP)malloc(sizeof(KEYMAP)); ++ pNewKeymap->pNext = keymaps; ++ pNewKeymap->from = keysym; ++ pNewKeymap->to = keysym2; ++ keymaps = pNewKeymap; ++#ifdef DEBUG ++ printf("will translate key %s to %s\n", argv[arg],argv[arg+1]); ++#endif ++ } else { ++ printf("x2x: warning: can't translate %s or %s\n", argv[arg],argv[arg+1]); ++ } ++ arg++; + } else if (!strcasecmp(argv[arg], "-buttonmap")) { + if (++arg >= argc) Usage(); + button = atoi(argv[arg]); +@@ -842,6 +842,7 @@ static void Usage() + printf(" -completeregionup <COORDINATE>\n"); + printf(" -completeregionlow <COORDINATE>\n"); + printf(" -struts\n"); ++ printf(" -keymap <FROM-KEYSYM> <TO-KEYSYM>\n"); + #ifdef WIN_2_X + printf(" -offset [-]<pixel offset of \"to\">\n"); + printf("WIN_2_X build allows Windows or X as -from display\n"); +@@ -2200,6 +2224,7 @@ XKeyEvent *pEv; + PSHADOW pShadow; + Bool bPress; + PSTICKY pSticky; ++ PKEYMAP pKeymap; + Bool DoFakeShift = False; + KeyCode toShiftCode; + +@@ -2211,6 +2236,15 @@ XKeyEvent *pEv; + XKeysymToString(keysym), (bPress ? "pressed" : "released"), pEv->state); + #endif + ++ for (pKeymap = keymaps; pKeymap; pKeymap = pKeymap->pNext) ++ if (keysym == pKeymap->from) { ++ keysym = pKeymap->to; ++#ifdef DEBUG ++ printf("Key mapped from %x to %x\n", pKeymap->from, pKeymap->to); ++#endif ++ } ++ ++ + /* If CapsLock is on, we need to do some funny business to make sure the */ + /* "to" display does the right thing */ + if(doCapsLkHack && (pEv->state & 0x2)) + +--- a./x2x.1 ++++ b./x2x.1 +@@ -309,6 +309,12 @@ Describes uppermost coordinate of complete rectangle region in from-display. + .B \-completeregionlow + .IP + Describes lowermost coordinate of complete rectangle region in from-display. ++.TP ++.B \-keymap \fIfrom-keysym\fP \fIto-keysym\fP ++.IP ++Translates the \fIfrom-keysym\fP keysym of the first X to \fIto-keysym\fP of the second X. ++See X11/keysymdef.h for available keysyms. ++Alternatively you can use setxkbmap, as described in the BUGS section. + .SH EXAMPLES + Calling the system whose keyboard is to be used "primary" and the + other system "secondary", you need to specify either \-from +@@ -329,6 +333,10 @@ secondary $ ssh \-X primary x2x \-from :0 \-west + run directly indirectly on primary: + .IP + primary $ ssh \-A secondary env DISPLAY=:0.0 ssh \-X primary x2x \-from :0 \-east ++.TP ++set a custom keymap binding: ++.IP ++x2x -keymap ISO_Level3_Shift Mode_switch + + .RE + If your primary display is configured with several monitors having different diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml index 2ba8e9e851e4..5d2f87cc3174 100644 --- a/x11-misc/x2x/metadata.xml +++ b/x11-misc/x2x/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person" proxied="yes"> + <email>rndxelement@protonmail.com</email> + <name>Philipp Rösner</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> </pkgmetadata> diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild deleted file mode 100644 index 4c02869b428b..000000000000 --- a/x11-misc/x2x/x2x-1.27-r3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A utility to connect the Mouse and KeyBoard to another X" -HOMEPAGE="http://www.the-labs.com/X11/#x2x" -SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz - mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz - mirror://gentoo/x2x_1.27-8-initvars.patch.gz - mirror://gentoo/${P}-keymap.diff.gz" - -LICENSE="x2x" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc x86" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXext" -DEPEND="${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/imake" - -PATCHES=( - # Patch from Debian to add -north and -south, among other fixes - "${WORKDIR}"/x2x_1.27-8.diff - # Fix variable initialization in Debian patch - "${WORKDIR}"/x2x_1.27-8-initvars.patch - # Patch to fix bug #126939 - # AltGr does not work in x2x with different keymaps: - "${WORKDIR}"/${P}-keymap.diff -) - -src_prepare() { - default - - # Revert part of debian patch messing with CFLAGS - sed -i '/CFLAGS = -Wall/d' Imakefile || die - # Man-page is packaged as x2x.1 but needs to be x2x.man for building - mv x2x.1 x2x.man || die -} - -src_configure() { - xmkmf || die -} - -src_compile() { - emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - default - newman x2x.man x2x.1 -} diff --git a/x11-misc/x2x/x2x-1.30-r1.ebuild b/x11-misc/x2x/x2x-1.30-r1.ebuild new file mode 100644 index 000000000000..202c42f4bebf --- /dev/null +++ b/x11-misc/x2x/x2x-1.30-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="A utility to connect the mouse and keyboard to another X" +HOMEPAGE="https://github.com/dottedmag/x2x" +SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-debian-1.30-10 + +LICENSE="MIT BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~mips ppc x86" + +RDEPEND="x11-libs/libX11 + x11-libs/libXtst + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # Patch to fix bug #126939 + # AltGr does not work in x2x with different keymaps: + "${FILESDIR}"/${PN}_1.30-10-keymap.patch +) + +DOCS=( README AUTHORS INSTALL ChangeLog ChangeLog.old ) + +src_prepare() { + default + + eautoreconf + + append-cflags -std=gnu89 # old codebase, incompatible with c2x +} + +src_compile() { + emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" +} + +src_install() { + default + dodoc -r docs/ +} diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest index 84765264890d..ec1e9c60886b 100644 --- a/x11-misc/xaos/Manifest +++ b/x11-misc/xaos/Manifest @@ -1,2 +1,3 @@ DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 +DIST xaos-4.2.1_p20210828.tar.gz 10918756 BLAKE2B c1431596b503d9b99c880945edae577c493ff4061020052d16dafe79f3abce0b137b789493b103a35d96ac954a47d76aa47d32972feaab0406d2cedc0e685504 SHA512 847315566c72d6b793f32b2c468b0c90e69877d9e9620f1f871e768cfdaf5b156c0d5b568274f3fb89b58ffb74c990108a96a94c21a753965b682adc5e99dbf3 DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262 diff --git a/x11-misc/xaos/files/xaos-3.4-include.patch b/x11-misc/xaos/files/xaos-3.4-include.patch index 65f7b8c5630c..3659ccc35a88 100644 --- a/x11-misc/xaos/files/xaos-3.4-include.patch +++ b/x11-misc/xaos/files/xaos-3.4-include.patch @@ -1,5 +1,5 @@ ---- src/util/thread.c.orig 2009-03-28 10:50:49.817619387 +0000 -+++ src/util/thread.c 2009-03-28 10:59:40.048185946 +0000 +--- a/src/util/thread.c ++++ b/src/util/thread.c @@ -1,3 +1,4 @@ +#include <stdlib.h> #ifndef _plan9_ diff --git a/x11-misc/xaos/files/xaos-3.4-png.patch b/x11-misc/xaos/files/xaos-3.4-png.patch deleted file mode 100644 index 454f8acaa994..000000000000 --- a/x11-misc/xaos/files/xaos-3.4-png.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2009-03-28 09:50:18.764999182 +0000 -+++ configure.in 2009-03-28 09:49:18.685947638 +0000 -@@ -98,7 +98,7 @@ - AC_ARG_WITH(png, - [ --with-png=yes/no enables/disables PNG saving support],[ - if test x$withval = xyes; then -- png=test -+ png=yes - fi - if test x$withval = xno; then - png=no diff --git a/x11-misc/xaos/files/xaos-3.6-buildsystem.patch b/x11-misc/xaos/files/xaos-3.6-buildsystem.patch new file mode 100644 index 000000000000..6cdb38ce6405 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.6-buildsystem.patch @@ -0,0 +1,86 @@ +--- a/configure.in ++++ b/configure.in +@@ -11,7 +11,6 @@ + + AC_PROG_CC + AX_COMPILER_VENDOR +-AX_CC_MAXOPT + + dnl + dnl GNU gettext related things +@@ -86,7 +85,7 @@ + AC_ARG_WITH(png, + [ --with-png=yes/no enables/disables PNG saving support],[ + if test x$withval = xyes; then +- png=test ++ png=yes + fi + if test x$withval = xno; then + png=no +@@ -141,7 +140,7 @@ + dnl Checks for programs. + + DRIVERDIRS="" +-LOCALEDIR="/usr/share/locale" ++LOCALEDIR="$prefix/share/locale" + DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a" + AC_PROG_INSTALL + +@@ -422,7 +421,7 @@ + AC_SUBST(REALTOPDIR) + BINPATH="$REALTOPDIR/bin" + AC_SUBST(BINPATH) +-AR="ar" ++AC_CHECK_TOOL([AR], [ar]) + AC_SUBST(AR) + SRCPATH="$REALTOPDIR/src" + AC_SUBST(SRCPATH) +@@ -450,7 +449,7 @@ + echo "using GSL for complex numbers" + GSL_LIBS=`$GSL_CONFIG --libs` + GSL_CFLAGS=`$GSL_CONFIG --cflags` +- CFLAGS="$CFLAGS $GSL_CFLAGS -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL" ++ CFLAGS="$CFLAGS $GSL_CFLAGS -DSFFE_USING -DSFFE_CMPLX_GSL" + DRIVERLIBS="$DRIVERLIBS lib/libsffe.a" + ASM_CMPLX_O="" + fi +@@ -473,8 +472,6 @@ + fi + fi + echo "------------------------------------------------------------" +-else +- CFLAGS="$CFLAGS -fomit-frame-pointer" + fi + + +--- a/Makefile.in ++++ b/Makefile.in +@@ -36,7 +36,7 @@ + @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help + @INSTALL@ -d $(DESTDIR)$(bindir) + @INSTALL@ -d $(DESTDIR)$(mandir)/man6 +- @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir) ++ @INSTALL@ bin/xaos $(DESTDIR)$(bindir) + @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial + + @INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples +@@ -49,7 +49,7 @@ + + @INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs + @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help +- @INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc ++ @INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc + @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 + test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)" + @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info +--- a/src/ui/ui-drv/gtk/Makefile.in ++++ b/src/ui/ui-drv/gtk/Makefile.in +@@ -2,7 +2,7 @@ + CFLAGS = @CFLAGS@ + LIBS = @LIBS@ -lm + LFLAGS = @LDFLAGS@ +-#AR = @AR@ ++AR = @AR@ + RANLIB = @RANLIB@ + + SRCS = ui_gtk.c diff --git a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch deleted file mode 100644 index 740f32d18985..000000000000 --- a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2014-06-09 10:54:18.459186718 -0700 -+++ configure.in 2014-06-09 10:56:47.472204763 -0700 -@@ -141,7 +141,7 @@ - dnl Checks for programs. - - DRIVERDIRS="" --LOCALEDIR="/usr/share/locale" -+LOCALEDIR="$prefix/share/locale" - DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a" - AC_PROG_INSTALL - diff --git a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch deleted file mode 100644 index ab6e6b56a9b8..000000000000 --- a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2014-06-09 10:42:00.574129368 -0700 -+++ Makefile.in 2014-06-09 10:43:04.035568767 -0700 -@@ -36,7 +36,7 @@ - @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help - @INSTALL@ -d $(DESTDIR)$(bindir) - @INSTALL@ -d $(DESTDIR)$(mandir)/man6 -- @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir) -+ @INSTALL@ bin/xaos $(DESTDIR)$(bindir) - @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial - - @INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples -@@ -49,7 +49,7 @@ - - @INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs - @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help -- @INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc -+ @INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc - @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 - test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)" - @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml index 820421b0993a..cfa060648fe0 100644 --- a/x11-misc/xaos/metadata.xml +++ b/x11-misc/xaos/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> @@ -12,7 +12,7 @@ provided for both the points inside and outside the selected set. XaoS supports switching between Julia and Mandelbrot fractal types and on-the-fly plane switching. -</longdescription> + </longdescription> <upstream> <remote-id type="sourceforge">xaos</remote-id> </upstream> diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild index 8f8963c98d1b..c0f0a8423529 100644 --- a/x11-misc/xaos/xaos-3.6.ebuild +++ b/x11-misc/xaos/xaos-3.6.ebuild @@ -1,51 +1,52 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils eutils +inherit autotools desktop strip-linguas DESCRIPTION="Very fast real-time fractal zoomer" HOMEPAGE="http://matek.hu/xaos/doku.php" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz +SRC_URI=" + https://downloads.sourceforge.net/${PN}/${P}.tar.gz https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar" -SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux" -IUSE="aalib doc -gtk nls png svga threads X" +SLOT="0" +KEYWORDS="amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="aalib doc gtk nls png svga threads X" RDEPEND=" - sci-libs/gsl:0= - sys-libs/zlib:0= - aalib? ( media-libs/aalib:0= ) - gtk? ( x11-libs/gtk+:2= ) - nls? ( sys-devel/gettext ) + sci-libs/gsl:= + sys-libs/zlib + aalib? ( media-libs/aalib ) + gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) - X? ( x11-libs/libX11:0= - x11-libs/libXext:0= - x11-libs/libXxf86vm:0= )" - + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + )" DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" virtual/pkgconfig doc? ( virtual/texi2dvi ) - X? ( x11-base/xorg-proto )" + nls? ( sys-devel/gettext )" PATCHES=( - "${FILESDIR}"/${PN}-3.4-png.patch + "${FILESDIR}"/${PN}-3.6-buildsystem.patch "${FILESDIR}"/${PN}-3.4-include.patch "${FILESDIR}"/${PN}-3.5-build-fix-i686.patch - "${FILESDIR}"/${PN}-3.6-locale-dir.patch - "${FILESDIR}"/${PN}-3.6-no-auto-strip.patch ) src_prepare() { - autotools-utils_src_prepare + default + mv configure.{in,ac} || die + eautoreconf + if use nls; then - if [[ "${LINGUAS+set}" == "set" ]]; then + if [[ ${LINGUAS+set} == set ]]; then strip-linguas -i src/i18n sed -i -e '/^ALL_LINGUAS=/d' configure || die export ALL_LINGUAS="${LINGUAS}" @@ -56,41 +57,36 @@ src_prepare() { } src_configure() { - local myeconfargs=( - --with-sffe=yes - --with-gsl=yes - $(use_enable nls) - $(use_with png) - $(use_with aalib aa-driver) - $(use_with gtk gtk-driver) - $(use_with threads pthread) - $(use_with X x11-driver) + econf \ + --with-sffe=yes \ + --with-gsl=yes \ + $(use_enable nls) \ + $(use_with png) \ + $(use_with aalib aa-driver) \ + $(use_with gtk gtk-driver) \ + $(use_with threads pthread) \ + $(use_with X x11-driver) \ $(use_with X x) - ) - autotools-utils_src_configure } src_compile() { - autotools-utils_src_compile + default + if use doc; then - cd "${BUILD_DIR}"/doc - emake xaos.dvi - dvipdf xaos.dvi || die - cd "${BUILD_DIR}"/help - emake html + emake -C doc xaos.dvi + dvipdf doc/xaos.dvi || die + + emake -C help html + rm -r help/rest || die + HTML_DOCS=( help/. ) fi } src_install() { - autotools-utils_src_install - if use doc; then - insinto /usr/share/doc/${PF} - doins doc/xaos.pdf - dohtml -r help/* - fi - local driver="x11" - use gtk && driver="\"GTK+ Driver\"" - make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \ - xaos "Application;Education;Math;Graphics;" + default + use doc && dodoc xaos.pdf + + make_desktop_entry "xaos -driver $(usex gtk '"GTK+ Driver"' x11)" "XaoS Fractal Zoomer" \ + xaos "Education;Math;Graphics;" doicon "${WORKDIR}"/${PN}.png } diff --git a/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild new file mode 100644 index 000000000000..cb49a8809e6b --- /dev/null +++ b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VIRTUALX_REQUIRED="always" +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" + +inherit docs qmake-utils + +COMMIT="de9e4f16849c5388760ba3a2e3b0955c5a39b71a" + +DESCRIPTION="Very fast real-time fractal zoomer" +HOMEPAGE="https://xaos-project.github.io/" +SRC_URI="https://github.com/xaos-project/XaoS/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/XaoS-${COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools" + +src_configure() { + # install into /usr/ instead of /usr/local + sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:g" XaoS.pro || die + eqmake5 + # Don't strip, this requires running X/wayland session + sed -i -e '/$(STRIP) $(TARGET)/d' Makefile || die + # Fix INSTALL_ROOT ignored for examples dir + sed -i -e "s:cp {} /usr/share/XaoS/examples:cp {} \${INSTALL_ROOT}/usr/share/XaoS/examples:g" Makefile || die +} + +src_compile() { + default + docs_compile +} + +src_install() { + INSTALL_ROOT="${ED}" default +} diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest index bda938b77423..85b37638f82a 100644 --- a/x11-misc/xautolock/Manifest +++ b/x11-misc/xautolock/Manifest @@ -1,4 +1,2 @@ DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04 -DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59 -DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391 -DIST xautolock_2.2-6.debian.tar.xz 6376 BLAKE2B a7ef40b0fedd21146e359b85b7245695d9395a54aac568800b80a89fb13a08616fe771997d8b9e155c49f8218447022fcb2b256802156ee5f66d923e394a53ba SHA512 c5d350ae2e123e63564e9145de3a7a180b47cca745262cc4f935ced83e0fe2450d68fcbd0c3de3f4566e6650b3d6183b4491f5a2d0caed838221d2bc0b9e1613 +DIST xautolock_2.2-7.debian.tar.xz 7976 BLAKE2B d56687d0eee58e513eae152f2d6d30496346935a05410759eb116eb9fb19c3073db10f1393ab26ae5a63436693b82557b01c0dc18be75af4ee04de8a783bc618 SHA512 5cc0cce408466a57fc99d701199b6a1b3545d9faae86e2474450263a07fbe9920dc89cc3ac14bd8a00274e7e80768be3e360e81ad7378bcdbe34ada23958745a diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml index b822c45366ac..5f52a9e04c85 100644 --- a/x11-misc/xautolock/metadata.xml +++ b/x11-misc/xautolock/metadata.xml @@ -1,19 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> -<longdescription lang='en'> +<!-- maintainer-needed --> +<longdescription lang="en"> If no user activity is detected after a set timeout, xautolock runs a program for you. If you want that program (with optional arguments) to be a screen locker, then one of these packages might fit your purpose: - x11-misc/alock - x11-misc/i3lock - x11-misc/slim - x11-misc/slock - x11-misc/xlockmore - x11-misc/xtrlock + <pkg>x11-misc/alock</pkg> + <pkg>x11-misc/i3lock</pkg> + <pkg>x11-misc/slim</pkg> + <pkg>x11-misc/slock</pkg> + <pkg>x11-misc/xlockmore</pkg> + <pkg>x11-misc/xtrlock</pkg> </longdescription> </pkgmetadata> diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild deleted file mode 100644 index d9595592a63a..000000000000 --- a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs versionator - -DESCRIPTION="An automatic X screen-locker/screen-saver" -HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/" - -DEB_REV_MAJ="$(get_version_component_range 3)" -DEB_REV_MIN="$(get_version_component_range 4)" -DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}" -SRC_URI=" - http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz -" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -RDEPEND=" - x11-libs/libXScrnSaver -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/imake -" -PATCHES=( - "${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch - "${WORKDIR}"/debian/patches/11-fix-no-dpms.patch - "${WORKDIR}"/debian/patches/12-fix-manpage.patch - "${WORKDIR}"/debian/patches/13-fix-hppa-build.patch - "${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch -) -S=${WORKDIR}/${P/_p*} - -src_configure() { - xmkmf || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - dobin xautolock - newman xautolock.man xautolock.1 - dodoc Changelog Readme Todo -} diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild deleted file mode 100644 index 5cff11d974cd..000000000000 --- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs versionator - -DESCRIPTION="An automatic X screen-locker/screen-saver" -HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/" - -DEB_REV_MAJ="$(get_version_component_range 3)" -DEB_REV_MIN="$(get_version_component_range 4)" -DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}" -SRC_URI=" - http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz -" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" - -RDEPEND=" - || ( - x11-misc/alock - x11-misc/i3lock - x11-misc/slim - x11-misc/slock - x11-misc/xlockmore - x11-misc/xtrlock - ) - x11-libs/libXScrnSaver -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/imake -" - -S=${WORKDIR}/${P/_p*} - -PATCHES=( - "${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch - "${WORKDIR}"/debian/patches/11-fix-no-dpms.patch - "${WORKDIR}"/debian/patches/12-fix-manpage.patch - "${WORKDIR}"/debian/patches/13-fix-hppa-build.patch - "${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch -) - -src_configure() { - xmkmf || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - dobin xautolock - newman xautolock.man xautolock.1 - dodoc Changelog Readme Todo -} diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild deleted file mode 100644 index 6125ac05fb94..000000000000 --- a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="An automatic X screen-locker/screen-saver" -HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/" - -DEB_REV_MAJ="$(ver_cut 4)" -DEB_REV_MIN="$(ver_cut 6)" -DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}" -SRC_URI=" - http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz -" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86" - -RDEPEND=" - x11-libs/libXScrnSaver -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/imake -" -S=${WORKDIR}/${P/_p*} - -src_prepare() { - eapply "${WORKDIR}"/debian/patches/*.patch - default -} - -src_configure() { - xmkmf || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - dobin xautolock - newman xautolock.man xautolock.1 - dodoc Changelog Readme Todo -} diff --git a/x11-misc/xautolock/xautolock-2.2_p6.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild index 1abba4868157..caed08b01a48 100644 --- a/x11-misc/xautolock/xautolock-2.2_p6.ebuild +++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,16 +14,19 @@ SRC_URI=" " LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86" RDEPEND=" x11-libs/libXScrnSaver " DEPEND=" ${RDEPEND} - app-text/rman x11-base/xorg-proto - x11-misc/imake +" +BDEPEND=" + app-text/rman + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1 " PATCHES=( "${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch @@ -37,7 +40,8 @@ src_prepare() { } src_configure() { - xmkmf || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_compile() { diff --git a/x11-misc/xautomation/metadata.xml b/x11-misc/xautomation/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xautomation/metadata.xml +++ b/x11-misc/xautomation/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xautomation/xautomation-1.09-r1.ebuild b/x11-misc/xautomation/xautomation-1.09-r2.ebuild index d78715f36b68..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-2018 Gentoo Foundation +# 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" @@ -9,15 +9,13 @@ SRC_URI="https://hoopajoo.net/static/projects/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" +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/xbatt/files/xbatt-1.2.1-clang16.patch b/x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch new file mode 100644 index 000000000000..9a7c03157738 --- /dev/null +++ b/x11-misc/xbatt/files/xbatt-1.2.1-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/870412 +--- a/xbatt.c ++++ b/xbatt.c +@@ -223,3 +223,3 @@ + +-main( ++int main( + int argc, diff --git a/x11-misc/xbatt/metadata.xml b/x11-misc/xbatt/metadata.xml index 66187a0f4213..d3e0f4631255 100644 --- a/x11-misc/xbatt/metadata.xml +++ b/x11-misc/xbatt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild new file mode 100644 index 000000000000..d9e0581b39b2 --- /dev/null +++ b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +MY_PV=${PV/_rc/pr} + +DESCRIPTION="Notebook battery indicator for X" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-$(ver_cut 1-2)" + +LICENSE="xbatt" +SLOT="0" +KEYWORDS="amd64 ppc x86" +RDEPEND=" + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXt + x11-libs/libXaw + x11-libs/libXext + x11-libs/libxkbfile + x11-libs/libXpm" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.1-implicits.patch + "${FILESDIR}"/${PN}-1.2.1-clang16.patch +) + +src_configure() { + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" \ + xbatt +} + +src_install() { + emake DESTDIR="${D}" install + einstalldocs +} diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild deleted file mode 100644 index 75a3899848d4..000000000000 --- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs eapi7-ver - -MY_PV=${PV/_rc/pr} -DESCRIPTION="Notebook battery indicator for X" -HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/" -SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz" - -LICENSE="xbatt" -SLOT="0" -KEYWORDS="amd64 ppc x86" -RDEPEND=" - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXaw - x11-libs/libXext - x11-libs/libxkbfile - x11-libs/libXpm -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - x11-misc/imake -" -PATCHES=( - "${FILESDIR}"/${PN}-1.2.1-implicits.patch -) -S="${WORKDIR}"/${PN}-$(ver_cut 1-2) - -src_compile() { - xmkmf || die - emake \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" \ - xbatt -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README* -} diff --git a/x11-misc/xbattbar/Manifest b/x11-misc/xbattbar/Manifest index 4c1741883e79..7ba85fedee85 100644 --- a/x11-misc/xbattbar/Manifest +++ b/x11-misc/xbattbar/Manifest @@ -1,2 +1 @@ -DIST xbattbar_1.4.8.orig.tar.gz 16254 BLAKE2B 3e2215bcee10f140a078266e128ae17185e5900090b057e845f966098c69371ab5115d3cdc620a87e27e2dd223a83ab33e5fef55119cdbac68491c0e88e63585 SHA512 1ec535ba997da4aa08b225b61b22eb87d74fc15c522d30f5361e1f56db6fd774f4230a95afdb7f1170144c0939724a80118c7289ea50d027a76649fa20164191 DIST xbattbar_1.4.9.orig.tar.gz 19105 BLAKE2B e33631f02266150fc494312c0a78cba145813e3f19ffa4a8fd46ce3adde3e50cb820617e5118a9bb6935fb7be26840e6a9525bf95e2f2fbf585e4e2542d35228 SHA512 e6d0efe0a97b2cb7d0c8a992b7a68a26155dfb625649a5fc8abc4bc37b2c286224185b57d6b2d3671f571690d278970976da5380c1d1bbcd9212e2001f9c40b8 diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch index 2602bb91187a..0cd1ca00b44c 100644 --- a/x11-misc/xbattbar/files/xbattbar-1.4.5.patch +++ b/x11-misc/xbattbar/files/xbattbar-1.4.5-Makefile.patch @@ -1,27 +1,37 @@ --- a/Makefile +++ b/Makefile -@@ -11,16 +11,16 @@ +@@ -4,23 +4,23 @@ DESTDIR ?= / + + TARGET = xbattbar + APM_CHECK = xbattbar-check-apm +-CPPFLAGS = -D_FORTIFY_SOURCE=2 +-CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security $(CPPFLAGS) +-LDFLAGS = -Wl,-z,relro ++CPPFLAGS ?= -D_FORTIFY_SOURCE=2 ++CFLAGS ?= -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security ++LDFLAGS ?= -Wl,-z,relro + all: $(TARGET) $(APM_CHECK) $(TARGET): obj/xbattbar.o - gcc -o $@ $< -lX11 $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(shell $(PKG_CONFIG) --libs x11) obj/xbattbar.o: xbattbar.c obj/stamp - gcc -MMD -o $@ -c $< $(CFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -o $@ -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -o $@ -c $< $(APM_CHECK): obj/xbattbar-check-apm.o - gcc -o $@ $< $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp - gcc -MMD -D$(OS_TYPE) -o $@ -c $< $(CFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< obj/stamp: mkdir obj -@@ -32,12 +32,12 @@ +@@ -32,12 +32,12 @@ clean: install: $(TARGET) $(APM_CHECK) diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch new file mode 100644 index 000000000000..8ee0b80ecb3b --- /dev/null +++ b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/875059 +--- a/xbattbar.c ++++ b/xbattbar.c +@@ -234,3 +234,3 @@ + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { diff --git a/x11-misc/xbattbar/metadata.xml b/x11-misc/xbattbar/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xbattbar/metadata.xml +++ b/x11-misc/xbattbar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild deleted file mode 100644 index 07f440b75dcb..000000000000 --- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs - -DESCRIPTION="Advanced Power Management battery status display for X" -HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html" -SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - dev-lang/perl - x11-libs/libX11 -" -RDEPEND=" - ${DEPEND} - ${PYTHON_DEPS} - !ppc? ( >=sys-power/acpi-1.5 ) -" # ppc has APM - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.4.5.patch \ - "${FILESDIR}"/${PN}-1.4.8-const.patch - - sed -i \ - -e "s:usr/lib:usr/$(get_libdir):" \ - xbattbar.c || die - - tc-export PKG_CONFIG -} - -src_compile() { - use kernel_linux && append-flags -Dlinux - emake \ - CC=$(tc-getCC) \ - LIBDIR="$(get_libdir)" \ - LDFLAGS="${LDFLAGS}" - python_fix_shebang ${PN}-check-sys -} - -src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install - dodoc README -} diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild index e246e6005e66..ff02fcb15ecb 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -1,50 +1,44 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit flag-o-matic multilib toolchain-funcs +EAPI=8 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="Advanced Power Management battery status display for X" HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html" SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" DEPEND=" dev-lang/perl - x11-libs/libX11 -" + x11-libs/libX11" RDEPEND=" ${DEPEND} - !ppc? ( >=sys-power/acpi-1.5 ) -" + !ppc? ( >=sys-power/acpi-1.5 )" +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-1.4.5.patch + "${FILESDIR}"/${PN}-1.4.5-Makefile.patch "${FILESDIR}"/${PN}-1.4.8-const.patch + "${FILESDIR}"/${PN}-1.4.9-implicit-int.patch ) src_prepare() { default - sed -i \ - -e "s:usr/lib:usr/$(get_libdir):" \ - xbattbar.c || die - - tc-export PKG_CONFIG + sed -i "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" xbattbar.c || die } -src_compile() { - use kernel_linux && append-flags -Dlinux - - emake \ - CC=$(tc-getCC) \ - LIBDIR="$(get_libdir)" \ - LDFLAGS="${LDFLAGS}" +src_configure() { + tc-export CC PKG_CONFIG + use kernel_linux && append-cppflags -Dlinux } src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install - dodoc README + emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install + einstalldocs } diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest index 8c5f2f19b9c5..084a2ff8da29 100644 --- a/x11-misc/xbindkeys/Manifest +++ b/x11-misc/xbindkeys/Manifest @@ -1,2 +1 @@ -DIST xbindkeys-1.8.6.tar.gz 151941 BLAKE2B f5eafb8f3655cbfa1ae7d7c5ed0bcdac97d4105df8df7a0aeecc267e08fbae8297713fc14c3e36871493e23959b624d5a88ba45cbef715a79df7de1f0927152f SHA512 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba DIST xbindkeys-1.8.7.tar.gz 177532 BLAKE2B 9ff6c9cd10bb6f2bf96a288482edb50e6671c9e4e3b5c136bdfaa92796f9e9bcfc42ab69ca3546c3871bdcdba1e952631cbd3d288dce9738986c20680e91c316 SHA512 a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9 diff --git a/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch b/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch deleted file mode 100644 index 427983e2d12b..000000000000 --- a/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit ceb7093f8d77cf5952e8e7778db02a6f3e8d8872 -Author: Alberto <address@hidden> -Date: Mon Feb 10 09:21:57 2014 +0200 - - fix keyboard layout problems - -diff --git a/xbindkeys.c b/xbindkeys.c -index b0adef9..162e47e 100644 ---- a/xbindkeys.c -+++ b/xbindkeys.c -@@ -377,7 +377,7 @@ event_loop (Display * d) - printf ("e.xbutton.state=%d\n", e.xbutton.state); - } - -- e.xbutton.state &= ~(numlock_mask | capslock_mask | scrolllock_mask -+ e.xbutton.state &= 0x1FFF && ~(numlock_mask | capslock_mask | scrolllock_mask - | Button1Mask | Button2Mask | Button3Mask - | Button4Mask | Button5Mask); - -@@ -409,7 +409,7 @@ event_loop (Display * d) - printf ("e.xbutton.state=%d\n", e.xbutton.state); - } - -- e.xbutton.state &= ~(numlock_mask | capslock_mask | scrolllock_mask -+ e.xbutton.state &= 0x1FFF && ~(numlock_mask | capslock_mask | scrolllock_mask - | Button1Mask | Button2Mask | Button3Mask - | Button4Mask | Button5Mask); - diff --git a/x11-misc/xbindkeys/metadata.xml b/x11-misc/xbindkeys/metadata.xml index 2ba8e9e851e4..6aebbc46f559 100644 --- a/x11-misc/xbindkeys/metadata.xml +++ b/x11-misc/xbindkeys/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person" proxied="yes"> + <email>jaco@uls.co.za</email> + <name>Jaco Kroon</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> </pkgmetadata> diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild deleted file mode 100644 index ff72ad31364c..000000000000 --- a/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Tool for launching commands on keystrokes" -SRC_URI="https://www.nongnu.org/${PN}/${P}.tar.gz" -HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="guile tk" - -RDEPEND="x11-libs/libX11 - guile? ( >=dev-scheme/guile-1.8.4[deprecated] ) - tk? ( dev-lang/tk )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}/${PN}-apply-mask-on-release-event-status.patch" -) - -src_configure() { - econf \ - $(use_enable tk) \ - $(use_enable guile) -} diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild index 28112e839030..a4c731642d2c 100644 --- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild +++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild @@ -1,29 +1,38 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + DESCRIPTION="Tool for launching commands on keystrokes" SRC_URI="https://www.nongnu.org/${PN}/${P}.tar.gz" HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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=" x11-libs/libX11 - guile? ( >=dev-scheme/guile-1.8.4[deprecated] ) + guile? ( >=dev-scheme/guile-1.8.4:=[deprecated] ) tk? ( dev-lang/tk ) " DEPEND=" ${RDEPEND} x11-base/xorg-proto " -DOCS=" - AUTHORS BUGS ChangeLog README TODO xbindkeysrc -" + +DOCS=( AUTHORS BUGS ChangeLog README TODO xbindkeysrc ) + +src_prepare() { + default + + # Regenerate to pick up newer versions of Guile macros + # bug #828532 + eautoreconf +} src_configure() { econf \ 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 e943b72b8a48..878ce12c5523 100644 --- a/x11-misc/xbitmaps/metadata.xml +++ b/x11-misc/xbitmaps/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <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.2-r1.ebuild deleted file mode 100644 index b1deeb2f45dc..000000000000 --- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="X.Org bitmaps data" -HOMEPAGE="https://www.x.org/wiki/" -SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -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/xbitmaps/xbitmaps-1.1.3.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild new file mode 100644 index 000000000000..d7c4977867a4 --- /dev/null +++ b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MODULE=data/ +XORG_TARBALL_SUFFIX="xz" +inherit xorg-3 + +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" + +# 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/xcalendar/files/xcalendar-4.0-clang16.patch b/x11-misc/xcalendar/files/xcalendar-4.0-clang16.patch new file mode 100644 index 000000000000..9e39901f9076 --- /dev/null +++ b/x11-misc/xcalendar/files/xcalendar-4.0-clang16.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/870484 +--- a/lists.c ++++ b/lists.c +@@ -26,4 +26,5 @@ + #include "xcalendar.h" + ++int is_last(LList *list); + + List +@@ -150,5 +151,5 @@ + } + +-is_last(list) ++int is_last(list) + LList *list; + { +--- a/xcalendar.c ++++ b/xcalendar.c +@@ -1168,5 +1168,5 @@ + int m, y; + { +- register d, i; ++ int d, i; + + calInit = y; +@@ -1217,5 +1217,5 @@ + int yr; + { +- register y, d; ++ int y, d; + + /* +--- a/xcalendar.h ++++ b/xcalendar.h +@@ -38,4 +38,5 @@ + + #include <stdio.h> ++#include <stdlib.h> + #include <X11/Xos.h> + #include <X11/Xlib.h> diff --git a/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch b/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch deleted file mode 100644 index 977ca96e572f..000000000000 --- a/x11-misc/xcalendar/files/xcalendar-4.0-implicits.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix implicit functions declarations - ---- xcalendar/xcalendar.h -+++ xcalendar/xcalendar.h -@@ -37,6 +37,7 @@ - - - #include <stdio.h> -+#include <stdlib.h> - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <X11/Intrinsic.h> ---- xcalendar/lists.c -+++ xcalendar/lists.c -@@ -25,6 +25,7 @@ - - #include "xcalendar.h" - -+is_last(LList *list); - - List - CreateList(length, elementSize) diff --git a/x11-misc/xcalendar/files/xcalendar-4.0-motif-gentoo.diff b/x11-misc/xcalendar/files/xcalendar-4.0-motif-gentoo.diff deleted file mode 100644 index a35d98bcb814..000000000000 --- a/x11-misc/xcalendar/files/xcalendar-4.0-motif-gentoo.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- xcalendar.orig/Imakefile Sat Sep 30 20:19:17 1995 -+++ xcalendar/Imakefile Tue Aug 20 08:37:48 2002 -@@ -1,18 +1,18 @@ - XCALENDAR_LIBDIR = $(LIBDIR)/xcalendar - LIBFILES = larrow.xbm qmark.xbm quit.xbm rarrow.xbm xcalendar.hlp - # Comment out the following two lines for the Motif version --LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -- EXTRA_DEFINES = -DATHENA -+#LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -+# EXTRA_DEFINES = -DATHENA - # Uncomment the following two lines for the Motif version --# LOCAL_LIBRARIES = -L/usr/local/Motif/lib -lXm $(XMULIB) $(XTOOLLIB) $(XLIB) --# EXTRA_DEFINES = -I/usr/local/Motif/include -+ LOCAL_LIBRARIES = -lXm $(XMULIB) $(XTOOLLIB) $(XLIB) -+ EXTRA_DEFINES = - SRCS = xcalendar.c dayeditor.c lists.c - OBJS = xcalendar.o dayeditor.o lists.o - - # - # for Internationalization - # --EXTRA_DEFINES = -DXI18N -DATHENA -+#EXTRA_DEFINES = -DXI18N -DATHENA - ##if !SharedLibXwchar - # _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a) - # XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB)) diff --git a/x11-misc/xcalendar/metadata.xml b/x11-misc/xcalendar/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xcalendar/metadata.xml +++ b/x11-misc/xcalendar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild deleted file mode 100644 index b89bdea80b70..000000000000 --- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="A simple interactive calendar program with a notebook capability" -HOMEPAGE="https://www.freebsd.org/" -SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i18n.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 x86" -IUSE="motif" - -RDEPEND="x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXaw - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-misc/imake - x11-misc/gccmakedep - motif? ( >=x11-libs/motif-2.3:0 )" - -S=${WORKDIR}/${PN} -PATCHES=( "${FILESDIR}"/${P}-implicits.patch ) - -src_prepare() { - use motif && PATCHES+=( "${FILESDIR}"/${P}-motif-gentoo.diff ) - default - sed -e "s:%%XCALENDAR_LIBDIR%%:/usr/$(get_libdir)/xcalendar:" \ - -e "s:/usr/local/X11R5/lib/X11/:/usr/$(get_libdir)/:" \ - -i XCalendar.sed || die -} - -src_compile() { - xmkmf -a || die - emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - dobin xcalendar - newman xcalendar.man xcalendar.1 - - insinto /usr/share/X11/app-defaults - newins XCalendar.sed XCalendar - - insinto /usr/$(get_libdir)/xcalendar - doins *.xbm *.hlp - - einstalldocs -} diff --git a/x11-misc/xcalendar/xcalendar-4.0-r3.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r3.ebuild new file mode 100644 index 000000000000..77be8a1f274a --- /dev/null +++ b/x11-misc/xcalendar/xcalendar-4.0-r3.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Simple interactive calendar program with a notebook capability" +HOMEPAGE="https://www.freebsd.org/" +SRC_URI="ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/${P}+i18n.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha amd64 ppc ppc64 x86" +IUSE="motif" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXt + motif? ( + x11-libs/libXmu + x11-libs/motif + ) + !motif? ( x11-libs/libXaw )" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + sed -e "s|%%XCALENDAR_LIBDIR%%|${EPREFIX}/usr/$(get_libdir)/xcalendar|" \ + -e "s|/usr/local/X11R5/lib/X11/|${EPREFIX}/usr/$(get_libdir)/|" \ + < XCalendar.sed > XCalendar || die +} + +src_compile() { + tc-export CC + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + if use motif; then + append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xmu xt || die) + append-libs -lXm $($(tc-getPKG_CONFIG) --libs x11 xmu xt || die) + else + append-cppflags -DATHENA $($(tc-getPKG_CONFIG) --cflags x11 xaw7 xt || die) + append-libs $($(tc-getPKG_CONFIG) --libs x11 xaw7 xt || die) + fi + + emake LDLIBS="${LIBS}" -f /dev/null -E "xcalendar: dayeditor.o lists.o" +} + +src_install() { + dobin xcalendar + newman xcalendar.man xcalendar.1 + + insinto /usr/share/X11/app-defaults + doins XCalendar + + insinto /usr/$(get_libdir)/xcalendar + doins *.xbm *.hlp + + einstalldocs +} diff --git a/x11-misc/xcalib/metadata.xml b/x11-misc/xcalib/metadata.xml index f26d6de2744f..fec047d98954 100644 --- a/x11-misc/xcalib/metadata.xml +++ b/x11-misc/xcalib/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/xcalib/xcalib-0.10.ebuild b/x11-misc/xcalib/xcalib-0.10.ebuild index 93348fe9c4d1..74d0b6510315 100644 --- a/x11-misc/xcalib/xcalib-0.10.ebuild +++ b/x11-misc/xcalib/xcalib-0.10.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake diff --git a/x11-misc/xcape/Manifest b/x11-misc/xcape/Manifest index 4ac65255b986..d40487713f24 100644 --- a/x11-misc/xcape/Manifest +++ b/x11-misc/xcape/Manifest @@ -1,2 +1 @@ -DIST xcape-1.1.tar.gz 18458 BLAKE2B b402f0a7dc21546c653e3e688f8a6ec1f6704426181d1d7e62d2f0ec2186589513cfc0f31ed8ad8f7f2eca83976a84a4967b746faa61a1243874200c6b537f6c SHA512 6234e50a38003249eae563ff22ce923c3032e44b358e8e49550001c60246be1159a47f60f52d42040dda88d5396228b8daf4f0f4b03db2bcfc514c634c81540f DIST xcape-1.2.tar.gz 18730 BLAKE2B 7e65d9d64d34f0500f524fe806c4d7d092c7670e1b78d0e7ea16860c4b268de0bfa732935eca45820a26be694e030cb6847b5910e0aad27974f4e9e74634c20c SHA512 5ae8502250a9ec55a4b0c5f7301c1597c652b76904261153b720362e3c5882e8db980c85396a2594f99ae2fb72ab7070c1b06c9432d54b7da84975ff45b25a79 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/metadata.xml b/x11-misc/xcape/metadata.xml index 203afc385611..6efa82ade53e 100644 --- a/x11-misc/xcape/metadata.xml +++ b/x11-misc/xcape/metadata.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>aditsu@yahoo.com</email> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/xcape/xcape-1.1.ebuild b/x11-misc/xcape/xcape-1.1.ebuild deleted file mode 100644 index 977f0de67883..000000000000 --- a/x11-misc/xcape/xcape-1.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils 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() { - # Fix path to man and to pkg-config - sed -i \ - -e "/MANDIR/s:local:share:" \ - -e "s/pkg-config/$(tc-getPKG_CONFIG)/" \ - Makefile || die - - epatch_user -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install -} 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/xcave/Manifest b/x11-misc/xcave/Manifest index ca3e7da9cfff..f9c567da8ab4 100644 --- a/x11-misc/xcave/Manifest +++ b/x11-misc/xcave/Manifest @@ -1,2 +1 @@ -DIST xcave-2.4.0.tar.gz 817356 BLAKE2B 2a80eb20d484fe37ee5871e4bbf443fb87170adf8a02d4ebc059bcc4f907b2b4442a0b9858719e1c656d0293e55c470aba1bcf83c899ba079a2f201d93b84cb2 SHA512 cdba5ad8b7634004a9439fd87a8eb8ed45137e78cb119310c6b7df9352aa979682edaae6440200804e23953c822d377c95cf459cc37ce227d1a41885a91afba4 DIST xcave-2.5.1.tar.gz 786853 BLAKE2B e3b2290b01c16bff4dbe8d5167b4bed75fbe4225555e3ee3856115302329878550cbb4c35286c717eb46c3fd12b4d66323895cdbb292cc6f054360b53c3f9c1a SHA512 6095c06d75f7c5d87a6d0f1c4c3a52071ffc1912d60ba07c95d9b8d84f0027ba24476f941828c4eecf801d7ca7f0bc168ddd2d162b3e863fc31ee6b4c9144cd4 diff --git a/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch b/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch deleted file mode 100644 index f0e331dccfe2..000000000000 --- a/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -49,10 +49,6 @@ - - - --PKG_CHECK_MODULES(libxml-2.0, libxml-2.0) --AC_SUBST(libxml-2.0_CFLAGS) --AC_SUBST(libxml-2.0_LIBS) -- - AC_OUTPUT([ - Makefile - src/Makefile diff --git a/x11-misc/xcave/metadata.xml b/x11-misc/xcave/metadata.xml index bc1b97e1eb76..02ab588d0b09 100644 --- a/x11-misc/xcave/metadata.xml +++ b/x11-misc/xcave/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild deleted file mode 100644 index 96c74893f67f..000000000000 --- a/x11-misc/xcave/xcave-2.4.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -DESCRIPTION="View and manage contents of your wine cellar" -HOMEPAGE="http://xcave.free.fr/index-en.php" -SRC_URI="http://${PN}.free.fr/backbone.php?what=download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RESTRICT="test" - -RDEPEND=" - x11-libs/gtk+:2 - dev-libs/libxml2:2 -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-2.4.0-pkg-config.patch -) - -src_prepare() { - mkdir m4 || die - default - eautoreconf -} - -src_configure() { - append-cflags -fcommon - default -} -src_install() { - default - - rm -rv "${ED}"/usr/doc || die -} diff --git a/x11-misc/xcave/xcave-2.5.1.ebuild b/x11-misc/xcave/xcave-2.5.1.ebuild index 21223817b379..6c7e7d0913f6 100644 --- a/x11-misc/xcave/xcave-2.5.1.ebuild +++ b/x11-misc/xcave/xcave-2.5.1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit flag-o-matic DESCRIPTION="View and manage contents of your wine cellar" HOMEPAGE="http://xcave.free.fr/index-en.php" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -18,9 +19,7 @@ RDEPEND=" gnome-base/libglade x11-libs/gtk+:2 " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" BDEPEND=" dev-util/intltool sys-devel/gettext diff --git a/x11-misc/xcb/files/xcb-modern-c-porting.patch b/x11-misc/xcb/files/xcb-modern-c-porting.patch new file mode 100644 index 000000000000..39c8173d53ba --- /dev/null +++ b/x11-misc/xcb/files/xcb-modern-c-porting.patch @@ -0,0 +1,342 @@ +diff --git a/xcb.c b/xcb.c +index 2c990a3..ac9fec2 100644 +--- a/xcb.c ++++ b/xcb.c +@@ -262,13 +262,8 @@ XCreateFontSetWithGuess (Display * d, const char *pattern, char ***miss, int *n_ + + static + Boolean +-CvtStringToFontSet (dpy, args, num_args, fromVal, toVal, closure_ret) +- Display *dpy; +- XrmValuePtr args; +- Cardinal *num_args; +- XrmValuePtr fromVal; +- XrmValuePtr toVal; +- XtPointer *closure_ret; ++CvtStringToFontSet (Display *dpy, XrmValuePtr args, Cardinal *num_args, ++ XrmValuePtr fromVal, XrmValuePtr toVal, XtPointer *closure_ret) + { + XFontSet f; + char **missing_charset_list; +@@ -299,10 +294,7 @@ CvtStringToFontSet (dpy, args, num_args, fromVal, toVal, closure_ret) + * Fetch the contents of cut buffer n from the root window. + */ + static char * +-fetch_buffer (a, nb, force_mb) +- Atom a; +- int *nb; +- int force_mb; ++fetch_buffer (Atom a, int *nb, int force_mb) + { + unsigned long after; + char **list; +@@ -338,11 +330,7 @@ fetch_buffer (a, nb, force_mb) + * Store the string p into cut buffer n on the root window. + */ + static void +-store_buffer (p, nb, atom, force_mb) +- char *p; +- int nb; +- Atom atom; +- int force_mb; ++store_buffer (char *p, int nb, Atom atom, int force_mb) + { + XTextProperty pt; + +@@ -359,8 +347,7 @@ store_buffer (p, nb, atom, force_mb) + * Add an atom to the program's atom cache. + */ + static Atom +-get_atom (n, ifexists) +- int n, ifexists; ++get_atom (int n, int ifexists) + { + char tmp[32]; + +@@ -403,10 +390,7 @@ initialize_properties (void) + * Draw a string in the window with top-left corner justification. + */ + static void +-place_text (cb, str, len, y) +- CbWidget cb; +- char *str; +- int len, y; ++place_text (CbWidget cb, char *str, int len, int y) + { + int cols; + GC gc; +@@ -439,10 +423,8 @@ place_text (cb, str, len, y) + */ + + static void +-cb_initialize (req, wdg, args, nargs) /*ARGSUSED */ +- Widget req, wdg; +- ArgList args; +- Cardinal *nargs; ++cb_initialize (Widget req, Widget wdg, ++ ArgList args, Cardinal *nargs) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + XFontSetExtents *xfe = XExtentsOfFontSet (cb->fontset); +@@ -455,10 +437,7 @@ cb_initialize (req, wdg, args, nargs) /*ARGSUSED */ + } + + static void +-cb_realize (wdg, mask, attrs) +- Widget wdg; +- XtValueMask *mask; +- XSetWindowAttributes *attrs; ++cb_realize (Widget wdg, XtValueMask *mask, XSetWindowAttributes *attrs) + { + CbWidget cb = (CbWidget) wdg; + XtGCMask v_mask = 0L; +@@ -487,10 +466,7 @@ cb_realize (wdg, mask, attrs) + * Keep it simple. + */ + static void +-cb_redisplay (wdg, event, region) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- Region region; ++cb_redisplay (Widget wdg, XEvent *event, Region region) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + char *p, *pp, *base; +@@ -513,8 +489,7 @@ cb_redisplay (wdg, event, region) /*ARGSUSED */ + } + + static void +-cb_destroy (wdg) +- Widget wdg; ++cb_destroy (Widget wdg) + { + CbWidget cb = (CbWidget) wdg; + +@@ -540,11 +515,8 @@ cb_destroy (wdg) + * This breaks all the rules for object oriented widgets. Disgusting, no? + */ + static void +-cb_cut (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_cut (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + Window win = cb->core.window; +@@ -572,11 +544,8 @@ cb_cut (wdg, event, parms, nparms) /*ARGSUSED */ + } + + static void +-cb_paste (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_paste (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + Window w; +@@ -596,11 +565,8 @@ cb_paste (wdg, event, parms, nparms) /*ARGSUSED */ + } + + static void +-cb_clear (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_clear (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + Window win = cb->core.window; +@@ -614,11 +580,8 @@ cb_clear (wdg, event, parms, nparms) /*ARGSUSED */ + } + + static void +-cb_rotate (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_rotate (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + int n = 0; + +@@ -630,11 +593,8 @@ cb_rotate (wdg, event, parms, nparms) /*ARGSUSED */ + } + + static void +-cb_quit (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_quit (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + exit (0); + } +@@ -643,11 +603,8 @@ cb_quit (wdg, event, parms, nparms) /*ARGSUSED */ + * Clear and redraw the widget's window. + */ + static void +-cb_refresh (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_refresh (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + XClearArea (dpy, wdg->core.window, 0, 0, 0, 0, False); + cb_redisplay (wdg, (XEvent *) 0, (Region) 0); +@@ -661,11 +618,8 @@ cb_refresh (wdg, event, parms, nparms) /*ARGSUSED */ + * of the cut buffer to the target window+atom. + */ + static void +-cb_selreq (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_selreq (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + int nbytes; + char *ptr; +@@ -739,11 +693,8 @@ cb_selreq (wdg, event, parms, nparms) /*ARGSUSED */ + * be redrawn without highlighting. + */ + static void +-cb_selclear (wdg, event, parms, nparms) /*ARGSUSED */ +- Widget wdg; +- XEvent *event; +- String *parms; +- Cardinal *nparms; ++cb_selclear (Widget wdg, XEvent *event, ++ String *parms, Cardinal *nparms) /*ARGSUSED */ + { + CbWidget cb = (CbWidget) wdg; + +@@ -858,18 +809,14 @@ usage () + * or in the xdm-errors file when forcibly destroying the client program. + */ + static int +-xioerror (d) /*ARGSUSED */ +- Display *d; ++xioerror (Display *d) /*ARGSUSED */ + { + exit (1); /*NOTREACHED */ + } + + static void +-wmdel (wdg, ptr, ep, cont) /*ARGSUSED */ +- Widget wdg; +- XtPointer ptr; +- XEvent *ep; +- Boolean *cont; ++wmdel (Widget wdg, XtPointer ptr, ++ XEvent *ep, Boolean *cont) /*ARGSUSED */ + { + if (ep->type == ClientMessage && ep->xclient.data.l[0] == delwin) + exit (0); +@@ -879,10 +826,7 @@ wmdel (wdg, ptr, ep, cont) /*ARGSUSED */ + * Print the contents of a cut buffer on stdout. + */ + static void +-doprint (n, ptr, nb) +- int n; +- char *ptr; +- int nb; ++doprint (int n, char *ptr, int nb) + { + Atom a; + +@@ -905,10 +849,7 @@ doprint (n, ptr, nb) + * Load a new value into one of the cut buffers. + */ + static void +-doset (n, ptr, nb) +- int n; +- char *ptr; +- int nb; ++doset (int n, char *ptr, int nb) + { + char *str = malloc (nb + 1); + +@@ -920,9 +861,7 @@ doset (n, ptr, nb) + } + + static void +-timeout (arg, id) +- char *arg; +- XtIntervalId *id; ++timeout (void *arg, XtIntervalId *id) + { + exit (2); + } +@@ -931,10 +870,7 @@ timeout (arg, id) + * Copy the PRIMARY selection into a cut buffer. + */ + static void +-dogetseln (n, ptr, nb) +- int n; +- char *ptr; +- int nb; ++dogetseln (int n, char *ptr, int nb) + { + char *data; + int nbytes; +@@ -981,11 +917,7 @@ dogetseln (n, ptr, nb) + * list ordering is significant. + */ + static void +-dolist (list, fn, data, nbytes) +- char *list; +- void (*fn) (); +- char *data; +- int nbytes; ++dolist (char *list, void (*fn)(int, char*, int), char *data, int nbytes) + { + int m, n, x; + +@@ -1027,9 +959,7 @@ dolist (list, fn, data, nbytes) + * without the need to create any X windows first. + */ + static void +-dotask (cmd, arg) +- int cmd; +- char *arg; ++dotask (int cmd, char *arg) + { + char *ptr; + int i, n, nb; +@@ -1122,9 +1052,7 @@ static XrmOptionDescRec opt[] = + * perform all the windows initializations. + */ + static void +-init (argc, argv) +- int argc; +- char **argv; ++init (int argc, char **argv) + { + int i, n; + char **p; +@@ -1350,9 +1278,8 @@ xevents () + } + } + +-main (argc, argv) +- int argc; +- char **argv; ++int ++main (int argc, char **argv) + { + init (argc, argv); + xevents (); diff --git a/x11-misc/xcb/metadata.xml b/x11-misc/xcb/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xcb/metadata.xml +++ b/x11-misc/xcb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r2.ebuild index 8a899553b4f9..21ff1bbe9c2c 100644 --- a/x11-misc/xcb/xcb-2.4-r1.ebuild +++ b/x11-misc/xcb/xcb-2.4-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Marc Lehmann's improved X Cut Buffers" @@ -10,7 +11,7 @@ SRC_URI="http://oldhome.schmorp.de/marc/data/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc x86" +KEYWORDS="~alpha amd64 ~ppc ~riscv x86" IUSE="motif" RDEPEND=" @@ -18,13 +19,17 @@ RDEPEND=" x11-libs/libXaw x11-libs/libXext x11-libs/libXt + motif? ( >=x11-libs/motif-2.3:0 ) " DEPEND=" ${RDEPEND} x11-base/xorg-proto - motif? ( >=x11-libs/motif-2.3:0 ) " +PATCHES=( + "${FILESDIR}"/${PN}-modern-c-porting.patch +) + src_compile() { local gui libs diff --git a/x11-misc/xclip/metadata.xml b/x11-misc/xclip/metadata.xml index c85f46b30ad3..7f3389a92687 100644 --- a/x11-misc/xclip/metadata.xml +++ b/x11-misc/xclip/metadata.xml @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="github">astrand/xclip</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>orbea@riseup.net</email> + <name>orbea</name> + </maintainer> + <maintainer type="person" proxied="proxy"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">astrand/xclip</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild index eba50d7fd63f..bb2a1cfa7bad 100644 --- a/x11-misc/xclip/xclip-0.13.ebuild +++ b/x11-misc/xclip/xclip-0.13.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 inherit autotools @@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" x11-libs/libX11 @@ -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 12a50d1de869..61bcf329f7bf 100644 --- a/x11-misc/xclip/xclip-9999.ebuild +++ b/x11-misc/xclip/xclip-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 autotools git-r3 DESCRIPTION="Copy data from standard input to X clipboard" @@ -19,6 +19,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} + x11-base/xorg-proto x11-libs/libXt " diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest index 05dc7b0a594d..2aba4b8c52e9 100644 --- a/x11-misc/xcompmgr/Manifest +++ b/x11-misc/xcompmgr/Manifest @@ -1 +1 @@ -DIST xcompmgr-1.1.8.tar.bz2 138806 BLAKE2B 85a7cd04c97c3594ab9acf7888aa0024b60027654dc8fa609c8f2fb801b5cd58105aa50c2afe9c322a02657eeea6e57da3f35720ac63c191a81c62fbf9ee4468 SHA512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d +DIST xcompmgr-1.1.9.tar.xz 132676 BLAKE2B ece3717d582df62dcaaabb347d07ffda373f9660a74688b9637ea824eb9ac32003bddf323d9b1478f3abdf51b68005abb4c024720a75689d1ed70b45a8e026c2 SHA512 699117492af7fd84b36d317dcbf422d5ec86a7f21e29370caa737cd940d8ff866a5c8704ba2e7bd17a64e085d77fd23b628263d619813dead85cd669ff5b860e diff --git a/x11-misc/xcompmgr/metadata.xml b/x11-misc/xcompmgr/metadata.xml index e943b72b8a48..f399c98ad452 100644 --- a/x11-misc/xcompmgr/metadata.xml +++ b/x11-misc/xcompmgr/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/app/xcompmgr</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.9.ebuild index 5d3be298debd..81c0ec91dde4 100644 --- a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild +++ b/x11-misc/xcompmgr/xcompmgr-1.1.9.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_MODULE=app/ -XORG_STATIC=no +XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X Compositing manager" LICENSE="BSD" -KEYWORDS="amd64 ppc ppc64 sparc x86" -IUSE="" +KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" RDEPEND=" x11-libs/libXrender diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest index 27b94e7d085b..a75c1630179d 100644 --- a/x11-misc/xdaliclock/Manifest +++ b/x11-misc/xdaliclock/Manifest @@ -1,2 +1,2 @@ -DIST xdaliclock-2.43.tar.gz 2300886 BLAKE2B 91b5f6ad0eff544ffde213d575c84a9b6c05b62c6bd26332eefb28b0d064ac8b5314a60e70fa82ebf6270e022b079ce4e86197ee5e8a713c34d84227c00dd94f SHA512 4906632148599254d9b29b032d846fcea1a568de8156cfe9556aa1603e063015d7e3422ba9ce4f47c2877f144837a660964456584a643f274b78422c12c0c923 -DIST xdaliclock-2.44.tar.gz 17727649 BLAKE2B 170f1a7f9e5c10799b62b2ae76b33ab64230e4ade8f0b79c2aff7481536009e3e4e0f19239dd806d7b16c69225744fa381f5aabbeec6e0e92d8b875bd8ca0aeb SHA512 82082a8e16a85c7115bdd0a44e7845aedfad93f94226a14cf606493564829c7ffe55eb4d17cb43c41bd0e6c97c090457d6aa2d184f60462cea3a89f47ef72e00 +DIST xdaliclock-2.47.tar.gz 3410612 BLAKE2B 64d2e98693f055887959c34021a3e595bd46fb8ba453c58af76d78977a2d7b6a0092c9c9e174c53d65b7af5723e9fb3c434a48e4d39f2986dac8d6b80f3fa9f7 SHA512 d51930240170bad5694cc502251aeb88aed8b78cee086bda704624c2599acf94e30368a971f26eb59a824df3273b6eb58c6fd2017684f8f421d678828e41db7f +DIST xdaliclock-2.48.tar.gz 3412476 BLAKE2B be2c7dfc5ffc39bd8310e24219d0057604b3f7c528b4cdfc96256bc840d0df5c2d62b70556cbeb9cc30518067283e3c14d61d806450d6cb97598ca420fe07c4d SHA512 e41810ef98a94b07fb233c397c13f8f9b9e69fd692b6c7737549c532466f37819e63aea3fcc6ed53d71269d4a32f5f602e686a46a1ce814ee4320a49717b0b17 diff --git a/x11-misc/xdaliclock/files/xdaliclock-2.47-DESTDIR.patch b/x11-misc/xdaliclock/files/xdaliclock-2.47-DESTDIR.patch new file mode 100644 index 000000000000..eee6682f17d5 --- /dev/null +++ b/x11-misc/xdaliclock/files/xdaliclock-2.47-DESTDIR.patch @@ -0,0 +1,59 @@ +https://cgit.freebsd.org/ports/tree/x11-clocks/xdaliclock/files/patch-Makefile.in?id=b4521d44c7f02e022fa92fdd445ee4274aa96948 +--- a/Makefile.in ++++ b/Makefile.in +@@ -92,35 +92,35 @@ $(install_prefix)$(SCHEMA_DIR): + $(install_prefix)$(GTK_APPDIR) \ + $(install_prefix)$(GTK_ICONDIR) \ + $(install_prefix)$(SCHEMA_DIR): +- mkdir -p $@ ++# mkdir -p $@ + + install-program: xdaliclock $(install_prefix)$(bindir) +- $(INSTALL_PROGRAM) $< $(install_prefix)$(bindir)/xdaliclock ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(install_prefix)$(bindir)/xdaliclock + + # If /usr/share/glib-2.0/schemas/org.jwz.xdaliclock.gschema.xml" does + # not exist, the app won't launch. This is an amazing design. Spectacular. + # No notes. + # + install-schema: $(SCHEMA) $(install_prefix)$(SCHEMA_DIR) +- $(INSTALL_DATA) $< $(install_prefix)$(SCHEMA_DIR)/ +- $(GLIB_COMPILE_SCHEMAS) $(install_prefix)$(SCHEMA_DIR) ++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(SCHEMA_DIR)/ ++ $(GLIB_COMPILE_SCHEMAS) $(DESTDIR)$(install_prefix)$(SCHEMA_DIR) + + # /usr/share/pixmaps/xdaliclock.png + install-gnome:: $(LOGO) $(install_prefix)$(GTK_ICONDIR) +- $(INSTALL_DATA) $< $(install_prefix)$(GTK_ICONDIR)/ ++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(GTK_ICONDIR)/ + + # /usr/share/applications/xdaliclock.desktop + install-gnome:: $(DESK) $(install_prefix)$(GTK_APPDIR) +- $(INSTALL_DATA) $< $(install_prefix)$(GTK_APPDIR)/ ++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(GTK_APPDIR)/ + + # /usr/share/pixmaps/index.theme + install-gnome:: update-icon-caches + update-icon-caches:: + @\ +- for f in $(install_prefix)$(datadir)/icons/index.theme \ +- $(install_prefix)$(datadir)/icons/*/index.theme \ +- $(install_prefix)$(datadir)/pixmaps/index.theme \ +- $(install_prefix)$(datadir)/pixmaps/*/index.theme ; do \ ++ for f in $(DESTDIR)$(install_prefix)$(datadir)/icons/index.theme \ ++ $(DESTDIR)$(install_prefix)$(datadir)/icons/*/index.theme \ ++ $(DESTDIR)$(install_prefix)$(datadir)/pixmaps/index.theme \ ++ $(DESTDIR)$(install_prefix)$(datadir)/pixmaps/*/index.theme ; do \ + if [ -f $$f ]; then \ + f=`dirname $$f` ; \ + echo $(UPDATE_ICON_CACHE) --force --quiet $$f ; \ +@@ -129,7 +129,7 @@ install-man: xdaliclock.man $(install_prefix)$(man1dir + done + + install-man: xdaliclock.man $(install_prefix)$(man1dir) +- $(INSTALL_DATA) $< $(install_prefix)$(man1dir)/xdaliclock.$(mansuffix) ++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(man1dir)/xdaliclock.$(mansuffix) + + + uninstall-program: + diff --git a/x11-misc/xdaliclock/metadata.xml b/x11-misc/xdaliclock/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xdaliclock/metadata.xml +++ b/x11-misc/xdaliclock/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild deleted file mode 100644 index abce1ab9418f..000000000000 --- a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape" -HOMEPAGE="http://www.jwz.org/xdaliclock" -SRC_URI="http://www.jwz.org/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -S=${WORKDIR}/${P}/X11 - -src_install() { - dobin ${PN} - newman ${PN}.man ${PN}.1 - dodoc ../README -} diff --git a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild b/x11-misc/xdaliclock/xdaliclock-2.44.ebuild deleted file mode 100644 index 05719f0141b0..000000000000 --- a/x11-misc/xdaliclock/xdaliclock-2.44.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape" -HOMEPAGE="https://www.jwz.org/xdaliclock" -SRC_URI="https://www.jwz.org/xdaliclock/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -S=${WORKDIR}/${P}/X11 - -src_install() { - dobin ${PN} - newman ${PN}.man ${PN}.1 - dodoc ../README -} diff --git a/x11-misc/xdaliclock/xdaliclock-2.47.ebuild b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild new file mode 100644 index 000000000000..70fb0b3ee3f2 --- /dev/null +++ b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils xdg + +DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape" +HOMEPAGE="https://www.jwz.org/xdaliclock" +SRC_URI="https://www.jwz.org/xdaliclock/${P}.tar.gz" +S="${WORKDIR}"/${P}/X11 + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:3 + x11-libs/libX11 + virtual/opengl +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/xdaliclock-2.47-DESTDIR.patch +) + +src_install() { + dodir /usr/bin /usr/share/pixmaps + dodir /usr/share/glib-2.0/schemas /usr/share/man/man1/ + dodir /usr/share/applications/ + + default + + # Will collide with dev-libs/glib + rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + + #dobin ${PN} + #newman ${PN}.man ${PN}.1 + #dodoc ../README + + #doicon xdaliclock.png + #domenu xdaliclock.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/x11-misc/xdaliclock/xdaliclock-2.48.ebuild b/x11-misc/xdaliclock/xdaliclock-2.48.ebuild new file mode 100644 index 000000000000..08ed1122de42 --- /dev/null +++ b/x11-misc/xdaliclock/xdaliclock-2.48.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils xdg + +DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape" +HOMEPAGE="https://www.jwz.org/xdaliclock" +SRC_URI="https://www.jwz.org/xdaliclock/${P}.tar.gz" +S="${WORKDIR}"/${P}/X11 + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:3 + x11-libs/libX11 + virtual/opengl +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/xdaliclock-2.47-DESTDIR.patch +) + +src_install() { + dodir /usr/bin /usr/share/pixmaps + dodir /usr/share/glib-2.0/schemas /usr/share/man/man1/ + dodir /usr/share/applications/ + + default + + # Will collide with dev-libs/glib + rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + + #dobin ${PN} + #newman ${PN}.man ${PN}.1 + #dodoc ../README + + #doicon xdaliclock.png + #domenu xdaliclock.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest index 60a54f7429c9..fbd0debff27d 100644 --- a/x11-misc/xdesktopwaves/Manifest +++ b/x11-misc/xdesktopwaves/Manifest @@ -1,2 +1 @@ -DIST xdesktopwaves-1.3.tar.gz 49302 BLAKE2B 96348d80ba71a179df09afbaa8f2fb79725e049203e9644769e5a41b7fa8a9cae06ef2002ac3062f317f84419ae2ef739e7a90142b9b06118f51754d295e70ed SHA512 7dd3eb4f3a9291e9afab7aab7385cc271af2754adecde85ef3a2dfbc6a0bd96bab440cdb9f34cabb9e7c6d9ee25cdc64bf57ba7edc4df03f344b5b10404cd52e DIST xdesktopwaves-1.4.tar.gz 50259 BLAKE2B 5512746c9a035878f50abfc35c088f2953c5a0decaab6e0fc3cd31e29e75d100430c36df5a0043f64222521e939797ad24b9147a66cf5ba20f7f4c22fc78767d SHA512 06ec5bea51737d066beccad57db63ef7e56e59c18bb7c1dcaf06f6691940ac32a32b7cd06d9e3f16ad472e3d793c391b072a753e0088ab71ae7304b20b2fa3ba diff --git a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch deleted file mode 100644 index 80e219edc6a8..000000000000 --- a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -11,14 +11,13 @@ - - #=========================== C compiler configuration ========================== - --CC = gcc --CFLAGS = -I/usr/X11R6/include -O2 -+CFLAGS += $(shell pkg-config --cflags x11 xext) - - #============================= Linker configuration ============================ - --LINK = gcc --LFLAGS = -L/usr/X11R6/lib --LIBS = -lm -lX11 -lXext -+LINK = $(CC) -+LFLAGS = $(LDFLAGS) -+LIBS = -lm $(shell pkg-config --libs x11 xext) - - #============================ Installer configuration ========================== - ---- a/xdwapi/Makefile -+++ b/xdwapi/Makefile -@@ -1,10 +1,9 @@ - # Makefile for the xdesktopwaves API and its demo program - --CC = gcc --CFLAGS = -I/usr/X11R6/include -O2 --LINK = gcc --LFLAGS = -L/usr/X11R6/lib --LIBS = -lm -lX11 -+CFLAGS += $(shell pkg-config --cflags x11 xext) -+LINK = $(CC) -+LFLAGS = $(LDFLAGS) -+LIBS = -lm $(shell pkg-config --libs x11 xext) - - all: xdwapidemo - diff --git a/x11-misc/xdesktopwaves/metadata.xml b/x11-misc/xdesktopwaves/metadata.xml index 678112183b91..0d0eeb09fbf0 100644 --- a/x11-misc/xdesktopwaves/metadata.xml +++ b/x11-misc/xdesktopwaves/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild deleted file mode 100644 index 2104e57383da..000000000000 --- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs - -DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water" -HOMEPAGE="http://xdesktopwaves.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -RDEPEND="x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -KEYWORDS="amd64 ppc x86" -IUSE="" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_compile() { - tc-export CC - emake - emake -C xdwapi -} - -src_install() { - dobin xdesktopwaves xdwapi/xdwapidemo - doman xdesktopwaves.1 - insinto /usr/share/pixmaps - doins xdesktopwaves.xpm - make_desktop_entry xdesktopwaves - einstalldocs -} - -pkg_preinst() { - elog "To see what xdesktopwaves is able to do, start it by running" - elog "'xdesktopwaves' and then run 'xdwapidemo'. You should see the" - elog "supported effects on your desktop" -} diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild index 901b11eb7789..5793a35f7477 100644 --- a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild +++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit desktop toolchain-funcs -DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water" -HOMEPAGE="http://xdesktopwaves.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" +DESCRIPTION="Cellular automata setting the background of your X Windows desktop under water" +HOMEPAGE="https://xdesktopwaves.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" +LICENSE="GPL-2+" SLOT="0" RDEPEND=" @@ -15,9 +15,10 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + virtual/pkgconfig x11-base/xorg-proto " -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" PATCHES=( "${FILESDIR}"/${PN}-1.4-gentoo.patch diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest index 054a42dca717..b5b48378a036 100644 --- a/x11-misc/xdg-user-dirs-gtk/Manifest +++ b/x11-misc/xdg-user-dirs-gtk/Manifest @@ -1 +1 @@ -DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5 +DIST xdg-user-dirs-gtk-0.11.tar.xz 126488 BLAKE2B 45b8c3ab0b43214a1c1b39d368a283fb566bee115549468eb85e1e9e5407025690dbe320698df107523a3ea0d7cd8d0d3ef8d2296c80c79a74863d50eb581581 SHA512 2a650c6372126f807ac90fb0508e1b11636b38b5960a3037b547e9f1bb1a6b82653f20da7d5aae1144eebec040e3af89a02fbf70c1768724019b384f6d9cf85a diff --git a/x11-misc/xdg-user-dirs-gtk/metadata.xml b/x11-misc/xdg-user-dirs-gtk/metadata.xml index f3cab85cf603..2fde1d689131 100644 --- a/x11-misc/xdg-user-dirs-gtk/metadata.xml +++ b/x11-misc/xdg-user-dirs-gtk/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>freedesktop-bugs@gentoo.org</email> - </maintainer> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/xdg-user-dirs-gtk</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild index d433d5e80cee..60eaaae8aa09 100644 --- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild +++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit gnome.org readme.gentoo-r1 +EAPI=8 +inherit gnome.org readme.gentoo-r1 toolchain-funcs DESCRIPTION="Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs" +HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" - dev-libs/glib - >=x11-misc/xdg-user-dirs-0.14 + dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 + >=x11-misc/xdg-user-dirs-0.14 " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/intltool virtual/pkgconfig " @@ -30,15 +30,25 @@ DOC_CONTENTS=" " src_prepare() { - default_src_prepare + default sed -i \ -e '/Encoding/d' \ -e 's:OnlyShowIn=GNOME;LXDE;Unity;:NotShowIn=KDE;:' \ user-dirs-update-gtk.desktop.in || die } +src_configure() { + local -a myeconfargs=( + # Skip configure.ac disabling the cross-compiling pkg-config. + ac_cv_path_PKG_CONFIG="$(tc-getPKG_CONFIG)" + # Skip searching for this program in the CBUILD root. + XDG_USER_DIRS_UPDATE="${EPREFIX}/usr/bin/xdg-user-dirs-update" + ) + econf "${myeconfargs[@]}" +} + src_install() { - default_src_install + default readme.gentoo_create_doc } diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest index dc216c40fd91..fdd9d5e93e78 100644 --- a/x11-misc/xdg-user-dirs/Manifest +++ b/x11-misc/xdg-user-dirs/Manifest @@ -1 +1 @@ -DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f +DIST xdg-user-dirs-0.18.tar.gz 273556 BLAKE2B e9d05a2399040229eaed4947098bb587a3962860a0c162fd5bd939451df592130faa2fc5201440787a6a481e966f7769912b46ca1028e57a834fc7ddd950f904 SHA512 f523b2ba4f840a3c2a5730f72182fb5bb798187db769bfb7d36e9f780442813278a2c1bad656b4fb38428131241a51d07200a62b4d7b935d49a74be53f969716 diff --git a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch index bf5910882c3b..7fa9e48b3230 100644 --- a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch +++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch @@ -1,11 +1,32 @@ -http://bugs.gentoo.org/366885 -http://bugs.gentoo.org/499940 +https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/9 +From f310c0534c1394410e98e610cf5cd34d1f4c07e4 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 16 Aug 2022 23:14:39 +0100 +Subject: [PATCH] Makefile.am: link with libiconv when needed + +Fixes issues on systems with libiconv separate from libc +(e.g. Darwin/macOS, uclibc). + +We already ask configure to do detection for us +of whether we need an explicit library link line +for libintl and libiconv, so let's use the result. + +This will have no effect if the variable is empty +of course, as will be the case on many systems +(everywhere it worked before). + +We've been carrying this patch in Gentoo for quite some time +with no issues. + +Bug: https://bugs.gentoo.org/366885 +Bug: https://bugs.gentoo.org/499940 +Signed-off-by: Sam James <sam@gentoo.org> --- a/Makefile.am +++ b/Makefile.am -@@ -16,7 +16,7 @@ - xdgdir=$(sysconfdir)/xdg - xdg_DATA=user-dirs.conf user-dirs.defaults +@@ -22,7 +22,7 @@ xdg_DATA=user-dirs.conf user-dirs.defaults + xdgautostartdir=$(xdgdir)/autostart + xdgautostart_DATA = xdg-user-dirs.desktop -libraries = $(LIBINTL) +libraries = $(LIBINTL) $(LIBICONV) diff --git a/x11-misc/xdg-user-dirs/metadata.xml b/x11-misc/xdg-user-dirs/metadata.xml index f3cab85cf603..53a236d2d5ca 100644 --- a/x11-misc/xdg-user-dirs/metadata.xml +++ b/x11-misc/xdg-user-dirs/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>freedesktop-bugs@gentoo.org</email> - </maintainer> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xdg/xdg-user-dirs</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild index bb36a19d1dcd..c4747adf2ade 100644 --- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild +++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -11,22 +11,20 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 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" -RDEPEND="" -# libxslt is mandatory because 0.15 tarball is broken, re: -# https://bugs.freedesktop.org/show_bug.cgi?id=66251 BDEPEND="app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt sys-devel/gettext" PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )" DOCS=( AUTHORS ChangeLog NEWS ) + PATCHES=( "${FILESDIR}"/${PN}-0.15-libiconv.patch ) src_prepare() { default - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032 - eautoreconf # for the above patch + + # For libiconv patch + eautoreconf } diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest index 267f0faf07d6..fcc0588cf220 100644 --- a/x11-misc/xdg-utils/Manifest +++ b/x11-misc/xdg-utils/Manifest @@ -1,2 +1,3 @@ -DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e -DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec +DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51 +DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71 +DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b59cb1bd260884ca5bfd2cb8ed7ed68a2f5a8db6d660ceabab59cbb9880fd4f1a26cb71a8f759ec40c2f9f95bbc8a05 SHA512 d5436449fec2f4db952239ee910bfda203955c8df8cb92379f182dc36f9c82b6ceb092ccbebfd02ed00eb7ef5f6895ef745baca67906ae7490e425db27b1dbfc diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch b/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch deleted file mode 100644 index 1f6cc29ab059..000000000000 --- a/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@gmail.com> -Date: Thu, 24 May 2018 14:40:53 -0500 -Subject: xdg-open: better pcmanfm check (BR106636,BR106161) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 630e63e..bf9da4c 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -451,7 +451,7 @@ open_lxde() - { - - # pcmanfm only knows how to handle file:// urls and filepaths, it seems. -- if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then -+ if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then - local file="$(file_url_to_path "$1")" - - # handle relative paths --- -cgit v1.1 - diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch new file mode 100644 index 000000000000..71608552a08b --- /dev/null +++ b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch @@ -0,0 +1,25 @@ +From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001 +From: E5ten <ethancsommer@gmail.com> +Date: Thu, 16 Jan 2020 02:06:09 +0000 +Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E" + +--- + scripts/xdg-open.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in +index 202f3e3..35b0522 100644 +--- a/scripts/xdg-open.in ++++ b/scripts/xdg-open.in +@@ -72,7 +72,7 @@ get_key() + is_file_url_or_path() + { + if echo "$1" | grep -q '^file://' \ +- || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then ++ || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then + return 0 + else + return 1 +-- +GitLab + diff --git a/x11-misc/xdg-utils/metadata.xml b/x11-misc/xdg-utils/metadata.xml index 95e86c12108a..e44a98a0f124 100644 --- a/x11-misc/xdg-utils/metadata.xml +++ b/x11-misc/xdg-utils/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xdg/xdg-utils</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild deleted file mode 100644 index 49d9abfce9e4..000000000000 --- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -MY_P="${P/_/-}" - -DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/" -#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz" -#SRC_URI="https://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz -# https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz" -SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris" -IUSE="doc" - -RDEPEND=" - dev-util/desktop-file-utils - dev-perl/File-MimeInfo - dev-perl/Net-DBus - dev-perl/X11-Protocol - sys-apps/dbus - x11-misc/shared-mime-info - x11-apps/xprop - x11-apps/xset -" -DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]" - -DOCS=( ChangeLog README RELEASE_NOTES TODO ) - -RESTRICT="test" # Disabled because of sandbox violation(s) - -PATCHES=( - "${FILESDIR}"/xdg-utils-1.1.3-xdg-open-pcmanfm.patch -) - -#S=${WORKDIR}/${MY_P} - -src_prepare() { - default - # If you choose to do git snapshot instead of patchset, you need to remember - # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh - # all the files - if [[ -d "${WORKDIR}/patch" ]]; then - eapply "${WORKDIR}/patch" - fi - eautoreconf -} - -src_configure() { - export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166 - default -} - -src_install() { - default - - newdoc scripts/xsl/README README.xsl - use doc && dodoc -r scripts/html - - # Install default XDG_DATA_DIRS, bug #264647 - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local - echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local - doenvd 30xdg-data-local - - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base - echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base - doenvd 90xdg-data-base -} - -pkg_postinst() { - [[ -x $(type -P gtk-update-icon-cache) ]] \ - || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command." -} diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild index 2df4bb6913bb..852bfc0c9eea 100644 --- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild +++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild @@ -1,32 +1,44 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools -EGIT_COMMIT="9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197" +MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9" DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/" -SRC_URI=" - https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${EGIT_COMMIT}/${P}.tar.bz2" -S=${WORKDIR}/xdg-utils-${EGIT_COMMIT} +SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2" +# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24 +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz" +S="${WORKDIR}"/xdg-utils-${MY_COMMIT} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris" -IUSE="doc" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="dbus doc gnome X" +REQUIRED_USE="gnome? ( dbus )" RDEPEND=" dev-util/desktop-file-utils dev-perl/File-MimeInfo - dev-perl/Net-DBus - dev-perl/X11-Protocol - sys-apps/dbus + dbus? ( + sys-apps/dbus + gnome? ( + dev-perl/Net-DBus + dev-perl/X11-Protocol + ) + ) x11-misc/shared-mime-info - x11-apps/xprop - x11-apps/xset + X? ( + x11-apps/xprop + x11-apps/xset + ) +" +BDEPEND=" + >=app-text/xmlto-0.0.28-r3[text(+)] + app-alternatives/awk " -BDEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]" DOCS=( ChangeLog README RELEASE_NOTES TODO ) @@ -34,8 +46,15 @@ DOCS=( ChangeLog README RELEASE_NOTES TODO ) # that block forever RESTRICT="test" +PATCHES=( + "${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch + # https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21 + "${FILESDIR}"/${PN}-egrep.patch +) + src_prepare() { default + # If you choose to do git snapshot instead of patchset, you need to remember # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh # all the files diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild new file mode 100644 index 000000000000..74b50cca06a6 --- /dev/null +++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/" +if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852" + SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2" + S="${WORKDIR}"/xdg-utils-${MY_COMMIT} +else + SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + S="${WORKDIR}"/${PN}-v${PV} +fi + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="dbus doc gnome X" +REQUIRED_USE="gnome? ( dbus )" + +RDEPEND=" + dev-util/desktop-file-utils + dev-perl/File-MimeInfo + dbus? ( + sys-apps/dbus + gnome? ( + dev-perl/Net-DBus + dev-perl/X11-Protocol + ) + ) + x11-misc/shared-mime-info + X? ( + x11-apps/xprop + x11-apps/xset + ) +" +BDEPEND=" + >=app-text/xmlto-0.0.28-r3[text(+)] + app-alternatives/awk +" + +# Tests run random system programs, including interactive programs +# that block forever +RESTRICT="test" + +src_prepare() { + default + + if [[ ${PV} == *_p* ]] ; then + # If you choose to do git snapshot instead of patchset, you need to remember + # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh + # all the files + eautoreconf + fi +} + +src_configure() { + export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166 + default + emake -C scripts scripts-clean +} + +src_install() { + default + + dodoc RELEASE_NOTES + + newdoc scripts/xsl/README README.xsl + use doc && dodoc -r scripts/html + + # Install default XDG_DATA_DIRS, bug #264647 + echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die + echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die + doenvd 30xdg-data-local + + echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die + echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die + doenvd 90xdg-data-base +} + +pkg_postinst() { + [[ -x $(type -P gtk-update-icon-cache) ]] \ + || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command." +} diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-install.patch b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch index f5a02b099d92..8ca19e598a34 100644 --- a/x11-misc/xdialog/files/xdialog-2.3.1-install.patch +++ b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch @@ -1,7 +1,7 @@ -http://bugs.gentoo.org/327353 +https://bugs.gentoo.org/327353 ---- doc/Makefile.am -+++ doc/Makefile.am +--- a/doc/Makefile.am ++++ b/doc/Makefile.am @@ -6,7 +6,7 @@ CLEANFILES = index.html compatibility.html changelog.html license.html Xdialog.1 diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch b/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch index a507f3f0cfbb..fea929d99fe4 100644 --- a/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch +++ b/x11-misc/xdialog/files/xdialog-2.3.1-no-strip.patch @@ -1,6 +1,6 @@ -diff -Nru Xdialog-2.3.1.vanilla/configure.in Xdialog-2.3.1/configure.in ---- Xdialog-2.3.1.vanilla/configure.in 2009-02-11 09:54:10.000000000 +0000 -+++ Xdialog-2.3.1/configure.in 2009-02-11 09:59:28.000000000 +0000 +diff -Nru a/configure.in b/configure.in +--- a/configure.in 2009-02-11 09:54:10.000000000 +0000 ++++ b/configure.in 2009-02-11 09:59:28.000000000 +0000 @@ -36,13 +36,8 @@ CPPFLAGS="$CPPFLAGS -DUSE_GTK2" AC_MSG_RESULT(Compiling for GTK2) diff --git a/x11-misc/xdialog/metadata.xml b/x11-misc/xdialog/metadata.xml index 49c86a887b6a..3ab9b4a739d3 100644 --- a/x11-misc/xdialog/metadata.xml +++ b/x11-misc/xdialog/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1-r1.ebuild index 3be9830a8b33..b04058431d62 100644 --- a/x11-misc/xdialog/xdialog-2.3.1.ebuild +++ b/x11-misc/xdialog/xdialog-2.3.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit autotools eutils +inherit autotools -DESCRIPTION="drop-in replacement for cdialog using GTK" +DESCRIPTION="Drop-in replacement for cdialog using GTK" HOMEPAGE="http://xdialog.free.fr/" SRC_URI="http://${PN}.free.fr/Xdialog-${PV}.tar.bz2" @@ -18,20 +18,25 @@ RDEPEND=" dev-libs/glib:2 >=x11-libs/gtk+-2.2:2 " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) " S="${WORKDIR}/${P/x/X}" +DOCS=( AUTHORS BUGS ChangeLog README ) + PATCHES=( - "${FILESDIR}"/${P}-{no-strip,install}.patch + "${FILESDIR}"/${P}-no-strip.patch + "${FILESDIR}"/${P}-install.patch ) src_prepare() { - epatch "${PATCHES[@]}" + default + + sed -i -e 's:configure.in:configure.ac:' configure.in || die eautoreconf } @@ -45,14 +50,12 @@ src_configure() { src_install() { default - rm -rv "${D}"/usr/share/doc || die - - dodoc AUTHORS BUGS ChangeLog README - - use doc && dohtml -r doc/ + rm -r "${ED}"/usr/share/doc || die + use doc && local HTML_DOCS=( doc/. ) + einstalldocs if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins samples/* + docinto examples + dodoc samples/* fi } diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest index c28097819c73..546d746f7e29 100644 --- a/x11-misc/xdiskusage/Manifest +++ b/x11-misc/xdiskusage/Manifest @@ -1,2 +1 @@ -DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a DIST xdiskusage-1.52.tgz 54458 BLAKE2B 6e91402c4e43e1dfafbd2e689282aea1305ac309a491fd410b16502b2176cfe9a8b17a7379eef5ddea074cc550e7801d91c13db0a7b119b3ab48f32f786f0e5b SHA512 d561f84ca2c8ff73a9abe8c6e34baed430aaa6c6793064b2aa5856249dd4b309d50c3f6b19824a8c948aa8a71f7a3056771937fdce3f3fcb8f2fc8b0f39cdf54 diff --git a/x11-misc/xdiskusage/metadata.xml b/x11-misc/xdiskusage/metadata.xml index 8e4097862009..cf859f92ea99 100644 --- a/x11-misc/xdiskusage/metadata.xml +++ b/x11-misc/xdiskusage/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild deleted file mode 100644 index 233643fc4012..000000000000 --- a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="user-friendly program to show you what is using up all your disk space" -HOMEPAGE="http://xdiskusage.sourceforge.net/" -SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -RDEPEND=" - >=x11-libs/fltk-1.3:1 -" -DEPEND=" - ${RDEPEND} -" - -src_compile() { - emake \ - CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags)" \ - LDLIBS="$(fltk-config --ldflags)" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README -} diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild index 7449a2fa676e..deb5d693b990 100644 --- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild +++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild @@ -1,25 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -DESCRIPTION="user-friendly program to show you what is using up all your disk space" -HOMEPAGE="http://xdiskusage.sourceforge.net/" -SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz" +DESCRIPTION="User-friendly program to show you what is using up all your disk space" +HOMEPAGE="https://xdiskusage.sourceforge.net/" +SRC_URI="https://xdiskusage.sourceforge.net/${P}.tgz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc x86" + +RDEPEND=">=x11-libs/fltk-1.3:1" +BDEPEND="${RDEPEND}" +DEPEND="${RDEPEND}" -RDEPEND=" - >=x11-libs/fltk-1.3:1 -" -BDEPEND=" - ${RDEPEND} -" -DEPEND=" - ${RDEPEND} -" PATCHES=( "${FILESDIR}"/${PN}-1.52-flags-order.patch "${FILESDIR}"/${PN}-1.52-pathbuf.patch diff --git a/x11-misc/xdo/metadata.xml b/x11-misc/xdo/metadata.xml index 34306975350b..2e95a562ed13 100644 --- a/x11-misc/xdo/metadata.xml +++ b/x11-misc/xdo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch b/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch new file mode 100644 index 000000000000..a4cd766c06e7 --- /dev/null +++ b/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch @@ -0,0 +1,11 @@ +#Bug https://bugs.gentoo.org/898894 +--- a/src/lib/network.c ++++ b/src/lib/network.c +@@ -16,6 +16,7 @@ + #include <stdarg.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <string.h>
+
+ int net_connect(char* host, int port)
+ {
diff --git a/x11-misc/xdock/files/xdock-0.3.0-clang16.patch b/x11-misc/xdock/files/xdock-0.3.0-clang16.patch new file mode 100644 index 000000000000..17db7dbb0433 --- /dev/null +++ b/x11-misc/xdock/files/xdock-0.3.0-clang16.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/871549 +--- a/src/docks/xdcalendar.c ++++ b/src/docks/xdcalendar.c +@@ -1,2 +1,3 @@ + #include <xdock.h> ++#include <ctype.h> + #include <getopt.h> +--- a/src/docks/xdmemory.c ++++ b/src/docks/xdmemory.c +@@ -1,2 +1,3 @@ + #include <xdock.h> ++#include <ctype.h> + #include <getopt.h> +--- a/src/lib/network.c ++++ b/src/lib/network.c +@@ -10,2 +10,3 @@ + # include <fcntl.h>
++# include <unistd.h>
+ # define INVALID_SOCKET -1
diff --git a/x11-misc/xdock/metadata.xml b/x11-misc/xdock/metadata.xml index 41d3ac17be6e..cfd0f051b71b 100644 --- a/x11-misc/xdock/metadata.xml +++ b/x11-misc/xdock/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/x11-misc/xdock/xdock-0.3.0-r2.ebuild b/x11-misc/xdock/xdock-0.3.0-r2.ebuild new file mode 100644 index 000000000000..ee2e5614c76c --- /dev/null +++ b/x11-misc/xdock/xdock-0.3.0-r2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Emulates Window Maker docks (runs in any window manager)" +HOMEPAGE="https://xdock.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" + +DOCS=( API AUTHORS ChangeLog README TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.2.0-ldconfig.patch + "${FILESDIR}"/${P}-clang16.patch + "${FILESDIR}"/${P}-clang16-memcpy.patch +) + +src_prepare() { + default + + sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die + eautoreconf +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0.ebuild deleted file mode 100644 index 63c9381744b7..000000000000 --- a/x11-misc/xdock/xdock-0.3.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="emulates Window Maker docks (runs in any window manager)" -HOMEPAGE="http://xdock.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" - -DOCS=( API AUTHORS ChangeLog README TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.2.0-ldconfig.patch - sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die - eautoreconf -} diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest index c38e8bdfa600..675c2f3d49a4 100644 --- a/x11-misc/xdotool/Manifest +++ b/x11-misc/xdotool/Manifest @@ -1 +1 @@ -DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c +DIST xdotool-3.20211022.1.tar.gz 115237 BLAKE2B 1269775848905253936b113ac45e2a5126f1414eeacb5dd91aea6dc0cb6993f9fa0da969f30c83e0e03d435894a31ba633dc02269b38f9056772b513f0c86889 SHA512 f11d7b079f19d1650adfb549ecc96e840805935bf4925beefc3238154ad0afbff36b134c78bfc73a9dc07fc869ab75676575d6de50cfd54484d2c35d6913ea27 diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch new file mode 100644 index 000000000000..d43784deaa3d --- /dev/null +++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_hardcoded_pkg-config.patch @@ -0,0 +1,16 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2021-08-04 17:14:19.000000000 +0100 ++++ b/Makefile 2021-08-05 22:13:20.509655072 +0100 +@@ -35,9 +35,9 @@ + DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lxkbcommon + DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include + +-XDOTOOL_LIBS=$(shell pkg-config --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)") $(shell sh platform.sh extralibs) +-LIBXDO_LIBS=$(shell pkg-config --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)") +-INC=$(shell pkg-config --cflags xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)") ++XDOTOOL_LIBS=$(shell $(PKG_CONFIG) --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)") $(shell sh platform.sh extralibs) ++LIBXDO_LIBS=$(shell $(PKG_CONFIG) --libs xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_LIBS)") ++INC=$(shell $(PKG_CONFIG) --cflags xi x11 xtst xinerama xkbcommon 2> /dev/null || echo "$(DEFAULT_INC)") + CFLAGS+=-std=c99 $(INC) + + CMDOBJS= cmd_click.o cmd_mousemove.o cmd_mousemove_relative.o cmd_mousedown.o \ diff --git a/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch new file mode 100644 index 000000000000..42051da88a38 --- /dev/null +++ b/x11-misc/xdotool/files/xdotool-3.20210804.2-no_ldconfig.patch @@ -0,0 +1,12 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2021-08-04 17:14:19.000000000 +0100 ++++ b/Makefile 2021-08-05 22:10:47.713611624 +0100 +@@ -71,7 +71,7 @@ + $(CC) -o xdotool.static xdotool.o xdo.o xdo_search.o $(CMDOBJS) $(LDFLAGS) -lm $(XDOTOOL_LIBS) $(LIBXDO_LIBS) + + .PHONY: install +-install: pre-install installlib installprog installman installheader installpc post-install ++install: pre-install installlib installprog installman installheader installpc + + .PHONY: pre-install + pre-install: diff --git a/x11-misc/xdotool/metadata.xml b/x11-misc/xdotool/metadata.xml index f872516554a8..55ffc5d35bcd 100644 --- a/x11-misc/xdotool/metadata.xml +++ b/x11-misc/xdotool/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> -<email>desktop-misc@gentoo.org</email> -</maintainer> -<longdescription> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> + </maintainer> + <longdescription> This tool lets you programatically (or manually) simulate keyboard input and mouse activity, move and resize windows, etc. It does this using X11's XTEST extension and other Xlib functions. -</longdescription> -<upstream> -<remote-id type="google-code">semicomplete</remote-id> -<remote-id type="github">jordansissel/xdotool</remote-id> -</upstream> + </longdescription> + <upstream> + <remote-id type="github">jordansissel/xdotool</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild deleted file mode 100644 index fcd7fd283af2..000000000000 --- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic multilib - -DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows" -HOMEPAGE="https://www.semicomplete.com/projects/xdotool/" -SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" -IUSE="examples" - -RDEPEND=" - x11-libs/libXtst - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libxkbcommon -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -# The test wants to manualy start Xvfb, wont use VirtualX and it tries -# to run a full gnome-session. For such a tiny application i consider -# it overkill to rewrite the test scripts to not use it's own X server -# and add a full blown gnome just to run the tests. -RESTRICT="test" - -src_prepare() { - default - - sed -i \ - -e "s/installheader post-install$/installheader/" \ - -e 's:\<pkg-config\>:$(PKG_CONFIG):' \ - Makefile || die -} - -src_compile() { - tc-export CC LD PKG_CONFIG - - emake PREFIX="${EPREFIX}/usr" -} - -src_install() { - emake PREFIX="${ED}usr" INSTALLMAN="${ED}usr/share/man" INSTALLLIB="${ED}usr/$(get_libdir)" install - - dodoc CHANGELIST README - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/* - fi -} diff --git a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild new file mode 100644 index 000000000000..eadd29f568db --- /dev/null +++ b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" + +inherit docs toolchain-funcs + +DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows" +HOMEPAGE="https://www.semicomplete.com/projects/xdotool/" +SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" +IUSE="examples" + +# Many the tests want to manually start Xvfb regardless of whether there +# is an X server running or not (i.e. does not play nicely with virtualx), +# some tests require x11-wm/openbox, some try to run a complete Gnome +# session. All of them require a Ruby interpreter with dev-ruby/minitest +# installed. In short, supporting tests here will need MUCH work. +RESTRICT="test" + +RDEPEND="x11-libs/libX11 + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXtst + x11-libs/libxkbcommon" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + x11-base/xorg-proto" + +PATCHES=( + "${FILESDIR}"/${PN}-3.20210804.2-no_hardcoded_pkg-config.patch + "${FILESDIR}"/${PN}-3.20210804.2-no_ldconfig.patch +) + +DOCS=( CHANGELIST README.md ) + +src_compile() { + tc-export CC LD PKG_CONFIG + emake PREFIX="${EPREFIX}/usr" + use doc && docs_compile +} + +src_install() { + emake PREFIX="${ED}/usr" INSTALLMAN="${ED}/usr/share/man" INSTALLLIB="${ED}/usr/$(get_libdir)" install + + use examples && DOCS+=( examples ) + einstalldocs +} diff --git a/x11-misc/xearth/metadata.xml b/x11-misc/xearth/metadata.xml index 66187a0f4213..115e9d64a669 100644 --- a/x11-misc/xearth/metadata.xml +++ b/x11-misc/xearth/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild index 52016d87ae19..afcf07d5a879 100644 --- a/x11-misc/xearth/xearth-1.1-r1.ebuild +++ b/x11-misc/xearth/xearth-1.1-r1.ebuild @@ -1,47 +1,55 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit flag-o-matic toolchain-funcs +DESCRIPTION="Set the X root window to an image of the Earth" HOMEPAGE="https://hewgill.com/xearth/original/" -DESCRIPTION="Xearth sets the X root window to an image of the Earth" SRC_URI="ftp://cag.lcs.mit.edu/pub/tuna/${P}.tar.gz ftp://ftp.cs.colorado.edu/users/tuna/${P}.tar.gz" -SLOT="0" LICENSE="xearth" +SLOT="0" KEYWORDS="~alpha amd64 ppc ppc64 x86" -IUSE="" RDEPEND=" x11-libs/libX11 x11-libs/libXext - x11-libs/libXt -" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-misc/imake + x11-libs/libXt" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" app-text/rman -" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" -src_prepare() { - epatch "${FILESDIR}"/${P}-include.patch -} +PATCHES=( + "${FILESDIR}"/${P}-include.patch +) + +DOCS=( BUILT-IN GAMMA-TEST HISTORY README ) src_configure() { - xmkmf || die + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_compile() { - emake CC=$(tc-getCC) \ - CCOPTIONS="${CFLAGS}" \ + local myemakeargs=( + CC="$(tc-getCC)" + CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" + ) + emake "${myemakeargs[@]}" } src_install() { - newman xearth.man xearth.1 dobin xearth - dodoc BUILT-IN GAMMA-TEST HISTORY README + newman xearth.man xearth.1 + einstalldocs } diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest index a5ce6bfabb48..c200cd335b0b 100644 --- a/x11-misc/xfe/Manifest +++ b/x11-misc/xfe/Manifest @@ -1,3 +1,2 @@ -DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351 -DIST xfe-1.43.1.tar.gz 2776237 BLAKE2B fc82e2ea21643ecc3875512538af24daddb0db0e8829ce23c7589dc90d68e896282f70d771dcf885ea746acfa88adbb7abe6a0c354e74afa5f722dcfacf77350 SHA512 3c697ff5d0246c8bab86c9824dd4a3475ed3775d2933c63eb8e78f02b4455edb4ca98f86123eac77f611eee6ad660bf0a909c4c2791af19506a4f1744395008e -DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d +DIST xfe-1.44.tar.xz 1444296 BLAKE2B 3ace2689adc2a4e2b24e44f8f416cad5e4904d38d2be7e275256714a707995368450e63c4cf2eee3f870be51c42f295a938ea6ecd159dd1a996aad53b5d119b3 SHA512 d02f0db46c5ca6e26cff447d7f11bbc5f03a9d28b8d492a783bb47f67431a022785d6f3b25013f82a6121a8675f86caf1a9154a7faa8186e05cf4de0bd2f1749 +DIST xfe-1.46.tar.xz 1431496 BLAKE2B d7b85e5280d1d9d6db3737f8ac14f4248ae4e99b52d843b51468299bdf71581003b21d0fb2be9949c7189481ed5f3fe88bbd146d2185c17dea3a4785edb876b7 SHA512 9fea984ebbfe4dada85e028bfbde1352392cb77462c238c77c6950aac2526db11d556c8187fd765fd935ba21088c1b551e88ee414dcac35d7c59f5411c4c145b diff --git a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch deleted file mode 100644 index 615f7b01bbeb..000000000000 --- a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -29,6 +29,7 @@ - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET -+PKG_PROG_PKG_CONFIG - - - # Internationalization -@@ -109,16 +110,13 @@ - - echo "checking whether FOX was compiled with Xft support... yes" - -- # Check for FreeType2 headers -- freetype_config='' -- AC_CHECK_PROGS(freetype_config,freetype-config,) -- if test -n "$freetype_config"; then -- freetype_cflags=`$freetype_config --cflags` -- freetype_libs=`$freetype_config --libs` -- LIBS="$LIBS $freetype_libs" -- CPPFLAGS="$freetype_cflags $CPPFLAGS" -- fi -- AC_CHECK_HEADER(config/ftheader.h,,[AC_CHECK_HEADER(freetype/config/ftheader.h,,AC_MSG_ERROR("ftheader.h not found"))]) -+ # Check for FreeType2 -+ PKG_CHECK_MODULES(FREETYPE, freetype2, [ -+ freetype_cflags="$FREETYPE_CFLAGS" -+ freetype_libs="$FREETYPE_LIBS" -+ LIBS="$LIBS $freetype_libs" -+ CPPFLAGS="$freetype_cflags $CPPFLAGS" -+ ], AC_MSG_ERROR("freetype not found")) - - # Check for Xft headers - xft_config='' -@@ -131,15 +129,13 @@ - CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H" - else - # On some systems (e.g. Fedora) xft-config is deprecated and pkg-config should be used instead -- pkg_config='' -- AC_CHECK_PROGS(pkg_config,pkg-config,) -- if test -n "$pkg_config"; then -- xft_cflags=`$pkg_config --cflags xft` -- xft_libs=`$pkg_config --libs xft` -- LIBS="$LIBS $xft_libs" -- CPPFLAGS="$xft_cflags $CPPFLAGS" -- CXXFLAGS="${CXXFLAGS} -DHAVE_XFT_H" -- fi -+ PKG_CHECK_MODULES(XFT, xft, [ -+ xft_cflags="$XFT_CFLAGS" -+ xft_libs="$XFT_LIBS" -+ LIBS="$LIBS $xft_libs" -+ CPPFLAGS="$xft_cflags $CPPFLAGS" -+ CXXFLAGS="$CXXFLAGS -DHAVE_XFT_H" -+ ], AC_MSG_ERROR("Xft not found")) - fi - AC_CHECK_HEADER(X11/Xft/Xft.h,,AC_MSG_ERROR("Xft.h not found")) - diff --git a/x11-misc/xfe/metadata.xml b/x11-misc/xfe/metadata.xml index 110d70c42283..532bd5a1c5e5 100644 --- a/x11-misc/xfe/metadata.xml +++ b/x11-misc/xfe/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">xfe</remote-id> </upstream> diff --git a/x11-misc/xfe/xfe-1.42.ebuild b/x11-misc/xfe/xfe-1.42.ebuild deleted file mode 100644 index c2619c850ccb..000000000000 --- a/x11-misc/xfe/xfe-1.42.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES=" - bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr - zh_CN zh_TW -" -inherit autotools eutils l10n - -DESCRIPTION="MS-Explorer-like minimalist file manager for X" -HOMEPAGE="http://roland65.free.fr/xfe" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug nls startup-notification" - -RDEPEND=" - media-libs/libpng:0 - x11-libs/fox:1.6[png,truetype] - x11-libs/libX11 - x11-libs/libXft - startup-notification? ( x11-libs/startup-notification ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) -" - -DOCS=( AUTHORS BUGS ChangeLog README TODO ) - -PATCHES=( "${FILESDIR}/${PN}-1.42-use_pkgconfig_for_freetype_and_xft.patch" ) - -src_prepare() { - default - - cat >po/POTFILES.skip <<-EOF - src/icons.cpp - xfe.desktop.in.in - xfi.desktop.in.in - xfp.desktop.in.in - xfv.desktop.in.in - xfw.desktop.in.in - EOF - - # malformed LINGUAS file - # recent intltool expects newline for every linguas - sed -i \ - -e '/^#/!s:\s\s*:\n:g' \ - po/LINGUAS || die - - # remove not selected locales - rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;} - l10n_for_each_disabled_locale_do rm_locale - - sed -i \ - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable debug) - $(use_enable nls) - $(use_enable startup-notification sn) - --enable-minimalflags - ) - econf "${myeconfargs[@]}" -} diff --git a/x11-misc/xfe/xfe-1.43.1.ebuild b/x11-misc/xfe/xfe-1.43.1.ebuild deleted file mode 100644 index 0a9e382f69bd..000000000000 --- a/x11-misc/xfe/xfe-1.43.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PLOCALES=" - bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr - zh_CN zh_TW -" -inherit l10n xdg-utils - -DESCRIPTION="MS-Explorer-like minimalist file manager for X" -HOMEPAGE="http://roland65.free.fr/xfe" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug nls startup-notification" - -RDEPEND=" - media-libs/libpng:0 - x11-libs/fox:1.6[png,truetype] - x11-libs/libX11 - x11-libs/libXft - startup-notification? ( x11-libs/startup-notification ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - nls? ( - dev-util/intltool - sys-devel/gettext - ) -" - -DOCS=( AUTHORS BUGS ChangeLog README TODO ) - -src_prepare() { - default - - cat >po/POTFILES.skip <<-EOF - src/icons.cpp - xfe.desktop.in.in - xfi.desktop.in.in - xfp.desktop.in.in - xfv.desktop.in.in - xfw.desktop.in.in - EOF - - # malformed LINGUAS file - # recent intltool expects newline for every linguas - sed -i \ - -e '/^#/!s:\s\s*:\n:g' \ - po/LINGUAS || die - - # remove not selected locales - rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;} - l10n_for_each_disabled_locale_do rm_locale -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable nls) \ - $(use_enable startup-notification sn) \ - --enable-minimalflags -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/xfe/xfe-1.43.2.ebuild b/x11-misc/xfe/xfe-1.44.ebuild index 57333f1ae0f0..0f646a5273d9 100644 --- a/x11-misc/xfe/xfe-1.43.2.ebuild +++ b/x11-misc/xfe/xfe-1.44.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PLOCALES=" bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr zh_CN zh_TW " -inherit l10n xdg-utils +inherit plocale xdg-utils DESCRIPTION="MS-Explorer-like minimalist file manager for X" -HOMEPAGE="http://roland65.free.fr/xfe" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" +HOMEPAGE="http://roland65.free.fr/xfe/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" @@ -18,17 +18,22 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="debug nls startup-notification" RDEPEND=" - media-libs/libpng:0 x11-libs/fox:1.6[png,truetype] + media-libs/fontconfig + x11-libs/libXrandr x11-libs/libX11 x11-libs/libXft - startup-notification? ( x11-libs/startup-notification ) + startup-notification? ( + x11-libs/libxcb:= + x11-libs/startup-notification + x11-libs/xcb-util + ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool virtual/pkgconfig nls? ( - dev-util/intltool sys-devel/gettext ) " @@ -38,7 +43,7 @@ DOCS=( AUTHORS BUGS ChangeLog README TODO ) src_prepare() { default - cat >po/POTFILES.skip <<-EOF + cat >po/POTFILES.skip || die <<-EOF src/icons.cpp xfe.desktop.in.in xfi.desktop.in.in @@ -55,7 +60,7 @@ src_prepare() { # remove not selected locales rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;} - l10n_for_each_disabled_locale_do rm_locale + plocale_for_each_disabled_locale rm_locale } src_configure() { diff --git a/x11-misc/xfe/xfe-1.46.ebuild b/x11-misc/xfe/xfe-1.46.ebuild new file mode 100644 index 000000000000..690f416c2cef --- /dev/null +++ b/x11-misc/xfe/xfe-1.46.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES=" + bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr + zh_CN zh_TW +" +inherit flag-o-matic plocale xdg-utils + +DESCRIPTION="MS-Explorer-like minimalist file manager for X" +HOMEPAGE="http://roland65.free.fr/xfe/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug nls startup-notification" +# The only dir which defines a 'check' target is po/ which doesn't do anything +# useful for us. It also fails, see bug #847253. +RESTRICT="test" + +RDEPEND=" + x11-libs/fox:1.6[png,truetype] + media-libs/fontconfig + x11-libs/libXrandr + x11-libs/libX11 + x11-libs/libXft + startup-notification? ( + x11-libs/libxcb:= + x11-libs/startup-notification + x11-libs/xcb-util + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( + sys-devel/gettext + ) +" + +DOCS=( AUTHORS BUGS ChangeLog README TODO ) + +src_prepare() { + default + + cat >po/POTFILES.skip || die <<-EOF + src/icons.cpp + xfe.desktop.in.in + xfi.desktop.in.in + xfp.desktop.in.in + xfv.desktop.in.in + xfw.desktop.in.in + EOF + + # malformed LINGUAS file + # recent intltool expects newline for every linguas + sed -i \ + -e '/^#/!s:\s\s*:\n:g' \ + po/LINGUAS || die + + # remove not selected locales + rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;} + plocale_for_each_disabled_locale rm_locale +} + +src_configure() { + # https://sourceforge.net/p/xfe/bugs/282/ (bug #864757) + filter-lto + + econf \ + $(use_enable debug) \ + $(use_enable nls) \ + $(use_enable startup-notification sn) \ + --enable-minimalflags +} + +src_install() { + default + + # Install this unconditionally rather than automagically based on whether + # polkit is installed + rm -rf "${ED}"/usr/share/polkit-1/actions || die + insinto /usr/share/polkit-1/actions + newins - org.xfe.root.policy <<-EOF + <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" + "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> + <policyconfig> + <vendor>Xfe</vendor> + <vendor_url>http://roland65.free.fr/xfe</vendor_url> + <icon_name>xfe</icon_name> + <action id="org.xfe.root"> + <description>Run Xfe as root</description> + <message>Authentication is required to run Xfe as root</message> + <defaults> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> + <annotate key="org.freedesktop.policykit.exec.path">${EPREFIX}/usr/bin/xfe</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> + </policyconfig> + EOF +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest index c0d925ad8a9b..2763902dcbbf 100644 --- a/x11-misc/xfishtank/Manifest +++ b/x11-misc/xfishtank/Manifest @@ -1 +1 @@ -DIST xfishtank-2.1tp.tar.gz 187513 BLAKE2B e2acec91ef52776bee82ea1b4df347b7fe509377687e74422d6dff81d7fce8a4009e4d0f45327a8401e4ae9782440d9f6478d1dd501c6e4e7d595d94b2d40b1a SHA512 641efa1104685d94589c2d9d365108308cb1b0dd238dbba6dc333c5922bda371536c0e26a63645351ac245a18f2386e4c47b4a1fc2a7f4b0400d37db846976a1 +DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f diff --git a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch deleted file mode 100644 index 0a4a03503246..000000000000 --- a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- xfishtank-2.1tp/read.c -+++ xfishtank-2.1tp/read.c -@@ -1,5 +1,7 @@ - #include <X11/Xlib.h> - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #include "compact.h" - #include "medcut.h" - ---- xfishtank-2.1tp/medcut.c -+++ xfishtank-2.1tp/medcut.c -@@ -1,4 +1,5 @@ - #include <stdio.h> -+#include <stdlib.h> - #include "medcut.h" - - #define RED 0 ---- xfishtank-2.1tp/xfish.c -+++ xfishtank-2.1tp/xfish.c -@@ -46,6 +46,9 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <unistd.h> - #ifdef sgi - #define _BSD_SIGNALS - #endif -@@ -848,8 +850,8 @@ - struct colr_data colrs[256]; - - colormap = XDefaultColormap(Dpy, screen); - -- if (colormap == NULL) -+ if (colormap == 0) - { - return; - } -@@ -1812,9 +1814,11 @@ - high_res_sleep(seconds) - double seconds; - { -- int fds = 0; -+ fd_set fds; - struct timeval timeout; - -+ FD_ZERO(&fds); -+ - timeout.tv_sec = seconds; - timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0; - select(0, &fds, &fds, &fds, &timeout); ---- xfishtank-2.1tp/makeh.c -+++ xfishtank-2.1tp/makeh.c -@@ -1,6 +1,6 @@ -- -+#include <stdlib.h> - #include <stdio.h> -- -+#include <string.h> - main() - { - FILE *fp; ---- xfishtank-2.1tp/gifread.c -+++ xfishtank-2.1tp/gifread.c -@@ -56,6 +56,8 @@ - - #include <X11/Xlib.h> - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #if defined(SYSV) || defined(SVR4) - #include <string.h> - #else /* SYSV */ diff --git a/x11-misc/xfishtank/metadata.xml b/x11-misc/xfishtank/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xfishtank/metadata.xml +++ b/x11-misc/xfishtank/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild deleted file mode 100644 index 3e5fbb14c7ea..000000000000 --- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_P=${P}tp - -DESCRIPTION="Turns your root window into an aquarium" -HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/demos/" -SRC_URI="http://www.ibiblio.org/pub/Linux/X11/demos/${MY_P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-misc/imake" - -S=${WORKDIR}/${MY_P} - -PATCHES=( "${FILESDIR}"/${P}-implicits.patch ) - -src_compile() { - xmkmf || die - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \ - EXTRA_LDOPTIONS="${LDFLAGS}" ${PN} -} diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild new file mode 100644 index 000000000000..22bdac1cd667 --- /dev/null +++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Turns your root window into an aquarium" +HOMEPAGE="https://jim.rees.org/computers/xfishtank.html" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux" + +RDEPEND=" + media-libs/imlib2[X] + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXt +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1 +" +S=${WORKDIR}/${PN} + +src_configure() { + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" \ + ${PN} +} diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest index 920d5083f8cb..dd41064d8892 100644 --- a/x11-misc/xflux-gui/Manifest +++ b/x11-misc/xflux-gui/Manifest @@ -1 +1 @@ -DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2 +DIST xflux-gui-2.0.tar.gz 35805 BLAKE2B 7a15371d682b31c900f35bebd36e12b70d6095c4cdc9c33f43bad031d72b82d8d3800f7f34f7e31965725dfe075dc6934512eeced98aa685d0023a57dfb61103 SHA512 4a5235feecb06ee95d28d4c05bb710014aea120943b3cbe23f2d2130486de82295891d8211a02e52385edb577da3438dd1c2ba45b209ab4359eb3469df08eade diff --git a/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch b/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch deleted file mode 100644 index dc14be17339b..000000000000 --- a/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 674d17b100f7b8a471d65b61749ca892567f8d58 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conrad@kostecki.com> -Date: Fri, 16 Aug 2019 16:02:59 +0200 -Subject: [PATCH] setup.py: add posbility to disable compilation of gschema - -When you install fluxgui, it also compiles the gschema, which is for -most distros fine. But on source distros like Gentoo, which do the -compilation of gschema separately, this will lead to a file collision, -as packages unter Gentoo are not allowed to install such files. - -So we introduce a new env variable called DISABLE_GSCHEMA_COMPILED which -needs to be set to disable this behaviour. - -Closes: https://github.com/xflux-gui/fluxgui/issues/124 -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - setup.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 8a8fa14..4bd404d 100755 ---- a/setup.py -+++ b/setup.py -@@ -76,9 +76,10 @@ def run(self): - super().run() - - # Compile '*.gschema.xml' to update or create 'gschemas.compiled'. -- info("compiling gsettings schemas") -- gschema_dir = os.path.join(self.install_dir, gschema_dir_suffix) -- self.spawn(["glib-compile-schemas", gschema_dir]) -+ if os.environ.get('DISABLE_GSCHEMAS_COMPILED', None) is None: -+ info("compiling gsettings schemas") -+ gschema_dir = os.path.join(self.install_dir, gschema_dir_suffix) -+ self.spawn(["glib-compile-schemas", gschema_dir]) - - setup(name = "f.lux indicator applet", - version = "1.2.1~pre", diff --git a/x11-misc/xflux-gui/metadata.xml b/x11-misc/xflux-gui/metadata.xml index 9a5cd0ccd7bd..fcd43ad2f897 100644 --- a/x11-misc/xflux-gui/metadata.xml +++ b/x11-misc/xflux-gui/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>conikost@gentoo.org</email> diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild b/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild index 0efff0431536..bae43d3357cd 100644 --- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r1.ebuild +++ b/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 gnome2-utils xdg-utils +inherit distutils-r1 gnome2-utils DESCRIPTION="A GUI for f.lux" -HOMEPAGE="https://justgetflux.com/" -SRC_URI="https://github.com/${PN}/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/xflux-gui/fluxgui/" +SRC_URI="https://github.com/${PN}/fluxgui/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/fluxgui-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="-* amd64 x86" - -PATCHES=( "${FILESDIR}/${P}-disable-gschemas-compiled.patch" ) +KEYWORDS="-* ~amd64 ~x86" RDEPEND=" - dev-libs/libappindicator:3 + dev-libs/libayatana-appindicator dev-python/pexpect[${PYTHON_USEDEP}] dev-python/pygobject[${PYTHON_USEDEP}] dev-python/pyxdg[${PYTHON_USEDEP}] @@ -26,14 +26,12 @@ RDEPEND=" x11-misc/xflux " -S="${WORKDIR}/fluxgui-${PV}" - -python_install() { +python_compile() { # Don't let the package compiling the schemas, # as this could cause a file collision export DISABLE_GSCHEMAS_COMPILED="true" - distutils-r1_python_install + distutils-r1_python_compile } pkg_postinst() { diff --git a/x11-misc/xflux/metadata.xml b/x11-misc/xflux/metadata.xml index 77ca72bcdaa5..242d91b52210 100644 --- a/x11-misc/xflux/metadata.xml +++ b/x11-misc/xflux/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>conikost@gentoo.org</email> diff --git a/x11-misc/xflux/xflux-20130927-r1.ebuild b/x11-misc/xflux/xflux-20130927-r2.ebuild index c34eac9ddae4..f51b9bab56ba 100644 --- a/x11-misc/xflux/xflux-20130927-r1.ebuild +++ b/x11-misc/xflux/xflux-20130927-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Makes the color of your computer's display adapt to the time of the day" HOMEPAGE="https://justgetflux.com/" @@ -9,6 +9,7 @@ SRC_URI=" amd64? ( https://justgetflux.com/linux/${PN}64.tgz -> ${PN}64-${PV}.tar.gz ) x86? ( https://justgetflux.com/linux/${PN}-pre.tgz -> ${P}.tar.gz ) " +S="${WORKDIR}" KEYWORDS="-* amd64 x86" LICENSE="f.lux" @@ -23,8 +24,6 @@ RDEPEND=" x11-libs/libXxf86vm " -S="${WORKDIR}" - QA_PREBUILT="usr/bin/xflux" src_install() { diff --git a/x11-misc/xflux/xflux-20170103.ebuild b/x11-misc/xflux/xflux-20170103-r1.ebuild index c5897e2e7152..c3e0c5cab0ea 100644 --- a/x11-misc/xflux/xflux-20170103.ebuild +++ b/x11-misc/xflux/xflux-20170103-r1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Makes the color of your computer's display adapt to the time of the day" HOMEPAGE="https://justgetflux.com/" SRC_URI="https://justgetflux.com/linux/${PN}12.tgz -> ${PN}12-${PV}.tar.gz" +S="${WORKDIR}" KEYWORDS="-* amd64" LICENSE="f.lux" @@ -20,8 +21,6 @@ RDEPEND=" x11-libs/libXxf86vm " -S="${WORKDIR}" - QA_PREBUILT="usr/bin/xflux" src_install() { diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest index 89b57a273ede..d14cc2daf147 100644 --- a/x11-misc/xfractint/Manifest +++ b/x11-misc/xfractint/Manifest @@ -1 +1 @@ -DIST xfractint-20.04p14.tar.gz 1336285 BLAKE2B 946c34551acf131845f1ecf17d4fe82214535627e8ea68d704efcff4b93c525d82f004bde8ae1bac11df8c82caa3bcff4778b2f8dfed1bdb494ba036e62256c5 SHA512 7d13c719f4f4b0680455b9b7f86644928d8145606973d208e5bf0d26b4f7b04ddbf8d2080ea35c872b21e079f1a116f3ef94e9acb36a45d43c16403c473e2acd +DIST xfractint-20.04p16.tar.gz 1356976 BLAKE2B 2cb05021c76d9761bf7020a2b9a0fbf7d682a620d931b7841ce75780c1a3aabb6bbbd1b2e378fba3e96b2cfdaf845ff9cdafcf3219ee756fe7d128a19b342132 SHA512 6696daf21c2927d87f58f7d7136c5d51bd8c60d78e901d537f1ef38f27b70c42a590b05c663363c49a8cb30d7013a969813e7bbe4a97f49b9c286497b440bdf1 diff --git a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch b/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch deleted file mode 100644 index eb3d92783aae..000000000000 --- a/x11-misc/xfractint/files/xfractint-20.04p09-ldflags.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -125,7 +125,7 @@ - - ifeq ($(AS),/usr/bin/nasm) - --CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin -+CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -DNASM -fno-builtin - #CFLAGS = -I. -D_CONST $(DEFINES) - #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \ - # -march=$(ARCH) -DNASM -fno-builtin -@@ -133,7 +133,7 @@ - - else - --CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX -fno-builtin -+CFLAGS = -I$(HFD) $(DEFINES) -DBIG_ANSI_C -DLINUX -fno-builtin - #CFLAGS = -I$(HFD) $(DEFINES) -g -DBIG_ANSI_C -DLINUX \ - # -march=$(ARCH) -fno-builtin - #CFLAGS = -I. $(DEFINES) -g -DBIG_ANSI_C -DLINUX -Os -fno-builtin -@@ -312,7 +312,7 @@ - "HFD=.${HFD}" - cd unix ; ${MAKE} all "CC=${CC}" "CFLAGS= -I.${HFD} -I${XFTHFD} ${CFLAGS} ${OPT}" "SRCDIR=${SHRDIR}" \ - "AS=${AS}" "AFLAGS=${AFLAGS}" "HFD=.${HFD}" -- $(CC) -o xfractint $(CFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS) -+ $(CC) -o xfractint $(CFLAGS) $(LDFLAGS) $(OPT) $(OBJS) $(U_OBJS) $(LIBS) - # strip xfractint - - fractint: diff --git a/x11-misc/xfractint/files/xfractint-20.04p16-install-phase.patch b/x11-misc/xfractint/files/xfractint-20.04p16-install-phase.patch new file mode 100644 index 000000000000..0387b63b7e43 --- /dev/null +++ b/x11-misc/xfractint/files/xfractint-20.04p16-install-phase.patch @@ -0,0 +1,24 @@ +Prevents recompiling in install phase and sets default +CC if not set +Fix by David Denoncin + +--- a/Makefile 2020-08-01 23:19:09.000000000 -0000 ++++ b/Makefile 2020-08-02 14:33:52.943061996 -0000 +@@ -150,7 +150,7 @@ + # For Sun Solaris 2.x w/GNU gcc, use CC = gcc + #CC = gcc + #CC = /usr/bin/gcc +-CC ?= ++CC ?= /usr/bin/gcc + + # For HPUX, use LIBS = -L/usr/lib/X11R4 -lX11 -lm -lcurses -ltermcap + # For AIX or OSF/1, add -lbsd +@@ -345,7 +345,7 @@ + cd $(COMDIR) ; ${MAKE} clean + cd $(UDIR) ; ${MAKE} clean "AS=${AS}" + +-install: xfractint fractint.hlp ++install: + # $(STRIP) xfractint + $(INSTALL) -d $(BINDIR) $(MANDIR) $(SRCDIR)/$(PDIR) $(SRCDIR)/$(FDIR) \ + $(SRCDIR)/$(IDIR) $(SRCDIR)/$(LDIR) $(SRCDIR)/$(MDIR) $(SRCDIR)/$(XDIR) diff --git a/x11-misc/xfractint/files/xfractint.envd b/x11-misc/xfractint/files/xfractint.envd deleted file mode 100644 index 3dd0cbcda664..000000000000 --- a/x11-misc/xfractint/files/xfractint.envd +++ /dev/null @@ -1,4 +0,0 @@ -#Specifies xfractint directory - -FRACTDIR=/usr/share/xfractint - diff --git a/x11-misc/xfractint/metadata.xml b/x11-misc/xfractint/metadata.xml index 6f49eba8f496..4f7fdcabe5c4 100644 --- a/x11-misc/xfractint/metadata.xml +++ b/x11-misc/xfractint/metadata.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>gentoo@denoncin.fr</email> + <name>David Denoncin</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/xfractint/xfractint-20.04_p14.ebuild b/x11-misc/xfractint/xfractint-20.04_p14.ebuild deleted file mode 100644 index b06f10dad010..000000000000 --- a/x11-misc/xfractint/xfractint-20.04_p14.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -MY_P=${P/_} - -DESCRIPTION="A fractal generator" -HOMEPAGE="https://www.fractint.org" -SRC_URI="https://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz" - -LICENSE="free-noncomm HPND public-domain" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND} - x11-libs/libXft" -# x86? ( dev-lang/nasm )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/xfractint-20.04p09-ldflags.patch" ) - -src_compile() { - # Untested, any x86 archteam dev. is allowed to uncomment this. - local myasm="foo" -# use x86 && myasm="/usr/bin/nasm" - emake CC="$(tc-getCC)" AS="${myasm}" OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - emake DESTDIR="${ED}/usr" STRIP="true" install - newenvd "${FILESDIR}"/xfractint.envd 60xfractint -} - -pkg_postinst() { - elog "XFractInt requires the FRACTDIR variable to be set in order to start." - elog "Please re-login or \`source /etc/profile\` to have this variable set." -} diff --git a/x11-misc/xfractint/xfractint-20.04_p16.ebuild b/x11-misc/xfractint/xfractint-20.04_p16.ebuild new file mode 100644 index 000000000000..af6790581497 --- /dev/null +++ b/x11-misc/xfractint/xfractint-20.04_p16.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +MY_P=${P/_} + +DESCRIPTION="A fractal generator" +HOMEPAGE="https://www.fractint.org" +SRC_URI="https://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz" + +S="${WORKDIR}/${MY_P}" + +LICENSE="free-noncomm HPND public-domain" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXft +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-20.04p16-install-phase.patch" +) + +src_compile() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/864759 + # Reported to developer list at + # https://mailman.xmission.com/postorius/lists/fractdev.mailman.xmission.com/ + # + # Do not trust for LTO either + append-flags -fno-strict-aliasing + filter-lto + emake CC="$(tc-getCC)" AS="$(tc-getAS)" OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + emake DESTDIR="${ED}/usr" install +} diff --git a/x11-misc/xgestures/metadata.xml b/x11-misc/xgestures/metadata.xml index cc37087c5caf..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 "http://www.gentoo.org/dtd/metadata.dtd"> +<!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 4e72115627db..e80e9e9eca09 100644 --- a/x11-misc/xgestures/xgestures-0.4.ebuild +++ b/x11-misc/xgestures/xgestures-0.4-r1.ebuild @@ -1,17 +1,20 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 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" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" 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,14 +22,16 @@ RDEPEND="x11-libs/libXmu DEPEND="${RDEPEND} x11-base/xorg-proto" -DOCS=( AUTHORS ChangeLog NEWS README ) +src_prepare() { + default + eautoreconf +} src_install() { default newdoc .gestures gestures } -pkg_postinst() -{ +pkg_postinst() { elog "Unpack /usr/share/doc/${PF}/gestures* and copy it to \$HOME/.gestures" } diff --git a/x11-misc/xhkeys/metadata.xml b/x11-misc/xhkeys/metadata.xml index 66187a0f4213..85e4ed814fa2 100644 --- a/x11-misc/xhkeys/metadata.xml +++ b/x11-misc/xhkeys/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1-r1.ebuild index 155de9151a0c..3ccb080471da 100644 --- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild +++ b/x11-misc/xhkeys/xhkeys-2.2.1-r1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=8 -DESCRIPTION="assign particular actions to any key or key combination" +inherit autotools + +DESCRIPTION="Assign particular actions to any key or key combination" HOMEPAGE="http://wmalms.tripod.com/#XHKEYS" -SRC_URI="mirror://gentoo/${P}.tar.gz" +SRC_URI="https://wmalms.tripod.com/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -27,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/xiccd/metadata.xml b/x11-misc/xiccd/metadata.xml index 0f9feee94985..7f909fce0eed 100644 --- a/x11-misc/xiccd/metadata.xml +++ b/x11-misc/xiccd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> diff --git a/x11-misc/xiccd/xiccd-0.3.0.ebuild b/x11-misc/xiccd/xiccd-0.3.0.ebuild index 680cb69d1d70..2d0c6c8e2084 100644 --- a/x11-misc/xiccd/xiccd-0.3.0.ebuild +++ b/x11-misc/xiccd/xiccd-0.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/agalakhov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~riscv" RDEPEND="dev-libs/glib:2 x11-apps/xrandr diff --git a/x11-misc/xidle/metadata.xml b/x11-misc/xidle/metadata.xml index f9f8bbfd9405..85e4ed814fa2 100644 --- a/x11-misc/xidle/metadata.xml +++ b/x11-misc/xidle/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xidle/xidle-26052015.ebuild b/x11-misc/xidle/xidle-26052015-r1.ebuild index 0ca23a545d60..28de0ef6a81a 100644 --- a/x11-misc/xidle/xidle-26052015.ebuild +++ b/x11-misc/xidle/xidle-26052015-r1.ebuild @@ -1,8 +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 -inherit toolchain-funcs +EAPI=8 + +inherit edo toolchain-funcs DESCRIPTION="Monitors inactivity in X and runs the specified program when a timeout occurs" HOMEPAGE="http://www.freebsdsoftware.org/x11/xidle.html" @@ -11,21 +12,20 @@ SRC_URI="http://distcache.freebsd.org/local-distfiles/novel/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~hppa ~x86" -IUSE="" -DEPEND=" +RDEPEND=" x11-libs/libX11 x11-libs/libXScrnSaver - " -RDEPEND="${DEPEND}" +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-dead.patch" ) +PATCHES=( + "${FILESDIR}/${P}-dead.patch" +) src_compile() { - local my_compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN}{,.c} - $($(tc-getPKG_CONFIG) --libs xscrnsaver) $($(tc-getPKG_CONFIG) --libs x11)" - echo ${my_compile} || die - eval ${my_compile} || die + edo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN}{,.c} $($(tc-getPKG_CONFIG) --libs xscrnsaver) $($(tc-getPKG_CONFIG) --libs x11) } src_install() { diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest index c9cc0566f8c4..98bc0f060635 100644 --- a/x11-misc/xkbd/Manifest +++ b/x11-misc/xkbd/Manifest @@ -1 +1 @@ -DIST xkbd-0.8.16.tar.gz 347616 BLAKE2B a7ee906d6ae3328d5366b88ebe960b6fdf84a5cad1c1db4b1a0056fc5842196699dfa749c3c0398054bc54073b422798c0efaf57c8116d05b6754c84d6abae03 SHA512 8410f722cb93069eea26f9d1ed6b9fea76ed5222b8586c2f78ccc1a0f040a964e165df0611ce72c108dbc7adeec31515595c81be3867e68c0cadd8846d985d4a +DIST xkbd-0.8.18.tar.gz 50421 BLAKE2B 7652f33cdf00584cc55fcb9dbced9d92c57cf6383b6164d8c026bf88c962e7469b094de7454b451745feb396fbe5ad561193c9d4de8e7b9f65c27a55e7cf478c SHA512 335e18e76e6bf8b7142eb785c9003e8a3d80719e6737149be8e1178bd7281fada6808ea0b18538caf3c3fa1d62778a3d6a45a1fa8b3b0845dca19f3e62942831 diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch deleted file mode 100644 index ff30537add44..000000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/287075 - ---- a/src/libvirtkeys.c -+++ b/src/libvirtkeys.c -@@ -341,7 +341,7 @@ - - for (keycode = 0; ((keycode < (maxKeycode - minKeycode + 1)) && !found); keycode++) - { -- for (column = 0; ((column < keysymsPerKeycode) && !found); column++) -+ for (column = 0; ((column < (keysymsPerKeycode > 4 ? 4 : keysymsPerKeycode)) && !found); column++) - { - if (keymap[(keycode * keysymsPerKeycode + column)] == ks) - { diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch deleted file mode 100644 index deadcd7cddb1..000000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN xkbd-0.8.15/data/en_GB.qwerty.xkbd.in xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in ---- xkbd-0.8.15/data/en_GB.qwerty.xkbd.in 2003-08-10 10:46:29.000000000 -0700 -+++ xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in 2008-03-23 02:52:52.000000000 -0700 -@@ -24,6 +24,7 @@ - - # button style, can be rounded ( default ), square or plain - button_style square -+repeat_delay 50 - - </global> - # -diff -ruN xkbd-0.8.15/data/en_US.qwerty.xkbd.in xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in ---- xkbd-0.8.15/data/en_US.qwerty.xkbd.in 2002-11-28 03:46:04.000000000 -0800 -+++ xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in 2008-03-23 02:50:39.000000000 -0700 -@@ -26,6 +26,7 @@ - - # button style, can be rounded ( default ), square or plain - # button_style plain -+repeat_delay 50 - - </global> - diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch b/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch deleted file mode 100644 index 987270d1d398..000000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fixes following QA issues: - * QA Notice: This package installs one or more .desktop files that do not - * pass validation. - * - * /usr/share/applications/inputmethods/xkbd.desktop: error: (will be fatal in the future): value "xkbd.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path - * /usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "MB"; values extending the format should start with "X-" - * /usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "Panel"; values extending the format should start with "X-" - * ---- a/xkbd.desktop 2003-09-29 20:29:35.000000000 +0300 -+++ b/xkbd.desktop 2017-02-16 16:23:40.927035269 +0200 -@@ -3,6 +3,6 @@ - Comment=Virtual Keyboard - Exec=xkbd - Type=Application --Icon=xkbd.png --Categories=Panel;Utility;MB -+Icon=xkbd -+Categories=Utility;Accessibility - X-MB-INPUT-MECHANSIM=True diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch deleted file mode 100644 index d90824085ea4..000000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- xkbd-0.8.16/src/xkbd.c -+++ xkbd-0.8.16/src/xkbd.c -@@ -307,21 +307,22 @@ - 0, BlackPixel(display, screen_num), - WhitePixel(display, screen_num)); - -+ wret = DisplayWidth(display, screen_num); -+ hret = DisplayHeight(display, screen_num)/4; -+ xret = 0; -+ yret = DisplayHeight(display, screen_num) - hret; -+ - // deactivate geometry for 0.8.16 release - mb - geometry = NULL; - if (geometry != NULL) - { -- XParseGeometry(geometry, &xret, &yret, &wret, &hret ); -- } -- else -- { -- if (wm_type != WM_MATCHBOX) -- { -- wret = DisplayWidth(display, screen_num); -- hret = DisplayHeight(display, screen_num)/4; -- xret = 0; -- yret = DisplayHeight(display, screen_num) - hret; -- } -+ int flags; -+ -+ flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret ); -+ if( flags & XNegative ) -+ xret += DisplayWidth( display, screen_num ) - wret; -+ if( flags & YNegative ) -+ yret += DisplayHeight( display, screen_num ) - hret; - } - - /* check for user selected keyboard conf file */ diff --git a/x11-misc/xkbd/files/xkbd-999999-evdev.patch b/x11-misc/xkbd/files/xkbd-999999-evdev.patch new file mode 100644 index 000000000000..087fd74ea01a --- /dev/null +++ b/x11-misc/xkbd/files/xkbd-999999-evdev.patch @@ -0,0 +1,15 @@ +--- a/src/xtg.c ++++ b/src/xtg.c +@@ -382,10 +382,12 @@ + static void map_to(){ + float x=scrX1,y=scrY1,w=width,h=height,dx=pf[p_touch_add],dy=pf[p_touch_add]; + _short m = 1; ++#ifdef USE_EVDEV + if (pa[p_touch_add] && pa[p_touch_add][0] == '+' && pa[p_touch_add][1] == 0) { + if (mwidth && devX!=0) dx = (devX - mwidth)/2; + if (mheight && devY!=0) dy = (devY - mheight)/2; + } ++#endif + if (dx!=0 && mwidth) { + float b = (w/mwidth)*dx; + x-=b; diff --git a/x11-misc/xkbd/files/xkbd-999999-xft.patch b/x11-misc/xkbd/files/xkbd-999999-xft.patch new file mode 100644 index 000000000000..8f803111bc02 --- /dev/null +++ b/x11-misc/xkbd/files/xkbd-999999-xft.patch @@ -0,0 +1,33 @@ +--- a/src/kb.c ++++ b/src/kb.c +@@ -66,7 +66,7 @@ + if (*f) XftFontClose(kb->display, *f); + return ((*f = XftFontOpenName(kb->display, kb->screen, fontname)) != NULL); + #else +- if (*f) XUnloadFont((*f)->fid); ++ if (*f) XUnloadFont(kb->display, (*f)->fid); + if ((*f = XLoadQueryFont(kb->display, fontname)) == NULL) return 0; + XSetFont(kb->display, kb->gc, (*f)->fid); + return True; +--- a/src/button.c ++++ b/src/button.c +@@ -150,7 +150,7 @@ + &extents); + return extents.width; + #else +- return XTextWidth(kb->font_info, txt, strlen(txt)); ++ return XTextWidth(kb->font, txt, strlen(txt)); + #endif + } + +@@ -441,8 +441,10 @@ + + b->fg_gc = k->gc; + b->bg_gc = k->rev_gc; ++#ifdef USE_XFT + b->col = k->color; + b->col_rev = k->color_rev; ++#endif + + b->layout_switch = -1; + diff --git a/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml index 49c86a887b6a..69de6019b8c5 100644 --- a/x11-misc/xkbd/metadata.xml +++ b/x11-misc/xkbd/metadata.xml @@ -1,8 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> +<email>desktop-misc@gentoo.org</email> +<name>Gentoo Desktop Miscellaneous Project</name> </maintainer> +<use> +<flag name="evdev">Enable <pkg>dev-libs/libevdev</pkg> support for xtg</flag> +<flag name="xi">Enable XInput2 support through <pkg>x11-libs/libXi</pkg></flag> +<flag name="xrandr">Enable XRandR support through <pkg>x11-libs/libXrandr</pkg></flag> +</use> </pkgmetadata> diff --git a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild deleted file mode 100644 index d3c9125a799e..000000000000 --- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="onscreen soft keyboard for X11" -HOMEPAGE="http://trac.hackable1.org/trac/wiki/Xkbd" -SRC_URI="http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" -IUSE="debug" - -RDEPEND="x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXtst - x11-libs/libXpm - media-libs/freetype - dev-libs/expat - sys-libs/zlib" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -DOCS=( AUTHORS ) -PATCHES=( - "${FILESDIR}"/${P}-fix-geometry.patch - "${FILESDIR}"/${P}-desktop.patch - "${FILESDIR}"/${PN}-0.8.15-increase-delay.patch - "${FILESDIR}"/${PN}-0.8.15-fix-keysyms-search.patch -) - -src_configure() { - econf \ - $(use_enable debug) -} diff --git a/x11-misc/xkbd/xkbd-0.8.18.ebuild b/x11-misc/xkbd/xkbd-0.8.18.ebuild new file mode 100644 index 000000000000..062dfdd982f6 --- /dev/null +++ b/x11-misc/xkbd/xkbd-0.8.18.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic + +DESCRIPTION="onscreen soft keyboard for X11" +HOMEPAGE="https://github.com/mahatma-kaganovich/xkbd" +SRC_URI="https://github.com/mahatma-kaganovich/${PN}/archive/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc x86" +IUSE="debug +xft +xpm" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXtst + xft? ( x11-libs/libXft ) + xpm? ( x11-libs/libXpm ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +DOCS=( AUTHORS ) +S=${WORKDIR}/${PN}-${P} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + use debug && append-cppflags -DDEBUG + econf \ + $(use_enable xft) \ + $(use_enable xpm) \ + --disable-debug +} diff --git a/x11-misc/xkbd/xkbd-999999.ebuild b/x11-misc/xkbd/xkbd-999999.ebuild new file mode 100644 index 000000000000..8d6139bf4019 --- /dev/null +++ b/x11-misc/xkbd/xkbd-999999.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic git-r3 + +DESCRIPTION="onscreen soft keyboard for X11" +HOMEPAGE="https://github.com/mahatma-kaganovich/xkbd" +EGIT_REPO_URI="https://github.com/mahatma-kaganovich/xkbd" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="debug +evdev +xft +xi +xpm +xrandr +xscreensaver" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXtst + evdev? ( dev-libs/libevdev ) + xft? ( x11-libs/libXft ) + xpm? ( x11-libs/libXpm ) + xrandr? ( x11-libs/libXrandr ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +DOCS=( AUTHORS ) +PATCHES=( + "${FILESDIR}"/${PN}-999999-evdev.patch + "${FILESDIR}"/${PN}-999999-xft.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + use debug && append-cppflags -DDEBUG + econf \ + $(use_enable evdev) \ + $(use_enable xft) \ + $(use_enable xi) \ + $(use_enable xpm) \ + $(use_enable xrandr) \ + $(use_enable xscreensaver ss) \ + --disable-debug +} diff --git a/x11-misc/xkblayout-state/Manifest b/x11-misc/xkblayout-state/Manifest index a23c24b233aa..fbfed7265a10 100644 --- a/x11-misc/xkblayout-state/Manifest +++ b/x11-misc/xkblayout-state/Manifest @@ -1 +1 @@ -DIST xkblayout-state-0_p20180118.tar.gz 6853 BLAKE2B 1a8b3a9c89d9647bb8b9f6a2261f2e06f44f408823939268d60364fe532b9501e3c36d8f66cc1160f0b5432874d48046f848159842d09135a6cb4af658a8b248 SHA512 7618e920f8044324b7f4eb58d4e22ce076056d2d911cd950e6a862303c4b37f31f5919fec69c63173a7ff181d51849def4f6a78a407baf3012232f2f423bed00 +DIST xkblayout-state-0_p20211106.tar.gz 7617 BLAKE2B 523a861c7cf79e2fc77ced1c411d54771f3ed4ed236ac89d8c89996a26e6fe4bf0d12f75ade9d9bebb1de9e233dcd6ca838dbf297df6f411caff0a27e47df5b5 SHA512 85d785ed767d1c29cd1710bc07894ebc94a18018afa211202929c82ac10e7efb06e5ce29d8de507cbd4c931d650e3c04e1452f63dad17a99a379e55761dbc15b diff --git a/x11-misc/xkblayout-state/metadata.xml b/x11-misc/xkblayout-state/metadata.xml index 1b2becffa26c..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 "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">nonpop/xkblayout-state</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild b/x11-misc/xkblayout-state/xkblayout-state-0_p20211106.ebuild index afbeba66bacf..765479fe3bb9 100644 --- a/x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild +++ b/x11-misc/xkblayout-state/xkblayout-state-0_p20211106.ebuild @@ -1,23 +1,21 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -# Commit Date: 18 Jan 2018 -EGIT_COMMIT="45b752b130e077d5b1437d40b0a459e062aafa13" +# Commit Date: 06 Nov 2021 +EGIT_COMMIT="f311779ed95f43f1fdebed0f710ad84057e6fe19" -DESCRIPTION="A small program to get/set the current XKB layout" +DESCRIPTION="Small program to get/set the current XKB layout" HOMEPAGE="https://github.com/nonpop/xkblayout-state" SRC_URI="https://github.com/nonpop/xkblayout-state/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND}" diff --git a/x11-misc/xkblayout-state/xkblayout-state-9999.ebuild b/x11-misc/xkblayout-state/xkblayout-state-9999.ebuild deleted file mode 100644 index b92c94a33662..000000000000 --- a/x11-misc/xkblayout-state/xkblayout-state-9999.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit git-r3 toolchain-funcs - -DESCRIPTION="A small program to get/set the current XKB layout" -HOMEPAGE="https://github.com/nonpop/xkblayout-state" -EGIT_REPO_URI="https://github.com/nonpop/xkblayout-state.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" - -src_compile() { - emake CXX="$(tc-getCXX)" -} - -src_install() { - emake PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install -} diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest index a8d43eb7a8e6..dbb062b684c8 100644 --- a/x11-misc/xkbset/Manifest +++ b/x11-misc/xkbset/Manifest @@ -1,4 +1,2 @@ DIST xkbset-0.5.tar.gz 13933 BLAKE2B f889bbf527e6ee808d970796815445cfa4803f315916c412d540eaac778f8cfdfa6e3d00e171cb21de589a61e5320de2af4f8b8c19c4c2a45c3cf837da38a0e7 SHA512 64de1a18076c0e0fd3e3189444b6033880028f53777566286caf935bfafcf062ccbd408d20926e2a4febb77d15b026349e0288f2aa93c815ddd9437b96589d8c -DIST xkbset_0.5-5.1.diff.gz 3744 BLAKE2B 3294afd74ddfa81d18827ef388935113eeaa6b2b8abfff799b13cec04f76dda2b78be685991933f133f5eb2b8ebcea5dbba6f5e4429d8363c984aa5c6d22de77 SHA512 92c362653088d5249dc26959cc898d4f8882f77b410ae09bbb2f03972940ed64ee2864b6da3425692c5cfa2bfe3b34d8316f5d7aa619f25c6311ac7a91a8db4b -DIST xkbset_0.5-6.debian.tar.xz 4028 BLAKE2B 5892ffc95e1926515cb98eaa40829f1f1d91009260e53d62834ce3fbc1bf99559ad5df9ff5b8a57cf7989579cbd351a7bb5481f7e284c9adaf954b2f20cb5d05 SHA512 c7d806406756785c77c12152a092c3f1245941682d063d503f3279d033a1adffa29c7b62723c720cdc03ebde882c134c494b30eda240211f899ceffbc874c366 DIST xkbset_0.5-7.1.debian.tar.xz 4336 BLAKE2B 48de493553add438ccce22567d1e8b706418a6db8a70aaeb83835c33662c8ebc22f8e3250a8b87d521a02c41e44f7252dce774525a1fa5c4bfbf57f876dd728f SHA512 f927cc1fde5b3d0658d28a8fc1cdaa0c366826f7a8eab19404dda6a66a0e91ce3c262da1e783169a7521eb10a3470e9c75c01e60728daea737ad1319bc0b946f diff --git a/x11-misc/xkbset/metadata.xml b/x11-misc/xkbset/metadata.xml index 9cd3e9988810..ae24bbc4f2af 100644 --- a/x11-misc/xkbset/metadata.xml +++ b/x11-misc/xkbset/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>jer@gentoo.org</email> -</maintainer> +<!-- maintainer-needed --> <use> <flag name="tk">Install the <pkg>dev-perl/Tk</pkg> based xkbset-gui utility</flag> </use> diff --git a/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild deleted file mode 100644 index 87d2b2816bdc..000000000000 --- a/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs versionator - -DEBIAN_P_MAJOR=$(get_version_component_range 3) -DEBIAN_P_MAJOR=${DEBIAN_P_MAJOR/p/} -DEBIAN_P_MINOR=$(get_version_component_range 4) -DEBIAN_P_MINOR=${DEBIAN_P_MINOR/p/} - -DESCRIPTION="User preference utility for XKB extensions for X" -HOMEPAGE="https://faculty.missouri.edu/~stephen/software/#xkbset" -SRC_URI=" - https://faculty.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P_MAJOR}.${DEBIAN_P_MINOR}.diff.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="tk" - -CDEPEND=" - x11-libs/libX11 -" -DEPEND=" - ${CDEPEND} -" -RDEPEND=" - ${CDEPEND} - tk? ( dev-perl/Tk ) -" - -S=${WORKDIR}/${P/_p*/} - -PATCHES=( - "${FILESDIR}"/${P/_p*/}-ldflags.patch - "${WORKDIR}"/${PN}_${PV/_p*}-${DEBIAN_P_MAJOR}.${DEBIAN_P_MINOR}.diff - "${WORKDIR}"/${P/_p*/}/debian/patches/02_clarify_errors.dpatch -) - -src_compile() { - emake CC=$(tc-getCC) INC_PATH= LIB_PATH= -} - -src_install() { - dobin xkbset - use tk && dobin xkbset-gui - doman xkbset.1 - dodoc README TODO -} diff --git a/x11-misc/xkbset/xkbset-0.5_p6.ebuild b/x11-misc/xkbset/xkbset-0.5_p6.ebuild deleted file mode 100644 index 7ac0f9aa012e..000000000000 --- a/x11-misc/xkbset/xkbset-0.5_p6.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs versionator - -DEBIAN_P_MAJOR=$(get_version_component_range 3) -DEBIAN_P_MAJOR=${DEBIAN_P_MAJOR/p/} - -DESCRIPTION="User preference utility for XKB extensions for X" -HOMEPAGE="https://faculty.missouri.edu/~stephen/software/#xkbset" -SRC_URI=" - https://faculty.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P_MAJOR}.debian.tar.xz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="tk" - -CDEPEND=" - x11-libs/libX11 -" -DEPEND=" - ${CDEPEND} -" -RDEPEND=" - ${CDEPEND} - tk? ( dev-perl/Tk ) -" - -S=${WORKDIR}/${P/_p*/} - -PATCHES=( - "${FILESDIR}"/${P/_p*/}-ldflags.patch - "${WORKDIR}"/debian/patches/02-clarify-errors.patch -) - -src_compile() { - emake CC=$(tc-getCC) INC_PATH= LIB_PATH= -} - -src_install() { - dobin xkbset - use tk && dobin xkbset-gui - doman xkbset.1 - dodoc README TODO -} diff --git a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild index 47ac617ee117..125b8f843a53 100644 --- a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild +++ b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,7 +38,7 @@ PATCHES=( ) src_compile() { - emake CC=$(tc-getCC) INC_PATH= LIB_PATH= + emake CC="$(tc-getCC)" INC_PATH= LIB_PATH= } src_install() { diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index a5432b313951..bfc8f0232e33 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,2 +1 @@ -DIST xkeyboard-config-2.29.tar.bz2 1707176 BLAKE2B 436f2e8f4c7bea5a96e551daf01cdf6f7eeb2468dbacd28b977be003e159d0af9f233f17749fb5379444ce84c8d5c78f1c949e4bddfa3db6d39338ae01f0aefe SHA512 202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670 -DIST xkeyboard-config-2.30.tar.bz2 1689137 BLAKE2B 54ba0a3a82d65f4cf15c45aa500bd8a44865c9ce845d5bc1ae85d3544a384622c580baa119b8882defa9868d8210697153f868a273a38852d938bf318ed09c3b SHA512 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4 +DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch deleted file mode 100644 index 0f4d455f6ea3..000000000000 --- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.29-fix-python3-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c847c834cce190c5c835a454bfe548195da9fa53 Mon Sep 17 00:00:00 2001 -From: MilhouseVH <milhouseVH.github@nmacleod.com> -Date: Sun, 16 Feb 2020 09:41:43 +0000 -Subject: [PATCH] fix python3 support - -https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197 ---- - rules/compat/map-variants.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py -index ebbfec9..979ba43 100755 ---- a/rules/compat/map-variants.py -+++ b/rules/compat/map-variants.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - - import argparse - import re -@@ -12,8 +12,8 @@ class Layout(object): - assert variant is None - # parse a layout(variant) string - match = re.match(r'([^(]+)\(([^)]+)\)', layout) -- self.layout = match[1] -- self.variant = match[2] -+ self.layout = match.groups()[0] -+ self.variant = match.groups()[1] - - def __str__(self): - if self.variant: --- -2.24.1 - diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml index d3cbfbdb344e..386b7d63b889 100644 --- a/x11-misc/xkeyboard-config/metadata.xml +++ b/x11-misc/xkeyboard-config/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id> -</upstream> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id> + <remote-id type="freedesktop-gitlab">xkeyboard-config/xkeyboard-config</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild deleted file mode 100644 index 37f50f131e36..000000000000 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.29.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-any-r1 - -DESCRIPTION="X keyboard configuration database" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" - inherit autotools git-r3 - # x11-misc/util-macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="" -DEPEND="${LIVE_DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-python3-support.patch -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" - --enable-compat-rules - # do not check for runtime deps - --disable-runtime-deps - --with-xkb-rules-symlink=xorg - ) - - econf "${econfargs[@]}" -} - -src_test() { - :; -} diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild deleted file mode 100644 index 66e3276b4ab7..000000000000 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.30.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-any-r1 - -DESCRIPTION="X keyboard configuration database" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" - inherit autotools git-r3 - # x11-misc/util-macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" -else - SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="" -DEPEND="${LIVE_DEPEND}" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - local econfargs=( - --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" - --enable-compat-rules - # do not check for runtime deps - --disable-runtime-deps - --with-xkb-rules-symlink=xorg - ) - - econf "${econfargs[@]}" -} - -src_test() { - :; -} diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild new file mode 100644 index 000000000000..fe824fdb32a2 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit meson python-any-r1 + +DESCRIPTION="X keyboard configuration database" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" + inherit git-r3 +else + SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +# <dev-python/pycountry-23.12.7 bug #920278 +BDEPEND=" + dev-lang/perl + dev-libs/libxslt + sys-devel/gettext + test? ( + ${PYTHON_DEPS} + x11-apps/xkbcomp + x11-libs/libxkbcommon + $(python_gen_any_dep ' + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + use test || return 0 + python_has_version \ + "dev-python/pycountry[${PYTHON_USEDEP}]" \ + "dev-python/pytest-xdist[${PYTHON_USEDEP}]" \ + "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + eapply_user + + # Remove pytest timeout + sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die +} + +src_configure() { + local emesonargs=( + -Dxkb-base="${EPREFIX}/usr/share/X11/xkb" + -Dcompat-rules=true + ) + meson_src_configure +} diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 5ae805ded96c..8dccf01c3ce0 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-any-r1 DESCRIPTION="X keyboard configuration database" @@ -13,24 +13,49 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" inherit git-r3 else - SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" + SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" fi LICENSE="MIT" SLOT="0" -IUSE="" +IUSE="test" +RESTRICT="!test? ( test )" -DEPEND="" -RDEPEND="" +# <dev-python/pycountry-23.12.7 bug #920278 BDEPEND=" - ${PYTHON_DEPS} + dev-lang/perl dev-libs/libxslt sys-devel/gettext + test? ( + ${PYTHON_DEPS} + x11-apps/xkbcomp + x11-libs/libxkbcommon + $(python_gen_any_dep ' + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ') + ) " +python_check_deps() { + use test || return 0 + python_has_version \ + "dev-python/pycountry[${PYTHON_USEDEP}]" \ + "dev-python/pytest-xdist[${PYTHON_USEDEP}]" \ + "dev-python/pytest[${PYTHON_USEDEP}]" +} + pkg_setup() { - python-any-r1_pkg_setup + use test && python-any-r1_pkg_setup +} + +src_prepare() { + eapply_user + + # Remove pytest timeout + sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die } src_configure() { diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch deleted file mode 100644 index f68629ef3eaf..000000000000 --- a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xkeycaps-2.47.orig/xkeycaps.man xkeycaps-2.47/xkeycaps.man ---- xkeycaps-2.47.orig/xkeycaps.man 2006-01-02 02:22:17.000000000 +0200 -+++ xkeycaps-2.47/xkeycaps.man 2008-12-07 22:51:38.000000000 +0200 -@@ -267,7 +267,7 @@ - the physical keys: it is immutable (unless you repaint your keyboard...) - .TP 10 - .B \fIChord\fP --This term refers to a set of two or more keys held down simultaniously (by -+This term refers to a set of two or more keys held down simultaneously (by - analogy with piano keyboards.) All but one of the keys will generally be - Modifier Keys. Sometimes \fIConstellation\fP is used to mean the same thing. - .TP 10 diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch new file mode 100644 index 000000000000..99dc6f4ea827 --- /dev/null +++ b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/871129 +--- a/commands.c ++++ b/commands.c +@@ -1754,3 +1754,3 @@ + } +- XawListChange (box->keysym_list, keysym_name_buffer, 0, 0, True); ++ XawListChange (box->keysym_list, (const char **) keysym_name_buffer, 0, 0, True); + } +@@ -2528,3 +2528,3 @@ + box->set = &keyboard_sets [i]; +- XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True); ++ XawListChange (box->keymap_list, (const char **) box->set->maps, 0, 0, True); + for (i = 0; i < box->set->map_count; i++) +@@ -2599,3 +2599,3 @@ + +- XawListChange (box->keyboard_list, list, 0, 0, True); ++ XawListChange (box->keyboard_list, (const char **) list, 0, 0, True); + XawListHighlight (box->keyboard_list, kbd); diff --git a/x11-misc/xkeycaps/metadata.xml b/x11-misc/xkeycaps/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xkeycaps/metadata.xml +++ b/x11-misc/xkeycaps/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild deleted file mode 100644 index 0c3b4ce21aa7..000000000000 --- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="GUI frontend to xmodmap" -HOMEPAGE="https://packages.qa.debian.org/x/xkeycaps.html" -SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -RDEPEND="x11-misc/xbitmaps - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXaw - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-misc/imake - >=sys-apps/sed-4" - -DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt ) -PATCHES=( - "${FILESDIR}"/${P}-Imakefile.patch - "${FILESDIR}"/${P}-man.patch -) - -src_compile() { - xmkmf || die - sed -i -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \ - Makefile || die - emake EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" -} - -src_install() { - default - newman ${PN}.man ${PN}.1 -} diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild index 646273eb1ed3..136ec95c516f 100644 --- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild +++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="HPND" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" RDEPEND=" x11-libs/libX11 @@ -25,14 +25,17 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - >=sys-apps/sed-4 x11-base/xorg-proto - x11-misc/imake +" +BDEPEND=" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1 " DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt ) PATCHES=( "${FILESDIR}"/${P/_p*}-Imakefile.patch + "${FILESDIR}"/${P}-clang16.patch ) S=${WORKDIR}/${P/_p*} @@ -46,7 +49,8 @@ src_prepare() { } src_configure() { - xmkmf || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die sed -i \ -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \ Makefile || die diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest index 630320071a90..51644f013aa7 100644 --- a/x11-misc/xlockmore/Manifest +++ b/x11-misc/xlockmore/Manifest @@ -1,4 +1,2 @@ -DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569 -DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2 -DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf99418bf3237594a1237547fa1eb9d5274327672f33344e97d2333eca71f95e51f760f0548abef06f8006a97c55c0 SHA512 0b067ced9afe0c5498f0b1e19bf163b0363bbb4bc2bc2007c1c0416328cdc2d528d664b122ef68322c38f2bcc37a15665b31ee6e8ce2369bad9e50528b93a047 -DIST xlockmore-5.64.tar.xz 1944496 BLAKE2B 1b2c0337950bcf7ba094012c70c6c8578523b81a6af6dd68a0373425f87d7da28a770a8f7453019cc1527501a417390f013f43b3da2ddfc7d44380c512f9b4c9 SHA512 4946e8e9f895c0433c09e1cd639389d26020a764d62b08b329ce5d9e5de4bb6438f024639b2068c94f21cb0ebb5a6f94dffff6f606c6c3e2372a5102768e7f39 +DIST xlockmore-5.69.tar.xz 2008396 BLAKE2B 69341456769f34c1ac537f382b4baf287b5da47f4620581cbea5ab92749a26467781ebb6d7f3dfa9bd1eedf92d21fb8e501715af681972f06007408a5a44f4e5 SHA512 03c5938a7442665a2743894c0daa45f3b38569f2b3c3cf395f0d0f5758f6f873e0ef703936d0846d0210babe52357a398a885f919257efe9a2038c8e06be40b9 +DIST xlockmore-5.71.tar.xz 2048496 BLAKE2B 417bd4175a483d350cfa098c8a2488f81df9758874c1b53c36a6c2ae23f3b17c942c089d8ecce432f8db244cd8c4df7e79854ff9f2156153ee838ac98f2778ad SHA512 d09cd28dbca37db5e8fa7a388f4d797369b82a856b509414dd6dca5b586506c466b0fb112947a6a0c71e8c8de7cc125ef19c0fa358edc2a521ad38c255946e58 diff --git a/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch b/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch new file mode 100644 index 000000000000..a6bd223373b1 --- /dev/null +++ b/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch @@ -0,0 +1,28 @@ +Clang16 will not allow assigning imcompatbile function pointer types. +Therefore this patch adds casts to the function pointers. + +Bug: https://bugs.gentoo.org/880909 +This patch has been sent to upstream via mail. + +Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-07) + +--- a/xlock/vtlock_proc.c ++++ b/xlock/vtlock_proc.c +@@ -188,7 +188,7 @@ find_x_proc(int disp_nr, dev_t lxdev, ino_t lxino) + lencmd = strlen(xcmd_ref); + if ( stat( PROCDIR, &stbuf ) == -1 ) return( (pid_t)-1 ); + namelist = (struct dirent **) malloc(sizeof (struct dirent *)); +- if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, alphasort)) == -1 ) ++ if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, (int (*)(const void *, const void *))alphasort)) == -1 ) + { + free(namelist); + return( (pid_t)-1 ); +@@ -301,7 +301,7 @@ scan_x_fds( struct inode_ref *inotab, int ln_ttys, pid_t proc ) + + (void) sprintf(xfddir, PROCDIR "/%d/fd", proc); + namelist = (struct dirent **) malloc(sizeof (struct dirent *)); +- if (scan_dir(xfddir, &namelist, NULL, alphasort) == -1) { ++ if (scan_dir(xfddir, &namelist, NULL, (int (*)(const void *, const void *))alphasort) == -1) { + free(namelist); + return 0; + } diff --git a/x11-misc/xlockmore/metadata.xml b/x11-misc/xlockmore/metadata.xml index 673b683e2429..915e543b6dee 100644 --- a/x11-misc/xlockmore/metadata.xml +++ b/x11-misc/xlockmore/metadata.xml @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <use> - <flag name="xlockrc">Enables xlockrc for people without PAM</flag> - <flag name="vtlock">Enables support for virtual terminal locking</flag> - </use> + <!-- maintainer-needed --> + <use> + <flag name="xlockrc">Enables xlockrc for people without PAM</flag> + <flag name="vtlock">Enables support for virtual terminal locking</flag> + </use> </pkgmetadata> diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild deleted file mode 100644 index 43775135d661..000000000000 --- a/x11-misc/xlockmore/xlockmore-5.50.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic pam - -DESCRIPTION="Just another screensaver application for X" -HOMEPAGE="https://www.sillycycle.com/xlockmore.html" -SRC_URI=" - https://www.sillycycle.com/xlock/${P}.tar.xz - https://www.sillycycle.com/xlock/recent-releases/${P}.tar.xz -" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86" -IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock" - -REQUIRED_USE=" - || ( crypt pam ) - pam? ( !xlockrc ) - xlockrc? ( !pam ) -" -RDEPEND=" - gtk? ( x11-libs/gtk+:2 ) - imagemagick? ( media-gfx/imagemagick:= ) - motif? ( >=x11-libs/motif-2.3:0 ) - nas? ( media-libs/nas ) - opengl? ( - virtual/opengl - virtual/glu - truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) - ) - pam? ( sys-libs/pam ) - truetype? ( media-libs/freetype:2 ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.46-freetype261.patch - "${FILESDIR}"/${PN}-5.47-CXX.patch - "${FILESDIR}"/${PN}-5.47-strip.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=() - - if use opengl && use truetype; then - myconf=( --with-ftgl ) - append-flags -DFTGL213 - else - myconf=( --without-ftgl ) - fi - - myconf+=( - $(use_enable pam) - $(use_enable xlockrc) - $(use_enable vtlock) - $(use_with crypt) - $(use_with debug editres) - $(use_with gtk gtk2) - $(use_with imagemagick magick) - $(use_with motif) - $(use_with nas) - $(use_with opengl mesa) - $(use_with opengl) - $(use_with truetype freetype) - $(use_with truetype ttf) - $(use_with xinerama) - --disable-mb - --enable-appdefaultdir=/usr/share/X11/app-defaults - --enable-syslog - --enable-vtlock - --without-esound - --without-gtk - ) - econf "${myconf[@]}" -} - -src_install() { - local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} ) - default - - pamd_mimic_system xlock auth - - if use pam; then - fperms 755 /usr/bin/xlock - else - fperms 4755 /usr/bin/xlock - fi - - docinto html - dodoc docs/xlock.html -} diff --git a/x11-misc/xlockmore/xlockmore-5.63.ebuild b/x11-misc/xlockmore/xlockmore-5.63.ebuild deleted file mode 100644 index 989d6c25d4c0..000000000000 --- a/x11-misc/xlockmore/xlockmore-5.63.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic pam - -DESCRIPTION="Just another screensaver application for X" -HOMEPAGE="https://www.sillycycle.com/xlockmore.html" -SRC_URI=" - https://www.sillycycle.com/xlock/${P/_beta/BETA}.tar.xz - https://www.sillycycle.com/xlock/recent-releases/${P/_beta/BETA}.tar.xz -" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock" - -REQUIRED_USE=" - || ( crypt pam ) - pam? ( !xlockrc ) - xlockrc? ( !pam ) -" -RDEPEND=" - gtk? ( x11-libs/gtk+:2 ) - imagemagick? ( media-gfx/imagemagick:= ) - motif? ( >=x11-libs/motif-2.3:0 ) - nas? ( media-libs/nas ) - opengl? ( - virtual/opengl - virtual/glu - truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) - ) - pam? ( sys-libs/pam ) - truetype? ( media-libs/freetype:2 ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.46-freetype261.patch - "${FILESDIR}"/${PN}-5.47-CXX.patch - "${FILESDIR}"/${PN}-5.47-strip.patch -) -S=${WORKDIR}/${P/_beta/BETA} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=() - - if use opengl && use truetype; then - myconf=( --with-ftgl ) - append-cppflags -DFTGL213 - else - myconf=( --without-ftgl ) - fi - - myconf+=( - $(use_enable pam) - $(use_enable xlockrc) - $(use_enable vtlock) - $(use_with crypt) - $(use_with debug editres) - $(use_with gtk gtk2) - $(use_with imagemagick magick) - $(use_with motif) - $(use_with nas) - $(use_with opengl mesa) - $(use_with opengl) - $(use_with truetype freetype) - $(use_with truetype ttf) - $(use_with xinerama) - --disable-mb - --enable-appdefaultdir=/usr/share/X11/app-defaults - --enable-syslog - --enable-vtlock - --without-esound - --without-gtk - ) - econf "${myconf[@]}" -} - -src_install() { - local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} ) - default - - pamd_mimic_system xlock auth - - if use pam; then - fperms 755 /usr/bin/xlock - else - fperms 4755 /usr/bin/xlock - fi - - docinto html - dodoc docs/xlock.html -} diff --git a/x11-misc/xlockmore/xlockmore-5.62.ebuild b/x11-misc/xlockmore/xlockmore-5.69.ebuild index 2071d0700818..1baf305fb5fc 100644 --- a/x11-misc/xlockmore/xlockmore-5.62.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.69.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools flag-o-matic pam DESCRIPTION="Just another screensaver application for X" @@ -10,10 +11,11 @@ SRC_URI=" https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz " +S="${WORKDIR}/${P/_alpha/ALPHA}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86" IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock" REQUIRED_USE=" @@ -21,7 +23,14 @@ REQUIRED_USE=" pam? ( !xlockrc ) xlockrc? ( !pam ) " + +BDEPEND="virtual/pkgconfig" RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) @@ -33,16 +42,10 @@ RDEPEND=" ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt xinerama? ( x11-libs/libXinerama ) " DEPEND=" ${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " @@ -50,11 +53,18 @@ PATCHES=( "${FILESDIR}"/${PN}-5.46-freetype261.patch "${FILESDIR}"/${PN}-5.47-CXX.patch "${FILESDIR}"/${PN}-5.47-strip.patch + #"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch ) -S=${WORKDIR}/${P/_alpha/ALPHA} src_prepare() { default + + sed -i \ + -e '/XLOCKLIBPATHS="-L/d' \ + -e '/XMLOCKLIBPATHS="-L/d' \ + -e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \ + configure.ac || die + eautoreconf } @@ -62,10 +72,11 @@ src_configure() { local myconf=() if use opengl && use truetype; then - myconf=( --with-ftgl ) - append-cppflags -DFTGL213 - else - myconf=( --without-ftgl ) + append-cppflags -DFTGL213 + + myconf=( --with-ftgl ) + else + myconf=( --without-ftgl ) fi myconf+=( @@ -90,6 +101,7 @@ src_configure() { --without-esound --without-gtk ) + econf "${myconf[@]}" } @@ -97,9 +109,8 @@ src_install() { local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} ) default - pamd_mimic_system xlock auth - if use pam; then + pamd_mimic_system xlock auth fperms 755 /usr/bin/xlock else fperms 4755 /usr/bin/xlock diff --git a/x11-misc/xlockmore/xlockmore-5.64.ebuild b/x11-misc/xlockmore/xlockmore-5.71.ebuild index 26cf0a2b0721..b774e8bccb86 100644 --- a/x11-misc/xlockmore/xlockmore-5.64.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.71.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools flag-o-matic pam DESCRIPTION="Just another screensaver application for X" @@ -10,10 +11,11 @@ SRC_URI=" https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz " +S="${WORKDIR}/${P/_alpha/ALPHA}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86" IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock" REQUIRED_USE=" @@ -21,7 +23,14 @@ REQUIRED_USE=" pam? ( !xlockrc ) xlockrc? ( !pam ) " + +BDEPEND="virtual/pkgconfig" RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) @@ -33,16 +42,10 @@ RDEPEND=" ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt xinerama? ( x11-libs/libXinerama ) " DEPEND=" ${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " @@ -50,23 +53,34 @@ PATCHES=( "${FILESDIR}"/${PN}-5.46-freetype261.patch "${FILESDIR}"/${PN}-5.47-CXX.patch "${FILESDIR}"/${PN}-5.47-strip.patch - "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch + #"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch + "${FILESDIR}"/${PN}-5.71-fix-build-for-clang16.patch ) -S=${WORKDIR}/${P/_alpha/ALPHA} src_prepare() { default + + sed -i \ + -e '/XLOCKLIBPATHS="-L/d' \ + -e '/XMLOCKLIBPATHS="-L/d' \ + -e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \ + configure.ac || die + eautoreconf } src_configure() { + # #864761 + filter-lto + local myconf=() if use opengl && use truetype; then - myconf=( --with-ftgl ) - append-cppflags -DFTGL213 - else - myconf=( --without-ftgl ) + append-cppflags -DFTGL213 + + myconf=( --with-ftgl ) + else + myconf=( --without-ftgl ) fi myconf+=( @@ -91,6 +105,7 @@ src_configure() { --without-esound --without-gtk ) + econf "${myconf[@]}" } @@ -98,9 +113,8 @@ src_install() { local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} ) default - pamd_mimic_system xlock auth - if use pam; then + pamd_mimic_system xlock auth fperms 755 /usr/bin/xlock else fperms 4755 /usr/bin/xlock diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest index f8f176ea99ec..7860d4448776 100644 --- a/x11-misc/xmobar/Manifest +++ b/x11-misc/xmobar/Manifest @@ -1 +1,2 @@ -DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3 +DIST xmobar-0.44.1.tar.gz 156756 BLAKE2B bee81627744146989b402ae04d36edb5e4a69686b546457afebad81cda96ece4ce0ace8a2855bd5136610be3fc396c2f62121ea062fffb1ad837145cf3238fdb SHA512 e04f3f9f40ffa4095df2b523916686d93d28b4cbb880f7732cf63d6f1915e721043764b9d723ed8b3c4938c3df749d0e5a9ddb9a9e64a2a015f8f0d6b3f46c97 +DIST xmobar-0.46.tar.gz 168197 BLAKE2B a1b0e94794232641574b0e6c1c55ab8c203fec800702896ab516f2df7d50ffec709385958ffd4098f79ac00a9c88c72c04088bca5f4523501cdb12cf39da8bb5 SHA512 37ebef56c3046b45ec83025ab8233827f50dcc3aa48691e06ac00c59b8bedeafd5860c94e36d54d3f499217a27a12641b0e98f6f0f248b9d56a22d1b103c50c8 diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch b/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch deleted file mode 100644 index 837df1d29753..000000000000 --- a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/Plugins/Monitors/Volume.hs -+++ b/src/Plugins/Monitors/Volume.hs -@@ -122,7 +122,8 @@ formatDb opts dbi = do - runVolume :: String -> String -> [String] -> Monitor String - runVolume mixerName controlName argv = do - opts <- io $ parseOpts argv -- (lo, hi, val, db, sw) <- io readMixer -+ (lo', hi', val', db, sw) <- io readMixer -+ let (lo, hi, val) = (toInteger <$> lo', toInteger <$> hi', toInteger <$> val') - p <- liftMonitor $ liftM3 formatVol lo hi val - b <- liftMonitor $ liftM3 formatVolBar lo hi val - v <- liftMonitor $ liftM3 formatVolVBar lo hi val -@@ -164,11 +165,11 @@ runVolume mixerName controlName argv = do - - getDB :: Maybe Volume -> IO (Maybe Integer) - getDB Nothing = return Nothing -- getDB (Just v) = channel (dB v) 0 -+ getDB (Just v) = fmap toInteger <$> channel (dB v) 0 - - getVal :: Maybe Volume -> IO (Maybe Integer) - getVal Nothing = return Nothing -- getVal (Just v) = channel (value v) 0 -+ getVal (Just v) = fmap toInteger <$> channel (value v) 0 - - getSw :: Maybe Switch -> IO (Maybe Bool) - getSw Nothing = return Nothing diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch deleted file mode 100644 index 8f4da6b78847..000000000000 --- a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/xmobar.cabal b/xmobar.cabal -index f6a6dae..8a17579 100644 ---- a/xmobar.cabal -+++ b/xmobar.cabal -@@ -89,3 +89,3 @@ executable xmobar - Xmobar, Actions, Bitmap, Config, Parsers, Commands, Localize, -- XUtil, XPMFile, StatFS, Runnable, ColorCache, Window, Signal, -+ XUtil, StatFS, Runnable, ColorCache, Window, Signal, - Environment, diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml index 69dba3f2e452..bcca3a0444db 100644 --- a/x11-misc/xmobar/metadata.xml +++ b/x11-misc/xmobar/metadata.xml @@ -1,22 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> <use> - <flag name="mpd">Support mpd plugin</flag> - <flag name="mpris">Enables MPRIS v1, v2 support</flag> - <flag name="timezone">Enables localized date support</flag> - <flag name="conduit">Use conduit to fetch weather data.</flag> - <flag name="uvmeter">Plugin to show UV data for Australia.</flag> + <flag name="alsa">Use alsa-mixer to get the volume from soundcards.</flag> + <flag name="datezone">Enables localized date support.</flag> + <flag name="dbus">Publish a service on the session bus for controlling xmobar.</flag> + <flag name="mpd">MPD support. Needs libmpd installed.</flag> + <flag name="mpris">MPRIS v1, v2 support.</flag> + <flag name="rtsopts">Use -with-rtsopts=-V0 to reduce wakeups.</flag> + <flag name="timezone">Enables localized date support.</flag> + <flag name="uvmeter">UVMeter only useful to australians.</flag> + <flag name="weather">Enable weather plugin.</flag> + <flag name="wifi">Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux, the kernel.</flag> + <flag name="xft">Use Xft to render text. UTF-8 support included.</flag> + <flag name="xpm">Enable usage of xpm for icons.</flag> + <flag name="xrender">Use XRender for alpha background pseudo-transparency.</flag> </use> - <longdescription> - Xmobar is a minimalistic text based status bar. - - Inspired by the Ion3 status bar, it supports similar - features, like dynamic color management, output templates, - and extensibility through plugins. - </longdescription> + <upstream> + <remote-id type="hackage">xmobar</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild b/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild deleted file mode 100644 index 7cf587b82685..000000000000 --- a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.5.9999 -#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm - -CABAL_FEATURES="bin" -inherit haskell-cabal - -DESCRIPTION="A Minimalistic Text Based Status Bar" -HOMEPAGE="https://xmobar.org" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm" - -RDEPEND=">=dev-haskell/http-4000.2.4:= - >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:= - dev-haskell/old-locale:= - >=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:= - dev-haskell/regex-compat:= - >=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:= - >=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:= - >=dev-haskell/x11-1.6.1:= - >=dev-lang/ghc-7.8.2:= - x11-libs/libXrandr - x11-libs/libXrender - alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:= - >=dev-haskell/alsa-mixer-0.3:= ) - dbus? ( >=dev-haskell/dbus-0.10:= ) - inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= ) - mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= ) - mpris? ( >=dev-haskell/dbus-0.10:= ) - timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:= - >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= ) - wifi? ( net-wireless/wireless-tools ) - conduit? ( dev-haskell/http-conduit:= - dev-haskell/http-types:= ) - xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= ) - xpm? ( x11-libs/libXpm ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 -" - -PATCHES=( - "${FILESDIR}"/${P}-noxpm.patch - "${FILESDIR}"/${P}-alsa-mixer-0.3.patch -) - -src_prepare() { - default - # xmobar is an idle multithreaded program - # which sits in 'while { sleep(1); }' - # loops in multiple threads. - # It has a pathological behaviour in GHC: - # everything program does is thread context switch - # 100 times per second. It's easily seen with - # - # $ strace -f -p `pidof xmobar` - # - # where rt_sigreturn() manages to enter/exit - # kernel 32 times in each second to do nothing - # This workaround allows shrinkng wakeups/thread - # switches down to one per second (internal xmobar's - # cycle). - # Be careful when remove it :] - HCFLAGS+=" -with-rtsopts=-V0" - - cabal_chdeps \ - 'stm >= 2.3 && < 2.5' 'stm >= 2.3' -} - -src_configure() { - haskell-cabal_src_configure \ - --flag=-all_extensions \ - $(cabal_flag alsa with_alsa) \ - $(cabal_flag conduit with_conduit) \ - $(cabal_flag timezone with_datezone) \ - $(cabal_flag dbus with_dbus) \ - $(cabal_flag inotify with_inotify) \ - $(cabal_flag wifi with_iwlib) \ - $(cabal_flag mpd with_mpd) \ - $(cabal_flag mpris with_mpris) \ - --flag=with_threaded \ - --flag=with_utf8 \ - $(cabal_flag uvmeter with_uvmeter) \ - $(cabal_flag xft with_xft) \ - $(cabal_flag xpm with_xpm) -} - -src_install() { - cabal_src_install - - dodoc samples/xmobar.config readme.md news.md -} diff --git a/x11-misc/xmobar/xmobar-0.44.1.ebuild b/x11-misc/xmobar/xmobar-0.44.1.ebuild new file mode 100644 index 000000000000..365e5f2504d5 --- /dev/null +++ b/x11-misc/xmobar/xmobar-0.44.1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.7.1.1.9999 +#hackport: flags: -all_extensions,+with_threaded,+with_utf8,-with_iwlib,with_nl80211:wifi,+with_inotify + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="A Minimalistic Text Based Status Bar" +HOMEPAGE="https://codeberg.org/xmobar/xmobar" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +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?] + dev-haskell/async:=[profile?] + >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] + dev-haskell/old-locale:=[profile?] + >=dev-haskell/parsec-numbers-0.1.0:=[profile?] + dev-haskell/regex-compat:=[profile?] + >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] + >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] + >=dev-haskell/x11-1.6.1:=[profile?] + >=dev-lang/ghc-8.4.3:= + x11-libs/libXrandr + x11-libs/libXrender + alsa? ( >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] + >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] ) + dbus? ( >=dev-haskell/dbus-1:=[profile?] + weather? ( dev-haskell/http-client-tls:=[profile?] + dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) + xpm? ( x11-libs/libXpm ) ) + !dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?] + dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) ) ) ) + >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] + mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) + mpris? ( >=dev-haskell/dbus-1:=[profile?] + !dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] + dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) ) ) + xpm? ( x11-libs/libXpm + weather? ( dev-haskell/http-client-tls:=[profile?] + dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) ) + !xpm? ( uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) ) ) ) + !mpris? ( !dbus? ( weather? ( dev-haskell/http-client-tls:=[profile?] ) + xpm? ( x11-libs/libXpm + weather? ( dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) ) ) ) + timezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] + >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) + uvmeter? ( dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) + wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] + >=dev-haskell/netlink-1.1.1.0:=[profile?] ) + xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 + test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 + dev-haskell/temporary ) +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-all_extensions \ + --flag=-with_iwlib \ + --flag=with_inotify \ + $(cabal_flag alsa with_alsa) \ + $(cabal_flag timezone with_datezone) \ + $(cabal_flag dbus with_dbus) \ + $(cabal_flag mpd with_mpd) \ + $(cabal_flag mpris with_mpris) \ + $(cabal_flag wifi with_nl80211) \ + $(cabal_flag rtsopts with_rtsopts) \ + --flag=with_threaded \ + --flag=with_utf8 \ + $(cabal_flag uvmeter with_uvmeter) \ + $(cabal_flag weather with_weather) \ + $(cabal_flag xft with_xft) \ + $(cabal_flag xpm with_xpm) +} + +src_install() { + cabal_src_install + +# dodoc readme.md + dodoc examples/xmobar.config examples/xmobar.hs changelog.md +} diff --git a/x11-misc/xmobar/xmobar-0.46.ebuild b/x11-misc/xmobar/xmobar-0.46.ebuild new file mode 100644 index 000000000000..30c801488862 --- /dev/null +++ b/x11-misc/xmobar/xmobar-0.46.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.8.0.0.9999 +#hackport: flags: -all_extensions,+with_threaded,+with_utf8,-with_iwlib,with_nl80211:wifi,+with_inotify + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="A Minimalistic Text Based Status Bar" +HOMEPAGE="https://codeberg.org/xmobar/xmobar" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="alsa datezone dbus mpd mpris +rtsopts uvmeter +weather wifi xpm +xrender" + +RDEPEND=">=dev-haskell/aeson-1.4.7.1:=[profile?] + dev-haskell/async:=[profile?] + >=dev-haskell/cairo-0.13:=[profile?] + >=dev-haskell/colour-2.3.6:=[profile?] + >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] + >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] + dev-haskell/old-locale:=[profile?] + >=dev-haskell/pango-0.13:=[profile?] + >=dev-haskell/parsec-numbers-0.1.0:=[profile?] + dev-haskell/regex-compat:=[profile?] + >=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?] + >=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] + >=dev-haskell/x11-1.6.1:=[profile?] + >=dev-lang/ghc-8.4.3:= + x11-libs/libXrandr + x11-libs/libXrender + alsa? ( + >=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?] + >=dev-haskell/alsa-mixer-0.3:=[profile?] <dev-haskell/alsa-mixer-0.4:=[profile?] + ) + datezone? ( >=dev-haskell/timezone-olson-0.2:=[profile?] <dev-haskell/timezone-olson-0.3:=[profile?] + >=dev-haskell/timezone-series-0.1:=[profile?] <dev-haskell/timezone-series-0.2:=[profile?] ) + dbus? ( >=dev-haskell/dbus-1:=[profile?] ) + mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] ) + mpris? ( >=dev-haskell/dbus-1:=[profile?] ) + uvmeter? ( dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) + weather? ( dev-haskell/http-client-tls:=[profile?] + dev-haskell/http-conduit:=[profile?] + dev-haskell/http-types:=[profile?] ) + wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?] + >=dev-haskell/netlink-1.1.1.0:=[profile?] ) + xpm? ( x11-libs/libXpm ) + xrender? ( >=dev-haskell/x11-xft-0.2:=[profile?] ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 + test? ( >=dev-haskell/hspec-2 <dev-haskell/hspec-3 + dev-haskell/temporary ) +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-all_extensions \ + $(cabal_flag alsa with_alsa) \ + $(cabal_flag datezone with_datezone) \ + $(cabal_flag dbus with_dbus) \ + --flag=with_inotify \ + --flag=-with_iwlib \ + $(cabal_flag mpd with_mpd) \ + $(cabal_flag mpris with_mpris) \ + $(cabal_flag wifi with_nl80211) \ + $(cabal_flag rtsopts with_rtsopts) \ + --flag=with_threaded \ + --flag=with_utf8 \ + $(cabal_flag uvmeter with_uvmeter) \ + $(cabal_flag weather with_weather) \ + $(cabal_flag xpm with_xpm) \ + $(cabal_flag xrender with_xrender) +} + +src_install() { + cabal_src_install + +# dodoc readme.md + dodoc etc/xmobar.config etc/xmobar.hs changelog.md +} diff --git a/x11-misc/xmonad-log-applet/Manifest b/x11-misc/xmonad-log-applet/Manifest deleted file mode 100644 index 44bdd2c505d8..000000000000 --- a/x11-misc/xmonad-log-applet/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xmonad-log-applet-2.0.0.tar.gz 82881 BLAKE2B a059158558cc2fcb150e90cbd055cf50367dbed464c46891b6c63d49d2b5e2974ea3fc859afe8f1115af78fae60e639bde0aec37af8be693720eca80905712b8 SHA512 1885ac97569d909ab1c6af99d9b271d0f782de905dfe035df27524f428d09cefa20a468103477132656dea8945faf886270fd70a49e5a08be538e04f3f05baca diff --git a/x11-misc/xmonad-log-applet/files/xmonad.hs b/x11-misc/xmonad-log-applet/files/xmonad.hs deleted file mode 100644 index 54b0025a97c4..000000000000 --- a/x11-misc/xmonad-log-applet/files/xmonad.hs +++ /dev/null @@ -1,60 +0,0 @@ -import XMonad -import XMonad.Config.Gnome -import XMonad.Hooks.DynamicLog - -import Control.OldException - -import DBus -import DBus.Connection -import DBus.Message - -main :: IO () -main = withConnection Session $ \dbus -> do - getWellKnownName dbus - xmonad $ gnomeConfig - { logHook = dynamicLogWithPP (prettyPrinter dbus) - } - -prettyPrinter :: Connection -> PP -prettyPrinter dbus = defaultPP - { ppOutput = dbusOutput dbus - , ppTitle = pangoSanitize - , ppCurrent = pangoColor "green" . wrap "[" "]" . pangoSanitize - , ppVisible = pangoColor "yellow" . wrap "(" ")" . pangoSanitize - , ppHidden = const "" - , ppUrgent = pangoColor "red" - , ppLayout = const "" - , ppSep = " " - } - -getWellKnownName :: Connection -> IO () -getWellKnownName dbus = tryGetName `catchDyn` (\(DBus.Error _ _) -> getWellKnownName dbus) - where - tryGetName = do - namereq <- newMethodCall serviceDBus pathDBus interfaceDBus "RequestName" - addArgs namereq [String "org.xmonad.Log", Word32 5] - sendWithReplyAndBlock dbus namereq 0 - return () - -dbusOutput :: Connection -> String -> IO () -dbusOutput dbus str = do - msg <- newSignal "/org/xmonad/Log" "org.xmonad.Log" "Update" - addArgs msg [String ("<b>" ++ str ++ "</b>")] - -- If the send fails, ignore it. - send dbus msg 0 `catchDyn` (\(DBus.Error _ _) -> return 0) - return () - -pangoColor :: String -> String -> String -pangoColor fg = wrap left right - where - left = "<span foreground=\"" ++ fg ++ "\">" - right = "</span>" - -pangoSanitize :: String -> String -pangoSanitize = foldr sanitize "" - where - sanitize '>' xs = ">" ++ xs - sanitize '<' xs = "<" ++ xs - sanitize '\"' xs = """ ++ xs - sanitize '&' xs = "&" ++ xs - sanitize x xs = x:xs diff --git a/x11-misc/xmonad-log-applet/metadata.xml b/x11-misc/xmonad-log-applet/metadata.xml deleted file mode 100644 index e8a655590796..000000000000 --- a/x11-misc/xmonad-log-applet/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - </maintainer> - <maintainer type="person"> - <email>flo@geekplace.eu</email> - </maintainer> - <longdescription> - xmonad-log-applet is for Xmonad users who find the GNOME, MATE, or Xfce panel useful. The applet will show the active workspaces, the title of the selected window or whatever information you send it from your xmonad.hs. - </longdescription> - <upstream> - <remote-id type="github">alexkay/xmonad-log-applet</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild deleted file mode 100644 index 9038beb0ce04..000000000000 --- a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2 - -DESCRIPTION="Gnome and XFCE applet for displaying XMonad log" -HOMEPAGE="https://github.com/alexkay/xmonad-log-applet" -SRC_URI="https://github.com/downloads/alexkay/${PN}/${P}.tar.gz" -LICENSE="BSD" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT="mirror" - -RDEPEND=" - sys-apps/dbus - xfce-base/xfce4-panel - dev-libs/dbus-glib - dev-libs/glib:2 - dev-haskell/dbus - x11-libs/gtk+:3 -" -DEPEND="${RDEPEND}" - -src_prepare() { - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure --sysconfdir=/etc --with-panel=xfce4 -} - -src_install() { - gnome2_src_install - dodoc AUTHORS.md README.md - dodoc "${FILESDIR}"/xmonad.hs -} - -pkg_postinst() { - gnome2_pkg_postinst - elog "Remember to update your xmonad.hs accordingly" - elog "a sample xmonad.hs is provided in /usr/share/doc/${PF}" -} diff --git a/x11-misc/xmountains/metadata.xml b/x11-misc/xmountains/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xmountains/metadata.xml +++ b/x11-misc/xmountains/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest deleted file mode 100644 index 906651bd7467..000000000000 --- a/x11-misc/xnee/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xnee-3.19.tar.gz 1893109 BLAKE2B 17f416d06dac092c79d4c9838e0f69219e617d695d7c56bee8c84cdf6a5de7e3f02eb1dc9f9f278e78ebf4090893557ede30b2cd5039acafcd743cff11e5602b SHA512 a4a82839a4597b0d7f5b65ad76092f03eb5c665d36298505a320475daacbf66f30b022c04284ce8795360e4481fdfb1d9138f0b8b173b66d23b7f1542d0acbe8 diff --git a/x11-misc/xnee/files/xnee-3.18-linker.patch b/x11-misc/xnee/files/xnee-3.18-linker.patch deleted file mode 100644 index b841bc0182e7..000000000000 --- a/x11-misc/xnee/files/xnee-3.18-linker.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libxnee/src/Makefile.am -+++ b/libxnee/src/Makefile.am -@@ -78,6 +78,7 @@ - libxnee_la_LDFLAGS = -rpath '$(libdir)' - #dnl libxnee_la_SOURCES = $(LIB_XNEE_SOURCE_FILES) - libxnee_a_CFLAGS = $(AM_CFLAGS) -+libxnee_la_LIBADD = @X11_LIBS@ - - #noinst_LIBRARIES = libxnee.a - diff --git a/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch b/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch deleted file mode 100644 index 4e80dacd20b0..000000000000 --- a/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- a/configure.in 2014/05/06 14:13:59 1.134 -+++ b/configure.in 2018/01/01 23:06:56 1.135 -@@ -382,62 +382,63 @@ - fi - - -- GNOMEUI2_MODULE="libgnomeui-2.0" -- GNOMEUI2_VERSION="2.0.0" -- -- -- if `$PKGCFG --exists $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION` -- then -- GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE" -- GTK_ERR=1 -- fi -- -- libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE ` -- libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE ` -- -- -- AC_SUBST(libgnomeui_CFLAGS) -- AC_SUBST(libgnomeui_LIBS) -- - PIXMAP_DIR=pixmap - -- -- if test x$buildgapplet = xtrue ; -+ if test x$buildgapplet = xtrue; - then -- -- if test x$GTKCONF = x ; -- then -- echo " **************************************** " -- echo " * WARNING, missing program: gtk-config *" -- echo " **************************************** " -- echo "" -- echo " On Debian based distros, install sth like: libgtk2.0-dev" -- echo "" -- echo "However, I will try my best to continue without gtk-config. " -- echo "Will not be able to check for gtk/gnome header files properly" -- echo "On most platforms this implies no problem" -- echo "" -- else -- GTK_PREFIX=`$GTKCONF --prefix` -- GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/ -- GNOME_H_FILE=$GTK_INC_PATH/gnome.h -- -- ls -l $GNOME_H_FILE 2>/dev/null >/dev/null -- -- MISSING_GNOME_H=$? - -- if test x$MISSING_GNOME_H != x0 ; -+ GNOMEUI2_MODULE="libgnomeui-2.0" -+ GNOMEUI2_VERSION="2.0.0" -+ -+ -+ if `$PKGCFG --exists $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION` -+ then -+ GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE" -+ GTK_ERR=1 -+ fi -+ -+ libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE ` -+ libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE ` -+ -+ -+ AC_SUBST(libgnomeui_CFLAGS) -+ AC_SUBST(libgnomeui_LIBS) -+ -+ -+ -+ if test x$GTKCONF = x ; - then -- echo "Missing GNOME header file (gnome.h), you need to install development packages" -- echo "On a Debian based distro system do:" -- echo "" -- echo " sudo apt-get install libgnome2-dev" -- echo "" --echo exit 1 -- fi -- fi -- -- fi -+ echo " **************************************** " -+ echo " * WARNING, missing program: gtk-config *" -+ echo " **************************************** " -+ echo "" -+ echo " On Debian based distros, install sth like: libgtk2.0-dev" -+ echo "" -+ echo "However, I will try my best to continue without gtk-config. " -+ echo "Will not be able to check for gtk/gnome header files properly" -+ echo "On most platforms this implies no problem" -+ echo "" -+ else -+ GTK_PREFIX=`$GTKCONF --prefix` -+ GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/ -+ GNOME_H_FILE=$GTK_INC_PATH/gnome.h -+ -+ ls -l $GNOME_H_FILE 2>/dev/null >/dev/null -+ -+ MISSING_GNOME_H=$? -+ -+ if test x$MISSING_GNOME_H != x0 ; -+ then -+ echo "Missing GNOME header file (gnome.h), you need to install development packages" -+ echo "On a Debian based distro system do:" -+ echo "" -+ echo " sudo apt-get install libgnome2-dev" -+ echo "" -+ echo exit 1 -+ fi -+ fi -+ -+ fi - fi - - diff --git a/x11-misc/xnee/metadata.xml b/x11-misc/xnee/metadata.xml deleted file mode 100644 index 66187a0f4213..000000000000 --- a/x11-misc/xnee/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> -</pkgmetadata> diff --git a/x11-misc/xnee/xnee-3.19-r2.ebuild b/x11-misc/xnee/xnee-3.19-r2.ebuild deleted file mode 100644 index 0a3540a531d3..000000000000 --- a/x11-misc/xnee/xnee-3.19-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop flag-o-matic - -DESCRIPTION="Program suite to record, replay and distribute user actions" -HOMEPAGE="https://xnee.wordpress.com/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnome xosd" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - x11-libs/libxcb - gnome? ( - >=gnome-base/gconf-2 - x11-libs/gtk+:2 - ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - virtual/pkgconfig - sys-devel/gettext - gnome? ( virtual/imagemagick-tools[jpeg,png] ) -" - -# This needs RECORD extension from X.org server which isn't necessarily -# enabled. Xlib: extension "RECORD" missing on display ":0.0". -RESTRICT="test" - -DOCS=( AUTHORS BUGS ChangeLog FAQ NEWS README TODO ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.18-linker.patch - "${FILESDIR}"/${P}-libgnomeui-only-for-applets.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cflags -fcommon - econf \ - $(use_enable gnome gui) \ - $(use_enable xosd buffer_verbose) \ - $(use_enable xosd verbose) \ - $(use_enable xosd) \ - --disable-gnome-applet \ - --disable-static \ - --disable-static-programs \ - --enable-cli \ - --enable-lib -} - -src_test() { - virtx emake check -} - -src_install() { - default - use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK" - find "${ED}" -name '*.la' -delete || die -} diff --git a/x11-misc/xnots/metadata.xml b/x11-misc/xnots/metadata.xml index 230858f0c0fd..91718977b34c 100644 --- a/x11-misc/xnots/metadata.xml +++ b/x11-misc/xnots/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> </maintainer> <upstream> <remote-id type="sourceforge">xnots</remote-id> diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild index 4037d3a8f0b6..295f6a4a777b 100644 --- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild +++ b/x11-misc/xnots/xnots-0.2.1-r2.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit flag-o-matic toolchain-funcs DESCRIPTION="A desktop sticky note program for the unix geek" HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots" -SRC_URI="mirror://sourceforge/xnots/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/xnots/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 -riscv x86" IUSE="vim-syntax" RDEPEND=" @@ -23,9 +24,10 @@ RDEPEND=" DEPEND=" ${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${PN}-0.2.1-gcc6.patch ) diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild deleted file mode 100644 index 3f81446e468c..000000000000 --- a/x11-misc/xnots/xnots-9999.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic git-r3 toolchain-funcs - -DESCRIPTION="A desktop sticky note program for the unix geek" -HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots" -EGIT_REPO_URI="https://github.com/thePalindrome/xnots" - -LICENSE="GPL-2" -SLOT="0" -IUSE="vim-syntax" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/pango[X] -" - -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - default - - sed -i -e 's|LICENCE||g' Makefile || die - - append-cflags -std=gnu89 -} - -src_compile() { - emake CC="$(tc-getCC)" NO_DEBUG=1 -} - -src_install() { - emake \ - DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} \ - mandir=/usr/share/man \ - prefix=/usr \ - install - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins etc/xnots.vim - fi -} diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest index 7b8dc93bc739..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.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa +DIST xorg-cf-files-1.0.8.tar.xz 290280 BLAKE2B b822839f2effa091d7e60aa82e0356dc6770116566d9c78a6c0915b8f9e89eb4a3bf78a3bd5380607b3b3e4c1670fb1c6ef0b3ac8ca342cfc1ef141a925c927d SHA512 cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9 diff --git a/x11-misc/xorg-cf-files/metadata.xml b/x11-misc/xorg-cf-files/metadata.xml index e943b72b8a48..dc313ef53879 100644 --- a/x11-misc/xorg-cf-files/metadata.xml +++ b/x11-misc/xorg-cf-files/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">xorg/util/cf</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild index 6326ffe97ca0..0e7054bcd5f2 100644 --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild +++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild @@ -1,42 +1,23 @@ -# 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 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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" +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 -" -RDEPEND="" -DEPEND="${RDEPEND}" - -PATCHES=( - "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch -) - -src_configure() { - local econfargs=( - --disable-selective-werror - ) - - econf "${econfargs[@]}" -} +BDEPEND="virtual/pkgconfig" src_install() { default echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \ "${ED}"/usr/$(get_libdir)/X11/config/host.def || die - sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \ + sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \ "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed" sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \ "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed" diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest index 8d06f3e1c371..5197d620a901 100644 --- a/x11-misc/xosview/Manifest +++ b/x11-misc/xosview/Manifest @@ -1,3 +1 @@ -DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a -DIST xosview-1.21.tar.gz 146428 BLAKE2B 899e0cb68489bd02e035765f8f33424d41996b80a7c16651f60a2e46538cf4eac1a9377342c2ed4f35da6cb00aa3961e34802c77fe26e4743a23e2d3dc443484 SHA512 9c42247d9e9b391b94c18ffc8c38df414f5293b7426aa57d3b357e680b02e9a3a2b332299905f2f529d488c23590e957cad9e088ddf753a6904905e2dff8074b -DIST xosview-1.22.tar.gz 146459 BLAKE2B 7f4920b5b5a765f574694ab64e1d34ad6dbc33893cb816bb73119b4f72b7d23900528cb0db9302b24d20d7b8ce1738ce2d00be572c9fd4b391724f277afb02d5 SHA512 9bf37f557d9c07a300f6f9c21e197d25d4c5a4bb6e67b40af9c44a3159ea5010d7ba5bf427a9cec9729fa423da132a1364d0ac7027e9bc9bcd33f490d9e8282a +DIST xosview-1.23.tar.gz 146299 BLAKE2B ba336ac152ac6c44bd51c84c160d7c1b565fe23c17aa89db36be7325f4f1caa1ab84a1ad386041841a0aacb62208fb5d59f5dd7a9d2bf071c76dff2901eb2c60 SHA512 10a25f644ec3d896071990117c6d80e553a17baf64809f11bc778652dca1498f81c333ac0f21a809ef617d7e6cbe65afaa14d5bc96908958d8f997234e660ba1 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/metadata.xml b/x11-misc/xosview/metadata.xml index 66187a0f4213..b23487decfd8 100644 --- a/x11-misc/xosview/metadata.xml +++ b/x11-misc/xosview/metadata.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>dilfridge@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/x11-misc/xosview/xosview-1.20-r1.ebuild b/x11-misc/xosview/xosview-1.20-r1.ebuild deleted file mode 100644 index 3ecc36b3b663..000000000000 --- a/x11-misc/xosview/xosview-1.20-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs xdg-utils - -DESCRIPTION="X11 operating system viewer" -HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/" -SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="suid" - -COMMON_DEPS="x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt" -RDEPEND="${COMMON_DEPS} - media-fonts/font-misc-misc" -DEPEND="${COMMON_DEPS} - x11-base/xorg-proto" - -DOCS=( CHANGES README.linux TODO ) - -src_prepare() { - default - - sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die - sed -i -e "s:Git:${PV}:g" ${PN}.cc || die - tc-export CXX -} - -src_compile() { - emake OPTFLAGS='' -} - -src_install() { - emake PREFIX="${D%/}/usr" install - use suid && fperms 4755 /usr/bin/${PN} - insinto /usr/share/X11/app-defaults - newins Xdefaults XOsview -} - -pkg_postinst() { - xdg_desktop_database_update - - if ! use suid ; then - ewarn "If you want to use serial meters ${PN} needs to be executed as root." - ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details." - fi -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/xosview/xosview-1.21.ebuild b/x11-misc/xosview/xosview-1.21.ebuild deleted file mode 100644 index 73b4e2932992..000000000000 --- a/x11-misc/xosview/xosview-1.21.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs xdg-utils - -DESCRIPTION="X11 operating system viewer" -HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/" -SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="suid" - -COMMON_DEPS="x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt" -RDEPEND="${COMMON_DEPS} - media-fonts/font-misc-misc" -DEPEND="${COMMON_DEPS} - x11-base/xorg-proto" - -DOCS=( CHANGES README.linux TODO ) - -src_prepare() { - default - - sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die - sed -i -e "s:Git:${PV}:g" ${PN}.cc || die - tc-export CXX -} - -src_compile() { - emake OPTFLAGS='' -} - -src_install() { - emake PREFIX="${D}/usr" install - use suid && fperms 4755 /usr/bin/${PN} - insinto /usr/share/X11/app-defaults - newins Xdefaults XOsview -} - -pkg_postinst() { - xdg_desktop_database_update - - if ! use suid ; then - ewarn "If you want to use serial meters ${PN} needs to be executed as root." - ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details." - fi -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/x11-misc/xosview/xosview-1.22.ebuild b/x11-misc/xosview/xosview-1.23.ebuild index 73b4e2932992..0de8636ff4a8 100644 --- a/x11-misc/xosview/xosview-1.22.ebuild +++ b/x11-misc/xosview/xosview-1.23.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 @@ -11,7 +11,7 @@ SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="suid" COMMON_DEPS="x11-libs/libX11 @@ -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 c39cdaf110ef..000000000000 --- a/x11-misc/xowl/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>jer@gentoo.org</email> - </maintainer> - <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 d4d0a425dfb7..000000000000 --- a/x11-misc/xowl/xowl-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 -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="" - -DEPEND=" - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXinerama -" -RDEPEND=" - ${DEPEND} -" - -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/Manifest b/x11-misc/xpad/Manifest index 04fc452ba667..e3461617d1a4 100644 --- a/x11-misc/xpad/Manifest +++ b/x11-misc/xpad/Manifest @@ -1,3 +1,3 @@ -DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7 -DIST xpad-5.3.0.tar.bz2 158165 BLAKE2B d020a36b11d7e79af4375a89276d4763c5362b5bea5a1076fd0f6e6a726c10c78364f3ac05f948049fde956864f84d27c1b93606d5d473bdcd15f2a31527358d SHA512 a38f152192741c9c9d0742d1999ffa49e18a3e8652919ba6963101b776a51784b04beb90449abaf54ef35f964c3fbdc5b7ad0fe79cf795f39641776ef381e83d DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f +DIST xpad-5.7.0.tar.bz2 162675 BLAKE2B 2166816696d2e00a261fcc8e9483841be7803121dc3669ab35fdd014728f16a47860448dd6b754836a3dfcd0fbbd1805b87e470f96c0b692fbe3a588c81ee35f SHA512 ab9319473cbec9a7022e520e2284853270fccca88ad19e8cb52024ce79a2dd8049251009a22b97e2387de12b9e75576e50d4d17a7236cb8e0eb4c840c3400ef3 +DIST xpad-5.8.0.tar.bz2 162732 BLAKE2B 6165e59b2d05e640f820f1f52811f214909f445adee4bfeb595fc3913493d15f4a25556b5edb006163a0c123b9953934c77cb519d0dd9f567170a0282637b43a SHA512 868dc820a172fc31f79fab5ee842e4f7e5646ae0239101bb442fc9a4a79b2c76052a70b635a9fa39fae22838df698a4a398188bc44dada63db16a756330c3cbd diff --git a/x11-misc/xpad/metadata.xml b/x11-misc/xpad/metadata.xml index 5ff781a3a18f..93bd8f933bed 100644 --- a/x11-misc/xpad/metadata.xml +++ b/x11-misc/xpad/metadata.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person" proxied="yes"> + <email>rndxelement@protonmail.com</email> + <name>Philipp Rösner</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="launchpad">xpad</remote-id> - <changelog>https://launchpadlibrarian.net/253130440/ChangeLog</changelog> + <changelog>https://launchpadlibrarian.net/589705902/ChangeLog</changelog> </upstream> </pkgmetadata> diff --git a/x11-misc/xpad/xpad-4.2.ebuild b/x11-misc/xpad/xpad-4.2.ebuild deleted file mode 100644 index 3396c56dfc1c..000000000000 --- a/x11-misc/xpad/xpad-4.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="a sticky note application for jotting down things to remember" -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 ppc x86" -IUSE="" - -RDEPEND=" - >=x11-libs/gtk+-2.12:2 - >=dev-libs/glib-2.38:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/pango -" -DEPEND=" - ${RDEPEND} - >=dev-util/intltool-0.31 - virtual/pkgconfig - sys-devel/gettext -" diff --git a/x11-misc/xpad/xpad-5.3.0.ebuild b/x11-misc/xpad/xpad-5.3.0.ebuild deleted file mode 100644 index 7bf9ed46b966..000000000000 --- a/x11-misc/xpad/xpad-5.3.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="a sticky note application for jotting down things to remember" -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 ~ppc ~x86" - -RDEPEND=" - >=dev-libs/glib-2.56:2 - app-accessibility/at-spi2-atk - dev-libs/atk - sys-devel/gettext - x11-libs/gdk-pixbuf - x11-libs/gtk+:3[X] - x11-libs/gtksourceview:3.0 - x11-libs/libICE - x11-libs/libSM - x11-libs/pango -" -DEPEND=" - ${RDEPEND} - >=dev-util/intltool-0.31 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - default - - eautoreconf -} diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild index 8f36edf945ac..cf0357f56a9e 100644 --- a/x11-misc/xpad/xpad-5.4.0.ebuild +++ b/x11-misc/xpad/xpad-5.4.0.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools -DESCRIPTION="a sticky note application for jotting down things to remember" +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 ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" RDEPEND=" >=dev-libs/glib-2.56:2 - app-accessibility/at-spi2-atk - dev-libs/atk + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + ( app-accessibility/at-spi2-atk dev-libs/atk ) + ) sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild new file mode 100644 index 000000000000..90ae5daec211 --- /dev/null +++ b/x11-misc/xpad/xpad-5.7.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 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 ppc x86" + +RDEPEND=" + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + ( app-accessibility/at-spi2-atk dev-libs/atk ) + ) + >=dev-libs/glib-2.58:2 + 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/xpad/xpad-5.8.0-r1.ebuild b/x11-misc/xpad/xpad-5.8.0-r1.ebuild new file mode 100644 index 000000000000..1f09ce2c5800 --- /dev/null +++ b/x11-misc/xpad/xpad-5.8.0-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg-utils + +DESCRIPTION="A sticky note application for GTK" +HOMEPAGE="https://launchpad.net/xpad" +SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm x86" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + >=dev-libs/glib-2.58:2 + dev-libs/libayatana-appindicator + x11-libs/gdk-pixbuf + x11-libs/gtk+:3[X] + x11-libs/gtksourceview:4 + x11-libs/libICE + x11-libs/libSM + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/intltool-0.31 + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + + eautoreconf +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/xpad/xpad-5.8.0.ebuild b/x11-misc/xpad/xpad-5.8.0.ebuild new file mode 100644 index 000000000000..90ae5daec211 --- /dev/null +++ b/x11-misc/xpad/xpad-5.8.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 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 ppc x86" + +RDEPEND=" + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + ( app-accessibility/at-spi2-atk dev-libs/atk ) + ) + >=dev-libs/glib-2.58:2 + x11-libs/gdk-pixbuf + x11-libs/gtk+:3[X] + x11-libs/gtksourceview:4 + x11-libs/libICE + x11-libs/libSM + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/intltool-0.31 + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + + eautoreconf +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch b/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch new file mode 100644 index 000000000000..534a32e9ef7c --- /dev/null +++ b/x11-misc/xplanet/files/xplanet-1.3.1-freetype_pkgconfig.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/788136 + +--- xplanet-1.3.1/acinclude.m4 ++++ xplanet-1.3.1/acinclude.m4 +@@ -48,23 +48,22 @@ + + AC_DEFUN([AC_FIND_FREETYPE], + [ +- ++PKG_PROG_PKG_CONFIG + AC_ARG_WITH(freetype,AC_HELP_STRING([--with-freetype],[Enable Freetype support for TrueType fonts (YES)])) + + have_freetype='no' +-if test "$with_freetype" != 'no'; then +- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +- if test "$FREETYPE_CONFIG" = no; then +- AC_MSG_WARN(*** Xplanet will be built without freetype support ***) +- else +- FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags` -I`$FREETYPE_CONFIG --prefix`/include" +- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` +- AC_SUBST(FREETYPE_CFLAGS) +- AC_SUBST(FREETYPE_LIBS) +- AC_DEFINE(HAVE_LIBFREETYPE,,Define if you have freetype) ++AS_IF([test "$with_freetype" != 'no'], [ ++ PKG_CHECK_MODULES([FREETYPE], [freetype2], [ ++ AC_DEFINE([HAVE_LIBFREETYPE],,[Define if you have freetype]) + have_freetype='yes' +- fi +-fi ++ ], [ ++ AS_IF([test "$with_freetype" != 'yes'], [ ++ AC_MSG_WARN(*** Xplanet will be built without freetype support ***) ++ ], [ ++ AC_MSG_ERROR(*** freetype support requested but not found ***) ++ ]) ++ ]) ++]) + ]) + + AC_DEFUN([AC_FIND_PANGO], diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch b/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch new file mode 100644 index 000000000000..ebf090f30bcd --- /dev/null +++ b/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch @@ -0,0 +1,87 @@ +diff -Naur xplanet-1.3.1.orig/src/readConfig.cpp xplanet-1.3.1/src/readConfig.cpp +--- xplanet-1.3.1.orig/src/readConfig.cpp 2013-02-16 20:37:47.000000000 +0100 ++++ xplanet-1.3.1/src/readConfig.cpp 2021-12-21 10:06:22.434195435 +0100 +@@ -46,10 +46,10 @@ + { + case ARC_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->ArcColor(color); + } + else +@@ -176,10 +176,10 @@ + break; + case COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->Color(color); + } + else +@@ -241,10 +241,10 @@ + break; + case GRID_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->GridColor(color); + } + else +@@ -293,10 +293,10 @@ + break; + case MARKER_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->MarkerColor(color); + } + else +@@ -400,10 +400,10 @@ + break; + case ORBIT_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->OrbitColor(color); + } + else +@@ -470,10 +470,10 @@ + break; + case TEXT_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->TextColor(color); + } + else diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml index 6037d71217ba..002d6c176524 100644 --- a/x11-misc/xplanet/metadata.xml +++ b/x11-misc/xplanet/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> </maintainer> <upstream> <remote-id type="sourceforge">xplanet</remote-id> diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild deleted file mode 100644 index 7fd20ea87c28..000000000000 --- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic - -DESCRIPTION="Render images of the earth into the X root window" -HOMEPAGE="http://xplanet.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86" -IUSE="gif jpeg png tiff truetype X" - -RDEPEND=" - gif? ( media-libs/giflib:= ) - jpeg? ( virtual/jpeg:0 ) - png? ( - media-libs/libpng:0= - media-libs/netpbm - ) - tiff? ( media-libs/tiff:0 ) - truetype? ( - media-libs/freetype:2 - x11-libs/pango - ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libXt - ) -" -DEPEND=" - ${RDEPEND} - truetype? ( virtual/pkgconfig ) - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${P}-giflib.patch - "${FILESDIR}"/${P}-remove-null-comparison.patch -) - -src_configure() { - # econf says 'checking pnm.h presence... no' - use png && append-cppflags -I"${EPREFIX}"/usr/include/netpbm - - local myconf=() - - use X \ - && myconf+=( --with-x --with-xscreensaver ) \ - || myconf+=( --with-x=no --with-xscreensaver=no ) - - use gif \ - && myconf+=( --with-gif ) \ - || myconf+=( --with-gif=no ) - - use jpeg \ - && myconf+=( --with-jpeg ) \ - || myconf+=( --with-jpeg=no ) - - use tiff \ - && myconf+=( --with-tiff ) \ - || myconf+=( --with-tiff=no ) - - use png \ - && myconf+=( --with-png --with-pnm ) \ - || myconf+=( --with-png=no --with-pnm=no ) - - use truetype \ - && myconf+=( --with-freetype --with-pango ) \ - || myconf+=( --with-freetype=no --with-pango=no ) - - econf \ - --with-cspice=no \ - "${myconf[@]}" -} diff --git a/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild new file mode 100644 index 000000000000..41432bd1dc76 --- /dev/null +++ b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Render images of the earth into the X root window" +HOMEPAGE="https://xplanet.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86" +IUSE="gif jpeg png tiff truetype X" + +RDEPEND=" + gif? ( media-libs/giflib:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( + media-libs/libpng:0= + media-libs/netpbm + ) + tiff? ( media-libs/tiff:= ) + truetype? ( + media-libs/freetype:2 + x11-libs/pango + ) + X? ( + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXext + x11-libs/libXt + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + truetype? ( virtual/pkgconfig ) + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${P}-giflib.patch + "${FILESDIR}"/${P}-narrowing_conversion.patch + "${FILESDIR}"/${P}-remove-null-comparison.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch #788136 +) + +src_prepare() { + default + eautoreconf #788136 +} + +src_configure() { + # econf says 'checking pnm.h presence... no' + use png && append-cppflags -I"${EPREFIX}"/usr/include/netpbm + + local myconf=( + --with-freetype$(usex truetype '' '=no') + --with-gif$(usex gif '' '=no') + --with-jpeg$(usex jpeg '' '=no') + --with-pango$(usex truetype '' '=no') + --with-png$(usex png '' '=no') + --with-pnm$(usex png '' '=no') + --with-tiff$(usex tiff '' '=no') + --with-x$(usex X '' '=no') + --with-xscreensaver$(usex X '' '=no') + ) + econf --with-cspice=no "${myconf[@]}" +} + +src_compile() { + emake AR="$(tc-getAR)" +} diff --git a/x11-misc/xprintidle/Manifest b/x11-misc/xprintidle/Manifest index 228dd3e632e4..dd3f58283b3f 100644 --- a/x11-misc/xprintidle/Manifest +++ b/x11-misc/xprintidle/Manifest @@ -1,2 +1 @@ -DIST xprintidle-2.0.tar.gz 87308 BLAKE2B b2ef3cd82f7208b2c2a2a2cf3fcff028c318e682b7b1e5de4982a50bb757b263044cf54edcd5452fea7fd93f435b86da3da6d0ef38dbacee761bc77399f43665 SHA512 cc2f62b33ef387366246ee9a195be4cde68b2d13a49a4d1299640da2d42f7042152bfdf6932e7904a7f4211b0dc22486bbd62b47fdaf9d5d3db895e296b5f2f9 DIST xprintidle-2.1.tar.gz 92360 BLAKE2B 9bfc08151a18200eb83b6569c2e9d79cbeb6326c39f0e8b9f5e400d0d3e28baa889ada32e3e0452197af77f90bae50d1094bae6972aeb0c3dbe81732246b6f1f SHA512 12393e10a6e53491f3e803fb2e946cc5e20d9fb6198c95d53512b3418034d0f262fddafe9fa10e1aa3f335940134365dcdecb0ac00216e32a2bc4cc5be1c8ec5 diff --git a/x11-misc/xprintidle/metadata.xml b/x11-misc/xprintidle/metadata.xml index 3216f3a00a5b..9f2016a87296 100644 --- a/x11-misc/xprintidle/metadata.xml +++ b/x11-misc/xprintidle/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> diff --git a/x11-misc/xprintidle/xprintidle-2.0.ebuild b/x11-misc/xprintidle/xprintidle-2.0.ebuild deleted file mode 100644 index 83b621d16fed..000000000000 --- a/x11-misc/xprintidle/xprintidle-2.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Prints user's X server idle time in milliseconds" -HOMEPAGE="https://github.com/lucianposton/xprintidle" -SRC_URI="https://github.com/lucianposton/xprintidle/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXScrnSaver - " -RDEPEND="${DEPEND}" - -DOCS=( - AUTHORS - ChangeLog - NEWS - README -) - -src_prepare() { - eapply_user - - # Address "configure: WARNING: 'missing' script is too old or missing" - eautoreconf -} diff --git a/x11-misc/xprintidle/xprintidle-2.1.ebuild b/x11-misc/xprintidle/xprintidle-2.1.ebuild index 276895f91bf9..22c3a3eccd91 100644 --- a/x11-misc/xprintidle/xprintidle-2.1.ebuild +++ b/x11-misc/xprintidle/xprintidle-2.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Prints user's X server idle time in milliseconds" HOMEPAGE="https://github.com/lucianposton/xprintidle" @@ -9,7 +9,7 @@ SRC_URI="https://github.com/lucianposton/xprintidle/archive/v${PV}.tar.gz -> ${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~riscv ~x86" IUSE="" DEPEND=" diff --git a/x11-misc/xrestop/Manifest b/x11-misc/xrestop/Manifest deleted file mode 100644 index 2c9ad1225da8..000000000000 --- a/x11-misc/xrestop/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xrestop-0.4.tar.gz 92308 BLAKE2B 5bfe6e9ccd49038e7884be8379e79f3de2bc960588dc21fbbe40d2acb89c6505efd78a9415e0ba8feb24986f11f066ce641b9c933f241776bbc1b3e59fd520f0 SHA512 eb7bf2f3ab7b73708c96d56fd466cb362d711242dd46992fa3e693af2d26995e9baa91075eb445ef227e1342deec5e0e22b37139e80399e4051c9f5cad8fd9b6 diff --git a/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch b/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch deleted file mode 100644 index ef2de121e839..000000000000 --- a/x11-misc/xrestop/files/xrestop-0.4-tinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,7 @@ - - # check for ncurses, fall back to curses - AC_CHECK_LIB([ncurses], [initscr],,AC_CHECK_LIB([curses], [initscr])) -+AC_SEARCH_LIBS([stdscr], [tinfo]) - - if test "x$GCC" = "xyes"; then - GCC_WARNINGS="-Wall -fno-strict-aliasing" diff --git a/x11-misc/xrestop/metadata.xml b/x11-misc/xrestop/metadata.xml deleted file mode 100644 index 66187a0f4213..000000000000 --- a/x11-misc/xrestop/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> -</pkgmetadata> diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild deleted file mode 100644 index 69cec5c92f2c..000000000000 --- a/x11-misc/xrestop/xrestop-0.4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="'Top' like statistics of X11 client's server side resource usage" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/xrestop" -SRC_URI="http://projects.o-hand.com/sources/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ~ppc64 sparc x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXres - x11-libs/libXt -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch - eautoreconf -} - -DOCS=( AUTHORS ChangeLog NEWS README ) diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch index 4b3aee406733..e5efe6541e11 100644 --- a/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch +++ b/x11-misc/xrootconsole/files/xrootconsole-0.6.makefile.patch @@ -1,5 +1,5 @@ ---- a/Makefile.org 2004-02-20 22:53:28.000000000 +0100 -+++ b/Makefile 2010-02-08 12:01:11.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -43,20 +43,16 @@ else echo Bleeding Edge Version; \ fi;) @@ -12,7 +12,7 @@ - -I /usr/X11R6/include -LDFLAGS = -s +CFLAGS += -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \ -+ $(shell pkg-config --cflags x11) ++ $(shell ${PKG_CONFIG} --cflags x11) # for testing #CFLAGS = -g -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION) (debug build)\"" \ @@ -20,7 +20,7 @@ #LDFLAGS = -LIBS = -L/usr/X11R6/lib -lX11 -lutil -+LIBS = $(shell pkg-config --libs x11) -lutil ++LIBS = $(shell ${PKG_CONFIG} --libs x11) -lutil OBJS = main.o util.o diff --git a/x11-misc/xrootconsole/metadata.xml b/x11-misc/xrootconsole/metadata.xml index ecb4e48af376..c41a76ee2c5f 100644 --- a/x11-misc/xrootconsole/metadata.xml +++ b/x11-misc/xrootconsole/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild index 58f43f33c854..a048ce423bff 100644 --- a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild +++ b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="A utility that displays its input in a text box on your root window" HOMEPAGE="https://sourceforge.net/projects/xrootconsole/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -18,7 +18,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} - x11-base/xorg-proto" + x11-base/xorg-proto + virtual/pkgconfig +" PATCHES=( "${FILESDIR}/${P}.noversion.patch" @@ -29,7 +31,7 @@ PATCHES=( DOCS=( TODO NEWS CREDITS ) src_compile() { - tc-export CC + tc-export CC PKG_CONFIG emake } diff --git a/x11-misc/xrootconsole/xrootconsole-0.6-r2.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6-r2.ebuild new file mode 100644 index 000000000000..8b8410770a04 --- /dev/null +++ b/x11-misc/xrootconsole/xrootconsole-0.6-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Utility that displays its input in a text box on your root window" +HOMEPAGE="https://sourceforge.net/projects/xrootconsole/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}.noversion.patch" + "${FILESDIR}/${P}.makefile.patch" + "${FILESDIR}/${P}.manpage.patch" +) + +src_compile() { + tc-export CC PKG_CONFIG + emake +} + +src_install() { + dodir /usr/bin + + emake \ + MANDIR="${ED}/usr/share/man/man1" \ + BINDIR="${ED}/usr/bin/" \ + install + + einstalldocs +} diff --git a/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch new file mode 100644 index 000000000000..533a72386d8c --- /dev/null +++ b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/924177 +--- a/xscreensaver.app.c ++++ b/xscreensaver.app.c +@@ -116,7 +116,7 @@ void popConfig() + + int main(int argc, char **argv) + { +- unsigned height, width; ++ unsigned short height, width; + char *st_command; + int status; + diff --git a/x11-misc/xscreensaver-app/metadata.xml b/x11-misc/xscreensaver-app/metadata.xml index 54cd402f4eec..b411a863a98f 100644 --- a/x11-misc/xscreensaver-app/metadata.xml +++ b/x11-misc/xscreensaver-app/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">xscreensaverapp</remote-id> - </upstream> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">xscreensaverapp</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild index 02dacca65c2a..256d7931c98d 100644 --- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild +++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools MY_PN=${PN/-a/.A} MY_PN=${MY_PN/xs/XS} MY_PN=${MY_PN/s/S} DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager" -HOMEPAGE="http://xscreensaverapp.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz" +HOMEPAGE="https://xscreensaverapp.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" CDEPEND=" x11-libs/libdockapp diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild index a4de3213fff7..73a96c967f27 100644 --- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild +++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools toolchain-funcs +EAPI=8 +inherit autotools MY_PN=${PN/-a/.A} MY_PN=${MY_PN/xs/XS} MY_PN=${MY_PN/s/S} DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager" -HOMEPAGE="http://xscreensaverapp.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz" +HOMEPAGE="https://xscreensaverapp.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" CDEPEND=" x11-libs/libdockapp @@ -32,10 +32,16 @@ RDEPEND=" S=${WORKDIR}/${MY_PN}-${PV} +PATCHES=( + "${FILESDIR}/${PN}-2.3-gcc14-build-fix.patch" +) + src_prepare() { rm configure.in || die cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die + default + eautoreconf } diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 790b47cc1b76..141e72c223b5 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,3 +1,4 @@ -DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561 -DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd -DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae +DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3 +DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3 +DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5 +DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B 1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d SHA512 a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch deleted file mode 100644 index 2a5eead4879f..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c ---- xscreensaver-5.05.orig/driver/prefs.c 2006-05-24 00:03:47 +0200 -+++ xscreensaver-5.05/driver/prefs.c 2008-03-11 09:20:58 +0100 -@@ -951,9 +951,12 @@ - { - p->init_file_date = write_date; - -+/* Interix has no sync() or alike. */ -+#ifndef __INTERIX - /* Since the .xscreensaver file is used for IPC, let's try and make - sure that the bits actually land on the disk right away. */ - sync (); -+#endif - - status = 0; /* wrote and renamed successfully! */ - } -diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c ---- xscreensaver-5.05.orig/driver/setuid.c 2006-02-09 03:33:29 +0100 -+++ xscreensaver-5.05/driver/setuid.c 2008-03-11 09:22:59 +0100 -@@ -136,9 +136,12 @@ - if (uid == (uid_t) -1) uid = (uid_t) -2; - - errno = 0; -+ -+#ifndef __INTERIX - if (setgroups_needed_p (gid) && - setgroups (1, &gid) < 0) - sgs_errno = errno ? errno : -1; -+#endif - - errno = 0; - if (setgid (gid) != 0) diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch deleted file mode 100644 index 1f2495363557..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.20-blurb-hndl-test-passwd.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.17-blurb-hndl-test-passwd.patch - ---- a/driver/test-passwd.c -+++ b/driver/test-passwd.c -@@ -66,6 +66,7 @@ - Bool update_screen_layout (saver_info *si) { return 0; } - - const char *blurb(void) { return progname; } -+Bool in_signal_handler_p = 0; - Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS; - - void diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch deleted file mode 100644 index bc7f58b4085d..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.20-test-passwd-segv-tty.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-test-passwd-segv-tty.patch - ---- a/driver/passwd.c -+++ b/driver/passwd.c -@@ -205,7 +205,7 @@ - { - # ifdef HAVE_SYSLOG - struct passwd *pw = getpwuid (getuid ()); -- char *d = DisplayString (si->dpy); -+ char *d = (si->dpy ? DisplayString (si->dpy) : 0); - char *u = (pw && pw->pw_name ? pw->pw_name : "???"); - int opt = 0; - int fac = 0; diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch deleted file mode 100644 index 32fb638afa03..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.20-tests-miscfix.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://pkgs.fedoraproject.org/cgit/xscreensaver.git/tree/xscreensaver-5.12-tests-miscfix.patch - ---- a/driver/test-xdpms.c -+++ a/driver/test-xdpms.c -@@ -29,7 +29,6 @@ - - #include <X11/Xproto.h> - #include <X11/extensions/dpms.h> --#include <X11/extensions/dpmsstr.h> - - extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret); - extern Bool DPMSCapable (Display *dpy); ---- a/driver/Makefile.in -+++ a/driver/Makefile.in -@@ -850,7 +850,7 @@ - test-mlstring: test-mlstring.o - $(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS) - --TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS) -+TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS) - test-fade: test-fade.o $(UTILS_BIN)/fade.o - $(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS) - diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch b/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch deleted file mode 100644 index 6c3143d758b7..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.28-comment-style.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/hacks/tessellimage.c -+++ b/hacks/tessellimage.c -@@ -507,15 +507,15 @@ - out[i].p = (n > 0 - ? (XPoint *) calloc (out[i].npoints + 1, sizeof (*out[i].p)) - : 0); --//printf("%d: ", i); -+/*printf("%d: ", i);*/ - for (j = 0; j < out[i].npoints; j++) - { - ITRIANGLE *tt = &v[t->tri[j]]; - out[i].p[j].x = (p[tt->p1].x + p[tt->p2].x + p[tt->p3].x) / 3; - out[i].p[j].y = (p[tt->p1].y + p[tt->p2].y + p[tt->p3].y) / 3; --//printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y); -+/*printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);*/ - } --//printf("\n"); -+/*printf("\n");*/ - } - - free (vert_to_tri); diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch deleted file mode 100644 index 91ce780aea3a..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.35-offensive.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/hacks/barcode.c -+++ a/hacks/barcode.c -@@ -131,7 +131,6 @@ - "children", - "chocolate", - "CLONE", -- "cock", - "constriction", - "contrition", - "cop", -@@ -265,7 +264,6 @@ - "punishment", - "punk rock", - "punk", -- "pussy", - "quagmire", - "quarantine", - "quartz", -@@ -333,8 +331,6 @@ - "vegetarian", - "venom", - "verifiability", -- "viagra", -- "vibrator", - "victim", - "vignette", - "villainy", ---- a/hacks/glx/glsnake.c -+++ a/hacks/glx/glsnake.c -@@ -565,17 +565,17 @@ - ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, - ZERO, PIN, ZERO } - }, -- { "erect penis", /* thanks benno */ -+ { "shuffle board", /* thanks benno */ - { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, - PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, - ZERO, ZERO } - }, -- { "flaccid penis", -+ { "flaccid anchor", - { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, - PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, - ZERO, ZERO } - }, -- { "vagina", -+ { "engagement ring", - { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, - LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, - PIN, RIGHT, ZERO } -@@ -995,7 +995,7 @@ - { "Parrot", - { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } - }, -- { "Penis", -+ { "Shuttle", - { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } - }, - { "PictureComingSoon", diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch deleted file mode 100644 index a6978a58e681..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.43-gentoo.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/driver/XScreenSaver.ad.in -+++ b/driver/XScreenSaver.ad.in -@@ -31,21 +31,21 @@ - *mode: random - *timeout: 0:10:00 - *cycle: 0:10:00 --*lockTimeout: 0:00:00 -+*lockTimeout: 0:30:00 - *passwdTimeout: 0:00:30 --*dpmsEnabled: False -+*dpmsEnabled: True - *dpmsQuickoffEnabled: False - *dpmsStandby: 2:00:00 - *dpmsSuspend: 2:00:00 - *dpmsOff: 4:00:00 --*grabDesktopImages: True -+*grabDesktopImages: False - *grabVideoFrames: False - *chooseRandomImages: @DEFAULT_IMAGES_P@ - ! This can be a local directory name, or the URL of an RSS or Atom feed. - *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ - *nice: 10 - *memoryLimit: 0 --*lock: False -+*lock: True - *verbose: False - *timestamp: True - *fade: True -@@ -63,7 +63,7 @@ - *textLiteral: XScreenSaver - *textFile: @DEFAULT_TEXT_FILE@ - *textProgram: fortune --*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss -+*textURL: https://planet.gentoo.org/rss20.xml - - *overlayTextForeground: #FFFF00 - *overlayTextBackground: #000000 -@@ -124,7 +124,8 @@ - - ! The format used for printing the date and time in the password dialog box - ! (see the strftime(3) manual page for details.) --*dateFormat: %d-%b-%y (%a); %I:%M %p -+!*dateFormat: %d-%b-%y (%a); %I:%M %p -+*dateFormat: %x %X - ! For day month date: - ! *dateFormat: %a %b %d, %I:%M %p - ! To show the time only: diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch deleted file mode 100644 index 25ee7a96ec72..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/hacks/barcode.c -+++ a/hacks/barcode.c -@@ -118,8 +118,6 @@ - "belly", - "bliss", - "bogosity", -- "boobies", -- "boobs", - "booty", - "bread", - "bubba", -@@ -132,7 +130,6 @@ - "children", - "chocolate", - "CLONE", -- "cock", - "constriction", - "contrition", - "cop", -@@ -266,7 +263,6 @@ - "punishment", - "punk rock", - "punk", -- "pussy", - "quagmire", - "quarantine", - "quartz", -@@ -334,8 +330,6 @@ - "vegetarian", - "venom", - "verifiability", -- "viagra", -- "vibrator", - "victim", - "vignette", - "villainy", ---- a/hacks/glx/glsnake.c -+++ a/hacks/glx/glsnake.c -@@ -565,17 +565,17 @@ - ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, - ZERO, PIN, ZERO } - }, -- { "erect penis", /* thanks benno */ -+ { "shuffle board", /* thanks benno */ - { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, - PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO, - ZERO, ZERO } - }, -- { "flaccid penis", -+ { "flaccid anchor", - { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN, - PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO, - ZERO, ZERO } - }, -- { "vagina", -+ { "engagement ring", - { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO, - LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT, - PIN, RIGHT, ZERO } -@@ -995,7 +995,7 @@ - { "Parrot", - { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO } - }, -- { "Penis", -+ { "Shuttle", - { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO } - }, - { "PictureComingSoon", diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch deleted file mode 100644 index cf95cf105b01..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/driver/test-passwd.c -+++ b/driver/test-passwd.c -@@ -69,6 +69,7 @@ - char *timestring (time_t when) { return ""; } - - const char *blurb(void) { return progname; } -+Bool in_signal_handler_p = 0; - Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS; - - void diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch deleted file mode 100644 index 279a19cf6386..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/driver/XScreenSaver.ad.in -+++ b/driver/XScreenSaver.ad.in -@@ -31,21 +31,21 @@ - *mode: random - *timeout: 0:10:00 - *cycle: 0:10:00 --*lockTimeout: 0:00:00 -+*lockTimeout: 0:30:00 - *passwdTimeout: 0:00:30 --*dpmsEnabled: False -+*dpmsEnabled: True - *dpmsQuickoffEnabled: False - *dpmsStandby: 2:00:00 - *dpmsSuspend: 2:00:00 - *dpmsOff: 4:00:00 --*grabDesktopImages: True -+*grabDesktopImages: False - *grabVideoFrames: False - *chooseRandomImages: @DEFAULT_IMAGES_P@ - ! This can be a local directory name, or the URL of an RSS or Atom feed. - *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ - *nice: 10 - *memoryLimit: 0 --*lock: False -+*lock: True - *verbose: False - *timestamp: True - *fade: True -@@ -63,7 +63,7 @@ - *textLiteral: XScreenSaver - *textFile: @DEFAULT_TEXT_FILE@ - *textProgram: fortune --*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss -+*textURL: https://planet.gentoo.org/rss20.xml - - ! When a saver writes an error message to stdout/stderr, it can be printed - ! on the screen. -@@ -124,7 +124,8 @@ - - ! The format used for printing the date and time in the password dialog box - ! (see the strftime(3) manual page for details.) --*dateFormat: %d-%b-%y (%a); %I:%M %p -+!*dateFormat: %d-%b-%y (%a); %I:%M %p -+*dateFormat: %x %X - ! For day month date: - ! *dateFormat: %a %b %d, %I:%M %p - ! To show the time only: diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch new file mode 100644 index 000000000000..490e32f68177 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure-install_sh.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/803479 + +--- a/configure.ac ++++ b/configure.ac +@@ -1062,6 +1062,7 @@ + AC_PROG_INSTALL + AC_PROG_INSTALL_DIRS + AC_PROG_MAKE_SET ++AM_PROG_INSTALL_SH + + # By default, autoconf sets INSTALL_SCRIPT to '${INSTALL_PROGRAM}'. + # That's wrong: it should be set to '${INSTALL}', so that one can diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch new file mode 100644 index 000000000000..fe56f927e208 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch @@ -0,0 +1,120 @@ +From 0f4d029102c651ccbc69860bf222126d2c58e36e Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sun, 13 Jun 2021 23:41:42 +0200 +Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on + Gentoo + +--- + configure.ac | 96 ---------------------------------------------------- + 1 file changed, 96 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9b8641e..2eaea28 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4833,102 +4833,6 @@ for bad_choice in xscreensaver xscreensaver-settings xscreensaver-command ; do + done + + +-# Warn if there's a previous RPM package installed. +- +-rpm_vers= +-if test -z "$RPM_PACKAGE_VERSION" ; then +- # Don't bother with this test if we are currently *building* an RPM. +- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras +- xscreensaver-data xscreensaver-data-extra" +- +- # M4 sucks!! +- changequote(X,Y) +- pkg_vers=`(rpm -qv $rpmnames) 2>&- | \ +- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.].*\)/\1/p' | head -1` +- rpm_vers="$pkg_vers" +- changequote([,]) +-fi +- +-if test \! -z "$rpm_vers" ; then +- +- # M4 sucks!! +- changequote(A,B) +- pkg_bindir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'` +- pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` +- pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'` +- pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` +- pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1` +- pkg_addir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'` +- +- if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi +- changequote([,]) +-fi +- +- +-# Warn if there's a previous Debian package installed. +-# +-deb_vers= +-if test -z "$pkg_vers" ; then +- debnames="xscreensaver xscreensaver-data xscreensaver-data-extra" +- pkg_vers='' +- for dpkg in $debnames ; do +- if test -z "$pkg_vers"; then +- pkg_vers=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'` +- deb_vers="$pkg_vers" +- fi +- done +-fi +- +-if test \! -z "$deb_vers" ; then +- +- # M4 sucks!! +- changequote(A,B) +- pkg_bindir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'` +- pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` +- pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'` +- pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` +- pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1` +- pkg_addir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'` +- changequote([,]) +- +- if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi +-fi +- +-bindir_err= +-hackdir_err= +-confdir_err= +-fontdir_err= +-addir_err= +-if ! test -z "$pkg_vers" ; then +- +- err=" (DIFFERS)" +- +- if test -z "$pkg_bindir" ; then pkg_bindir='???' +- elif test "$pkg_bindir" != "${bindir}/" ; then bindir_err="$err" ; fi +- +- if test -z "$pkg_hackdir" ; then pkg_hackdir='???' +- elif test "$pkg_hackdir" != "${HACKDIR}/" ; then hackdir_err="$err"; fi +- +- if test -z "$pkg_confdir" ; then pkg_confdir='???' +- elif test "$pkg_confdir" != "${HACK_CONF_DIR}/" ; then confdir_err="$err"; fi +- +- if test -z "$pkg_fontdir" ; then pkg_fontdir='none' +- elif test "$pkg_fontdir/" != "${FONT_DIR}" ; then fontdir_err="$err"; fi +- +- if test -z "$pkg_addir" ; then pkg_addir='???' +- elif test "$pkg_addir" != "${APPDEFAULTS}/" ; then addir_err="$err" ; fi +- +- warning=no +- warnL "There is already an installed package of xscreensaver" +- warn2 "version \"$pkg_vers\", in these directories:" +- echo "" +- warn2 "User programs: $pkg_bindir$bindir_err" +- warn2 "Screen savers: $pkg_hackdir$hackdir_err" +- warn2 "Configuration: $pkg_confdir$confdir_err" +- warn2 "Extra fonts: $pkg_fontdir$fontdir_err" +- warn2 "App Defaults: $pkg_addir$addir_err" +-fi +- + echo "" + echo "$warnsep" + echo "" +-- +2.31.1 + diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch index 881869fb4637..41f8d7b7d089 100644 --- a/x11-misc/xscreensaver/files/xscreensaver-5.35-gentoo.patch +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch @@ -24,24 +24,24 @@ -*lock: False +*lock: True *verbose: False - *timestamp: True *fade: True -@@ -63,7 +63,7 @@ + *unfade: True +@@ -62,7 +62,7 @@ *textLiteral: XScreenSaver *textFile: @DEFAULT_TEXT_FILE@ *textProgram: fortune -*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss +*textURL: https://planet.gentoo.org/rss20.xml - *overlayTextForeground: #FFFF00 - *overlayTextBackground: #000000 -@@ -123,7 +123,8 @@ + ! This is what the "Settings" button on the splash screen runs. + *demoCommand: xscreensaver-settings +@@ -103,7 +103,8 @@ - ! The format used for printing the date and time in the password dialog box - ! (see the strftime(3) manual page for details.) --*dateFormat: %d-%b-%y (%a); %I:%M %p -+!*dateFormat: %d-%b-%y (%a); %I:%M %p + + ! The strftime(3) format string for printing the time on the password dialog. +-*dateFormat: %I:%M %p, %a %b %e ++!*dateFormat: %I:%M %p, %a %b %e +*dateFormat: %x %X - ! To show the time only: - ! *dateFormat: %I:%M %p - ! For 24 hour time: + ! DD MMM: + ! *dateFormat: %I:%M %p, %e %b (%a) + ! 12 hour time only: diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch new file mode 100644 index 000000000000..cb8b6e45db2b --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-non-gtk-install.patch @@ -0,0 +1,56 @@ +From 25b22d16fabbdb3e7a6afcd6cd8d1a25afaaa252 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sat, 17 Jul 2021 23:44:44 +0200 +Subject: [PATCH 1/2] Fix install for --without-motif --without-gtk + +Related to https://bugs.gentoo.org/796992 +--- + configure.ac | 4 ++++ + driver/Makefile.in | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2eaea28..4cb3385 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4148,13 +4148,16 @@ fi + + PREFERRED_DEMO_PROGRAM='' + ALL_DEMO_PROGRAMS= ++SETTINGS_PROGRAM_OR_NOT= + if test "$have_motif" = yes; then + PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Xm + ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS" ++ SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings + fi + if test "$have_gtk" = yes; then + PREFERRED_DEMO_PROGRAM=xscreensaver-settings-Gtk + ALL_DEMO_PROGRAMS="$PREFERRED_DEMO_PROGRAM $ALL_DEMO_PROGRAMS" ++ SETTINGS_PROGRAM_OR_NOT=xscreensaver-settings + fi + + +@@ -4306,6 +4309,7 @@ AC_SUBST(INCLUDES) + + AC_SUBST(PREFERRED_DEMO_PROGRAM) + AC_SUBST(ALL_DEMO_PROGRAMS) ++AC_SUBST(SETTINGS_PROGRAM_OR_NOT) + AC_SUBST(SAVER_LIBS) + AC_SUBST(MOTIF_LIBS) + AC_SUBST(GTK_LIBS) +diff --git a/driver/Makefile.in b/driver/Makefile.in +index 0e986a9..1877d8a 100644 +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uid test-xdpms test-grab \ + xdpyinfo test-screens test-yarandom test-xinput \ + test-xkb + +-EXES = xscreensaver xscreensaver-command xscreensaver-settings ++EXES = xscreensaver xscreensaver-command @SETTINGS_PROGRAM_OR_NOT@ + UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@ + SETUID_EXES = xscreensaver-auth + DEMO_EXES = @ALL_DEMO_PROGRAMS@ +-- +2.32.0 + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch new file mode 100644 index 000000000000..c98d5297e9b0 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch @@ -0,0 +1,28 @@ +From fa531a3ff2dd8aa4e0b6767e3390f88bfbaca791 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Mon, 14 Jun 2021 12:11:32 +0200 +Subject: [PATCH] hacks/glx/Makefile.in: Fix target install-program for + --without-gl + +Symptom was: +/usr/bin/install: cannot stat 'sonar': No such file or directory +--- + hacks/glx/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in +index ed07a1f..6ae969c 100644 +--- a/hacks/glx/Makefile.in ++++ b/hacks/glx/Makefile.in +@@ -320,7 +320,7 @@ install-program:: $(EXES) + $(INSTALL_PROGRAM) $$program $$idir/$$program ; \ + done ; \ + \ +- exes="$(SUID_EXES)" ; \ ++ exes="@SUID_EXES@" ; \ + if [ @SETUID_HACKS@ = yes ]; then \ + sinst="$(INSTALL_SETUID)" ; \ + else \ +-- +2.31.1 + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch new file mode 100644 index 000000000000..e1996291bd3a --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch @@ -0,0 +1,12 @@ +Upstream don't support this anymore (https://github.com/gentoo/gentoo/pull/24404#issuecomment-1061128526) +but it's a trivial patch so let's keep it going for now. +--- xscreensaver-6.03.orig/configure.ac 2022-03-04 11:23:24.415172769 -0700 ++++ xscreensaver-6.03/configure.ac 2022-03-04 11:27:40.419205257 -0700 +@@ -4737,7 +4737,6 @@ + CONF_STATUS=1 + elif test "$with_gl_req" = no ; then + noteL 'The OpenGL 3D library is not being used.' +- CONF_STATUS=1 + else + noteL 'The OpenGL 3D library was not found.' + CONF_STATUS=1 diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch new file mode 100644 index 000000000000..d69e5965ca2f --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch @@ -0,0 +1,43 @@ +The configure scripts exits on a non zero exit code even with a warning. Even +though for upstream this is just a warning, for portage this means failure and +it will exit. +We therefore alter the exit codes where neccesary. + +Bug: https://bugs.gentoo.org/885441 + +Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-15) + +--- a/configure.ac ++++ b/configure.ac +@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then + else + warnL "The GTK libraries do not seem to be available; the" + warn2 "\`xscreensaver-settings' program requires them." +- CONF_STATUS=1 + # echo '' + # warn2 'You can use Motif or Lesstif instead of GTK (use the' + # warn2 "\`--with-motif' option) but that is NOT recommended." +@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then + warn "GTK is being used, but the GDK-Pixbuf library and/or" + warn2 "headers were not found. That can't be good. Please" + warn2 "install the GDK-Pixbuf development kit and re-configure." +- CONF_STATUS=1 + fi + + if test "$have_motif" = yes -a "$have_lesstif" = yes ; then +@@ -4714,7 +4712,6 @@ if test "$have_jpeg" = no ; then + warn2 "This means that it won't be possible for the image-manipulating" + warn2 "display modes to load files from disk; and it also means that" + warn2 "the \`webcollage' program will be much slower." +- CONF_STATUS=1 + else + warn2 "This means the \`webcollage' program will be much slower." + fi +@@ -4733,7 +4730,6 @@ if test "$have_png" = no ; then + + if test "$png_halfassed" = yes ; then halfassery ; fi + warn2 "Many things aren't going to work right." +- CONF_STATUS=1 + fi + + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch new file mode 100644 index 000000000000..7d9ffdfae4d7 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch @@ -0,0 +1,13 @@ +Remove update icon cache as it is a sandbox access violation. +We do this in the ebuild by ourselves instead. + +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -564,7 +564,6 @@ install-gnome:: $(LOGO) + fi + + install-gnome:: uninstall-old-gnome-icons +-install-gnome:: update-icon-caches + + update-icon-caches:: + @for f in /usr/share/icons/index.theme diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch new file mode 100644 index 000000000000..0f09d970a920 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch @@ -0,0 +1,42 @@ +This is to teach handly some good manners and get his mind out of the gutter. He let himself go quite a bit lately. +Fixes: https://bugs.gentoo.org/869218 + + +--- a/hacks/glx/handsy_anim.h ++++ b/hacks/glx/handsy_anim.h +@@ -770,7 +770,6 @@ static const hand_anim goatse_anim[] = { + /**************************************************************************/ + + static const hand_anim_pair all_hand_anims[] = { +- {{ middle_anim, middle_anim }, 0.2 }, + {{ tap_anim, tap_anim }, 0.7 }, + {{ tap_anim, tap_anim }, 0.7 }, + {{ tap_anim, tap_anim }, 0.7 }, +@@ -778,15 +777,12 @@ static const hand_anim_pair all_hand_anims[] = { + {{ spock_anim, hidden_anim}, 0 }, + {{ horns_anim, horns_anim}, 0 }, + {{ horns_anim, horns_anim}, 0 }, +- {{ bs1_anim, bs2_anim }, 0 }, +- {{ upyours_anim, hidden_anim }, 0 }, + {{ peace_anim, hidden_anim }, 0 }, + {{ scissor1_anim, scissor2_anim }, 0 }, + {{ wave_anim, hidden_anim }, 0 }, + {{ wave2_anim, hidden_anim }, 0 }, + {{ jazzhands_anim, jazzhands_anim }, 0 }, + {{ ok_anim, ok_anim }, 0 }, +- {{ inout1_anim, inout2_anim }, 0 }, + {{ clap_anim, clap_anim }, 0 }, + {{ slow_clap_anim, slow_clap_anim }, 0 }, + {{ pray_anim, pray_anim }, 0 }, +@@ -795,11 +791,9 @@ static const hand_anim_pair all_hand_anims[] = { + {{ thumbsup_anim, thumbsup_anim }, 0 }, + {{ thumbsdn_anim, thumbsdn_anim }, 0 }, + {{ thisguy_anim, thisguy_anim }, 0 }, +- {{ outtahere_anim, hidden_anim }, 0 }, + {{ stahhhp_anim, stahhhp_anim }, 0 }, + {{ gun_anim, gun_anim }, 0.25 }, + {{ walk_anim, walk_anim }, 0.3 }, +- {{ goatse_anim, goatse_anim }, 0 }, + {{ 0, }}}; + + #endif /* __HANDSY_ANIM__ */ diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch new file mode 100644 index 000000000000..dd2ea676d443 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-allow-no-pam.patch @@ -0,0 +1,18 @@ +The use flag combination -pam +locking is not possible with that configure.ac. +Having a pam conf and a /etc/pam.d could be remnants from a previous installation +of pam and don't tell us for sure that the user does not want this. + +Bug: https://bugs.gentoo.org/908509 + +# Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/configure.ac ++++ b/configure.ac +@@ -4971,7 +4971,6 @@ elif test "$have_pam" = no -a "$enable_locking" = yes ; then + if test -d /etc/pam.d -o -f /etc/pam.conf ; then + warn "Your system seems to have PAM, but PAM is not being used." + warn2 "That is probably not going to work out well." +- CONF_STATUS=1 + fi + fi + diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch new file mode 100644 index 000000000000..07474aec689b --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-fix-desktop-files.patch @@ -0,0 +1,31 @@ +* xscreensaver-settings.desktop: error: value item "Screensaver" in key +* "Categories" in group "Desktop Entry" is a reserved category, so a +* "OnlyShowIn" key must be included +* xscreensaver.desktop: error: value item "Screensaver" in key "Categories" +* in group "Desktop Entry" is a reserved category, so a "OnlyShowIn" key +* must be included + +We just remove the category Screensaver then. + +Bug: https://bugs.gentoo.org/894700 + +# Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/driver/xscreensaver-settings.desktop.in ++++ b/driver/xscreensaver-settings.desktop.in +@@ -5,5 +5,5 @@ Icon=xscreensaver + _Name=XScreenSaver Settings + _Comment=Change screensaver properties + Type=Application +-Categories=Settings;DesktopSettings;Screensaver;Security;GNOME;GTK;KDE;Motif;Qt;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings ++Categories=Settings;DesktopSettings;Security;GNOME;GTK;KDE;Motif;Qt;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings + Terminal=false +--- a/driver/xscreensaver.desktop.in ++++ b/driver/xscreensaver.desktop.in +@@ -5,5 +5,5 @@ Icon=xscreensaver + _Name=XScreenSaver + _Comment=XScreenSaver daemon: screen saver and locker + Type=Application +-Categories=Screensaver;Security;GNOME;GTK;KDE;Motif;Qt ++Categories=Security;GNOME;GTK;KDE;Motif;Qt + Terminal=false diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch new file mode 100644 index 000000000000..05c0c014f412 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.07-gcc.patch @@ -0,0 +1,24 @@ +We want it to be possible to bulid with clang, so also check against that. + +# Pascal Jäger <pascal.jaeger@leimstift.de> + +--- a/configure.ac ++++ b/configure.ac +@@ -303,7 +303,7 @@ done + + AC_DEFUN([AC_CHECK_GCC_ARG], + [if test -n "$GCC"; then +- AC_CACHE_CHECK([whether gcc accepts [$2]], ++ AC_CACHE_CHECK([whether $[$CC] accepts [$2]], + ac_cv_gcc_accepts_[$1], + [rm -rf conftest.$ac_ext + touch conftest.$ac_ext +@@ -316,7 +316,7 @@ AC_DEFUN([AC_CHECK_GCC_ARG], + # earlier diagnostics". + # + without_no=`echo $2 | sed s/Wno-/W/` +- if ( ( gcc -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ ++ if ( ( $CC -c $without_no conftest.$ac_ext -o/dev/null >/dev/null ) \ + 2>&1 | \ + grep unrecognized >/dev/null ); then + ac_cv_gcc_accepts_[$1]=no diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch deleted file mode 100644 index 79ffcd7098cf..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch +++ /dev/null @@ -1,49 +0,0 @@ -libXxf86misc is the client-side code of an X extension that has not been -supported by the Xserver in more than 10 years. Since xscreensaver's dependency -on it is automagic, we have to patch configure.in to safely remove it. - -https://bugs.gentoo.org/720158 - -diff -ruN xscreensaver.orig/configure.in xscreensaver/configure.in ---- xscreensaver.orig/configure.in 2020-05-02 18:09:23.169324761 -0700 -+++ xscreensaver/configure.in 2020-05-02 18:09:52.578233240 -0700 -@@ -104,12 +104,6 @@ - (It's available if the file /usr/include/X11/extensions/XInput.h - exists.)]) - --AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE], -- [Define this if you have the XF86MiscSetGrabKeysState function -- (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key -- sequences to be temporarily disabled. Sadly, it doesn't affect -- Ctrl-Alt-BS or Ctrl-Alt-F1.)]) -- - AH_TEMPLATE([HAVE_RANDR], - [Define this if you have the Resize and Rotate extension. - This is standard on sufficiently-recent XFree86 systems, and -@@ -1888,25 +1882,6 @@ - fi - - --############################################################################### --# --# Check for XF86MiscSetGrabKeysState (but only bother if we are already --# using other XF86 stuff.) --# --############################################################################### -- --have_xf86miscsetgrabkeysstate=no --if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then -- AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState, -- [have_xf86miscsetgrabkeysstate=yes], -- [true], -lXext -lX11) -- if test "$have_xf86miscsetgrabkeysstate" = yes ; then -- SAVER_LIBS="$SAVER_LIBS -lXxf86misc" -- AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE) -- fi --fi -- -- - ############################################################################### - # - # Check for HP XHPDisableReset and XHPEnableReset. - diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml index fb3aa2fc1da8..68803a1d6b15 100644 --- a/x11-misc/xscreensaver/metadata.xml +++ b/x11-misc/xscreensaver/metadata.xml @@ -1,20 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>desktop-misc@gentoo.org</email> -<name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -<upstream> -<maintainer> -<email>jwz@jwz.org</email> -<name>Jamie Zawinski</name> -</maintainer> -</upstream> -<use> -<flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag> -<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag> -<flag name="locking">Compile in support for locking the display</flag> -<flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag> -</use> + <maintainer type="person"> + <email>pascal.jaeger@leimstift.de</email> + <name>Pascal Jäger</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <maintainer> + <email>jwz@jwz.org</email> + <name>Jamie Zawinski</name> + </maintainer> + </upstream> + <use> + <flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag> + <flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag> + <flag name="gles" restrict=">=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag> + <flag name="glx" restrict=">=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag> + <flag name="locking">Compile in support for locking the display</flag> + <flag name="logind-idle-hint">Send the session idle hint to logind once the screen saver blanks</flag> + <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag> + </use> </pkgmetadata> diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild deleted file mode 100644 index 9ffa8e21aea5..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic multilib pam - -DESCRIPTION="A 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 -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama" - -COMMON_DEPEND=" - >=gnome-base/libglade-2 - dev-libs/libxml2 - media-libs/netpbm - x11-apps/appres - x11-apps/xwininfo - x11-libs/gdk-pixbuf:2[X] - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - sed -i configure.in -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{,.in} || die - fi - - eapply \ - "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch \ - "${FILESDIR}"/${PN}-5.05-interix.patch \ - "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \ - "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \ - "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \ - "${FILESDIR}"/${PN}-5.28-comment-style.patch \ - "${FILESDIR}"/${PN}-5.31-pragma.patch \ - "${FILESDIR}"/${PN}-5.35-gentoo.patch - - use offensive || eapply "${FILESDIR}"/${PN}-5.35-offensive.patch - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with xinerama xinerama-ext) \ - --enable-locking \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-gtk \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-pixbuf \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - use pam && fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild deleted file mode 100644 index 5a18a2279341..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.43-r3.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools desktop eutils flag-o-matic multilib pam - -DESCRIPTION="A 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 -> ${P}-r1.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama" - -COMMON_DEPEND=" - >=gnome-base/libglade-2 - dev-libs/libxml2 - media-libs/netpbm - x11-apps/appres - x11-apps/xwininfo - x11-libs/gdk-pixbuf:2[X] - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - caps? ( sys-libs/libcap ) - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch - "${FILESDIR}"/${PN}-5.05-interix.patch - "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch - "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch - "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-5.43-gentoo.patch -) - -src_prepare() { - sed -i configure.in -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{,.in} || die - fi - - default - - use offensive || eapply "${FILESDIR}"/${PN}-5.43-offensive.patch - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_with caps setcap-hacks) \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with xinerama xinerama-ext) \ - --enable-locking \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-gtk \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-pixbuf \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - use pam && fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild deleted file mode 100644 index 49a04e5dd618..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools desktop eutils flag-o-matic multilib pam - -DESCRIPTION="A 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 -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama" -REQUIRED_USE=" - gdk-pixbuf? ( gtk ) -" - -COMMON_DEPEND=" - >=gnome-base/libglade-2 - dev-libs/libxml2 - media-libs/netpbm - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - caps? ( sys-libs/libcap ) - gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) - gtk? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch - "${FILESDIR}"/${PN}-5.05-interix.patch - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch - "${FILESDIR}"/${PN}-5.44-gentoo.patch -) - -src_prepare() { - sed -i configure.in -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{,.in} || die - fi - - default - - 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 || break - fi - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_enable locking) \ - $(use_with caps setcap-hacks) \ - $(use_with gdk-pixbuf pixbuf) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with xinerama xinerama-ext) \ - --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-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --without-motif \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - use pam && fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild new file mode 100644 index 000000000000..2134da5a04c9 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI=" + https://www.jwz.org/xscreensaver/${P}.tar.gz + logind-idle-hint? ( + https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> + ${PN}-6.06-logind-idle-hint.patch + ) + systemd? ( + https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> + ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch + ) +" + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" +REQUIRED_USE=" + gles? ( !glx ) + ?? ( elogind systemd ) + pam? ( locking ) + logind-idle-hint? ( || ( elogind systemd ) ) +" + +COMMON_DEPEND=" + >=dev-libs/libxml2-2.4.6 + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + >=x11-libs/gtk+-3.0.0:3 + jpeg? ( media-libs/libjpeg-turbo:= ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + virtual/glu + virtual/opengl + pam? ( sys-libs/pam ) + media-libs/libpng:= + systemd? ( >=sys-apps/systemd-221 ) + >=x11-libs/libXft-2.1.0 + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + app-alternatives/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-6.07-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch +# "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch +# "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch +# "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch + "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch +# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch +# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch + "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch + "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch +) + +DOCS=( README{,.hacking} ) + +# see https://bugs.gentoo.org/898328 +QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) + +src_prepare() { + default + + # bug #896440 + mv po/ca.po po/ca.po.old || die + iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + + if use systemd; then + # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." + # after "systemctl --user enable xscreensaver". + sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ + driver/xscreensaver.service.in || die + + eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" + fi + + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" + fi + + if use logind-idle-hint; then + eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" + fi + + config_rpath_update "${S}"/config.rpath + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # /proc/interrupts won't always have the keyboard bits needed + # Not clear this does anything in 6.03+(?) but let's keep it for now in case. + # (See also: configure argument) + export ac_cv_have_proc_interrupts=yes + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + --with-pixbuf + $(use_with gles) + $(use_with glx) + --with-gtk + $(use_with new-login login-manager) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=yes + --with-xft=yes + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die + + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -rfv "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + if use systemd; then + systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" + fi + # Makefile installs xscreensaver.service regardless of + # --without-systemd, and if USE=systemd, we will have installed the + # unit file already. + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + + # bug #885989 + fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf + + xdg_icon_cache_update +} + +pkg_postrm() { + use fonts && font_pkg_postrm + xdg_icon_cache_update +} diff --git a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild new file mode 100644 index 000000000000..a044a8b3bf9b --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild @@ -0,0 +1,278 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI=" + https://www.jwz.org/xscreensaver/${P}.tar.gz + logind-idle-hint? ( + https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> + ${PN}-6.06-logind-idle-hint.patch + ) + systemd? ( + https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> + ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch + ) +" + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" +REQUIRED_USE=" + gles? ( !glx ) + ?? ( elogind systemd ) + pam? ( locking ) + logind-idle-hint? ( || ( elogind systemd ) ) +" + +COMMON_DEPEND=" + >=dev-libs/libxml2-2.4.6 + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + >=x11-libs/gtk+-3.0.0:3 + jpeg? ( media-libs/libjpeg-turbo:= ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + virtual/glu + virtual/opengl + pam? ( sys-libs/pam ) + media-libs/libpng:= + systemd? ( >=sys-apps/systemd-221 ) + >=x11-libs/libXft-2.1.0 + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + app-alternatives/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-6.07-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch + "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch + "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch + "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch + "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch + "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch + "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch + "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch +) + +DOCS=( README{,.hacking} ) + +# see https://bugs.gentoo.org/898328 +QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) + +src_prepare() { + default + + # bug #896440 + mv po/ca.po po/ca.po.old || die + iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + + if use systemd; then + # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." + # after "systemctl --user enable xscreensaver". + sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ + driver/xscreensaver.service.in || die + + eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" + fi + + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" + fi + + if use logind-idle-hint; then + eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" + fi + + config_rpath_update "${S}"/config.rpath + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # /proc/interrupts won't always have the keyboard bits needed + # Not clear this does anything in 6.03+(?) but let's keep it for now in case. + # (See also: configure argument) + export ac_cv_have_proc_interrupts=yes + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + --with-pixbuf + $(use_with gles) + $(use_with glx) + --with-gtk + $(use_with new-login login-manager) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=yes + --with-xft=yes + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die + + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -rfv "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + if use systemd; then + systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" + fi + # Makefile installs xscreensaver.service regardless of + # --without-systemd, and if USE=systemd, we will have installed the + # unit file already. + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + + # bug #885989 + fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf + + xdg_icon_cache_update +} + +pkg_postrm() { + use fonts && font_pkg_postrm + xdg_icon_cache_update +} diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild new file mode 100644 index 000000000000..2134da5a04c9 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI=" + https://www.jwz.org/xscreensaver/${P}.tar.gz + logind-idle-hint? ( + https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> + ${PN}-6.06-logind-idle-hint.patch + ) + systemd? ( + https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> + ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch + ) +" + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" +REQUIRED_USE=" + gles? ( !glx ) + ?? ( elogind systemd ) + pam? ( locking ) + logind-idle-hint? ( || ( elogind systemd ) ) +" + +COMMON_DEPEND=" + >=dev-libs/libxml2-2.4.6 + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + >=x11-libs/gtk+-3.0.0:3 + jpeg? ( media-libs/libjpeg-turbo:= ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + virtual/glu + virtual/opengl + pam? ( sys-libs/pam ) + media-libs/libpng:= + systemd? ( >=sys-apps/systemd-221 ) + >=x11-libs/libXft-2.1.0 + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + app-alternatives/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-6.07-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch +# "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch +# "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch +# "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch + "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch +# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch +# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch + "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch + "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch +) + +DOCS=( README{,.hacking} ) + +# see https://bugs.gentoo.org/898328 +QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) + +src_prepare() { + default + + # bug #896440 + mv po/ca.po po/ca.po.old || die + iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + + if use systemd; then + # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." + # after "systemctl --user enable xscreensaver". + sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ + driver/xscreensaver.service.in || die + + eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" + fi + + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" + fi + + if use logind-idle-hint; then + eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" + fi + + config_rpath_update "${S}"/config.rpath + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # /proc/interrupts won't always have the keyboard bits needed + # Not clear this does anything in 6.03+(?) but let's keep it for now in case. + # (See also: configure argument) + export ac_cv_have_proc_interrupts=yes + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + --with-pixbuf + $(use_with gles) + $(use_with glx) + --with-gtk + $(use_with new-login login-manager) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=yes + --with-xft=yes + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die + + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -rfv "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + if use systemd; then + systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" + fi + # Makefile installs xscreensaver.service regardless of + # --without-systemd, and if USE=systemd, we will have installed the + # unit file already. + rm "${ED}/usr/share/${PN}/xscreensaver.service" || die + + # bug #885989 + fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf + + xdg_icon_cache_update +} + +pkg_postrm() { + use fonts && font_pkg_postrm + xdg_icon_cache_update +} diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest index 65168a048074..4c89446690fa 100644 --- a/x11-misc/xsel/Manifest +++ b/x11-misc/xsel/Manifest @@ -1 +1,2 @@ DIST xsel-1.2.0.tar.gz 169155 BLAKE2B 59b5c2f03058be1a584f12bd5c129a008ae581545b7aed3a54240f6a0b9c29e857c7425cbf6fa6421ccd577a1907a9a6c1d7213e4ccc43309a5e8933e707847d SHA512 e28623e6cc180f2e2210c20697d21d336633f0a5272ca9b62150a1c535e8de89731acc07230a9977e391e37d3943a9d687f1f967765a15bca5092a6c6d8c4d8f +DIST xsel-1.2.1.tar.gz 51621 BLAKE2B c9c066e4032d71c8c9e717c1251ce929590a7e3be9a156f54eb2625b3877b683e1a3f53f88c405b3f9986160ec38a3a737fe919f703ab307d1e74c97ef81c9f8 SHA512 549874679a2d2979fca851ce762870165f5cbe60ba3f15e0690080506a78ea0b2c52833bbf7868eb3988fc377a103c31c62367fb9c5d1eb606e0660985f82ca4 diff --git a/x11-misc/xsel/files/xsel-1.2.0-Werror.patch b/x11-misc/xsel/files/xsel-1.2.0-Werror.patch new file mode 100644 index 000000000000..443dbb909cab --- /dev/null +++ b/x11-misc/xsel/files/xsel-1.2.0-Werror.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,7 @@ + dnl Add some useful warnings if we have gcc. + dnl changequote(,)dnl + if test "x$ac_cv_prog_gcc" = xyes ; then +- CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Werror -g -std=gnu99 -Wdeclaration-after-statement -Wno-unused" ++ CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wdeclaration-after-statement -Wno-unused" + fi + dnl changequote([,])dnl + diff --git a/x11-misc/xsel/metadata.xml b/x11-misc/xsel/metadata.xml index 2ba8e9e851e4..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 "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>erkiferenc@gmail.com</email> + <name>Ferenc Erki</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> <name>Gentoo Desktop Miscellaneous Project</name> diff --git a/x11-misc/xsel/xsel-1.2.0-r1.ebuild b/x11-misc/xsel/xsel-1.2.0-r1.ebuild deleted file mode 100644 index 3ffdc71e3900..000000000000 --- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Command-line program for getting and setting the contents of the X selection" -HOMEPAGE="http://www.vergenet.net/~conrad/software/xsel" -SRC_URI="http://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-libs/libXt" - -src_compile() { - emake CFLAGS="${CFLAGS}" -} diff --git a/x11-misc/xsel/xsel-1.2.0-r2.ebuild b/x11-misc/xsel/xsel-1.2.0-r2.ebuild new file mode 100644 index 000000000000..3f2c213b8b7e --- /dev/null +++ b/x11-misc/xsel/xsel-1.2.0-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Command-line program for getting and setting the contents of the X selection" +HOMEPAGE="https://www.vergenet.net/~conrad/software/xsel" +SRC_URI="https://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/libXt" + +PATCHES=( "${FILESDIR}"/${P}-Werror.patch ) + +src_prepare() { + default + eautoreconf +} diff --git a/x11-misc/xsel/xsel-1.2.1.ebuild b/x11-misc/xsel/xsel-1.2.1.ebuild new file mode 100644 index 000000000000..e7570554b3ad --- /dev/null +++ b/x11-misc/xsel/xsel-1.2.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Command-line program for getting and setting the contents of the X selection" +HOMEPAGE="https://vergenet.net/~conrad/software/xsel" +SRC_URI="https://github.com/kfish/xsel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + +DEPEND="x11-libs/libX11" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + eautoreconf +} diff --git a/x11-misc/xsel/xsel-9999.ebuild b/x11-misc/xsel/xsel-9999.ebuild deleted file mode 100644 index d3edca7a9f74..000000000000 --- a/x11-misc/xsel/xsel-9999.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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.git" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - x11-libs/libXt -" - -src_prepare() { - default - eautoreconf -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest index 72737730e31c..81ba33a20c20 100644 --- a/x11-misc/xsensors/Manifest +++ b/x11-misc/xsensors/Manifest @@ -1 +1 @@ -DIST xsensors-0.70.tar.gz 115430 BLAKE2B af18fa723a9e6b84df62d0ea0397d7b30ab800816b84449f91357aa75d99944796ae8164171bd217118dd93ef713d286fe435354614baef7947f3f851b368df9 SHA512 34f038b192f3cecb2e7587e19c4837b795a2705e6d0e9ea2bd3ead6d3259a1dded364fcfc70fa5e37d64f32c879e1dd9c6e43dcf32fa9aeb73ee5cc49bf290a4 +DIST xsensors-0.80.tar.gz 214763 BLAKE2B 7be4c0ef0f59e7c8c8b32b7e132acb906c9ab64e6e0f63a3316691eef8dd2f8b659d4e40d2213cf580cc4874bcba2fefad4f6a759bf349e18ebef12a99c91128 SHA512 e1ac7107b978bf9b392b0ecb13e49f49c8efebb228a9c6781a519b128f467d0346d35632646f20a036fdc34ea3ee86440c7be5a3285d922f8afbf051e9cfdcc8 diff --git a/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch b/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch deleted file mode 100644 index 2f36cfba514c..000000000000 --- a/x11-misc/xsensors/files/xsensors-0.70-gtk220.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/src/gui.c -+++ b/src/gui.c -@@ -84,7 +84,7 @@ - while ( *digit ) { - get_pm_location( *digit, &x, &y, &w ); - gdk_draw_drawable( widget->window, -- widget->style->fg_gc[ GTK_WIDGET_STATE -+ widget->style->fg_gc[ gtk_widget_get_state - (widget) ], theme, x, y + highLow, - pos, 0, w, 30 ); - pos += w; -@@ -121,7 +121,7 @@ - - /* Display RPM */ - gdk_draw_drawable( widget->window, -- widget->style->fg_gc[ GTK_WIDGET_STATE -+ widget->style->fg_gc[ gtk_widget_get_state - (widget) ], theme, 0, 120 + highLow, - 90, 0, 57, 30 ); - break; -@@ -142,7 +142,7 @@ - else - x = 57; - gdk_draw_drawable( widget->window, -- widget->style->fg_gc[ GTK_WIDGET_STATE -+ widget->style->fg_gc[ gtk_widget_get_state - (widget) ], theme, x, 60 + highLow, - 96, 0, 57, 30 ); - -@@ -158,7 +158,7 @@ - - /* Display V */ - gdk_draw_drawable( widget->window, -- widget->style->fg_gc[ GTK_WIDGET_STATE -+ widget->style->fg_gc[ gtk_widget_get_state - (widget) ], theme, 114, 60 + highLow, - 96, 0, 57, 30 ); - diff --git a/x11-misc/xsensors/files/xsensors-0.80-Werror.patch b/x11-misc/xsensors/files/xsensors-0.80-Werror.patch new file mode 100644 index 000000000000..b903404256ac --- /dev/null +++ b/x11-misc/xsensors/files/xsensors-0.80-Werror.patch @@ -0,0 +1,14 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,10 +4,7 @@ + -DG_LOG_DOMAIN=\"GnomeCPUInfoApplet\" \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DDATADIR=\""$(datadir)"\" \ +- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \ +- -ansi -Wall -Wmissing-prototypes -Wmissing-declarations \ +- -Werror ++ -ansi -Wall -Wmissing-prototypes -Wmissing-declarations + + bin_PROGRAMS = xsensors + diff --git a/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch b/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch new file mode 100644 index 000000000000..9b53de088647 --- /dev/null +++ b/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch @@ -0,0 +1,34 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -29,7 +29,7 @@ + [Force GTK2 GUI, even if GTK3 is available @<:@default=check@:>@])], + [], [with_gtk2=no]) + +-if [ test "x$with_gtk2" == xno ]; then ++if [ test "x$with_gtk2" = xno ]; then + PKG_CHECK_MODULES([GTK],[gtk+-3.0],foundgtk3=true,foundgtk3=false) + else + echo "Using GTK2..." +@@ -37,18 +37,13 @@ + fi + + if [ $foundgtk3 ]; then +- XSENSORS_CFLAGS="`pkg-config --cflags gtk+-3.0` -Werror -Wall" +- XSENSORS_LIBS="`pkg-config --libs gtk+-3.0`" ++ XSENSORS_CFLAGS="`${PKG_CONFIG} --cflags gtk+-3.0` -Wall -Wall" ++ XSENSORS_LIBS="`${PKG_CONFIG} --libs gtk+-3.0`" + else +- if [ test "x$with_gtk2" == xno ]; then +- echo "GTK3 is not installed, checking for GTK2 instead..." +- fi +- AM_PATH_GTK_2_0(2.8.0,,AC_MSG_ERROR([ ++ AC_MSG_ERROR([ + *** GTK+ is required to build xsensors; please make sure you have the GTK+ + *** development headers installed. The latest version of GTK+ is +-*** always available at http://www.gtk.org/.])) +- XSENSORS_CFLAGS="`pkg-config --cflags gtk+-2.0` -Werror -Wall" +- XSENSORS_LIBS="`pkg-config --libs gtk+-2.0`" ++*** always available at http://www.gtk.org/.]) + fi + + AC_SUBST(XSENSORS_CFLAGS) diff --git a/x11-misc/xsensors/metadata.xml b/x11-misc/xsensors/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xsensors/metadata.xml +++ b/x11-misc/xsensors/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xsensors/xsensors-0.70-r1.ebuild b/x11-misc/xsensors/xsensors-0.70-r1.ebuild deleted file mode 100644 index 38fde9b5deb9..000000000000 --- a/x11-misc/xsensors/xsensors-0.70-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A hardware health information viewer, interface to lm-sensors" -HOMEPAGE="https://www.linuxhardware.org/xsensors/" -SRC_URI="https://www.linuxhardware.org/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND="x11-libs/gtk+:2 - >=sys-apps/lm-sensors-3" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-gtk220.patch ) - -src_prepare() { - default - - sed -i \ - -e '/-DG.*_DISABLE_DEPRECATED/d' \ - -e 's:-Werror:-Wall:' \ - src/Makefile.am configure.in || die - - mv configure.{in,ac} || die #426262 - - eautoreconf -} diff --git a/x11-misc/xsensors/xsensors-0.80.ebuild b/x11-misc/xsensors/xsensors-0.80.ebuild new file mode 100644 index 000000000000..0c913f588eec --- /dev/null +++ b/x11-misc/xsensors/xsensors-0.80.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools xdg + +DESCRIPTION="A hardware health information viewer, interface to lm-sensors" +HOMEPAGE="https://github.com/Mystro256/xsensors/" +SRC_URI="https://github.com/Mystro256/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +RDEPEND=" + >=sys-apps/lm-sensors-3 + dev-libs/glib:2 + x11-libs/gtk+:3 +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${P}-gtk220.patch + "${FILESDIR}"/${P}-Werror.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf --without-gtk2 +} + +src_install() { + default + + rm -r "${ED}"/usr/share/appdata || die +} diff --git a/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch b/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch new file mode 100644 index 000000000000..3235053c8b7e --- /dev/null +++ b/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch @@ -0,0 +1,75 @@ +https://bugs.gentoo.org/870571 + +Not sent upstream as it's a generated file and configure.in +is written for autoconf 2.13. +--- a/configure ++++ b/configure +@@ -1057,7 +1057,7 @@ cat > conftest.$ac_ext << EOF + #line 1058 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -1304,6 +1304,7 @@ else + #line 1305 "configure" + #include "confdefs.h" + #include <ctype.h> ++#include <stdlib.h> + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') + #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +@@ -2477,7 +2478,7 @@ for ac_kw in inline __inline__ __inline; do + #include "confdefs.h" + + int main() { +-} $ac_kw foo() { ++} int $ac_kw foo() { + ; return 0; } + EOF + if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +@@ -2855,13 +2856,14 @@ else + cat > conftest.$ac_ext <<EOF + #line 2857 "configure" + #include "confdefs.h" ++#include <unistd.h> + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ + #include <assert.h> + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char $ac_func(); ++int $ac_func(); + + int main() { + +@@ -2934,14 +2936,13 @@ else + * does it exist and is it safe to write into the mmap'd area + * how to use it (BSD variants) */ + #include <sys/types.h> ++#include <sys/stat.h> + #include <fcntl.h> + #include <sys/mman.h> ++#include <stdlib.h> ++#include <unistd.h> + +-/* This mess was copied from the GNU getpagesize.h. */ + #ifndef HAVE_GETPAGESIZE +-# ifdef HAVE_UNISTD_H +-# include <unistd.h> +-# endif + + /* Assume that all systems that can run configure have sys/param.h. */ + # ifndef HAVE_SYS_PARAM_H +@@ -2981,7 +2982,7 @@ else + #ifdef __cplusplus + extern "C" { void *malloc(unsigned); } + #else +-char *malloc(); ++void *malloc(); + #endif + + int diff --git a/x11-misc/xsetleds/metadata.xml b/x11-misc/xsetleds/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xsetleds/metadata.xml +++ b/x11-misc/xsetleds/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild deleted file mode 100644 index 2da7811b8e48..000000000000 --- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="small tool to report and change the keyboard LED states of an X display" -HOMEPAGE="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/" -SRC_URI="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc sparc x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXtst -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-assignment.patch \ - "${FILESDIR}"/${P}-isalpha.patch - tc-export CC -} - -DOCS=( AUTHORS ChangeLog README TODO ) diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild index cd140527393c..5a8da903b1c3 100644 --- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild +++ b/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs -DESCRIPTION="small tool to report and change the keyboard LED states of an X display" +DESCRIPTION="Small tool to report and change the keyboard LED states of an X display" HOMEPAGE="https://github.com/bmeurer/xsetleds" SRC_URI=" ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz - https://dev.gentoo.org/~jer/${P}.tar.gz + https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz " LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86" RDEPEND=" x11-libs/libX11 @@ -23,14 +24,15 @@ DEPEND=" ${RDEPEND} x11-base/xorg-proto " + PATCHES=( "${FILESDIR}"/${P}-assignment.patch "${FILESDIR}"/${P}-isalpha.patch + "${FILESDIR}"/${P}-configure-implicit-function-decl.patch ) -src_prepare() { - default +src_configure() { tc-export CC -} -DOCS=( AUTHORS ChangeLog README TODO ) + default +} diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest new file mode 100644 index 000000000000..8ec01e0af78e --- /dev/null +++ b/x11-misc/xsettingsd/Manifest @@ -0,0 +1 @@ +DIST xsettingsd-1.0.2.tar.gz 22481 BLAKE2B 1f7e8112b8910ea20492109ebc2df90d7113804653d5758bbac2b52116e737505026ddd0e17b5444951ad83606ba41495ce8e165bbe04573c740cc3faee75c1b SHA512 da2a82d0b3f5061a1fad7632d800539f4e81bd3f8631dd724705d0601556c044c62da7469a974cbe8f6d8e070247493ac5776bac966cf36f1fae825562457baa diff --git a/x11-misc/xsettingsd/metadata.xml b/x11-misc/xsettingsd/metadata.xml new file mode 100644 index 000000000000..c73224cc9ad9 --- /dev/null +++ b/x11-misc/xsettingsd/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <remote-id type="github">derat/xsettingsd</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild new file mode 100644 index 000000000000..f60d3ec97eaa --- /dev/null +++ b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Provides settings to X11 applications via the XSETTINGS specification" +HOMEPAGE="https://github.com/derat/xsettingsd" +SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test) + $(cmake_use_find_package test GTest) + ) + cmake_src_configure +} diff --git a/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch b/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch new file mode 100644 index 000000000000..9b51bcb33e5b --- /dev/null +++ b/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/870811 +--- a/xsnap.c ++++ b/xsnap.c +@@ -150,2 +150,3 @@ + Window win; ++int init_cursor; + { +@@ -1706,3 +1707,3 @@ + static Window win0 = None; +- static w0 = 0, h0 = 0; ++ static int w0 = 0, h0 = 0; + int i, j, d, w, h; +@@ -2254,3 +2255,3 @@ + if (op_mode == 0) +- exitXsnap (NULL, NULL, snap_pixmap, copy_gc); ++ exitXsnap ((Window)0, (Window)0, snap_pixmap, copy_gc); + diff --git a/x11-misc/xsnap/metadata.xml b/x11-misc/xsnap/metadata.xml index bc1b97e1eb76..02ab588d0b09 100644 --- a/x11-misc/xsnap/metadata.xml +++ b/x11-misc/xsnap/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild deleted file mode 100644 index 920e4a2ffcc9..000000000000 --- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen" -HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/" -SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" -IUSE="" - -COMMON_DEPEND=" - media-libs/libpng:0 - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXpm -" -RDEPEND=" - ${COMMON_DEPEND} - media-fonts/font-misc-misc -" -DEPEND=" - ${COMMON_DEPEND} - app-text/rman - dev-lang/perl - x11-base/xorg-proto - x11-misc/imake -" -DOCS=( AUTHORS Changelog README ) -PATCHES=( "${FILESDIR}"/${P}-root_name.patch ) - -src_prepare() { - default - - sed -i \ - -e 's|/usr/share/locale|$(LOCALEDIR)|g' \ - -e 's|/usr/share/man/man1|$(MANDIR)|g' \ - -e '/cd po.*install/s|cd.*|$(MAKE) -C po LOCALEDIR=$(LOCALEDIR) install|' \ - -e '21s|.*|LOCALEDIR = /usr/share/locale|' \ - Imakefile || die - sed -i \ - -e '/^LOCALEDIR=/d' \ - po/Makefile || die - - xmkmf || die - - sed -i \ - -e '/ CC = /d' \ - -e '/ LD = /d' \ - -e '/ CDEBUGFLAGS = /d' \ - -e '/ CCOPTIONS = /d' \ - -e 's|CPP = cpp|CPP = $(CC)|g' \ - Makefile || die -} - -src_compile() { - tc-export CC - emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - default - find "${ED}" -name '*.1.gz' -exec gunzip {} \; || die -} diff --git a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild index f8f3dd11c404..c68de841d51c 100644 --- a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild +++ b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit toolchain-funcs +EAPI=8 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen" HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/" @@ -11,29 +12,30 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux" -IUSE="" COMMON_DEPEND=" - media-libs/libpng:0 - virtual/jpeg:0 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-libs/zlib:= x11-libs/libX11 x11-libs/libXft - x11-libs/libXpm -" + x11-libs/libXpm" RDEPEND=" ${COMMON_DEPEND} - media-fonts/font-misc-misc -" + media-fonts/font-misc-misc" DEPEND=" ${COMMON_DEPEND} + x11-base/xorg-proto" +BDEPEND=" app-text/rman dev-lang/perl - x11-base/xorg-proto - x11-misc/imake -" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" -DOCS=( AUTHORS Changelog README ) -PATCHES=( "${FILESDIR}"/${P}-root_name.patch ) +PATCHES=( + "${FILESDIR}"/${P}-root_name.patch + "${FILESDIR}"/${P}-clang.patch +) src_prepare() { default @@ -47,19 +49,24 @@ src_prepare() { sed -i \ -e '/^LOCALEDIR=/d' \ po/Makefile || die +} - xmkmf || die +src_configure() { + append-cflags -std=gnu89 # old codebase, incompatible with c2x - sed -i \ - -e '/ CC = /d' \ - -e '/ LD = /d' \ - -e '/ CDEBUGFLAGS = /d' \ - -e '/ CCOPTIONS = /d' \ - -e 's|CPP = cpp|CPP = $(CC)|g' \ - Makefile || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_compile() { - tc-export CC - emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" + emake \ + CC="$(tc-getCC)" \ + CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.1.gz' -exec gunzip {} + || die } diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest index 63341784f64f..3052526a82de 100644 --- a/x11-misc/xsnow/Manifest +++ b/x11-misc/xsnow/Manifest @@ -1 +1,4 @@ -DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257 +DIST xsnow-3.3.0.tar.gz 405967 BLAKE2B d2b6d87b781c894c09157ff2f06389d0b1cf401eff735b812ec324560d295195c5afaa3c9c755f569f10f4ff4cd9738dbcc393044dbdebc13454bfeb8e1a9065 SHA512 b2674039ed26c5788a137cf44396b18f07458e926ea0552034d2c78cefaeaffce35ef42f2da386ee48b8b4d8f98960a4a31edfcf737c6d269485785699f9227a +DIST xsnow-3.6.0.tar.gz 495875 BLAKE2B 9ebc87254ce81b7fd051bbc0170faa7198390679a8dbaccdfa3674b1f584ad298fa73506b7eb8ff63fe04f168ebafcd30bc2101510c4e912e029edefe4813c65 SHA512 e2684e6d011a8add8819e16b6b649f8d501525c41a4baa0ef32d90b7603e30910a77093c2d21f52a7adb72f0ba18076f9265557e70dc246b365e0fd2b8ed4ab1 +DIST xsnow-3.7.4.tar.gz 1381177 BLAKE2B 7ebc5bf2c64ddfebf1167fd6ceb29ed52f88273bccc4d8f679d102573bbd55f5da0c3b1c01a3157a4de515d1301451ada24539555c31afd5fc015228c35a0dd4 SHA512 ac58a7ea63126d61a8f01d06422db8f12b31d23ff2edf03967f4a12e146e2d5934a24643d8487e35f6f99d35ffcf188cbaafae49d587e6ffe5019f1476358663 +DIST xsnow-3.7.5.tar.gz 1375177 BLAKE2B 7ee2100abcff7d5224315f0fe1ce906c0d1cc24f0e695e3d3914d5eb58f50ab39c0d8e2dc89185c887175a018c3732ef3c943c3184fb10b87106105612bb37bb SHA512 68683d0de9380d990580049b300f326bd9ee6a3debbc3cb0323a21a26a2eda07e6475596070a7cbe8946074b781bc3b374ec3a5fdd587b851d9cdf55d768bffb diff --git a/x11-misc/xsnow/files/xsnow-3.0.7-gamesdir.patch b/x11-misc/xsnow/files/xsnow-3.0.7-gamesdir.patch new file mode 100644 index 000000000000..9272ad83ab47 --- /dev/null +++ b/x11-misc/xsnow/files/xsnow-3.0.7-gamesdir.patch @@ -0,0 +1,12 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -19,8 +19,7 @@ + #-# + SUBDIRS = Pixmaps + +-gamesdir = $(exec_prefix)/games +-games_PROGRAMS = xsnow ++bin_PROGRAMS = xsnow + + xsnow_CPPFLAGS = $(XML_CFLAGS) $(GTK_CFLAGS) $(DBUS_CFLAGS) -DUSE_LIST_NODE_ALLOCATOR + xsnow_LDADD = $(XML_LIBS) $(GTK_LIBS) $(DBUS_LIBS) diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml index 2ba8e9e851e4..cb3f92949549 100644 --- a/x11-misc/xsnow/metadata.xml +++ b/x11-misc/xsnow/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>dilfridge@gentoo.org</email> </maintainer> + <upstream> + <remote-id type='sourceforge'>xsnow</remote-id> + <changelog>https://www.ratrabbit.nl/ratrabbit/xsnow/changelog/</changelog> + </upstream> </pkgmetadata> diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild deleted file mode 100644 index 2ccf2f3dc660..000000000000 --- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="let it snow on your desktop and windows" -HOMEPAGE="https://janswaal.home.xs4all.nl/Xsnow/" -SRC_URI="https://janswaal.home.xs4all.nl/Xsnow/${P}.tar.gz" - -LICENSE="freedist" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext - x11-libs/libXpm -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/imake - x11-misc/gccmakedep -" - -src_compile() { - xmkmf || die - make depend || die - emake \ - CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" \ - LOCAL_LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin xsnow - rman -f HTML < xsnow._man > xsnow.1-html || die - newman xsnow._man xsnow.1 - newdoc xsnow.1-html xsnow.1.html - dodoc README -} diff --git a/x11-misc/xsnow/xsnow-3.3.0.ebuild b/x11-misc/xsnow/xsnow-3.3.0.ebuild new file mode 100644 index 000000000000..bfecc6ddf15c --- /dev/null +++ b/x11-misc/xsnow/xsnow-3.3.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools xdg + +DESCRIPTION="let it snow on your desktop and windows" +HOMEPAGE="https://janswaal.home.xs4all.nl/Xsnow/ https://sourceforge.net/projects/xsnow/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" + +LICENSE="freedist" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc ~x86" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 + sys-apps/dbus + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXpm +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.7-gamesdir.patch +) + +src_prepare() { + default + eautoreconf +} diff --git a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild new file mode 100644 index 000000000000..ff9e83c41410 --- /dev/null +++ b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools xdg + +DESCRIPTION="let it snow on your desktop and windows" +HOMEPAGE="https://www.ratrabbit.nl/ratrabbit/xsnow/" +SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz" + +LICENSE="freedist" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc ~x86" + +RDEPEND=" + dev-libs/glib:2 + sci-libs/gsl:= + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXtst + x11-libs/libxkbcommon +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.7-gamesdir.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + # Install xscreensaver hack, which calls xsnow with the correct + # arguments. xscreensaver calls all hacks with --root, however xsnow + # only understands -root and will exit with an error if an unknown + # argument (--root) is provided. + exeinto usr/$(get_libdir)/misc/xscreensaver + newexe - xsnow <<-EOF + #/usr/bin/env bash + exec "${EPREFIX}/usr/bin/xsnow" -nomenu -root +EOF +} diff --git a/x11-misc/xsnow/xsnow-3.7.4.ebuild b/x11-misc/xsnow/xsnow-3.7.4.ebuild new file mode 100644 index 000000000000..27ff71302c85 --- /dev/null +++ b/x11-misc/xsnow/xsnow-3.7.4.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools xdg + +DESCRIPTION="let it snow on your desktop and windows" +HOMEPAGE="https://www.ratrabbit.nl/ratrabbit/xsnow/" +SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz" + +LICENSE="freedist" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + dev-libs/glib:2 + sci-libs/gsl:= + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXtst + x11-libs/libxkbcommon +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.7-gamesdir.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + # Install xscreensaver hack, which calls xsnow with the correct + # arguments. xscreensaver calls all hacks with --root, however xsnow + # only understands -root and will exit with an error if an unknown + # argument (--root) is provided. + exeinto usr/$(get_libdir)/misc/xscreensaver + newexe - xsnow <<-EOF + #/usr/bin/env bash + exec "${EPREFIX}/usr/bin/xsnow" -nomenu -root +EOF +} diff --git a/x11-misc/xsnow/xsnow-3.7.5.ebuild b/x11-misc/xsnow/xsnow-3.7.5.ebuild new file mode 100644 index 000000000000..27ff71302c85 --- /dev/null +++ b/x11-misc/xsnow/xsnow-3.7.5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools xdg + +DESCRIPTION="let it snow on your desktop and windows" +HOMEPAGE="https://www.ratrabbit.nl/ratrabbit/xsnow/" +SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz" + +LICENSE="freedist" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND=" + dev-libs/glib:2 + sci-libs/gsl:= + sys-apps/dbus + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXtst + x11-libs/libxkbcommon +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.7-gamesdir.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + + # Install xscreensaver hack, which calls xsnow with the correct + # arguments. xscreensaver calls all hacks with --root, however xsnow + # only understands -root and will exit with an error if an unknown + # argument (--root) is provided. + exeinto usr/$(get_libdir)/misc/xscreensaver + newexe - xsnow <<-EOF + #/usr/bin/env bash + exec "${EPREFIX}/usr/bin/xsnow" -nomenu -root +EOF +} diff --git a/x11-misc/xsr/metadata.xml b/x11-misc/xsr/metadata.xml index c2e7935c2eab..8ce0e4c35db4 100644 --- a/x11-misc/xsr/metadata.xml +++ b/x11-misc/xsr/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>lezsakdomi1@gmail.com</email> <name>Domonkos Lezsák</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> 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/xsri/metadata.xml b/x11-misc/xsri/metadata.xml index 49c86a887b6a..3ab9b4a739d3 100644 --- a/x11-misc/xsri/metadata.xml +++ b/x11-misc/xsri/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xsri/xsri-2.1.0-r3.ebuild b/x11-misc/xsri/xsri-2.1.0-r3.ebuild deleted file mode 100644 index d0b56abeec3b..000000000000 --- a/x11-misc/xsri/xsri-2.1.0-r3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils rpm - -DESCRIPTION="The xsri wallpaper setter from RedHat" -HOMEPAGE="http://fedoraproject.org" -SRC_URI="http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/source/SRPMS/${P}-17.fc12.src.rpm" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${P}-configure.patch - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS README - doman ../${PN}.1 -} diff --git a/x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild b/x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild index c72349d5799a..194324e6fe55 100644 --- a/x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild +++ b/x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools eutils rpm +inherit autotools rpm DESCRIPTION="The xsri wallpaper setter from RedHat" HOMEPAGE="https://fedoraproject.org" @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xss-lock/metadata.xml b/x11-misc/xss-lock/metadata.xml index aa62c530159e..7bc558c06d3c 100644 --- a/x11-misc/xss-lock/metadata.xml +++ b/x11-misc/xss-lock/metadata.xml @@ -1,21 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>sir.suriv@gmail.com</email> - <name>Diogo Pereira</name> -</maintainer> -<maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> -</maintainer> +<!-- maintainer-needed --> <longdescription lang="en"> xss-lock hooks up your favorite locker to the MIT screen saver extension for X and also to systemd's login manager. </longdescription> -<use> - <flag name="man">Build and install man pages</flag> -</use> <upstream> <maintainer status="inactive"> <email>raymondwagenmaker@gmail.com</email> diff --git a/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild b/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild deleted file mode 100644 index 5beaf9edeacf..000000000000 --- a/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils vcs-snapshot - -DESCRIPTION="Use external locker as X screen saver" -HOMEPAGE="https://bitbucket.org/raymonad/xss-lock" -SRC_URI="https://bitbucket.org/raymonad/xss-lock/get/1e158fb20108058dbd62bd51d8e8c003c0a48717.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+man" - -RDEPEND="dev-libs/glib:2 - x11-libs/libxcb - x11-libs/xcb-util" -DEPEND="${RDEPEND} - man? ( dev-python/docutils )" - -src_install() { - cmake-utils_src_install - - dodoc -r "${ED%/}/usr/share/doc/${PN}/." - rm -r "${ED%/}/usr/share/doc/${PN}" || die -} diff --git a/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r2.ebuild b/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r2.ebuild new file mode 100644 index 000000000000..a8dc3542b071 --- /dev/null +++ b/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake vcs-snapshot + +MY_COMMIT="1e158fb20108058dbd62bd51d8e8c003c0a48717" +DESCRIPTION="Use external locker as X screen saver" +HOMEPAGE="https://bitbucket.org/raymonad/xss-lock" +SRC_URI="https://bitbucket.org/raymonad/xss-lock/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="+man" + +RDEPEND="dev-libs/glib:2 + x11-libs/libxcb + x11-libs/xcb-util" +DEPEND="${RDEPEND}" +BDEPEND="man? ( dev-python/docutils )" + +src_install() { + cmake_src_install + + dodoc -r "${ED}"/usr/share/doc/${PN}/. + rm -r "${ED}"/usr/share/doc/${PN} || die +} diff --git a/x11-misc/xssstate/files/xssstate-1.1-libdir.patch b/x11-misc/xssstate/files/xssstate-1.1-libdir.patch new file mode 100644 index 000000000000..cedde569f12b --- /dev/null +++ b/x11-misc/xssstate/files/xssstate-1.1-libdir.patch @@ -0,0 +1,23 @@ +Bug: https://bugs.gentoo.org/732450 +Upstream-Commit: https://git.suckless.org/xssstate/commit/5d8e9b49ce2970f786f1e5aa12bbaae83900453f.html + +From: orbea <orbea@riseup.net> +Date: Fri, 23 Sep 2022 21:17:01 -0700 +Subject: [PATCH] config.mk: Add LIBDIR + +--- a/config.mk ++++ b/config.mk +@@ -5,11 +5,12 @@ VERSION = 1.1 + + # paths + PREFIX = /usr/local ++LIBDIR = ${PREFIX}/lib + MANPREFIX = ${PREFIX}/share/man + + # includes and libs + INCS = -I. -I/usr/include +-LIBS = -L/usr/lib -lc -lX11 -lXss ++LIBS = -L${LIBDIR} -lc -lX11 -lXss + + # flags + CPPFLAGS = -DVERSION=\"${VERSION}\" diff --git a/x11-misc/xssstate/metadata.xml b/x11-misc/xssstate/metadata.xml index 229dd61feac9..8a473e90e026 100644 --- a/x11-misc/xssstate/metadata.xml +++ b/x11-misc/xssstate/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> -<email>jer@gentoo.org</email> -<name>Jeroen Roovers</name> -</maintainer> -<maintainer type="project"> -<email>desktop-misc@gentoo.org</email> -<name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/xssstate/xssstate-1.1-r1.ebuild b/x11-misc/xssstate/xssstate-1.1-r1.ebuild new file mode 100644 index 000000000000..a28494199a22 --- /dev/null +++ b/x11-misc/xssstate/xssstate-1.1-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A simple tool to retrieve the X screensaver state" +HOMEPAGE="https://tools.suckless.org/x/xssstate" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXScrnSaver +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.20130103-gentoo.patch + "${FILESDIR}"/${PN}-1.1-libdir.patch #732450 +) + +src_compile() { + emake CC="$(tc-getCC)" LIBDIR="${EPREFIX}/usr/$(get_libdir)" +} + +src_install() { + emake install \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}"/usr \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" + + dodoc README xsidle.sh + doman ${PN}.1 +} diff --git a/x11-misc/xssstate/xssstate-1.1.ebuild b/x11-misc/xssstate/xssstate-1.1.ebuild index 311c55ab00f7..384b74fe4fa3 100644 --- a/x11-misc/xssstate/xssstate-1.1.ebuild +++ b/x11-misc/xssstate/xssstate-1.1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="A simple tool to retrieve the X screensaver state" HOMEPAGE="https://tools.suckless.org/x/xssstate" @@ -10,8 +11,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" RDEPEND=" x11-libs/libX11 @@ -22,8 +22,13 @@ DEPEND=" x11-base/xorg-proto " +PATCHES=( + "${FILESDIR}"/${PN}-1.0.20130103-gentoo.patch +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.20130103-gentoo.patch + default + tc-export CC } diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest deleted file mode 100644 index 9053cdd5b36b..000000000000 --- a/x11-misc/xstroke/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xstroke-0.6.tar.bz2 140237 BLAKE2B 0419c0375e8579d758730d129c2d2db0de8ecc2f0c73a026b08db8e18818dc2c4d1c4ffff6e9794c48bd645176decbce2e477e182cf78402fc859234438266a3 SHA512 0fb75f20dfcb8db68bb17d50a9dea2906e17ee1d8675bb7b4dea964189aa69c8bfcc101d7e7fac22209da3f83fc0d0afd569d443d3f585bffa2d62ce11ad772a diff --git a/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch b/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch deleted file mode 100644 index b36958849f53..000000000000 --- a/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nru xstroke-0.6.vanilla/sprintf_alloc.c xstroke-0.6/sprintf_alloc.c ---- xstroke-0.6.vanilla/sprintf_alloc.c 2005-11-26 01:55:32.000000000 +0100 -+++ xstroke-0.6/sprintf_alloc.c 2005-11-26 01:55:55.000000000 +0100 -@@ -74,7 +74,8 @@ - { - char *new_str; - /* Guess we need no more than 100 bytes. */ -- int n, size = 100; -+ /* yeah... right... */ -+ int n, size = 512; - - if ((*str = malloc (size)) == NULL) - return -1; diff --git a/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch b/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch deleted file mode 100644 index 52b39ddf4512..000000000000 --- a/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -40,7 +40,7 @@ - BUILT_SOURCES = rec_parse.h rec_lex.h rec_lex.c - AM_YFLAGS = -d - --xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst -+xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst -lX11 -lXrender -lXext -ldl - AM_CFLAGS = @XSTROKE_CFLAGS@ -DXSTROKE_CONF_DIR='"$(sysconfdir)/xstroke"' $(X_CFLAGS) - - EXTRA_DIST = xstroke_active.xpm xstroke_inactive.xpm etc/alphabet diff --git a/x11-misc/xstroke/metadata.xml b/x11-misc/xstroke/metadata.xml deleted file mode 100644 index 4150784c3af2..000000000000 --- a/x11-misc/xstroke/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="freshmeat">xstroke</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild deleted file mode 100644 index 3f141748d23d..000000000000 --- a/x11-misc/xstroke/xstroke-0.6-r1.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 - -inherit autotools - -DESCRIPTION="Gesture/Handwriting recognition engine for X" -HOMEPAGE="http://freshmeat.net/projects/xstroke/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~mips ppc sparc x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXtst" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - sys-devel/flex - virtual/pkgconfig - virtual/yacc" - -PATCHES=( - "${FILESDIR}"/${P}-sigsegv_sprintf.patch - "${FILESDIR}"/${P}-underlinking.patch -) - -src_prepare() { - default - eautoreconf -} diff --git a/x11-misc/xteddy/metadata.xml b/x11-misc/xteddy/metadata.xml index c030175dcef1..f975f9979790 100644 --- a/x11-misc/xteddy/metadata.xml +++ b/x11-misc/xteddy/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person"> + <email>dilfridge@gentoo.org</email> </maintainer> <longdescription lang="en"> Normally, xteddy just sits around doing nothing. After all, that's what diff --git a/x11-misc/xteddy/xteddy-2.2.ebuild b/x11-misc/xteddy/xteddy-2.2.ebuild index 5924af617562..32e5717252ec 100644 --- a/x11-misc/xteddy/xteddy-2.2.ebuild +++ b/x11-misc/xteddy/xteddy-2.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 +inherit autotools DESCRIPTION="A cuddly teddy bear (or other image) for your X desktop" HOMEPAGE="http://webstaff.itn.liu.se/~stegu/xteddy/" @@ -16,14 +16,17 @@ IUSE="" RDEPEND="media-libs/imlib2[X,png] x11-libs/libX11 x11-libs/libXext" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS README ChangeLog NEWS xteddy.README ) -src_prepare() { - epatch "${FILESDIR}"/${P}-linking.patch +PATCHES=( + "${FILESDIR}"/${P}-linking.patch +) +src_prepare() { + default # Fix paths in xtoys script wrt bug #404899 sed -i -e "s:/usr/games:/usr/bin:" xtoys || die eautoreconf diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest index 8b49bf2d552b..1cbda4530a73 100644 --- a/x11-misc/xtermcontrol/Manifest +++ b/x11-misc/xtermcontrol/Manifest @@ -1 +1 @@ -DIST xtermcontrol-3.7.tar.gz 151984 BLAKE2B 246b17e0b38540cfe022321129d76ae196c8d0b50b2a2fffbb523029321c5e8fde093fc5af16e5a550fc39eb2fcaf1fca4882de2948c45397c9bd4a9a11a06cb SHA512 b23da5dd07ea8fc59717752e937cffb36038870f3ad486d43b8d0477826916255ae8f00f894293efb2dead46ff9122c7e27200d5fc15b7bd91d9df1b649e2081 +DIST xtermcontrol-3.8.tar.gz 181399 BLAKE2B b65acd8ecdf6e0293fcd856cd05f7a3c2eaf868f6f7e0ea34829fbfece4e2a17c2085042e6eeb50a20504200db754badde8ffba0305358547d5f65cf18df564c SHA512 9dacddc57c31705d00f52753f906cd83ae4b7ae34ff2e712869becc452535dbce9fb3e0e9aaf689b55edd34889d9e37553e3702c26ccbd136f544016fcfedbf1 diff --git a/x11-misc/xtermcontrol/metadata.xml b/x11-misc/xtermcontrol/metadata.xml index d2f71679d389..07b403500c24 100644 --- a/x11-misc/xtermcontrol/metadata.xml +++ b/x11-misc/xtermcontrol/metadata.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<longdescription> -xtermcontrol enables dynamic control of xterm properties. -It makes it easy to change colors, title, font and geometry of a running xterm, -as well as to report the current settings of the aforementioned properties. -Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported. -To complete the feature set; xtermcontrol lets advanced users issue any xterm control -sequence of their choosing. -</longdescription> + <maintainer type="project"> + <email>x11@gentoo.org</email> + <name>X11</name> + </maintainer> + <longdescription> + xtermcontrol enables dynamic control of xterm properties. + It makes it easy to change colors, title, font and geometry of a running xterm, + as well as to report the current settings of the aforementioned properties. + Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported. + To complete the feature set; xtermcontrol lets advanced users issue any xterm control + sequence of their choosing. + </longdescription> + <upstream> + <remote-id type="github">JessThrysoee/xtermcontrol</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild index 857f12bcce57..5a84b2b84a63 100644 --- a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild +++ b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,4 +10,3 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86" -IUSE="" diff --git a/x11-misc/xtitle/metadata.xml b/x11-misc/xtitle/metadata.xml index 6698a4ab7883..115e9d64a669 100644 --- a/x11-misc/xtitle/metadata.xml +++ b/x11-misc/xtitle/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xtitle/xtitle-1.0.4.ebuild b/x11-misc/xtitle/xtitle-1.0.4.ebuild index c5e8c66d85a6..eb54d4f2901c 100644 --- a/x11-misc/xtitle/xtitle-1.0.4.ebuild +++ b/x11-misc/xtitle/xtitle-1.0.4.ebuild @@ -1,29 +1,32 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit toolchain-funcs DESCRIPTION="Set window title and icon name for an X11 terminal window" HOMEPAGE="https://kinzler.com/me/xtitle/" -SRC_URI="https://kinzler.com/me/${PN}/${P}.tgz" +SRC_URI="https://kinzler.com/me/xtitle/${P}.tgz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" -DEPEND="x11-misc/imake" -RDEPEND="" +BDEPEND=" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" HTML_DOCS=( xtitle.html ) -src_compile() { - xmkmf || die - emake +src_configure() { + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_install() { default + newman "${PN}.man" "${PN}.1" einstalldocs } diff --git a/x11-misc/xtoolwait/metadata.xml b/x11-misc/xtoolwait/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xtoolwait/metadata.xml +++ b/x11-misc/xtoolwait/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild index 386962ee9765..c8cafd651d2c 100644 --- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild +++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Xtoolwait notably decreases the startup time of an X session" HOMEPAGE="http://ftp.x.org/contrib/utilities/xtoolwait-1.3.README" @@ -16,23 +16,25 @@ KEYWORDS="amd64 ppc x86" RDEPEND=" x11-libs/libX11 x11-libs/libXext" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} x11-base/xorg-proto" BDEPEND=" app-text/rman - x11-misc/imake" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" src_configure() { - xmkmf || die - sed -i \ - -e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \ - Makefile || die + append-cflags -std=gnu89 # old codebase, incompatible with c2x + + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_compile() { emake \ CC="$(tc-getCC)" \ - CCOPTIONS="${CFLAGS}" \ + CDEBUGFLAGS="${CFLAGS}" \ EXTRA_LDOPTIONS="${LDFLAGS}" } diff --git a/x11-misc/xtrace/metadata.xml b/x11-misc/xtrace/metadata.xml index 867145a2f0fb..bef24d2c2337 100644 --- a/x11-misc/xtrace/metadata.xml +++ b/x11-misc/xtrace/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest index dc098a88c16a..64921ab0b771 100644 --- a/x11-misc/xtrlock/Manifest +++ b/x11-misc/xtrlock/Manifest @@ -1,2 +1 @@ -DIST xtrlock_2.12.tar.xz 20620 BLAKE2B d40599f5fec67b8e89f1028dafc929a9b21d6ae1f6e094658d07859e7f74e4686d338e1e03393f9981a62030839969b57493a8655e225b963df8dc04cf6b62f6 SHA512 8392a8c254726e99d2324415bfdac6e577f725942d4e7fd39c915637f87814f1737aefa903a1502632272cabbb10182070dc15ec5d3e5268c9c1b53218d00f36 DIST xtrlock_2.13.tar.xz 21156 BLAKE2B 879c27936cf8058707cbdb2247e1044c8c5eadf74dcb2bcfd5ec8f4b2bab80da6859118e48943de97f7696e41456771bf274b03728a61f5ac6bef8b471192dce SHA512 656e1e77194b816b04260a88c8046b8ef25d6df0405de6fe1ee1dfb2ebfa528a329c1b67be70eaac5ce4ee6a4159d728d363bf8a59232941b76b1e6d14aa91aa diff --git a/x11-misc/xtrlock/metadata.xml b/x11-misc/xtrlock/metadata.xml index 66187a0f4213..d3e0f4631255 100644 --- a/x11-misc/xtrlock/metadata.xml +++ b/x11-misc/xtrlock/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xtrlock/xtrlock-2.12.ebuild b/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild index d7bea7933844..fef71c7cb75b 100644 --- a/x11-misc/xtrlock/xtrlock-2.12.ebuild +++ b/x11-misc/xtrlock/xtrlock-2.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,16 +13,21 @@ LICENSE="GPL-3" KEYWORDS="amd64 ppc x86" RDEPEND=" - x11-libs/libX11 -" + virtual/libcrypt:= + x11-libs/libX11" DEPEND=" ${RDEPEND} - x11-base/xorg-proto - x11-misc/imake -" + x11-base/xorg-proto" +BDEPEND=" + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" + +src_configure() { + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die +} src_compile() { - xmkmf || die emake CDEBUGFLAGS="${CFLAGS} -DSHADOW_PWD" CC="$(tc-getCC)" \ EXTRA_LDOPTIONS="${LDFLAGS}" xtrlock } diff --git a/x11-misc/xtrlock/xtrlock-2.13.ebuild b/x11-misc/xtrlock/xtrlock-2.13.ebuild deleted file mode 100644 index 87544effb0d1..000000000000 --- a/x11-misc/xtrlock/xtrlock-2.13.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="A simplistic screen locking program for X" -HOMEPAGE="http://ftp.debian.org/debian/pool/main/x/xtrlock/" -SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.xz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND=" - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - x11-misc/imake -" - -src_compile() { - xmkmf || die - emake CDEBUGFLAGS="${CFLAGS} -DSHADOW_PWD" CC="$(tc-getCC)" \ - EXTRA_LDOPTIONS="${LDFLAGS}" xtrlock -} - -src_install() { - dobin xtrlock - chmod u+s "${D}"/usr/bin/xtrlock - newman xtrlock.man xtrlock.1 - dodoc debian/changelog -} diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest index f02c154f6737..db0f9bc3d488 100644 --- a/x11-misc/xvfb-run/Manifest +++ b/x11-misc/xvfb-run/Manifest @@ -1,3 +1,4 @@ -DIST xorg-server_1.18.4-2.diff.gz 189089 BLAKE2B fa5270bb760a60fe0234a630afd55eb091a6637c696f26ba82427d8e305dbf634966c4ee5b230bab0205b48b490f810dd9838e4c26c5f11f0a7f5ed16732c904 SHA512 d76e2471a29a1fdc7a65aeb724f1d449ab58e9380acb7c0811d8d3d9962618205943b50c7a684bfc6b6432afe2521ae98356662a5437c78e7e3dd075d872248c -DIST xorg-server_1.19.3-2.diff.gz 139662 BLAKE2B b88708c4358a121a6f7bd099b15711b10fd9b08c163fd12e9340c83234746ab47da695f40cf35f7b91caac1480c64364ade46b9753cdace9594c4591646bae3e SHA512 6e030aa132da920092e8b0ed9b414ec883878b84106964ba002e086f9beec821be0cd7a54f5647ca5c54b09198123d6210b8d5620e3fd68369b59cf818be4f85 -DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7 +DIST xorg-server_21.1.10-1.diff.gz 168382 BLAKE2B ef41295c9f45836b99aa09f2bea632ff909796538d5f6adb42db78b7b57a4ff41ad997657923820d4c703f21ab43ad2f83998391d8090b30717c600ddf7b8162 SHA512 417b5dcc167b5b066802e70754817aa0c8b22294c779084fca0ca85d0ca926b5b59b633adb2794f31715ff6c36677ea61cb4c7ebd4f32f97471d9257f327c8fb +DIST xorg-server_21.1.11-2.diff.gz 169271 BLAKE2B 79318e2395e60c2deebaa456e5b43ae3a0f095ddd3e9ff179d9861d48166823e4ed4356ae60fafc8e7703ab10bade80d8fed773f636e0d2355f241d8e31ff809 SHA512 42a782544e674e0ae0b95093d65c0b66224ab12cdf08e47eff1f605d1f8bf149dcdc6267f29748823b529a045b6f994c6f6614ff38811fe6c25d6c7c6640cb40 +DIST xorg-server_21.1.12-1.diff.gz 169446 BLAKE2B 3e56e2dd9c660c5107c2d2ea0e5a19a9d441ea556097fdb1af954c74f2c15a184d3f70c4b3482528cfbe323b3e37751dc3b8d05055a991f9e71d388d114e639c SHA512 05bf602379d220a4ece9308d64bf1c7f2be8ba597fe8c179cea62bfbfb2c36516e4d6ef2ea4374861c9550b55bb74dfe93dcc04fdb8eea8fbd6a4831b8db3edf +DIST xorg-server_21.1.7-1.diff.gz 168149 BLAKE2B 68011ab5d77efec6c42921c906ff1be4f7b3b2455025d5fb8f33270bddf02f1bd2c3fd0997b9ad356298d0ee4b8b2f1af6244b39281756259a737e3a5d7a6814 SHA512 433f8d19691f3d0f8bd04f4d8dbd201079da8503d4174d01894824b8239c032af35727e5502b4a2491d9975ba0c6ba6d55c504fbc23c0ca65cc7ba695594d143 diff --git a/x11-misc/xvfb-run/metadata.xml b/x11-misc/xvfb-run/metadata.xml index 6d2298876faa..6a22e9e318bb 100644 --- a/x11-misc/xvfb-run/metadata.xml +++ b/x11-misc/xvfb-run/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sping@gentoo.org</email> diff --git a/x11-misc/xvfb-run/xvfb-run-1.19.3_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild index e0b3fcee16fd..cc9e028b4a34 100644 --- a/x11-misc/xvfb-run/xvfb-run-1.19.3_p2.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild @@ -1,18 +1,17 @@ -# 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 MY_PN=xorg-server -MY_PV=${PV/_p/-} +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 ~x86" -IUSE="" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" DEPEND="dev-util/patchutils" RDEPEND="x11-apps/xauth diff --git a/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild index 3a1d8f874660..1191b6b39e1c 100644 --- a/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=8 MY_PN=xorg-server -MY_PV=${PV/_p/-} +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="http://snapshot.debian.org/archive/debian/20160906T162237Z/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz" +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 ~x86" -IUSE="" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" DEPEND="dev-util/patchutils" RDEPEND="x11-apps/xauth @@ -23,6 +22,7 @@ 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() { diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild new file mode 100644 index 000000000000..1191b6b39e1c --- /dev/null +++ b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=xorg-server +MY_PV="$(ver_cut 1-3)-$(ver_cut 4)" +DESCRIPTION="Run a command in a virtual X server environment" +HOMEPAGE="https://packages.debian.org/sid/xvfb" +SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + +DEPEND="dev-util/patchutils" +RDEPEND="x11-apps/xauth + x11-base/xorg-server[xvfb]" + +S="${WORKDIR}"/ + +src_prepare() { + # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + eapply_user +} + +src_install() { + doman ${PN}.1 + dobin ${PN} +} diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild index 8ea25a1deffa..b37ac978a797 100644 --- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.7.1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN=xorg-server -MY_PV=${PV/_p/-} +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 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND="dev-util/patchutils" diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest index f6e9dfcbe101..f6dee6944b1c 100644 --- a/x11-misc/xvkbd/Manifest +++ b/x11-misc/xvkbd/Manifest @@ -1,4 +1 @@ -DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385 -DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98 -DIST xvkbd-4.0.tar.gz 408256 BLAKE2B 12f18dc6af9636021a9a067528b9ee2387c43aec0d7a23e01e7e4979273ccfa1eae7752cd2814465da906eeada44a31ff70a3f00f030e87ff66db35e3f3c7f5a SHA512 17fe50b86974f21f1456c522cec107f42a8915fa4ffa60849e03d56a3eb8b600aba46becfde458799e30b073d435c60ee8b3b61d79f4c0d86575770cb4bfd951 DIST xvkbd-4.1.tar.gz 408704 BLAKE2B 45667706005f508e22dcd6d24631b5488ffd32b0bba2cb14e67ce1f77c5fdf3f667ca1431a0833e311bbffbc5baf08daed8ff736158c72178ae5d079f694d9d7 SHA512 6a27a659bacc0f78d70c0afab7ae0f6301f0e7f0c9ed12c581fb4fd5040791536aed50c82ccbd703377244156aade80136567276193f2789a23f05c341b6c0e9 diff --git a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch b/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch deleted file mode 100644 index 7fe70773acca..000000000000 --- a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xvkbd.c -+++ b/xvkbd.c -@@ -681,7 +681,7 @@ - } - } - -- last_altgr_mask = (altgr_mask | last_altgr_mask); -+ last_altgr_mask = altgr_mask; - alt_mask = 0; - meta_mask = 0; - altgr_mask = 0; diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch deleted file mode 100644 index 83879dd9fd02..000000000000 --- a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,4 @@ --appdefaultdir=$(shell pkg-config --variable=appdefaultdir xt) --datarootdir=$(shell pkg-config --variable=datarootdir xt) -+appdefaultdir = $(shell $(PKG_CONFIG) --variable=appdefaultdir xt) - - SUBDIRS = . - bin_PROGRAMS = xvkbd -@@ -17,11 +16,12 @@ - [ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h - - install-data-hook: -+ [ -d $(DESTDIR)/$(appdefaultdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(appdefaultdir)/xvkbd/ - for file in *.ad; do \ -- $(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \ -+ $(INSTALL_DATA) $$file $(DESTDIR)/$(appdefaultdir)/$${file%.ad}; \ - done -- [ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/ -- $(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english -+ [ -d $(DESTDIR)/$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(datarootdir)/xvkbd/ -+ $(INSTALL_DATA) words.english $(DESTDIR)/$(datarootdir)/xvkbd/words.english - - EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english - diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch deleted file mode 100644 index 1ca0db048566..000000000000 --- a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/resources.h -+++ b/resources.h -@@ -19,7 +19,7 @@ - # define PROGRAM_NAME "xvkbd" - #endif - --struct appres_struct { -+extern struct appres_struct { - String description; - String show_manual_command; - ---- a/xvkbd.c -+++ b/xvkbd.c -@@ -500,6 +500,8 @@ - - static Pixmap xvkbd_pixmap = None; - -+struct appres_struct appres; -+ - static int AddKeysym(KeySym keysym, Boolean top); /* forward */ - static void MakeKeyboard(Boolean remake); - static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz); diff --git a/x11-misc/xvkbd/metadata.xml b/x11-misc/xvkbd/metadata.xml index 2ba8e9e851e4..115e9d64a669 100644 --- a/x11-misc/xvkbd/metadata.xml +++ b/x11-misc/xvkbd/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild deleted file mode 100644 index 5be3cd228d62..000000000000 --- a/x11-misc/xvkbd/xvkbd-3.7.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils multilib toolchain-funcs - -DESCRIPTION="virtual keyboard for X window system" -HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/" -SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXaw3d - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXtst -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/gccmakedep - x11-misc/imake -" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch - - epatch_user -} - -src_configure() { - xmkmf -a || die -} - -src_compile() { - emake \ - CC=$(tc-getCC) LD=$(tc-getCC) \ - XAPPLOADDIR="/usr/share/X11/app-defaults" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - CDEBUGFLAGS="${CFLAGS}" -} - -src_install() { - emake \ - XAPPLOADDIR="/usr/share/X11/app-defaults" \ - DESTDIR="${D}" \ - install - - rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die - - dodoc README - newman ${PN}.man ${PN}.1 -} diff --git a/x11-misc/xvkbd/xvkbd-3.9.ebuild b/x11-misc/xvkbd/xvkbd-3.9.ebuild deleted file mode 100644 index 8b80572a63b9..000000000000 --- a/x11-misc/xvkbd/xvkbd-3.9.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib toolchain-funcs - -DESCRIPTION="virtual keyboard for X window system" -HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/" -SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXaw3d - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXtst -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/gccmakedep - x11-misc/imake -" -PATCHES=( - "${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch -) - -src_configure() { - xmkmf -a || die -} - -src_compile() { - emake \ - CC=$(tc-getCC) LD=$(tc-getCC) \ - XAPPLOADDIR="/usr/share/X11/app-defaults" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - CDEBUGFLAGS="${CFLAGS}" -} - -src_install() { - emake \ - XAPPLOADDIR="/usr/share/X11/app-defaults" \ - DESTDIR="${D}" \ - install - - rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die - - dodoc README - newman ${PN}.man ${PN}.1 -} diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild deleted file mode 100644 index 90be10d40308..000000000000 --- a/x11-misc/xvkbd/xvkbd-4.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="virtual keyboard for X window system" -HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/" -SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXaw3d - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXtst -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-4.0-destdir.patch - "${FILESDIR}"/${PN}-4.0-fno-common.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - dodir /usr/share/X11/app-defaults - - default - - dodoc ChangeLog README - newman ${PN}.man ${PN}.1 -} diff --git a/x11-misc/xvkbd/xvkbd-4.1.ebuild b/x11-misc/xvkbd/xvkbd-4.1.ebuild index a4291a7738c9..d9ba69c3cbc9 100644 --- a/x11-misc/xvkbd/xvkbd-4.1.ebuild +++ b/x11-misc/xvkbd/xvkbd-4.1.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 @@ -9,7 +9,7 @@ SRC_URI="http://t-sato.in.coocan.jp/xvkbd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest index 444bdd79b087..00c689ce1094 100644 --- a/x11-misc/xwallpaper/Manifest +++ b/x11-misc/xwallpaper/Manifest @@ -1,3 +1,2 @@ -DIST xwallpaper-0.6.2.tar.xz 82600 BLAKE2B 2e2b1121fcc2481c4a1e3c78e357534b9609b4435c4364f22dbed78ee0de7c671d2044403c22d22b494a9c89efd17d843f32b296c863df3c0f5d7b3673ae361f SHA512 3713038ffe8fe1da117dc64db6e3c8642fe663473d1e9078963890fa08f21af6ace60e08773e23e6025fcf2116563e24c76d07a66ba02537b38aafa9ac99f395 -DIST xwallpaper-0.6.4.tar.xz 82752 BLAKE2B e81a1a9ec56ffe0a1953f1186c945c9ebb143ff683b8c0c01b819506b79520738935d04725420a24b38119221cbb71d9a5562bffd03e03736c65ba7e3c6a1713 SHA512 531910957c44f7e5ce7357fa46737967f673aeca53868012211eb91507f78bd028f8d84fcbee6e1237107816a09f8247cd0445c0907b60792ff5d07416630d56 -DIST xwallpaper-0.6.5.tar.xz 82696 BLAKE2B 8c12bcce2a2eeb9580038b172b51284cc9fa851f01bef34e7cfeb13ccc05879f5443ef0b7fd39a4f0d5abcc399ec614db28f6f6db6847505855128348fd22d4b SHA512 99c911c6a4f7501101d85532cfb9956fa4affb57f7836e9216e5e0d873ed34c9e7d0a9983def442a4728a682a3351268905e22174dc9a14d003dc36c42ed9615 +DIST xwallpaper-0.7.3.tar.xz 86388 BLAKE2B 45942dbe7e3627fbbf99ac5ab94c88ecea919e48131f268f0be10a0fba15a4feddf207c0787ac47f75bc6a5cc94f2b78d599e97950609196930a73073ae21ec1 SHA512 7fa9cc9ca2445afdfcb647724a6dc8bb3b52b9a6c91d237f6b443cf1fe6624c67d16d611bf4e435c5f3dcdae6cbf73bbde257a4e194bc127dc13dca1f8067c19 +DIST xwallpaper-0.7.4.tar.xz 86432 BLAKE2B c10a69ab5734e43e99a746872bff427797e1d8f9de06d241fa81435036527b029031bb49733cf2119e8725883f20b9253b779ef9113d32d1b4f77bd73511a76a SHA512 f6eaf41befe724ad55d14f607bdfe9d05c79139054deb6590198ce767cf42173f068459dd894b284f3e8dbc95fc482d8ed7ed1c615f7b72b249897a6a01d51ba diff --git a/x11-misc/xwallpaper/metadata.xml b/x11-misc/xwallpaper/metadata.xml index 1c2d8ed0efac..43a27bb1aa2a 100644 --- a/x11-misc/xwallpaper/metadata.xml +++ b/x11-misc/xwallpaper/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> The xwallpaper utility allows you to set image files as your X wallpaper. JPEG, PNG, and XPM file formats are supported, all of them being configurable and therefore no fixed dependencies. diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild deleted file mode 100644 index ed317b228bd9..000000000000 --- a/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Wallpaper setting utility for X" -HOMEPAGE="https://github.com/stoeckmann/xwallpaper" - -if [ ${PV} == "9999" ] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git" -else - SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc64 x86" -fi - -LICENSE="ISC" -SLOT="0" -IUSE="jpeg png seccomp xpm" - -RDEPEND=" - x11-libs/pixman - x11-libs/xcb-util - x11-libs/xcb-util-image - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( media-libs/libpng:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - xpm? ( x11-libs/libXpm )" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - default - eautoreconf -} -src_configure() { - local myconf=( - $(use_with jpeg) - $(use_with png) - $(use_with seccomp) - $(use_with xpm) - --with-randr - --with-zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" - ) - econf "${myconf[@]}" -} diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild index 2b1e1615823f..82ae178851d7 100644 --- a/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild +++ b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,17 +8,17 @@ inherit autotools DESCRIPTION="Wallpaper setting utility for X" HOMEPAGE="https://github.com/stoeckmann/xwallpaper" -if [ ${PV} == "9999" ] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git" else SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ppc64 x86" fi LICENSE="ISC" SLOT="0" -IUSE="jpeg png seccomp xpm" +IUSE="+jpeg +png seccomp xpm" RDEPEND=" x11-libs/pixman @@ -27,16 +27,17 @@ RDEPEND=" jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - xpm? ( x11-libs/libXpm )" - -DEPEND="${RDEPEND} - virtual/pkgconfig + xpm? ( x11-libs/libXpm ) " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + src_prepare() { default eautoreconf } + src_configure() { local myconf=( $(use_with jpeg) diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild index 2b1e1615823f..70132cc575a5 100644 --- a/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild +++ b/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="Wallpaper setting utility for X" HOMEPAGE="https://github.com/stoeckmann/xwallpaper" -if [ ${PV} == "9999" ] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git" else SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi LICENSE="ISC" SLOT="0" -IUSE="jpeg png seccomp xpm" +IUSE="+jpeg +png seccomp xpm" RDEPEND=" x11-libs/pixman @@ -27,16 +27,17 @@ RDEPEND=" jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - xpm? ( x11-libs/libXpm )" - -DEPEND="${RDEPEND} - virtual/pkgconfig + xpm? ( x11-libs/libXpm ) " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + src_prepare() { default eautoreconf } + src_configure() { local myconf=( $(use_with jpeg) diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild index 2b1e1615823f..70132cc575a5 100644 --- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild +++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="Wallpaper setting utility for X" HOMEPAGE="https://github.com/stoeckmann/xwallpaper" -if [ ${PV} == "9999" ] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git" else SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi LICENSE="ISC" SLOT="0" -IUSE="jpeg png seccomp xpm" +IUSE="+jpeg +png seccomp xpm" RDEPEND=" x11-libs/pixman @@ -27,16 +27,17 @@ RDEPEND=" jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - xpm? ( x11-libs/libXpm )" - -DEPEND="${RDEPEND} - virtual/pkgconfig + xpm? ( x11-libs/libXpm ) " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + src_prepare() { default eautoreconf } + src_configure() { local myconf=( $(use_with jpeg) diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest index 8cce36e4f132..e0b850c31d53 100644 --- a/x11-misc/xwit/Manifest +++ b/x11-misc/xwit/Manifest @@ -1,3 +1,2 @@ -DIST xwit_3.4-15.debian.tar.gz 20722 BLAKE2B fcec4b3cdfa0f4d0b90e172f4539bfb622e77c902e351d9423555bbb43706c79e3d2cb15bb83021151a4876cc2c3bdacb62f074d6af50e2896a55b20b31df5e1 SHA512 047e00e5ff0282729495f39c7cb264837306da46d24e4d95e835d6d0060acd0bfa8f8cedff37ab8c503f267d8c5d42e5af0120cba6260e6eb9dd8c9a3a9dab46 DIST xwit_3.4-16.debian.tar.xz 17840 BLAKE2B 05e772134c4c2c97c81b2367cdcbd73b21c5a4498a482b52dbbbc081426a623f242c3c77c73af3d6e6dbf46c1f1a7240b3677700006a691717402c309ccea644 SHA512 09086d375bb4c7b87c468a3ddad0ae62ad58e168c7875ea9e29bc37e599b193c7e8ff167ac471bb49f836b216876279430d03f462b62286130ed5c3ad0859263 DIST xwit_3.4.orig.tar.gz 14557 BLAKE2B d023b89d02c8520421b35a69c3834d0493a1ab771b160c6c0592e9e43684062a7da9ed56491e90ba2948ba51b2d36f7b0c26ededdfa61a684b2a010d71865a56 SHA512 265114f81ede19e477685373e39deed3cf7cd3fd9dbb445362f34ea96dac6d9686d1c55cf882636f7d02598c83f5ee1ca2688fcbd01f6fc7ef34cac75691df94 diff --git a/x11-misc/xwit/metadata.xml b/x11-misc/xwit/metadata.xml index 66187a0f4213..d3e0f4631255 100644 --- a/x11-misc/xwit/metadata.xml +++ b/x11-misc/xwit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild deleted file mode 100644 index 6f20325979dd..000000000000 --- a/x11-misc/xwit/xwit-3.4_p15.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="A collection of simple routines to call some of those X11 functions" -HOMEPAGE="https://tracker.debian.org/pkg/xwit" -SRC_URI=" - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}.orig.tar.gz - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.gz -" - -LICENSE="public-domain HPND" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/${P/_p*/}.orig - -PATCHES=( "${WORKDIR}"/debian/patches ) - -src_prepare() { - default - sed -i \ - -e 's|gcc|${CC}|g' \ - Makefile || die - tc-export CC -} - -src_install() { - dobin xwit - newman xwit.man xwit.1 - einstalldocs -} diff --git a/x11-misc/xwit/xwit-3.4_p16.ebuild b/x11-misc/xwit/xwit-3.4_p16.ebuild index cc910e726870..5047e5de035c 100644 --- a/x11-misc/xwit/xwit-3.4_p16.ebuild +++ b/x11-misc/xwit/xwit-3.4_p16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="public-domain HPND" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xwrits/metadata.xml b/x11-misc/xwrits/metadata.xml index 2ba8e9e851e4..410408b3d171 100644 --- a/x11-misc/xwrits/metadata.xml +++ b/x11-misc/xwrits/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>desktop-misc@gentoo.org</email> 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/xxkb/metadata.xml b/x11-misc/xxkb/metadata.xml index 855595694b79..c1da2d8e3086 100644 --- a/x11-misc/xxkb/metadata.xml +++ b/x11-misc/xxkb/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">xxkb</remote-id> </upstream> diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild index 3cc40778ed9f..107cdbf1e1a0 100644 --- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild +++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib toolchain-funcs + +inherit toolchain-funcs DESCRIPTION="eXtended XKB - assign different keymaps to different windows" HOMEPAGE="https://sourceforge.net/projects/xxkb/" SRC_URI=" - mirror://sourceforge/${PN}/${P}-src.tar.gz - svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 ) + https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz + svg? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-flags.tar.bz2 ) " LICENSE="Artistic-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="svg" RDEPEND=" + x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt @@ -26,11 +28,12 @@ RDEPEND=" x11-libs/gtk+:2 ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-text/rman + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1 svg? ( virtual/pkgconfig ) - x11-misc/imake " src_prepare() { @@ -46,7 +49,9 @@ src_prepare() { } src_configure() { - xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" \ + xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die } src_compile() { diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1.ebuild deleted file mode 100644 index 16f2f9b64abe..000000000000 --- a/x11-misc/xxkb/xxkb-1.11.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils multilib - -DESCRIPTION="eXtended XKB - assign different keymaps to different windows" -HOMEPAGE="https://sourceforge.net/projects/xxkb/" -SRC_URI=" - mirror://sourceforge/${PN}/${P}-src.tar.gz - svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 ) -" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="svg" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt - svg? ( - dev-libs/glib:2 - gnome-base/librsvg:2 - x11-libs/gtk+:2 - ) -" -DEPEND=" - ${RDEPEND} - app-text/rman - svg? ( virtual/pkgconfig ) - x11-misc/imake -" - -src_prepare() { - if use svg; then - mv "${WORKDIR}"/flags . || die - epatch "${FILESDIR}"/svg-flags.patch - epatch "${FILESDIR}"/svg-appdefaults.patch - fi - - epatch "${FILESDIR}"/missing_init.patch -} - -src_configure() { - xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die -} - -src_compile() { - emake \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LIBRARIES="-lXext" \ - LOCAL_LDFLAGS="${LDFLAGS}" \ - PIXMAPDIR=/usr/share/xxkb \ - PROJECTROOT=/usr -} - -src_install() { - local myopts - if use svg; then - myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \ - flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg" - else - myopts="FOOBAR=buzz" - fi - - emake "${myopts}" DESTDIR="${D}" install - rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die - - emake DESTDIR="${D}" install.man - - insinto /usr/share/xxkb - use svg || doins "${FILESDIR}"/*.xpm - dodoc README* CHANGES* -} diff --git a/x11-misc/xystray/metadata.xml b/x11-misc/xystray/metadata.xml index 86d6295c7e49..0926557034b1 100644 --- a/x11-misc/xystray/metadata.xml +++ b/x11-misc/xystray/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> diff --git a/x11-misc/xystray/xystray-1.0.ebuild b/x11-misc/xystray/xystray-1.0-r1.ebuild index d640d249dafd..0479175fa362 100644 --- a/x11-misc/xystray/xystray-1.0.ebuild +++ b/x11-misc/xystray/xystray-1.0-r1.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A simple implementation of freedesktop.org notification area for X" -HOMEPAGE="https://steelman.github.com/xystray/" +HOMEPAGE="https://steelman.github.io/xystray/" SRC_URI="https://github.com/steelman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" +KEYWORDS="amd64 ~x86" -CDEPEND=" - x11-libs/libX11 +RDEPEND="x11-libs/libX11 x11-libs/libXt" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} x11-libs/libXaw" -RDEPEND="${CDEPEND}" PATCHES=( "${FILESDIR}/${P}-ldflags.patch" diff --git a/x11-misc/yabar/metadata.xml b/x11-misc/yabar/metadata.xml index e6d7b0c55687..48456c4a4174 100644 --- a/x11-misc/yabar/metadata.xml +++ b/x11-misc/yabar/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>lillyjsm@gmail.com</email> <name>Jake Lilly</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/x11-misc/ydotool/Manifest b/x11-misc/ydotool/Manifest new file mode 100644 index 000000000000..9fe77b15836b --- /dev/null +++ b/x11-misc/ydotool/Manifest @@ -0,0 +1 @@ +DIST ydotool-1.0.4.tar.gz 29364 BLAKE2B d021d0bc6cea3118cb91bd1e0cf0eab6b808925902c29274a417f16b0727998904085ca725411371284f222d7a043b9f3460725a07a911d40d0bd477d4fe9fcb SHA512 bbf66d752aa1dce9173c930e3a71bc277b330763b1aa0e38f9fec1976c282c64330251ba5abe222a991f4bcafbabf1312a940eb4b40a34bf99f628c2a41bc4a2 diff --git a/x11-misc/ydotool/files/ydotool-openrc.patch b/x11-misc/ydotool/files/ydotool-openrc.patch new file mode 100644 index 000000000000..2a90087109e3 --- /dev/null +++ b/x11-misc/ydotool/files/ydotool-openrc.patch @@ -0,0 +1,25 @@ +diff -Naur ydotool-1.0.4-orig/Daemon/CMakeLists.txt ydotool-1.0.4/Daemon/CMakeLists.txt +--- ydotool-1.0.4-orig/Daemon/CMakeLists.txt 2023-01-30 03:53:24.000000000 -0800 ++++ ydotool-1.0.4/Daemon/CMakeLists.txt 2023-05-22 22:42:53.960568790 -0700 +@@ -2,4 +2,9 @@ + "${CMAKE_CURRENT_SOURCE_DIR}/ydotool.service.in" + "${PROJECT_BINARY_DIR}/ydotool.service" + @ONLY) ++configure_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/ydotool.service-openrc.in" ++ "${PROJECT_BINARY_DIR}/ydotool.openrc" ++ @ONLY) + install(FILES "${PROJECT_BINARY_DIR}/ydotool.service" DESTINATION ${SD_UNITDIR}) ++install(FILES "${PROJECT_BINARY_DIR}/ydotool.openrc" DESTINATION "/etc/init.d" RENAME ydotool) +diff -Naur ydotool-1.0.4-orig/Daemon/ydotool.service-openrc.in ydotool-1.0.4/Daemon/ydotool.service-openrc.in +--- ydotool-1.0.4-orig/Daemon/ydotool.service-openrc.in 2023-01-30 03:53:24.000000000 -0800 ++++ ydotool-1.0.4/Daemon/ydotool.service-openrc.in 2023-05-22 22:38:49.822064144 -0700 +@@ -3,7 +3,7 @@ + name=$RC_SVCNAME + description="Starts ydotoold service" + supervisor="supervise-daemon" +-command="/usr/local/bin/ydotoold" ++command="@CMAKE_INSTALL_FULL_BINDIR@/ydotoold" + + reload() { + ebegin "Reloading $RC_SVCNAME" diff --git a/x11-misc/ydotool/metadata.xml b/x11-misc/ydotool/metadata.xml new file mode 100644 index 000000000000..6144f457ca39 --- /dev/null +++ b/x11-misc/ydotool/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>zoltan@sinustrom.info</email> + <name>Zoltan Puskas</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> + Generic Linux command-line automation tool (no X!) ou can use it on + anything as long as it accepts keyboard/mouse/whatever input. For + example, X11, text console, "RetroArch OS", fbdev apps + (fbterm/mplayer/SDL1/LittleVGL/Qt Embedded), etc. + </longdescription> + <upstream> + <remote-id type="github">ReimuNotMoe/ydotool</remote-id> + <bugs-to>https://github.com/ReimuNotMoe/ydotool/issues</bugs-to> + </upstream> +</pkgmetadata> diff --git a/x11-misc/ydotool/ydotool-1.0.4-r2.ebuild b/x11-misc/ydotool/ydotool-1.0.4-r2.ebuild new file mode 100644 index 000000000000..c0834b3c51a3 --- /dev/null +++ b/x11-misc/ydotool/ydotool-1.0.4-r2.ebuild @@ -0,0 +1,21 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Generic command-line automation tool (no X!)" +HOMEPAGE="https://github.com/ReimuNotMoe/ydotool" +SRC_URI="https://github.com/ReimuNotMoe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="amd64" + +BDEPEND=" + app-text/scdoc + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${PN}-openrc.patch ) diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest index bbe26c930acf..810472407ad9 100644 --- a/x11-misc/zim/Manifest +++ b/x11-misc/zim/Manifest @@ -1,3 +1 @@ -DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b7068922ea0cc05606bce8f5bd0ef7d92b7965ee0af067add28ef75f53363e864b3ca43d216dbf99fe2cac6e19a73 SHA512 3b74388eb9272e6c5c89e752d784428b18ffc6cbc76311162aa8f42f2de434ad8e9f9c6932b8aaa62e2a3abdb879a31c982cc3103e7eaa3a5407a02cb6750bfc -DIST zim-0.73.0.tar.gz 2615116 BLAKE2B 0d7c3910dfaa49f5260b4f7d23f812aa4cd9288bb19ffca0ca7297c49a508b89d4815ee7f2e98883f43c5cad92c6084939b827ccc4cb4e976edbf1cbc910eafa SHA512 0c01c63f68fe661263e25eef80e9b5872f2e5315d1e6a378de6b2486c081d39e5970435feee879a444f16f67ff2eda1a1e790630a3829a630c0ea95e59a505fa -DIST zim-0.73.1.tar.gz 2615382 BLAKE2B 055857b20dbdebc1e5d8d6b13c344fcf665d9889f392f9c58fd3cfef1f80865a78c48e5138d2443f67bb29b8cd915b8d0d6bc0ac4807de20344dfe6673f1350e SHA512 ba67b396a6c06921e5e67ab5ccf0559e54b29a719262411b24f178c350bd0ac7c8239f8d5d4396b9dc291aadc36b59869d81dc04d457ce4a36eade67cdd53dd2 +DIST zim-0.75.2.tar.gz 3257345 BLAKE2B 452716cbc6c149645c5146d8fcef2449c7c316ac57da9870dbe26b9fec13b6827a6368295277dc3b2b7a7874a7c930da27612a8e8e00b295ae9ecb3942d0e65b SHA512 ea6f361047690dfb314a3510d34880a4831d142c94fc0ca08e1c29869fd42d5fd1182c47edc241edeb512fed601a474af6d9970f819e8a8b67135c7589ae461a diff --git a/x11-misc/zim/metadata.xml b/x11-misc/zim/metadata.xml index 0dc3b7b6c991..00af9242199a 100644 --- a/x11-misc/zim/metadata.xml +++ b/x11-misc/zim/metadata.xml @@ -1,17 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -<longdescription lang="en"> -Zim is a graphical text editor used to maintain a collection of wiki pages. -Each page can contain links to other pages, simple formatting and images. Pages -are stored in a folder structure, like in an outliner, and can have -attachments. Creating a new page is as easy as linking to a nonexistent page. -All data is stored in plain text files with wiki formatting. Various plugins -provide additional functionality, like a task list manager, an equation editor, -a tray icon, and support for version control. -</longdescription> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <longdescription lang="en"> + Zim is a graphical text editor used to maintain a collection of wiki pages. + Each page can contain links to other pages, simple formatting and images. Pages + are stored in a folder structure, like in an outliner, and can have + attachments. Creating a new page is as easy as linking to a nonexistent page. + All data is stored in plain text files with wiki formatting. Various plugins + provide additional functionality, like a task list manager, an equation editor, + a tray icon, and support for version control. + </longdescription> + <upstream> + <remote-id type="github">zim-desktop-wiki/zim-desktop-wiki</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/zim/zim-0.72.1-r2.ebuild b/x11-misc/zim/zim-0.72.1-r2.ebuild deleted file mode 100644 index c970ffe1e845..000000000000 --- a/x11-misc/zim/zim-0.72.1-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=1 -inherit xdg-utils distutils-r1 virtualx - -DESCRIPTION="A desktop wiki" -HOMEPAGE=" - https://zim-wiki.org/ - https://github.com/zim-desktop-wiki/zim-desktop-wiki -" -SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -RESTRICT="test" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] - ') - x11-libs/gtk+:3[introspection] - x11-misc/xdg-utils -" -DEPEND=" - ${RDEPEND} -" -DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md ) -PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) -S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-} - -python_prepare_all() { - sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die - - if [[ ${LINGUAS} ]]; then - local lingua - for lingua in translations/*.po; do - lingua=${lingua/.po} - lingua=${lingua/translations\/} - has ${lingua} ${LINGUAS} || \ - { rm translations/${lingua}.po || die; } - done - fi - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - if ! has_version ${CATEGORY}/${PN}; then - elog "Please install these packages for additional functionality" - elog " dev-lang/R" - elog " dev-python/gtkspell-python" - elog " dev-vcs/bzr" - elog " media-gfx/graphviz" - elog " media-gfx/imagemagick" - elog " media-gfx/scrot" - elog " media-sound/lilypond" - elog " sci-visualization/gnuplot" - elog " virtual/latex-base app-text/dvipng" - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/x11-misc/zim/zim-0.73.0.ebuild b/x11-misc/zim/zim-0.73.0.ebuild deleted file mode 100644 index 51a1c261843f..000000000000 --- a/x11-misc/zim/zim-0.73.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=1 -inherit xdg-utils distutils-r1 virtualx - -DESCRIPTION="A desktop wiki" -HOMEPAGE=" - https://zim-wiki.org/ - https://github.com/zim-desktop-wiki/zim-desktop-wiki -" -SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RESTRICT="test" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] - ') - x11-libs/gtk+:3[introspection] - x11-misc/xdg-utils -" -DEPEND=" - ${RDEPEND} -" -DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md ) -PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) -S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-} - -python_prepare_all() { - sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die - - if [[ ${LINGUAS} ]]; then - local lingua - for lingua in translations/*.po; do - lingua=${lingua/.po} - lingua=${lingua/translations\/} - has ${lingua} ${LINGUAS} || \ - { rm translations/${lingua}.po || die; } - done - fi - - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - if ! has_version ${CATEGORY}/${PN}; then - elog "Please install these packages for additional functionality" - elog " dev-lang/R" - elog " dev-python/gtkspell-python" - elog " dev-vcs/bzr" - elog " media-gfx/graphviz" - elog " media-gfx/imagemagick" - elog " media-gfx/scrot" - elog " media-sound/lilypond" - elog " sci-visualization/gnuplot" - elog " virtual/latex-base app-text/dvipng" - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/x11-misc/zim/zim-0.73.1.ebuild b/x11-misc/zim/zim-0.73.1.ebuild deleted file mode 100644 index 44944193205d..000000000000 --- a/x11-misc/zim/zim-0.73.1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=no -inherit xdg-utils virtualx distutils-r1 - -DESCRIPTION="A desktop wiki" -HOMEPAGE=" - https://zim-wiki.org/ - https://github.com/zim-desktop-wiki/zim-desktop-wiki -" -SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RESTRICT="test" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] - ') - x11-libs/gtk+:3[introspection] - x11-misc/xdg-utils -" -DEPEND=" - ${RDEPEND} -" -DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md ) -PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) -S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-} - -python_prepare_all() { - sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die - - if [[ ${LINGUAS} ]]; then - local lingua - for lingua in translations/*.po; do - lingua=${lingua/.po} - lingua=${lingua/translations\/} - has ${lingua} ${LINGUAS} || \ - { rm translations/${lingua}.po || die; } - done - fi - - distutils-r1_python_prepare_all - export XDG_RUNTIME_DIR=fakethis -} - -python_install() { - distutils-r1_python_install -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - if ! has_version ${CATEGORY}/${PN}; then - elog "Please install these packages for additional functionality" - elog " dev-lang/R" - elog " dev-python/gtkspell-python" - elog " dev-vcs/bzr" - elog " media-gfx/graphviz" - elog " media-gfx/imagemagick" - elog " media-gfx/scrot" - elog " media-sound/lilypond" - elog " sci-visualization/gnuplot" - elog " virtual/latex-base app-text/dvipng" - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/x11-misc/zim/zim-0.75.2-r1.ebuild b/x11-misc/zim/zim-0.75.2-r1.ebuild new file mode 100644 index 000000000000..e72df1ffba7f --- /dev/null +++ b/x11-misc/zim/zim-0.75.2-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="sqlite" +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 +VIRTUALX_REQUIRED=test +inherit distutils-r1 optfeature virtualx xdg + +DESCRIPTION="A desktop wiki" +HOMEPAGE=" + https://zim-wiki.org/ + https://github.com/zim-desktop-wiki/zim-desktop-wiki +" +SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~riscv ~x86" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ') + x11-libs/gtk+:3[introspection] + x11-misc/xdg-utils +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md ) +PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) +S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-} + +python_prepare_all() { + if [[ ${LINGUAS} ]]; then + local lingua + for lingua in translations/*.po; do + lingua=${lingua/.po} + lingua=${lingua/translations\/} + has ${lingua} ${LINGUAS} || \ + { rm translations/${lingua}.po || die; } + done + fi + + distutils-r1_python_prepare_all + export XDG_RUNTIME_DIR=fakethis +} + +python_test() { + if has_version dev-vcs/git; then + git config --global user.email "git@example.com" || die + git config --global user.name "GitExample" || die + fi + + virtx ./test.py +} + +src_install() { + distutils-r1_src_install + + insinto /usr/share/icons + doins -r xdg/hicolor +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Spell checker" app-text/gtkspell[introspection] + optfeature "GNU R Plot Editor" dev-lang/R + optfeature "Version control Bazaar support" dev-vcs/breezy + optfeature "Diagram Editor" media-gfx/graphviz + optfeature "Insert Screenshot" "media-gfx/imagemagick media-gfx/scrot" + optfeature "Score Editor" media-sound/lilypond + optfeature "Gnuplot Editor" sci-visualization/gnuplot + optfeature "Equation Editor" virtual/latex-base app-text/dvipng +} |