* [gentoo-commits] repo/gentoo:master commit in: x11-wm/notion/, x11-wm/notion/files/
@ 2022-06-20 8:13 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2022-06-20 8:13 UTC (permalink / raw
To: gentoo-commits
commit: 5d093b37fd23de4f55bb8607a45e682287ea1512
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 08:13:17 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 08:13:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d093b37
x11-wm/notion: drop 3_p2015061300-r100
Closes: https://bugs.gentoo.org/836122
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-wm/notion/Manifest | 1 -
.../files/notion-3_p2015061300-pkg-config.patch | 76 ----------------
x11-wm/notion/notion-3_p2015061300-r100.ebuild | 101 ---------------------
3 files changed, 178 deletions(-)
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 2a557101b588..acfb810ec6d1 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -1,2 +1 @@
-DIST notion-3_p2015061300.tar.gz 797057 BLAKE2B 55258bb1d47a1c2506e9cb6654e5d68d69494a749174eaace2a53416ae40cac908b0398400a5a377dbb07618aa800529cbdfc0c7ef946d285681e1dfccfd9c48 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679
DIST notion-4.0.2_p20220613.tar.gz 791823 BLAKE2B 2aa50eb4f710bf289dd6edb6f4696662e8d2588b337f038845efdf79aa2e2b28a725734c829de5184def6fd5d32c51f511025dadf4ad6a689c0dc4e0b0d8e3eb SHA512 7c187571a00bdf5736032c0ff0b57a0afdb20a7b4f6e66877c84bf112922ec8f5b853165d419ecc7c18fc84a873b278c3cbdad5e7399e0312066141de1dc6673
diff --git a/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch b/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch
deleted file mode 100644
index fb718caa3158..000000000000
--- a/x11-wm/notion/files/notion-3_p2015061300-pkg-config.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- notion-3-2015061300/system-autodetect.mk
-+++ notion-3-2015061300/system-autodetect.mk
-@@ -84,8 +84,8 @@
- # SunOS/Solaris
- #X11_PREFIX ?= /usr/openwin
-
--X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
--X11_INCLUDES=-I$(X11_PREFIX)/include
-+X11_LIBS=$(shell $(PKG_CONFIG) --libs x11 xext)
-+X11_INCLUDES=$(shell $(PKG_CONFIG) --cflags-only-I x11 xext)
-
- # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
- # The following setting should work around that situation.
---- notion-3-2015061300/mod_xinerama/Makefile
-+++ notion-3-2015061300/mod_xinerama/Makefile
-@@ -9,14 +9,14 @@
-
- ######################################
-
--INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR)
--CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
-+INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR) $(shell $(PKG_CONFIG) --cflags-only-I xinerama)
-+CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) $(shell $(PKG_CONFIG) --cflags-only-other xinerama)
- DOCS=LICENSE README
-
- SOURCES=mod_xinerama.c
-
- MAKE_EXPORTS=mod_xinerama
--LIBS = -L/usr/lib/x86_64-linux-gnu $(X11_LIBS) -lXinerama
-+LIBS = $(X11_LIBS) $(shell $(PKG_CONFIG) --libs xinerama)
- MODULE=mod_xinerama
- MODULE_STUB=mod_xinerama.lua
-
-@@ -44,7 +44,7 @@
-
- .PHONY: test
- test: $(SOURCES)
-- lua test_xinerama.lua
-+ $(LUA) test_xinerama.lua
-
- ######################################
-
-@@ -57,4 +57,4 @@
- ################ ls_xinerama utility ###############
-
- ls_xinerama: ls_xinerama.c
-- $(CC) ls_xinerama.c -o ls_xinerama -Wl,--as-needed -lX11 -lXinerama
-+ $(CC) $(CFLAGS) ls_xinerama.c -o ls_xinerama $(LDFLAGS) $(LIBS)
---- notion-3-2015061300/mod_xrandr/Makefile
-+++ notion-3-2015061300/mod_xrandr/Makefile
-@@ -9,13 +9,13 @@
-
- ######################################
-
--INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR)
--CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
-+INCLUDES += $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) $(X11_INCLUDES) -I$(TOPDIR) $(shell pkg-config --cflags-only-I xrandr)
-+CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) $(shell $(PKG_CONFIG) --cflags-only-other xrandr)
-
- SOURCES=mod_xrandr.c
-
- MAKE_EXPORTS=mod_xrandr
--LIBS = $(X11_LIBS) -lXrandr
-+LIBS = $(X11_LIBS) $(shell $(PKG_CONFIG) --libs xrandr)
- MODULE=mod_xrandr
- MODULE_STUB=mod_xrandr.lua
- ETC=cfg_xrandr.lua
-@@ -45,7 +45,7 @@
-
- .PHONY: test
- test: $(SOURCES)
-- for i in test_xrandr*.lua ; do echo 'Testing' $$i ; lua $$i ; done
-+ for i in test_xrandr*.lua ; do echo 'Testing' $$i ; $(LUA) $$i ; done
-
- ######################################
-
diff --git a/x11-wm/notion/notion-3_p2015061300-r100.ebuild b/x11-wm/notion/notion-3_p2015061300-r100.ebuild
deleted file mode 100644
index 2aee50148789..000000000000
--- a/x11-wm/notion/notion-3_p2015061300-r100.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-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/"
-SRC_URI="https://github.com/raboof/${PN}/archive/${PV/_p/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls xinerama +xrandr"
-
-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"
-
-# mod_xrandr references mod_xinerama
-REQUIRED_USE="${LUA_REQUIRED_USE}
- xrandr? ( xinerama )"
-
-# needs slingshot,... not in tree
-RESTRICT=test
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3_p2015061300-pkg-config.patch
-)
-
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
- default
-
- sed -e "/^CFLAGS/{s: =: +=: ; s:-Os:: ; s:-g::}" \
- -e "/^LDFLAGS/{s: =: +=: ; s:-Wl,--as-needed::}" \
- -i system-autodetect.mk || die
- echo > build/lua-detect.mk
-}
-
-src_configure() {
- { echo "CFLAGS += -D_DEFAULT_SOURCE"
- echo "PREFIX=${EROOT}/usr"
- echo "DOCDIR=\$(PREFIX)/share/doc/${PF}"
- echo "ETCDIR=${EROOT}/etc/${PN}"
- echo "LIBDIR=\$(PREFIX)/$(get_libdir)"
- echo "VARDIR=${EROOT}/var/cache/${PN}"
- echo "X11_PREFIX=${EROOT}/usr"
- echo "STRIPPROG=true"
- echo "CC=$(tc-getCC)"
- echo "AR=$(tc-getAR)"
- echo "RANLIB=$(tc-getRANLIB)"
- echo "LUA_MANUAL=1"
- echo "LUA=${LUA}"
- echo "LUAC=/usr/bin/luac5.1"
- echo "LUA_LIBS=$(lua_get_LIBS)"
- echo "LUA_INCLUDES=$(lua_get_CFLAGS)"
- use nls || echo "DEFINES+=-DCF_NO_LOCALE -DCF_NO_GETTEXT"
- } > system-local.mk
-
- 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
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
-
-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."
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/notion/, x11-wm/notion/files/
@ 2024-05-02 3:55 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-05-02 3:55 UTC (permalink / raw
To: gentoo-commits
commit: 5b37553a9c5af8e400cd23a2dd79ecdf4b32812e
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Wed May 1 08:48:39 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 2 03:54:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b37553a
x11-wm/notion: Fix passing of incompatible pointer type
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.
Closes: https://bugs.gentoo.org/919249
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36498
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/notion-4.0.2-gcc14-build-fix.patch | 49 ++++++++++++++++++++++
...999.ebuild => notion-4.0.2_p20220613-r1.ebuild} | 10 ++++-
x11-wm/notion/notion-9999.ebuild | 6 ++-
3 files changed, 62 insertions(+), 3 deletions(-)
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-9999.ebuild b/x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild
similarity index 88%
copy from x11-wm/notion/notion-9999.ebuild
copy to x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild
index 3bc5247a3ad3..8838324ac69b 100644
--- a/x11-wm/notion/notion-9999.ebuild
+++ b/x11-wm/notion/notion-4.0.2_p20220613-r1.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
@@ -14,7 +14,9 @@ if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/raboof/${PN}.git"
else
- SRC_URI="https://github.com/raboof/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ inherit vcs-snapshot
+ COMMIT="f161c1b4dbba1ac81d8e9c3d7e5e353058a4d7d1"
+ SRC_URI="https://github.com/raboof/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -43,6 +45,10 @@ 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=""
diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild
index 3bc5247a3ad3..213357db0dbf 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
@@ -43,6 +43,10 @@ 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=""
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-02 3:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-20 8:13 [gentoo-commits] repo/gentoo:master commit in: x11-wm/notion/, x11-wm/notion/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-05-02 3:55 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox