OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fvwm2?expand=0&rev=8

fvwm-2.5.21-string_compar.patch

@@ -0,0 +1,107 @@
+--- fvwm/builtins.c
++++ fvwm/builtins.c
+@@ -2884,7 +2884,7 @@
+ 	int ret;
+ 	unsigned long argument, data1 = 0, data2 = 0;
+ 
+-	if (action == NULL || action == "\0")
++	if (action == NULL || (strcmp(action,"\0") == 0))
+ 	{
+ 		return;
+ 	}
+--- libs/Flocale.c
++++ libs/Flocale.c
+@@ -1080,7 +1080,7 @@
+ 	fftf = FftGetFont(dpy, fn, module);
+ 	if (fftf == NULL)
+ 	{
+-		if (fn != NULL && fn != FLOCALE_FFT_FALLBACK_FONT)
++		if (fn != NULL && fn != (char *)FLOCALE_FFT_FALLBACK_FONT)
+ 		{
+ 			free(fn);
+ 		}
+@@ -1095,7 +1095,7 @@
+ 		&flf->fftf, &flf->height, &flf->ascent, &flf->descent);
+ 	FftGetFontWidths(flf, &flf->max_char_width);
+ 	free(fftf);
+-	if (fn != NULL && fn != FLOCALE_FFT_FALLBACK_FONT)
++	if (fn != NULL && fn != (char *) FLOCALE_FFT_FALLBACK_FONT)
+ 	{
+ 		free(fn);
+ 	}
+@@ -1124,7 +1124,7 @@
+ 	}
+ 	else if (!(fn_fixed = FlocaleFixNameForFontSet(dpy, fn, module)))
+ 	{
+-		if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT)
++		if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT)
+ 		{
+ 			free(fn);
+ 		}
+@@ -1136,7 +1136,7 @@
+ 		{
+ 			free(fn_fixed);
+ 		}
+-		if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT)
++		if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT)
+ 		{
+ 			free(fn);
+ 		}
+@@ -1185,7 +1185,7 @@
+ 	{
+ 		free(fn_fixed);
+ 	}
+-	if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT)
++	if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT)
+ 	{
+ 		free(fn);
+ 	}
+@@ -1212,7 +1212,7 @@
+ 			fn = FLOCALE_FALLBACK_FONT;
+ 		}
+ 		font = XLoadQueryFont(dpy, fn);
+-		if (fn != NULL && fn != FLOCALE_FALLBACK_FONT)
++		if (fn != NULL && fn != (char *) FLOCALE_FALLBACK_FONT)
+ 		{
+ 			free(fn);
+ 			fn = NULL;
+@@ -1224,7 +1224,7 @@
+ 	}
+ 	if (font == NULL)
+ 	{
+-		if (fn != NULL && fn != FLOCALE_FALLBACK_FONT)
++		if (fn != NULL && fn != (char *) FLOCALE_FALLBACK_FONT)
+ 		{
+ 			free(fn);
+ 		}
+@@ -1248,7 +1248,7 @@
+ 	flf->max_char_width = font->max_bounds.width;
+ 	if (flf->font->max_byte1 > 0)
+ 		flf->flags.is_mb = True;
+-	if (fn != NULL && fn != FLOCALE_FALLBACK_FONT)
++	if (fn != NULL && fn != (char *) FLOCALE_FALLBACK_FONT)
+ 	{
+ 		free(fn);
+ 	}
+@@ -1460,8 +1460,8 @@
+ 	{
+ 		flf = FlocaleGetFontOrFontSet(
+ 			dpy, fn, encoding, fontname, module);
+-		if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT &&
+-		    fn != FLOCALE_FALLBACK_FONT)
++		if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT &&
++		    fn != (char *) FLOCALE_FALLBACK_FONT)
+ 		{
+ 			free(fn);
+ 			fn = NULL;
+@@ -1471,8 +1471,8 @@
+ 			str = GetQuotedString(str, &fn, ";", NULL, NULL, NULL);
+ 		}
+ 	}
+-	if (fn != NULL && fn != FLOCALE_MB_FALLBACK_FONT &&
+-	    fn != FLOCALE_FALLBACK_FONT)
++	if (fn != NULL && fn != (char *) FLOCALE_MB_FALLBACK_FONT &&
++	    fn != (char *) FLOCALE_FALLBACK_FONT)
+ 	{
+ 		free(fn);
+ 	}

fvwm2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr  4 16:48:44 CEST 2007 - lmichnovic@suse.cz
+
+- fixed gcc warnings: comparing a char* pointer with a 
+  string literal (string_compar.patch)
+
 -------------------------------------------------------------------
 Fri Mar  9 18:40:31 CET 2007 - lmichnovic@suse.cz
 

fvwm2.spec

@@ -18,7 +18,7 @@ Provides:       fvwmicns windowmanager xpmroot
 Obsoletes:      fvwm xpmroot
 Autoreqprov:    on
 Version:        2.5.21
-Release:        6
+Release:        11
 Summary:        Improved Version of FVWM Window Manager
 URL:            http://www.fvwm.org
 Source0:        fvwm-2.5.21.tar.bz2
@@ -34,6 +34,7 @@ Patch1:         fvwm-%{version}-gcc-warnings.patch
 Patch2:         fvwm-%{version}-ia64.patch
 Patch3:         fvwm-%{version}-sv_SE.patch
 Patch4:         fvwm-%{version}-utf_encoding.patch
+Patch5:         fvwm-%{version}-string_compar.patch
 
 %description
 FVWM is a virtual desktop window manager for the X Window System.
@@ -70,6 +71,7 @@ Authors:
 %patch2
 %patch3
 %patch4
+%patch5
 find . -name *sv_SE* |xargs rename sv_SE sv  
 mkdir icons
 tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2
@@ -164,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Apr 04 2007 - lmichnovic@suse.cz
+- fixed gcc warnings: comparing a char* pointer with a
+  string literal (string_compar.patch)
 * Fri Mar 09 2007 - lmichnovic@suse.cz
 - Fixed corrupted characters in sax2 test mode for some locales
   [#251639] (*utf_encoding.patch)