1 Index: icewm-1.3.7/configure
2 ===================================================================
3 --- icewm-1.3.7.orig/configure 2010-10-31 15:09:40.000000000 +0100
4 +++ icewm-1.3.7/configure 2011-03-14 15:58:59.000000000 +0100
7 if test "${PKG_CONFIG}" != ""; then
9 - GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
10 - GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
11 + GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 fontconfig`
12 + GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 fontconfig`
16 $as_echo "#define CONFIG_GNOME_MENUS 1" >>confdefs.h
17 Index: icewm-1.3.7/configure.in
18 ===================================================================
19 --- icewm-1.3.7.orig/configure.in 2010-10-31 15:09:37.000000000 +0100
20 +++ icewm-1.3.7/configure.in 2011-03-14 15:58:59.000000000 +0100
23 if test "${PKG_CONFIG}" != ""; then
25 - GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
26 - GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
27 + GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 fontconfig`
28 + GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 fontconfig`
30 AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
32 Index: icewm-1.3.7/po/Makefile.in
33 ===================================================================
34 --- icewm-1.3.7.orig/po/Makefile.in 2010-10-31 15:09:37.000000000 +0100
35 +++ icewm-1.3.7/po/Makefile.in 2011-03-14 15:58:59.000000000 +0100
42 +# /*ebloch*/ XXX this should become @PACKAGE@ again when it's passing is fixed
47 Index: icewm-1.3.7/src/WinMgr.h
48 ===================================================================
49 --- icewm-1.3.7.orig/src/WinMgr.h 2010-10-31 15:09:36.000000000 +0100
50 +++ icewm-1.3.7/src/WinMgr.h 2011-03-14 15:58:59.000000000 +0100
52 * this where WIN_WORKSPACE_COUNT comes into play.
55 -#define WinWorkspaceInvalid (-1L)
56 +#define WinWorkspaceInvalid ((unsigned long)-1)
59 #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
60 Index: icewm-1.3.7/src/yapp.cc
61 ===================================================================
62 --- icewm-1.3.7.orig/src/yapp.cc 2010-10-31 15:09:36.000000000 +0100
63 +++ icewm-1.3.7/src/yapp.cc 2011-03-14 15:58:59.000000000 +0100
69 + if(measure_latency) {
70 struct timeval difftime;
71 struct timeval curtime;
72 gettimeofday(&curtime, 0);
73 Index: icewm-1.3.7/src/Makefile.in
74 ===================================================================
75 --- icewm-1.3.7.orig/src/Makefile.in 2011-03-14 16:00:59.012121443 +0100
76 +++ icewm-1.3.7/src/Makefile.in 2011-03-14 16:01:08.285521758 +0100
78 CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
79 @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
81 -LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
82 +LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig
84 CORE_LIBS = @CORE_LIBS@ # `fc-config --libs`
85 IMAGE_LIBS = @IMAGE_LIBS@
86 --- icewm-1.3.8/src/icesh.cc.orig 2013-11-17 17:54:39.000000000 +0100
87 +++ icewm-1.3.8/src/icesh.cc 2020-11-10 22:44:42.344406358 +0100
91 SymbolTable layers = {
92 - layerIdentifiers, 0, WinLayerCount - 1, WinLayerInvalid
93 + layerIdentifiers, 0, WinLayerCount - 1, (long)WinLayerInvalid
96 SymbolTable states = {
100 SymbolTable trayOptions = {
101 - trayOptionIdentifiers, 0, WinTrayOptionCount - 1, WinTrayInvalid
102 + trayOptionIdentifiers, 0, WinTrayOptionCount - 1, (long)WinTrayInvalid
105 /******************************************************************************/