From: dcc Date: Sat, 13 Jan 2024 01:09:23 +0000 (-0800) Subject: multilib is correct now X-Git-Url: https://git.logografos.com/?p=dcc-suckless-config;a=commitdiff_plain multilib is correct now --- diff --git a/bashs/shell scrips/keyboardlayoutswitcher.sh b/bashs/shell scrips/keyboardlayoutswitcher.sh index ff3101c..838b013 100755 --- a/bashs/shell scrips/keyboardlayoutswitcher.sh +++ b/bashs/shell scrips/keyboardlayoutswitcher.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash +#!/bin/bash numberofparameter=$# # Gets the number of parameter passed currentlayout=$(setxkbmap -query | grep layout | awk '{print $2}') # Gets the current layout diff --git a/bashs/shell scrips/keyboardlayoutswitcher.sh~ b/bashs/shell scrips/keyboardlayoutswitcher.sh~ index d3a5df4..ff3101c 100755 --- a/bashs/shell scrips/keyboardlayoutswitcher.sh~ +++ b/bashs/shell scrips/keyboardlayoutswitcher.sh~ @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/usr/local/bin/bash numberofparameter=$# # Gets the number of parameter passed currentlayout=$(setxkbmap -query | grep layout | awk '{print $2}') # Gets the current layout diff --git a/bashs/shell scrips/multilib-install-current b/bashs/shell scrips/multilib-install-current index 9ef28b9..d7d6bce 100755 --- a/bashs/shell scrips/multilib-install-current +++ b/bashs/shell scrips/multilib-install-current @@ -3,6 +3,6 @@ cd /tmp mkdir multilib cd multilib wget -r -np -nd -l1 --accept=*.t?z http://www.slackware.com/~alien/multilib/current/ -lftp -c 'open http://slackware.com/~alien/multilib/ ; mirror -c -e 15.0' +lftp -c 'open http://slackware.com/~alien/multilib/ ; mirror -c -e current' upgradepkg --reinstall --install-new *.t?z upgradepkg --reinstall --install-new slackware64-compat32/*-compat32/*.t?z diff --git a/bashs/shell scrips/multilib-install-current~ b/bashs/shell scrips/multilib-install-current~ new file mode 100755 index 0000000..9ef28b9 --- /dev/null +++ b/bashs/shell scrips/multilib-install-current~ @@ -0,0 +1,8 @@ +#!/bin/bash +cd /tmp +mkdir multilib +cd multilib +wget -r -np -nd -l1 --accept=*.t?z http://www.slackware.com/~alien/multilib/current/ +lftp -c 'open http://slackware.com/~alien/multilib/ ; mirror -c -e 15.0' +upgradepkg --reinstall --install-new *.t?z +upgradepkg --reinstall --install-new slackware64-compat32/*-compat32/*.t?z diff --git a/bdmenu-based/.config.mk.un~ b/bdmenu-based/.config.mk.un~ new file mode 100755 index 0000000..04ba808 Binary files /dev/null and b/bdmenu-based/.config.mk.un~ differ diff --git a/bdmenu-based/config.mk b/bdmenu-based/config.mk index 57afe4d..ebd8e96 100755 --- a/bdmenu-based/config.mk +++ b/bdmenu-based/config.mk @@ -16,7 +16,7 @@ XINERAMAFLAGS = -DXINERAMA FREETYPELIBS = -lfontconfig -lXft FREETYPEINC = /usr/include/freetype2 # OpenBSD (uncomment) -FREETYPEINC = $(X11INC)/freetype2 +#FREETYPEINC = $(X11INC)/freetype2 # includes and libs INCS = -I$(X11INC) -I$(FREETYPEINC) diff --git a/bdmenu-based/config.mk~ b/bdmenu-based/config.mk~ new file mode 100755 index 0000000..57afe4d --- /dev/null +++ b/bdmenu-based/config.mk~ @@ -0,0 +1,31 @@ +# dmenu version +VERSION = 5.1 + +# paths +PREFIX = /usr/local +MANPREFIX = $(PREFIX)/share/man + +X11INC = /usr/X11R6/include +X11LIB = /usr/X11R6/lib + +# Xinerama, comment if you don't want it +XINERAMALIBS = -lXinerama -lXrender +XINERAMAFLAGS = -DXINERAMA + +# freetype +FREETYPELIBS = -lfontconfig -lXft +FREETYPEINC = /usr/include/freetype2 +# OpenBSD (uncomment) +FREETYPEINC = $(X11INC)/freetype2 + +# includes and libs +INCS = -I$(X11INC) -I$(FREETYPEINC) +LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) + +# flags +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) +CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) +LDFLAGS = $(LIBS) + +# compiler and linker +CC = cc diff --git a/bdmenu-based/dmenu b/bdmenu-based/dmenu index 86a0d6b..c7912f2 100755 Binary files a/bdmenu-based/dmenu and b/bdmenu-based/dmenu differ diff --git a/bdmenu-based/dmenu.o b/bdmenu-based/dmenu.o index 8e83e6c..665f1b2 100644 Binary files a/bdmenu-based/dmenu.o and b/bdmenu-based/dmenu.o differ diff --git a/bdmenu-based/drw.o b/bdmenu-based/drw.o index 0619a4b..8c38889 100644 Binary files a/bdmenu-based/drw.o and b/bdmenu-based/drw.o differ diff --git a/bdmenu-based/stest b/bdmenu-based/stest index 43bca64..b9ec0e9 100755 Binary files a/bdmenu-based/stest and b/bdmenu-based/stest differ diff --git a/bdmenu-based/stest.o b/bdmenu-based/stest.o index 77ae22a..5284664 100644 Binary files a/bdmenu-based/stest.o and b/bdmenu-based/stest.o differ diff --git a/bdmenu-based/util.o b/bdmenu-based/util.o index 1189f70..91daf38 100644 Binary files a/bdmenu-based/util.o and b/bdmenu-based/util.o differ diff --git a/bdwm/.config.mk.un~ b/bdwm/.config.mk.un~ new file mode 100755 index 0000000..c1cf073 Binary files /dev/null and b/bdwm/.config.mk.un~ differ diff --git a/bdwm/config.mk b/bdwm/config.mk index 287ee86..81c493e 100755 --- a/bdwm/config.mk +++ b/bdwm/config.mk @@ -18,8 +18,8 @@ XINERAMAFLAGS = -DXINERAMA FREETYPELIBS = -lfontconfig -lXft FREETYPEINC = /usr/include/freetype2 # OpenBSD (uncomment) -FREETYPEINC = ${X11INC}/freetype2 -MANPREFIX = ${PREFIX}/man +#FREETYPEINC = ${X11INC}/freetype2 +#MANPREFIX = ${PREFIX}/man # includes and libs INCS = -I${X11INC} -I${FREETYPEINC} diff --git a/bdwm/config.mk~ b/bdwm/config.mk~ new file mode 100755 index 0000000..287ee86 --- /dev/null +++ b/bdwm/config.mk~ @@ -0,0 +1,39 @@ +# dwm version +VERSION = 6.3 + +# Customize below to fit your system + +# paths +PREFIX = /usr/local +MANPREFIX = ${PREFIX}/share/man + +X11INC = /usr/X11R6/include +X11LIB = /usr/X11R6/lib + +# Xinerama, comment if you don't want it +XINERAMALIBS = -lXinerama +XINERAMAFLAGS = -DXINERAMA + +# freetype +FREETYPELIBS = -lfontconfig -lXft +FREETYPEINC = /usr/include/freetype2 +# OpenBSD (uncomment) +FREETYPEINC = ${X11INC}/freetype2 +MANPREFIX = ${PREFIX}/man + +# includes and libs +INCS = -I${X11INC} -I${FREETYPEINC} +LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} + +# flags +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} +CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} +LDFLAGS = ${LIBS} + +# Solaris +#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" +#LDFLAGS = ${LIBS} + +# compiler and linker +CC = cc diff --git a/bdwm/drw.o b/bdwm/drw.o index d5e4707..fab4ab2 100644 Binary files a/bdwm/drw.o and b/bdwm/drw.o differ diff --git a/bdwm/dwm b/bdwm/dwm index c5ed19b..6cb1be0 100755 Binary files a/bdwm/dwm and b/bdwm/dwm differ diff --git a/bdwm/dwm.o b/bdwm/dwm.o index 581c099..c42f83c 100644 Binary files a/bdwm/dwm.o and b/bdwm/dwm.o differ diff --git a/bdwm/util.o b/bdwm/util.o index 6cc164b..91daf38 100644 Binary files a/bdwm/util.o and b/bdwm/util.o differ