Hi ports --
Attached is a fairly large diff to update icewm to its newest version.
Upstream has changed; it's on GitHub now.
Lots of patch shuffling. Lots of patches have gone away.
Been running it on amd64 and macppc without any issues.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile 24 Oct 2018 14:28:13 -0000 1.64
+++ Makefile 9 Mar 2019 23:45:11 -0000
@@ -1,31 +1,39 @@
# $OpenBSD: Makefile,v 1.64 2018/10/24 14:28:13 sthen Exp $
+V= 1.5.2
COMMENT= small and fast window manager
-
-DISTNAME= icewm-1.3.8
-REVISION= 6
+DISTNAME= icewm-${V}
+EXTRACT_SUFX= .tar.xz
CATEGORIES= x11
-HOMEPAGE= http://www.icewm.org/
+HOMEPAGE= https://www.ice-wm.org/
+MAINTAINER= Brian Callahan <[email protected]>
-# LGPLv2
+# LGPLv2 only
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xrandr Xrender c fontconfig
-WANTLIB += freetype gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 iconv intl m pthread ${COMPILER_LIBCXX}
-WANTLIB += z
+WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xext Xft Xinerama
+WANTLIB += Xrandr Xrender ao c expat ffi fontconfig freetype fribidi
+WANTLIB += gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 iconv intl m ogg pcre sndfile
+WANTLIB += vorbis vorbisenc xcb z
+
+COMPILER= base-clang ports-gcc base-gcc
+
+MASTER_SITES= https://github.com/ice-wm/icewm/releases/download/${V}/
-COMPILER = base-clang ports-gcc base-gcc
+BUILD_DEPENDS= devel/gettext-tools \
+ textproc/asciidoc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/}
+LIB_DEPENDS= audio/libao \
+ audio/libsndfile \
+ devel/fribidi \
+ graphics/gdk-pixbuf2
-BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS= graphics/gdk-pixbuf2
+RUN_DEPENDS= devel/desktop-file-utils
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --with-docdir=${PREFIX}/share/doc \
- --with-libdir=${PREFIX}/share/icewm \
+CONFIGURE_ARGS= --with-libdir=${PREFIX}/share/icewm \
--with-cfgdir=${SYSCONFDIR}/icewm \
--with-kdedatadir=${LOCALBASE}/share \
--with-x \
@@ -39,18 +47,16 @@ CONFIGURE_ARGS= --with-docdir=${PREFIX}/
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-.include <bsd.port.arch.mk>
+# make: don't know how to make %.html: (prerequisite of: icewm.html)
+USE_GMAKE= Yes
-# XXX rendering bug on big-endian systems
-.if ${PROPERTIES:Mle}
-CONFIGURE_ARGS+= --enable-gradients
-.endif
+.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mapm}
PATCH_LIST= patch-* apm-*
.endif
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/doc/icewm-7.html
+ ${SUBST_CMD} ${WRKSRC}/doc/icewm.adoc
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/icewm/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 4 Jan 2014 09:05:24 -0000 1.16
+++ distinfo 9 Mar 2019 23:45:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.3.8.tar.gz) = F1iNngu7sjWHvATIPandlP1NpolOz+5tfz7VDXgNzRg=
-SIZE (icewm-1.3.8.tar.gz) = 905680
+SHA256 (icewm-1.5.2.tar.xz) = DH+Ceud065O6ZoOf7wzXUwn0RZ7miOe24E/+wpGgeZs=
+SIZE (icewm-1.5.2.tar.xz) = 1662664
Index: patches/apm-patch-src_aapm_cc
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/apm-patch-src_aapm_cc,v
retrieving revision 1.4
diff -u -p -r1.4 apm-patch-src_aapm_cc
--- patches/apm-patch-src_aapm_cc 4 Jan 2014 09:05:24 -0000 1.4
+++ patches/apm-patch-src_aapm_cc 9 Mar 2019 23:45:11 -0000
@@ -1,7 +1,9 @@
$OpenBSD: apm-patch-src_aapm_cc,v 1.4 2014/01/04 09:05:24 ajacoutot Exp $
---- src/aapm.cc.orig Sun Nov 17 17:54:39 2013
-+++ src/aapm.cc Sat Jan 4 09:34:02 2014
-@@ -38,7 +38,7 @@
+
+Index: src/aapm.cc
+--- src/aapm.cc.orig
++++ src/aapm.cc
+@@ -32,12 +32,11 @@
#include <dev/acpica/acpiio.h>
#endif
@@ -10,7 +12,13 @@ $OpenBSD: apm-patch-src_aapm_cc,v 1.4 20
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/types.h>
-@@ -73,7 +73,7 @@ static YColor *taskBarBg = 0;
+-#include <dev/apm/apmbios.h>
+-#include <dev/apm/apmio.h>
++#include <machine/apmvar.h>
+ #endif
+
+ #include <math.h>
+@@ -62,7 +61,7 @@ extern YColorName taskBarBg;
void YApm::ApmStr(char *s, bool Tool) {
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(i386)
struct apm_info ai;
@@ -18,11 +26,11 @@ $OpenBSD: apm-patch-src_aapm_cc,v 1.4 20
+#elif defined __NetBSD__ || defined __OpenBSD__
struct apm_power_info ai;
#else
- char buf[80];
-@@ -114,7 +114,7 @@ void YApm::ApmStr(char *s, bool Tool) {
+ char buf[APM_LINE_LEN];
+@@ -103,7 +102,7 @@ void YApm::ApmStr(char *s, bool Tool) {
BATlife = ai.ai_batt_life;
BATtime = ai.ai_batt_time == 0 ? -1 : ai.ai_batt_time;
- strcpy(units, "sec");
+ strlcpy(units, "sec", sizeof units);
-#elif defined __NetBSD__
+#elif defined __NetBSD__ || defined __OpenBSD__
memset(&ai, 0, sizeof(ai));
Index: patches/apm-patch-src_aapm_h
===================================================================
RCS file: patches/apm-patch-src_aapm_h
diff -N patches/apm-patch-src_aapm_h
--- patches/apm-patch-src_aapm_h 4 Jan 2014 09:05:24 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-$OpenBSD: apm-patch-src_aapm_h,v 1.5 2014/01/04 09:05:24 ajacoutot Exp $
---- src/aapm.h.orig Sun Nov 17 17:54:39 2013
-+++ src/aapm.h Sat Jan 4 09:35:12 2014
-@@ -1,5 +1,5 @@
-
--#if defined(linux) || (defined (__FreeBSD__)) || (defined (__FreeBSD_kernel__)) || (defined(__NetBSD__) && defined(i386))
-+#if defined(linux) || (defined (__FreeBSD__)) || (defined (__FreeBSD_kernel__)) || (defined(__NetBSD__) && defined(i386)) || defined(__OpenBSD__)
-
- #include "ywindow.h"
- #include "ytimer.h"
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 11 Apr 2014 15:25:24 -0000 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.13 2014/04/11 15:25:24 giovanni Exp $
---- Makefile.in.orig Sun Nov 17 17:54:39 2013
-+++ Makefile.in Fri Apr 4 10:00:05 2014
-@@ -4,7 +4,7 @@
- # Please run 'configure' first (generate it with autogen.sh)
- ################################################################################
-
--SHELL=/bin/bash
-+SHELL=/bin/sh
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -56,6 +56,8 @@ docs:
- nls:
- @cd po && $(MAKE) all
-
-+man:
-+
- srcclean:
- @cd src && $(MAKE) clean
-
-@@ -119,12 +121,9 @@ install-base: base
-
- install-docs: docs
- @echo ------------------------------------------
-- @rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-- @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-+ @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm"
- @echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
-- @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-- @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-- @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-+ $(BSD_INSTALL_DATA) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm"
- @echo ------------------------------------------
-
- install-nls: nls
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 11 Apr 2014 15:25:24 -0000 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-configure,v 1.14 2014/04/11 15:25:24 giovanni Exp $
---- configure.orig Sun Nov 17 18:41:19 2013
-+++ configure Thu Apr 3 23:24:54 2014
-@@ -2664,7 +2664,7 @@ test -n "$target_alias" &&
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
--TARGETS=base
-+TARGETS='base docs man'
- APPLICATIONS='icewm icewm-session icesh icewmhint icewmbg icewmtray'
- TESTCASES=`echo src/test*.cc | sed 's%src/\([^ ]*\)\.cc%\1%g'`
- TESTCASES="$TESTCASES iceview icesame iceicon icerun icelist icebar" # iceclock
-@@ -4481,7 +4481,7 @@ if ${ac_cv_lib_intl_strftime+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lintl $LIBS"
-+LIBS="-lintl $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -5799,7 +5799,7 @@ if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lintl $LIBS"
-+LIBS="-lintl -liconv $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
Index: patches/patch-doc_icewm-7_html
===================================================================
RCS file: patches/patch-doc_icewm-7_html
diff -N patches/patch-doc_icewm-7_html
--- patches/patch-doc_icewm-7_html 12 Dec 2010 19:13:01 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-doc_icewm-7_html,v 1.9 2010/12/12 19:13:01 jasper Exp $
---- doc/icewm-7.html.orig Thu Dec 9 16:03:22 2010
-+++ doc/icewm-7.html Thu Dec 9 16:04:22 2010
-@@ -26,9 +26,9 @@ directories:</P>
- <DT><B>$HOME/.icewm</B><DD>
- <P>user's personal customization. This location can
- be customized by setting the $ICEWM_PRIVCFG environment variable.</P>
--<DT><B>/etc/X11/icewm</B><DD>
-+<DT><B>${SYSCONFDIR}/icewm</B><DD>
- <P>system-wide customized defaults</P>
--<DT><B>/usr/share/icewm OR /usr/local/share/icewm</B><DD>
-+<DT><B>${PREFIX}/share/icewm</B><DD>
- <P>compiled-in default directory
- with default files</P>
- </DL>
-@@ -37,8 +37,8 @@ with default files</P>
- in the system/install directory can be overridden by the user by creating
- the same directory hierarchy under <CODE>$HOME/.icewm</CODE>.</P>
- <P>To customize icewm yourself, you should create the $HOME/.icewm directory and copy
--the files that you wish to modify (preferences, winoptions),from /etc/X11/icewm,
--/usr/share/icewm or /usr/local/share/icewm and then modify as you like.</P>
-+the files that you wish to modify (preferences, winoptions),from ${SYSCONFDIR}/icewm,
-+${PREFIX}/share/icewm and then modify as you like.</P>
- <P>To customize the default themes, you should create the $HOME/.icewm/themes directory
- and copy all the theme files there and then modify as necessary.</P>
-
Index: patches/patch-doc_icewm_adoc
===================================================================
RCS file: patches/patch-doc_icewm_adoc
diff -N patches/patch-doc_icewm_adoc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_icewm_adoc 9 Mar 2019 23:45:11 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: doc/icewm.adoc
+--- doc/icewm.adoc.orig
++++ doc/icewm.adoc
+@@ -395,10 +395,10 @@ $ICEWM_PRIVCFG; $XDG_CONFIG_HOME/icewm; $HOME/.icewm
+ The first of these which is defined and existent is used to search
+ for the user's personal customization.
+
+-/etc/icewm
++${SYSCONFDIR}/icewm
+ the system-wide defaults directory
+
+-/usr/share/icewm OR /usr/local/share/icewm
++${PREFIX}/share/icewm
+ the compiled-in default directory with default files
+
+ The directories are searched in the above order, so any file located
+@@ -407,8 +407,8 @@ creating the same directory hierarchy under `$HOME/.ic
+
+ To customize icewm yourself, you could create the `$HOME/.icewm`
+ directory and copy the files that you wish to modify, like
+-`preferences`, `keys` or `winoptions`, from `/etc/icewm`,
+-`/usr/share/icewm` or `/usr/local/share/icewm` and then modify as
++`preferences`, `keys` or `winoptions`, from `${SYSCONFDIR}/icewm`,
++or `${PREFIX}/share/icewm` and then modify as
+ you like.
+
+ To customize the default themes, create the `$HOME/.icewm/themes`
Index: patches/patch-lib_Makefile_in
===================================================================
RCS file: patches/patch-lib_Makefile_in
diff -N patches/patch-lib_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Makefile_in 9 Mar 2019 23:45:11 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: lib/Makefile.in
+--- lib/Makefile.in.orig
++++ lib/Makefile.in
+@@ -350,7 +350,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-xsessiondir = $(datadir)/xsessions
++xsessiondir = $(datadir)/applications
+ dist_xsession_DATA = \
+ icewm.desktop \
+ icewm-session.desktop
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 4 Jan 2014 09:05:24 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.9 2014/01/04 09:05:24 ajacoutot Exp $
---- src/Makefile.in.orig Sun Nov 17 17:54:39 2013
-+++ src/Makefile.in Sat Jan 4 09:34:02 2014
-@@ -32,7 +32,7 @@ DEFS = @DEFS@ \
- -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
- -DICESMEXE='"icewm-session$(EXEEXT)"' \
- -DICEHELPEXE='"icehelp$(EXEEXT)"' \
-- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+ -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"'
-
- CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
- @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags`
-@@ -203,11 +203,11 @@ clean:
-
- %.o: %.cc
- @echo " CXX " $@
-- @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
-+ $(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
-
- $(BINARIES):
- @echo " LD " $@
-- @$(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
-+ $(LD) -o $@ $($(@:$(EXEEXT)=)_OBJS) $(LFLAGS) $($(@:$(EXEEXT)=)_LFLAGS) $(LIBS) $($(@:$(EXEEXT)=)_LIBS)
-
- genpref.o: genpref.cc
- @echo " HOSTCXX " $@
Index: patches/patch-src_WinMgr_h
===================================================================
RCS file: patches/patch-src_WinMgr_h
diff -N patches/patch-src_WinMgr_h
--- patches/patch-src_WinMgr_h 19 Apr 2018 22:30:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_WinMgr_h,v 1.1 2018/04/19 22:30:36 naddy Exp $
-
-Index: src/WinMgr.h
---- src/WinMgr.h.orig
-+++ src/WinMgr.h
-@@ -189,7 +189,7 @@
- */
-
- #define WinLayerCount 16
--#define WinLayerInvalid 0xFFFFFFFFL
-+#define WinLayerInvalid -1L
-
- #define WinLayerDesktop 0L
- #define WinLayerBelow 2L
-@@ -228,7 +228,7 @@
- */
-
- #define WinTrayOptionCount 3
--#define WinTrayInvalid 0xFFFFFFFFL
-+#define WinTrayInvalid -1L
-
- #define WinTrayIgnore 0L
- #define WinTrayMinimized 1L
Index: patches/patch-src_default_h
===================================================================
RCS file: /cvs/ports/x11/icewm/patches/patch-src_default_h,v
retrieving revision 1.14
diff -u -p -r1.14 patch-src_default_h
--- patches/patch-src_default_h 11 Apr 2014 15:25:24 -0000 1.14
+++ patches/patch-src_default_h 9 Mar 2019 23:45:11 -0000
@@ -1,21 +1,22 @@
$OpenBSD: patch-src_default_h,v 1.14 2014/04/11 15:25:24 giovanni Exp $
---- src/default.h.orig Sun Nov 17 17:54:39 2013
-+++ src/default.h Sat Apr 5 23:20:25 2014
-@@ -38,7 +38,7 @@ XIV(bool, showTaskBar, true)
+Index: src/default.h
+--- src/default.h.orig
++++ src/default.h
+@@ -37,7 +37,7 @@ XIV(bool, showTaskBar, true)
XIV(bool, taskBarAtTop, false)
XIV(bool, taskBarKeepBelow, false)
XIV(bool, taskBarShowClock, true)
-XIV(bool, taskBarShowApm, false)
+XIV(bool, taskBarShowApm, true)
- XIV(bool, taskBarShowApmTime, true) // mschy
- XIV(bool, taskBarShowApmGraph, true) // hatred
- XIV(bool, taskBarShowMailboxStatus, true)
-@@ -162,10 +162,10 @@ XSV(const char *, acpiIgnoreBatteries, 0)
- #endif
+ XIV(bool, taskBarShowApmAuto, true)
+ XIV(bool, taskBarShowApmTime, true)
+ XIV(bool, taskBarShowApmGraph, true)
+@@ -171,10 +171,10 @@ XIV(int, netWorkAreaBehaviour, 0)
+ XSV(const char *, acpiIgnoreBatteries, 0)
XSV(const char *, mailBoxPath, 0)
--XSV(const char *, mailCommand, "xterm -name pine -title PINE -e pine")
--XSV(const char *, mailClassHint, "pine.XTerm")
+-XSV(const char *, mailCommand, "xterm -name mutt -e mutt")
+-XSV(const char *, mailClassHint, "mutt.XTerm")
+XSV(const char *, mailCommand, "xterm -name mail -title MAIL -e mail")
+XSV(const char *, mailClassHint, "mail.XTerm")
XSV(const char *, newMailCommand, 0)
Index: patches/patch-src_wmabout_cc
===================================================================
RCS file: patches/patch-src_wmabout_cc
diff -N patches/patch-src_wmabout_cc
--- patches/patch-src_wmabout_cc 8 Apr 2018 19:10:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_wmabout_cc,v 1.1 2018/04/08 19:10:10 jasper Exp $
-
-error: invalid suffix on literal; C++11 requires a space between literal and identifier
-
-Index: src/wmabout.cc
---- src/wmabout.cc.orig
-+++ src/wmabout.cc
-@@ -23,7 +23,7 @@
- AboutDlg *aboutDlg = 0;
-
- AboutDlg::AboutDlg(): YDialog() {
-- char const *version("IceWM "VERSION" ("HOSTOS"/"HOSTCPU")");
-+ char const *version("IceWM " VERSION " (" HOSTOS "/" HOSTCPU ")");
- ustring copyright =
- ustring("Copyright ")
- .append(_("(C)"))
Index: patches/patch-src_wmapp_cc
===================================================================
RCS file: patches/patch-src_wmapp_cc
diff -N patches/patch-src_wmapp_cc
--- patches/patch-src_wmapp_cc 8 Apr 2018 19:10:10 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_wmapp_cc,v 1.10 2018/04/08 19:10:10 jasper Exp $
-
-error: invalid suffix on literal; C++11 requires a space between literal and identifier
-
-Index: src/wmapp.cc
---- src/wmapp.cc.orig
-+++ src/wmapp.cc
-@@ -221,7 +221,7 @@ static void registerProtocols2(Window xid) {
- #endif
-
- long pid = getpid();
-- const char wmname[] = "IceWM "VERSION" ("HOSTOS"/"HOSTCPU")";
-+ const char wmname[] = "IceWM " VERSION " (" HOSTOS "/" HOSTCPU ")";
-
- #ifdef GNOME1_HINTS
- XChangeProperty(xapp->display(), xid,
-@@ -338,7 +338,7 @@ static void initFontPath(IApp *app) {
- char ** fontPath(XGetFontPath(xapp->display(), &ndirs));
-
- char ** newFontPath = new char *[ndirs + 1];
-- newFontPath[ndirs] = fontsdir;
-+ newFontPath[ndirs] = (char *)fontsdir;
-
- if (fontPath)
- memcpy(newFontPath, fontPath, ndirs * sizeof (char *));
Index: patches/patch-src_wmmgr_cc
===================================================================
RCS file: patches/patch-src_wmmgr_cc
diff -N patches/patch-src_wmmgr_cc
--- patches/patch-src_wmmgr_cc 4 Jun 2014 05:07:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_wmmgr_cc,v 1.1 2014/06/04 05:07:59 giovanni Exp $
---- src/wmmgr.cc.orig Tue Jun 3 19:28:30 2014
-+++ src/wmmgr.cc Tue Jun 3 19:28:50 2014
-@@ -697,7 +697,6 @@ void YWindowManager::handleClientMessage(const XClient
- case ICEWM_ACTION_RESTARTWM:
- case ICEWM_ACTION_WINDOWLIST:
- case ICEWM_ACTION_ABOUT:
-- break;
- default:
- smActionListener->handleSMAction(message.data.l[1]);
- break;
Index: patches/patch-src_yapp_cc
===================================================================
RCS file: patches/patch-src_yapp_cc
diff -N patches/patch-src_yapp_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_yapp_cc 9 Mar 2019 23:45:11 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/yapp.cc
+--- src/yapp.cc.orig
++++ src/yapp.cc
+@@ -262,7 +262,7 @@ int YApplication::mainLoop() {
+ // This is irrelevant when using monotonic clocks:
+ // if time travel to past, decrease the timeouts
+ if (diff < zerotime()) {
+- warn("time warp of %ld.%06ld", diff.tv_sec, diff.tv_usec);
++ warn("time warp of %lld.%06ld", diff.tv_sec, diff.tv_usec);
+ decreaseTimeouts(diff);
+ } else {
+ // no detection for time travel to the future
Index: patches/patch-src_ybutton_cc
===================================================================
RCS file: patches/patch-src_ybutton_cc
diff -N patches/patch-src_ybutton_cc
--- patches/patch-src_ybutton_cc 8 Apr 2018 19:10:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_ybutton_cc,v 1.1 2018/04/08 19:10:10 jasper Exp $
-
-Index: src/ybutton.cc
---- src/ybutton.cc.orig
-+++ src/ybutton.cc
-@@ -158,10 +158,10 @@ void YButton::paintFocus(Graphics &g, const YRect &/*r
- g.setPenStyle(false);
- } else {
- XRectangle focus[] = {
-- { dp, dp, width() - ds, 1 },
-- { dp, dp + 1, 1, height() - ds - 2 },
-- { dp + width() - ds - 1, dp + 1, 1, height() - ds - 2 },
-- { dp, dp + height() - ds - 1, width() - ds, 1 }
-+ { static_cast<short>(dp), static_cast<short>(dp), static_cast<unsigned short>(width() - ds), 1 },
-+ { static_cast<short>(dp), static_cast<short>(dp + 1), 1, static_cast<unsigned short>(height() - ds - 2) },
-+ { static_cast<short>(dp + width() - ds - 1), static_cast<short>(dp + 1), 1, static_cast<unsigned short>(height() - ds - 2) },
-+ { static_cast<short>(dp), static_cast<short>(dp + height() - ds - 1), static_cast<unsigned short>(width() - ds), 1 }
- };
-
- g.setClipRectangles(focus, 4);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/icewm/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST 11 Apr 2014 15:25:25 -0000 1.16
+++ pkg/PLIST 9 Mar 2019 23:45:11 -0000
@@ -1,54 +1,150 @@
@comment $OpenBSD: PLIST,v 1.16 2014/04/11 15:25:25 giovanni Exp $
@bin bin/icehelp
@bin bin/icesh
+@bin bin/icesound
@bin bin/icewm
+@bin bin/icewm-menu-fdo
+bin/icewm-menu-xrandr
@bin bin/icewm-session
bin/icewm-set-gnomewm
@bin bin/icewmbg
@bin bin/icewmhint
@bin bin/icewmtray
+@man man/man1/icehelp.1
+@man man/man1/icesh.1
+@man man/man1/icesound.1
+@man man/man1/icewm-menu-fdo.1
+@man man/man1/icewm-session.1
+@man man/man1/icewm-set-gnomewm.1
@man man/man1/icewm.1
+@man man/man1/icewmbg.1
+@man man/man1/icewmhint.1
+@man man/man1/icewmtray.1
+@man man/man5/icewm-env.5
+@man man/man5/icewm-focus_mode.5
+@man man/man5/icewm-keys.5
+@man man/man5/icewm-menu.5
+@man man/man5/icewm-preferences.5
+@man man/man5/icewm-prefoverride.5
+@man man/man5/icewm-programs.5
+@man man/man5/icewm-shutdown.5
+@man man/man5/icewm-startup.5
+@man man/man5/icewm-theme.5
+@man man/man5/icewm-toolbar.5
+@man man/man5/icewm-winoptions.5
+share/applications/
+share/applications/icewm-session.desktop
+share/applications/icewm.desktop
share/doc/icewm/
-share/doc/icewm/icewm-1.html
-share/doc/icewm/icewm-10.html
-share/doc/icewm/icewm-11.html
-share/doc/icewm/icewm-12.html
-share/doc/icewm/icewm-13.html
-share/doc/icewm/icewm-14.html
-share/doc/icewm/icewm-15.html
-share/doc/icewm/icewm-16.html
-share/doc/icewm/icewm-17.html
-share/doc/icewm/icewm-18.html
-share/doc/icewm/icewm-19.html
-share/doc/icewm/icewm-2.html
-share/doc/icewm/icewm-20.html
-share/doc/icewm/icewm-3.html
-share/doc/icewm/icewm-4.html
-share/doc/icewm/icewm-5.html
-share/doc/icewm/icewm-6.html
-share/doc/icewm/icewm-7.html
-share/doc/icewm/icewm-8.html
-share/doc/icewm/icewm-9.html
+share/doc/icewm/icehelp.1.html
+share/doc/icewm/icesh.1.html
+share/doc/icewm/icesound.1.html
+share/doc/icewm/icewm-env.5.html
+share/doc/icewm/icewm-focus_mode.5.html
+share/doc/icewm/icewm-keys.5.html
+share/doc/icewm/icewm-menu-fdo.1.html
+share/doc/icewm/icewm-menu.5.html
+share/doc/icewm/icewm-preferences.5.html
+share/doc/icewm/icewm-prefoverride.5.html
+share/doc/icewm/icewm-programs.5.html
+share/doc/icewm/icewm-session.1.html
+share/doc/icewm/icewm-set-gnomewm.1.html
+share/doc/icewm/icewm-shutdown.5.html
+share/doc/icewm/icewm-startup.5.html
+share/doc/icewm/icewm-theme.5.html
+share/doc/icewm/icewm-toolbar.5.html
+share/doc/icewm/icewm-winoptions.5.html
+share/doc/icewm/icewm.1.html
share/doc/icewm/icewm.html
+share/doc/icewm/icewmbg.1.html
+share/doc/icewm/icewmhint.1.html
+share/doc/icewm/icewmtray.1.html
share/icewm/
share/icewm/icons/
+share/icewm/icons/about_16x16.xpm
+share/icewm/icons/about_32x32.xpm
share/icewm/icons/app_16x16.xpm
share/icewm/icons/app_32x32.xpm
+share/icewm/icons/bomb_16x16.xpm
+share/icewm/icons/bomb_32x32.xpm
+share/icewm/icons/communicator-abook_16x16.xpm
+share/icewm/icons/communicator-abook_32x32.xpm
+share/icewm/icons/communicator-browser_16x16.xpm
+share/icewm/icons/communicator-browser_32x32.xpm
+share/icewm/icons/communicator-composer_16x16.xpm
+share/icewm/icons/communicator-composer_32x32.xpm
+share/icewm/icons/communicator-discussion_16x16.xpm
+share/icewm/icons/communicator-discussion_32x32.xpm
+share/icewm/icons/communicator-mail_16x16.xpm
+share/icewm/icons/communicator-mail_32x32.xpm
share/icewm/icons/emacs_16x16.xpm
share/icewm/icons/emacs_32x32.xpm
share/icewm/icons/file_16x16.xpm
share/icewm/icons/file_32x32.xpm
+share/icewm/icons/focus_16x16.png
+share/icewm/icons/focus_16x16.xpm
+share/icewm/icons/focus_32x32.png
+share/icewm/icons/focus_32x32.xpm
share/icewm/icons/folder_16x16.xpm
share/icewm/icons/folder_32x32.xpm
share/icewm/icons/fte_16x16.xpm
share/icewm/icons/fte_32x32.xpm
+share/icewm/icons/gimp_16x16.xpm
+share/icewm/icons/gimp_32x32.xpm
+share/icewm/icons/gnome_16x16.xpm
+share/icewm/icons/help_16x16.xpm
+share/icewm/icons/help_32x32.xpm
+share/icewm/icons/icewm_16x16.png
+share/icewm/icons/icewm_32x32.png
share/icewm/icons/java_16x16.xpm
share/icewm/icons/java_32x32.xpm
+share/icewm/icons/kde_16x16.xpm
+share/icewm/icons/key_16x16.png
+share/icewm/icons/key_32x32.png
+share/icewm/icons/koules_16x16.xpm
+share/icewm/icons/koules_32x32.xpm
+share/icewm/icons/lock_16x16.xpm
+share/icewm/icons/lock_32x32.xpm
+share/icewm/icons/lock_48x48.xpm
+share/icewm/icons/logout_16x16.xpm
+share/icewm/icons/logout_32x32.xpm
+share/icewm/icons/navigator_16x16.xpm
+share/icewm/icons/navigator_32x32.xpm
+share/icewm/icons/netscape_16x16.xpm
+share/icewm/icons/netscape_32x32.xpm
+share/icewm/icons/pdf_16x16.xpm
+share/icewm/icons/pdf_32x32.xpm
+share/icewm/icons/pref_16x16.png
+share/icewm/icons/pref_32x32.png
+share/icewm/icons/programs_16x16.xpm
+share/icewm/icons/programs_32x32.xpm
+share/icewm/icons/reboot_16x16.xpm
+share/icewm/icons/reboot_32x32.xpm
+share/icewm/icons/restart_16x16.xpm
+share/icewm/icons/restart_32x32.xpm
+share/icewm/icons/run_16x16.xpm
+share/icewm/icons/run_32x32.xpm
+share/icewm/icons/save_16x16.png
+share/icewm/icons/save_32x32.png
+share/icewm/icons/settings_16x16.xpm
+share/icewm/icons/settings_32x32.xpm
+share/icewm/icons/shutdown_16x16.xpm
+share/icewm/icons/shutdown_32x32.xpm
+share/icewm/icons/themes_16x16.xpm
+share/icewm/icons/themes_32x32.xpm
share/icewm/icons/vim_16x16.xpm
share/icewm/icons/vim_32x32.xpm
share/icewm/icons/vim_48x48.xpm
+share/icewm/icons/windows_16x16.xpm
+share/icewm/icons/windows_32x32.xpm
+share/icewm/icons/xisp_16x16.xpm
+share/icewm/icons/xisp_32x32.xpm
+share/icewm/icons/xload_16x16.xpm
+share/icewm/icons/xload_32x32.xpm
share/icewm/icons/xterm_16x16.xpm
share/icewm/icons/xterm_32x32.xpm
+share/icewm/icons/xv_16x16.xpm
+share/icewm/icons/xv_32x32.xpm
share/icewm/keys
share/icewm/ledclock/
share/icewm/ledclock/a.xpm
@@ -77,13 +173,141 @@ share/icewm/mailbox/nomail.xpm
share/icewm/mailbox/unreadmail.xpm
share/icewm/menu
share/icewm/preferences
+share/icewm/programs
share/icewm/taskbar/
share/icewm/taskbar/collapse.xpm
+share/icewm/taskbar/debian.xpm
share/icewm/taskbar/desktop.xpm
share/icewm/taskbar/expand.xpm
+share/icewm/taskbar/icewm.xpm
+share/icewm/taskbar/linux.xpm
+share/icewm/taskbar/linux1.xpm
+share/icewm/taskbar/linux2.xpm
+share/icewm/taskbar/linux20.xpm
share/icewm/taskbar/start.xpm
share/icewm/taskbar/windows.xpm
+share/icewm/taskbar/xfreeos2.xpm
share/icewm/themes/
+share/icewm/themes/CrystalBlue/
+share/icewm/themes/CrystalBlue/close.xpm
+share/icewm/themes/CrystalBlue/closeA.xpm
+share/icewm/themes/CrystalBlue/closeO.xpm
+share/icewm/themes/CrystalBlue/default.theme
+share/icewm/themes/CrystalBlue/dframeAB.xpm
+share/icewm/themes/CrystalBlue/dframeABL.xpm
+share/icewm/themes/CrystalBlue/dframeABR.xpm
+share/icewm/themes/CrystalBlue/dframeAL.xpm
+share/icewm/themes/CrystalBlue/dframeAR.xpm
+share/icewm/themes/CrystalBlue/dframeAT.xpm
+share/icewm/themes/CrystalBlue/dframeATL.xpm
+share/icewm/themes/CrystalBlue/dframeATR.xpm
+share/icewm/themes/CrystalBlue/dframeIB.xpm
+share/icewm/themes/CrystalBlue/dframeIBL.xpm
+share/icewm/themes/CrystalBlue/dframeIBR.xpm
+share/icewm/themes/CrystalBlue/dframeIL.xpm
+share/icewm/themes/CrystalBlue/dframeIR.xpm
+share/icewm/themes/CrystalBlue/dframeIT.xpm
+share/icewm/themes/CrystalBlue/dframeITL.xpm
+share/icewm/themes/CrystalBlue/dframeITR.xpm
+share/icewm/themes/CrystalBlue/frameAB.xpm
+share/icewm/themes/CrystalBlue/frameABL.xpm
+share/icewm/themes/CrystalBlue/frameABR.xpm
+share/icewm/themes/CrystalBlue/frameAL.xpm
+share/icewm/themes/CrystalBlue/frameAR.xpm
+share/icewm/themes/CrystalBlue/frameAT.xpm
+share/icewm/themes/CrystalBlue/frameATL.xpm
+share/icewm/themes/CrystalBlue/frameATR.xpm
+share/icewm/themes/CrystalBlue/frameIB.xpm
+share/icewm/themes/CrystalBlue/frameIBL.xpm
+share/icewm/themes/CrystalBlue/frameIBR.xpm
+share/icewm/themes/CrystalBlue/frameIL.xpm
+share/icewm/themes/CrystalBlue/frameIR.xpm
+share/icewm/themes/CrystalBlue/frameIT.xpm
+share/icewm/themes/CrystalBlue/frameITL.xpm
+share/icewm/themes/CrystalBlue/frameITR.xpm
+share/icewm/themes/CrystalBlue/ledclock/
+share/icewm/themes/CrystalBlue/ledclock/a.xpm
+share/icewm/themes/CrystalBlue/ledclock/colon.xpm
+share/icewm/themes/CrystalBlue/ledclock/dot.xpm
+share/icewm/themes/CrystalBlue/ledclock/m.xpm
+share/icewm/themes/CrystalBlue/ledclock/n0.xpm
+share/icewm/themes/CrystalBlue/ledclock/n1.xpm
+share/icewm/themes/CrystalBlue/ledclock/n2.xpm
+share/icewm/themes/CrystalBlue/ledclock/n3.xpm
+share/icewm/themes/CrystalBlue/ledclock/n4.xpm
+share/icewm/themes/CrystalBlue/ledclock/n5.xpm
+share/icewm/themes/CrystalBlue/ledclock/n6.xpm
+share/icewm/themes/CrystalBlue/ledclock/n7.xpm
+share/icewm/themes/CrystalBlue/ledclock/n8.xpm
+share/icewm/themes/CrystalBlue/ledclock/n9.xpm
+share/icewm/themes/CrystalBlue/ledclock/p.xpm
+share/icewm/themes/CrystalBlue/ledclock/slash.xpm
+share/icewm/themes/CrystalBlue/ledclock/space.xpm
+share/icewm/themes/CrystalBlue/maximize.xpm
+share/icewm/themes/CrystalBlue/maximizeA.xpm
+share/icewm/themes/CrystalBlue/maximizeO.xpm
+share/icewm/themes/CrystalBlue/menuButtonA.xpm
+share/icewm/themes/CrystalBlue/menuButtonI.xpm
+share/icewm/themes/CrystalBlue/menubg.xpm
+share/icewm/themes/CrystalBlue/menusel.xpm
+share/icewm/themes/CrystalBlue/minimize.xpm
+share/icewm/themes/CrystalBlue/minimizeA.xpm
+share/icewm/themes/CrystalBlue/minimizeO.xpm
+share/icewm/themes/CrystalBlue/restore.xpm
+share/icewm/themes/CrystalBlue/restoreA.xpm
+share/icewm/themes/CrystalBlue/restoreO.xpm
+share/icewm/themes/CrystalBlue/rolldown.xpm
+share/icewm/themes/CrystalBlue/rolldownA.xpm
+share/icewm/themes/CrystalBlue/rolldownO.xpm
+share/icewm/themes/CrystalBlue/rollup.xpm
+share/icewm/themes/CrystalBlue/rollupA.xpm
+share/icewm/themes/CrystalBlue/rollupO.xpm
+share/icewm/themes/CrystalBlue/taskbar/
+share/icewm/themes/CrystalBlue/taskbar/collapse.xpm
+share/icewm/themes/CrystalBlue/taskbar/desktop.xpm
+share/icewm/themes/CrystalBlue/taskbar/expand.xpm
+share/icewm/themes/CrystalBlue/taskbar/icewm.xpm
+share/icewm/themes/CrystalBlue/taskbar/taskbarbg.xpm
+share/icewm/themes/CrystalBlue/taskbar/taskbuttonactive.xpm
+share/icewm/themes/CrystalBlue/taskbar/taskbuttonbg.xpm
+share/icewm/themes/CrystalBlue/taskbar/taskbuttonminimized.xpm
+share/icewm/themes/CrystalBlue/taskbar/toolbuttonbg.xpm
+share/icewm/themes/CrystalBlue/taskbar/windows.xpm
+share/icewm/themes/CrystalBlue/titleAB.xpm
+share/icewm/themes/CrystalBlue/titleAJ.xpm
+share/icewm/themes/CrystalBlue/titleAM.xpm
+share/icewm/themes/CrystalBlue/titleAP.xpm
+share/icewm/themes/CrystalBlue/titleAQ.xpm
+share/icewm/themes/CrystalBlue/titleAS.xpm
+share/icewm/themes/CrystalBlue/titleAT.xpm
+share/icewm/themes/CrystalBlue/titleIB.xpm
+share/icewm/themes/CrystalBlue/titleIJ.xpm
+share/icewm/themes/CrystalBlue/titleIM.xpm
+share/icewm/themes/CrystalBlue/titleIP.xpm
+share/icewm/themes/CrystalBlue/titleIQ.xpm
+share/icewm/themes/CrystalBlue/titleIS.xpm
+share/icewm/themes/CrystalBlue/titleIT.xpm
+share/icewm/themes/Helix/
+share/icewm/themes/Helix/closeA.xpm
+share/icewm/themes/Helix/closeI.xpm
+share/icewm/themes/Helix/default.theme
+share/icewm/themes/Helix/maximizeA.xpm
+share/icewm/themes/Helix/maximizeI.xpm
+share/icewm/themes/Helix/menuButtonA.xpm
+share/icewm/themes/Helix/menuButtonI.xpm
+share/icewm/themes/Helix/minimizeA.xpm
+share/icewm/themes/Helix/minimizeI.xpm
+share/icewm/themes/Helix/restoreA.xpm
+share/icewm/themes/Helix/restoreI.xpm
+share/icewm/themes/Helix/titleAB.xpm
+share/icewm/themes/Helix/titleAM.xpm
+share/icewm/themes/Helix/titleAP.xpm
+share/icewm/themes/Helix/titleAS.xpm
+share/icewm/themes/Helix/titleAT.xpm
+share/icewm/themes/Helix/titleIB.xpm
+share/icewm/themes/Helix/titleIP.xpm
+share/icewm/themes/Helix/titleIS.xpm
+share/icewm/themes/Helix/titleIT.xpm
share/icewm/themes/Infadel2/
share/icewm/themes/Infadel2/Ergonomic.theme
share/icewm/themes/Infadel2/Overloaded.theme
@@ -104,7 +328,7 @@ share/icewm/themes/Infadel2/cursors/size
share/icewm/themes/Infadel2/default.theme
share/icewm/themes/Infadel2/depthA.xpm
share/icewm/themes/Infadel2/depthI.xpm
-share/icewm/themes/Infadel2/fonts.dir
+share/icewm/themes/Infadel2/fonts.dir.default
share/icewm/themes/Infadel2/hideA.xpm
share/icewm/themes/Infadel2/hideI.xpm
share/icewm/themes/Infadel2/icons/
@@ -131,6 +355,7 @@ share/icewm/themes/Infadel2/rollupA.xpm
share/icewm/themes/Infadel2/rollupI.xpm
share/icewm/themes/Infadel2/snap.pcf
share/icewm/themes/Infadel2/taskbar/
+share/icewm/themes/Infadel2/taskbar/linux.xpm
share/icewm/themes/Infadel2/taskbar/start.xpm
share/icewm/themes/Infadel2/taskbar/windows.xpm
share/icewm/themes/Infadel2/titleAB.xpm
@@ -149,18 +374,145 @@ share/icewm/themes/Infadel2/titleIQ.xpm
share/icewm/themes/Infadel2/titleIR.xpm
share/icewm/themes/Infadel2/titleIS.xpm
share/icewm/themes/Infadel2/titleIT.xpm
-share/icewm/themes/gtk2/
-share/icewm/themes/gtk2/closeA.xpm
-share/icewm/themes/gtk2/closeI.xpm
-share/icewm/themes/gtk2/default.theme
-share/icewm/themes/gtk2/maximizeA.xpm
-share/icewm/themes/gtk2/maximizeI.xpm
-share/icewm/themes/gtk2/menuButtonA.xpm
-share/icewm/themes/gtk2/menuButtonI.xpm
-share/icewm/themes/gtk2/minimizeA.xpm
-share/icewm/themes/gtk2/minimizeI.xpm
-share/icewm/themes/gtk2/restoreA.xpm
-share/icewm/themes/gtk2/restoreI.xpm
+share/icewm/themes/NanoBlue/
+share/icewm/themes/NanoBlue/closeA.xpm
+share/icewm/themes/NanoBlue/closeI.xpm
+share/icewm/themes/NanoBlue/closeO.xpm
+share/icewm/themes/NanoBlue/default.theme
+share/icewm/themes/NanoBlue/dframeAB.xpm
+share/icewm/themes/NanoBlue/dframeABL.xpm
+share/icewm/themes/NanoBlue/dframeABR.xpm
+share/icewm/themes/NanoBlue/dframeAL.xpm
+share/icewm/themes/NanoBlue/dframeAR.xpm
+share/icewm/themes/NanoBlue/dframeAT.xpm
+share/icewm/themes/NanoBlue/dframeATL.xpm
+share/icewm/themes/NanoBlue/dframeATR.xpm
+share/icewm/themes/NanoBlue/dframeIB.xpm
+share/icewm/themes/NanoBlue/dframeIBL.xpm
+share/icewm/themes/NanoBlue/dframeIBR.xpm
+share/icewm/themes/NanoBlue/dframeIL.xpm
+share/icewm/themes/NanoBlue/dframeIR.xpm
+share/icewm/themes/NanoBlue/dframeIT.xpm
+share/icewm/themes/NanoBlue/dframeITL.xpm
+share/icewm/themes/NanoBlue/dframeITR.xpm
+share/icewm/themes/NanoBlue/drameAB.xpm
+share/icewm/themes/NanoBlue/drameATR.xpm
+share/icewm/themes/NanoBlue/eos.jpg
+share/icewm/themes/NanoBlue/expandA.xpm
+share/icewm/themes/NanoBlue/expandI.xpm
+share/icewm/themes/NanoBlue/expandO.xpm
+share/icewm/themes/NanoBlue/frameAB.xpm
+share/icewm/themes/NanoBlue/frameABL.xpm
+share/icewm/themes/NanoBlue/frameABR.xpm
+share/icewm/themes/NanoBlue/frameAL.xpm
+share/icewm/themes/NanoBlue/frameAR.xpm
+share/icewm/themes/NanoBlue/frameAT.xpm
+share/icewm/themes/NanoBlue/frameATL.xpm
+share/icewm/themes/NanoBlue/frameATR.xpm
+share/icewm/themes/NanoBlue/frameIB.xpm
+share/icewm/themes/NanoBlue/frameIBL.xpm
+share/icewm/themes/NanoBlue/frameIBR.xpm
+share/icewm/themes/NanoBlue/frameIL.xpm
+share/icewm/themes/NanoBlue/frameIR.xpm
+share/icewm/themes/NanoBlue/frameIT.xpm
+share/icewm/themes/NanoBlue/frameITL.xpm
+share/icewm/themes/NanoBlue/frameITR.xpm
+share/icewm/themes/NanoBlue/icons/
+share/icewm/themes/NanoBlue/icons/IceWM_16x16.xpm
+share/icewm/themes/NanoBlue/icons/IceWM_32x32.xpm
+share/icewm/themes/NanoBlue/icons/app_16x16.xpm
+share/icewm/themes/NanoBlue/icons/firefox_16x16.xpm
+share/icewm/themes/NanoBlue/icons/firefox_32x32.xpm
+share/icewm/themes/NanoBlue/icons/folder_16x16.xpm
+share/icewm/themes/NanoBlue/icons/folder_32x32.xpm
+share/icewm/themes/NanoBlue/icons/gimp_16x16.xpm
+share/icewm/themes/NanoBlue/icons/gimp_32x32.xpm
+share/icewm/themes/NanoBlue/icons/mplayer_16x16.xpm
+share/icewm/themes/NanoBlue/icons/mplayer_32x32.xpm
+share/icewm/themes/NanoBlue/icons/thunderbird_16x16.xpm
+share/icewm/themes/NanoBlue/icons/thunderbird_32x32.xpm
+share/icewm/themes/NanoBlue/icons/xterm_16x16.xpm
+share/icewm/themes/NanoBlue/icons/xterm_32x32.xpm
+share/icewm/themes/NanoBlue/ledclock/
+share/icewm/themes/NanoBlue/ledclock/a.xpm
+share/icewm/themes/NanoBlue/ledclock/colon.xpm
+share/icewm/themes/NanoBlue/ledclock/dot.xpm
+share/icewm/themes/NanoBlue/ledclock/m.xpm
+share/icewm/themes/NanoBlue/ledclock/n0.xpm
+share/icewm/themes/NanoBlue/ledclock/n1.xpm
+share/icewm/themes/NanoBlue/ledclock/n2.xpm
+share/icewm/themes/NanoBlue/ledclock/n3.xpm
+share/icewm/themes/NanoBlue/ledclock/n4.xpm
+share/icewm/themes/NanoBlue/ledclock/n5.xpm
+share/icewm/themes/NanoBlue/ledclock/n6.xpm
+share/icewm/themes/NanoBlue/ledclock/n7.xpm
+share/icewm/themes/NanoBlue/ledclock/n8.xpm
+share/icewm/themes/NanoBlue/ledclock/n9.xpm
+share/icewm/themes/NanoBlue/ledclock/p.xpm
+share/icewm/themes/NanoBlue/ledclock/slash.xpm
+share/icewm/themes/NanoBlue/ledclock/space.xpm
+share/icewm/themes/NanoBlue/maximizeA.xpm
+share/icewm/themes/NanoBlue/maximizeI.xpm
+share/icewm/themes/NanoBlue/maximizeO.xpm
+share/icewm/themes/NanoBlue/menuButtonA.xpm
+share/icewm/themes/NanoBlue/menuButtonI.xpm
+share/icewm/themes/NanoBlue/menuButtonO.xpm
+share/icewm/themes/NanoBlue/menusel.xpm
+share/icewm/themes/NanoBlue/menusep.xpm
+share/icewm/themes/NanoBlue/minimizeA.xpm
+share/icewm/themes/NanoBlue/minimizeI.xpm
+share/icewm/themes/NanoBlue/minimizeO.xpm
+share/icewm/themes/NanoBlue/restoreA.xpm
+share/icewm/themes/NanoBlue/restoreI.xpm
+share/icewm/themes/NanoBlue/restoreO.xpm
+share/icewm/themes/NanoBlue/taskbar/
+share/icewm/themes/NanoBlue/taskbar/collapse.xpm
+share/icewm/themes/NanoBlue/taskbar/desktop.xpm
+share/icewm/themes/NanoBlue/taskbar/expand.xpm
+share/icewm/themes/NanoBlue/taskbar/icewm.xpm
+share/icewm/themes/NanoBlue/taskbar/taskbarbg.xpm
+share/icewm/themes/NanoBlue/taskbar/taskbuttonactive.xpm
+share/icewm/themes/NanoBlue/taskbar/taskbuttonbg.xpm
+share/icewm/themes/NanoBlue/taskbar/taskbuttonminimized.xpm
+share/icewm/themes/NanoBlue/taskbar/toolbuttonbg.xpm
+share/icewm/themes/NanoBlue/taskbar/windows.xpm
+share/icewm/themes/NanoBlue/taskbar/workspacebuttonactive.xpm
+share/icewm/themes/NanoBlue/taskbar/workspacebuttonbg.xpm
+share/icewm/themes/NanoBlue/titleAB.xpm
+share/icewm/themes/NanoBlue/titleAL.xpm
+share/icewm/themes/NanoBlue/titleAM.xpm
+share/icewm/themes/NanoBlue/titleAP.xpm
+share/icewm/themes/NanoBlue/titleAR.xpm
+share/icewm/themes/NanoBlue/titleAS.xpm
+share/icewm/themes/NanoBlue/titleAT.xpm
+share/icewm/themes/NanoBlue/titleIB.xpm
+share/icewm/themes/NanoBlue/titleIL.xpm
+share/icewm/themes/NanoBlue/titleIM.xpm
+share/icewm/themes/NanoBlue/titleIP.xpm
+share/icewm/themes/NanoBlue/titleIR.xpm
+share/icewm/themes/NanoBlue/titleIS.xpm
+share/icewm/themes/NanoBlue/titleIT.xpm
+share/icewm/themes/default/
+share/icewm/themes/default/closeA.xpm
+share/icewm/themes/default/closeI.xpm
+share/icewm/themes/default/default.png
+share/icewm/themes/default/default.theme
+share/icewm/themes/default/depthA.xpm
+share/icewm/themes/default/depthI.xpm
+share/icewm/themes/default/hideA.xpm
+share/icewm/themes/default/hideI.xpm
+share/icewm/themes/default/maximizeA.xpm
+share/icewm/themes/default/maximizeI.xpm
+share/icewm/themes/default/menuButtonA.xpm
+share/icewm/themes/default/menuButtonI.xpm
+share/icewm/themes/default/minimizeA.xpm
+share/icewm/themes/default/minimizeI.xpm
+share/icewm/themes/default/restoreA.xpm
+share/icewm/themes/default/restoreI.xpm
+share/icewm/themes/default/rolldownA.xpm
+share/icewm/themes/default/rolldownI.xpm
+share/icewm/themes/default/rollupA.xpm
+share/icewm/themes/default/rollupI.xpm
share/icewm/themes/icedesert/
share/icewm/themes/icedesert/closeA.xpm
share/icewm/themes/icedesert/closeI.xpm
@@ -255,63 +607,15 @@ share/icewm/themes/motif/maximize.xpm
share/icewm/themes/motif/menu.xpm
share/icewm/themes/motif/minimize.xpm
share/icewm/themes/motif/restore.xpm
-share/icewm/themes/nice/
-share/icewm/themes/nice/blue.theme
-share/icewm/themes/nice/close.xpm
-share/icewm/themes/nice/default.theme
-share/icewm/themes/nice/hide.xpm
-share/icewm/themes/nice/maximize.xpm
-share/icewm/themes/nice/minimize.xpm
-share/icewm/themes/nice/restore.xpm
-share/icewm/themes/nice/rolldown.xpm
-share/icewm/themes/nice/rollup.xpm
-share/icewm/themes/nice2/
-share/icewm/themes/nice2/closeA.xpm
-share/icewm/themes/nice2/closeI.xpm
-share/icewm/themes/nice2/default.theme
-share/icewm/themes/nice2/maximizeA.xpm
-share/icewm/themes/nice2/maximizeI.xpm
-share/icewm/themes/nice2/menuButtonA.xpm
-share/icewm/themes/nice2/menuButtonI.xpm
-share/icewm/themes/nice2/minimizeA.xpm
-share/icewm/themes/nice2/minimizeI.xpm
-share/icewm/themes/nice2/restoreA.xpm
-share/icewm/themes/nice2/restoreI.xpm
-share/icewm/themes/nice2/titleAB.xpm
-share/icewm/themes/nice2/titleAT.xpm
-share/icewm/themes/nice2/titleIB.xpm
-share/icewm/themes/nice2/titleIT.xpm
-share/icewm/themes/warp3/
-share/icewm/themes/warp3/close.xpm
-share/icewm/themes/warp3/default.theme
-share/icewm/themes/warp3/hide.xpm
-share/icewm/themes/warp3/maximize.xpm
-share/icewm/themes/warp3/minimize.xpm
-share/icewm/themes/warp3/restore.xpm
-share/icewm/themes/warp3/rolldown.xpm
-share/icewm/themes/warp3/rollup.xpm
-share/icewm/themes/warp4/
-share/icewm/themes/warp4/close.xpm
-share/icewm/themes/warp4/default.theme
-share/icewm/themes/warp4/hide.xpm
-share/icewm/themes/warp4/maximize.xpm
-share/icewm/themes/warp4/minimize.xpm
-share/icewm/themes/warp4/restore.xpm
share/icewm/themes/win95/
share/icewm/themes/win95/close.xpm
share/icewm/themes/win95/default.theme
share/icewm/themes/win95/maximize.xpm
share/icewm/themes/win95/minimize.xpm
share/icewm/themes/win95/restore.xpm
-share/icewm/themes/yellowmotif/
-share/icewm/themes/yellowmotif/close.xpm
-share/icewm/themes/yellowmotif/default.theme
-share/icewm/themes/yellowmotif/maximize.xpm
-share/icewm/themes/yellowmotif/menu.xpm
-share/icewm/themes/yellowmotif/minimize.xpm
-share/icewm/themes/yellowmotif/restore.xpm
share/icewm/toolbar
share/icewm/winoptions
+share/locale/ar/LC_MESSAGES/icewm.mo
share/locale/be/LC_MESSAGES/icewm.mo
share/locale/bg/LC_MESSAGES/icewm.mo
share/locale/ca/LC_MESSAGES/icewm.mo
@@ -323,21 +627,19 @@ share/locale/en/LC_MESSAGES/icewm.mo
share/locale/es/LC_MESSAGES/icewm.mo
share/locale/fi/LC_MESSAGES/icewm.mo
share/locale/fr/LC_MESSAGES/icewm.mo
+share/locale/he/LC_MESSAGES/icewm.mo
share/locale/hr/LC_MESSAGES/icewm.mo
share/locale/hu/LC_MESSAGES/icewm.mo
share/locale/id/LC_MESSAGES/icewm.mo
share/locale/it/LC_MESSAGES/icewm.mo
share/locale/ja/LC_MESSAGES/icewm.mo
share/locale/ko/LC_MESSAGES/icewm.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/icewm.mo
share/locale/lv/LC_MESSAGES/icewm.mo
-share/locale/mk/
-share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/icewm.mo
share/locale/nb/LC_MESSAGES/icewm.mo
share/locale/nl/LC_MESSAGES/icewm.mo
+share/locale/no/LC_MESSAGES/icewm.mo
share/locale/pl/LC_MESSAGES/icewm.mo
share/locale/pt_BR/LC_MESSAGES/icewm.mo
share/locale/ro/LC_MESSAGES/icewm.mo
@@ -350,3 +652,4 @@ share/locale/uk/LC_MESSAGES/icewm.mo
share/locale/vi/LC_MESSAGES/icewm.mo
share/locale/zh_CN/LC_MESSAGES/icewm.mo
share/locale/zh_TW/LC_MESSAGES/icewm.mo
+@tag update-desktop-database