Improved build system, add gentoo ebuild.

ChangeLog

@@ -0,0 +1,22 @@
+User johns
+Date:
+
+ Improved build system, add gentoo ebuild.
+ Fix bugs with fullscreen/window switching apps.
+ Add support of two text line to the clock pluglin.
+ Fix xinerama bugs.
+ Support color names in xpm icons.
+
+Data: Fri May 6 14:10:20 CEST 2011
+
+ Fix xcb 1.7 compatiblity.
+ Doxygen documentation cleaned up.
+
+Date: Wed Nov 10 21:42:44 CET 2010
+
+ Release 0.25.
+ Fix outdated glibc queue.h.
+
+Date: Fri Jul 10 15:49:12 2009 +0200
+
+ Initial version

Makefile

@@ -30,6 +30,8 @@
 #
 #CONFIG += '-DDEFAULT_FONT="-*-luxi sans-*-*-*-*-*-*-*-*-*-*-*-*"'
 
+# global default uwm system configuration file
+#CONFIG += '-DSYSTEM_CONFIG="/etc/system.uwmrc"'
 # enable/disable runtime configuration
 #CONFIG += -DUSE_RC
 #CONFIG += -DNO_RC
@@ -90,10 +92,10 @@
 #CONFIG += -DUSE_ICON
 #CONFIG += -DNO_ICON
 # enable/disable external jpeg support (needs icon)
-#CONFIG += -DUSE_JPEG
+CONFIG += -DUSE_JPEG
 #CONFIG += -DNO_JPEG
 # enable/disable external png support (needs icon)
-#CONFIG += -DUSE_PNG
+CONFIG += -DUSE_PNG
 #CONFIG += -DNO_PNG
 # enable/disable external tiff support (needs icon)
 #CONFIG += -DUSE_TIFF
@@ -113,7 +115,7 @@
 #CONFIG += -DNO_TD
 
 # use X Xinerama Extension
-#CONFIG += -DUSE_XINERAMA
+CONFIG += -DUSE_XINERAMA
 #CONFIG += -DNO_XINERAMA
 # use X Rendering Extension
 #CONFIG += -DUSE_RENDER
@@ -142,22 +144,34 @@ DEFS = $(CONFIG) #### $(addprefix -D, $(CONFIG))
 VERSION = "0.30"
 GIT_REV = $(shell git describe --always 2>/dev/null)
 
-CC= gcc
+#CC= gcc
+#CC= tcc
 #CC= clang
+#CC= /opt/ekopath/bin/pathcc
 
 #MARCH= -march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp
 #MARCH= -march=native
 #MARCH= -muclibc
 OPTIM= -U_FORTIFY_SOURCE -D__OPTIMIZE__ -Os -fomit-frame-pointer
-CFLAGS= $(MARCH) $(OPTIM) -W -Wall -Wextra -g -pipe \
- -I. $(DEFS) -DVERSION='$(VERSION)' \
+CFLAGS= $(MARCH) $(OPTIM) -pipe -W -Wall -Wextra -g
+override CFLAGS+= -I. $(DEFS) -DVERSION='$(VERSION)' \
  $(if $(GIT_REV), -DGIT_REV='"$(GIT_REV)"') \
  $(if $(findstring DDEBUG,$(CONFIG)), -Werror)
