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

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@
Commit	Line	Data
9b97b900 JR	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
	5	@@ -7038,8 +7038,9 @@
	6
	7	if test "${PKG_CONFIG}" != ""; then
	8	GNOME_VER=2
	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`
	13	+
	14
	15
	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
	21	@@ -836,8 +836,8 @@
	22
	23	if test "${PKG_CONFIG}" != ""; then
	24	GNOME_VER=2
	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`
	29
	30	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
	31
	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
	36	@@ -4,7 +4,9 @@
	37	prefix = @prefix@
	38	datadir = @datadir@
	39
	40	-PACKAGE = @PACKAGE@
	41	+PACKAGE = icewm
	42	+# /ebloch/ XXX this should become @PACKAGE@ again when it's passing is fixed
	43	+
	44	LOCDIR = @LOCDIR@
	45
	46	DESTDIR =
	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
	51	@@ -128,7 +128,7 @@
	52	* this where WIN_WORKSPACE_COUNT comes into play.
	53	*/
	54
	55	-#define WinWorkspaceInvalid (-1L)
	56	+#define WinWorkspaceInvalid ((unsigned long)-1)
	57
	58	/* workspaces */
	59	#define XA_WIN_WORKSPACES "_WIN_WORKSPACES"
	60	Index: icewm-1.3.7/src/yfont.cc
	61	===================================================================
	62	--- icewm-1.3.7.orig/src/yfont.cc 2010-10-31 15:09:36.000000000 +0100
	63	+++ icewm-1.3.7/src/yfont.cc 2011-03-14 15:58:59.000000000 +0100
	64	@@ -12,7 +12,7 @@
65
66	extern ref<YFont> getXftFont(ustring name, bool antialias);
67	extern ref<YFont> getXftFontXlfd(ustring name, bool antialias);
68	-extern ref<YFont> getCoreFont(ustring name);
69	+extern ref<YFont> getCoreFont(const char*);
70
71	#ifdef CONFIG_XFREETYPE
72	ref<YFont> YFont::getFont(ustring name, ustring xftFont, bool antialias) {
73	@@ -46,7 +46,9 @@
74	#endif
75
76	#ifdef CONFIG_COREFONTS
77	- return getCoreFont(name);
78	+ char tmp[4096]; // XXX: such things should go into getCoreFont directly
79	+ name.copy(tmp, sizeof(tmp));
80	+ return getCoreFont(tmp);
81	#else
82	return null;
83	#endif
84	Index: icewm-1.3.7/src/yapp.cc
85	===================================================================
86	--- icewm-1.3.7.orig/src/yapp.cc 2010-10-31 15:09:36.000000000 +0100
87	+++ icewm-1.3.7/src/yapp.cc 2011-03-14 15:58:59.000000000 +0100
88	@@ -269,7 +269,7 @@
89	}
90	#endif
91
92	- {
93	+ if(measure_latency) {
94	struct timeval difftime;
95	struct timeval curtime;
96	gettimeofday(&curtime, 0);
97	Index: icewm-1.3.7/src/Makefile.in
98	===================================================================
99	--- icewm-1.3.7.orig/src/Makefile.in 2011-03-14 16:00:59.012121443 +0100
100	+++ icewm-1.3.7/src/Makefile.in 2011-03-14 16:01:08.285521758 +0100
101	@@ -37,7 +37,7 @@
102	CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
103	@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
104	LFLAGS = @LDFLAGS@
105	-LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs`
106	+LIBS = @LIBS@ `pkg-config gdk-pixbuf-xlib-2.0 --libs` -lfontconfig
107
108	CORE_LIBS = @CORE_LIBS@ # `fc-config --libs`
109	IMAGE_LIBS = @IMAGE_LIBS@