aboutsummaryrefslogtreecommitdiff
path: root/libraries/xview
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2021-01-12 00:04:40 +0100
committerRobby Workman <rworkman@slackbuilds.org>2021-04-18 00:10:34 -0500
commit16f43c65afc879fd88d9e384df334b24e286cc37 (patch)
tree1bc02789fb04561ea61fe48b0c03e7b1b3ee9999 /libraries/xview
parent3e2dc6cf1539bd2a2ad665e105953797d0d81680 (diff)
libraries/xview: Pass -fcommon for gcc >= 10.x, use libtirpc.
Add a couple of generic xinitrc files Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/xview')
-rw-r--r--libraries/xview/xinitrc.olvwm16
-rw-r--r--libraries/xview/xinitrc.olwm16
-rw-r--r--libraries/xview/xview.SlackBuild2
3 files changed, 33 insertions, 1 deletions
diff --git a/libraries/xview/xinitrc.olvwm b/libraries/xview/xinitrc.olvwm
new file mode 100644
index 000000000000..203011e0a3e4
--- /dev/null
+++ b/libraries/xview/xinitrc.olvwm
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f $userresources ] && xrdb -merge $userresources
+[ -f $usermodmap ] && xmodmap $usermodmap
+
+# Start the window manager:
+/usr/bin/olvwm
diff --git a/libraries/xview/xinitrc.olwm b/libraries/xview/xinitrc.olwm
new file mode 100644
index 000000000000..ec81c6341a31
--- /dev/null
+++ b/libraries/xview/xinitrc.olwm
@@ -0,0 +1,16 @@
+#!/bin/sh
+# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f $userresources ] && xrdb -merge $userresources
+[ -f $usermodmap ] && xmodmap $usermodmap
+
+# Start the window manager:
+/usr/bin/olwm
diff --git a/libraries/xview/xview.SlackBuild b/libraries/xview/xview.SlackBuild
index d5e643a36cc8..7d52c36f514d 100644
--- a/libraries/xview/xview.SlackBuild
+++ b/libraries/xview/xview.SlackBuild
@@ -86,7 +86,7 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# Apply our CFLAGS. There might be a simpler way to do it, but this works:
-sed -i "s,-O2,$SLKCFLAGS,g" \
+sed -i "s|-O2|$SLKCFLAGS -fcommon -I/usr/include/tirpc -Wl,-ltirpc|g" \
clients/olvwm-4.1/compiler.tmpl \
clients/olwm/Makefile.simple \
config/XView.tmpl