-LDFLAGS = -Wl,--sort-common,--gc-sections,--as-needed
+ifeq ($(CC),tcc)
+ LDFLAGS=
+else
+ LDFLAGS= -Wl,--sort-common,--gc-sections,--as-needed
+endif
 LIBS= `pkg-config --static --libs xcb-keysyms xcb-aux xcb-atom xcb-util \
  xcb-event xcb-icccm xcb-shape xcb-renderutil xcb-render xcb-image \
- xcb-shm xcb` `pkg-config --static --libs libpng` -ljpeg -ltiff -lpthread
-
+ xcb-shm xcb` \
+ $(if $(findstring USE_XINERAMA,$(CONFIG)), \
+ `pkg-config --static --libs xcb-xinerama`) \
+ $(if $(findstring USE_PNG,$(CONFIG)), \
+ `pkg-config --static --libs libpng`) \
+ $(if $(findstring USE_JPEG,$(CONFIG)), -ljpeg) \
+ $(if $(findstring USE_TIFF,$(CONFIG)), -ltiff) \
+ -lpthread
 OBJS = uwm.o command.o pointer.o keyboard.o draw.o image.o icon.o \
  tooltip.o hints.o screen.o background.o desktop.o menu.o \
  rule.o border.o client.o moveresize.o event.o property.o misc.o \
@@ -172,8 +186,9 @@ HDRS = uwm.h command.h pointer.h keyboard.h draw.h image.h icon.h \
  plugin/systray.h plugin/clock.h plugin/netload.h \
  readable_bitmap.h dia.h td.h uwm-config.h queue.h
 
-FILES= Makefile u.xpm contrib/uwm-helper.sh.in uwm.1 uwmrc.5 \
- contrib/uwm.doxyfile contrib/uwm16x16.xpm contrib/uwmrc.example
+FILES= Makefile u.xpm contrib/uwm-helper.sh.in uwm.1 uwmrc.5 CODINGSTYLE.txt \
+ ChangeLog contrib/uwm.doxyfile contrib/uwm16x16.xpm contrib/x.xpm \
+ contrib/uwmrc.example
 
 all: uwm #udm
 

README.txt

@@ -97,6 +97,7 @@ Optional:
  https://www.libpng.org/
 
  media-libs/tiff
+ not yet supported!
  Library for manipulation of TIFF (Tag Image File Format) images
  https://www.remotesensing.org/libtiff/
 
@@ -108,9 +109,18 @@ Optional:
  A clean fixed font for the console and X11
  https://www.is-vn.bg/hamster/
 
+ media-fonts/font-alias
+ X.Org font aliases
+ https://xorg.freedesktop.org/
+
+ media-fonts/font-cursor-misc
+ X.Org cursor font
+ https://xorg.freedesktop.org/
+
  media-fonts/font-misc-misc
  X.Org miscellaneous fonts
  https://xorg.freedesktop.org/
+
  peg
  Parsing Expression Grammar - parser generator
  https://piumarta.com/software/peg

contrib/uwm-9999.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-2
+ EGIT_REPO_URI="git:https://uwm.git.sourceforge.net/gitroot/${PN}/${PN}"
+else
+ SRC_URI="mirror:https://sourceforge/${PN}/${P}.tar.bz2"
+fi
+
+DESCRIPTION="uwm - µ Window Manager"
+HOMEPAGE="https://uwm.sourceforge.net"
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE="png jpeg xinerama"
+
+DEPEND=">=x11-libs/libxcb-1.7
+ x11-libs/xcb-util
+ x11-libs/xcb-util-wm
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-renderutil
+ x11-libs/libX11
+ sys-devel/make
+ media-fonts/font-alias
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc
+ png? ( media-libs/libpng )
+ jpeg? ( media-libs/jpeg )
+ xinerama? ( x11-proto/xineramaproto )
+"
+
+src_compile() {
+ local myconf
+
+ myconf="'-DSYSTEM_CONFIG=\"/etc/system.uwmrc\"'"
+ use png && myconf="${myconf} -DUSE_PNG"
+ use jpeg && myconf="${myconf} -DUSE_JPEG"
+ use xinerama && myconf="${myconf} -DUSE_XINERAMA"
+
+ #emake -j1 all contrib/uwm-helper CFLAGS="${CFLAGS}"
+ emake -j1 all contrib/uwm-helper CONFIG="${myconf}"
+}
+
+src_install() {
+ echo "#!/bin/sh" > ${T}/uwm
+ echo "exec /usr/bin/uwm" >> ${T}/uwm
+
+ exeinto /etc/X11/Sessions
+ doexe "${T}"/uwm
+
+ dobin uwm contrib/uwm-helper
+ doman uwm.1 uwmrc.5
+ dodoc ChangeLog README.txt contrib/uwmrc.example
+ doicon contrib/uwm16x16.xpm contrib/x.xpm
+}
+
+pkg_postinst() {
+ ewarn "Please extract uwmrc.example from /usr/share/doc/${PF} to"
+ ewarn "/etc/system.uwmrc or to your \$HOME/.uwm/uwmrc or/and edit it."
+}

uwm.c

@@ -62,7 +62,8 @@
 ** - multiple screen (xinerama)
 ** - 64-bit and 32-bit clean
 ** - little-endian and big-endian clean
-** - compatible with uclibc
+** - compatible with uclibc and libc6
+** - compatible with GCC 4.5.3, Clang 2.9 and ekopath 4.0.11
 ** - many features can be compile time enabled / disabled
 **
 ** see <a href="modules.html">list of µwm modules</a>.

www/index.html

@@ -68,10 +68,13 @@ <h3>Features</h3>
  <LI>multiple screen (xinerama)
  <LI>64-bit and 32-bit clean; little-endian and big-endian working
  <LI>compatible with uclibc and libc6
- <LI>compatible with GCC 4.5.2 and Clang 2.8
+ <LI>compatible with GCC 4.5.3, Clang 2.9 and ekopath 4.0.11
+ <LI>many features can be compile time enabled / disabled
  </UL>
 
  <h2 id="news">News</h2>
+ <h3></h3>
+
  <h3>Wed Nov 10 21:48:19 CET 2010</h3>
 
  Version 0.25 released.