- fixes from debian

[packages/icewm.git] / icewm-build-fixes.patch

diff --git a/icewm-build-fixes.patch b/icewm-build-fixes.patch
new file mode 100644 (file)
index 0000000..fbab112
--- /dev/null
+++ b/icewm-build-fixes.patch
@@ -0,0 +1,109 @@
+Index: icewm-1.3.7/configure
+===================================================================
+--- icewm-1.3.7.orig/configure 2010-10-31 15:09:40.000000000 +0100
++++ icewm-1.3.7/configure      2011-03-14 15:58:59.000000000 +0100
+@@ -7038,8 +7038,9 @@
+ 
+       if test "${PKG_CONFIG}" != ""; then
+       GNOME_VER=2
+-      GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
+-      GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
++  GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 fontconfig`
++      GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 fontconfig`
++
+ 
+ 
+ $as_echo "#define CONFIG_GNOME_MENUS 1" >>confdefs.h
+Index: icewm-1.3.7/configure.in
+===================================================================
+--- icewm-1.3.7.orig/configure.in      2010-10-31 15:09:37.000000000 +0100
++++ icewm-1.3.7/configure.in   2011-03-14 15:58:59.000000000 +0100
+@@ -836,8 +836,8 @@
+     
+       if test "${PKG_CONFIG}" != ""; then
+       GNOME_VER=2
+-      GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
+-      GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
++  GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 fontconfig`
++      GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 gnome-vfs-2.0 libgnomeui-2.0 fontconfig`
+ 
+       AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
+ 
+Index: icewm-1.3.7/po/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/po/Makefile.in    2010-10-31 15:09:37.000000000 +0100
++++ icewm-1.3.7/po/Makefile.in 2011-03-14 15:58:59.000000000 +0100
+@@ -4,7 +4,9 @@
+ prefix  =       @prefix@
+ datadir =       @datadir@
+ 
+-PACKAGE =     @PACKAGE@
++PACKAGE =     icewm
++# /*ebloch*/ XXX this should become @PACKAGE@ again when it's passing is fixed
++
+ LOCDIR =        @LOCDIR@
+ 
+ DESTDIR = 
+Index: icewm-1.3.7/src/WinMgr.h
+===================================================================
+--- icewm-1.3.7.orig/src/WinMgr.h      2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/WinMgr.h   2011-03-14 15:58:59.000000000 +0100
+@@ -128,7 +128,7 @@
+  * this where WIN_WORKSPACE_COUNT comes into play.
+  */
+ 
+-#define WinWorkspaceInvalid    (-1L)
++#define WinWorkspaceInvalid    ((unsigned long)-1)
+ 
+ /* workspaces */
+ #define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
+Index: icewm-1.3.7/src/yfont.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yfont.cc      2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/yfont.cc   2011-03-14 15:58:59.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ extern ref<YFont> getXftFont(ustring name, bool antialias);
+ extern ref<YFont> getXftFontXlfd(ustring name, bool antialias);
+-extern ref<YFont> getCoreFont(ustring name);
++extern ref<YFont> getCoreFont(const char*);
+ 
+ #ifdef CONFIG_XFREETYPE
+ ref<YFont> YFont::getFont(ustring name, ustring xftFont, bool antialias) {
+@@ -46,7 +46,9 @@
+ #endif
+ 
+ #ifdef CONFIG_COREFONTS
+-    return getCoreFont(name);
++    char tmp[4096]; // XXX: such things should go into getCoreFont directly
++    name.copy(tmp, sizeof(tmp));
++    return getCoreFont(tmp);
+ #else
+     return null;
+ #endif
+Index: icewm-1.3.7/src/yapp.cc
+===================================================================
+--- icewm-1.3.7.orig/src/yapp.cc       2010-10-31 15:09:36.000000000 +0100
++++ icewm-1.3.7/src/yapp.cc    2011-03-14 15:58:59.000000000 +0100
+@@ -269,7 +269,7 @@
+         }
+ #endif
+ 
+-        {
++        if(measure_latency) {
+             struct timeval difftime;
+             struct timeval curtime;
+             gettimeofday(&curtime, 0);
+Index: icewm-1.3.7/src/Makefile.in
+===================================================================
+--- icewm-1.3.7.orig/src/Makefile.in   2011-03-14 16:00:59.012121443 +0100
++++ icewm-1.3.7/src/Makefile.in        2011-03-14 16:01:08.285521758 +0100
+@@ -37,7 +37,7 @@
+ CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
+               @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
+ LFLAGS =      @LDFLAGS@ 
+-LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` 
++LIBS =          @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig
+ 
+ CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
+ IMAGE_LIBS =    @IMAGE_LIBS@