From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- x11-misc/j4-dmenu-desktop/Manifest | 7 ++- .../files/j4-dmenu-desktop-2.18-gcc13.patch | 25 --------- .../j4-dmenu-desktop-2.18-r1.ebuild | 59 -------------------- .../j4-dmenu-desktop-3.0-r1.ebuild | 2 +- .../j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild | 63 ++++++++++++++++++++++ 5 files changed, 67 insertions(+), 89 deletions(-) delete mode 100644 x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch delete mode 100644 x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild create mode 100644 x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild (limited to 'x11-misc/j4-dmenu-desktop') diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest index b09c2f15e1f9..bef32c461d36 100644 --- a/x11-misc/j4-dmenu-desktop/Manifest +++ b/x11-misc/j4-dmenu-desktop/Manifest @@ -1,6 +1,5 @@ -AUX j4-dmenu-desktop-2.18-gcc13.patch 684 BLAKE2B 00ca09e661c3cec0cd4eb01636099ca7e1cb5da56c54b9b33981173b72486187767df36c48e2a059e107a2cfccaf3de0944d26cf8fe8d1b70bcc9b4bd7040a38 SHA512 b58c2bc3b30a49d02beb0aa60ee74b9d1627c4c4511804b394cf6be68e1d48499c7fdb6d8c769b5c2d8cdc973d7000c05a004cf70a1a036bb14119e222a64b48 -DIST j4-dmenu-desktop-2.18.tar.gz 34785 BLAKE2B 26d5861d6d7ddcd9653a464d1175d19532001705de193811087fd42fddbdead89b8d49bd14f8e323288d6a7ba37bd4e11f4c7c52dd9b0a454f95a83a14853bcb SHA512 f8b0c825d567d60da0fb418e6f0b24a6d9daa9fb142b194b0a8b249303f4e09b6694fce72bf031007ac67253e488fc7666d4ba7beb032bc74cc2a32aca0f6c96 DIST j4-dmenu-desktop-3.0.tar.gz 87265 BLAKE2B 63fb87b98e500b1adba188b0b523ef0c2449826e7fa5b5ca442c451ff5003160a9f6803cdb3c918da366447355b9312b9bf0ece4a7d2eebe427da4edf219f881 SHA512 9823428477600f3ab284dc80f6baef20b5f22b34269317f491c65e7331817f5a0115af20e05acb7f2c66f021f7c2d683c332a334f03088d867319926eaa4568a -EBUILD j4-dmenu-desktop-2.18-r1.ebuild 1236 BLAKE2B a914620d1147738058438861eaf1daa678c0f144ac81dd9430be4e8486cf90c52d2f9a8564d5995eed65aeefd1837235e53a963e9b4481c997667013c21f4473 SHA512 2bfd359cffe05e10ae6a2482b47ea7c66af06723269de42acea401c26abcfdb447e0b19a010b504af4b9bdf2c4ae95cc126cdd0db08d1d60a4be9adf92918537 -EBUILD j4-dmenu-desktop-3.0-r1.ebuild 1272 BLAKE2B 4173a96dcf25858ea28fd5adde961964de652fd6f8d819b26347ad1fb2a391f8b42610ecd17d95b091e94cfeec33431aa7f180aeeb46d13c884c2558ba022125 SHA512 06f6a25ce89b56c46079d984f70ce4a06a5807046aa4106bb9eb74220627a28c2808d81f1b53c00a51ecb865a88414a086bbd91eab1635328ee380c8d501b221 +DIST j4-dmenu-desktop-3.1.tar.gz 108974 BLAKE2B fd0527ee27855ef453b76e52cd15402bb86b9812255edacfacd5b5486162b052eb74d41f072fcf151837698d352dfa743a6bd30cd28156f62ddafc39d2402edb SHA512 6baa4bdf0564683e09bf3dd34f619ec9dcfc840be68ec0f68b4cd643bee5acbc09ebfffaf82daced991899fb467c84ed441257915a9c6b411f317e9947471fca +EBUILD j4-dmenu-desktop-3.0-r1.ebuild 1270 BLAKE2B fb0f5962f891e0f24f6c9beb34e59bc6d03bb1f677ee0a5d78236ca61ebfcb21f321ddbd36e6a9ea81e0242c1a5aa552da6bc5bbf56f29b1bf163b29cead31d2 SHA512 c5eef0db2ae4c9edaeedcabbc15eb8f1215b1c8efefd6dff86efcda00cd89721a787bb3bcba42c3f6b6b1212ceec139e5d1aefc9f3449966dd57f8e484b27d44 +EBUILD j4-dmenu-desktop-3.1.ebuild 1272 BLAKE2B 4173a96dcf25858ea28fd5adde961964de652fd6f8d819b26347ad1fb2a391f8b42610ecd17d95b091e94cfeec33431aa7f180aeeb46d13c884c2558ba022125 SHA512 06f6a25ce89b56c46079d984f70ce4a06a5807046aa4106bb9eb74220627a28c2808d81f1b53c00a51ecb865a88414a086bbd91eab1635328ee380c8d501b221 MISC metadata.xml 720 BLAKE2B f7953adbe54ea74a53d8d24b01ab9f49ec6953730e555547de6cb19f11cf7cb359a80f517a334494007ab691942390bc8d48c27b44beed6d9e8829f120f67201 SHA512 1decbf705eafff204783071471f3fa6c99719525fd81b2eaaf0effaa41e501b81dddc2604e2069ca393933285f78f8f76686be14e6a7f0b301ebcf4fed3628e5 diff --git a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch deleted file mode 100644 index 269044a01ba7..000000000000 --- a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/enkore/j4-dmenu-desktop/pull/139 - -From 53e318f155875562b22318395461b836e9ec7e8b Mon Sep 17 00:00:00 2001 -From: Sam James -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 --#include -+#include -+#include - #include - - #include "Utilities.hh" diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild deleted file mode 100644 index 0e03d6f0d6be..000000000000 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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="+dmenu test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-cpp/catch:1 )" -RDEPEND="dmenu? ( x11-misc/dmenu )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.18-gcc13.patch -) - -src_prepare() { - cmake_src_prepare - - # Respect users CFLAGS - sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DWITH_GIT_CATCH="no" - -DWITH_TESTS="$(usex test)" - ) - - cmake_src_configure -} - -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=," - elog "as otherwise it won't work." - fi -} diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild index e56bc1b3ab29..a44226418300 100644 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.0-r1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+dmenu test" RESTRICT="!test? ( test )" diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild new file mode 100644 index 000000000000..e56bc1b3ab29 --- /dev/null +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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="+dmenu test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-cpp/catch:0 )" +DEPEND=" + dev-libs/libfmt:= + dev-libs/spdlog:= +" +RDEPEND=" + ${DEPEND} + dmenu? ( x11-misc/dmenu ) +" + +src_prepare() { + cmake_src_prepare + + # Respect users CFLAGS + sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DNO_DOWNLOAD="ON" + -DWITH_GIT_CATCH="no" + -DWITH_TESTS="$(usex test)" + ) + + cmake_src_configure +} + +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=," + elog "as otherwise it won't work." + fi +} -- cgit v1.2.3