[gentoo-commits] repo/gentoo:master commit in: x11-misc/j4-dmenu-desktop/, x11-misc/j4-dmenu-desktop/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/j4-dmenu-desktop/, x11-misc/j4-dmenu-desktop/files/

[Sam James]

commit:     69a7d428ae3555c23c74ece8fecea229ca6cf7d1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 10:11:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 10:24:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a7d428

x11-misc/j4-dmenu-desktop: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/895200
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/j4-dmenu-desktop-2.18-gcc13.patch        | 25 ++++++++++++++++++++++
 .../j4-dmenu-desktop-2.18-r1.ebuild                |  6 +++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch
new file mode 100644
index 000000000000..269044a01ba7
--- /dev/null
+++ b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch
@@ -0,0 +1,25 @@
+https://github.com/enkore/j4-dmenu-desktop/pull/139
+
+From 53e318f155875562b22318395461b836e9ec7e8b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 18 Apr 2023 11:08:53 +0100
+Subject: [PATCH] Fix build with GCC 13
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
+are no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Bug: https://bugs.gentoo.org/895200
+--- a/src/Application.hh
++++ b/src/Application.hh
+@@ -19,7 +19,8 @@
+ #define APPLICATION_DEF
+ 
+ #include <algorithm>
+-#include <string.h>
++#include <cstdint>
++#include <cstring>
+ #include <unistd.h>
+ 
+ #include "Utilities.hh"

diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild
index 1ad6b767f43d..0e03d6f0d6be 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,6 +21,10 @@ RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-cpp/catch:1 )"
 RDEPEND="dmenu? ( x11-misc/dmenu )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.18-gcc13.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/j4-dmenu-desktop/, x11-misc/j4-dmenu-desktop/files/

[Conrad Kostecki]

commit:     81032925d38d0a1fdecbec02b013d5f53e0b5ee2
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 20:47:33 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 20:47:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81032925

x11-misc/j4-dmenu-desktop: drop 2.18-r1

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 x11-misc/j4-dmenu-desktop/Manifest                 |  1 -
 .../files/j4-dmenu-desktop-2.18-gcc13.patch        | 25 ---------
 .../j4-dmenu-desktop-2.18-r1.ebuild                | 59 ----------------------
 3 files changed, 85 deletions(-)

diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 11475aab7087..f23c593c4433 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,2 +1 @@
-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

diff --git a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch
deleted file mode 100644
index 269044a01ba7..000000000000
--- a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.18-gcc13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/enkore/j4-dmenu-desktop/pull/139
-
-From 53e318f155875562b22318395461b836e9ec7e8b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 18 Apr 2023 11:08:53 +0100
-Subject: [PATCH] Fix build with GCC 13
-
-GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
-are no longer transitively included.
-
-See https://gnu.org/software/gcc/gcc-13/porting_to.html.
-
-Bug: https://bugs.gentoo.org/895200
---- a/src/Application.hh
-+++ b/src/Application.hh
-@@ -19,7 +19,8 @@
- #define APPLICATION_DEF
- 
- #include <algorithm>
--#include <string.h>
-+#include <cstdint>
-+#include <cstring>
- #include <unistd.h>
- 
- #include "Utilities.hh"

diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-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=<command>,"
-		elog "as otherwise it won't work."
-	fi
-}