gentoo auto-resync : 03:05:2024 - 00:00:22

5 files changed, 150 insertions, 2 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f660b86b83cf..23a335321750 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index f0c58ae46ce3..419517aeba0b 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -1,6 +1,8 @@
 AUX notion 26 BLAKE2B b39f9f65f79f85b8af02c52334f71f0eb171abf2e48af8698b4eb51929a718d1aa24cce3b0c76b5d2c05843a4e6c1485b76081704004b03f0dfb92049aad252c SHA512 4d5aa2efb7ff7c9927ec6c2d8b0e5fd9ad1fcd10c7c40b20312342cb5a01ea9a835bbdfa88a054fb639f4a1a94dd4e05cb5f77a47d46ff43326086aba0cd69d8
+AUX notion-4.0.2-gcc14-build-fix.patch 2121 BLAKE2B b62e0511cec847a6d88000e66153754fd7042f0d0262f5fa4812e4ddb51ae7f4ca1364cb951fb0b0d630a893f71b6836efe968a58848be2acbc54fcf4cf12c7d SHA512 6df6b0d66a6586e8b8a4004f417d99700dedc71780fe4c31ef703e6610bbfb79027c506a582ccb7943188d41add693279b9135c04eb38e6dcaaa0e966b15d2dd
 AUX notion.desktop 208 BLAKE2B 7d138a583a49325901e3c1682c22dbdc1da02b4dcaa2ae6581c66e2676277de1a7b5a87e1c25465cb4ae6beebd7e93ab473e92b3ad6949ad97c833f2293e40da SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f
 DIST notion-4.0.2_p20220613.tar.gz 791823 BLAKE2B 2aa50eb4f710bf289dd6edb6f4696662e8d2588b337f038845efdf79aa2e2b28a725734c829de5184def6fd5d32c51f511025dadf4ad6a689c0dc4e0b0d8e3eb SHA512 7c187571a00bdf5736032c0ff0b57a0afdb20a7b4f6e66877c84bf112922ec8f5b853165d419ecc7c18fc84a873b278c3cbdad5e7399e0312066141de1dc6673
+EBUILD notion-4.0.2_p20220613-r1.ebuild 2185 BLAKE2B 5b005e02650c652bddc0f2fae213e350ac30d0e1fd20721f493e5310c0f4104b74d6ead0798caacb1e3e9d76d921a7a48efb89822d8f8540091d91799ad773c5 SHA512 243b6489034594128585e50804b0a166d10693be93a3296254e0c5249d27d45777e606ade326a0e1d586924de9b1add8c865f5077646dddb154eb4532973683d
 EBUILD notion-4.0.2_p20220613.ebuild 2123 BLAKE2B 8aca9e78756246c79bc2388bc8de7d1518a4e541eb98e9f6ffe4c2d1d7ba583af364ba97c042eb7e86c73ed9729a83a200c4531b24b055d8261ee67ec04ab2e4 SHA512 6ae643d2c54358402565a52437e1fc466f35282223058c11f3c8e3141d3e78ea876c6ed1a2dd0201d9bc6ace109cac4a0e2180af1ea3b2442a1455a900f8d960
-EBUILD notion-9999.ebuild 2046 BLAKE2B 69701c3d87c27b2b41670fbf9e1d9533db62bde2882216a5d7ddf3b13cebbbd311bb272c8a665731add1075c68fff0355dfb546c93d16b4d72ef15c496b1cfb8 SHA512 7833f2282368da0b75e2f971e5929cc0d404c239ae3cefd49738b766cab04e3046a18c4a7f0f50a3d394f33ab224dadfc386d6f83230a7a1acbc92570e3ac2d8
+EBUILD notion-9999.ebuild 2046 BLAKE2B a361ec9115570a832b8714f0519ba7140511082c54abbd9e41b5506110808db7d70ff1f85eab1cc54c1b348ed6ef98596022f7c5060bbad84af43d3b1a728075 SHA512 c744573ef7d67366dcecfae67c4a3e7c7b6686ee078056a8960096748d9014d94642a8b8caadb43f8f0dbb80729684ffc771fb5158ff1c5f0970063d0b8f54ef
 MISC metadata.xml 441 BLAKE2B f1adc7889242f95216b90541c0b15e459738b2a375e1f74e19c52d9e5d2c5c7241c8eee77a89290d88619e5981adac8518477e6af2d2416c4596594d5a2bd671 SHA512 ebe72f7eeab009519f2d127028b210d9cc621ae6fcb60e09f8f07a35ff13eb6a66a514a2083490079749045332c4a9a35cef64d852c942761c065dd6547eb52e
