rpms/rxvt-unicode/devel rxvt-unicode-gcc44.patch, NONE, 1.1 rxvt-unicode.spec, 1.44, 1.45

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/rxvt-unicode/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27558/devel

Modified Files:
	rxvt-unicode.spec 
Added Files:
	rxvt-unicode-gcc44.patch 
Log Message:
- Fix FTBFS: added rxvt-unicode-gcc44.patch



rxvt-unicode-gcc44.patch:

--- NEW FILE rxvt-unicode-gcc44.patch ---
--- src/background.C.orig	2009-04-25 01:12:46.000000000 +0200
+++ src/background.C	2009-04-25 01:19:21.000000000 +0200
@@ -261,7 +261,7 @@
   unsigned int w = 0, h = 0;
   unsigned int n;
   unsigned long new_flags = (flags & (~geometryFlags));
-  char *p;
+  const char *p;
 #  define MAXLEN_GEOM		256 /* could be longer than regular geometry string */
 
   if (geom == NULL)
@@ -677,7 +677,7 @@
       if (!target->asimman)
         target->asimman = create_generic_imageman (target->rs[Rs_path]);
 
-      if (char *f = strchr (file, ';'))
+      if (char *f = (char *) strchr (file, ';'))
         {
           size_t len = f - file;
           f = (char *)malloc (len + 1);
--- src/command.C.orig	2009-04-25 01:20:29.000000000 +0200
+++ src/command.C	2009-04-25 01:21:20.000000000 +0200
@@ -3336,7 +3336,7 @@
           }
         else
           {
-            char *eq = strchr (str, '='); // constness lost, but verified to be ok
+            char *eq = (char *) strchr (str, '='); // constness lost, but verified to be ok
 
             if (eq)
               {
--- src/misc.C.orig	2009-04-25 01:41:05.000000000 +0200
+++ src/misc.C	2009-04-25 01:41:37.000000000 +0200
@@ -170,7 +170,7 @@
 char *
 rxvt_basename (const char *str) NOTHROW
 {
-  char *base = strrchr (str, '/');
+  char *base = (char *) strrchr (str, '/');
 
   return (char *) (base ? base + 1 : str);
 }


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- rxvt-unicode.spec	25 Feb 2009 22:19:08 -0000	1.44
+++ rxvt-unicode.spec	24 Apr 2009 23:51:47 -0000	1.45
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        9.06
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
 Group:          User Interface/X
@@ -8,6 +8,8 @@
 URL:            http://software.schmorp.de/
 Source0:        http://dist.schmorp.de/%{name}/%{name}-%{version}.tar.bz2
 Source1:        rxvt-unicode.desktop
+# Sent to rxvt-unicode [AT] lists [DOT]Â schmorp [DOT] de on 2009/04/25
+Patch0:			rxvt-unicode-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -33,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure --enable-xft --enable-font-styles --enable-afterimage \
@@ -70,6 +73,9 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 9.06-3
+- Fix FTBFS: added rxvt-unicode-gcc44.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.06-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild