notion: update to HEAD

This commit is contained in:
c0dev0id
2023-02-19 15:17:25 +01:00
parent 000816f394
commit 53ae8d4ef8
9 changed files with 312 additions and 0 deletions

View File

@@ -0,0 +1,24 @@
libtu,libext need want gettext
Index: build/libs.mk
--- build/libs.mk.orig
+++ build/libs.mk
@@ -10,14 +10,14 @@ CFLAGS += -DNOTION_RELEASE='"$(NOTION_RELEASE)"'
LIBS_SUBDIRS += libtu
LIBTU_DIR = $(TOPDIR)/libtu
-LIBTU_INCLUDES = -I$(TOPDIR)
-LIBTU_LIBS = -L$(LIBTU_DIR) -ltu
+LIBTU_INCLUDES = -I$(TOPDIR) -I${LOCALBASE}/include
+LIBTU_LIBS = -L$(LIBTU_DIR) -L${LOCALBASE}/lib -lintl -liconv -ltu
#libextl
LIBS_SUBDIRS += libextl
LIBEXTL_DIR = $(TOPDIR)/libextl
-LIBEXTL_INCLUDES = -I$(TOPDIR)
-LIBEXTL_LIBS = -L$(LIBEXTL_DIR) -lextl
+LIBEXTL_INCLUDES = -I$(TOPDIR) -I${LOCALBASE}/include
+LIBEXTL_LIBS = -L$(LIBEXTL_DIR) -L${LOCALBASE}/lib -lintl -liconv -lextl
MKEXPORTS = $(LUA) $(LIBEXTL_DIR)/libextl-mkexports

View File

@@ -0,0 +1,14 @@
Disable "remote control" modules, which per readme is a "gaping security hole"
Index: etc/cfg_defaults.lua
--- etc/cfg_defaults.lua.orig
+++ etc/cfg_defaults.lua
@@ -10,7 +10,7 @@ dopath("mod_menu")
dopath("mod_tiling")
dopath("mod_dock")
dopath("mod_sp")
-dopath("mod_notionflux")
+-- dopath("mod_notionflux")
dopath("mod_xrandr")
dopath("net_client_list")

View File

@@ -0,0 +1,12 @@
Index: man/Makefile
--- man/Makefile.orig
+++ man/Makefile
@@ -13,7 +13,7 @@ SHELL=sh -e
TARGETS=notion.1 notionflux.1 welcome.txt
MKMAN=$(LUA) ../build/mkman.lua
-NROFF=nroff -man -Tlatin1
+NROFF=mandoc
#FILTERCRAP=perl -p -i -e 's/.\10//g'
FILTERCRAP=$(LUA) -e 'io.write((string.gsub(io.read("*a"), ".\8", "")))'
LUA_REFVERSION:=$(shell $(LUA) -e 'print(_VERSION:match("[\x25d.]+"))')

View File

@@ -0,0 +1,32 @@
Configure for OpenBSD
Index: system-autodetect.mk
--- system-autodetect.mk.orig
+++ system-autodetect.mk
@@ -61,7 +61,7 @@ endif
#PRELOAD_MODULES=1
# Flags to link with libdl.
-DL_LIBS=-ldl
+#DL_LIBS=-ldl
##
@@ -79,7 +79,7 @@ X11_INCLUDES:=$(shell $(PKG_CONFIG) --cflags-only-I x1
# XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
# The following setting should work around that situation.
-DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
+#DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
# Use the Xutf8 routines (XFree86 extension) instead of the Xmb routines
# in an UTF-8 locale. (No, you don't need this in UTF-8 locales, and
@@ -153,7 +153,7 @@ HAS_SYSTEM_ASPRINTF ?= 1
# The following setting is needed with GNU libc for clock_gettime and the
# monotonic clock. Other systems may not need it, or may not provide a
# monotonic clock at all (which Ion can live with, and usually detect).
-LIBS += -lrt
+#LIBS += -lrt
# Cygwin needs this. Also when you disable _BSD_SOURCE you may need it.
#DEFINES += -DCF_NO_GETLOADAVG