diff --git a/x11-wm/notion/files/notion-4.0.2-gcc14-build-fix.patch b/x11-wm/notion/files/notion-4.0.2-gcc14-build-fix.patch
new file mode 100644
index 000000000000..94782a30a8cc
--- /dev/null
+++ b/x11-wm/notion/files/notion-4.0.2-gcc14-build-fix.patch
@@ -0,0 +1,49 @@
+https://github.com/raboof/notion/commit/3c81575d48b2fd1b851536e305961bb199ea36b5.patch
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Wed, 1 May 2024 11:35:59 +0530
+Subject: [PATCH] Fix build with GCC 14 and above
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Newer compilers such as GCC 14 ( and above ) have enabled a few compiler
+flags by default, -Wincompatible-pointer-types being one of them. Thus
+resulting in build errors such as:
+
+frame.c: In function ‘frame_set_numbers_extl’:
+frame.c:799:32: error: passing argument 1 of ‘ioncore_grab_establish’ from incompatible pointer type [-Wincompatible-pointer-types]
+  799 |         ioncore_grab_establish(frame, numbers_grab_handler, NULL,
+      |                                ^~~~~
+      |                                |
+      |                                WFrame * {aka struct WFrame_struct *}
+
+For now a type casting can be used to supress the error, as changing the type
+of frame would require touching other parts of the codebase. This should be
+fine for now as WFrame is a WMPlex which is a WWindow.
+
+TODO:
+According to developer/s, frame->mplex->win would be a more type-safe way to
+achieve the same, but then it becomes less clear whether this is an 'is' or a
+'has' relationship.
+
+First reported on Gentoo Linux with GCC 14, for more details please
+reffer https://bugs.gentoo.org/919249
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+---
+ ioncore/frame.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ioncore/frame.c b/ioncore/frame.c
+index dbe0d107c..2f7663815 100644
+--- a/ioncore/frame.c
++++ b/ioncore/frame.c
+@@ -796,7 +796,7 @@ bool frame_set_numbers_extl(WFrame *frame, const char *how)
+ {
+     if(how!=NULL && strcmp(how, "during_grab")==0){
+         bool new_state = frame_set_numbers(frame, SETPARAM_SET);
+-        ioncore_grab_establish(frame, numbers_grab_handler, NULL,
++        ioncore_grab_establish((WRegion *)frame, numbers_grab_handler, NULL,
+                                0, GRAB_DEFAULT_FLAGS&~GRAB_POINTER);
+         return new_state;
+     }
diff --git a/x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild b/x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild
new file mode 100644
index 000000000000..8838324ac69b
--- /dev/null
+++ b/x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit lua-single toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
+HOMEPAGE="https://notionwm.net/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
+else
+	inherit vcs-snapshot
+	COMMIT="f161c1b4dbba1ac81d8e9c3d7e5e353058a4d7d1"
+	SRC_URI="https://github.com/raboof/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls xinerama +xrandr"
+# needs slingshot,... not in tree
+RESTRICT="test"
+# mod_xrandr references mod_xinerama
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	xrandr? ( xinerama )"
+
+RDEPEND="
+	${LUA_DEPS}
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}"
+# luac is called at build time
+BDEPEND="
+	${LUA_DEPS}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.2-gcc14-build-fix.patch
+)
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+	export INSTALL_STRIP=""
+
+	cat > system-local.mk <<- _EOF_ || die
+		PREFIX=${EPREFIX}/usr
+		DOCDIR=\$(PREFIX)/share/doc/${PF}
+		ETCDIR=${EPREFIX}/etc/${PN}
+		LIBDIR=\$(PREFIX)/$(get_libdir)
+		VARDIR=${EPREFIX}/var/cache/${PN}
+		LUA_MANUAL=1
+		LUA=${LUA}
+		LUAC=${BROOT}/usr/bin/${ELUA/lua/luac}
+		LUA_LIBS=$(lua_get_LIBS)
+		LUA_INCLUDES=$(lua_get_CFLAGS)
+		$(usev !nls "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT")
+	_EOF_
+
+	if ! use xinerama ; then
+		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
+	fi
+
+	if ! use xrandr ; then
+		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
+		sed -e '/mod_xrandr/d' -i etc/cfg_defaults.lua || die
+	fi
+}
+
+src_install() {
+	default
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/notion
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/notion.desktop
+
+	local DOC_CONTENTS="
+		If you want notion to have an ability to view a file based on its
+		guessed MIME type you should emerge app-misc/run-mailcap."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
index 3bc5247a3ad3..17f1344a33e4 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8